adding check for upstream name whether equaling the host

Author: xiaokai-wang

src/ngx_stream_upsync_module.c

@@ -219,7 +219,7 @@ static ngx_int_t ngx_stream_upsync_check_index(
     ngx_stream_upsync_server_t *upsync_server);
 static ngx_int_t ngx_stream_upsync_consul_parse_json(void *upsync_server);
 static ngx_int_t ngx_stream_upsync_etcd_parse_json(void *upsync_server);
-static ngx_int_t ngx_stream_upsync_check_key(u_char *key);
+static ngx_int_t ngx_stream_upsync_check_key(u_char *key, ngx_str_t host);
 static void *ngx_stream_upsync_servers(ngx_cycle_t *cycle, 
     ngx_stream_upsync_server_t *upsync_server, ngx_flag_t flag);
 static void *ngx_stream_upsync_addrs(ngx_pool_t *pool, u_char *sockaddr);
@@ -712,7 +712,7 @@ ngx_stream_upsync_check_index(ngx_stream_upsync_server_t *upsync_server)
                            NGX_INDEX_HEARDER_LEN) == 0) {
                 p = ngx_strchr(state.headers[i][1], '\r');
                 *p = '\0';
-                index = strtoull((char *)state.headers[i][1],
+                index = ngx_strtoull((char *)state.headers[i][1],
                              (char **)NULL, 10);
                 break;
             }
@@ -736,7 +736,7 @@ ngx_stream_upsync_check_index(ngx_stream_upsync_server_t *upsync_server)
                            NGX_INDEX_ETCD_HEARDER_LEN) == 0) {
                 p = ngx_strchr(state.headers[i][1], '\r');
                 *p = '\0';
-                index = strtoull((char *)state.headers[i][1],
+                index = ngx_strtoull((char *)state.headers[i][1],
                              (char **)NULL, 10);
                 break;
             }
@@ -1153,17 +1153,12 @@ ngx_stream_upsync_consul_parse_json(void *data)
     {
         cJSON *temp1 = cJSON_GetObjectItem(server_next, "Key");
         if (temp1 != NULL && temp1->valuestring != NULL) {
-            p = (u_char *)ngx_strrchr(temp1->valuestring, '/');
-            if (p == NULL) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
-                              "consul_upsync_parse_json: %s key format is "
-                              "illegal, contains no slash ('/')", 
-                              temp1->valuestring);
-                continue;
-            } else if (ngx_stream_upsync_check_key(p) != NGX_OK) {
+            if (ngx_stream_upsync_check_key((u_char *)temp1->valuestring,
+                                             upsync_server->host) != NGX_OK) {
                 continue;
             }
 
+            p = (u_char *)ngx_strrchr(temp1->valuestring, '/');
             upstream_conf = ngx_array_push(&ctx->upstream_conf);
             ngx_memzero(upstream_conf, sizeof(*upstream_conf));
             ngx_sprintf(upstream_conf->sockaddr, "%*s", ngx_strlen(p + 1), p + 1);
@@ -1400,16 +1395,12 @@ ngx_stream_upsync_etcd_parse_json(void *data)
     {
         cJSON *temp0 = cJSON_GetObjectItem(server_next, "key");
         if (temp0 != NULL && temp0->valuestring != NULL) {
-            p = (u_char *)ngx_strrchr(temp0->valuestring, '/');
-            if (p == NULL) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
-                              "etcd_upsync_parse_json: %s key format is illegal,"
-                              "contains no slash ('/')", temp0->valuestring);
-                continue;
-            } else if (ngx_stream_upsync_check_key(p) != NGX_OK) {
+            if (ngx_stream_upsync_check_key((u_char *)temp0->valuestring,
+                                             upsync_server->host) != NGX_OK) {
                 continue;
             }
 
+            p = (u_char *)ngx_strrchr(temp0->valuestring, '/');
             upstream_conf = ngx_array_push(&ctx->upstream_conf);
             ngx_memzero(upstream_conf, sizeof(*upstream_conf));
             ngx_sprintf(upstream_conf->sockaddr, "%*s", ngx_strlen(p + 1), p + 1);
@@ -1552,30 +1543,44 @@ ngx_stream_upsync_etcd_parse_json(void *data)
 
 
 static ngx_int_t
-ngx_stream_upsync_check_key(u_char *key)
+ngx_stream_upsync_check_key(u_char *key, ngx_str_t host)
 {
-    u_char          *last, *ip_p, *port_p;
+    u_char          *last, *ip_p, *port_p, *s_p;
     ngx_int_t        port;
 
-    port_p = (u_char *)ngx_strchr(key, ':');
+    s_p = (u_char *)ngx_strrchr(key, '/');
+    if (s_p == NULL) {
+        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
+                      "upsync_parse_json: %s key format is illegal, "
+                      "contains no slash ('/')", key);
+        return NGX_ERROR;
+    }
+    if (*(s_p - host.len - 1) != '/') {
+        return NGX_ERROR;
+    }
+    if (ngx_strncmp((s_p - host.len), host.data, host.len) != 0) {
+        return NGX_ERROR;
+    }
+
+    port_p = (u_char *)ngx_strchr(s_p, ':');
     if (port_p == NULL) {
         ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, 
-                      "upsync_check_key: has no port in %s", key);
+                      "upsync_check_key: has no port in %s", s_p);
         return NGX_ERROR;
     }
 
-    ip_p = key + 1;
+    ip_p = s_p + 1;
     if (ngx_inet_addr(ip_p, port_p - ip_p) == INADDR_NONE) {
         ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, 
-                      "upsync_check_key: invalid ip in %s", key);
+                      "upsync_check_key: invalid ip in %s", s_p);
         return NGX_ERROR;
     }
 
     last = ip_p + ngx_strlen(ip_p);
     port = ngx_atoi(port_p + 1, last - port_p - 1);
     if (port < 1 || port > 65535) {
         ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, 
-                      "upsync_check_key: invalid port in %s", key);
+                      "upsync_check_key: invalid port in %s", s_p);
         return NGX_ERROR;
     }
 

src/ngx_stream_upsync_module.h

@@ -17,6 +17,8 @@
 #define ngx_fopen(path, mode)           fopen(path, mode)
 #define ngx_fclose(fp)                  fclose(fp)
 
+#define ngx_strtoull(nptr, endptr, base) strtoull((const char *) nptr, \
+                                                  (char **) endptr, (int) base)
 
 #define NGX_INDEX_HEARDER "X-Consul-Index"
 #define NGX_INDEX_HEARDER_LEN 14