Merge pull request #396 from HXSecurity/Bidaya0-patch-dockerfile

Bidaya0 patch dockerfile
HXSecurity · Jan 14, 2022 · 4f7bd45 · 4f7bd45
2 parents bce3256 + 0169919
commit 4f7bd45
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -7,7 +7,11 @@ ENV TZ=Asia/Shanghai
 RUN curl -fsSL https://nginx.org/keys/nginx_signing.key | apt-key add - \
     && apt-key fingerprint ABF5BD827BD9BF62 \
     && apt-get update -y \
-    && apt install -y libc6-dev unzip  vim cron swig
+    && apt install -y libc6-dev unzip curl vim cron swig
+
+RUN curl -L https://github.com/Endava/cats/releases/download/cats-7.0.1/cats-linux -o  /usr/local/bin/cats \
+	&& chmod +x /usr/local/bin/cats \
+	&& ln -s /usr/local/bin/cats /usr/bin/cats
 
 COPY requirements-prod.txt /opt/dongtai/webapi/requirements.txt
 RUN pip3 install -r /opt/dongtai/webapi/requirements.txt

diff --git a/DockerfileDev b/DockerfileDev
@@ -6,7 +6,11 @@ ENV TZ=Asia/Shanghai
 ENV debug=true
 
 RUN apt-get update -y \
-		&& apt install -y  gcc make cmake libmariadb-dev
+		&& apt install -y  gcc make cmake libmariadb-dev curl
+
+RUN curl -L https://github.com/Endava/cats/releases/download/cats-7.0.1/cats-linux -o  /usr/local/bin/cats \
+	&& chmod +x /usr/local/bin/cats \
+	&& ln -s /usr/local/bin/cats /usr/bin/cats
 
 
 COPY requirements-test.txt /opt/dongtai/webapi/requirements.txt

diff --git a/DockerfileTest b/DockerfileTest
@@ -10,15 +10,16 @@ RUN curl -fsSL https://nginx.org/keys/nginx_signing.key | apt-key add - \
     && apt-get update -y \
     && apt install -y libc6-dev unzip curl vim cron swig gcc make cmake
 
+RUN curl -L https://github.com/Endava/cats/releases/download/cats-7.0.1/cats-linux -o  /usr/local/bin/cats \
+	&& chmod +x /usr/local/bin/cats \
+	&& ln -s /usr/local/bin/cats /usr/bin/cats
+
 COPY dongtai-agent-python.tar.gz /tmp/dongtai-agent-python.tar.gz
 RUN pip3 install /tmp/dongtai-agent-python.tar.gz
 
 COPY requirements-test.txt /opt/dongtai/webapi/requirements.txt
 RUN pip3 install --upgrade pip  &&  pip3 install -r /opt/dongtai/webapi/requirements.txt
 
-RUN curl -L https://github.com/Endava/cats/releases/download/cats-7.0.1/cats-linux -o  /usr/local/bin/cats \
-	&& chmod +x /usr/local/bin/cats \
-	&& ln -s /usr/local/bin/cats /usr/bin/cats
 
 COPY . /opt/dongtai/webapi
 WORKDIR /opt/dongtai/webapi

diff --git a/iast/views/project_detail.py b/iast/views/project_detail.py
@@ -77,7 +77,7 @@ def get(self, request, id):
                 "vul_validation": project.vul_validation,
                 'base_url':project.base_url,
                 "test_req_header_key":project.test_req_header_key,
-                "test_req_header_value":project.test_req_header_values,
+                "test_req_header_value":project.test_req_header_value,
             })
         else:
             return R.failure(status=203, msg=_('no permission'))