Merge pull request #606 from bunkerity/dev

Merge branch "dev" into branch "staging"
This commit is contained in:
Théophile Diot 2023-08-29 16:29:28 +02:00 committed by GitHub
commit ee47407dfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 94 additions and 56 deletions

View file

@ -1,6 +1,6 @@
mkdocs==1.5.2
mkdocs-material==9.2.3
mkdocs-material==9.2.5
pytablewriter==1.0.0
mike==1.1.2
jinja2<3.1.0
mkdocs-print-site-plugin==2.3.5
mkdocs-print-site-plugin==2.3.6

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine AS builder
FROM python:3.11.5-alpine AS builder
# Copy python requirements
COPY src/common/gen/requirements.txt /tmp/req/requirements.txt
@ -33,7 +33,7 @@ COPY src/common/helpers /usr/share/bunkerweb/helpers
COPY src/common/settings.json /usr/share/bunkerweb/settings.json
COPY src/common/utils /usr/share/bunkerweb/utils
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
# Set default umask to prevent huge recursive chmod increasing the final image size
RUN umask 027
@ -61,7 +61,7 @@ RUN apk add --no-cache bash && \
chmod 750 /usr/share/bunkerweb/cli/main.py /usr/share/bunkerweb/helpers/*.sh /usr/bin/bwcli /usr/share/bunkerweb/autoconf/main.py /usr/share/bunkerweb/deps/python/bin/*
# Fix CVEs
RUN apk add "libcrypto3>=3.1.1-r2" "libssl3>=3.1.1-r2"
# There are no CVE to fix for the moment
VOLUME /data /etc/nginx

View file

@ -73,7 +73,7 @@ RUN apk add --no-cache pcre bash python3 && \
ln -s /proc/1/fd/1 /var/log/bunkerweb/access.log
# Fix CVEs
RUN apk add "libx11>=1.8.4-r1" "tiff>=4.4.0-r4" "libcrypto3>=3.0.9-r2" "libssl3>=3.0.9-r2" "nghttp2-libs>=1.51.0-r1"
# There are no CVE to fix for the moment
VOLUME /data /etc/nginx

View file

@ -39,7 +39,7 @@ if [ -f "/etc/nginx/variables.env" ] ; then
log "ENTRYPOINT" "⚠️ " "Looks like BunkerWeb has already been loaded, will not generate temp config"
else
# generate "temp" config
echo -e "IS_LOADING=yes\nSERVER_NAME=\nAPI_HTTP_PORT=${API_HTTP_PORT:-5000}\nAPI_SERVER_NAME=${API_SERVER_NAME:-bwapi}\nAPI_WHITELIST_IP=${API_WHITELIST_IP:-127.0.0.0/8}\nUSE_REAL_IP=${USE_REAL_IP:-no}\nUSE_PROXY_PROTOCOL=${USE_PROXY_PROTOCOL:-no}\nREAL_IP_FROM=${REAL_IP_FROM:-192.168.0.0/16 172.16.0.0/12 10.0.0.0/8}\nREAL_IP_HEADER=${REAL_IP_HEADER:-X-Forwarded-For}\nHTTP_PORT=${HTTP_PORT:-8080}\nHTTPS_PORT=${HTTPS_PORT:-8443}" > /tmp/variables.env
echo -e "IS_LOADING=yes\nUSE_BUNKERNET=no\nSERVER_NAME=\nAPI_HTTP_PORT=${API_HTTP_PORT:-5000}\nAPI_SERVER_NAME=${API_SERVER_NAME:-bwapi}\nAPI_WHITELIST_IP=${API_WHITELIST_IP:-127.0.0.0/8}\nUSE_REAL_IP=${USE_REAL_IP:-no}\nUSE_PROXY_PROTOCOL=${USE_PROXY_PROTOCOL:-no}\nREAL_IP_FROM=${REAL_IP_FROM:-192.168.0.0/16 172.16.0.0/12 10.0.0.0/8}\nREAL_IP_HEADER=${REAL_IP_HEADER:-X-Forwarded-For}\nHTTP_PORT=${HTTP_PORT:-8080}\nHTTPS_PORT=${HTTPS_PORT:-8443}" > /tmp/variables.env
python3 /usr/share/bunkerweb/gen/main.py --variables /tmp/variables.env
fi

View file

@ -196,7 +196,9 @@ python-dotenv==1.0.0 \
--hash=sha256:f5971a9226b701070a4bf2c38c89e5a3f0d64de8debda981d1db98583009122a
# via -r requirements.in
pyyaml==6.0.1 \
--hash=sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5 \
--hash=sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc \
--hash=sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df \
--hash=sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741 \
--hash=sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206 \
--hash=sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27 \
@ -204,7 +206,10 @@ pyyaml==6.0.1 \
--hash=sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62 \
--hash=sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98 \
--hash=sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696 \
--hash=sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290 \
--hash=sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9 \
--hash=sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d \
--hash=sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6 \
--hash=sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867 \
--hash=sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47 \
--hash=sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486 \
@ -212,9 +217,12 @@ pyyaml==6.0.1 \
--hash=sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3 \
--hash=sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007 \
--hash=sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938 \
--hash=sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0 \
--hash=sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c \
--hash=sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735 \
--hash=sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d \
--hash=sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28 \
--hash=sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4 \
--hash=sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba \
--hash=sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8 \
--hash=sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5 \
@ -229,7 +237,9 @@ pyyaml==6.0.1 \
--hash=sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43 \
--hash=sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859 \
--hash=sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673 \
--hash=sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54 \
--hash=sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a \
--hash=sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b \
--hash=sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab \
--hash=sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa \
--hash=sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c \

View file

@ -101,6 +101,34 @@ function start() {
stop_nginx
# Generate temp conf for jobs and start nginx
API_HTTP_PORT="$(grep "^API_HTTP_PORT=" /etc/bunkerweb/variables.env | cut -d '=' -f 2)"
if [ "$API_HTTP_PORT" = "" ] ; then
API_HTTP_PORT="5000"
fi
API_SERVER_NAME="$(grep "^API_SERVER_NAME=" /etc/bunkerweb/variables.env | cut -d '=' -f 2)"
if [ "$API_SERVER_NAME" = "" ] ; then
API_SERVER_NAME="bwapi"
fi
API_WHITELIST_IP="$(grep "^API_WHITELIST_IP=" /etc/bunkerweb/variables.env | cut -d '=' -f 2)"
if [ "$API_WHITELIST_IP" = "" ] ; then
API_WHITELIST_IP="127.0.0.0/8"
fi
USE_REAL_IP="$(grep "^USE_REAL_IP=" /etc/bunkerweb/variables.env | cut -d '=' -f 2)"
if [ "$USE_REAL_IP" = "" ] ; then
USE_REAL_IP="no"
fi
USE_PROXY_PROTOCOL="$(grep "^USE_PROXY_PROTOCOL=" /etc/bunkerweb/variables.env | cut -d '=' -f 2)"
if [ "$USE_PROXY_PROTOCOL" = "" ] ; then
USE_PROXY_PROTOCOL="no"
fi
REAL_IP_FROM="$(grep "^REAL_IP_FROM=" /etc/bunkerweb/variables.env | cut -d '=' -f 2)"
if [ "$REAL_IP_FROM" = "" ] ; then
REAL_IP_FROM="192.168.0.0/16 172.16.0.0/12 10.0.0.0/8"
fi
REAL_IP_HEADER="$(grep "^REAL_IP_HEADER=" /etc/bunkerweb/variables.env | cut -d '=' -f 2)"
if [ "$REAL_IP_HEADER" = "" ] ; then
REAL_IP_HEADER="X-Forwarded-For"
fi
HTTP_PORT="$(grep "^HTTP_PORT=" /etc/bunkerweb/variables.env | cut -d '=' -f 2)"
if [ "$HTTP_PORT" = "" ] ; then
HTTP_PORT="8080"
@ -109,7 +137,7 @@ function start() {
if [ "$HTTPS_PORT" = "" ] ; then
HTTPS_PORT="8443"
fi
sudo -E -u nginx -g nginx /bin/bash -c "echo -ne 'IS_LOADING=yes\nUSE_BUNKERNET=no\nHTTP_PORT=${HTTP_PORT}\nHTTPS_PORT=${HTTPS_PORT}\nAPI_LISTEN_IP=127.0.0.1\nSERVER_NAME=\n' > /var/tmp/bunkerweb/tmp.env"
sudo -E -u nginx -g nginx /bin/bash -c "echo -ne 'IS_LOADING=yes\nUSE_BUNKERNET=no\nSERVER_NAME=\nAPI_HTTP_PORT=${API_HTTP_PORT}\nAPI_SERVER_NAME=${API_SERVER_NAME}\nAPI_WHITELIST_IP=${API_WHITELIST_IP}\nUSE_REAL_IP=${USE_REAL_IP}\nUSE_PROXY_PROTOCOL=${USE_PROXY_PROTOCOL}\nREAL_IP_FROM=${REAL_IP_FROM}\nREAL_IP_HEADER=${REAL_IP_HEADER}\nHTTP_PORT=${HTTP_PORT}\nHTTPS_PORT=${HTTPS_PORT}\n' > /var/tmp/bunkerweb/tmp.env"
sudo -E -u nginx -g nginx /bin/bash -c "PYTHONPATH=/usr/share/bunkerweb/deps/python/ /usr/share/bunkerweb/gen/main.py --variables /var/tmp/bunkerweb/tmp.env --no-linux-reload"
if [ $? -ne 0 ] ; then
log "SYSTEMCTL" "❌" "Error while generating config from /var/tmp/bunkerweb/tmp.env"

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine AS builder
FROM python:3.11.5-alpine AS builder
# Copy python requirements
COPY src/scheduler/requirements.txt /tmp/req/requirements.txt
@ -37,7 +37,7 @@ COPY src/common/utils /usr/share/bunkerweb/utils
COPY src/scheduler /usr/share/bunkerweb/scheduler
COPY src/VERSION /usr/share/bunkerweb/VERSION
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
# Set default umask to prevent huge recursive chmod increasing the final image size
RUN umask 027
@ -75,7 +75,7 @@ COPY --chown=root:scheduler src/bw/misc/country.mmdb /var/tmp/bunkerweb/country.
RUN chmod 770 /var/tmp/bunkerweb/asn.mmdb /var/tmp/bunkerweb/country.mmdb
# Fix CVEs
RUN apk add "libcrypto3>=3.1.1-r2" "libssl3>=3.1.1-r2"
# There are no CVE to fix for the moment
VOLUME /data /etc/nginx

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine AS builder
FROM python:3.11.5-alpine AS builder
# Copy python requirements
COPY src/ui/requirements.txt /tmp/req/requirements.txt
@ -35,7 +35,7 @@ COPY src/common/helpers /usr/share/bunkerweb/helpers
COPY src/ui /usr/share/bunkerweb/ui
COPY src/VERSION /usr/share/bunkerweb/VERSION
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
# Set default umask to prevent huge recursive chmod increasing the final image size
RUN umask 027
@ -67,7 +67,7 @@ RUN apk add --no-cache bash && \
ln -s /proc/1/fd/2 /var/log/bunkerweb/ui.log
# Fix CVEs
RUN apk add "libcrypto3>=3.1.1-r2" "libssl3>=3.1.1-r2"
# There are no CVE to fix for the moment
VOLUME /data /etc/nginx

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
# Install firefox and geckodriver
RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
# Install firefox and geckodriver
RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,2 +1,2 @@
fastapi==0.101.1
fastapi==0.103.0
uvicorn[standard]==0.23.2

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,2 +1,2 @@
fastapi==0.101.1
fastapi==0.103.0
uvicorn[standard]==0.23.2

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
# Install firefox and geckodriver
RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
# Install firefox and geckodriver
RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
# Install firefox and geckodriver
RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,2 +1,2 @@
fastapi==0.101.1
fastapi==0.103.0
uvicorn[standard]==0.23.2

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
# Install firefox and geckodriver
RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
# Install firefox and geckodriver
RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \

View file

@ -1,5 +1,5 @@
requests==2.31.0
redis==5.0.0
fastapi==0.101.1
fastapi==0.103.0
uvicorn[standard]==0.23.2
selenium==4.11.2

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
# Install firefox and geckodriver
RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \

View file

@ -1,3 +1,3 @@
requests==2.31.0
fastapi==0.101.1
fastapi==0.103.0
uvicorn[standard]==0.23.2

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
# Install firefox and geckodriver
RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,2 +1,2 @@
fastapi==0.101.1
fastapi==0.103.0
uvicorn[standard]==0.23.2

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
WORKDIR /tmp

View file

@ -1,4 +1,4 @@
FROM python:3.11.4-alpine
FROM python:3.11.5-alpine
# Install firefox and geckodriver
RUN apk add --no-cache --virtual .build-deps curl grep zip wget && \