Skip to content

CASSANDRA-18671: New git and prefetch OWASP db to docker image #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

CASSANDRA-18671: New git and prefetch OWASP db to docker image #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b82ee57
Use the newest git
jacek-lewandowski Jul 17, 2023
3ff644e
Prefetch OWASP database
jacek-lewandowski Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions docker/testing/build-owasp-db.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<project basedir="." default="dependency-check-update" name="dependency-check-update">

<property name="dependency-check.version" value="8.3.1"/>
<property name="dependency-check.home.base" value="${basedir}/plugin"/>
<property name="dependency-check.home" value="${basedir}/plugin/dependency-check-ant"/>
<property name="owasp.data.dir" value="${user.home}/.cache/cassandra-owasp/dependency-check-ant"/>

<condition property="is.dependency.check.jar">
<available file="${dependency-check.home}/dependency-check-ant.jar" type="file" />
</condition>

<target name="dependency-check-download"
description="Fetch OWASP Dependency checker"
unless="is.dependency.check.jar">

<echo>Downloading OWASP Dependency checks ...</echo>

<mkdir dir="${dependency-check.home.base}"/>

<retry retrycount="3" retrydelay="10" >
<get src="https://github.com/jeremylong/DependencyCheck/releases/download/v${dependency-check.version}/dependency-check-ant-${dependency-check.version}-release.zip"
dest="${dependency-check.home.base}/dependency-check-ant-${dependency-check.version}-release.zip"/>
</retry>

<unzip src="${dependency-check.home.base}/dependency-check-ant-${dependency-check.version}-release.zip" dest="${dependency-check.home.base}"/>
</target>

<target name="dependency-check-update" description="Dependency-Check Update" depends="dependency-check-download">
<path id="dependency-check.path">
<pathelement location="${dependency-check.home}/dependency-check-ant.jar"/>
<fileset dir="${dependency-check.home}/lib">
<include name="*.jar"/>
</fileset>
</path>

<taskdef resource="dependency-check-taskdefs.properties">
<classpath refid="dependency-check.path" />
</taskdef>

<dependency-check-update dataDirectory="${owasp.data.dir}"/>
</target>

</project>
14 changes: 13 additions & 1 deletion docker/testing/ubuntu2004_j11.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,16 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get install -y --no-install-recommends software-properties-common apt-utils vim && \
apt-get install -y lsof

# We need git 2.30.0+ to support --merge-base in diff command; Ubuntu 20.04 has 2.25.1
RUN export DEBIAN_FRONTEND=noninteractive && \
add-apt-repository ppa:git-core/ppa && \
apt-get update && \
apt-get install -y git

RUN export DEBIAN_FRONTEND=noninteractive && \
add-apt-repository -y ppa:deadsnakes/ppa && \
apt-get update && \
apt-get install -y curl git-core python2.7 python-dev python3-pip \
apt-get install -y curl python2.7 python-dev python3-pip \
python3.6 python3.6-venv python3.6-dev \
python3.7 python3.7-venv python3.7-dev \
python3.8 python3.8-venv python3.8-dev \
Expand Down Expand Up @@ -161,6 +167,12 @@ RUN chown cassandra:cassandra ~/.ssh
RUN chown cassandra:cassandra ~/.ssh/config
RUN chmod 600 ~/.ssh/config

# Fetch the OWASP database
RUN mkdir -p /home/cassandra/dependency-check
COPY build-owasp-db.xml /home/cassandra/dependency-check/build.xml
RUN cd /home/cassandra/dependency-check && ant -f build.xml -Dowasp.data.dir=/home/cassandra/.cache/cassandra-owasp/dependency-check-ant && chown -R cassandra:cassandra /home/cassandra/.cache
RUN rm -rf /home/cassandra/dependency-check

# mark "/tmp" as a volume so it will get mounted as an ext4 mount and not
# the stupid aufs/CoW stuff that the actual docker container mounts will have.
# we've been seeing 3+ minute hangs when calling sync on an aufs backed mount
Expand Down