修复python3.8环境下运行失败的问题

.coveralls.yml

@@ -1 +1 @@
-repo_token: RTm43Y7KTsi2AkDnpxTr3UvNcJZBKSXid
+repo_token: JJS0p6rdrOP93s5lMebbwyAx2Z2L0PabA

.travis.yml

@@ -1,6 +1,5 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
   - "3.3"
   - "3.4"

Dockerfile

@@ -3,7 +3,7 @@ FROM ubuntu:xenial
 COPY . /code/
 WORKDIR /code
 
-RUN apt-get update && apt-get install -y python-pip curl \
+RUN apt-get update && apt-get install -y python-pip curl git \
     && apt-get autoremove \
     && apt-get clean \
     && apt-get autoclean \

README.md

@@ -1,10 +1,12 @@
 # Cobra
-[![Build Status](https://travis-ci.org/FeeiCN/cobra.svg?branch=master)](https://travis-ci.org/FeeiCN/cobra)
-[![Coverage Status](https://coveralls.io/repos/github/FeeiCN/cobra/badge.svg?branch=master)](https://coveralls.io/github/FeeiCN/cobra?branch=master)
-[![GitHub (pre-)release](https://img.shields.io/github/release/feeicn/cobra/all.svg)](https://github.com/feeicn/cobra/releases)
-[![license](https://img.shields.io/github/license/mashape/apistatus.svg?maxAge=2592000)](https://github.com/feeicn/cobra/blob/master/LICENSE)
+[![Build Status](https://travis-ci.org/WhaleShark-Team/cobra.svg?branch=master)](https://travis-ci.org/WhaleShark-Team/cobra)
+[![Coverage Status](https://coveralls.io/repos/github/WhaleShark-Team/cobra/badge.svg?branch=master)](https://coveralls.io/github/WhaleShark-Team/cobra?branch=master)
+[![GitHub (pre-)release](https://img.shields.io/github/release/WhaleShark-Team/cobra/all.svg)](https://github.com/WhaleShark-Team/cobra/releases)
+[![license](https://img.shields.io/github/license/mashape/apistatus.svg?maxAge=2592000)](https://github.com/WhaleShark-Team/cobra/blob/master/LICENSE)
 
-[![asciicast](https://raw.githubusercontent.com/feeicn/cobra/master/docs/report_03.jpg)](https://asciinema.org/a/132572)
+[![asciicast](https://raw.githubusercontent.com/WhaleShark-Team/cobra/master/docs/report_03.jpg)](https://asciinema.org/a/132572)
+
+**该项目设计已无法实现当前白盒扫描要求，已不在维护，仅做研究使用，请勿在生产环境使用**
 
 ## Introduction（介绍）
 Cobra是一款**源代码安全审计**工具，支持检测多种开发语言源代码中的**大部分显著**的安全问题和漏洞。
@@ -20,8 +22,11 @@ Cobra是一款**源代码安全审计**工具，支持检测多种开发语言
 > 提供本地Web Server服务，可使用GUI可视化操作，也可支持本地API接口，方便和其它系统（发布系统、CI等）对接扩展。
 
 ## Screenshot（截图）
-[![report01](https://raw.githubusercontent.com/feeicn/cobra/master/docs/report_01.jpg)](https://feeicn.github.io/cobra/api)
-[![report02](https://raw.githubusercontent.com/feeicn/cobra/master/docs/report_02.jpg)](https://feeicn.github.io/cobra/api)
+[![report01](https://raw.githubusercontent.com/whaleshark-team/cobra/master/docs/report_01.jpg)](https://whaleshark-team.github.io/cobra/api)
+[![report02](https://raw.githubusercontent.com/whaleshark-team/cobra/master/docs/report_02.jpg)](https://whaleshark-team.github.io/cobra/api)
+
+## Contributors（贡献者）
+项目由[Feei](https://github.com/FeeiCN)发起并主导，核心开发者[LiGhT1EsS](https://github.com/LiGhT1EsS)、[BlBana](https://github.com/BlBana)、[40huo](https://github.com/40huo)、[braveghz](https://github.com/braveghz)，也感谢其他[贡献者](https://github.com/WhaleShark-Team/cobra/graphs/contributors)，欢迎提交PR。
 
 ## Links（链接）
-- [Cobra文档](https://feeicn.github.io/cobra/)
+- [Cobra文档](https://whaleshark-team.github.io/cobra/)

cobra.py

@@ -8,7 +8,7 @@
     Implements cobra entry
 
     :author:    Feei <[email protected]>
-    :homepage:  https://github.com/FeeiCN/cobra
+    :homepage:  https://github.com/WhaleShark-Team/cobra
     :license:   MIT, see LICENSE for more details.
     :copyright: Copyright (c) 2018 Feei. All rights reserved
 """

cobra/__init__.py

@@ -8,7 +8,7 @@
     Implements cobra main
 
     :author:    Feei <[email protected]>
-    :homepage:  https://github.com/FeeiCN/cobra
+    :homepage:  https://github.com/WhaleShark-Team/cobra
     :license:   MIT, see LICENSE for more details.
     :copyright: Copyright (c) 2018 Feei. All rights reserved
 """
@@ -22,7 +22,8 @@
 from . import cli, api, config
 from .cli import get_sid
 from .engine import Running
-from .utils import unhandled_exception_message, create_github_issue
+from .utils import unhandled_exception_message, create_github_issue, set_config_hash, get_config_hash
+from .report import Report
 
 from .__version__ import __title__, __introduction__, __url__, __version__
 from .__version__ import __author__, __author_email__, __license__
@@ -43,11 +44,14 @@ def main():
 
         parser_group_scan = parser.add_argument_group('Scan')
         parser_group_scan.add_argument('-t', '--target', dest='target', action='store', default='', metavar='<target>', help='file, folder, compress, or repository address')
-        parser_group_scan.add_argument('-f', '--format', dest='format', action='store', default='json', metavar='<format>', choices=['html', 'json', 'csv', 'xml'], help='vulnerability output format (formats: %(choices)s)')
+        parser_group_scan.add_argument('-f', '--format', dest='format', action='store', default='json', metavar='<format>', choices=['json', 'csv', 'xml'], help='vulnerability output format (formats: %(choices)s)')
         parser_group_scan.add_argument('-o', '--output', dest='output', action='store', default='', metavar='<output>', help='vulnerability output STREAM, FILE, HTTP API URL, MAIL')
         parser_group_scan.add_argument('-r', '--rule', dest='special_rules', action='store', default=None, metavar='<rule_id>', help='specifies rules e.g: CVI-100001,cvi-190001')
         parser_group_scan.add_argument('-d', '--debug', dest='debug', action='store_true', default=False, help='open debug mode')
         parser_group_scan.add_argument('-sid', '--sid', dest='sid', action='store', default=None, help='scan id(API)')
+        parser_group_scan.add_argument('-dels', '--dels', dest='dels', action='store_true', default=False, help='del target directory True or False')
+        parser_group_scan.add_argument('-rp', '--report', dest='report', action='store_true', default=False, help='automation report Cobra data')
+        parser_group_scan.add_argument('-m', '--md5', dest='md5', action='store_true', default=False, help='Create projects file md5')
 
         parser_group_server = parser.add_argument_group('RESTful')
         parser_group_server.add_argument('-H', '--host', dest='host', action='store', default=None, metavar='<host>', help='REST-JSON API Service Host')
@@ -59,6 +63,19 @@ def main():
             logger.setLevel(logging.DEBUG)
             logger.debug('[INIT] set logging level: debug')
 
+        if args.report:
+            logger.info('[REPORT] Start report')
+            res = Report().run()
+            if res is False:
+                logger.critical('[REPORT] Cobra Report failed')
+            else:
+                logger.info('[REPORT] Cobra Report Success ')
+            exit()
+
+        if args.md5 and args.port is None and args.host is None and args.target is '':
+            set_config_hash()
+            exit()
+
         if args.host is None and args.port is None and args.target is '' and args.output is '':
             parser.print_help()
             exit()
@@ -67,8 +84,12 @@ def main():
             logger.critical('Nonsupport Windows!!!')
 
         if args.host is not None and args.port is not None:
-            if not int(args.port) <= 65535:
-                logger.critical('port must be 0-65535.')
+            try:
+                if not int(args.port) <= 65535:
+                    logger.critical('port must be 0-65535.')
+                    exit()
+            except ValueError as e:
+                logger.critical('port must be 0-65535')
                 exit()
             logger.debug('[INIT] start RESTful Server...')
             api.start(args.host, args.port, args.debug)
@@ -86,14 +107,16 @@ def main():
             else:
                 # API call CLI mode
                 a_sid = args.sid
-            cli.start(args.target, args.format, args.output, args.special_rules, a_sid)
+            cli.start(args.target, args.format, args.output, args.special_rules, a_sid, args.dels)
         t2 = time.time()
         logger.info('[INIT] Done! Consume Time:{ct}s'.format(ct=t2 - t1))
+
     except Exception as e:
         err_msg = unhandled_exception_message()
         exc_msg = traceback.format_exc()
         logger.warning(exc_msg)
-        create_github_issue(err_msg, exc_msg)
+        if get_config_hash():  # 项目未被修改，提交issue
+            create_github_issue(err_msg, exc_msg)
 
 
 if __name__ == '__main__':

cobra/__version__.py

@@ -3,8 +3,8 @@
 
 __title__ = 'cobra'
 __description__ = 'Code Security Audit'
-__url__ = 'https://github.com/FeeiCN/cobra'
-__issue_page__ = 'https://github.com/FeeiCN/cobra/issues/new'
+__url__ = 'https://github.com/WhaleShark-Team/cobra'
+__issue_page__ = 'https://github.com/WhaleShark-Team/cobra/issues/new'
 __python_version__ = sys.version.split()[0]
 __platform__ = platform.platform()
 __version__ = '2.0.0-alpha.5'
@@ -18,7 +18,7 @@
     |    |   ||   ||    ,---|
     `---``---``---``    `---^ v{version}
 
-GitHub: https://github.com/FeeiCN/cobra
+GitHub: https://github.com/WhaleShark-Team/cobra
 
 Cobra is a static code analysis system that automates the detecting vulnerabilities and security issue.""".format(version=__version__)
 __epilog__ = """Usage:
@@ -29,3 +29,24 @@
   python {m} -t {tg} -f json -o http://push.to.com/api 
   python {m} -H 127.0.0.1 -P 8888
 """.format(m='cobra.py', td='tests/vulnerabilities', tg='https://github.com/ethicalhack3r/DVWA')
+
+__introduction_git__ = """
+This script can push your target to the api
+Please write cobra_ip, secret_key in config when you want to scan the specified git address
+Please write gitlab_url, private_token, cobra_ip, secret_key when you want to scan all gitlab's projects
+"""
+
+__epilog_git__ = """Usage:
+  python {m} -a
+  python {m} -a -r cvi-190001,cvi-190002
+  python {m} -a -f json -o /tmp/report.json 
+
+  python {m} -t {td}
+  python {m} -t {td},{td1}
+  python {m} -t {td},{td1} -d
+  python {m} -t {td} -r cvi-190001,cvi-190002
+  python {m} -t {td} -f json -o /tmp/report.json 
+  python {m} -t {tg} -f json -o [email protected] 
+  python {m} -t {tg} -f json -o http://push.to.com/api 
+""".format(m='git_projcets.py', td='tests/vulnerabilities', td1='tests/dvwa',
+           tg='https://github.com/ethicalhack3r/DVWA')