Import from murphy: Small corrections

[mirror/userdir-ldap.git] / sigcheck

diff --git a/sigcheck b/sigcheck
index e20f68f..af1be9d 100755 (executable)
--- a/sigcheck
+++ b/sigcheck
@@ -16,9 +16,10 @@
 #  -g  supplementary group membership
 #  -p  File of Phrases that must be in the plaintext.
 #  -m  Disallow PGP/MIME
+#  -v  Verbose mode
 
 # Typical Debian invokation may look like:
-# ./gpgwrapper -k /usr/share/keyrings/debian-keyring.gpg:/usr/share/keyrings/debian-keyring.pgp \
+# sigcheck -k /usr/share/keyrings/debian-keyring.gpg:/usr/share/keyrings/debian-keyring.pgp \
 #      -d ou=users,dc=debian,dc=org -l db.debian.org \
 #      -m debian.org -a admin@db.debian.org \
 #      -e /etc/userdir-ldap/templtes/error-reply -- test.sh
@@ -38,6 +39,11 @@ LDAPServer = None;
 GroupMember = None;
 Phrases = None;
 AllowMIME = 1;
+Verbose = 0;
+
+def verbmsg(msg):
+   if Verbose:
+      sys.stderr.write(msg + "\n")
 
 # Match the key fingerprint against an LDAP directory
 def CheckLDAP(FingerPrint):
@@ -46,12 +52,13 @@ def CheckLDAP(FingerPrint):
    # Connect to the ldap server
    global ErrTyp, ErrMsg;
    ErrType = EX_TEMPFAIL;
-   ErrMsg = "An error occured while performing the LDAP lookup:";
+   ErrMsg = "An error occurred while performing the LDAP lookup:";
    global l;
    l = ldap.open(LDAPServer);
    l.simple_bind_s("","");
 
    # Search for the matching key fingerprint
+   verbmsg("Processing fingerprint %s" % FingerPrint)
    Attrs = l.search_s(LDAPDn,ldap.SCOPE_ONELEVEL,"keyfingerprint=" + FingerPrint);
    if len(Attrs) == 0:
       raise Error, "Key not found"
@@ -69,7 +76,7 @@ def CheckLDAP(FingerPrint):
    
 # Start of main program
 # Process options
-(options, arguments) = getopt.getopt(sys.argv[1:], "r:k:d:l:g:mp:");
+(options, arguments) = getopt.getopt(sys.argv[1:], "r:k:d:l:g:mp:v");
 for (switch, val) in options:
    if (switch == '-r'):
       ReplayCacheFile = val;
@@ -83,6 +90,8 @@ for (switch, val) in options:
       GroupMember = val;
    elif (switch == '-m'):
       AllowMIME = 0;
+   elif (switch == '-v'):
+      Verbose = 1;
    elif (switch == '-p'):
       Phrases = val;
       
@@ -103,7 +112,10 @@ try:
    ErrMsg = "Failed to understand the email or find a signature:";
    Email = mimetools.Message(sys.stdin,0);
    MsgID = Email.getheader("Message-ID");
+   print "Inspecting message %s"%MsgID;
+   verbmsg("Processing message %s" % MsgID)
    Msg = GetClearSig(Email,1);
+   # print Msg
    if AllowMIME == 0 and Msg[1] != 0:
       raise Error, "PGP/MIME disallowed";
   
@@ -114,7 +126,7 @@ try:
    # Check the signature
    ErrMsg = "Unable to check the signature or the signature was invalid:";
    Res = GPGCheckSig(Msg[0]);
-   
+
    if Res[0] != None:
       raise Error, Res[0];
       
@@ -157,4 +169,5 @@ except:
    sys.exit(EX_PERMFAIL);
 
 # For Main   
+print "Message %s passed"%MsgID;
 sys.exit(0);