From 90edbe285085b7788eb615a0176c895102ad776f Mon Sep 17 00:00:00 2001
From: xuzhiyi <xuzhiyi@baimaohui.net>
Date: Wed, 9 Mar 2022 11:40:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9compose?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vulfocus-api/Dockerfile            |  21 +++++++++++++++++++++
 vulfocus-api/db.sqlite3            | Bin 430080 -> 430080 bytes
 vulfocus-api/layout_image/views.py |  12 ++++++++----
 vulfocus-api/vulfocus/settings.py  |  22 ++++++++++++++++------
 4 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 vulfocus-api/Dockerfile

diff --git a/vulfocus-api/Dockerfile b/vulfocus-api/Dockerfile
new file mode 100644
index 00000000..13cb0fde
--- /dev/null
+++ b/vulfocus-api/Dockerfile
@@ -0,0 +1,21 @@
+FROM python:3
+LABEL maintainer="vulfocus" version="0.3.2.11" description="Vulfocus for Docker"
+
+RUN mkdir /vulfocus-api/
+WORKDIR /vulfocus-api/
+ADD . /vulfocus-api/
+
+ENV VUL_IP=""
+ENV EMAIL_HOST=""
+ENV EMAIL_HOST_USER=""
+ENV EMAIL_HOST_PASSWORD=""
+ENV DOCKER_URL="unix://var/run/docker.sock"
+
+
+RUN python3 -m pip install --upgrade pip -i https://pypi.tuna.tsinghua.edu.cn/simple
+RUN pip install -i https://pypi.tuna.tsinghua.edu.cn/simple some-package -r requirements.txt
+
+EXPOSE 8000
+
+CMD ["python3", "manage.py", "runserver", "0.0.0.0:8000"]
+
diff --git a/vulfocus-api/db.sqlite3 b/vulfocus-api/db.sqlite3
index 89339739171a9698381f33dba1ea618e6613937b..32d8e08d7ea80414c7fde07c833243567f07b3d0 100644
GIT binary patch
delta 1389
zcmZuwUuaWT7{5vGO)FJz+|agZ(i^9RN!R53Kj$h_YjJVY{z0Ks3Z~JfBVC)un$~}P
zh#(W6tR670qC%0qgx=}(LASD(?X?W{+$Uim*uoUV4m`1nXwH2&oO6En_x--__kE{)
zCtAJ}oj=_Yt6GL(SoSlu8bkIQ`<1<BKewNG+lo`R_pkk=u^Dv%+yz7e(!Bugg)j*K
z<_O9sE$yFUAnCd;5lpVN?9*WcaaZ=VrZkwK7`pO$>#iN2>8Y3;BOw3K(f}7+$i`^0
zKBRCNgk1JUyEK@fzy<QAmd6PpSpE~;rQuOR5s{I$*l=B%f>4)`Ltk1($G+}~?8T{>
zQYJr{{V@jsK$+}JX)1#NLI4Aifdqrv;ZtitQV{3@EU&eFRj<vdzyQjnw)l}c9w&@L
zn2K1&_KxnEbGd1y2{ZXZzLd{S=!7_dR0!D-b2LJTK*r^8EUv*I6so^BVx1aHS&E5V
zjwS1R$N_Po+#bg|8ekO3OdQr@OgXChyAWqO>>cmF_%|9%P$sbC?V8>*K`;^Wa=WGk
z#?|;@`Lta#PmEJUi3~cL8knjNV|mPp)|bv060V$ch$c;{)S&#+(X^WpMk!rPoU|Ki
zZ&Q8VNa~k^UeoGp$1~>}B3@JVW$JD<a%*L)daW;P@BbI~%W`L8zu7oz{Hiup*=bV$
zud{*0@XhX+fBQmUF{rM)!s(W9^DwO}{~TzQ3r(H=@0SA){vNtG)-#o!{(ky!aiDMa
zQQSG$TO6A0OCRbk<&K^F?oxWN@5H5_z#!;z#|M5Wz~eLh$Ip)!OXS<^=w!Z7H)P07
zB2FnMm8Je*A|b}ckf5W?&1FX+%$>=i+-WtWXON2p!|v##fnWis?Dkx%l!Jby94a}g
z)K_*TP!07&Hw^f=hSrSPjgx<>8aic}wS&L(Fm%=Ob|y9j{obdc-@bV75Lhgm5zky*
zKcL*YJ#QYdKL#?wE5R)rl#yHJLP%``0h3+{g)4<QEA5}Cn2*0!iM&j01gWk&A2v1b
f9~G^_W|ei?e>i6i;`f4y+AsIa)e+w;hS#09V!dF^

