librewolf
/
bunkerized-nginx
mirror of https://github.com/bunkerity/bunkerized-nginx
4
0
Fork 1
Code Issues Projects Releases Wiki Activity

fix ui integrations and fix stream support in db

This commit is contained in:
florian 2023-04-27 22:09:12 +02:00
parent d8b7db167e
commit c6a184d90a
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
17 changed files with 61 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
misc/integrations/autoconf.mariadb.ui.yml
View File

@ -78,16 +78,15 @@ services:
- AUTOCONF_MODE=yes
- ADMIN_USERNAME=admin
- ADMIN_PASSWORD=changeme
- ABSOLUTE_URI=http://www.example.com/changeme
- ABSOLUTE_URI=http://www.example.com/changeme/
labels:
- "bunkerweb.SERVER_NAME=www.example.com"
- "bunkerweb.USE_UI=yes"
- "bunkerweb.USE_REVERSE_PROXY=yes"
- "bunkerweb.REVERSE_PROXY_URL=/changeme"
- "bunkerweb.REVERSE_PROXY_URL=/changeme/"
- "bunkerweb.REVERSE_PROXY_HOST=http://bw-ui:7000"
- "bunkerweb.REVERSE_PROXY_HEADERS=X-Script-Name /changeme"
- "bunkerweb.INTERCEPTED_ERROR_CODES=400 401 404 405 413 429 500 501 502 503 504"
- 'bunkerweb.CUSTOM_CONF_MODSEC_CRS_remove_ui_false_positives=SecRule REQUEST_FILENAME "@rx /global_config$$" "id:999,ctl:ruleRemoveByTag=platform-pgsql,nolog"'
- "bunkerweb.REVERSE_PROXY_INTERCEPT_ERRORS=no"
volumes:
bw-data:

13
misc/integrations/autoconf.mysql.ui.yml
View File

@ -76,18 +76,17 @@ services:
- DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
- DOCKER_HOST=tcp://bw-docker:2375
- AUTOCONF_MODE=yes
- ADMIN_USERNAME=admin
- ADMIN_PASSWORD=admin
- ABSOLUTE_URI=http://www.example.com/admin
- ADMIN_USERNAME=changeme
- ADMIN_PASSWORD=changeme
- ABSOLUTE_URI=http://www.example.com/changeme/
labels:
- "bunkerweb.SERVER_NAME=www.example.com"
- "bunkerweb.USE_UI=yes"
- "bunkerweb.USE_REVERSE_PROXY=yes"
- "bunkerweb.REVERSE_PROXY_URL=/admin"
- "bunkerweb.REVERSE_PROXY_URL=/changeme/"
- "bunkerweb.REVERSE_PROXY_HOST=http://bw-ui:7000"
- "bunkerweb.REVERSE_PROXY_HEADERS=X-Script-Name /admin"
- "bunkerweb.INTERCEPTED_ERROR_CODES=400 401 405 413 429 500 501 502 503 504"
- 'bunkerweb.CUSTOM_CONF_MODSEC_CRS_remove_ui_false_positives=SecRule REQUEST_FILENAME "@rx /global_config$$" "id:999,ctl:ruleRemoveByTag=platform-pgsql,nolog"'
- "bunkerweb.REVERSE_PROXY_HEADERS=X-Script-Name /changeme"
- "bunkerweb.REVERSE_PROXY_INTERCEPT_ERRORS=no"
volumes:
bw-data:

7
misc/integrations/autoconf.postgres.ui.yml
View File

