Changeset 2755

Timestamp:

Feb 26, 2016, 2:06:58 AM (9 years ago)

Author:

andersk

Message:

mod_vhost_ldap: Use scriptsVhost records rather than apacheConfig records

This will let us kill off the redundant apacheConfig records.  It
relies on the following CoS template in LDAP to make the
homeDirectory, uidNumber, and gidNumber fields available as generated
attributes in the scriptsVhost records.

dn: cn=vhostOwnerCoS,ou=VirtualHosts,dc=scripts,dc=mit,dc=edu
cn: vhostOwnerCoS
objectClass: top
objectClass: ldapSubEntry
objectClass: cosSuperDefinition
objectClass: cosIndirectDefinition
cosIndirectSpecifier: scriptsVhostAccount
cosAttribute: homeDirectory operational
cosAttribute: uid operational
cosAttribute: uidNumber operational
cosAttribute: gidNumber operational

File:

• trunk/server/common/oursrc/httpdmods/mod_vhost_ldap.c (modified) (7 diffs)

trunk/server/common/oursrc/httpdmods/mod_vhost_ldap.c

@@ -90 +90 @@
     char *dn;                           /* The saved dn from a successful search */
     char *name;                         /* ServerName */
-    char *admin;                        /* ServerAdmin */
-    char *docroot;                      /* DocumentRoot */
-    char *cgiroot;                      /* ScriptAlias */
+    char *home;                         /* HOME */
+    char *directory;                    /* DocumentRoot relative to HOME/web_scripts */
     char *uid;                          /* Suexec Uid */
     char *gid;                          /* Suexec Gid */
@@ -98 +97 @@
 
 char *attributes[] =
-  { "apacheServerName", "apacheDocumentRoot", "apacheScriptAlias", "apacheSuexecUid", "apacheSuexecGid", "apacheServerAdmin", 0 };
+  { "scriptsVhostName", "homeDirectory", "scriptsVhostDirectory", "uidNumber", "gidNumber", 0 };
 
 static int total_modules;
@@ -304 +303 @@
     }
     else {
-        conf->filter = "objectClass=apacheConfig";
+        conf->filter = "objectClass=scriptsVhost";
     }
 
@@ -509 +508 @@
     if (ldap_bv2escaped_filter_value(&hostnamebv, &shostnamebv) != 0)
         goto null;
-    apr_snprintf(filtbuf, FILTER_LENGTH, "(&(%s)(|(apacheServerName=%s)(apacheServerAlias=%s)))", conf->filter, shostnamebv.bv_val, shostnamebv.bv_val);
+    apr_snprintf(filtbuf, FILTER_LENGTH, "(&(%s)(|(scriptsVhostName=%s)(scriptsVhostAlias=%s)))", conf->filter, shostnamebv.bv_val, shostnamebv.bv_val);
     ber_memfree(shostnamebv.bv_val);
 
@@ -587 +586 @@
             char *val = apr_pstrdup (r->pool, vals[i]);
             /* These do not correspond to any real directives */
-            if (strcasecmp (attributes[i], "apacheSuexecUid") == 0) {
+            if (strcasecmp (attributes[i], "uidNumber") == 0) {
                 reqc->uid = val;
                 continue;
             }
-            else if (strcasecmp (attributes[i], "apacheSuexecGid") == 0) {
+            else if (strcasecmp (attributes[i], "gidNumber") == 0) {
                 reqc->gid = val;
                 continue;
             }
-
-            if (strcasecmp (attributes[i], "apacheServerName") == 0) {
+            else if (strcasecmp (attributes[i], "homeDirectory") == 0) {
+                reqc->home = val;
+                continue;
+            }
+            else if (strcasecmp (attributes[i], "scriptsVhostDirectory") == 0) {
+                reqc->directory = val;
+                continue;
+            }
+
+            if (strcasecmp (attributes[i], "scriptsVhostName") == 0) {
                 reqc->name = val;
                 directive = "ServerName";
-            }
-            else if (strcasecmp (attributes[i], "apacheServerAdmin") == 0) {
-                reqc->admin = val;
-                directive = "ServerAdmin";
-            }
-            else if (strcasecmp (attributes[i], "apacheDocumentRoot") == 0) {
-                reqc->docroot = val;
-                directive = "DocumentRoot";
-            }
-            else if (strcasecmp (attributes[i], "apacheScriptAlias") == 0) {
-                if (val != NULL) {
-                    /* Hack to deal with current apacheScriptAlias lagout */
-                    if (strlen(val) > 0 && val[strlen(val) - 1] == '/')
-                        val = apr_pstrcat(r->pool, "/cgi-bin/ ", val, (const char *)NULL);
-                    else
-                        val = apr_pstrcat(r->pool, "/cgi-bin/ ", val, "/", (const char *)NULL);
-                    directive = "ScriptAlias";
-                }
-                reqc->cgiroot = val;
             }
             else {
@@ -637 +625 @@
     ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
                   "[mod_vhost_ldap.c]: loaded from ldap: "
-                  "apacheServerName: %s, "
-                  "apacheServerAdmin: %s, "
-                  "apacheDocumentRoot: %s, "
-                  "apacheScriptAlias: %s, "
-                  "apacheSuexecUid: %s, "
-                  "apacheSuexecGid: %s",
-                  reqc->name, reqc->admin, reqc->docroot, reqc->cgiroot, reqc->uid, reqc->gid);
-
-    if ((reqc->name == NULL)||(reqc->docroot == NULL)) {
+                  "scriptsVhostName: %s, "
+                  "homeDirectory: %s, "
+                  "scriptsVhostDirectory: %s, "
+                  "uidNumber: %s, "
+                  "gidNumber: %s",
+                  reqc->name, reqc->home, reqc->directory, reqc->uid, reqc->gid);
+
+    if (reqc->name == NULL || reqc->home == NULL || reqc->directory == NULL) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r, 
                       "[mod_vhost_ldap.c] translate: "
@@ -651 +638 @@
         return HTTP_INTERNAL_SERVER_ERROR;
     }
+
+    char *docroot =
+        strcmp(reqc->directory, ".") == 0 ?
+        apr_pstrcat(r->pool, reqc->home, "/web_scripts", (const char *)NULL) :
+        apr_pstrcat(r->pool, reqc->home, "/web_scripts/", reqc->directory, (const char *)NULL);
+    if ((code = reconfigure_directive(r->pool, server, "DocumentRoot", docroot)) != 0)
+        return code;
 
     if (reqc->uid != NULL) {