Version 1.26.0

essentialkaos · May 3, 2024 · 03d485b · 03d485b
1 parent 1ea7eba
commit 03d485b
Show file tree

Hide file tree

Showing 17 changed files with 146 additions and 276 deletions.
diff --git a/.bibop/modules.conf b/.bibop/modules.conf
@@ -6,4 +6,3 @@
 
 load_module modules/ngx_http_brotli_filter_module.so;
 load_module modules/ngx_http_brotli_static_module.so;
-load_module modules/ngx_http_naxsi_module.so;
diff --git a/.bibop/webkaos.recipe b/.bibop/webkaos.recipe
@@ -187,12 +187,6 @@ command "-" "Check brotli module"
   mode {modules_dir}/ngx_http_brotli_filter_module.so 755
   mode {modules_dir}/ngx_http_brotli_static_module.so 755
 
-command "-" "Check NAXSI module"
-  exist {prefix_dir}/naxsi_core.rules
-  exist {modules_dir}/ngx_http_naxsi_module.so
-  mode {prefix_dir}/naxsi_core.rules 644
-  mode {modules_dir}/ngx_http_naxsi_module.so 755
-
 command "systemctl start {service_name}" "Start service"
   wait-pid {pid_file} 5
   service-works {service_name}

diff --git a/.docker/centos7-unprivileged.docker b/.docker/centos7-unprivileged.docker
@@ -14,15 +14,15 @@ LABEL org.opencontainers.image.title="WEBKAOS (Unprivileged)" \
       org.opencontainers.image.url="https://kaos.sh/webkaos" \
       org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"
 
-ARG WEBKAOS_VER=1.24.0
-ARG BROTLI_VER=0.1.5
+ARG WEBKAOS_VER=1.26.0
+ARG BROTLI_VER=0.1.6
 ARG REPOSITORY=kaos-release
 
 ARG UID=1001
 ARG GID=1001
 
 # hadolint ignore=DL3031,DL3033
-RUN yum -y -q install https://yum.kaos.st/kaos-repo-latest.el7.noarch.rpm && \
+RUN yum -y -q install https://pkgs.kaos.st/kaos-repo-latest.el7.noarch.rpm && \
     yum -y -q install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} webkaos-module-brotli-${BROTLI_VER} gettext && \
     yum clean all && \
     rm -rf /var/cache/yum && \

diff --git a/.docker/centos7.docker b/.docker/centos7.docker
@@ -14,12 +14,12 @@ LABEL org.opencontainers.image.title="WEBKAOS" \
       org.opencontainers.image.url="https://kaos.sh/webkaos" \
       org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"
 
-ARG WEBKAOS_VER=1.24.0
-ARG BROTLI_VER=0.1.5
+ARG WEBKAOS_VER=1.26.0
+ARG BROTLI_VER=0.1.6
 ARG REPOSITORY=kaos-release
 
 # hadolint ignore=DL3031,DL3033
-RUN yum -y -q install https://yum.kaos.st/kaos-repo-latest.el7.noarch.rpm && \
+RUN yum -y -q install https://pkgs.kaos.st/kaos-repo-latest.el7.noarch.rpm && \
     yum -y -q install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} webkaos-module-brotli-${BROTLI_VER} gettext && \
     yum clean all && \
     rm -rf /var/cache/yum && \

diff --git a/.docker/ol7-unprivileged.docker b/.docker/ol7-unprivileged.docker
@@ -14,15 +14,15 @@ LABEL org.opencontainers.image.title="WEBKAOS (Unprivileged)" \
       org.opencontainers.image.url="https://kaos.sh/webkaos" \
       org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"
 
-ARG WEBKAOS_VER=1.24.0
-ARG BROTLI_VER=0.1.5
+ARG WEBKAOS_VER=1.26.0
+ARG BROTLI_VER=0.1.6
 ARG REPOSITORY=kaos-release
 
 ARG UID=1001
 ARG GID=1001
 
 # hadolint ignore=DL3031,DL3033
