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

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.

(cherry picked from commit 5cd0e528cf2bed6eb1f79582ef89cf1667337e46)
Signed-off-by: Willy Tarreau <w@1wt.eu>
(cherry picked from commit b2a50298b1f6f46c943b77685142d59d3e69e193)
[wt: minor ctx adjustments]
Signed-off-by: Willy Tarreau <w@1wt.eu>

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 1338002..51e8d2f 100644 (file)
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -20864,6 +20864,10 @@ applications. All these variables may be overwritten, with caution though.
   | 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   |
   |                   | queried through the HTTPS protocol.                 |
   |                   |                                                     |

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 68954c0..7cc69e4 100644 (file)
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -32,6 +32,7 @@
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/trace.h>
+#include <haproxy/version.h>
 
 
 /* FCGI Connection flags (32 bits) */
@@ -186,7 +187,8 @@ struct fcgi_strm {
 #define FCGI_SP_PATH_TRANS     0x00002000
 #define FCGI_SP_CONT_LEN       0x00004000
 #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)
 
 /* FCGI parameters used when PARAMS record is sent */
@@ -204,6 +206,7 @@ struct fcgi_strm_params {
        struct ist rem_addr;
        struct ist rem_port;
        struct ist cont_len;
+       struct ist srv_soft;
        int https;
        struct buffer *p;
 };
@@ -1401,6 +1404,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:
        return 1;
   error:
@@ -1490,6 +1499,10 @@ static int fcgi_encode_default_param(struct fcgi_conn *fconn, struct fcgi_strm *
                        p.n = ist("HTTPS");
                        p.v = ist("on");
                        goto encode;
+               case FCGI_SP_SRV_SOFT:
+                       p.n = ist("SERVER_SOFTWARE");
+                       p.v = params->srv_soft;
+                       goto encode;
                default:
                        goto skip;
        }
@@ -1983,6 +1996,8 @@ static size_t fcgi_strm_send_params(struct fcgi_conn *fconn, struct fcgi_strm *f
                                                params.mask |= FCGI_SP_PATH_TRANS;
                                        else if (isteq(p.n, ist("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"))) {
                                        p.n = ist("CONTENT_LENGTH");
@@ -2061,6 +2076,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_PATH_TRANS)  ||
            !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))
                goto error;