# Copyright (c) 2008 Joerg Jaspert <joerg@debian.org>
import userdir_gpg, userdir_ldap, sys, traceback, time, ldap, os, commands
-import pwd, tmpfile
+import pwd, tempfile
+
from userdir_gpg import *
from userdir_ldap import *
ReplayCacheFile = ConfModule.replaycachefile;
SSHFingerprintFile = ConfModule.fingerprintfile
+UUID_FORMAT = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+
EX_TEMPFAIL = 75;
EX_PERMFAIL = 65; # EX_DATAERR
Error = 'Message Error';
mailWhitelist = {}
SeenList = {}
DNS = {}
+SudoPasswd = {}
SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$')
+SSHRSA1Match = re.compile('^^(.* )?\d+ \d+ \d+')
+
+GenderTable = {"male": 1,
+ "1": 1,
+ "female": 2,
+ "2": 2,
+ "unspecified": 9,
+ "9": 9,
+};
ArbChanges = {"c": "..",
"l": ".*",
"mailGreylisting": "^(TRUE|FALSE)$",
"mailCallout": "^(TRUE|FALSE)$",
"VoIP": ".*",
+ "gender": "^(1|2|9|male|female|unspecified)$",
};
DelItems = {"c": None,
"VoIP": None,
};
+
# Decode a GPS location from some common forms
def LocDecode(Str,Dir):
# Check for Decimal degrees, DGM, or DGMS
if re.match(ArbChanges[attrName],G[1]) == None:
raise Error, "Item does not match the required format"+ArbChanges[attrName];
+ value = G[1];
+ if attrName == 'gender':
+ if G[1] not in GenderTable:
+ raise Error, "Gender not found in table"
+ value = GenderTable[G[1]]
+
# if attrName == 'birthDate':
# (re.match("^([0-9]{4})([01][0-9])([0-3][0-9])$",G[1]) {
# $bd_yr = $1; $bd_mo = $2; $bd_day = $3;
# } elsif (not defined($query->param('birthdate')) or $query->param('birthdate') =~ /^\s*$/) {
# $bd_ok = 1;
# }
- Attrs.append((ldap.MOD_REPLACE,attrName,G[1]));
- return "Changed entry %s to %s"%(attrName,G[1]);
+ Attrs.append((ldap.MOD_REPLACE,attrName,value));
+ return "Changed entry %s to %s"%(attrName,value);
# Handle changing a set of arbitary fields
# <field>: value
# Handle an SSH authentication key, the line format is:
# [options] 1024 35 13188913666680[..] [comment]
-def DoSSH(Str,Attrs, badkeys):
+def DoSSH(Str, Attrs, badkeys, uid):
Match = SSH2AuthSplit.match(Str);
if Match == None:
- Match = re.compile('^1024 (\d+) ').match(Str)
+ return None;
+ g = Match.groups()
+ typekey = g[1]
+ if Match == None:
+ Match = SSHRSA1Match.match(Str)
if Match is not None:
- return "SSH1 keys not supported anymore"
+ return "RSA1 keys not supported anymore"
return None;
- (fd, path) = tempfile.mkstemp("", "sshkeytry")
+ (fd, path) = tempfile.mkstemp(".pub", "sshkeytry", "/tmp")
f = open(path, "w")
- f.write(Str)
- f.close
- (result, output) = commands.getstatusoutput("ssh-keygen -f %s -l" % (path))
+ f.write("%s\n" % (Str))
+ f.close()
+ cmd = "/usr/bin/ssh-keygen -l -f %s < /dev/null" % (path)
+ (result, output) = commands.getstatusoutput(cmd)
os.remove(path)
if (result != 0):
- sys.stderr.write("ssh-keygen -l invocation failed!\n%s\n" % (output))
- sys.exit(result)
+ raise Error, "ssh-keygen -l invocation failed!\n%s\n" % (output)
- Match = SSHFingerprint.match(output)
+ # Head
+ Date = time.strftime("%a, %d %b %Y %H:%M:%S +0000",time.gmtime(time.time()))
+ ErrReplyHead = "From: %s\nCc: %s\nReply-To: %s\nDate: %s\n" % (os.environ['SENDER'],os.environ['SENDER'],ReplyTo,Date)
+ Subst = {}
+ Subst["__ADMIN__"] = ReplyTo
+ Subst["__USER__"] = uid
+
+ Match = SSHFingerprint.match(output)
g = Match.groups()
- if (g[0] < 1024):
- return "SSH keys must have at least 1024 bits, not added"
- elif g[0] in badkeys:
- return "Submitted SSH Key known to be bad and insecure, not added"
+
+ if int(g[0]) < 1024:
+ try:
+ # Body
+ Subst["__ERROR__"] = "SSH keysize %s is below limit 1024" % (g[0])
+ ErrReply = TemplateSubst(Subst,open(TemplatesDir+"admin-info","r").read())
+
+ Child = os.popen("/usr/sbin/sendmail -t","w")
+ Child.write(ErrReplyHead)
+ Child.write(ErrReply)
+ if Child.close() != None:
+ raise Error, "Sendmail gave a non-zero return code"
+ except:
+ sys.exit(EX_TEMPFAIL)
+
+ # And now break and stop processing input, which sends a reply to the user.
+ raise Error, "SSH keys must have at least 1024 bits, processing halted, NOTHING MODIFIED AT ALL"
+ elif g[1] in badkeys:
+ try:
+ # Body
+ Subst["__ERROR__"] = "SSH key with fingerprint %s known as bad key" % (g[1])
+ ErrReply = TemplateSubst(Subst,open(TemplatesDir+"admin-info","r").read())
+
+ Child = os.popen("/usr/sbin/sendmail -t","w")
+ Child.write(ErrReplyHead)
+ Child.write(ErrReply)
+ if Child.close() != None:
+ raise Error, "Sendmail gave a non-zero return code"
+ except:
+ sys.exit(EX_TEMPFAIL)
+
+ # And now break and stop processing input, which sends a reply to the user.
+ raise Error, "Submitted SSH Key known to be bad and insecure, processing halted, NOTHING MODIFIED AT ALL"
+
+ if (typekey == "dss"):
+ return "DSA keys not accepted anymore"
global SeenKey;
if SeenKey:
SeenList[Key] = 1;
return "%s replaced with %s" % (Key,Host)
+# Handle a ConfirmSudoPassword request
+def DoConfirmSudopassword(Str):
+ Match = re.compile('^confirm sudopassword ('+UUID_FORMAT+') ([a-z0-9.,*]+) ([0-9a-f]{40})$').match(Str)
+ if Match == None:
+ return None
+
+ uuid = Match.group(1)
+ hosts = Match.group(2)
+ hmac = Match.group(3)
+
+ global SudoPasswd
+ SudoPasswd[uuid] = (hosts, hmac)
+ return "got confirm for sudo password %s on host(s) %s, auth code %s" % (uuid,hosts, hmac)
+
+def FinishConfirmSudopassword(l, uid, Attrs):
+ global SudoPasswd
+ result = "\n"
+
+ res = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid="+uid, ['sudoPassword']);
+ if len(res) != 1:
+ raise Error, "Not exactly one hit when searching for user"
+ if res[0][1].has_key('sudoPassword'):
+ inldap = res[0][1]['sudoPassword']
+ else:
+ inldap = []
+
+ newldap = []
+ for entry in inldap:
+ Match = re.compile('^('+UUID_FORMAT+') (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*]+) ([^ ]+)$').match(entry)
+ if Match == None:
+ raise Error, "Could not parse existing sudopasswd entry"
+ uuid = Match.group(1)
+ status = Match.group(2)
+ hosts = Match.group(3)
+ cryptedpass = Match.group(4)
+
+ if SudoPasswd.has_key(uuid):
+ confirmedHosts = SudoPasswd[uuid][0]
+ confirmedHmac = SudoPasswd[uuid][1]
+ if status.startswith('confirmed:'):
+ if status == 'confirmed:'+make_sudopasswd_hmac('password-is-confirmed', uuid, hosts, cryptedpass):
+ result = result + "Entry %s for sudo password on hosts %s already confirmed.\n"%(uuid, hosts)
+ else:
+ result = result + "Entry %s for sudo password on hosts %s is listed as confirmed, but HMAC does not verify.\n"%(uuid, hosts)
+ elif confirmedHosts != hosts:
+ result = result + "Entry %s hostlist mismatch (%s vs. %s).\n"%(uuid, hosts, confirmedHosts)
+ elif make_sudopasswd_hmac('confirm-new-password', uuid, hosts, cryptedpass) == confirmedHmac:
+ result = result + "Entry %s for sudo password on hosts %s now confirmed.\n"%(uuid, hosts)
+ status = 'confirmed:'+make_sudopasswd_hmac('password-is-confirmed', uuid, hosts, cryptedpass)
+ else:
+ result = result + "Entry %s for sudo password on hosts %s HMAC verify failed.\n"%(uuid, hosts)
+ del SudoPasswd[uuid]
+
+ newentry = " ".join([uuid, status, hosts, cryptedpass])
+ if len(newldap) == 0:
+ newldap.append((ldap.MOD_REPLACE,"sudoPassword",newentry))
+ else:
+ newldap.append((ldap.MOD_ADD,"sudoPassword",newentry))
+
+ for entry in SudoPasswd:
+ result = result + "Entry %s that you confirm is not listed in ldap."%(entry)
+
+ for entry in newldap:
+ Attrs.append(entry)
+
+ return result
+
# Handle an [almost] arbitary change
def HandleChange(Reply,DnRecord,Key):
global PlainText;
Result = "";
Attrs = [];
Show = 0;
+ CommitChanges = 1
for Line in Lines:
Line = Line.strip()
if Line == "":
Result = Result + "> "+Line+"\n";
try:
if Line == "show":
- Show = 1;
- Res = "OK";
+ Show = 1;
+ Res = "OK";
else:
badkeys = LoadBadSSH()
Res = DoPosition(Line,Attrs) or DoDNS(Line,Attrs,DnRecord) or \
- DoArbChange(Line,Attrs) or DoSSH(Line,Attrs,badkeys) or \
- DoDel(Line,Attrs) or DoRBL(Line,Attrs)
+ DoArbChange(Line,Attrs) or DoSSH(Line,Attrs,badkeys,GetAttr(DnRecord,"uid")) or \
+ DoDel(Line,Attrs) or DoRBL(Line,Attrs) or DoConfirmSudopassword(Line)
except:
Res = None;
Result = Result + "==> %s: %s\n" %(sys.exc_type,sys.exc_value);
-
+
# Fail, if someone tries to send someone elses signed email to the
# daemon then we want to abort ASAP.
if Res == None:
- Result = Result + "Command is not understood. Halted\n";
+ CommitChanges = 0
+ Result = Result + "Command is not understood. Halted - no changes committed\n";
break;
Result = Result + Res + "\n";
# Connect to the ldap server
- l = ldap.open(LDAPServer);
+ l = connectLDAP()
F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
AccessPass = F.readline().strip().split(" ")
F.close();
- # Modify the record
l.simple_bind_s("uid="+AccessPass[0]+","+BaseDn,AccessPass[1]);
oldAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid="+GetAttr(DnRecord,"uid"));
if ((GetAttr(oldAttrs[0],"userPassword").find("*LK*") != -1)
or GetAttr(oldAttrs[0],"userPassword").startswith("!")):
raise Error, "This account is locked";
+ try:
+ Res = FinishConfirmSudopassword(l, GetAttr(DnRecord,"uid"), Attrs)
+ Result = Result + Res + "\n";
+ except Error, e:
+ CommitChanges = 0
+ Result = Result + "FinishConfirmSudopassword raised an error (%s) - no changes committed\n"%(e);
+ # Modify the record
Dn = "uid=" + GetAttr(DnRecord,"uid") + "," + BaseDn;
- l.modify_s(Dn,Attrs);
+ if CommitChanges == 1:
+ l.modify_s(Dn,Attrs);
Attribs = "";
if Show == 1:
Reply = Reply + TemplateSubst(Subst,open(TemplatesDir+"passwd-changed","r").read());
# Connect to the ldap server
- l = ldap.open(LDAPServer);
+ l = connectLDAP()
F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
AccessPass = F.readline().strip().split(" ")
F.close();
raise Error, "This account is locked";
# Modify the password
- Rec = [(ldap.MOD_REPLACE,"userPassword","{crypt}"+Pass)];
+ Rec = [(ldap.MOD_REPLACE,"userPassword","{crypt}"+Pass),
+ (ldap.MOD_REPLACE,"shadowLastChange",str(int(time.time()/24/60/60)))];
Dn = "uid=" + GetAttr(DnRecord,"uid") + "," + BaseDn;
l.modify_s(Dn,Rec);
ErrType = EX_TEMPFAIL;
ErrMsg = "An error occured while performing the LDAP lookup";
global l;
- l = ldap.open(LDAPServer);
+ l = connectLDAP()
l.simple_bind_s("","");
# Search for the matching key fingerprint
projects / mirror / userdir-ldap.git / blobdiff