@ -77,16 +77,15 @@ services:
- AUTOCONF_MODE=yes
- ADMIN_USERNAME=admin
- ADMIN_PASSWORD=changeme
- ABSOLUTE_URI=http://www.example.com/changeme
- ABSOLUTE_URI=http://www.example.com/changeme/
labels:
- "bunkerweb.SERVER_NAME=www.example.com"
- "bunkerweb.USE_UI=yes"
- "bunkerweb.USE_REVERSE_PROXY=yes"
- "bunkerweb.REVERSE_PROXY_URL=/changeme"
- "bunkerweb.REVERSE_PROXY_URL=/changeme/"
- "bunkerweb.REVERSE_PROXY_HOST=http://bw-ui:7000"
- "bunkerweb.REVERSE_PROXY_HEADERS=X-Script-Name /changeme"
- "bunkerweb.INTERCEPTED_ERROR_CODES=400 401 404 405 413 429 500 501 502 503 504"
- 'bunkerweb.CUSTOM_CONF_MODSEC_CRS_remove_ui_false_positives=SecRule REQUEST_FILENAME "@rx /global_config$$" "id:999,ctl:ruleRemoveByTag=platform-pgsql,nolog"'
- "bunkerweb.REVERSE_PROXY_INTERCEPT_ERRORS=no"
volumes:
bw-data:

7
misc/integrations/autoconf.ui.yml
View File

@ -68,16 +68,15 @@ services:
- AUTOCONF_MODE=yes
- ADMIN_USERNAME=admin
- ADMIN_PASSWORD=changeme
- ABSOLUTE_URI=http://www.example.com/changeme
- ABSOLUTE_URI=http://www.example.com/changeme/
labels:
- "bunkerweb.SERVER_NAME=www.example.com"
- "bunkerweb.USE_UI=yes"
- "bunkerweb.USE_REVERSE_PROXY=yes"
- "bunkerweb.REVERSE_PROXY_URL=/changeme"
- "bunkerweb.REVERSE_PROXY_URL=/changeme/"
- "bunkerweb.REVERSE_PROXY_HOST=http://bw-ui:7000"
- "bunkerweb.REVERSE_PROXY_HEADERS=X-Script-Name /changeme"
- "bunkerweb.INTERCEPTED_ERROR_CODES=400 401 405 413 429 500 501 502 503 504"
- 'bunkerweb.CUSTOM_CONF_MODSEC_CRS_remove_ui_false_positives=SecRule REQUEST_FILENAME "@rx /global_config$$" "id:999,ctl:ruleRemoveByTag=platform-pgsql,nolog"'
- "bunkerweb.REVERSE_PROXY_INTERCEPT_ERRORS=no"
volumes:
bw-data:

4
misc/integrations/docker.mariadb.ui.yml
View File

@ -17,13 +17,11 @@ services:
- USE_CLIENT_CACHE=yes
- USE_GZIP=yes
- www.example.com_USE_UI=yes
- www.example.com_SERVE_FILES=no
- www.example.com_USE_REVERSE_PROXY=yes
- www.example.com_REVERSE_PROXY_URL=/admin/
- www.example.com_REVERSE_PROXY_HOST=http://bw-ui:7000
- www.example.com_REVERSE_PROXY_HEADERS=X-Script-Name /admin
- www.example.com_INTERCEPTED_ERROR_CODES=400 401 405 413 429 500 501 502 503 504
- www.example.com_CUSTOM_CONF_MODSEC_CRS_config=SecRule REQUEST_FILENAME "@rx /global_config$$" "id:999,ctl:ruleRemoveByTag=platform-pgsql,nolog"
- www.example.com_REVERSE_PROXY_INTERCEPT_ERRORS=no
networks:
- bw-universe
- bw-services

6
misc/integrations/docker.mysql.ui.yml
View File

