gsadmin/haproxy-openmanager
1
0
Fork 0
mirror of https://github.com/taylanbakircioglu/haproxy-openmanager.git synced 2026-09-16 15:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove tcp_request_rules merge strategy from frontend PUT endpoint

Browse Source 
User reported that tcp_request_rules cannot be deleted via UI - values persist
after deletion. This was caused by the merge strategy in frontend PUT endpoint
that automatically restored existing values when user sent empty/null values.

Changes:
- Remove tcp_request_rules merge logic from frontend PUT
- Use direct frontend.tcp_request_rules value (user-controlled)
- Clean up unused SELECT query fields (request_headers, tcp_request_rules)

Impact:
- Users can now freely delete tcp_request_rules via UI
- Consistent behavior with request_headers (no merge in PUT endpoints)
- Fixes the same issue pattern as Bug 3 (use-service deletion)

Related: This completes the fix for merge strategy removal from PUT endpoints
This commit is contained in:
taylanbakircioglu
2025-11-13 15:54:35 +03:00
parent 46735c1894
commit ebcdf4174e
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/routers/frontend.py
+4 -13
View File
@@ -600,10 +600,9 @@ async def update_frontend(frontend_id: int, frontend: FrontendConfig, request: R
conn = await get_database_connection()
# Check if frontend exists and get current configuration (including request_headers and tcp_request_rules for merge strategy)
# Check if frontend exists and get current configuration
existing = await conn.fetchrow("""
SELECT id, name, cluster_id, ssl_enabled, ssl_certificate_id, ssl_port, ssl_cert_path, ssl_cert, ssl_verify,
request_headers, tcp_request_rules
SELECT id, name, cluster_id, ssl_enabled, ssl_certificate_id, ssl_port, ssl_cert_path, ssl_cert, ssl_verify
FROM frontends WHERE id = $1
""", frontend_id)
if not existing:
@@ -663,15 +662,7 @@ async def update_frontend(frontend_id: int, frontend: FrontendConfig, request: R
if filtered_options != frontend.options and frontend.options:
logger.info(f"Frontend '{frontend.name}': Filtered 'option httpchk' from options field. Health checks are for backends.")
# BUGFIX: Merge strategy for tcp_request_rules (preserve from bulk import)
# TCP request rules from bulk import should be preserved during frontend edit
merged_tcp_request_rules = frontend.tcp_request_rules
if not merged_tcp_request_rules and existing['tcp_request_rules']:
# If user didn't modify tcp_request_rules (empty/null), preserve existing
merged_tcp_request_rules = existing['tcp_request_rules']
logger.info(f"FRONTEND UPDATE: Preserved tcp_request_rules for frontend '{frontend.name}'")
# Update frontend with all form fields (using preserved/merged values)
# Update frontend with all form fields
await conn.execute("""
UPDATE frontends SET
name = $1, bind_address = $2, bind_port = $3,
@@ -686,7 +677,7 @@ async def update_frontend(frontend_id: int, frontend: FrontendConfig, request: R
frontend.default_backend, frontend.mode, ssl_enabled,
ssl_certificate_id, ssl_cert_ids_json, ssl_port, ssl_cert_path, ssl_cert, ssl_verify,
json.dumps(frontend.acl_rules or []), json.dumps(frontend.redirect_rules or []), json.dumps(frontend.use_backend_rules or []),
frontend.request_headers, frontend.response_headers, filtered_options, merged_tcp_request_rules, frontend.timeout_client, frontend.timeout_http_request,
frontend.request_headers, frontend.response_headers, filtered_options, frontend.tcp_request_rules, frontend.timeout_client, frontend.timeout_http_request,
frontend.rate_limit, frontend.compression, frontend.log_separate, frontend.monitor_uri,
frontend.cluster_id, frontend.maxconn, frontend_id)