# -e /etc/userdir-ldap/templtes/error-reply -- test.sh
import sys, traceback, time, os;
-import string, pwd, getopt;
+import pwd, getopt;
from userdir_gpg import *;
EX_TEMPFAIL = 75;
ErrType = EX_TEMPFAIL;
ErrMsg = "An error occurred while performing the LDAP lookup:";
global l;
- l = ldap.open(LDAPServer);
+ l = connectLDAP(LDAPServer);
l.simple_bind_s("","");
# Search for the matching key fingerprint
if len(Attrs) != 1:
raise Error, "Oddly your key fingerprint is assigned to more than one account.."
+ gidnumber_found = 0;
+ for key in Attrs[0][1].keys():
+ if (key == "gidNumber"):
+ gidnumber_found = 1
+
+ if (gidnumber_found != 1):
+ raise Error, "No gidnumber in attributes for fingerprint %s" % FingerPrint
+
+ # Look for the group with the gid of the user
+ GAttr = l.search_s(LDAPDn,ldap.SCOPE_ONELEVEL,"(&(objectClass=debianGroup)(gidnumber=%s))" % Attrs[0][1]["gidNumber"][0], ["gid"])
+ if len(GAttr) == 0:
+ raise Error, "Database inconsistency found: main group for account not found in database"
+
# See if the group membership is OK
+ # Only if a group was given on the commandline
if GroupMember != None:
Hit = 0;
- for x in Attrs[0][1].get("supplementarygid",[]):
- if x == GroupMember:
- Hit = 1;
+ # Check primary group first
+ if GAttr[0][1]["gid"][0] == GroupMember:
+ Hit = 1
+ else:
+ # Check supplementary groups
+ for x in Attrs[0][1].get("supplementaryGid",[]):
+ if x == GroupMember:
+ Hit = 1;
if Hit != 1:
raise Error, "You don't have %s group permissions."%(GroupMember);
if (switch == '-r'):
ReplayCacheFile = val;
elif (switch == '-k'):
- SetKeyrings(string.split(val,":"));
+ SetKeyrings(val.split(":"));
elif (switch == '-d'):
LDAPDn = val;
elif (switch == '-l'):
raise Error, "PGP/MIME disallowed";
ErrMsg = "Message is not PGP signed:"
- if string.find(Msg[0],"-----BEGIN PGP SIGNED MESSAGE-----") == -1:
+ if Msg[0].find("-----BEGIN PGP SIGNED MESSAGE-----") == -1:
raise Error, "No PGP signature";
# Check the signature
if Rply != None:
raise Error, Rply;
RC.Add(Res[1]);
+ RC.close();
# Do LDAP stuff
if LDAPDn != None:
while 1:
Line = F.readline();
if Line == "": break;
- if string.find(Res[3],string.strip(Line)) == -1:
- raise Error,"Phrase '%s' was not found"%(string.strip(Line));
+ if Res[3].find(Line.strip()) == -1:
+ raise Error,"Phrase '%s' was not found" % (Line.strip())
except:
ErrMsg = "[%s] \"%s\" \"%s %s\"\n"%(Now,MsgID,ErrMsg,sys.exc_value);