-RUN yum -y -q install https://yum.kaos.st/kaos-repo-latest.el7.noarch.rpm && \
+RUN yum -y -q install https://pkgs.kaos.st/kaos-repo-latest.el7.noarch.rpm && \
     yum -y -q install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} webkaos-module-brotli-${BROTLI_VER} gettext && \
     yum clean all && \
     rm -rf /var/cache/yum && \

diff --git a/.docker/ol7.docker b/.docker/ol7.docker
@@ -14,12 +14,12 @@ LABEL org.opencontainers.image.title="WEBKAOS" \
       org.opencontainers.image.url="https://kaos.sh/webkaos" \
       org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"
 
-ARG WEBKAOS_VER=1.24.0
-ARG BROTLI_VER=0.1.5
+ARG WEBKAOS_VER=1.26.0
+ARG BROTLI_VER=0.1.6
 ARG REPOSITORY=kaos-release
 
 # hadolint ignore=DL3031,DL3033
-RUN yum -y -q install https://yum.kaos.st/kaos-repo-latest.el7.noarch.rpm && \
+RUN yum -y -q install https://pkgs.kaos.st/kaos-repo-latest.el7.noarch.rpm && \
     yum -y -q install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} webkaos-module-brotli-${BROTLI_VER} gettext && \
     yum clean all && \
     rm -rf /var/cache/yum && \

diff --git a/.docker/ol8-unprivileged.docker b/.docker/ol8-unprivileged.docker
@@ -14,15 +14,15 @@ LABEL org.opencontainers.image.title="WEBKAOS (Unprivileged)" \
       org.opencontainers.image.url="https://kaos.sh/webkaos" \
       org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"
 
-ARG WEBKAOS_VER=1.24.0
-ARG BROTLI_VER=0.1.5
+ARG WEBKAOS_VER=1.26.0
+ARG BROTLI_VER=0.1.6
 ARG REPOSITORY=kaos-release
 
 ARG UID=1001
 ARG GID=1001
 
 # hadolint ignore=DL3031,DL3041
-RUN rpm -ivh https://yum.kaos.st/kaos-repo-latest.el8.noarch.rpm && \
+RUN rpm -ivh https://pkgs.kaos.st/kaos-repo-latest.el8.noarch.rpm && \
     microdnf -y install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} webkaos-module-brotli-${BROTLI_VER} gettext && \
     microdnf clean all && \
     rm -rf /var/cache/dnf /var/log/dnf.* && \

diff --git a/.docker/ol8.docker b/.docker/ol8.docker
@@ -14,12 +14,12 @@ LABEL org.opencontainers.image.title="WEBKAOS" \
       org.opencontainers.image.url="https://kaos.sh/webkaos" \
       org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"
 
-ARG WEBKAOS_VER=1.24.0
-ARG BROTLI_VER=0.1.5
+ARG WEBKAOS_VER=1.26.0
+ARG BROTLI_VER=0.1.6
 ARG REPOSITORY=kaos-release
 
 # hadolint ignore=DL3031,DL3041
-RUN rpm -ivh https://yum.kaos.st/kaos-repo-latest.el8.noarch.rpm && \
+RUN rpm -ivh https://pkgs.kaos.st/kaos-repo-latest.el8.noarch.rpm && \
     microdnf -y install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} webkaos-module-brotli-${BROTLI_VER} gettext && \
     microdnf clean all && \
     rm -rf /var/cache/dnf /var/log/dnf.* && \

diff --git a/.docker/ol9-unprivileged.docker b/.docker/ol9-unprivileged.docker
@@ -14,15 +14,15 @@ LABEL org.opencontainers.image.title="WEBKAOS (Unprivileged)" \
       org.opencontainers.image.url="https://kaos.sh/webkaos" \
       org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"
 
-ARG WEBKAOS_VER=1.24.0
-ARG BROTLI_VER=0.1.5
+ARG WEBKAOS_VER=1.26.0
+ARG BROTLI_VER=0.1.6
 ARG REPOSITORY=kaos-release
 
 ARG UID=1001
 ARG GID=1001
 
 # hadolint ignore=DL3031,DL3041
