Changeset 1823 for trunk/server/common/oursrc/execsys/ldapize.pl

Timestamp:

Apr 29, 2011, 9:15:02 PM (14 years ago)

Author:

andersk

Message:

ldapize: Support wildcard vhosts

As a side effect, this magically gives us useful error messages for
unknown vhosts (Trac: #166).

File:

• trunk/server/common/oursrc/execsys/ldapize.pl (modified) (3 diffs)

trunk/server/common/oursrc/execsys/ldapize.pl

@@ -11 +11 @@
 my $mesg;
 
+my $vhostName = $hostname;
+
+vhost:
 # oh my gosh Net::LDAP::Filter SUCKS
 my $filter = bless({and =>
@@ -17 +20 @@
      {or =>
          [{equalityMatch => {attributeDesc  => 'scriptsVhostName',
-                             assertionValue => $hostname}},
+                             assertionValue => $vhostName}},
           {equalityMatch => {attributeDesc  => 'scriptsVhostAlias',
-                             assertionValue => $hostname}}]}]},
+                             assertionValue => $vhostName}}]}]},
     'Net::LDAP::Filter');
 
@@ -31 +34 @@
 
 my $vhostEntry = $mesg->pop_entry;
+if (!defined $vhostEntry) {
+  $vhostName ne '*' or die 'No vhost for *';
+  $vhostName =~ s/^(?:\*\.)?[^.]*/*/;  # Try next wildcard
+  goto vhost;
+}
+
 my $vhostDirectory = $vhostEntry->get_value('scriptsVhostDirectory');