# Prior copyright probably rmurray, troup, joey, jgg -- weasel 2008
# Copyright (c) 2009 Stephen Gran <steve@lobefin.net>
-# Copyright (c) 2008 Peter Palfrader <peter@palfrader.org>
+# Copyright (c) 2008
,2009,2010 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
SeenList = {}
DNS = {}
SudoPasswd = {}
+ValidHostNames = [] # will be initialized in later
SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$')
SSHRSA1Match = re.compile('^^(.* )?\d+ \d+ \d+')
"mailDisableMessage": ".*",
"mailGreylisting": "^(TRUE|FALSE)$",
"mailCallout": "^(TRUE|FALSE)$",
+ "mailDefaultOptions": "^(TRUE|FALSE)$",
"VoIP": ".*",
"gender": "^(1|2|9|male|female|unspecified)$",
"mailContentInspectionAction": "^(reject|blackhole|markup)$",
"mailRHSBL": None,
"mailWhitelist": None,
"mailDisableMessage": None,
+ "mailDefaultOptions": None,
"VoIP": None,
"mailContentInspectionAction": None,
};
# 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:
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"
+ 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")
f.write("%s\n" % (Str))
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()))
# Check the signature
ErrMsg = "Unable to check the signature or the signature was invalid:";
- Res = GPGCheckSig(Msg[0]);
+ pgp = GPGCheckSig2(Msg[0])
- if Res[0] != None:
- raise UDFormatError, Res[0];
+ if not pgp.ok:
+ raise UDFormatError, pgp.why
- if Res[3] == None:
- raise UDFormatError, "Null signature text";
+ if pgp.text is None:
+ raise UDFormatError, "Null signature text"
# Extract the plain message text in the event of mime encoding
global PlainText;
ErrMsg = "Problem stripping MIME headers from the decoded message"
if Msg[1] == 1:
try:
- Index = Res[3].index("\n\n") + 2;
+ Index = pgp.text.index("\n\n") + 2
except ValueError:
- Index = Res[3].index("\n\r\n") + 3;
- PlainText = Res[3][Index:];
+ Index = pgp.text.index("\n\r\n") + 3
+ PlainText = pgp.text[Index:]
else:
- PlainText = Res[3];
+ PlainText = pgp.text
# Connect to the ldap server
ErrType = EX_TEMPFAIL;
l.simple_bind_s("","");
# Search for the matching key fingerprint
- Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"keyFingerPrint=" + Res[2][1]);
+ Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"keyFingerPrint=" + pgp.key_fpr)
ErrType = EX_PERMFAIL;
if len(Attrs) == 0:
RC = ReplayCache(ReplayCacheFile);
RC.Clean();
ErrMsg = "The replay cache rejected your message. Check your clock!";
- Rply = RC.Check(Res[1]);
+ Rply = RC.Check(pgp.sig_info);
if Rply != None:
RC.close()
raise UDNotAllowedError, Rply;
- RC.Add(Res[1]);
+ RC.Add(pgp.sig_info);
RC.close()
# Determine the sender address
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);
+ 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]);
+ Reply = HandlePing(Reply,Attrs[0],pgp.key_info);
elif sys.argv[1] == "chpass":
if PlainText.strip().find("Please change my Debian password") != 0:
raise UDFormatError,"Please send a signed message where the first line of text is the string 'Please change my Debian password'";
- Reply = HandleChPass(Reply,Attrs[0],Res[2]);
+ Reply = HandleChPass(Reply,Attrs[0],pgp.key_info);
elif sys.argv[1] == "change":
- Reply = HandleChange(Reply,Attrs[0],Res[2]);
+ Reply = HandleChange(Reply,Attrs[0],pgp.key_info);
else:
print sys.argv;
raise UDFormatError, "Incorrect Invokation";
projects / mirror / userdir-ldap.git / blobdiff