Add the ProxyRemoteMatch directive to the mod_proxy

code. Doccos to be done soon

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93597 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 0c7a8beaf0d37705d8439c11c875efde76cdf1e4..4b4e95da734fd8193c0976bcb89f94956e1b67d5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.33-dev
 
+  *) New Directive for mod_proxy: ProxyRemoteMatch. This provides
+     regex pattern matching for the determination of which requests
+     to use the remote proxy for. [Jim Jagielski]
+
   *) Fix CustomLog bytes-sent with HTTP 0.9.  [Justin Erenkrantz]
 
   *) Prevent Apache from ignoring SIGHUP due to some lingering 1.3

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 3f23747eb2dd034bdbe33f09bc3c51ef1c276a77..e6e8f72a6777e3f01792921b293eb6ed63c1b142 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -431,6 +431,7 @@ static int proxy_handler(request_rec *r)
         for (i = 0; i < proxies->nelts; i++) {
             p2 = ap_strchr_c(ents[i].scheme, ':');  /* is it a partial URL? */
             if (strcmp(ents[i].scheme, "*") == 0 ||
+                (ents[i].use_regex && ap_regexec(ents[i].regexp, url, 0,NULL, 0)) ||
                 (p2 == NULL && strcasecmp(scheme, ents[i].scheme) == 0) ||
                 (p2 != NULL &&
                  strncasecmp(url, ents[i].scheme, strlen(ents[i].scheme)) == 0)) {
@@ -548,7 +549,7 @@ static void *merge_proxy_dir_config(apr_pool_t *p, void *basev, void *addv)
 
 
 static const char *
-    add_proxy(cmd_parms *cmd, void *dummy, const char *f1, const char *r1)
+    add_proxy(cmd_parms *cmd, void *dummy, const char *f1, const char *r1, int regex)
 {
     server_rec *s = cmd->server;
     proxy_server_conf *conf =
@@ -556,6 +557,7 @@ static const char *
     struct proxy_remote *new;
     char *p, *q;
     char *r, *f, *scheme;
+    regex_t *reg = NULL;
     int port;
 
     r = apr_pstrdup(cmd->pool, r1);
@@ -563,22 +565,35 @@ static const char *
     f = apr_pstrdup(cmd->pool, f1);
     p = strchr(r, ':');
     if (p == NULL || p[1] != '/' || p[2] != '/' || p[3] == '\0') {
-        return "ProxyRemote: Bad syntax for a remote proxy server";
+        if (regex)
+            return "ProxyRemoteMatch: Bad syntax for a remote proxy server";
+        else
+            return "ProxyRemote: Bad syntax for a remote proxy server";
     }
     else {
         scheme[p-r] = 0;
     }
     q = strchr(p + 3, ':');
     if (q != NULL) {
-        if (sscanf(q + 1, "%u", &port) != 1 || port > 65535)
-            return "ProxyRemote: Bad syntax for a remote proxy server (bad port number)";
+        if (sscanf(q + 1, "%u", &port) != 1 || port > 65535) {
+            if (regex)
+                return "ProxyRemoteMatch: Bad syntax for a remote proxy server (bad port number)";
+            else
+                return "ProxyRemote: Bad syntax for a remote proxy server (bad port number)";
+        }
         *q = '\0';
     }
     else
         port = -1;
     *p = '\0';
-    if (strchr(f, ':') == NULL)
-        ap_str_tolower(f);             /* lowercase scheme */
+    if (regex) {
+        reg = ap_pregcomp(cmd->pool, f, REG_EXTENDED);
+        if (!reg)
+            return "Regular expression for ProxyRemoteMatch could not be compiled.";
+    }
+    else
+        if (strchr(f, ':') == NULL)
+            ap_str_tolower(f);         /* lowercase scheme */
     ap_str_tolower(p + 3);             /* lowercase hostname */
 
     if (port == -1) {
@@ -590,9 +605,23 @@ static const char *
     new->protocol = r;
     new->hostname = p + 3;
     new->port = port;
+    new->regexp = reg;
+    new->use_regex = regex;
     return NULL;
 }
 
+static const char *
+    add_proxy_noregex(cmd_parms *cmd, void *dummy, const char *f1, const char *r1)
+{
+    return add_proxy(cmd, dummy, f1, r1, 0);
+}
+
+static const char *
+    add_proxy_regex(cmd_parms *cmd, void *dummy, const char *f1, const char *r1)
+{
+    return add_proxy(cmd, dummy, f1, r1, 1);
+}
+
 static const char *
     add_pass(cmd_parms *cmd, void *dummy, const char *f, const char *r)
 {
@@ -963,8 +992,10 @@ static const command_rec proxy_cmds[] =
     "location, in regular expression syntax"),
     AP_INIT_FLAG("ProxyRequests", set_proxy_req, NULL, RSRC_CONF,
      "on if the true proxy requests should be accepted"),
-    AP_INIT_TAKE2("ProxyRemote", add_proxy, NULL, RSRC_CONF,
+    AP_INIT_TAKE2("ProxyRemote", add_proxy_noregex, NULL, RSRC_CONF,
      "a scheme, partial URL or '*' and a proxy server"),
+    AP_INIT_TAKE2("ProxyRemoteMatch", add_proxy_regex, NULL, RSRC_CONF,
+     "a regex pattern and a proxy server"),
     AP_INIT_TAKE12("ProxyPass", add_pass, NULL, RSRC_CONF|ACCESS_CONF,
      "a virtual path and a URL"),
     AP_INIT_TAKE12("ProxyPassReverse", add_pass_reverse, NULL, RSRC_CONF|ACCESS_CONF,

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index ce7e157255e996d5c3fe8254e1fb0d5224264188..34edcfb2ebf418eeaa127d717b90ce050fbedb9f 100644 (file)
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -136,6 +136,8 @@ struct proxy_remote {
     const char *protocol;      /* the scheme used to talk to this proxy */
     const char *hostname;      /* the hostname of this proxy */
     apr_port_t  port;          /* the port for this proxy */
+    regex_t *regexp;           /* compiled regex (if any) for the remote */
+    int use_regex;             /* simple boolean. True if we have a regex pattern */
 };
 
 struct proxy_alias {