projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ud-update-sudopasswords: drop trailing semicolons
[mirror/userdir-ldap.git]
/
sigcheck
diff --git
a/sigcheck
b/sigcheck
index
57c4a90
..
9c59bd2
100755
(executable)
--- a/
sigcheck
+++ b/
sigcheck
@@
-26,6
+26,7
@@
import sys, traceback, time, os;
import pwd, getopt;
import sys, traceback, time, os;
import pwd, getopt;
+import email, email.parser
from userdir_gpg import *;
EX_TEMPFAIL = 75;
from userdir_gpg import *;
EX_TEMPFAIL = 75;
@@
-48,13
+49,14
@@
def verbmsg(msg):
# Match the key fingerprint against an LDAP directory
def CheckLDAP(FingerPrint):
import ldap;
# Match the key fingerprint against an LDAP directory
def CheckLDAP(FingerPrint):
import ldap;
+ import userdir_ldap;
# Connect to the ldap server
global ErrTyp, ErrMsg;
ErrType = EX_TEMPFAIL;
ErrMsg = "An error occurred while performing the LDAP lookup:";
global l;
# Connect to the ldap server
global ErrTyp, ErrMsg;
ErrType = EX_TEMPFAIL;
ErrMsg = "An error occurred while performing the LDAP lookup:";
global l;
- l =
ldap.open
(LDAPServer);
+ l =
userdir_ldap.connectLDAP
(LDAPServer);
l.simple_bind_s("","");
# Search for the matching key fingerprint
l.simple_bind_s("","");
# Search for the matching key fingerprint
@@
-80,7
+82,7
@@
def CheckLDAP(FingerPrint):
# See if the group membership is OK
# Only if a group was given on the commandline
# See if the group membership is OK
# Only if a group was given on the commandline
- if GroupMember
!=
None:
+ if GroupMember
is not
None:
Hit = 0;
# Check primary group first
if GAttr[0][1]["gid"][0] == GroupMember:
Hit = 0;
# Check primary group first
if GAttr[0][1]["gid"][0] == GroupMember:
@@
-121,20
+123,19
@@
MsgID = None;
try:
# Startup the replay cache
ErrType = EX_TEMPFAIL;
try:
# Startup the replay cache
ErrType = EX_TEMPFAIL;
- if ReplayCacheFile
!=
None:
+ if ReplayCacheFile
is not
None:
ErrMsg = "Failed to initialize the replay cache:";
RC = ReplayCache(ReplayCacheFile);
ErrMsg = "Failed to initialize the replay cache:";
RC = ReplayCache(ReplayCacheFile);
- RC.Clean();
-
+
# Get the email
ErrType = EX_PERMFAIL;
ErrMsg = "Failed to understand the email or find a signature:";
# Get the email
ErrType = EX_PERMFAIL;
ErrMsg = "Failed to understand the email or find a signature:";
- Email = mimetools.Message(sys.stdin,0);
- MsgID = Email.getheader("Message-ID");
+ mail = email.parser.Parser().parse(sys.stdin);
+ MsgID = mail["Message-ID"]
+
print "Inspecting message %s"%MsgID;
verbmsg("Processing message %s" % MsgID)
print "Inspecting message %s"%MsgID;
verbmsg("Processing message %s" % MsgID)
- Msg = GetClearSig(Email,1);
- # print Msg
+ Msg = GetClearSig(mail,1);
if AllowMIME == 0 and Msg[1] != 0:
raise Error, "PGP/MIME disallowed";
if AllowMIME == 0 and Msg[1] != 0:
raise Error, "PGP/MIME disallowed";
@@
-144,34
+145,28
@@
try:
# Check the signature
ErrMsg = "Unable to check the signature or the signature was invalid:";
# 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 Error, Res[0];
-
- if Res[3] == None:
- raise Error, "Null signature text";
+ if not pgp.ok:
+ raise UDFormatError, pgp.why
+ if pgp.text is None:
+ raise UDFormatError, "Null signature text"
# Check the signature against the replay cache
# Check the signature against the replay cache
- if ReplayCacheFile != None:
- ErrMsg = "The replay cache rejected your message. Check your clock!";
- Rply = RC.Check(Res[1]);
- if Rply != None:
- raise Error, Rply;
- RC.Add(Res[1]);
- RC.close();
+ if ReplayCacheFile is not None:
+ RC.process(pgp.sig_info)
# Do LDAP stuff
# Do LDAP stuff
- if LDAPDn
!=
None:
- CheckLDAP(
Res[2][1]);
-
+ if LDAPDn
is not
None:
+ CheckLDAP(
pgp.key_fpr)
+
ErrMsg = "Verifying message:";
ErrMsg = "Verifying message:";
- if Phrases
!=
None:
+ if Phrases
is not
None:
F = open(Phrases,"r");
while 1:
Line = F.readline();
if Line == "": break;
F = open(Phrases,"r");
while 1:
Line = F.readline();
if Line == "": break;
- if
Res[3]
.find(Line.strip()) == -1:
+ if
pgp.text
.find(Line.strip()) == -1:
raise Error,"Phrase '%s' was not found" % (Line.strip())
except:
raise Error,"Phrase '%s' was not found" % (Line.strip())
except: