DandelionNStuff/dkimpy-smtputf8
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixup script structure for entrypoints

Browse Source
This commit is contained in:
Scott Kitterman
2018-03-26 03:35:03 -04:00
parent 30062b3c2b
commit e50d3907ae
6 changed files with 124 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dkim/arcsign.py
+28 -24
View File
@@ -35,32 +35,36 @@ import dkim
logging.basicConfig(level=10) logging.basicConfig(level=10)
if len(sys.argv) != 4: def main():
print("Usage: arcsign.py selector domain privatekeyfile", file=sys.stderr) if len(sys.argv) != 4:
sys.exit(1) print("Usage: arcsign.py selector domain privatekeyfile", file=sys.stderr)
sys.exit(1)
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
# Make sys.stdin and stdout binary streams. # Make sys.stdin and stdout binary streams.
sys.stdin = sys.stdin.detach() sys.stdin = sys.stdin.detach()
sys.stdout = sys.stdout.detach() sys.stdout = sys.stdout.detach()
selector = sys.argv[1].encode('ascii') selector = sys.argv[1].encode('ascii')
domain = sys.argv[2].encode('ascii') domain = sys.argv[2].encode('ascii')
privatekeyfile = sys.argv[3] privatekeyfile = sys.argv[3]
message = sys.stdin.read() message = sys.stdin.read()
# Pick a cv status # Pick a cv status
cv = dkim.CV_None cv = dkim.CV_None
if re.search('arc-seal', message, re.IGNORECASE): if re.search('arc-seal', message, re.IGNORECASE):
cv = dkim.CV_Pass cv = dkim.CV_Pass
#try: #try:
sig = dkim.arc_sign(message, selector, domain, open(privatekeyfile, "rb").read(), sig = dkim.arc_sign(message, selector, domain, open(privatekeyfile, "rb").read(),
domain + ": none", cv) domain + ": none", cv)
for line in sig: for line in sig:
sys.stdout.write(line) sys.stdout.write(line)
sys.stdout.write(message) sys.stdout.write(message)
#except Exception as e: #except Exception as e:
# print(e, file=sys.stderr) # print(e, file=sys.stderr)
#sys.stdout.write(message) #sys.stdout.write(message)
if __name__ == "__main__":
main()
dkim/arcverify.py
+18 -14
View File
@@ -32,19 +32,23 @@ import sys
import dkim import dkim
if sys.version_info[0] >= 3: def main():
# Make sys.stdin a binary stream. if sys.version_info[0] >= 3:
sys.stdin = sys.stdin.detach() # Make sys.stdin a binary stream.
sys.stdin = sys.stdin.detach()
message = sys.stdin.read() message = sys.stdin.read()
verbose = '-v' in sys.argv verbose = '-v' in sys.argv
if verbose: if verbose:
logging.basicConfig(level=10) logging.basicConfig(level=10)
a = dkim.ARC(message) a = dkim.ARC(message)
cv, results, comment = a.verify() cv, results, comment = a.verify()
else: else:
cv, results, comment = dkim.arc_verify(message) cv, results, comment = dkim.arc_verify(message)
print("arc verification: cv=%s %s" % (cv, comment)) print("arc verification: cv=%s %s" % (cv, comment))
if verbose: if verbose:
print(repr(results)) print(repr(results))
if __name__ == "__main__":
main()
dkim/dkimsign.py
+52 -48
View File
@@ -29,53 +29,57 @@ import argparse
import dkim import dkim
# Backward compatibility hack because argparse doesn't support optional def main():
# positional arguments # Backward compatibility hack because argparse doesn't support optional
arguments=['--'+arg if arg[:8] == 'identity' else arg for arg in sys.argv[1:]] # positional arguments
parser = argparse.ArgumentParser( arguments=['--'+arg if arg[:8] == 'identity' else arg for arg in sys.argv[1:]]
description='Produce DKIM signature for email messages.', parser = argparse.ArgumentParser(
epilog="message to be signed follows commands on stdin") description='Produce DKIM signature for email messages.',
parser.add_argument('selector', action="store") epilog="message to be signed follows commands on stdin")
parser.add_argument('domain', action="store") parser.add_argument('selector', action="store")
parser.add_argument('privatekeyfile', action="store") parser.add_argument('domain', action="store")
parser.add_argument('--hcanon', choices=['simple', 'relaxed'], parser.add_argument('privatekeyfile', action="store")
default='relaxed', parser.add_argument('--hcanon', choices=['simple', 'relaxed'],
help='Header canonicalization algorithm: default=relaxed') default='relaxed',
parser.add_argument('--bcanon', choices=['simple', 'relaxed'], help='Header canonicalization algorithm: default=relaxed')
default='simple', parser.add_argument('--bcanon', choices=['simple', 'relaxed'],
help='Body canonicalization algorithm: default=simple') default='simple',
parser.add_argument('--signalg', choices=['rsa-sha256', 'ed25519-sha256', 'rsa-sha1'], help='Body canonicalization algorithm: default=simple')
default='rsa-sha256', parser.add_argument('--signalg', choices=['rsa-sha256', 'ed25519-sha256', 'rsa-sha1'],
help='Signature algorithm: default=rsa-sha256') default='rsa-sha256',
parser.add_argument('--identity', help='Optional value for i= tag.') help='Signature algorithm: default=rsa-sha256')
args=parser.parse_args(arguments) parser.add_argument('--identity', help='Optional value for i= tag.')
include_headers = None args=parser.parse_args(arguments)
length = None include_headers = None
logger = None length = None
logger = None
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
args.selector = bytes(args.selector, encoding='UTF-8') args.selector = bytes(args.selector, encoding='UTF-8')
args.domain = bytes(args.domain, encoding='UTF-8') args.domain = bytes(args.domain, encoding='UTF-8')
if args.identity is not None: if args.identity is not None:
args.identity = bytes(args.identity, encoding='UTF-8') args.identity = bytes(args.identity, encoding='UTF-8')
args.hcanon = bytes(args.hcanon, encoding='UTF-8') args.hcanon = bytes(args.hcanon, encoding='UTF-8')
args.bcanon = bytes(args.bcanon, encoding='UTF-8') args.bcanon = bytes(args.bcanon, encoding='UTF-8')
args.signalg = bytes(args.signalg, encoding='UTF-8') args.signalg = bytes(args.signalg, encoding='UTF-8')
# Make sys.stdin and stdout binary streams. # Make sys.stdin and stdout binary streams.
sys.stdin = sys.stdin.detach() sys.stdin = sys.stdin.detach()
sys.stdout = sys.stdout.detach() sys.stdout = sys.stdout.detach()
canonicalize = (args.hcanon, args.bcanon) canonicalize = (args.hcanon, args.bcanon)
message = sys.stdin.read() message = sys.stdin.read()
try: try:
d = dkim.DKIM(message,logger=logger, d = dkim.DKIM(message,logger=logger,
signature_algorithm=args.signalg) signature_algorithm=args.signalg)
sig = d.sign(args.selector, args.domain, open( sig = d.sign(args.selector, args.domain, open(
args.privatekeyfile, "rb").read(), identity = args.identity, args.privatekeyfile, "rb").read(), identity = args.identity,
canonicalize=canonicalize, include_headers=include_headers, canonicalize=canonicalize, include_headers=include_headers,
length=length) length=length)
sys.stdout.write(sig) sys.stdout.write(sig)
sys.stdout.write(message) sys.stdout.write(message)
except Exception as e: except Exception as e:
print(e, file=sys.stderr) print(e, file=sys.stderr)
sys.stdout.write(message) sys.stdout.write(message)
if __name__ == "__main__":
main()
dkim/dkimverify.py
+19 -15
View File
@@ -27,19 +27,23 @@ import sys
import dkim import dkim
if sys.version_info[0] >= 3: def main():
# Make sys.stdin a binary stream. if sys.version_info[0] >= 3:
sys.stdin = sys.stdin.detach() # Make sys.stdin a binary stream.
sys.stdin = sys.stdin.detach()
message = sys.stdin.read() message = sys.stdin.read()
verbose = '-v' in sys.argv verbose = '-v' in sys.argv
if verbose: if verbose:
import logging import logging
d = dkim.DKIM(message, logger=logging) d = dkim.DKIM(message, logger=logging)
res = d.verify() res = d.verify()
else: else:
res = dkim.verify(message) res = dkim.verify(message)
if not res: if not res:
print("signature verification failed") print("signature verification failed")
sys.exit(1) sys.exit(1)
print("signature ok") print("signature ok")
if __name__ == "__main__":
main()
dkim/dknewkey.py
+2 -2
View File
@@ -90,7 +90,7 @@ def ExtractEd25519PublicKey(private_key_file, dns_file, priv_key):
print >> dns_fp, "k=ed25519; p={0}".format(output) print >> dns_fp, "k=ed25519; p={0}".format(output)
dns_fp.close() dns_fp.close()
def main(argv): def main():
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description='Produce DKIM keys.',) description='Produce DKIM keys.',)
parser.add_argument('key_name', action="store") parser.add_argument('key_name', action="store")
@@ -121,4 +121,4 @@ def main(argv):
if __name__ == '__main__': if __name__ == '__main__':
main(sys.argv) main()
setup.py
+5 -5
View File
@@ -41,11 +41,11 @@ verification.""",
packages = ["dkim"], packages = ["dkim"],
entry_points = { entry_points = {
'console_scripts' : [ 'console_scripts' : [
'arcsign = dkim.arcsign', 'arcsign = dkim.arcsign:main',
'arverify = dkim.arcverify', 'arverify = dkim.arcverify:main',
'dkimgsign = dkim.dkimsign', 'dkimgsign = dkim.dkimsign:main',
'dkimverify = dkim.dkimverify', 'dkimverify = dkim.dkimverify:main',
'dknewkey = dkim.dknewkey' 'dknewkey = dkim.dknewkey:main'
], ],
}, },
data_files = [(os.path.join('share', 'man', 'man1'), data_files = [(os.path.join('share', 'man', 'man1'),