37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
|
From 8c1b1be9e4f11a8474f64dcb85d507a57b6cfe9f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Willy Tarreau <w@1wt.eu>
|
||
|
|
Date: Tue, 13 Aug 2013 17:19:08 +0200
|
||
|
|
Subject: [PATCH 7/9] MINOR: config: warn when a server with no specific port
|
||
|
|
uses rdp-cookie
|
||
|
|
|
||
|
|
Mathew Levett reported an issue which is a bit nasty and hard to track
|
||
|
|
down. RDP cookies contain both the IP and the port, and haproxy matches
|
||
|
|
them exactly. So if a server has no port specified (or a remapped port),
|
||
|
|
it will never match a port specified in a cookie. Better warn the user
|
||
|
|
when this is detected.
|
||
|
|
(cherry picked from commit 82ffa39bfd34e5680cb65cc0b7ef625c0a274856)
|
||
|
|
---
|
||
|
|
src/cfgparse.c | 6 ++++++
|
||
|
|
1 file changed, 6 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/src/cfgparse.c b/src/cfgparse.c
|
||
|
|
index 7d349b3..cecec03 100644
|
||
|
|
--- a/src/cfgparse.c
|
||
|
|
+++ b/src/cfgparse.c
|
||
|
|
@@ -5638,6 +5638,12 @@ out_uri_auth_compat:
|
||
|
|
err_code |= ERR_WARN;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if ((newsrv->state & SRV_MAPPORTS) && (curproxy->options2 & PR_O2_RDPC_PRST)) {
|
||
|
|
+ Warning("config : %s '%s' : RDP cookie persistence will not work for server '%s' because it lacks an explicit port number.\n",
|
||
|
|
+ proxy_type_str(curproxy), curproxy->id, newsrv->id);
|
||
|
|
+ err_code |= ERR_WARN;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
#if defined(CONFIG_HAP_CTTPROXY) || defined(CONFIG_HAP_LINUX_TPROXY)
|
||
|
|
if (curproxy->mode != PR_MODE_HTTP && newsrv->bind_hdr_occ) {
|
||
|
|
newsrv->bind_hdr_occ = 0;
|
||
|
|
--
|
||
|
|
1.8.1.5
|
||
|
|
|