@ -17,13 +17,11 @@ services:
- USE_CLIENT_CACHE=yes
- USE_GZIP=yes
- www.example.com_USE_UI=yes
- www.example.com_SERVE_FILES=no
- www.example.com_USE_REVERSE_PROXY=yes
- www.example.com_REVERSE_PROXY_URL=/admin/
- www.example.com_REVERSE_PROXY_HOST=http://bw-ui:7000
- www.example.com_REVERSE_PROXY_HEADERS=X-Script-Name /admin
- www.example.com_INTERCEPTED_ERROR_CODES=400 401 405 413 429 500 501 502 503 504
- www.example.com_CUSTOM_CONF_MODSEC_CRS_config=SecRule REQUEST_FILENAME "@rx /global_config$$" "id:999,ctl:ruleRemoveByTag=platform-pgsql,nolog"
- www.example.com_REVERSE_PROXY_INTERCEPT_ERRORS=no
networks:
- bw-universe
- bw-services
@ -58,7 +56,7 @@ services:
- DOCKER_HOST=tcp://bw-docker:2375
- ADMIN_USERNAME=admin
- ADMIN_PASSWORD=changeme # Remember to set a stronger password for the admin user
- ABSOLUTE_URI=http://www.example.com/changeme
- ABSOLUTE_URI=http://www.example.com/changeme/
networks:
- bw-universe
- bw-docker

3
misc/integrations/docker.postgres.ui.yml
View File

@ -22,8 +22,7 @@ services:
- www.example.com_REVERSE_PROXY_URL=/admin/
- www.example.com_REVERSE_PROXY_HOST=http://bw-ui:7000
- www.example.com_REVERSE_PROXY_HEADERS=X-Script-Name /admin
- www.example.com_INTERCEPTED_ERROR_CODES=400 401 405 413 429 500 501 502 503 504
- www.example.com_CUSTOM_CONF_MODSEC_CRS_config=SecRule REQUEST_FILENAME "@rx /global_config$$" "id:999,ctl:ruleRemoveByTag=platform-pgsql,nolog"
- www.example.com_REVERSE_PROXY_INTERCEPT_ERRORS=no
networks:
- bw-universe
- bw-services

12
misc/integrations/docker.ui.yml
View File

@ -14,10 +14,10 @@ services:
- API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
- www.example.com_USE_UI=yes
- www.example.com_USE_REVERSE_PROXY=yes
- www.example.com_REVERSE_PROXY_URL=/admin
- www.example.com_REVERSE_PROXY_URL=/changeme/
- www.example.com_REVERSE_PROXY_HOST=http://bw-ui:7000
- www.example.com_REVERSE_PROXY_HEADERS=X-Script-Name /admin
- www.example.com_INTERCEPTED_ERROR_CODES=400 401 405 413 429 500 501 502 503 504
- www.example.com_REVERSE_PROXY_HEADERS=X-Script-Name /changeme
- www.example.com_REVERSE_PROXY_INTERCEPT_ERRORS=no
networks:
- bw-universe
- bw-services
@ -52,9 +52,9 @@ services:
- bw-data:/data
environment:
- DOCKER_HOST=tcp://bw-docker:2375
- ADMIN_USERNAME=admin
- ADMIN_PASSWORD=admin
- ABSOLUTE_URI=http://www.example.com/admin
- ADMIN_USERNAME=changeme
- ADMIN_PASSWORD=changeme
- ABSOLUTE_URI=http://www.example.com/changeme/
networks:
- bw-universe
- bw-docker

9
misc/integrations/k8s.mariadb.ui.yml
View File

@ -232,11 +232,11 @@ spec:
imagePullPolicy: Always
env:
- name: ADMIN_USERNAME
value: "admin"
value: "changeme"
- name: "ADMIN_PASSWORD"
value: "changeme"
- name: "ABSOLUTE_URI"
value: "http://www.example.com/admin/"
value: "http://www.example.com/changeme/"
- name: KUBERNETES_MODE
value: "YES"
- name: "DATABASE_URI"
@ -312,13 +312,14 @@ metadata:
name: ingress
annotations:
bunkerweb.io/www.example.com_USE_UI: "yes"
bunkerweb.io/www.example.com_REVERSE_PROXY_HEADERS_1: "X-Script-Name /admin"
bunkerweb.io/www.example.com_REVERSE_PROXY_HEADERS_1: "X-Script-Name /changeme"
bunkerweb.io/www.example.com_REVERSE_PROXY_INTERCEPT_ERRORS: "no"
spec:
rules:
- host: www.example.com
http:
paths:
- path: /admin/
- path: /changeme/
pathType: Prefix
backend:
service:

9
misc/integrations/k8s.mysql.ui.yml
View File

@ -290,11 +290,11 @@ spec:
imagePullPolicy: Always
env:
- name: ADMIN_USERNAME
value: "admin"
value: "changeme"
- name: "ADMIN_PASSWORD"
value: "changeme"
- name: "ABSOLUTE_URI"
value: "http://www.example.com/admin/"
value: "http://www.example.com/changeme/"
- name: KUBERNETES_MODE
value: "YES"
- name: "DATABASE_URI"
@ -370,13 +370,14 @@ metadata:
name: ingress
annotations:
bunkerweb.io/www.example.com_USE_UI: "yes"
bunkerweb.io/www.example.com_REVERSE_PROXY_HEADERS_1: "X-Script-Name /admin"
bunkerweb.io/www.example.com_REVERSE_PROXY_HEADERS_1: "X-Script-Name /changeme"
bunkerweb.io/www.example.com_REVERSE_PROXY_INTERCEPT_ERRORS: "no"
spec:
rules:
- host: www.example.com
http:
paths:
- path: /admin/
- path: /changeme/
pathType: Prefix
backend:
service:

9
misc/integrations/k8s.postgres.ui.yml
View File

@ -230,11 +230,11 @@ spec:
imagePullPolicy: Always
env:
- name: ADMIN_USERNAME
value: "admin"
value: "changeme"
- name: "ADMIN_PASSWORD"
value: "changeme"
- name: "ABSOLUTE_URI"
value: "http://www.example.com/admin/"
value: "http://www.example.com/changeme/"
- name: KUBERNETES_MODE
value: "YES"
- name: "DATABASE_URI"
@ -323,13 +323,14 @@ metadata:
name: ingress
annotations:
bunkerweb.io/www.example.com_USE_UI: "yes"
bunkerweb.io/www.example.com_REVERSE_PROXY_HEADERS_1: "X-Script-Name /admin"
bunkerweb.io/www.example.com_REVERSE_PROXY_HEADERS_1: "X-Script-Name /changeme"
bunkerweb.io/www.example.com_REVERSE_PROXY_INTERCEPT_ERRORS: "no"
spec:
rules:
- host: www.example.com
http:
paths:
- path: /admin/
- path: /changeme/
pathType: Prefix
backend:
service:

12
misc/integrations/swarm.mariadb.ui.yml
View File

@ -90,9 +90,9 @@ services:
environment:
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database
- DOCKER_HOST=tcp://bw-docker:2375
- ADMIN_USERNAME=admin
- ADMIN_PASSWORD=changeme # Remember to set a stronger password for the admin user
- ABSOLUTE_URI=http://www.example.com/admin
- ADMIN_USERNAME=changeme
- ADMIN_PASSWORD=changeme # Remember to set a stronger password for the changeme user
- ABSOLUTE_URI=http://www.example.com/changeme/
networks:
- bw-universe
- bw-docker
@ -101,10 +101,10 @@ services:
- bunkerweb.SERVER_NAME=www.example.com
- bunkerweb.USE_UI=yes
- bunkerweb.USE_REVERSE_PROXY=yes
- bunkerweb.REVERSE_PROXY_URL=/admin
- bunkerweb.REVERSE_PROXY_URL=/changeme/
- bunkerweb.REVERSE_PROXY_HOST=http://bw-ui:7000
- bunkerweb.REVERSE_PROXY_HEADERS=X-Script-Name /admin
- bunkerweb.INTERCEPTED_ERROR_CODES=400 401 405 413 429 500 501 502 503 504
- bunkerweb.REVERSE_PROXY_HEADERS=X-Script-Name /changeme
- bunkerweb.REVERSE_PROXY_INTERCEPT_ERRORS=no
volumes:
bw-data:

12
misc/integrations/swarm.mysql.ui.yml
View File

