From 0fa73915f60c99b94861c3ffa2b6f25500eadd20 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Sat, 14 May 2022 17:19:07 +0200 Subject: [PATCH] Allow ingress --- whoogle/config.json | 3 + .../etc/cont-init.d/32-nginx_ingress.sh | 49 ++++++++++ whoogle/rootfs/etc/cont-init.d/99-run.sh | 4 +- whoogle/rootfs/etc/nginx/includes/mime.types | 96 +++++++++++++++++++ .../etc/nginx/includes/proxy_params.conf | 15 +++ .../rootfs/etc/nginx/includes/resolver.conf | 1 + .../etc/nginx/includes/server_params.conf | 6 ++ .../rootfs/etc/nginx/includes/ssl_params.conf | 9 ++ .../rootfs/etc/nginx/includes/upstream.conf | 3 + whoogle/rootfs/etc/nginx/nginx.conf | 56 +++++++++++ whoogle/rootfs/etc/nginx/servers/ingress.conf | 17 ++++ 11 files changed, 258 insertions(+), 1 deletion(-) create mode 100644 whoogle/rootfs/etc/cont-init.d/32-nginx_ingress.sh create mode 100644 whoogle/rootfs/etc/nginx/includes/mime.types create mode 100644 whoogle/rootfs/etc/nginx/includes/proxy_params.conf create mode 100644 whoogle/rootfs/etc/nginx/includes/resolver.conf create mode 100644 whoogle/rootfs/etc/nginx/includes/server_params.conf create mode 100644 whoogle/rootfs/etc/nginx/includes/ssl_params.conf create mode 100644 whoogle/rootfs/etc/nginx/includes/upstream.conf create mode 100644 whoogle/rootfs/etc/nginx/nginx.conf create mode 100644 whoogle/rootfs/etc/nginx/servers/ingress.conf diff --git a/whoogle/config.json b/whoogle/config.json index bab8f9eb6..ed76b5986 100644 --- a/whoogle/config.json +++ b/whoogle/config.json @@ -7,6 +7,8 @@ "codenotary": "alexandrep.github@gmail.com", "description": "Self-hosted, ad-free, privacy-respecting metasearch engine", "devices": [], + "ingress": true, + "ingress_stream": true, "map": [ "config:rw" ], @@ -16,6 +18,7 @@ "WHOOGLE_CONFIG_LANGUAGE": "lang_en", "WHOOGLE_CONFIG_URL": "https://website.com" }, + "panel_icon": "mdi:magnify", "ports": { "5000/tcp": 5000 }, diff --git a/whoogle/rootfs/etc/cont-init.d/32-nginx_ingress.sh b/whoogle/rootfs/etc/cont-init.d/32-nginx_ingress.sh new file mode 100644 index 000000000..543a579c7 --- /dev/null +++ b/whoogle/rootfs/etc/cont-init.d/32-nginx_ingress.sh @@ -0,0 +1,49 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash + +################# +# CORRECT IMAGE # +################# +#Allow images access +#chmod -R 755 /whoogle/app +#Allow manifest access +#sed -i 's|manifest.json">|manifest.json" crossorigin="use-credentials">|g' /whoogle/app/templates/index.html + +#Allow ingress +sed -i "1a export WHOOGLE_URL_PREFIX=$(bashio::addon.ingress_entry)" /etc/cont-init.d/99-run.sh + +################# +# NGINX SETTING # +################# +declare port +declare certfile +declare ingress_interface +declare ingress_port +declare keyfile + +port=$(bashio::addon.port 80) +if bashio::var.has_value "${port}"; then + bashio::config.require.ssl + + if bashio::config.true 'ssl'; then + certfile=$(bashio::config 'certfile') + keyfile=$(bashio::config 'keyfile') + + mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf + sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf + sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf + + else + mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf + fi +fi + +ingress_port=$(bashio::addon.ingress_port) +ingress_interface=$(bashio::addon.ip_address) +ingress_entry=$(bashio::addon.ingress_entry) +sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf +sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf +sed -i "s#%%ingress_entry%%#${ingress_entry}#g" /etc/nginx/servers/ingress.conf + +dns_host=127.0.0.11 +sed -i "s/%%dns_host%%/${dns_host}/g" /etc/nginx/includes/resolver.conf diff --git a/whoogle/rootfs/etc/cont-init.d/99-run.sh b/whoogle/rootfs/etc/cont-init.d/99-run.sh index ebefe3609..762e0594a 100644 --- a/whoogle/rootfs/etc/cont-init.d/99-run.sh +++ b/whoogle/rootfs/etc/cont-init.d/99-run.sh @@ -1,3 +1,5 @@ #!/bin/sh -exec misc/tor/start-tor.sh & ./run +exec misc/tor/start-tor.sh & ./run & echo "Starting NGinx..." + +exec nginx diff --git a/whoogle/rootfs/etc/nginx/includes/mime.types b/whoogle/rootfs/etc/nginx/includes/mime.types new file mode 100644 index 000000000..7c7cdef2d --- /dev/null +++ b/whoogle/rootfs/etc/nginx/includes/mime.types @@ -0,0 +1,96 @@ +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} diff --git a/whoogle/rootfs/etc/nginx/includes/proxy_params.conf b/whoogle/rootfs/etc/nginx/includes/proxy_params.conf new file mode 100644 index 000000000..1990d4959 --- /dev/null +++ b/whoogle/rootfs/etc/nginx/includes/proxy_params.conf @@ -0,0 +1,15 @@ +proxy_http_version 1.1; +proxy_ignore_client_abort off; +proxy_read_timeout 86400s; +proxy_redirect off; +proxy_send_timeout 86400s; +proxy_max_temp_file_size 0; + +proxy_set_header Accept-Encoding ""; +proxy_set_header Connection $connection_upgrade; +proxy_set_header Host $http_host; +proxy_set_header Upgrade $http_upgrade; +proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +proxy_set_header X-Forwarded-Proto $scheme; +proxy_set_header X-NginX-Proxy true; +proxy_set_header X-Real-IP $remote_addr; diff --git a/whoogle/rootfs/etc/nginx/includes/resolver.conf b/whoogle/rootfs/etc/nginx/includes/resolver.conf new file mode 100644 index 000000000..d86489993 --- /dev/null +++ b/whoogle/rootfs/etc/nginx/includes/resolver.conf @@ -0,0 +1 @@ +resolver %%dns_host%%; diff --git a/whoogle/rootfs/etc/nginx/includes/server_params.conf b/whoogle/rootfs/etc/nginx/includes/server_params.conf new file mode 100644 index 000000000..09c06543e --- /dev/null +++ b/whoogle/rootfs/etc/nginx/includes/server_params.conf @@ -0,0 +1,6 @@ +root /dev/null; +server_name $hostname; + +add_header X-Content-Type-Options nosniff; +add_header X-XSS-Protection "1; mode=block"; +add_header X-Robots-Tag none; diff --git a/whoogle/rootfs/etc/nginx/includes/ssl_params.conf b/whoogle/rootfs/etc/nginx/includes/ssl_params.conf new file mode 100644 index 000000000..6f1500599 --- /dev/null +++ b/whoogle/rootfs/etc/nginx/includes/ssl_params.conf @@ -0,0 +1,9 @@ +ssl_protocols TLSv1.2; +ssl_prefer_server_ciphers on; +ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA; +ssl_ecdh_curve secp384r1; +ssl_session_timeout 10m; +ssl_session_cache shared:SSL:10m; +ssl_session_tickets off; +ssl_stapling on; +ssl_stapling_verify on; diff --git a/whoogle/rootfs/etc/nginx/includes/upstream.conf b/whoogle/rootfs/etc/nginx/includes/upstream.conf new file mode 100644 index 000000000..325245525 --- /dev/null +++ b/whoogle/rootfs/etc/nginx/includes/upstream.conf @@ -0,0 +1,3 @@ +upstream backend { + server 127.0.0.1:5000; +} diff --git a/whoogle/rootfs/etc/nginx/nginx.conf b/whoogle/rootfs/etc/nginx/nginx.conf new file mode 100644 index 000000000..7e5bc6f7c --- /dev/null +++ b/whoogle/rootfs/etc/nginx/nginx.conf @@ -0,0 +1,56 @@ +# Run nginx in foreground. +daemon off; + +# This is run inside Docker. +user root; + +# Pid storage location. +pid /var/run/nginx.pid; + +# Set number of worker processes. +worker_processes 1; + +# Enables the use of JIT for regular expressions to speed-up their processing. +pcre_jit on; + +# Write error log to Hass.io add-on log. +error_log /proc/1/fd/1 error; + +# Load allowed environment vars +env HASSIO_TOKEN; + +# Load dynamic modules. +include /etc/nginx/modules/*.conf; + +# Max num of simultaneous connections by a worker process. +events { + worker_connections 512; +} + +http { + include /etc/nginx/includes/mime.types; + + log_format hassio '[$time_local] $status ' + '$http_x_forwarded_for($remote_addr) ' + '$request ($http_user_agent)'; + + access_log /proc/1/fd/1 hassio; + client_max_body_size 4G; + default_type application/octet-stream; + gzip on; + keepalive_timeout 65; + sendfile on; + server_tokens off; + tcp_nodelay on; + tcp_nopush on; + + map $http_upgrade $connection_upgrade { + default upgrade; + '' close; + } + + include /etc/nginx/includes/resolver.conf; + include /etc/nginx/includes/upstream.conf; + + include /etc/nginx/servers/*.conf; +} diff --git a/whoogle/rootfs/etc/nginx/servers/ingress.conf b/whoogle/rootfs/etc/nginx/servers/ingress.conf new file mode 100644 index 000000000..4e0edef6b --- /dev/null +++ b/whoogle/rootfs/etc/nginx/servers/ingress.conf @@ -0,0 +1,17 @@ +server { + listen %%interface%%:%%port%% default_server; + + include /etc/nginx/includes/server_params.conf; + include /etc/nginx/includes/proxy_params.conf; + + client_max_body_size 0; + + location / { + add_header Access-Control-Allow-Origin *; + proxy_read_timeout 30; + proxy_pass http://backend; + #Allow frame + proxy_hide_header 'x-frame-options'; + } + +}