EX_TEMPFAIL = 75;
EX_PERMFAIL = 65; # EX_DATAERR
Error = 'Message Error';
-SeenRSA = 0;
+SeenKey = 0;
SeenDNS = 0;
ArbChanges = {"c": "..",
"latitude": None,
"longitude": None,
"icquin": None,
- "sshrsaauthkey": None};
+ "sshrsaauthkey": None,
+ "sshdsaauthkey": None};
# Decode a GPS location from some common forms
def LocDecode(Str,Dir):
Attrs.append((ldap.MOD_REPLACE,"longitude",sLong));
return "Position set to %s/%s (%s/%s decimal degrees)"%(sLat,sLong,Lat,Long);
-# Handle a SSH RSA authentication key, the line format is:
+# Handle an SSH authentication key, the line format is:
# [options] 1024 35 13188913666680[..] [comment]
def DoSSH(Str,Attrs):
Match = SSHAuthSplit.match(Str);
if Match == None:
- return None;
+ Match = SSH2AuthSplit.match(Str);
+ if Match == None:
+ return None;
- global SeenRSA;
- if SeenRSA:
+ global SeenKey;
+ if SeenKey:
Attrs.append((ldap.MOD_ADD,"sshrsaauthkey",Str));
return "SSH Key added "+FormatSSHAuth(Str);
Attrs.append((ldap.MOD_REPLACE,"sshrsaauthkey",Str));
- SeenRSA = 1;
+ SeenKey = 1;
return "SSH Keys replaced with "+FormatSSHAuth(Str);
# Handle changing a dns entry
def DoDNS(Str,Attrs,DnRecord):
if re.match('^[\w-]+\s+in\s+a\s+\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$',\
Str,re.IGNORECASE) == None and \
- re.match("^[\w-]+\s+in\s+cname\s+[\w.\-]+\.$",Str,re.IGNORECASE) == None:
+ re.match("^[\w-]+\s+in\s+cname\s+[\w.\-]+\.$",Str,re.IGNORECASE) == None and \
+ re.match("^[\w-]+\s+in\s+mx\s+\d{1,3}\s+[\w.\-]+\.$",Str,re.IGNORECASE) == None:
return None;
# Check if the name is already taken
# Handle an [almost] arbitary change
def HandleChange(Reply,DnRecord,Key):
global PlainText;
- Lines = string.split(PlainText,"\r\n");
+ Lines = re.split("\n *\r?",PlainText);
Result = "";
Attrs = [];
else:
Res = DoPosition(Line,Attrs) or DoDNS(Line,Attrs,DnRecord) or \
DoArbChange(Line,Attrs) or DoSSH(Line,Attrs) or \
- DoDel(Line,Attrs);
+ DoDel(Line,Attrs);
except:
Res = None;
Result = Result + "==> %s: %s\n" %(sys.exc_type,sys.exc_value);
# Check for a locked account
Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid="+GetAttr(DnRecord,"uid"));
- if (string.find(GetAttr(Attrs[0],"userPassword"),"*LK*") != -1):
+ if (string.find(GetAttr(Attrs[0],"userpassword"),"*LK*") != -1):
raise Error, "This account is locked";
# Modify the password
if Sender == None:
raise Error, "Unable to determine the sender's address";
- if (string.find(GetAttr(Attrs[0],"userPassword"),"*LK*") != -1):
+ if (string.find(GetAttr(Attrs[0],"userpassword"),"*LK*") != -1):
raise Error, "This account is locked";
# Formulate a reply