Merge pull request #131 from fofapro/0.3.1.1

0.3.1.1

CHANGELOG.md

@@ -1,5 +1,13 @@
 ## 更新日志
 
+### v0.3.1.1
+
+更新时间：2020-09-04
+
+- 新增 8 个镜像
+- 新增内置 83 个镜像
+- 修复一些 BUG
+
 ### v0.2.3
 
 更新时间：2020-07-02

Dockerfile

@@ -1,5 +1,5 @@
 FROM python:3
-LABEL maintainer="r4v3zn <[email protected]>" version="0.2.3" description="Vulfocus for Docker"
+LABEL maintainer="r4v3zn <[email protected]>" version="0.3.1.1" description="Vulfocus for Docker"
 EXPOSE 80
 RUN mkdir /vulfocus-api/
 WORKDIR /vulfocus-api/

images/README.md

@@ -4,7 +4,15 @@ Vulfocus 镜像维护目录，该目录中存储 Vulfocus 所有的 Dockerfile 
 
 | 漏洞名称         | 拉取命令                                  | 描述             |贡献者|
 | :--------------- | :--------------------------------------------------- | :--------------- |:--------------- |
-|CVE-2020-3396|`docker pull vulfocus/confluence-cve_2020_3396`|CVE-2020-3396|[Vulfocus](https://github.com/fofapro/vulfocus)|
+|Struts2-059 命令执行 CVE-2019-0230|`docker pull vulfocus/struts059-cve_2019_0230`|CVE-2019-0230|[Vulfocus](https://github.com/fofapro/vulfocus)|
+|CVE-2020-10199|`docker pull vulfocus/nexus-cve_2020_10199`|CVE-2020-10199|[Vulfocus](https://github.com/fofapro/vulfocus)|
+|CVE-2017-7494|`docker pull vulfocus/samba-cve_2017_7494`|CVE-2017-7494|[Vulfocus](https://github.com/fofapro/vulfocus)|
+|CVE-2017-4971|`docker pull vulfocus/spring-cve_2017_4971`|CVE-2017-4971|[Vulfocus](https://github.com/fofapro/vulfocus)|
+|CVE-2018-1273|`docker pull vulfocus/spring-cve_2018_1273`|CVE-2018-1273|[Vulfocus](https://github.com/fofapro/vulfocus)|
+|CVE-2015-8103|`docker pull vulfocus/jenkins-cve_2015_8103`|CVE-2015-8103|[Vulfocus](https://github.com/fofapro/vulfocus)|
+|CVE-2020-10204|`docker pull vulfocus/nexus-cve_2020_10204`|CVE-2020-10204|[Vulfocus](https://github.com/fofapro/vulfocus)|
+|thinkphp-2x-rce|`docker pull vulfocus/thinkphp-2x-rce`|thinkphp-2x-rce|[Vulfocus](https://github.com/fofapro/vulfocus)|
+|CVE-2019-3396|`docker pull vulfocus/confluence-cve_2019_3396`|CVE-2019-3396|[Vulfocus](https://github.com/fofapro/vulfocus)|
 |CVE-2020-11996|`docker pull vulfocus/tomcat-cve_2020_11996`|CVE-2020-11996|[Vulfocus](https://github.com/fofapro/vulfocus)|
 |CVE-2020-1948|`docker pull vulfocus/dubbo-cve_2020_1948`|CVE-2020-1948|[Vulfocus](https://github.com/fofapro/vulfocus)|
 |CVE-2020-9480|`docker pull vulfocus/apache_spark-cve_2020_9480`|CVE-2020-9480|[Vulfocus](https://github.com/fofapro/vulfocus)|
@@ -90,9 +98,20 @@ Vulfocus 镜像维护目录，该目录中存储 Vulfocus 所有的 Dockerfile 
 
 ## 镜像新增日志
 
+2020-09-04
+
+- vulfocus/struts059-cve_2019_0230
+- vulfocus/nexus-cve_2020_10199
+- vulfocus/samba-cve_2017_7494
+- vulfocus/spring-cve_2017_4971
+- vulfocus/spring-cve_2018_1273
+- vulfocus/jenkins-cve_2015_8103
+- vulfocus/nexus-cve_2020_10204
+- vulfocus/thinkphp-2x-rce
+
 2020-07-01
 
-- vulfocus/confluence-cve_2020_3396
+- vulfocus/confluence-cve_2019_3396
 - vulfocus/tomcat-cve_2020_11996
 - vulfocus/dubbo-cve_2020_1948
 

vulfocus-api/tasks/tasks.py

@@ -67,6 +67,8 @@ def create_image_task(image_info, user_info, request_ip, image_file=None):
                     image_name = repo_tags[0]
                     image_port = ",".join(ports)
                     image_info = ImageInfo.objects.filter(image_name=image_name).first()
+                    if not image_info:
+                        image_info = ImageInfo()
                     image_info.image_name = image_name
                     image_info.image_port = image_port
                     # image_vul_name
@@ -81,7 +83,7 @@ def create_image_task(image_info, user_info, request_ip, image_file=None):
                     task_info.task_status = 3
                     task_msg = R.ok(data="%s 添加成功" % (image_name, ))
             except Exception as e:
-                # traceback.print_exc()
+                traceback.print_exc()
                 task_msg = R.err()
                 try:
                     image_info.delete()
@@ -630,7 +632,7 @@ def share_image(task_id):
                 last_info = line
             print("last_info")
             print("==========================")
-            print(json.dumps(last_info,ensure_ascii=False))
+            print(json.dumps(last_info, ensure_ascii=False))
             if "error" in last_info and last_info["error"]:
                 task_info.task_msg = R.build(msg="原%s构建新镜像%s失败，错误信息：%s" % (image_name, new_image_name, str(last_info["error"]),))
                 task_info.task_status = 4

vulfocus-frontend/.env.development

@@ -3,8 +3,8 @@ ENV = 'development'
 
 # base api
 #VUE_APP_BASE_API = '/dev-api'
-#VUE_APP_BASE_API = 'http://127.0.0.1:8000'
-VUE_APP_BASE_API = 'http://10.10.10.172:8000'
+VUE_APP_BASE_API = 'http://127.0.0.1:8000'
+#VUE_APP_BASE_API = 'http://10.10.10.172:8000'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
 # It only does one thing by converting all import() to require().