Merge pull request #1054 from NullArray/dev-beta

Checksums

Author: NullArray

lib/banner.py

@@ -1,7 +1,7 @@
 import os
 import random
 
-VERSION = "3.1.1"
+VERSION = "3.1.2"
 
 
 def banner_1(line_sep="#--", space=" " * 30):

lib/creation/issue_creator.py

@@ -184,13 +184,14 @@ def request_issue_creation(path, arguments, error_message):
     request the creation and create the issue
     """
 
-    if not checksum(path):
-        lib.output.error(
-            "It seems you have changed some of the code in the program. We do not accept issues from edited "
-            "code as we have no way of reliably testing your issue. We recommend that you only use the version "
-            "that is available on github, no issue will be created for this problem."
-        )
-        exit(1)
+    # TODO:/ we're gonna go ahead and give you guys another chance
+    #if not checksum(path):
+    #    lib.output.error(
+    #        "It seems you have changed some of the code in the program. We do not accept issues from edited "
+    #        "code as we have no way of reliably testing your issue. We recommend that you only use the version "
+    #        "that is available on github, no issue will be created for this problem."
+    #    )
+    #    exit(1)
 
     question = raw_input(
         "do you want to create an anonymized issue?[y/N]: "

lib/term/terminal.py

@@ -491,11 +491,11 @@ def terminal_main_display(self, tokens, extra_commands=None, save_history=True):
                                     print(self.do_exploit_targets.__doc__)
                             except TypeError:
                                 pass
-                            if len(choice_data_list) < 4:
+                            if choice_data_list is None or len(choice_data_list) < 4:
                                 lib.output.error(
                                     "must provide at least LHOST, LPORT, workspace name with `{}` keyword "
                                     "(IE {} 127.0.0.1 9076 default [whitelist-path] [honeycheck])".format(
-                                        choice, choice
+                                        choice.strip(), choice.strip()
                                     )
                                 )
                             else:
@@ -547,11 +547,11 @@ def terminal_main_display(self, tokens, extra_commands=None, save_history=True):
                                     print(self.do_load_custom_hosts.__doc__)
                             except TypeError:
                                 pass
-                            if len(choice_data_list) < 3:
+                            if choice_data_list is None or len(choice_data_list) < 3:
                                 lib.output.error(
                                     "must provide a list of API names after `{}` keyword and query "
                                     "(IE {} shodan,censys apache2)".format(
-                                        choice, choice
+                                        choice.strip(), choice.strip()
                                     )
                                 )
                             else:
@@ -578,11 +578,11 @@ def terminal_main_display(self, tokens, extra_commands=None, save_history=True):
                             except TypeError:
                                 pass
 
-                            if len(choice_data_list) < 3:
+                            if choice_data_list is None or len(choice_data_list) < 3:
                                 lib.output.error(
                                     "must supply API name with `{}` keyword along with "
                                     "new token (IE {} shodan mytoken123 [userID (censys)])".format(
-                                        choice, choice
+                                        choice.strip(), choice.strip()
                                     )
                                 )
                             else: