Add redirection io set header for apache

Author: joelwurtz

Diff for: src/mod_redirectionio.c

@@ -35,6 +35,7 @@ static const char *redirectionio_set_logs_enable(cmd_parms *cmd, void *cfg, cons
 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_server(cmd_parms *cmd, void *dc, int argc, char *const argv[]);
+static const char *redirectionio_set_header(cmd_parms *cmd, void *cfg, const char *arg1, const char *arg2);
 static void redirectionio_apache_log_callback(const char* log_str, const void* data, short level);
 static apr_status_t redirectionio_atoi(const char *line, apr_size_t len);
 
@@ -45,6 +46,7 @@ static const command_rec redirectionio_directives[] = {
     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"),
+    AP_INIT_TAKE2("redirectionioSetHeader", redirectionio_set_header, NULL, OR_ALL, "Add header to match in redirectionio request"),
     { NULL }
 };
 
@@ -506,6 +508,7 @@ static void *create_redirectionio_dir_conf(apr_pool_t *pool, char *context) {
         config->server.timeout = RIO_TIMEOUT;
         config->pool = pool;
         config->show_rule_ids = -1;
+        config->headers_set = NULL;
     }
 
     return config;
@@ -523,6 +526,14 @@ static void *merge_redirectionio_dir_conf(apr_pool_t *pool, void *parent, void *
         conf->enable = conf_current->enable;
     }
 
+    if (conf_current->headers_set == NULL) {
+        conf->headers_set = conf_parent->headers_set;
+    } else if (conf_parent->headers_set == NULL) {
+        conf->headers_set = conf_current->headers_set;
+    } else {
+        conf->headers_set = apr_table_overlay(pool, conf_current->headers_set, conf_parent->headers_set);
+    }
+
     if (conf_current->enable_logs == -1) {
         conf->enable_logs = conf_parent->enable_logs;
     } else {
@@ -806,6 +817,18 @@ static const char *redirectionio_set_server(cmd_parms *cmd, void *cfg, int argc,
     return NULL;
 }
 
+static const char *redirectionio_set_header(cmd_parms *cmd, void *cfg, const char *arg1, const char *arg2) {
+    redirectionio_config *conf = (redirectionio_config*)cfg;
+
+    if (conf->headers_set == NULL) {
+        conf->headers_set = apr_table_make(conf->pool, 10);
+    }
+
+    apr_table_set(conf->headers_set, arg1, arg2);
+
+    return NULL;
+}
+
 static void redirectionio_apache_log_callback(const char* log_str, const void* data, short level) {
     if (level <= 1) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, (request_rec *)data, "mod_redirectionio api error: %s", log_str);

Diff for: src/mod_redirectionio.h

@@ -61,6 +61,7 @@ typedef struct {
     int                     show_rule_ids;
     apr_reslist_t           *connection_pool;
     apr_pool_t              *pool;
+    apr_table_t             *headers_set;
 } redirectionio_config;
 
 typedef struct {

Diff for: src/redirectionio_protocol.c

@@ -33,12 +33,16 @@ apr_status_t redirectionio_protocol_match(redirectionio_connection *conn, redire
     struct REDIRECTIONIO_HeaderMap  *first_header = NULL, *current_header = NULL;
     const char                      *request_serialized, *scheme;
     char                            *action_serialized;
-    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;
+    const apr_array_header_t        *tarr;
+    const apr_table_entry_t         *telts;
     int                             i;
     redirectionio_config            *config = (redirectionio_config*) ap_get_module_config(r->per_dir_config, &redirectionio_module);
 
     // Create request header map
+    // First header from request
+    tarr = apr_table_elts(r->headers_in);
+    telts = (const apr_table_entry_t*)tarr->elts;
+
     for (i = 0; i < tarr->nelts; i++) {
         current_header = (struct REDIRECTIONIO_HeaderMap *) apr_palloc(r->pool, sizeof(struct REDIRECTIONIO_HeaderMap));
 
@@ -53,6 +57,26 @@ apr_status_t redirectionio_protocol_match(redirectionio_connection *conn, redire
         first_header = current_header;
     }
 
+    // Then header from config
+    if (config->headers_set != NULL) {
+        tarr = apr_table_elts(config->headers_set);
+        telts = (const apr_table_entry_t*)tarr->elts;
+
+        for (i = 0; i < tarr->nelts; i++) {
+            current_header = (struct REDIRECTIONIO_HeaderMap *) apr_palloc(r->pool, sizeof(struct REDIRECTIONIO_HeaderMap));
+
+            if (current_header == NULL) {
+                return APR_EGENERAL;
+            }
+
+            current_header->name = (const char *)telts[i].key;
+            current_header->value = (const char *)telts[i].val;
+            current_header->next = first_header;
+
+            first_header = current_header;
+        }
+    }
+
     // Create redirection io request
     scheme = config->scheme;