Changeset 14d718f in mod_gnutls

Timestamp:

Nov 11, 2012, 4:04:15 PM (7 years ago)

Author:

Dash Shendy <neuromancer@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, msva, upstream

Children:

9ddaa29

Parents:

9ee0464

Message:

Added support for wildcards in ServerAlias? configuration directive

Signed-off-by: Dash Shendy <neuromancer@…>

File:

• src/gnutls_hooks.c (modified) (3 diffs)

src/gnutls_hooks.c

@@ -509 +509 @@
 } vhost_cb_rec;
 
+/**
+ * Matches the current vhost's ServerAlias directives
+ *
+ * @param x vhost callback record
+ * @param s server record
+ * @return true if a match, false otherwise
+ *
+ */
+int check_server_aliases(vhost_cb_rec *x, server_rec * s, mgs_srvconf_rec *tsc) {
+        apr_array_header_t *names;
+        int i,rv = 0;
+
+        /* Check ServerName First! */
+        if(apr_strnatcasecmp(x->sni_name, s->server_hostname) == 0) {
+                // We have a match, save this server configuration
+                x->sc = tsc;
+                rv = 1;
+        /* Check any ServerAlias directives */
+        } else if(s->names) {
+                names = s->names;
+                char **name = (char **)names->elts;
+                for (i = 0; i < names->nelts; ++i) {
+        if (!name[i]) { continue; } 
+                        if (apr_strnatcasecmp(x->sni_name, name[i]) == 0) { 
+                                // We have a match, save this server configuration
+                                x->sc = tsc;
+                                rv = 1;
+            }                   
+                }
+        /* Wild any ServerAlias Directives */
+        } else if(s->wild_names) {
+                names = s->wild_names;
+    char **name = (char **)names->elts;
+                for (i = 0; i < names->nelts; ++i) {
+                        if (!name[i]) { continue; }
+                        if(apr_fnmatch(name[i], x->sni_name , 
+                                                                                APR_FNM_CASE_BLIND|
+                                                                                APR_FNM_PERIOD|
+                                                                                APR_FNM_PATHNAME|
+                                                                                APR_FNM_NOESCAPE) == APR_SUCCESS) { 
+                                x->sc = tsc;
+                                rv = 1; 
+                        }
+                }
+        }
+        return rv;
+}
+
 static int vhost_cb(void *baton, conn_rec * conn, server_rec * s) {
     mgs_srvconf_rec *tsc;
     vhost_cb_rec *x = baton;
-    apr_array_header_t *names;
-    int i;
     
     _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__);
@@ -523 +569 @@
     }
     
-    /* Check ServerName First! */
-    if(!apr_strnatcasecmp(x->sni_name, s->server_hostname)) {
-            x->sc = tsc;return 1;
-    } else if(s->names) {
-    /* ServerAlias Directives */
-            names = s->names;
-            char **name = (char **)names->elts;            
-            for (i = 0; i < names->nelts; ++i) {
-                    if (!name[i]) { continue; } 
-                    if (!apr_strnatcasecmp(x->sni_name, name[i])) { 
-                        x->sc = tsc;return 1; }
-            }        
-    } else if(s->wild_names) {
-    /* Wild ServerAlias Directives */
-            names = s->wild_names;
-            char **name = (char **)names->elts;
-            for (i = 0; i < names->nelts; ++i) {
-                    if (!name[i]) { continue; } 
-                    if (!ap_strcasecmp_match(x->sni_name, name[i])) { 
-                        x->sc = tsc;return 1; }
-            }            
-    }
-    
-    return 0;
+    return check_server_aliases(x, s, tsc);
 }
 #endif
@@ -604 +627 @@
         
         if (tsc->enabled != GNUTLS_ENABLED_TRUE) { continue; }
-
-        /* Check ServerName First! */
-        if(!apr_strnatcasecmp(sni_name, s->server_hostname)) {
-                return tsc;
-        } else if(s->names) {
-        /* ServerAlias Directives */
-                names = s->names;
-                char **name = (char **)names->elts;            
-                for (i = 0; i < names->nelts; ++i) {
-                        if (!name[i]) { continue; } 
-                        if (!apr_strnatcasecmp(sni_name, name[i])) { 
-                            return tsc; }
-                }        
-        } else if(s->wild_names) {
-        /* Wild ServerAlias Directives */
-                names = s->wild_names;
-                char **name = (char **)names->elts;
-                for (i = 0; i < names->nelts; ++i) {
-                        if (!name[i]) { continue; } 
-                        if (!ap_strcasecmp_match(sni_name, name[i])) { 
-                            return tsc; }
-                }            
-        } /* End Wild Names*/        
-    } /* End For Loop */
+                                
+                                if(check_server_aliases(x, s, tsc)) {
+                                        return tsc;
+                                }
 #endif
     return NULL;