delta 2508
zcmaJ?T}%{L6rMXXJG-*NE-DTS`-f;OMV9&7`Oy$uz#t-41O-G{R#<cumPLM)h$$Eg
zwkA~^<4x1VYTML@rU_*W^CDvU(loYdiA`IZCiTIPK4_HKv=6qicb1~aPRZ__<lOI^
zbMN`iH)jT~Wer}-x_F2wzGuQP%w(HIPpsbd%=V{k&i2qYOSvs~R)$R{tTUD?WV7`g
zn6TE6`Petm7XwFN=@~E#?_2<W?Vm2thf{nuMVIHmnPHF#Kkovx*4+a#0h~SsZfKr9
z(1_FY!F(`O6^XWni`G(fbw0o%QOZqeqbI>6zRE`D<ba`LJ)uMGVLt0+u340eD$k_o
zM!%li0WY5d`S5%%xU97efI%WYYn!&vYyry_Fn%v9ZswHDoa|!-Mv_GJW~SQ!;{}Q1
z)Va(p1{kNv604Rv3Jow;_6wr=wj+0K(s_)cpyR$Y3S)Rll3CS~<x5V<upEQ1s;q*g
znB-FwfmalDG&v4o68iboAG2}|;si<HMb)0|Y+Q0p6o>92$t9~z*oG~E_E3LkZ%;7N
z5jq@Z7={amdV4y99K*3J%lLz=$SJz<Dz$nJPUIPNBzs-**)qcjvY_71c5P3JlVm~R
z*h0Gr%h(X;?G7JDXR^UaG}03ZwHqBIp%MjN-Qe^jA0+ujUXj&Cr^^82Wx>y@7o7P<
z7%%ahI^*;$?V;q8IEmra3>R+@#>$MWs6iKNgs}{(s5e}q0mkTsseiaOC1au@a-yJ0
zZiC*7ir|+e^_1J71W}d{tWLR;^d$L2NfB8|#XSZ!h!X0XsP6P+C6_LWEF-D|9>L(6
zf-DP?`jy9^-6Ajhd3oI1U^82y;S<4NG~QhJ=~iHlr^g=KMt7UW2d!RH3YsfaVkiE*
z6WBkD>Hkaj)3mf0^~e@~_V|-QJdh1%E&wNNjDb|z(r4PEkApJ>iE+@~-yO8{VPC-Z
z7<fG~cot6^4NaS`spY1NhNl}3mlR$4i)M?4X3GzE>)WH{Y*~Og-g&&LZhd{<-hE|a
z!;!uYu~OMp*IrqDELwYXclExG+Q7-fU0g$pSYK6kG*%)8ibAa&k!X^VdD$oWMaD0~
z+i&1ruhgc<V%Q(%!z_By!Yv9H3Wr)+!vcDDSeD}^cjHk8FLuDL3BqGx=U-A~1P<aF
z93*-?VDkdGSH_64to|B(j<$wRc6YT$dcr|s4(prW)0)PJCKE|J96-B0L7X+=Ek%0L
zjj&lGQsC?dq{F%u!@wQ7s0a+_LZFg<Pz<lXPdeduSIIPJze-wQew;{!2Sz{+{Ow)T
zpGVzb1-z+}e`!@y#I04JXyGz?OJi10yu=PH*yAy)9hAPbNN=2MHrq|*NF4LqNF2Bw
zf{SFijZV1>PSXVi;H{0+eLPhwe2-j#Yt5I)8w9MLBJPnGM%F{$En>adKSWS;MQ-B5
zqiuxbgV)k`qLh_rZAYsFtw6lmzScs88!5WKCgEsGh!s|Agxefs=Z(=R!n5Y=z<x7b
zQv=Qg6Uuw(wkTrFj?z8b0=3(`wSkhI+q~;uIIYuu86%zoYu->>gPDG_0-Q;Q%rub?
z8z+g?&@xH5;m9=M*Ueq10-^+dHc8y2FbqG|S@EJXHh5DbyjD~Io<>(xfRS{)GcNf3
z7(v1FV}u)&%=aj$5o`1lM*+x#b8%wInTm?V?D_-KIoN^LVh&QxRJeIr4s=2?s)ngx
zf`oUvmm#5YITB9eWZqC+6U>_?eo7f?J7~zpb)AEcUvThkG6$##Jf?GSZtqeKcD%~L
zQ^dje6RX`+g=(JHp!&RX<qF;0`rp<=o324qH8ST_yJ#AX$8fub$4u=ji3Kr1B&JQ;
z#DHlZpW29G_M_E+Rvpst?>40M^aIFRiagMfjDrX<LhtLSqY0t^=kcrV;R+&;<-C5j
SjSrIckH{y@8X2Sh_WTR1W~Ju<

diff --git a/vulfocus-api/layout_image/views.py b/vulfocus-api/layout_image/views.py
index 9775378a..6daf4d57 100644
--- a/vulfocus-api/layout_image/views.py
+++ b/vulfocus-api/layout_image/views.py
@@ -1359,7 +1359,8 @@ def upload_zip_file(request):
                         for single_network in docker_networks:
                             config_list = single_network.attrs['IPAM']['Config']
                             for single_config in config_list:
-                                network_list.append(single_config["Gateway"].split(".")[0:2])
+                                if "Gateway" in single_config:
+                                    network_list.append(single_config["Gateway"].split(".")[0:2])
                             if single_network.name == network_name:
                                 network_name_temp = network_name
                                 network_name = str(uuid.uuid4())
@@ -1392,7 +1393,8 @@ def upload_zip_file(request):
                                 return JsonResponse({"code": 400, "msg": "编排环境中子网或者网关设置错误"})
                             net_work_client_id = str(net_work.id)
                             if not gateway:
-                                gateway = net_work.attrs['IPAM']['Config']['Gateway']
+                                if "Gateway" in net_work.attrs['IPAM']['Config']:
+                                    gateway = net_work.attrs['IPAM']['Config']['Gateway']
                             created_network = NetWorkInfo(net_work_id=str(uuid.uuid4()),
                                                             net_work_client_id=net_work_client_id,
                                                             create_user=user.id,
@@ -1646,7 +1648,8 @@ def download_official_website_layout(request):
             for single_network in docker_networks:
                 config_list = single_network.attrs['IPAM']['Config']
                 for single_config in config_list:
-                    network_list.append(single_config["Gateway"].split(".")[0:2])
+                    if "Gateway" in single_config:
+                        network_list.append(single_config["Gateway"].split(".")[0:2])
                 if single_network.name == network_name:
                     network_name_temp = network_name
                     network_name = str(uuid.uuid4())
@@ -1679,7 +1682,8 @@ def download_official_website_layout(request):
                     return JsonResponse({"code": 400, "msg": "编排环境中子网或者网关设置错误"})
                 net_work_client_id = str(net_work.id)
                 if not gateway:
-                    gateway = net_work.attrs['IPAM']['Config']['Gateway']
+                    if "Gateway" in net_work.attrs['IPAM']['Config']:
+                        gateway = net_work.attrs['IPAM']['Config']['Gateway']
                 created_network = NetWorkInfo(net_work_id=str(uuid.uuid4()),
                                               net_work_client_id=net_work_client_id,
                                               create_user=user.id,
diff --git a/vulfocus-api/vulfocus/settings.py b/vulfocus-api/vulfocus/settings.py
index cbed8a29..3ee597c8 100644
--- a/vulfocus-api/vulfocus/settings.py
+++ b/vulfocus-api/vulfocus/settings.py
@@ -62,18 +62,28 @@
     'notice',
 ]
 
-# redis host
-REDIS_HOST = "127.0.0.1"
+REDIS_HOST = os.environ.get('REDIS_HOST')
+if not REDIS_HOST or REDIS_HOST == '':
+    REDIS_HOST = "127.0.0.1"
+
 # redis port
-REDIS_PORT = 6379
+REDIS_PORT = os.environ.get('REDIS_PORT')
+if not REDIS_PORT or REDIS_PORT == '' or REDIS_PORT == 0:
+    REDIS_PORT = "6379"
+
 # redis pass
-REDIS_PASS = ""
+REDIS_PASS = os.environ.get('REDIS_PASS')
+if not REDIS_PASS or REDIS_PASS == '':
+    REDIS_PASS = ""
+
 if REDIS_PASS:
     CELERY_BROKER_URL = "redis://:%s@%s:%s/0" % (REDIS_PASS, str(REDIS_HOST), str(REDIS_PORT))
-    REDIS_POOL = redis.ConnectionPool(host=REDIS_HOST, port=int(REDIS_PORT), password=REDIS_PASS, decode_responses=True, db=1)
+    REDIS_POOL = redis.ConnectionPool(host=REDIS_HOST, port=int(REDIS_PORT), password=REDIS_PASS, decode_responses=True,
+                                      db=1)
 else:
     CELERY_BROKER_URL = 'redis://%s:%s/0' % (REDIS_HOST, str(REDIS_PORT))
-    REDIS_POOL = redis.ConnectionPool(host=REDIS_HOST, port=int(REDIS_PORT), decode_responses=True,db=1)
+    REDIS_POOL = redis.ConnectionPool(host=REDIS_HOST, port=int(REDIS_PORT), decode_responses=True, db=1)
+
 if REDIS_PASS:
     REDIS_IMG = redis.Redis(host=REDIS_HOST, port=int(REDIS_PORT), password=REDIS_PASS, db=6, decode_responses=True)
     REDIS_USER_CACHE = redis.Redis(host=REDIS_HOST, port=int(REDIS_PORT), password=REDIS_PASS, db=7, decode_responses=True)