Skip to content
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

Jump to bottom

Improve container security #97

Merged
merged 2 commits into from
Jul 26, 2022
Merged

Improve container security #97

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a665eb
Improve container security
flavioheleno Jul 18, 2022
b929637
Remove obsolete/uneeded headers suggested by code review
flavioheleno Jul 22, 2022
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
21 changes: 17 additions & 4 deletions docker/nginx/default.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
server {
listen 80 default_server;
listen 80 default_server reuseport;
okiedork marked this conversation as resolved.
Show resolved Hide resolved

keepalive_timeout 70;

index index.php;

location / {
root /usr/share/nginx/html;
try_files $uri /index.php$is_args$args;
root /usr/share/nginx/html;
try_files $uri /index.php$is_args$args;

# security headers
add_header X-XSS-Protection "1; mode=block" always;
okiedork marked this conversation as resolved.
Show resolved Hide resolved
add_header X-Content-Type-Options "nosniff" always;
okiedork marked this conversation as resolved.
Show resolved Hide resolved
add_header Referrer-Policy "no-referrer-when-downgrade" always;
add_header Content-Security-Policy "default-src 'self' http: https: ws: wss: data: blob: 'unsafe-inline'; frame-ancestors 'self';" always;
add_header Permissions-Policy "interest-cohort=()" always;
okiedork marked this conversation as resolved.
Show resolved Hide resolved
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
flavioheleno marked this conversation as resolved.
Show resolved Hide resolved

location ~* \.(css|png|ico|webmanifest|eot|svg|ttf|woff|woff2|txt)$ {
try_files $uri /index.php$is_args$args;
access_log off;
expires max;
add_header Cache-Control "public";
okiedork marked this conversation as resolved.
Show resolved Hide resolved
}

location ~ \.php {
Expand Down
12 changes: 8 additions & 4 deletions docker/nginx/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
user nginx;
worker_processes auto;
pid /var/run/nginx.pid;
worker_processes auto;
worker_rlimit_nofile 65535;

events {
worker_connections 1024;
multi_accept on;
use epoll;
worker_connections 65535;
}

# faster regexp
pcre_jit on;

http {

##
Expand All @@ -32,9 +35,10 @@ http {
# number of requests client can make over keep-alive
keepalive_requests 100000;
types_hash_max_size 2048;
types_hash_bucket_size 64;
server_tokens off;

client_max_body_size 100m;
client_max_body_size 16m;
client_body_buffer_size 1m;
fastcgi_buffer_size 128k;
fastcgi_buffers 256 16k;
Expand Down
33 changes: 18 additions & 15 deletions docker/php.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
FROM php:8.1.8-cli-alpine3.16 AS builder

# https://blog.packagecloud.io/eng/2017/02/21/set-environment-variable-save-thousands-of-system-calls/
ENV TZ=:/etc/localtime
ENV TZ=:UTC

WORKDIR /usr/src

Expand Down Expand Up @@ -46,16 +46,10 @@ RUN docker-php-source extract && \
mkdir /usr/src/php/ext/amqp && \
tar --extract --file amqp.tar.gz --directory /usr/src/php/ext/amqp --strip 1 && \
docker-php-ext-install -j$(nproc) amqp && \
docker-php-source delete

RUN docker-php-source extract && \
okiedork marked this conversation as resolved.
Show resolved Hide resolved
wget -O redis.tar.gz https://github.com/phpredis/phpredis/archive/refs/tags/5.3.7.tar.gz && \
mkdir /usr/src/php/ext/redis && \
tar --extract --file redis.tar.gz --directory /usr/src/php/ext/redis --strip 1 && \
docker-php-ext-install -j$(nproc) redis && \
docker-php-source delete

RUN docker-php-source extract && \
okiedork marked this conversation as resolved.
Show resolved Hide resolved
wget -O igbinary.tar.gz https://github.com/igbinary/igbinary/archive/refs/tags/3.2.7.tar.gz && \
mkdir /usr/src/php/ext/igbinary && \
tar --extract --file igbinary.tar.gz --directory /usr/src/php/ext/igbinary --strip 1 && \
Expand Down Expand Up @@ -94,7 +88,7 @@ RUN composer install --no-progress --ignore-platform-reqs --no-dev --prefer-dist
FROM php:8.1.8-cli-alpine3.16 as cli

# https://blog.packagecloud.io/eng/2017/02/21/set-environment-variable-save-thousands-of-system-calls/
ENV TZ=:/etc/localtime
ENV TZ=:UTC
ENV PHP_ENV=dev

#============================================
Expand Down Expand Up @@ -174,7 +168,7 @@ CMD ["php"]
FROM php:8.1.8-fpm-alpine3.16 as fpm

# https://blog.packagecloud.io/eng/2017/02/21/set-environment-variable-save-thousands-of-system-calls/
ENV TZ=:/etc/localtime
ENV TZ=:UTC
ENV PHP_ENV=dev

#============================================
Expand All @@ -189,7 +183,15 @@ RUN apk add --no-cache --upgrade apk-tools && \
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
echo "memory_limit = 256M" > /usr/local/etc/php/conf.d/memory.ini && \
echo "variables_order = EGPCS" > /usr/local/etc/php/conf.d/variables_order.ini && \
echo "expose_php = 0" > /usr/local/etc/php/conf.d/expose_php.ini
echo "expose_php = Off" > /usr/local/etc/php/conf.d/expose_php.ini && \
echo "allow_url_fopen = Off" > /usr/local/etc/php/conf.d/security.ini && \
echo "allow_url_include = Off" >> /usr/local/etc/php/conf.d/security.ini && \
echo "cgi.fix_pathinfo = Off" >> /usr/local/etc/php/conf.d/security.ini && \
echo "cgi.force_redirect = On" >> /usr/local/etc/php/conf.d/security.ini && \
echo "file_uploads = Off" >> /usr/local/etc/php/conf.d/security.ini && \
echo "max_input_vars = 100" >> /usr/local/etc/php/conf.d/security.ini && \
echo "open_basedir = /var/www/html" >> /usr/local/etc/php/conf.d/security.ini && \
echo "post_max_size = 256K" >> /usr/local/etc/php/conf.d/security.ini
RUN echo "pm.status_path = /status" >> /usr/local/etc/php-fpm.d/zz-docker.conf

#============================================
Expand Down Expand Up @@ -220,14 +222,15 @@ RUN wget -O /usr/local/bin/php-fpm-healthcheck https://raw.githubusercontent.com
#============================================
# FPM Extensions
#============================================
RUN docker-php-ext-enable dom && \
docker-php-ext-enable gd && \
docker-php-ext-enable igbinary && \
RUN docker-php-ext-enable gd && \
okiedork marked this conversation as resolved.
Show resolved Hide resolved
docker-php-ext-enable opcache && \
docker-php-ext-enable pdo_pgsql && \
docker-php-ext-enable redis && \
docker-php-ext-enable simplexml && \
docker-php-ext-enable zip
docker-php-ext-enable simplexml
RUN rm /usr/local/etc/php/conf.d/docker-php-ext-igbinary.ini && \
rm /usr/local/etc/php/conf.d/docker-php-ext-pcntl.ini && \
rm /usr/local/etc/php/conf.d/docker-php-ext-sockets.ini && \
rm /usr/local/etc/php/conf.d/docker-php-ext-zip.ini
okiedork marked this conversation as resolved.
Show resolved Hide resolved

#============================================
# User
Expand Down