@ -90,9 +90,9 @@ services:
environment:
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database
- DOCKER_HOST=tcp://bw-docker:2375
- ADMIN_USERNAME=admin
- ADMIN_PASSWORD=changeme # Remember to set a stronger password for the admin user
- ABSOLUTE_URI=http://www.example.com/admin
- ADMIN_USERNAME=changeme
- ADMIN_PASSWORD=changeme # Remember to set a stronger password for the changeme user
- ABSOLUTE_URI=http://www.example.com/changeme/
networks:
- bw-universe
- bw-docker
@ -101,10 +101,10 @@ services:
- bunkerweb.SERVER_NAME=www.example.com
- bunkerweb.USE_UI=yes
- bunkerweb.USE_REVERSE_PROXY=yes
- bunkerweb.REVERSE_PROXY_URL=/admin
- bunkerweb.REVERSE_PROXY_URL=/changeme/
- bunkerweb.REVERSE_PROXY_HOST=http://bw-ui:7000
- bunkerweb.REVERSE_PROXY_HEADERS=X-Script-Name /admin
- bunkerweb.INTERCEPTED_ERROR_CODES=400 401 405 413 429 500 501 502 503 504
- bunkerweb.REVERSE_PROXY_HEADERS=X-Script-Name /changeme
- bunkerweb.REVERSE_PROXY_INTERCEPT_ERRORS=no
volumes:
bw-data:

10
misc/integrations/swarm.postgres.ui.yml
View File

@ -89,9 +89,9 @@ services:
environment:
- DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
- DOCKER_HOST=tcp://bw-docker:2375
- ADMIN_USERNAME=admin
- ADMIN_USERNAME=changeme
- ADMIN_PASSWORD=changeme
- ABSOLUTE_URI=http://www.example.com/admin
- ABSOLUTE_URI=http://www.example.com/changeme/
networks:
- bw-universe
- bw-docker
@ -100,10 +100,10 @@ services:
- bunkerweb.SERVER_NAME=www.example.com
- bunkerweb.USE_UI=yes
- bunkerweb.USE_REVERSE_PROXY=yes
- bunkerweb.REVERSE_PROXY_URL=/admin
- bunkerweb.REVERSE_PROXY_URL=/changeme/
- bunkerweb.REVERSE_PROXY_HOST=http://bw-ui:7000
- bunkerweb.REVERSE_PROXY_HEADERS=X-Script-Name /admin
- bunkerweb.INTERCEPTED_ERROR_CODES=400 401 405 413 429 500 501 502 503 504
- bunkerweb.REVERSE_PROXY_HEADERS=X-Script-Name /changeme
- bunkerweb.REVERSE_PROXY_INTERCEPT_ERRORS=no
volumes:
bw-data:

1
src/common/db/Database.py
View File

@ -285,6 +285,7 @@ class Database:
"name": "General",
"description": "The general settings for the server",
"version": "0.1",
"stream": "partial",
"external": False,
}
else:

3
src/common/db/model.py
View File

@ -27,7 +27,7 @@ CUSTOM_CONFIGS_TYPES_ENUM = Enum(
"modsec",
"modsec_crs",
"stream",
"stream_http",
"server_stream",
name="custom_configs_types_enum",
)
LOG_LEVELS_ENUM = Enum(
@ -60,6 +60,7 @@ class Plugins(Base):
name = Column(String(128), nullable=False)
description = Column(String(256), nullable=False)
version = Column(String(32), nullable=False)
stream = Column(String(16), nullable=False)
external = Column(Boolean, default=False, nullable=False)
method = Column(METHODS_ENUM, default="manual", nullable=False)
data = Column(LargeBinary(length=(2**32) - 1), nullable=True)

1
src/ui/src/Config.py
View File

@ -176,6 +176,7 @@ class Config:
"name": "General",
"description": "The general settings for the server",
"version": "0.1",
"stream": "partial",
"external": False,
"method": "manual",
"page": False,