Adjusted impacket import check

This commit is contained in:
Bernardo Damele 2010-10-27 21:10:56 +00:00
parent ed1f2da43f
commit 26cf6c2136
2 changed files with 15 additions and 2 deletions

View File

@ -25,8 +25,11 @@ import select
import socket import socket
import sys import sys
from impacket import ImpactDecoder try:
from impacket import ImpactPacket from impacket import ImpactDecoder
from impacket import ImpactPacket
except ImportError, _:
pass
def main(src, dst): def main(src, dst):
# Make standard input a non-blocking file # Make standard input a non-blocking file

View File

@ -12,6 +12,7 @@ from lib.core.common import runningAsAdmin
from lib.core.data import conf from lib.core.data import conf
from lib.core.data import kb from lib.core.data import kb
from lib.core.data import logger from lib.core.data import logger
from lib.core.exception import sqlmapMissingDependence
from lib.core.exception import sqlmapMissingMandatoryOptionException from lib.core.exception import sqlmapMissingMandatoryOptionException
from lib.core.exception import sqlmapMissingPrivileges from lib.core.exception import sqlmapMissingPrivileges
from lib.core.exception import sqlmapNotVulnerableException from lib.core.exception import sqlmapNotVulnerableException
@ -126,6 +127,15 @@ class Takeover(Abstraction, Metasploit, ICMPsh, Registry, Miscellaneous):
errMsg += "sniff and craft ICMP packets" errMsg += "sniff and craft ICMP packets"
raise sqlmapMissingPrivileges, errMsg raise sqlmapMissingPrivileges, errMsg
try:
from impacket import ImpactDecoder
from impacket import ImpactPacket
except ImportError, _:
errMsg = "sqlmap requires 'impacket' third-party library "
errMsg += "in order to run icmpsh master. Download from "
errMsg += "http://oss.coresecurity.com/projects/impacket.html"
raise sqlmapMissingDependence, errMsg
if kb.stackedTest or conf.direct: if kb.stackedTest or conf.direct:
web = False web = False