Merge pull request #182 from LoRexxar/develop

Develop

README.md

@@ -181,7 +181,7 @@ KunLun-M Dashbroad，并且允许通过apitoken来访问api获取数据
 
 默认9999端口
 ```
-python3 .\kunlun.py web 9999
+python3 .\kunlun.py web -p 9999
 ```
 
 ![](docs/web.png)

core/core_engine/php/parser.py

@@ -733,6 +733,10 @@ def parameters_back(param, nodes, function_params=None, lineno=0,
         _is_co = 0
         _cp = None
 
+        if not node:
+            logger.warning("[AST] dataflow analysize error.")
+            return is_co, cp, expr_lineno
+
         # 加入扫描范围check, 如果当前行数大于目标行数，直接跳过(等于会不会有问题呢？)
         if node.lineno >= int(lineno) and int(lineno) != 0:
             return parameters_back(param, nodes[:-1], function_params, lineno,

core/vendors.py

@@ -286,11 +286,13 @@ def check_vendor(self):
 
                 elif filename == 'composer.json':
                     vendors = json.loads(filecontent)
+                    vendors_list = []
 
                     if not len(vendors):
                         continue
 
-                    vendors_list = vendors['require']
+                    if 'require' in vendors:
+                        vendors_list = vendors['require']
 
                     for vendor in vendors_list:
                         vendor_name = vendor.strip()

templates/dashboard/vendors/vendors_vuln_list.html

@@ -38,7 +38,13 @@ <h3 class="box-title">Vendor Vulns List</h3>
             <!-- /.box-body -->
 
             <div class="box-footer">
-
+                <ul class="pagination pagination-sm m-0 float-right">
+                  <li class="page-item"><a class="page-link" href="{% url 'dashboard:vendor_vulns_list' %}">«</a></li>
+                {% for i in page_range %}
+                  <li class="page-item {% if page == i %}active{% endif %}"><a class="page-link" href="{% url 'dashboard:vendors_list' %}?p={{ i }}">{{ i }}</a></li>
+                {% endfor %}
+                  <li class="page-item"><a class="page-link" href="{% url 'dashboard:vendor_vulns_list' %}?p={{ max_page }}">»</a></li>
+                </ul>
             </div>
           </div>
           <!-- /.box -->

web/dashboard/controller/vendor.py

@@ -131,6 +131,7 @@ def get(request):
 
             projects.append(p)
             vvulns.extend(list(vvs))
+            vvulns = list(set(vvulns))
 
         if not len(vs):
             return HttpResponseNotFound('Vendor Not Found.')