Add possibility to show rule ids in header

Author: joelwurtz

nginx-test.conf.in

@@ -31,6 +31,7 @@ http {
 
         redirectionio on;
         redirectionio_project_key 58056a48-664d-11e7-aeb0-0242ac130004;
+        redirectionio_add_rule_ids_header on;
         redirectionio_pass agent:10301;
 
         location /noredirection {

src/ngx_http_redirectionio_module.c

@@ -53,6 +53,14 @@ static ngx_command_t ngx_http_redirectionio_commands[] = {
         offsetof(ngx_http_redirectionio_conf_t, enable_logs),
         ngx_http_redirectionio_enable_state
     },
+    {
+        ngx_string("redirectionio_add_rule_ids_header"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+        ngx_conf_set_enum_slot,
+        NGX_HTTP_LOC_CONF_OFFSET,
+        offsetof(ngx_http_redirectionio_conf_t, show_rule_ids),
+        ngx_http_redirectionio_enable_state
+    },
     {
         ngx_string("redirectionio_pass"),
         NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -61,6 +69,14 @@ static ngx_command_t ngx_http_redirectionio_commands[] = {
         offsetof(ngx_http_redirectionio_conf_t, pass),
         NULL
     },
+    {
+        ngx_string("redirectionio_scheme"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+        ngx_conf_set_str_slot,
+        NGX_HTTP_LOC_CONF_OFFSET,
+        offsetof(ngx_http_redirectionio_conf_t, scheme),
+        NULL
+    },
     ngx_null_command /* command termination */
 };
 
@@ -321,6 +337,7 @@ static void *ngx_http_redirectionio_create_conf(ngx_conf_t *cf) {
 
     conf->enable = NGX_CONF_UNSET_UINT;
     conf->enable_logs = NGX_CONF_UNSET_UINT;
+    conf->show_rule_ids = NGX_CONF_UNSET_UINT;
 
     return conf;
 }
@@ -330,7 +347,9 @@ static char *ngx_http_redirectionio_merge_conf(ngx_conf_t *cf, void *parent, voi
     ngx_http_redirectionio_conf_t       *conf = child;
 
     ngx_conf_merge_uint_value(conf->enable_logs, prev->enable_logs, NGX_HTTP_REDIRECTIONIO_ON);
+    ngx_conf_merge_uint_value(conf->show_rule_ids, prev->show_rule_ids, NGX_HTTP_REDIRECTIONIO_OFF);
     ngx_conf_merge_str_value(conf->project_key, prev->project_key, "");
+    ngx_conf_merge_str_value(conf->scheme, prev->scheme, "");
 
     if (conf->pass.url.data == NULL) {
         if (prev->pass.url.data) {

src/ngx_http_redirectionio_module.h

@@ -40,6 +40,8 @@ typedef struct {
     ngx_uint_t                  enable;
     ngx_uint_t                  enable_logs;
     ngx_str_t                   project_key;
+    ngx_str_t                   scheme;
+    ngx_uint_t                  show_rule_ids;
     ngx_http_complex_value_t    *complex_target;
     ngx_url_t                   pass;
     ngx_reslist_t               *connection_pool;

src/ngx_http_redirectionio_module_filter.c

@@ -53,7 +53,7 @@ ngx_int_t ngx_http_redirectionio_headers_filter(ngx_http_request_t *r) {
 
     conf = ngx_http_get_module_loc_conf(r, ngx_http_redirectionio_module);
 
-    if (conf->enable == NGX_HTTP_REDIRECTIONIO_OFF) {
+    if (conf == NULL || conf->enable == NGX_HTTP_REDIRECTIONIO_OFF) {
         return ngx_http_next_header_filter(r);
     }
 
@@ -106,7 +106,7 @@ ngx_int_t ngx_http_redirectionio_headers_filter(ngx_http_request_t *r) {
     }
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "http redirectionio filtering on response status code %d", r->headers_out.status);
-    first_header = (struct REDIRECTIONIO_HeaderMap *)redirectionio_action_header_filter_filter(ctx->action, first_header, r->headers_out.status);
+    first_header = (struct REDIRECTIONIO_HeaderMap *)redirectionio_action_header_filter_filter(ctx->action, first_header, r->headers_out.status, conf->show_rule_ids == NGX_HTTP_REDIRECTIONIO_ON);
 
     if (first_header == NULL) {
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "http redirectionio no filter to add");

src/ngx_http_redirectionio_protocol.c

@@ -22,9 +22,16 @@ void ngx_http_redirectionio_protocol_send_match(ngx_connection_t *c, ngx_http_re
     ngx_list_part_t                 *part;
     struct REDIRECTIONIO_HeaderMap  *first_header = NULL, *current_header = NULL;
     const char                      *request_serialized;
-    char                            *method, *uri, *host = NULL, *scheme = "http";
+    char                            *method, *uri, *host = NULL, *scheme = NULL;
     ngx_uint_t                      i;
     ngx_pool_cleanup_t              *cln;
+    ngx_http_redirectionio_conf_t   *conf;
+
+    conf = ngx_http_get_module_loc_conf(r, ngx_http_redirectionio_module);
+
+    if (conf == NULL) {
+        return;
+    }
 
     // Create header map
     part = &r->headers_in.headers.part;
@@ -53,11 +60,17 @@ void ngx_http_redirectionio_protocol_send_match(ngx_connection_t *c, ngx_http_re
         first_header = current_header;
     }
 
-    #if (NGX_HTTP_SSL)
+    if (conf->scheme.len > 0) {
+        scheme = ngx_str_to_char(&conf->scheme, r->pool);
+    } else {
+        scheme = "http";
+    }
+
+#if (NGX_HTTP_SSL)
     if (r->connection->ssl) {
         scheme = "https";
     }
-    #endif
+#endif
 
     uri = ngx_str_to_char(&r->unparsed_uri, r->pool);
     method = ngx_str_to_char(&r->method_name, r->pool);