Merge pull request #307 from u5surf/fix_encode_without_pcre2

fix: escape uri in module side

Author: u5surf

share/status.template.html

@@ -631,7 +631,7 @@ <h1>
                            ? '<img class="flag flag-{}" />'.format(name.toLowerCase())
                            : '';
 
-                    s = '{}{}'.format(aHe('th', encodeURI('{}{}'.format(flag, name))),
+                    s = '{}{}'.format(aHe('th', '{}{}'.format(flag, name)),
                                       aHe('td', [(zone.requestCounter + zone.overCounts['maxIntegerSize'] * zone.overCounts['requestCounter']),
                                                  aPs.getValue('{}.{}'.format(uniq, 'requestCounter'), zone.requestCounter), mTh(zone.requestMsec)
                                                 ]));
@@ -681,7 +681,7 @@ <h1>
 
                     clas = (n++ % 2) ? 'odd' : '';
 
-                    s = '{}{}'.format(aHe('th', encodeURI(peer.server)),
+                    s = '{}{}'.format(aHe('th', peer.server),
                                       aHe('td', [sTh(peer.backup, peer.down), mTh(peer.responseMsec),
                                                  peer.weight, peer.maxFails, peer.failTimeout,
                                                  (peer.requestCounter + peer.overCounts['maxIntegerSize'] * peer.overCounts['requestCounter']),
@@ -722,7 +722,7 @@ <h1>
 
                     clas = (n++ % 2) ? 'odd' : '';
 
-                    s = '{}{}'.format(aHe('th', encodeURI(name)),
+                    s = '{}{}'.format(aHe('th', name),
                                       aHe('td', [bTh(zone.maxSize),
                                                  bTh(zone.usedSize),
                                                  bTh(zone.outBytes + zone.overCounts['maxIntegerSize'] * zone.overCounts['outBytes']),

src/ngx_http_vhost_traffic_status_display_json.c

@@ -92,6 +92,7 @@ ngx_http_vhost_traffic_status_display_set_server_node(
     }
 
 #if (NGX_HTTP_CACHE)
+    ngx_http_vhost_traffic_status_display_encode_uri(r, &dst);
     buf = ngx_sprintf(buf, NGX_HTTP_VHOST_TRAFFIC_STATUS_JSON_FMT_SERVER,
                       &dst, vtsn->stat_request_counter,
                       vtsn->stat_in_bytes,
@@ -140,6 +141,7 @@ ngx_http_vhost_traffic_status_display_set_server_node(
                       vtsn->stat_cache_scarce_counter_oc,
                       vtsn->stat_request_time_counter_oc);
 #else
+    ngx_http_vhost_traffic_status_display_encode_uri(r, &dst);
     buf = ngx_sprintf(buf, NGX_HTTP_VHOST_TRAFFIC_STATUS_JSON_FMT_SERVER,
                       &dst, vtsn->stat_request_counter,
                       vtsn->stat_in_bytes,
@@ -286,6 +288,31 @@ ngx_http_vhost_traffic_status_display_set_filter_node(ngx_http_request_t *r,
     return ngx_http_vhost_traffic_status_display_set_server_node(r, buf, &key, vtsn);
 }
 
+void
+ngx_http_vhost_traffic_status_display_encode_uri(ngx_http_request_t *r,
+    ngx_str_t *uri)
+{
+
+    size_t     len;
+    ngx_str_t  *euri;
+    u_char     *p;
+    euri = uri;
+    len = ngx_escape_html(NULL, uri->data, uri->len);
+
+    if (len) {
+        p = ngx_pnalloc(r->pool, uri->len + len);
+        if (p == NULL) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "display_encode_uri::ngx_pnalloc() failed");
+        }
+
+        (void) ngx_escape_html(p, uri->data, uri->len);
+        euri->data = p;
+        euri->len = uri->len + len;
+        uri = euri;
+    }
+    return;
+}
 
 u_char *
 ngx_http_vhost_traffic_status_display_set_filter(ngx_http_request_t *r,
@@ -332,6 +359,7 @@ ngx_http_vhost_traffic_status_display_set_filter(ngx_http_request_t *r,
                                   "display_set_filter::escape_json_pool() failed");
                 }
 
+                ngx_http_vhost_traffic_status_display_encode_uri(r, &filter);
                 buf = ngx_sprintf(buf, NGX_HTTP_VHOST_TRAFFIC_STATUS_JSON_FMT_OBJECT_S,
                                   &filter);
 
@@ -392,6 +420,7 @@ ngx_http_vhost_traffic_status_display_set_upstream_node(ngx_http_request_t *r,
     }
 
     if (vtsn != NULL) {
+        ngx_http_vhost_traffic_status_display_encode_uri(r, &key);
         buf = ngx_sprintf(buf, NGX_HTTP_VHOST_TRAFFIC_STATUS_JSON_FMT_UPSTREAM,
                 &key, vtsn->stat_request_counter,
                 vtsn->stat_in_bytes, vtsn->stat_out_bytes,
@@ -434,6 +463,7 @@ ngx_http_vhost_traffic_status_display_set_upstream_node(ngx_http_request_t *r,
                 vtsn->stat_request_time_counter_oc, vtsn->stat_response_time_counter_oc);
 
     } else {
+        ngx_http_vhost_traffic_status_display_encode_uri(r, &key);
         buf = ngx_sprintf(buf, NGX_HTTP_VHOST_TRAFFIC_STATUS_JSON_FMT_UPSTREAM,
                 &key, (ngx_atomic_uint_t) 0,
                 (ngx_atomic_uint_t) 0, (ngx_atomic_uint_t) 0,
@@ -563,6 +593,7 @@ ngx_http_vhost_traffic_status_display_set_upstream_group(ngx_http_request_t *r,
 
             o = buf;
 
+            ngx_http_vhost_traffic_status_display_encode_uri(r, &uscf->host);
             buf = ngx_sprintf(buf, NGX_HTTP_VHOST_TRAFFIC_STATUS_JSON_FMT_ARRAY_S,
                               &uscf->host);
             s = buf;
@@ -703,6 +734,7 @@ ngx_http_vhost_traffic_status_display_set_upstream_group(ngx_http_request_t *r,
 
     ngx_str_set(&key, "::nogroups");
 
+    ngx_http_vhost_traffic_status_display_encode_uri(r, &key);
     buf = ngx_sprintf(buf, NGX_HTTP_VHOST_TRAFFIC_STATUS_JSON_FMT_ARRAY_S, &key);
 
     s = buf;
@@ -742,6 +774,7 @@ u_char
                       "display_set_cache_node::escape_json_pool() failed");
     }
 
+    ngx_http_vhost_traffic_status_display_encode_uri(r, &key);
     buf = ngx_sprintf(buf, NGX_HTTP_VHOST_TRAFFIC_STATUS_JSON_FMT_CACHE,
                       &key, vtsn->stat_cache_max_size,
                       vtsn->stat_cache_used_size,

src/ngx_http_vhost_traffic_status_display_json.h

@@ -257,6 +257,8 @@ u_char *ngx_http_vhost_traffic_status_display_set_cache(
 u_char *ngx_http_vhost_traffic_status_display_set(ngx_http_request_t *r,
     u_char *buf);
 
+void ngx_http_vhost_traffic_status_display_encode_uri(
+    ngx_http_request_t *r, ngx_str_t *uri);
 
 #endif /* _NGX_HTTP_VTS_DISPLAY_JSON_H_INCLUDED_ */