Merge pull request #2 from bhdresh/v2.0-beta-1

V2.0 beta 1
bhdresh · Apr 19, 2017 · 3cad9a3 · 3cad9a3
2 parents 28440d7 + aded5a9
commit 3cad9a3
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/cve-2017-0199_toolkit.py b/cve-2017-0199_toolkit.py
@@ -9,11 +9,14 @@ def main(argv):
     global host
     global filename
     global docuri
-    global port
     global payloadurl
     global payloadlocation
+    filename = ''
+    docuri = ''
+    payloadurl = ''
+    payloadlocation = ''
     port = int("80")
-    host = '0.0.0.0'
+    host = ''
     # Capture command line arguments
     try:
         opts, args = getopt.getopt(argv,"hM:w:u:p:e:l:",["mode=","filename=","docuri=","port=","payloadurl=","payloadlocation="])
@@ -49,13 +52,19 @@ def main(argv):
         elif opt in ("-l", "--payloadlocation"):
             payloadlocation = arg
     if "gen" in mode:
-        if filename or docuri == None:
+        if (len(filename)<1):
+            print 'Help: python '+sys.argv[0]+' -h'
+            sys.exit()
+        if (len(docuri)<1):
             print 'Help: python '+sys.argv[0]+' -h'
             sys.exit()
         print "Generating payload"
         generate_exploit_rtf()
     if "exp" in mode:
-        if port or payloadurl or payloadlocation == None:
+        if (len(payloadurl)<1):
+            print 'Help: python '+sys.argv[0]+' -h'
+            sys.exit()
+        if (len(payloadlocation)<1):
             print 'Help: python '+sys.argv[0]+' -h'
             sys.exit()
         print "Running exploit mode - waiting for victim to connect"