Changeset 2757 for trunk/server/common/oursrc

Timestamp:

Feb 26, 2016, 2:48:37 AM (8 years ago)

Author:

andersk

Message:

whoisd: Use scriptsVhost records rather than apacheConfig records

File:

• trunk/server/common/oursrc/whoisd/whoisd.tac (modified) (3 diffs)

trunk/server/common/oursrc/whoisd/whoisd.tac

@@ -3 +3 @@
 from twisted.protocols import basic
 import ldap, ldap.filter
-import pwd
+import posixpath
 
 class WhoisProtocol(basic.LineReceiver):
@@ -32 +32 @@
 #            return vhost + ".mit.edu"
     def searchLDAP(self, vhost):
+        attrlist = ('scriptsVhostName', 'homeDirectory', 'scriptsVhostDirectory', 'uid')
         results = self.ldap.search_st(self.ldap_base, ldap.SCOPE_SUBTREE,
             ldap.filter.filter_format(
-                '(|(apacheServername=%s)(apacheServerAlias=%s))', (vhost,)*2),
-                timeout=5)
+                '(|(scriptsVhostName=%s)(scriptsVhostAlias=%s))', (vhost,)*2),
+                attrlist=attrlist, timeout=5)
         if len(results) >= 1:
             result = results[0]
             attrs = result[1]
-            for attr in ('apacheServerName','apacheDocumentRoot', 'apacheSuexecUid', 'apacheSuexecGid'):
+            for attr in attrlist:
                 attrs[attr] = attrs[attr][0]
-            user = pwd.getpwuid(int(attrs['apacheSuexecUid']))
-            if user:
-                attrs['locker'] = user.pw_name
-            else:
-                attrs['locker'] = None
             return attrs
         else:
@@ -63 +59 @@
         if info:
             ret = "Hostname: %s\nAlias: %s\nLocker: %s\nDocument Root: %s" % \
-                (info['apacheServerName'], vhost, info['locker'], info['apacheDocumentRoot'])
+                (info['scriptsVhostName'], vhost, info['uid'],
+                 posixpath.join(info['homeDirectory'], 'web_scripts', info['scriptsVhostDirectory']))
         elif tries == 3:
             ret = "The whois server is experiencing problems looking up LDAP records.\nPlease contact scripts@mit.edu for help if this problem persists."