import pwd, tempfile
import subprocess
import email, email.parser
+import binascii
from userdir_gpg import *
from userdir_ldap import *
DNS = {}
ValidHostNames = [] # will be initialized in later
-SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$')
+SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}|SHA256:[0-9A-Za-z/+]{43}) (.+)$')
SSHRSA1Match = re.compile('^^(.* )?\d+ \d+ \d+')
GenderTable = {"male": '1',
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"
+ return "unknown machine {} used in allowed_hosts stanza for ssh keys".format(m)
(fd, path) = tempfile.mkstemp(".pub", "sshkeytry", "/tmp")
f = open(path, "w")
Subst["__USER__"] = uid
Match = SSHFingerprint.match(output)
+ if Match is None:
+ return "Failed to match SSH fingerprint, has the output of ssh-keygen changed?"
g = Match.groups()
key_size = g[0]
fingerprint = g[1]
global SeenKey;
if SeenKey:
Attrs.append((ldap.MOD_ADD,"sshRSAAuthKey",Str));
- return "SSH Key added "+FormatSSHAuth(Str);
+ return "SSH Key added: %s %s [%s]"%(key_size, fingerprint, FormatSSHAuth(Str))
Attrs.append((ldap.MOD_REPLACE,"sshRSAAuthKey",Str));
SeenKey = 1;
- return "SSH Keys replaced with "+FormatSSHAuth(Str);
+ return "SSH Keys replaced with: %s %s [%s]"%(key_size, fingerprint, FormatSSHAuth(Str))
# Handle changing a dns entry
# host IN A 12.12.12.12
cnamerecord = re.match("^[-\w]+\s+IN\s+CNAME\s+([-\w.]+\.)$",Str,re.IGNORECASE)
arecord = re.match('^[-\w]+\s+IN\s+A\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$',Str,re.IGNORECASE)
mxrecord = re.match("^[-\w]+\s+IN\s+MX\s+(\d{1,3})\s+([-\w.]+\.)$",Str,re.IGNORECASE)
- txtrecord = re.match("^[-\w]+\s+IN\s+TXT\s+([-\d. a-z\t<>@]+)", Str, re.IGNORECASE)
+ txtrecord = re.match("^[-\w]+\s+IN\s+TXT\s+([-\d. a-z\t<>@:]+)", Str, re.IGNORECASE)
#aaaarecord = re.match('^[-\w]+\s+IN\s+AAAA\s+((?:[0-9a-f]{1,4})(?::[0-9a-f]{1,4})*(?::(?:(?::[0-9a-f]{1,4})*|:))?)$',Str,re.IGNORECASE)
aaaarecord = re.match('^[-\w]+\s+IN\s+AAAA\s+([A-F0-9:]{2,39})$',Str,re.IGNORECASE)
return Reply;
+def HandleChTOTPSeed(Reply, DnRecord, Key):
+ # Generate a random seed
+ seed = binascii.hexlify(open("/dev/urandom", "r").read(32))
+ msg = GPGEncrypt("Your new TOTP seed is '%s'\n" % (seed,), "0x"+Key[1],Key[4]);
+
+ if msg is None:
+ raise UDFormatError, "Unable to generate the encrypted reply, gpg failed.";
+
+ Subst = {};
+ Subst["__FROM__"] = ChPassFrom
+ Subst["__EMAIL__"] = EmailAddress(DnRecord)
+ Subst["__PASSWORD__"] = msg
+ Subst["__ADMIN__"] = ReplyTo
+ Reply = Reply + TemplateSubst(Subst, open(TemplatesDir+"totp-seed-changed", "r").read())
+
+ l = connect_to_ldap_and_check_if_locked(DnRecord)
+ # Modify the password
+ Rec = [(ldap.MOD_REPLACE, "totpSeed", seed)]
+ Dn = "uid=" + GetAttr(DnRecord,"uid") + "," + BaseDn
+ l.modify_s(Dn,Rec)
+ return Reply;
+
def HandleChKrbPass(Reply,DnRecord,Key):
# Connect to the ldap server, will throw an exception if account locked.
l = connect_to_ldap_and_check_if_locked(DnRecord)
Reply = HandleChPass(Reply,Attrs[0],pgp.key_info);
elif PlainText.strip().find("Please change my Kerberos password") >= 0:
Reply = HandleChKrbPass(Reply,Attrs[0],pgp.key_info);
+ elif PlainText.strip().find("Please change my TOTP seed") >= 0:
+ Reply = HandleChTOTPSeed(Reply, Attrs[0], pgp.key_info)
else:
raise UDFormatError,"Please send a signed message where the first line of text is the string 'Please change my Debian password' or some other string we accept here.";
elif sys.argv[1] == "change":