X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=65955f6048dcb32ee0448f34e9a9425697052fe3;hb=72167978380cd7dcab18c79432d9b74c8432d629;hp=87e2a04a69184ed77613df13589cfa1caf95af6a;hpb=1fbe81444fcbb3f043ad5df7769fc53c7fd7cc00;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-mailgate b/ud-mailgate
index 87e2a04..65955f6 100755
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -35,6 +35,7 @@ mailWhitelist = {}
 SeenList = {}
 DNS = {}
 SudoPasswd = {}
+ValidHostNames = [] # will be initialized in later
 
 SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$')
 SSHRSA1Match = re.compile('^^(.* )?\d+ \d+ \d+')
@@ -281,6 +282,7 @@ def DoSSH(Str, Attrs, badkeys, uid):
       return None;
 
    # lines can now be prepended with "allowed_hosts=machine1,machine2 "
+   machines = []
    if Str.startswith("allowed_hosts="):
       Str = Str.split("=", 1)[1]
       if ' ' not in Str:
@@ -292,6 +294,8 @@ def DoSSH(Str, Attrs, badkeys, uid):
             return "empty machine specification for ssh key"
          if not machine_regex.match(m):
             return "machine specification for ssh key contains invalid characters"
+         if m not in ValidHostNames:
+            return "unknown machine used in allowed_hosts stanza for ssh keys"
 
    (fd, path) = tempfile.mkstemp(".pub", "sshkeytry", "/tmp")
    f = open(path, "w")
@@ -303,6 +307,10 @@ def DoSSH(Str, Attrs, badkeys, uid):
    if (result != 0):
       raise UDExecuteError, "ssh-keygen -l invocation failed!\n%s\n" % (output)
 
+   # format the string again for ldap:
+   if machines:
+      Str = "allowed_hosts=%s %s" % (",".join(machines), Str)
+
 
    # Head
    Date = time.strftime("%a, %d %b %Y %H:%M:%S +0000",time.gmtime(time.time()))
@@ -767,6 +775,14 @@ try:
    Date = time.strftime("%a, %d %b %Y %H:%M:%S +0000",time.gmtime(time.time()));
    Reply = "To: %s\nReply-To: %s\nDate: %s\n" % (Sender,ReplyTo,Date);
 
+   global ValidHostNames
+   Res = l.search_s(HostBaseDn, ldap.SCOPE_SUBTREE, '(objectClass=debianServer)', ['hostname'] )
+   # Res is a list of tuples.
+   # The tuples contain a dn (str) and a dictionary.
+   # The dictionaries map the key "hostname" to a list.
+   # These lists contain a single hostname (str).
+   ValidHostNames = reduce(lambda a,b: a+b, [value.get("hostname", []) for (dn, value) in Res], [])
+
    # Dispatch
    if sys.argv[1] == "ping":
       Reply = HandlePing(Reply,Attrs[0],Res[2]);