Add possibility to show rule ids in header

joelwurtz · joelwurtz · commit 7b1e4b54002d · 2020-05-12T10:35:53.000+02:00
diff --git a/src/mod_redirectionio.c b/src/mod_redirectionio.c
@@ -1,12 +1,3 @@
-#include "httpd.h"
-#include "http_config.h"
-#include "http_log.h"
-#include "http_protocol.h"
-#include "http_request.h"
-#include "ap_config.h"
-#include "apr_network_io.h"
-#include "apr_strings.h"
-#include "apr_uri.h"
 #include "mod_redirectionio.h"
 #include "redirectionio_protocol.h"
 
@@ -41,6 +32,8 @@ static apr_status_t redirectionio_child_exit(void *resource);
 static const char *redirectionio_set_enable(cmd_parms *cmd, void *cfg, const char *arg);
 static const char *redirectionio_set_project_key(cmd_parms *cmd, void *cfg, const char *arg);
 static const char *redirectionio_set_logs_enable(cmd_parms *cmd, void *cfg, const char *arg);
+static const char *redirectionio_set_scheme(cmd_parms *cmd, void *cfg, const char *arg);
+static const char *redirectionio_set_show_rule_ids(cmd_parms *cmd, void *cfg, const char *arg);
 static const char *redirectionio_set_pass(cmd_parms *cmd, void *cfg, const char *arg);
 static void redirectionio_apache_log_callback(const char* log_str, const void* data, short level);
 
@@ -49,6 +42,8 @@ static const command_rec redirectionio_directives[] = {
     AP_INIT_TAKE1("redirectionioPass", redirectionio_set_pass, NULL, OR_ALL, "Agent server location"),
     AP_INIT_TAKE1("redirectionioProjectKey", redirectionio_set_project_key, NULL, OR_ALL, "RedirectionIO project key"),
     AP_INIT_TAKE1("redirectionioLogs", redirectionio_set_logs_enable, NULL, OR_ALL, "Enable or disable logging for redirectionio"),
+    AP_INIT_TAKE1("redirectionioScheme", redirectionio_set_scheme, NULL, OR_ALL, "Force scheme to use when matching request"),
+    AP_INIT_TAKE1("redirectionioRuleIdsHeader", redirectionio_set_show_rule_ids, NULL, OR_ALL, "Show rule ids used on response header"),
     { NULL }
 };
 
@@ -509,11 +504,13 @@ static void *create_redirectionio_dir_conf(apr_pool_t *pool, char *context) {
         config->enable = -1;
         config->enable_logs = -1;
         config->project_key = NULL;
+        config->scheme = NULL;
         config->protocol = TCP;
         config->port = 10301;
         config->server = "127.0.0.1";
         config->pass_set = -1;
         config->pool = pool;
+        config->show_rule_ids = -1;
     }
 
     return config;
@@ -537,12 +534,24 @@ static void *merge_redirectionio_dir_conf(apr_pool_t *pool, void *parent, void *
         conf->enable_logs = conf_current->enable_logs;
     }
 
+    if (conf_current->show_rule_ids == -1) {
+        conf->show_rule_ids = conf_parent->show_rule_ids;
+    } else {
+        conf->show_rule_ids = conf_current->show_rule_ids;
+    }
+
     if (conf_current->project_key == NULL) {
         conf->project_key = conf_parent->project_key;
     } else {
         conf->project_key = conf_current->project_key;
     }
 
+    if (conf_current->scheme == NULL) {
+        conf->scheme = conf_parent->scheme;
+    } else {
+        conf->scheme = conf_current->scheme;
+    }
+
     if (conf_current->pass_set == -1) {
         conf->port = conf_parent->port;
         conf->protocol = conf_parent->protocol;
@@ -621,6 +630,10 @@ static const char *redirectionio_set_enable(cmd_parms *cmd, void *cfg, const cha
             if (conf->enable_logs == -1) {
                 conf->enable_logs = 1;
             }
+
+            if (conf->show_rule_ids == -1) {
+                conf->show_rule_ids = 0;
+            }
         } else {
             conf->enable = 0;
         }
@@ -647,6 +660,16 @@ static const char *redirectionio_set_project_key(cmd_parms *cmd, void *cfg, cons
     return NULL;
 }
 
+static const char *redirectionio_set_scheme(cmd_parms *cmd, void *cfg, const char *arg) {
+    redirectionio_config *conf = (redirectionio_config*)cfg;
+
+    if (conf) {
+        conf->scheme = arg;
+    }
+
+    return NULL;
+}
+
 static const char *redirectionio_set_logs_enable(cmd_parms *cmd, void *cfg, const char *arg) {
     redirectionio_config *conf = (redirectionio_config*)cfg;
 
@@ -661,6 +684,20 @@ static const char *redirectionio_set_logs_enable(cmd_parms *cmd, void *cfg, cons
     return NULL;
 }
 
+static const char *redirectionio_set_show_rule_ids(cmd_parms *cmd, void *cfg, const char *arg) {
+    redirectionio_config *conf = (redirectionio_config*)cfg;
+
+    if (conf) {
+        if(!strcasecmp(arg, "on")) {
+            conf->show_rule_ids = 1;
+        } else {
+            conf->show_rule_ids = 0;
+        }
+    }
+
+    return NULL;
+}
+
 static const char *redirectionio_set_pass(cmd_parms *cmd, void *cfg, const char *arg) {
     apr_uri_t               uri;
     redirectionio_config    *conf = (redirectionio_config*)cfg;
diff --git a/src/mod_redirectionio.h b/src/mod_redirectionio.h
@@ -3,6 +3,15 @@
 
 #include "apr_network_io.h"
 #include "apr_reslist.h"
+#include "httpd.h"
+#include "http_config.h"
+#include "http_log.h"
+#include "http_protocol.h"
+#include "http_request.h"
+#include "ap_config.h"
+#include "apr_network_io.h"
+#include "apr_strings.h"
+#include "apr_uri.h"
 #include "redirectionio.h"
 
 #ifndef APR_UNIX
@@ -34,12 +43,14 @@
 
 typedef struct {
     const char*     project_key;
+    const char*     scheme;
     char*           server;
     int             port;
     int             protocol;
     int             enable;
     int             enable_logs;
     int             pass_set;
+    int             show_rule_ids;
     apr_reslist_t   *connection_pool;
     apr_pool_t      *pool;
 } redirectionio_config;
@@ -56,4 +67,6 @@ typedef struct {
     struct REDIRECTIONIO_FilterBodyAction   *body_filter;
 } redirectionio_context;
 
+module AP_MODULE_DECLARE_DATA redirectionio_module;
+
 #endif
diff --git a/src/redirectionio_protocol.c b/src/redirectionio_protocol.c
@@ -36,6 +36,7 @@ apr_status_t redirectionio_protocol_match(redirectionio_connection *conn, redire
     const apr_array_header_t        *tarr = apr_table_elts(r->headers_in);
     const apr_table_entry_t         *telts = (const apr_table_entry_t*)tarr->elts;
     int                             i;
+    redirectionio_config            *config = (redirectionio_config*) ap_get_module_config(r->per_dir_config, &redirectionio_module);
 
     // Create request header map
     for (i = 0; i < tarr->nelts; i++) {
@@ -53,7 +54,12 @@ apr_status_t redirectionio_protocol_match(redirectionio_connection *conn, redire
     }
 
     // Create redirection io request
-    scheme = r->parsed_uri.scheme ? r->parsed_uri.scheme : ap_http_scheme(r);
+    scheme = config->scheme;
+
+    if (scheme == NULL) {
+        scheme = r->parsed_uri.scheme ? r->parsed_uri.scheme : ap_http_scheme(r);
+    }
+
     ctx->request = (struct REDIRECTIONIO_Request *)redirectionio_request_create(r->unparsed_uri, r->hostname, scheme, r->method, first_header);
 
     if (ctx->request == NULL) {
@@ -182,6 +188,7 @@ apr_status_t redirectionio_protocol_send_filter_headers(redirectionio_context *c
     int                             i;
     char                            *name_str, *value_str;
     struct REDIRECTIONIO_HeaderMap  *first_header = NULL, *current_header = NULL;
+    redirectionio_config            *config = (redirectionio_config*) ap_get_module_config(r->per_dir_config, &redirectionio_module);
 
     // Create request header map
     for (i = 0; i < tarr->nelts; i++) {
@@ -198,7 +205,7 @@ apr_status_t redirectionio_protocol_send_filter_headers(redirectionio_context *c
         first_header = current_header;
     }
 
-    first_header = (struct REDIRECTIONIO_HeaderMap *)redirectionio_action_header_filter_filter(ctx->action, first_header, r->status);
+    first_header = (struct REDIRECTIONIO_HeaderMap *)redirectionio_action_header_filter_filter(ctx->action, first_header, r->status, config->show_rule_ids == 1);
     ctx->response_headers = first_header;
 
     // Even if error returns success, as it does not affect anything
