ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
fix(waf): wire the include into the serving block, not the SSL redirect
Juan Deniscc5323d8a995
diff --git a/backend/app/services/waf_service.py b/backend/app/services/waf_service.pyindex 4e2f7421..909f7461 100644--- a/backend/app/services/waf_service.py+++ b/backend/app/services/waf_service.py@@ -366,11 +366,25 @@ class WafService:content,)- # Insert right after the first "server {".- match = re.search(r'server\s*\{', cleaned)- if not match:+ # Insert into the first server block that actually serves the app.+ # On an SSL vhost the file opens with the HTTP->HTTPS redirect block+ # (SSL_REDIRECT_TEMPLATE) — wiring the WAF there would protect only+ # the redirect and leave the real HTTPS server uncovered, so skip+ # redirect-only blocks (a 301 return and nothing served).+ starts = list(re.finditer(r'server\s*\{', cleaned))+ if not starts:return {'success': False, 'error': 'no server block found in vhost'}- idx = match.end()+ idx = None+ for pos, match in enumerate(starts):+ end = starts[pos + 1].start() if pos + 1 < len(starts) else len(cleaned)+ body = cleaned[match.end():end]+ redirect_only = (re.search(r'return\s+301\b', body)+ and not re.search(r'\b(location|proxy_pass|root|try_files)\b', body))+ if not redirect_only:+ idx = match.end()+ break+ if idx is None:+ idx = starts[0].end()new_content = cleaned[:idx] + '\n' + include_line + cleaned[idx:]return cls._write_file(vhost_path, new_content)diff --git a/backend/tests/test_waf_vhost_injection.py b/backend/tests/test_waf_vhost_injection.pynew file mode 100644index 00000000..9798d39f--- /dev/null+++ b/backend/tests/test_waf_vhost_injection.py@@ -0,0 +1,114 @@+"""WAF include placement inside the vhost (#117 bug class).++_inject_include used to insert after the *first* ``server {`` — on an SSL+vhost that is the HTTP->HTTPS redirect block from SSL_REDIRECT_TEMPLATE, so+ModSecurity was wired into a server that only issues 301s while the real+HTTPS server stayed unprotected (and apply() still reported wired).+The micro-cache injector guards this exact trap (nginx_service.py); these+tests pin the same guarantee for the WAF include.+"""+import pytest++from app.services.waf_service import WafService+++SSL_VHOST = '''server {+ listen 80;+ listen [::]:80;+ server_name shop.example.com;+ return 301 https://$server_name$request_uri;+}+server {+ listen 443 ssl;+ server_name shop.example.com;++ location / {+ proxy_pass http://127.0.0.1:8003;+ }+}+'''++PLAIN_VHOST = '''server {+ listen 80;+ server_name blog.example.com;++ location / {+ proxy_pass http://127.0.0.1:8004;+ }+}+'''+++def plain_write(monkeypatch):+ """Route _write_file to a plain filesystem write (no sudo/tee)."""+ def _write(path, content):+ with open(path, 'w') as fh:+ fh.write(content)+ return {'success': True}+ monkeypatch.setattr(WafService, '_write_file',+ classmethod(lambda cls, p, c: _write(p, c)))+++def _server_blocks(content):+ """Split rendered vhost text into per-server-block chunks."""+ import re+ starts = [m.start() for m in re.finditer(r'server\s*\{', content)]+ starts.append(len(content))+ return [content[starts[i]:starts[i + 1]] for i in range(len(starts) - 1)]+++def test_ssl_vhost_include_lands_in_https_block(tmp_path, plain_write):+ vhost = tmp_path / 'shop.example.com'+ vhost.write_text(SSL_VHOST)++ result = WafService._inject_include(str(vhost), '/etc/nginx/waf/shop.conf')+ assert result['success']++ redirect_block, https_block = _server_blocks(vhost.read_text())+ assert 'include /etc/nginx/waf/shop.conf;' not in redirect_block+ assert 'include /etc/nginx/waf/shop.conf;' in https_block+ # The redirect block still redirects.+ assert 'return 301' in redirect_block+++def test_plain_vhost_include_lands_in_only_block(tmp_path, plain_write):+ vhost = tmp_path / 'blog.example.com'+ vhost.write_text(PLAIN_VHOST)++ assert WafService._inject_include(str(vhost), '/etc/nginx/waf/blog.conf')['success']+ assert 'include /etc/nginx/waf/blog.conf;' in vhost.read_text()+++def test_reapply_is_idempotent_and_stays_in_https_block(tmp_path, plain_write):+ vhost = tmp_path / 'shop.example.com'+ vhost.write_text(SSL_VHOST)++ WafService._inject_include(str(vhost), '/etc/nginx/waf/shop.conf')+ WafService._inject_include(str(vhost), '/etc/nginx/waf/shop-v2.conf')++ content = vhost.read_text()+ assert content.count('include /etc/nginx/waf/') == 1+ redirect_block, https_block = _server_blocks(content)+ assert 'shop-v2.conf' in https_block+ assert 'waf' not in redirect_block+++def test_app_block_with_location_level_redirect_still_selected(tmp_path, plain_write):+ # A serving block that happens to contain a 301 inside a location must+ # not be mistaken for the redirect-only wrapper.+ vhost = tmp_path / 'site'+ vhost.write_text('''server {+ listen 80;+ server_name site.example.com;++ location /old {+ return 301 /new;+ }+ location / {+ proxy_pass http://127.0.0.1:8005;+ }+}+''')+ assert WafService._inject_include(str(vhost), '/etc/nginx/waf/site.conf')['success']+ assert 'include /etc/nginx/waf/site.conf;' in vhost.read_text()