-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into USAGOV-1979-use-cdn-with-waf-for-stage
- Loading branch information
Showing
116 changed files
with
2,099 additions
and
3,035 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| ARG ubuntu_version="jammy" | ||
| FROM ubuntu:${ubuntu_version} | ||
|
|
||
| LABEL maintainer="USA.gov Web Ops" | ||
|
|
||
| ENV modsecurity_nginx_version="1.0.3" | ||
| ENV nginx_version="1.27.2" | ||
|
|
||
| ARG GITBRANCH | ||
| ENV GITBRANCH ${GITBRANCH:-none} | ||
|
|
||
| ARG GITCOMMIT | ||
| ENV GITCOMMIT ${GITCOMMIT:-none} | ||
|
|
||
| ARG GITTAG | ||
| ENV GITTAG ${GITTAG:-none} | ||
|
|
||
| ENV APP_NAME=USAGov \ | ||
| PARANOIA=2 \ | ||
| ANOMALY_INBOUND=5 \ | ||
| ANOMALY_OUTBOUND=4 \ | ||
| NGINX_KEEPALIVE_TIMEOUT=60s \ | ||
| ERRORLOG=/var/log/nginx/error.log \ | ||
| LOGLEVEL=warn \ | ||
| USER=nginx \ | ||
| PORT=80 \ | ||
| SERVERNAME=locahost \ | ||
| WORKER_CONNECTIONS=1024 \ | ||
| MODSEC_DEFAULT_PHASE1_ACTION="phase:1,pass,log,tag:'\${MODSEC_TAG}'" \ | ||
| MODSEC_DEFAULT_PHASE2_ACTION="phase:2,pass,log,tag:'\${MODSEC_TAG}'" \ | ||
| MODSEC_RULE_ENGINE=on \ | ||
| MODSEC_REQ_BODY_ACCESS=on \ | ||
| MODSEC_REQ_BODY_LIMIT=13107200 \ | ||
| MODSEC_REQ_BODY_NOFILES_LIMIT=131072 \ | ||
| MODSEC_RESP_BODY_ACCESS=on \ | ||
| MODSEC_RESP_BODY_LIMIT=1048576 \ | ||
| MODSEC_PCRE_MATCH_LIMIT=500000 \ | ||
| MODSEC_PCRE_MATCH_LIMIT_RECURSION=500000 | ||
|
|
||
| # RUN sed -i 's/^# deb-src./deb-src /' /etc/apt/sources.list | ||
| RUN sed -i 's/https/http/g' /etc/apk/repositories | ||
|
|
||
| RUN apk upgrade --update && \ | ||
| apk add bash \ | ||
| curl \ | ||
| gettext \ | ||
| inotify-tools \ | ||
| jq \ | ||
| make \ | ||
| nano \ | ||
| sed \ | ||
| tar \ | ||
| vim \ | ||
| wget | ||
|
|
||
| # hadolint ignore=DL3008,SC2016 | ||
| RUN set -eux; \ | ||
| apk add --no-cache \ | ||
| ca-certificates; | ||
|
|
||
| ARG modsecurity_path=/usr/local/src/modsecurity_nginx | ||
| RUN mkdir -p ${modsecurity_path} | ||
| WORKDIR ${modsecurity_path} | ||
| RUN wget https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v${modsecurity_nginx_version}.tar.gz | ||
| RUN tar -xf v${modsecurity_nginx_version}.tar.gz && \ | ||
| rm -f v${modsecurity_nginx_version}.tar.gz | ||
|
|
||
| WORKDIR /usr/share/nginx/src/ | ||
| # RUN apk add --virtual .build-deps nginx | ||
|
|
||
| # RUN wget https://nginx.org/download/nginx-${nginx_version}.tar.gz && \ | ||
| # tar -xf nginx-${nginx_version}.tar.gz && \ | ||
| # rm -f nginx-${nginx_version}.tar.gz | ||
|
|
||
| # WORKDIR /usr/share/nginx/src/nginx-${nginx_version} | ||
|
|
||
| # RUN ./configure --add-dynamic-module=${modsecurity_path}/ModSecurity-nginx-${modsecurity_nginx_version} --with-compat && \ | ||
| # make modules && \ | ||
| # cp ./objs/ngx_http_modsecurity_module.so /ngx_http_modsecurity_module.so | ||
|
|
||
| # RUN apk del .build-deps | ||
|
|
||
| COPY src-waf/docker-entrypoint-waf.sh / | ||
| COPY src-waf/etc/ /etc/ | ||
| COPY src-waf/opt/ /opt/ | ||
| RUN rm -rf /opt/owasp-crs/tests; | ||
|
|
||
| RUN set -eux; \ | ||
| mkdir /var/log/modsecurity && \ | ||
| touch /var/log/modsecurity/modsec_audit.log; | ||
|
|
||
| COPY src-waf/opt/owasp-crs/modsecurity.conf /etc/modsecurity.d/modsecurity.conf | ||
| COPY src-waf/opt/owasp-crs/modsecurity-override.conf /etc/modsecurity.d/modsecurity-override.conf | ||
| COPY src-waf/opt/owasp-crs/setup.conf /etc/modsecurity.d/setup.conf | ||
| COPY src-waf/cert-watcher.sh /cert-watcher.sh | ||
|
|
||
| COPY motd /etc/motd | ||
|
|
||
| RUN echo " built:" $(date) >> /etc/motd \ | ||
| && echo " branch: " $GITBRANCH >> /etc/motd \ | ||
| && echo " gittag: " $GITTAG >> /etc/motd \ | ||
| && echo " commit: " $GITCOMMIT >> /etc/motd \ | ||
| && echo >> /etc/motd | ||
|
|
||
| HEALTHCHECK CMD pgrep "nginx: master process" | ||
|
|
||
| ENTRYPOINT ["/docker-entrypoint-waf.sh"] | ||
| CMD ["/usr/sbin/nginx", "-g", "daemon off;"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| ARG modsecurity_nginx_version="1.0.3" | ||
| ARG nginx_version="1.27.2" | ||
| ARG ubuntu_version="jammy" | ||
|
|
||
| FROM docker.io/ubuntu:${ubuntu_version} | ||
|
|
||
| ARG modsecurity_nginx_version | ||
| ARG nginx_version | ||
|
|
||
| RUN sed -i 's/^# deb-src./deb-src /' /etc/apt/sources.list | ||
|
|
||
| RUN apt-get update && \ | ||
| apt-get install -y \ | ||
| autoconf \ | ||
| automake \ | ||
| build-essential \ | ||
| doxygen \ | ||
| dpkg-dev \ | ||
| gcc \ | ||
| gettext \ | ||
| libcurl4 \ | ||
| libcurl4-openssl-dev \ | ||
| libfuzzy-dev \ | ||
| libgeoip-dev \ | ||
| liblua5.3-dev \ | ||
| libmodsecurity3 \ | ||
| libmodsecurity-dev \ | ||
| libpcre2-dev \ | ||
| libpcre3 \ | ||
| libpcre3-dev \ | ||
| libtool \ | ||
| libxml2 \ | ||
| libxml2-dev \ | ||
| libyajl-dev \ | ||
| make \ | ||
| pkg-config \ | ||
| software-properties-common \ | ||
| ssdeep \ | ||
| uuid-dev \ | ||
| wget | ||
|
|
||
| ARG modsecurity_path=/usr/local/src/modsecurity_nginx | ||
| RUN mkdir -p ${modsecurity_path} | ||
| WORKDIR ${modsecurity_path} | ||
| RUN wget https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v${modsecurity_nginx_version}.tar.gz | ||
| RUN tar -xf v${modsecurity_nginx_version}.tar.gz && \ | ||
| rm -f v${modsecurity_nginx_version}.tar.gz | ||
|
|
||
| WORKDIR /usr/share/nginx/src/ | ||
| RUN apt-get build-dep -y nginx | ||
|
|
||
| RUN wget https://nginx.org/download/nginx-${nginx_version}.tar.gz && \ | ||
| tar -xf nginx-${nginx_version}.tar.gz && \ | ||
| rm -f nginx-${nginx_version}.tar.gz | ||
|
|
||
| WORKDIR /usr/share/nginx/src/nginx-${nginx_version} | ||
|
|
||
| RUN ./configure --add-dynamic-module=${modsecurity_path}/ModSecurity-nginx-${modsecurity_nginx_version} --with-compat && \ | ||
| make modules && \ | ||
| cp ./objs/ngx_http_modsecurity_module.so /ngx_http_modsecurity_module.so | ||
|
|
||
| HEALTHCHECK NONE | ||
| USER nginx |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.