diff --git a/packages/ns-ui/Makefile b/packages/ns-ui/Makefile index 01eaa3384..54c75614b 100644 --- a/packages/ns-ui/Makefile +++ b/packages/ns-ui/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ns-ui # renovate: datasource=github-releases depName=NethServer/nethsecurity-ui PKG_VERSION:=2.8.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=ui-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://nethsecurity.ams3.digitaloceanspaces.com/ui-dist/ @@ -71,6 +71,8 @@ define Package/ns-ui/install $(INSTALL_BIN) ./files/ns-ui $(1)/usr/sbin $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/ns-ui.init $(1)/etc/init.d/ns-ui + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_BIN) ./files/ns-ui.uci-defaults $(1)/etc/uci-defaults $(CP) $(PKG_BUILD_DIR)/../dist/* $(1)/www-ns endef diff --git a/packages/ns-ui/files/config b/packages/ns-ui/files/config index 9cf4fba57..e1604c8a7 100644 --- a/packages/ns-ui/files/config +++ b/packages/ns-ui/files/config @@ -4,3 +4,4 @@ config main 'config' option nsui_enable '1' option nsui_extra_port '9090' option nsui_extra_enable '1' + option server_tokens 'on' diff --git a/packages/ns-ui/files/ns-ui b/packages/ns-ui/files/ns-ui index 382505e4d..e5838e8aa 100755 --- a/packages/ns-ui/files/ns-ui +++ b/packages/ns-ui/files/ns-ui @@ -32,6 +32,7 @@ nsui_extra_enable=$(uci -q get ns-ui.config.nsui_extra_enable) nsui_extra_port=$(uci -q get ns-ui.config.nsui_extra_port) crt=$(uci -q get nginx._lan.ssl_certificate) key=$(uci -q get nginx._lan.ssl_certificate_key) +server_tokens=$(uci -q get ns-ui.config.server_tokens) if [[ "$nsui_extra_enable" == "1" && "$nsui_extra_port" != "" ]]; then cat < "$NSUI_EXTRA_FILE" server { @@ -44,6 +45,7 @@ server { ssl_session_timeout 64m; error_log syslog:server=unix:/dev/log,nohostname; access_log syslog:server=unix:/dev/log,nohostname; + server_tokens $server_tokens; # enable NS UI location / { diff --git a/packages/ns-ui/files/ns-ui.uci-defaults b/packages/ns-ui/files/ns-ui.uci-defaults new file mode 100644 index 000000000..2e58fce9a --- /dev/null +++ b/packages/ns-ui/files/ns-ui.uci-defaults @@ -0,0 +1,11 @@ +#!/bin/sh + +# +# Copyright (C) 2026 Nethesis S.r.l. +# SPDX-License-Identifier: GPL-2.0-only +# + +if ! uci -q get ns-ui.config.server_tokens; then + uci set ns-ui.config.server_tokens='on' + uci commit ns-ui +fi diff --git a/packages/python3-nethsec/Makefile b/packages/python3-nethsec/Makefile index f283ccd77..46b0ff0b7 100644 --- a/packages/python3-nethsec/Makefile +++ b/packages/python3-nethsec/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python3-nethsec # renovate: datasource=github-tags depName=NethServer/python3-nethsec -PKG_VERSION:=1.4.5 +PKG_VERSION:=1.4.7 PKG_RELEASE:=1 PKG_MAINTAINER:=Giacomo Sanchietti