Merge pull request #560 from 40huo/develop

fix #552
FeeiCN · Sep 7, 2017 · 1bdc6a6 · 1bdc6a6
2 parents 2d979c5 + 93973f0
commit 1bdc6a6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 22 deletions.
diff --git a/cobra/api.py b/cobra/api.py
@@ -167,7 +167,7 @@ def post():
                 'msg': 'success',
                 'sid': sid,
                 'status': result.get('status'),
-                'report': result.get('report'),
+                'report': request.url_root + result.get('report'),
                 'still_running': result.get('still_running'),
                 'total_target_num': r_data.get('total_target_num'),
                 'not_finished': int(r_data.get('total_target_num')) - len(r_data.get('sids'))
@@ -312,7 +312,6 @@ def summary():
                                key=key)
 
     status_url = 'http://{host}:{port}/api/status'.format(host=running_host, port=running_port)
-    logger.critical(status_url)
     post_data = {
         'key': key,
         'sid': a_sid,
@@ -340,7 +339,6 @@ def summary():
                 elif len(split_target) == 2:
                     target, branch = target_str, 'master'
                 else:
-                    logger.critical('[API] Target url exception: {u}'.format(u=target_str))
                     target, branch = target_str, 'master'
                 still_running[s_sid] = {'target': target,
                                         'branch': branch}
@@ -373,7 +371,6 @@ def summary():
                 elif len(split_target) == 2:
                     target, branch = target_str, 'master'
                 else:
-                    logger.critical('Target url exception: {u}'.format(u=target_str))
                     target, branch = target_str, 'master'
 
                 target_info.update({

diff --git a/cobra/export.py b/cobra/export.py
@@ -14,7 +14,7 @@
 import csv
 import json
 import os
-from codecs import open,BOM_UTF8
+from codecs import open, BOM_UTF8
 
 from prettytable import PrettyTable
 

diff --git a/cobra/templates/asset/js/report.js b/cobra/templates/asset/js/report.js
@@ -108,7 +108,7 @@ $(function () {
                                 $('.commit-author').text('@' + data.commit_author);
                                 $('.commit-time').text('@' + data.commit_time);
                                 $('.v-level').text(score2level[data.level]);
-                                $('.v-type').text(data.rule_name);
+                                $('.v-type').text('CVI-' + data.id + ' ' + data.rule_name);
                                 $('.v-solution').text(data.solution);
                                 // $('.v-rule').text(data.match_result);
                             }
@@ -341,8 +341,8 @@ $(function () {
                                 ' data-start="1" data-line="1">' +
                                 '<strong>MVE-' + (i + 1) + '</strong><br><span>' + list[i].file_path + line + '</span><br>' +
                                 '<span class="issue-information">' +
-                                '<small>' +
-                                ' => ' + list[i].commit_time +
+                                '<small>' + 'CVI-' + list[i].id +
+                                ' => ' + list[i].rule_name +
                                 '</small>' +
                                 '</span>' +
                                 '</li>';

diff --git a/docs/api.md b/docs/api.md
@@ -20,7 +20,8 @@
     "code": 1001, # 状态码为1001则表示逻辑处理正常
     "result": {
         "msg": "Add scan job successfully.", # 消息
-        "sid": "afbe69gxpy6h" # 扫描的任务ID（调用任务状态查询时需要用到）
+        "sid": "a938e2y2vnkf", # 扫描的任务ID（调用任务状态查询时需要用到）
+        "total_target_num": 1 # 扫描任务的项目总数
     }
 }
 ```
@@ -45,9 +46,12 @@
     "code": 1001, # 状态码为1001则表示逻辑处理正常
     "result": {
         "msg": "success", # 消息
+        "not_finished": 0, # 未完成的项目数
+        "report": "http://127.0.0.1/?sid=ae3ea90pkoo5", # 扫描报告页
+        "sid": "ae3ea90pkoo5", # 扫描的任务ID
         "status": "done", # 扫描状态
-        "report": "?sid=afbe69v8jjme", # 扫描报告页
-        "sid": "sfbe69y2sjge" # 扫描的任务ID
+        "still_running": {}, # 正在扫描的项目
+        "total_target_num": 1, # 扫描任务的项目总数
     }
 }
 ```
@@ -69,24 +73,14 @@ curl -H "Content-Type: application/json" -X POST -d '{"key":"your_secret_key", "
 
 ## 查询任务状态
 ```bash
-curl -H "Content-Type: application/json" -X POST -d '{"key":"your_secret_key","sid": "e3ea91nd1f4"}' http://127.0.0.1/api/status
-```
-
-## 查询扫描报告
-```bash
-curl -H "Content-Type: application/json" -X POST -d '{"key":"your_secret_key","task_id": "your_task_id"}' http://127.0.0.1/api/report
+curl -H "Content-Type: application/json" -X POST -d '{"key":"your_secret_key","sid": "a938e29vdse8"}' http://127.0.0.1/api/status
 ```
 
 # Web 报告页
 
-## 任务汇总报告
 ```
 http://127.0.0.1/?sid=afbe69p7dxva
 ```
 
-## 扫描详情报告
-```
-http://127.0.0.1/report/afbe69p7dxva/sfbe69plo5qs
-```
 ---
 下一章：[高级功能配置](https://wufeifei.github.io/cobra/config)