Turn on build rigor, fix issues

Author: abedra

ngx_http_bot_verifier_module.c

@@ -230,11 +230,11 @@ ngx_http_bot_verifier_module_merge_loc_conf(ngx_conf_t *cf, void *parent, void *
   ngx_http_bot_verifier_module_loc_conf_t *prev = (ngx_http_bot_verifier_module_loc_conf_t *) parent;
   ngx_http_bot_verifier_module_loc_conf_t *conf = (ngx_http_bot_verifier_module_loc_conf_t *) child;
 
-  ngx_conf_merge_value(conf->enabled,                  prev->enabled,                  0);
-  ngx_conf_merge_value(conf->redis.port,               prev->redis.port,               6379);
-  ngx_conf_merge_value(conf->redis.connection_timeout, prev->redis.connection_timeout, 10);
-  ngx_conf_merge_value(conf->redis.read_timeout,       prev->redis.read_timeout,       10);
-  ngx_conf_merge_value(conf->redis.expiry,             prev->redis.expiry,             3600);
+  ngx_conf_merge_value(conf->enabled,                       prev->enabled,                  0);
+  ngx_conf_merge_uint_value(conf->redis.port,               prev->redis.port,               6379);
+  ngx_conf_merge_uint_value(conf->redis.connection_timeout, prev->redis.connection_timeout, 10);
+  ngx_conf_merge_uint_value(conf->redis.read_timeout,       prev->redis.read_timeout,       10);
+  ngx_conf_merge_uint_value(conf->redis.expiry,             prev->redis.expiry,             3600);
 
   return NGX_CONF_OK;
 }

ngx_http_bot_verifier_provider.c

@@ -8,7 +8,7 @@ provider_t *make_provider(char *name, char *valid_domains[], size_t len) {
   provider->len = len;
 
   int i;
-  for (i = 0; i < provider->len; i++) {
+  for (i = 0; i < (int)provider->len; i++) {
     provider->valid_domains[i] = valid_domains[i];
   }
 

ngx_http_bot_verifier_verifier.c

@@ -28,9 +28,9 @@ hostname_matches_provider_domain(ngx_http_request_t *r, char *hostname, ngx_http
       capture.data = ngx_hostname.data + captures[i];
       capture.len = captures[i + 1] - captures[i];
       ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "Capture: %V", &capture);
-      for (j = 0; j < loc_conf->provider_len; j++) {
+      for (j = 0; j < (int)loc_conf->provider_len; j++) {
 	// TODO: This could be optimized capturing the name of the provider that matched and only iteration through that providers valid domains.
-	for (k = 0; k < loc_conf->providers[j]->len; k++) {
+	for (k = 0; k < (int)loc_conf->providers[j]->len; k++) {
 	  ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "Comparing %s against: %s", capture.data, loc_conf->providers[j]->valid_domains[k]);
 	  if (ngx_strncmp(capture.data, loc_conf->providers[j]->valid_domains[k], strlen(loc_conf->providers[j]->valid_domains[k])) == 0) {
 	    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "Found match for %V with %V", &ngx_hostname, &capture);

script/bootstrap

@@ -3,11 +3,12 @@
 set -o nounset
 set -o errexit
 
-NGINX_VERSION=1.14.0
+NGINX_VERSION=1.16.0
 
 DIR=$(pwd)
 BUILDDIR=$DIR/build
 NGINX_DIR=nginx
+DEBUG_FLAGS="-g -O0 -Wall -Werror -static-libasan -fsanitize=address -fsanitize=leak -fsanitize=undefined -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null"
 
 setup_local_directories () {
     if [ ! -d $BUILDDIR ]; then
@@ -36,13 +37,13 @@ install_nginx () {
         curl -s -L -O "http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz"
         tar xzf "nginx-$NGINX_VERSION.tar.gz"
         pushd "nginx-$NGINX_VERSION" > /dev/null 2>&1
-	CFLAGS="-g -O0 -Wall -Werror" ./configure         \
-            --with-debug                                  \
-            --prefix=$(pwd)/../../build/nginx             \
-            --conf-path=conf/nginx.conf                   \
-            --error-log-path=logs/error.log               \
-            --http-log-path=logs/access.log               \
-	    --add-module=../echo-nginx-module             \
+	./configure                            \
+            --with-debug                       \
+            --prefix=$(pwd)/../../build/nginx  \
+            --conf-path=conf/nginx.conf        \
+            --error-log-path=logs/error.log    \
+            --http-log-path=logs/access.log    \
+	    --add-module=../echo-nginx-module  \
             --add-module=../..
         make
         make install
@@ -57,13 +58,15 @@ install_nginx () {
 compile () {
     pushd "vendor" > /dev/null 2>&1
     pushd "nginx-$NGINX_VERSION" > /dev/null 2>&1
-    CFLAGS="-g -O0 -Wall -Werror" ./configure        \
-        --with-debug                                 \
-        --prefix=$(pwd)/../../build/nginx            \
-        --conf-path=conf/nginx.conf                  \
-        --error-log-path=logs/error.log              \
-        --http-log-path=logs/access.log              \
-	--add-module=../echo-nginx-module            \
+    ./configure                             \
+        --with-debug                        \
+	--with-threads                      \
+	--with-ld-opt="-lasan -lubsan -ldl" \
+	--prefix=$(pwd)/../../build/nginx   \
+        --conf-path=conf/nginx.conf         \
+        --error-log-path=logs/error.log     \
+        --http-log-path=logs/access.log     \
+	--add-module=../echo-nginx-module   \
         --add-module=../..
     make
     make install