From: Alexandru Avadanii Date: Tue, 14 Apr 2020 10:38:58 +0000 (+0000) Subject: Merge "Change the criticality of OS security test" X-Git-Tag: 3.0.0 X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=commitdiff_plain;h=2865a1e803121989fa0db5fbe26c283639751fe7;hp=b6ade8b653a44400a6c509a726e23c98317e40ab Merge "Change the criticality of OS security test" --- diff --git a/.gitignore b/.gitignore index 92f8161..30c15b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ bluval/__pycache__ docker/manifest-tool +docker/os/db.tar.gz* *.sw? # Compiled class files diff --git a/docker/os/Dockerfile b/docker/os/Dockerfile index 676062d..c4d5938 100644 --- a/docker/os/Dockerfile +++ b/docker/os/Dockerfile @@ -57,10 +57,10 @@ RUN tar czvf /opt/akraino/ltp.tar.gz /opt/ltp WORKDIR /root/src RUN git clone https://github.com/CISOfy/lynis && tar czvf /opt/akraino/lynis-remote.tar.gz ./lynis -#Fetches vuls databases +# Fetches vuls databases (invalidate cache using unique timestamp) SHELL ["/bin/bash", "-c"] RUN if [ $(uname -m) == 'aarch64' ]; then HOST_ARCH=arm64; else HOST_ARCH=amd64; fi && \ - wget https://dl.google.com/go/go1.12.6.linux-$HOST_ARCH.tar.gz -P /root/ && \ + wget https://dl.google.com/go/go1.12.6.linux-$HOST_ARCH.tar.gz -P /root/ --progress=dot:giga && \ cd /root/ && \ tar -xzf go1.12.6.linux-$HOST_ARCH.tar.gz -C /root/ && \ rm go1.12.6.linux-$HOST_ARCH.tar.gz && \ @@ -76,23 +76,30 @@ RUN if [ $(uname -m) == 'aarch64' ]; then HOST_ARCH=arm64; else HOST_ARCH=amd64; git -C /root/go/src/github.com/kotakanbe clone https://github.com/kotakanbe/go-cve-dictionary.git && \ cd /root/go/src/github.com/kotakanbe/go-cve-dictionary/ && \ make install && \ - for i in $(seq 2002 "$(date +"%Y")"); do go-cve-dictionary fetchnvd -http-proxy=${HTTP_PROXY} -dbpath /opt/akraino/validation/tests/os/vuls/cve.sqlite3 -years "$i"; done && \ git -C /root/go/src/github.com/kotakanbe clone https://github.com/kotakanbe/goval-dictionary.git && \ cd /root/go/src/github.com/kotakanbe/goval-dictionary && \ make install && \ - goval-dictionary fetch-ubuntu -http-proxy=${HTTP_PROXY} -dbpath=/opt/akraino/validation/tests/os/vuls/oval_ubuntu_16.sqlite3 16 && \ - goval-dictionary fetch-ubuntu -http-proxy=${HTTP_PROXY} -dbpath=/opt/akraino/validation/tests/os/vuls/oval_ubuntu_18.sqlite3 18 && \ - goval-dictionary fetch-redhat -http-proxy=${HTTP_PROXY} -dbpath=/opt/akraino/validation/tests/os/vuls/oval_centos.sqlite3 7 && \ mkdir -p /root/go/src/github.com/knqyf263 && \ git -C /root/go/src/github.com/knqyf263 clone https://github.com/knqyf263/gost.git && \ cd /root/go/src/github.com/knqyf263/gost && \ - make install && \ - gost fetch redhat --http-proxy=${HTTP_PROXY} --dbpath=/opt/akraino/validation/tests/os/vuls/gost_centos.sqlite3 && \ + make install + +ADD db.tar.gz /opt/akraino/validation/tests/os/vuls/ +ADD db.tar.gz.timestamp /root/ +RUN \ + export GOROOT=/root/go && \ + export GOPATH=/root/go/src && \ + export PATH=$PATH:/root/go/bin:/root/go/src/bin && \ + for i in $(seq 2002 "$(date +"%Y")"); do go-cve-dictionary fetchnvd -quiet -http-proxy=${HTTP_PROXY} -dbpath /opt/akraino/validation/tests/os/vuls/cve.sqlite3 -years "$i"; done && \ + goval-dictionary fetch-ubuntu -http-proxy=${HTTP_PROXY} -dbpath=/opt/akraino/validation/tests/os/vuls/oval_ubuntu_16.sqlite3 16 && \ + goval-dictionary fetch-ubuntu -http-proxy=${HTTP_PROXY} -dbpath=/opt/akraino/validation/tests/os/vuls/oval_ubuntu_18.sqlite3 18 && \ + goval-dictionary fetch-redhat -http-proxy=${HTTP_PROXY} -dbpath=/opt/akraino/validation/tests/os/vuls/oval_centos.sqlite3 7 && \ + gost fetch redhat --http-proxy=${HTTP_PROXY} --dbpath=/opt/akraino/validation/tests/os/vuls/gost_centos.sqlite3 --threads=$(nproc) && \ cd /opt/akraino/validation/tests/os/vuls && \ tar cvzf db.tar.gz *.sqlite3 && \ rm *.sqlite3 -# Copy binaries into the final container and install robot framework +# Copy binaries into the final container and install robot framework, bluval dependencies FROM ubuntu:18.04 COPY --from=build /wheels /wheels COPY --from=build /opt/akraino/validation /opt/akraino/validation @@ -106,12 +113,11 @@ RUN apt-get update && apt-get -y install \ cd /usr/bin && ln -s python3 python && \ pip3 install -r /wheels/requirements/pip-requirements.txt \ -f /wheels && \ + pip3 install -r /opt/akraino/validation/bluval/requirements.txt && \ rm -rf /wheels && \ rm -rf /root/.cache/pip/* && \ rm -rf /var/cache/apt/* && \ rm -rf /var/lib/apt/lists/* -# Install bluval dependencies -RUN pip3 install -r /opt/akraino/validation/bluval/requirements.txt ENV LC_ALL=C.UTF-8 ENV LANG=C.UTF-8 diff --git a/docker/os/Makefile b/docker/os/Makefile index 4d43df8..5e5386b 100644 --- a/docker/os/Makefile +++ b/docker/os/Makefile @@ -14,6 +14,26 @@ # limitations under the License. # ############################################################################## +export OS_VULS_DB?=/opt/akraino/validation/tests/os/vuls/db.tar.gz + +.PHONY: .init_db_cache +.init_db_cache: + if [ ! -f $(OS_VULS_DB) ]; then \ + sudo mkdir -p $(dir $(OS_VULS_DB)); \ + sudo chown $(shell id -u):$(shell id -g) $(dir $(OS_VULS_DB)); \ + tar czf $(OS_VULS_DB) -T /dev/null; \ + fi + +.PHONY: .build +.build:: + if [ -f $(OS_VULS_DB) ]; then \ + echo DB cache file found, will be used during the build; \ + cp $(OS_VULS_DB) .; \ + else \ + tar czf $(notdir $(OS_VULS_DB)) -T /dev/null; \ + fi + date +%s > $(notdir $(OS_VULS_DB)).timestamp + .PHONY: all all: push-image .push_manifest @@ -24,3 +44,14 @@ build: .build push-image: .push_image include ../build.mk + +.PHONY: .build +.build:: + if [ -f $(OS_VULS_DB) ]; then \ + echo DB cache file found, will be updated; \ + docker run -v $(OS_VULS_DB):$(OS_VULS_DB).host \ + --rm --entrypoint cp \ + $(REGISTRY)/$(NAME):$(TAG_PRE)-$(HOST_ARCH)-$(TAG_VER) \ + $(OS_VULS_DB) $(OS_VULS_DB).host; \ + fi + rm -f $(notdir $(OS_VULS_DB))* diff --git a/docker/os/pip-requirements.txt b/docker/os/pip-requirements.txt index 6139a45..bd35f83 100644 --- a/docker/os/pip-requirements.txt +++ b/docker/os/pip-requirements.txt @@ -2,3 +2,4 @@ robotframework robotframework-httplibrary robotframework-requests robotframework-sshlibrary +cryptography>=2.5