解决了单个文件无法扫描的bug, fix #583

Author: BlBana

cobra/cli.py

@@ -69,6 +69,7 @@ def start(target, formatter, output, special_rules, a_sid=None):
     # target directory
     try:
         target_directory = pa.target_directory(target_mode)
+        target_directory = target_directory.rstrip("/")
         logger.info('[CLI] Target directory: {d}'.format(d=target_directory))
 
         # static analyse files info
@@ -86,7 +87,6 @@ def start(target, formatter, output, special_rules, a_sid=None):
 
         if pa.special_rules is not None:
             logger.info('[CLI] [SPECIAL-RULE] only scan used by {r}'.format(r=','.join(pa.special_rules)))
-
         # scan
         scan(target_directory=target_directory, a_sid=a_sid, s_sid=s_sid, special_rules=pa.special_rules,
              language=main_language, framework=main_framework, file_count=file_count, extension_count=len(files))

cobra/engine.py

@@ -161,7 +161,10 @@ def scan(target_directory, a_sid=None, s_sid=None, special_rules=None, language=
     def store(result):
         if result is not None and isinstance(result, list) is True:
             for res in result:
-                res.file_path = res.file_path.replace(target_directory, '')
+                if os.path.isdir(target_directory):
+                    res.file_path = res.file_path.replace(target_directory, '')
+                else:
+                    res.file_path = res.file_path.replace(os.path.dirname(target_directory), '')
                 find_vulnerabilities.append(res)
         else:
             logger.debug('[SCAN] [STORE] Not found vulnerabilities on this rule!')
@@ -363,8 +366,12 @@ def parse_match(self, single_match):
             # v.php:2:$password 2017:01:01
             # v.exe Binary file
             try:
-                mr.line_number, mr.code_content = re.findall(r':(\d+):(.*)', single_match)[0]
-                mr.file_path = single_match.split(u':{n}:'.format(n=mr.line_number))[0]
+                if os.path.isdir(self.target_directory):
+                    mr.line_number, mr.code_content = re.findall(r':(\d+):(.*)', single_match)[0]
+                    mr.file_path = single_match.split(u':{n}:'.format(n=mr.line_number))[0]
+                else:
+                    mr.line_number, mr.code_content = re.findall(r'(\d+):(.*)', single_match)[0]
+                    mr.file_path = self.target_directory
             except Exception:
                 logger.warning('match line parse exception')
                 mr.file_path = ''

cobra/pickup.py

@@ -530,7 +530,8 @@ def committer(directory, file_path, line_number, length=1):
         :param length:
         :return: group#1, group#2
         """
-        os.chdir(directory)
+        if os.path.isdir(directory):
+            os.chdir(directory)
         cmd = "git blame -L{0},+{1} -- {2}".format(line_number, length, file_path.replace(directory, ''))
         p = subprocess.Popen(cmd, shell=True, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
         checkout_out, checkout_err = p.communicate()