-RUN rpm -ivh https://yum.kaos.st/kaos-repo-latest.el9.noarch.rpm && \
+RUN rpm -ivh https://pkgs.kaos.st/kaos-repo-latest.el9.noarch.rpm && \
     microdnf -y install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} webkaos-module-brotli-${BROTLI_VER} gettext && \
     microdnf clean all && \
     rm -rf /var/cache/dnf /var/log/dnf.* && \

diff --git a/.docker/ol9.docker b/.docker/ol9.docker
@@ -14,12 +14,12 @@ LABEL org.opencontainers.image.title="WEBKAOS" \
       org.opencontainers.image.url="https://kaos.sh/webkaos" \
       org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"
 
-ARG WEBKAOS_VER=1.24.0
-ARG BROTLI_VER=0.1.5
+ARG WEBKAOS_VER=1.26.0
+ARG BROTLI_VER=0.1.6
 ARG REPOSITORY=kaos-release
 
 # hadolint ignore=DL3031,DL3041
-RUN rpm -ivh https://yum.kaos.st/kaos-repo-latest.el9.noarch.rpm && \
+RUN rpm -ivh https://pkgs.kaos.st/kaos-repo-latest.el9.noarch.rpm && \
     microdnf -y install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} webkaos-module-brotli-${BROTLI_VER} gettext && \
     microdnf clean all && \
     rm -rf /var/cache/dnf /var/log/dnf.* && \

diff --git a/README.md b/README.md
@@ -4,13 +4,13 @@
 
 ## Feature list
 
-* Improved default SSL/TLS preferencies (_A+ on [SSL Labs](https://www.ssllabs.com/ssltest/analyze.html?d=essentialkaos.com), [Immuni Web](https://www.immuniweb.com/ssl/?id=WHUz0U3v), [Mozilla Observatory](https://observatory.mozilla.org/analyze/essentialkaos.com), [CryptCheck](https://tls.imirhil.fr/https/essentialkaos.com) and [Security Headers](https://securityheaders.com/?q=essentialkaos.com&followRedirects=on)_)
+* Improved default SSL/TLS preferencies
 * [Dynamic TLS Records](https://blog.cloudflare.com/optimizing-tls-over-tcp-to-reduce-latency/) support
 * The latest version of [BoringSSL](https://boringssl.googlesource.com/boringssl/) with some state-of-the-art crypto features
 * TLS 1.3 support (_RFC 8446_)
 * [TCP Fast Open](https://en.wikipedia.org/wiki/TCP_Fast_Open) support
 * [Lua](https://github.com/openresty/lua-nginx-module) and [Headers More](https://github.com/openresty/headers-more-nginx-module) modules from the box
-* [Brotli](https://github.com/eustas/ngx_brotli) and [NAXSI](https://github.com/nbs-system/naxsi) as dynamic modules
+* [Brotli](https://github.com/eustas/ngx_brotli) as dynamic module
 * Improved SysV script
 * Well-looking error pages
 * Improved design of index pages
@@ -24,7 +24,7 @@
 sudo yum install -y https://pkgs.kaos.st/kaos-repo-latest.el$(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5).noarch.rpm
 sudo yum install webkaos
 # install optional modules
-sudo yum install webkaos-module-brotli webkaos-module-naxsi
+sudo yum install webkaos-module-brotli
 ```
 
 #### Using Docker

diff --git a/SOURCES/modules.conf b/SOURCES/modules.conf
@@ -7,6 +7,3 @@
 # Brotli dynamic module (webkaos-module-brotli)
 # load_module modules/ngx_http_brotli_filter_module.so;
 # load_module modules/ngx_http_brotli_static_module.so;
-
-# NAXSI dynamic module (webkaos-module-naxsi)
-# load_module modules/ngx_http_naxsi_module.so;
diff --git a/SOURCES/naxsi-compat.patch b/SOURCES/naxsi-compat.patch
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,3 @@

		load_module modules/ngx_http_brotli_filter_module.so;
		load_module modules/ngx_http_brotli_static_module.so;
		load_module modules/ngx_http_naxsi_module.so;