mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 15:17:01 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: mux-fcgi: Expose SERVER_SOFTWARE parameter by default

Browse Source 
As specified in the RFC3875 (section 4.1.17), this parameter must be set to
the name and version of the information server software making the CGI
request. Thus, it is now added to the default parameters defined by
HAProxy. It is set to the string "HAProxy $version".

This patch should fix the issue #1285 and must be backported as far as 2.2.
This commit is contained in:
Christopher Faulet 2021-06-11 13:34:42 +02:00
parent 1cf414b522
commit 5cd0e528cf
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/configuration.txt
View File

@ -21898,6 +21898,10 @@ applications. All these variables may be overwritten, with caution though.
| SERVER_PROTOCOL | Contains the request's protocol. | | SERVER_PROTOCOL | Contains the request's protocol. |
| | | | | |
+-------------------+-----------------------------------------------------+ +-------------------+-----------------------------------------------------+
| SERVER_SOFTWARE | Contains the string "HAProxy" followed by the |
| | current HAProxy version. |
| | |
+-------------------+-----------------------------------------------------+
| HTTPS | Set to a non-empty value ("on") if the script was | | HTTPS | Set to a non-empty value ("on") if the script was |
| | queried through the HTTPS protocol. | | | queried through the HTTPS protocol. |
| | | | | |

18
src/mux_fcgi.c
View File

@ -32,6 +32,7 @@
#include <haproxy/stream.h> #include <haproxy/stream.h>
#include <haproxy/stream_interface.h> #include <haproxy/stream_interface.h>
#include <haproxy/trace.h> #include <haproxy/trace.h>
#include <haproxy/version.h>
/* FCGI Connection flags (32 bits) */ /* FCGI Connection flags (32 bits) */
@ -188,7 +189,8 @@ struct fcgi_strm {
#define FCGI_SP_PATH_TRANS 0x00002000 #define FCGI_SP_PATH_TRANS 0x00002000
#define FCGI_SP_CONT_LEN 0x00004000 #define FCGI_SP_CONT_LEN 0x00004000
#define FCGI_SP_HTTPS 0x00008000 #define FCGI_SP_HTTPS 0x00008000
#define FCGI_SP_MASK 0x0000FFFF #define FCGI_SP_SRV_SOFT 0x00010000
#define FCGI_SP_MASK 0x0001FFFF
#define FCGI_SP_URI_MASK (FCGI_SP_SCRIPT_NAME|FCGI_SP_PATH_INFO|FCGI_SP_REQ_QS) #define FCGI_SP_URI_MASK (FCGI_SP_SCRIPT_NAME|FCGI_SP_PATH_INFO|FCGI_SP_REQ_QS)
/* FCGI parameters used when PARAMS record is sent */ /* FCGI parameters used when PARAMS record is sent */
@ -206,6 +208,7 @@ struct fcgi_strm_params {
struct ist rem_addr; struct ist rem_addr;
struct ist rem_port; struct ist rem_port;
struct ist cont_len; struct ist cont_len;
struct ist srv_soft;
int https; int https;
struct buffer *p; struct buffer *p;
}; };
@ -1413,6 +1416,12 @@ static int fcgi_set_default_param(struct fcgi_conn *fconn, struct fcgi_strm *fst
} }
} }
if (!(params->mask & FCGI_SP_SRV_SOFT)) {
params->srv_soft = ist2(b_tail(params->p), 0);
chunk_appendf(params->p, "HAProxy %s", haproxy_version);
params->srv_soft.len = b_tail(params->p) - params->srv_soft.ptr;
}
end: end:
return 1; return 1;
error: error:
@ -1502,6 +1511,10 @@ static int fcgi_encode_default_param(struct fcgi_conn *fconn, struct fcgi_strm *
p.n = ist("HTTPS"); p.n = ist("HTTPS");
p.v = ist("on"); p.v = ist("on");
goto encode; goto encode;
case FCGI_SP_SRV_SOFT:
p.n = ist("SERVER_SOFTWARE");
p.v = params->srv_soft;
goto encode;
default: default:
goto skip; goto skip;
} }
@ -2002,6 +2015,8 @@ static size_t fcgi_strm_send_params(struct fcgi_conn *fconn, struct fcgi_strm *f
params.mask |= FCGI_SP_PATH_TRANS; params.mask |= FCGI_SP_PATH_TRANS;
else if (isteq(p.n, ist("https"))) else if (isteq(p.n, ist("https")))
params.mask |= FCGI_SP_HTTPS; params.mask |= FCGI_SP_HTTPS;
else if (isteq(p.n, ist("server_software")))
params.mask |= FCGI_SP_SRV_SOFT;
} }
else if (isteq(p.n, ist("content-length"))) { else if (isteq(p.n, ist("content-length"))) {
p.n = ist("CONTENT_LENGTH"); p.n = ist("CONTENT_LENGTH");
@ -2082,6 +2097,7 @@ static size_t fcgi_strm_send_params(struct fcgi_conn *fconn, struct fcgi_strm *f
!fcgi_encode_default_param(fconn, fstrm, &params, &outbuf, FCGI_SP_SCRIPT_FILE) || !fcgi_encode_default_param(fconn, fstrm, &params, &outbuf, FCGI_SP_SCRIPT_FILE) ||
!fcgi_encode_default_param(fconn, fstrm, &params, &outbuf, FCGI_SP_PATH_TRANS) || !fcgi_encode_default_param(fconn, fstrm, &params, &outbuf, FCGI_SP_PATH_TRANS) ||
!fcgi_encode_default_param(fconn, fstrm, &params, &outbuf, FCGI_SP_CONT_LEN) || !fcgi_encode_default_param(fconn, fstrm, &params, &outbuf, FCGI_SP_CONT_LEN) ||
!fcgi_encode_default_param(fconn, fstrm, &params, &outbuf, FCGI_SP_SRV_SOFT) ||
!fcgi_encode_default_param(fconn, fstrm, &params, &outbuf, FCGI_SP_HTTPS)) { !fcgi_encode_default_param(fconn, fstrm, &params, &outbuf, FCGI_SP_HTTPS)) {
TRACE_ERROR("error encoding default params", FCGI_EV_TX_RECORD|FCGI_EV_STRM_ERR, fconn->conn, fstrm); TRACE_ERROR("error encoding default params", FCGI_EV_TX_RECORD|FCGI_EV_STRM_ERR, fconn->conn, fstrm);
goto error; goto error;