Revert "- With hide-version unbound also omits the version from http headers."

This reverts commit 9d4644b12583911be2a0c4be9a3bc47dfd95a039.

diff --git a/daemon/worker.c b/daemon/worker.c
index 3fdacef9e275961a725de7d17f5fb5a320711844..e9e163a0448b438e3d3cb8c9d808707bffd095e7 100644 (file)
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -1796,7 +1796,7 @@ worker_init(struct worker* worker, struct config_file *cfg,
                worker->daemon->connect_sslctx, cfg->delay_close,
                cfg->tls_use_sni, dtenv, cfg->udp_connect,
                cfg->max_reuse_tcp_queries, cfg->tcp_reuse_timeout,
-               cfg->tcp_auth_query_timeout, cfg->hide_version);
+               cfg->tcp_auth_query_timeout);
        if(!worker->back) {
                log_err("could not create outgoing sockets");
                worker_delete(worker);

diff --git a/doc/Changelog b/doc/Changelog
index 472762a59daac60a98857b0fdbd740561521ba9c..0d77c545234369694108a0d1bddeb213b03bfc81 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -7,7 +7,6 @@
        - Fix unbound-control local_data and local_datas to print detailed
          syntax errors.
        - review fix to remove duplicate error printout.
-       - With hide-version unbound also omits the version from http headers.
 
 6 July 2021: Wouter
        - iana portlist update.

diff --git a/libunbound/libworker.c b/libunbound/libworker.c
index 9c4485cb11c683b93189e5c380102f7236e50251..8a9ca94194807f4c1bc0b50d3d68291d3bcec567 100644 (file)
--- a/libunbound/libworker.c
+++ b/libunbound/libworker.c
@@ -243,7 +243,7 @@ libworker_setup(struct ub_ctx* ctx, int is_bg, struct ub_event_base* eb)
                cfg->do_udp || cfg->udp_upstream_without_downstream, w->sslctx,
                cfg->delay_close, cfg->tls_use_sni, NULL, cfg->udp_connect,
                cfg->max_reuse_tcp_queries, cfg->tcp_reuse_timeout,
-               cfg->tcp_auth_query_timeout, cfg->hide_version);
+               cfg->tcp_auth_query_timeout);
        w->env->outnet = w->back;
        if(!w->is_bg || w->is_bg_thread) {
                lock_basic_unlock(&ctx->cfglock);

diff --git a/services/outside_network.c b/services/outside_network.c
index 60dde2bcf3f9064ae9630d2d88b23ee6785a5325..af14f8622d4fb8adcc0ce53205133a8528b70dfc 100644 (file)
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1437,7 +1437,7 @@ outside_network_create(struct comm_base *base, size_t bufsize,
        void (*unwanted_action)(void*), void* unwanted_param, int do_udp,
        void* sslctx, int delayclose, int tls_use_sni, struct dt_env* dtenv,
        int udp_connect, int max_reuse_tcp_queries, int tcp_reuse_timeout,
-       int tcp_auth_query_timeout, int hide_version)
+       int tcp_auth_query_timeout)
 {
        struct outside_network* outnet = (struct outside_network*)
                calloc(1, sizeof(struct outside_network));
@@ -1471,7 +1471,6 @@ outside_network_create(struct comm_base *base, size_t bufsize,
        outnet->do_udp = do_udp;
        outnet->tcp_mss = tcp_mss;
        outnet->ip_dscp = dscp;
-       outnet->hide_version = hide_version;
 #ifndef S_SPLINT_S
        if(delayclose) {
                outnet->delayclose = 1;
@@ -3437,14 +3436,13 @@ outnet_comm_point_for_tcp(struct outside_network* outnet,
 
 /** setup http request headers in buffer for sending query to destination */
 static int
-setup_http_request(sldns_buffer* buf, char* host, char* path, int hide_version)
+setup_http_request(sldns_buffer* buf, char* host, char* path)
 {
        sldns_buffer_clear(buf);
        sldns_buffer_printf(buf, "GET /%s HTTP/1.1\r\n", path);
        sldns_buffer_printf(buf, "Host: %s\r\n", host);
-       if(!hide_version)
-               sldns_buffer_printf(buf, "User-Agent: unbound/%s\r\n",
-                       PACKAGE_VERSION);
+       sldns_buffer_printf(buf, "User-Agent: unbound/%s\r\n",
+               PACKAGE_VERSION);
        /* We do not really do multiple queries per connection,
         * but this header setting is also not needed.
         * sldns_buffer_printf(buf, "Connection: close\r\n") */
@@ -3496,7 +3494,7 @@ outnet_comm_point_for_http(struct outside_network* outnet,
        comm_point_start_listening(cp, fd, timeout);
 
        /* setup http request in cp->buffer */
-       if(!setup_http_request(cp->buffer, host, path, outnet->hide_version)) {
+       if(!setup_http_request(cp->buffer, host, path)) {
                log_err("error setting up http request");
                comm_point_delete(cp);
                return NULL;

diff --git a/services/outside_network.h b/services/outside_network.h
index 97ed048af9369c6051ea37050419154c41f84719..071f37dde45ce14d0b1363d96745c78c96fa14c8 100644 (file)
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -146,8 +146,6 @@ struct outside_network {
        int tcp_mss;
        /** IP_TOS socket option requested on the sockets */
        int ip_dscp;
-       /** hide version option */
-       int hide_version;
 
        /**
         * Array of tcp pending used for outgoing TCP connections.
@@ -546,7 +544,6 @@ struct serviced_query {
  * @param max_reuse_tcp_queries: max number of queries on a reuse connection.
  * @param tcp_reuse_timeout: timeout for REUSE entries in milliseconds.
  * @param tcp_auth_query_timeout: timeout in milliseconds for TCP queries to auth servers.
- * @param hide_version: if the version is hidden.
  * @return: the new structure (with no pending answers) or NULL on error.
  */
 struct outside_network* outside_network_create(struct comm_base* base,
@@ -557,7 +554,7 @@ struct outside_network* outside_network_create(struct comm_base* base,
        void (*unwanted_action)(void*), void* unwanted_param, int do_udp,
        void* sslctx, int delayclose, int tls_use_sni, struct dt_env *dtenv,
        int udp_connect, int max_reuse_tcp_queries, int tcp_reuse_timeout,
-       int tcp_auth_query_timeout, int hide_version);
+       int tcp_auth_query_timeout);
 
 /**
  * Delete outside_network structure.

diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index feb581d0813dd1009f382c15911781a57a198627..a19a1ec0d6027756f51443ce5dd0d33d07849048 100644 (file)
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -1052,7 +1052,7 @@ outside_network_create(struct comm_base* base, size_t bufsize,
        int ATTR_UNUSED(delayclose), int ATTR_UNUSED(tls_use_sni),
        struct dt_env* ATTR_UNUSED(dtenv), int ATTR_UNUSED(udp_connect),
        int ATTR_UNUSED(max_reuse_tcp_queries), int ATTR_UNUSED(tcp_reuse_timeout),
-       int ATTR_UNUSED(tcp_auth_query_timeout), int ATTR_UNUSED(hide_version))
+       int ATTR_UNUSED(tcp_auth_query_timeout))
 {
        struct replay_runtime* runtime = (struct replay_runtime*)base;
        struct outside_network* outnet =  calloc(1,