X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=283ee2236f86078a7d01a34ad470959492d1c774;hb=f7531ca0088fbb3a727a5e0a607acec49a7d4ed6;hp=3ca7f817faf8a6d3a4f510f15392fa5e5766dc62;hpb=25e44ab9788aeb949e3dd5143a4f52f1c076ee1b;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-mailgate b/ud-mailgate
index 3ca7f81..283ee22 100755
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -5,6 +5,7 @@
 #   Copyright (c) 2009 Stephen Gran <steve@lobefin.net>
 #   Copyright (c) 2008 Peter Palfrader <peter@palfrader.org>
 #   Copyright (c) 2008 Joerg Jaspert <joerg@debian.org>
+#   Copyright (c) 2010 Helmut Grohne <helmut@subdivi.de>
 
 import userdir_gpg, userdir_ldap, sys, traceback, time, ldap, os, commands
 import pwd, tempfile
@@ -51,6 +52,7 @@ ArbChanges = {"c": "..",
 	      "facsimileTelephoneNumber": ".*",
 	      "telephoneNumber": ".*",
 	      "postalAddress": ".*",
+         "bATVToken": ".*",
 	      "postalCode": ".*",
               "loginShell": ".*",
               "emailForward": "^([^<>@]+@.+)?$",
@@ -63,8 +65,10 @@ ArbChanges = {"c": "..",
               "mailDisableMessage": ".*",
 	      "mailGreylisting": "^(TRUE|FALSE)$",
 	      "mailCallout": "^(TRUE|FALSE)$",
+	      "mailDefaultOptions": "^(TRUE|FALSE)$",
 	      "VoIP": ".*",
 	      "gender": "^(1|2|9|male|female|unspecified)$",
+         "mailContentInspectionAction": "^(reject|blackhole|markup)$",
 };
 
 DelItems = {"c": None,
@@ -72,6 +76,7 @@ DelItems = {"c": None,
             "facsimileTelephoneNumber": None,
             "telephoneNumber": None,
             "postalAddress": None,
+            "bATVToken": None,
             "postalCode": None,
             "emailForward": None,
             "ircNick": None,
@@ -91,7 +96,9 @@ DelItems = {"c": None,
             "mailRHSBL": None,
             "mailWhitelist": None,
             "mailDisableMessage": None,
+            "mailDefaultOptions": None,
             "VoIP": None,
+            "mailContentInspectionAction": None,
             };
 
 
@@ -258,6 +265,9 @@ def LoadBadSSH():
 
 # Handle an SSH authentication key, the line format is:
 #  [options] 1024 35 13188913666680[..] [comment]
+# maybe it really should be:
+# [allowed_hosts=machine1,machine2 ][options ]ssh-rsa keybytes [comment]
+machine_regex = re.compile("^[0-9a-zA-Z.-]+$")
 def DoSSH(Str, Attrs, badkeys, uid):
    Match = SSH2AuthSplit.match(Str);
    if Match == None:
@@ -270,6 +280,20 @@ def DoSSH(Str, Attrs, badkeys, uid):
          return "RSA1 keys not supported anymore"
       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:
+         return "invalid ssh key syntax with machine specification"
+      machines, Str = Str.split(' ', 1)
+      machines = machines.split(",")
+      for m in machines:
+         if not m:
+            return "empty machine specification for ssh key"
+         if not machine_regex.match(m):
+            return "machine specification for ssh key contains invalid characters"
+
    (fd, path) = tempfile.mkstemp(".pub", "sshkeytry", "/tmp")
    f = open(path, "w")
    f.write("%s\n" % (Str))
@@ -280,6 +304,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()))