From 41b5a747ba183bd40f8d70e8adba8b3c0a799f2c Mon Sep 17 00:00:00 2001
From: "Tobias Dussa (TGD)" <dussa@dfn-cert.de>
Date: Thu, 12 Sep 2024 20:37:19 +0200
Subject: [PATCH] Fixed typo.
---
reaction-mailcreate/createMails.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/reaction-mailcreate/createMails.py b/reaction-mailcreate/createMails.py
index f1348fe..0ddfe6c 100755
--- a/reaction-mailcreate/createMails.py
+++ b/reaction-mailcreate/createMails.py
@@ -63,6 +63,7 @@ parser.add_argument('-o', '--output', dest='output', default='{based
parser.add_argument('-R', '--reply-to', dest='replyto', default=None, help='reply-to mail address (default: None)')
parser.add_argument( '--salt', dest='salt', default=None, help='salt to use for hashing (default: random 8-byte hex string)')
parser.add_argument( '--sign', dest='sign', default='', type=str.lower, choices=['', 'gpg', 'gpgsm'], help='signature method (default: ""); one of "", "gpg"')
+parser.add_argument( '--signpass', dest='signpass', default=None, help='Password for the signature key (default: none); will be queried interactively if set to "-"')
parser.add_argument( '--sign-arg', dest='signarg', default={}, nargs=1, action='keyvalue', help='additional arguments to be passed to the signature call (default: None)')
parser.add_argument( '--sign-init-arg', dest='signinitarg', default={}, nargs=1, action='keyvalue', help='additional arguments to be passed to the signature-mechanism init call (default: None)')
parser.add_argument('-s', '--subject', dest='subject', default='Security Challenge for {site} -- {campaign}{infix}', help='mail subject (default: "Security Challenge Message -- {campaign}{infix}")')
@@ -95,7 +96,7 @@ if (args.sender == 'Nobody <nobody@example.com>') or \
if not args.dryrun:
import smtplib
# Import dependencies for HTTTP interaction if necessary
- if not args.webserver:
+ if args.webserver:
import requests
# Import dependencies for attachment file-magic if necessary
@@ -137,6 +138,11 @@ if args.smtppass and not args.smtpuser:
if args.smtppass == '-':
args.smtppass = getpass.getpass('SMTP authentication password: ')
+if args.signpass == '-':
+ args.signpass = getpass.getpass('Signature key password: ')
+if args.signpass:
+ args.signarg['passphrase']: args.signpass
+
if args.sign and 'keyid' not in args.signarg:
args.signarg['keyid'] = args.sender
@@ -173,6 +179,8 @@ if args.verbose:
print(f'Using "{args.sign}" as signature method.')
if args.signarg:
print(f'Using "{str(args.signarg)}" as signing argument(s).')
+ if args.signpass:
+ print('Using "{args.signpass}" as password for signature key.')
else:
print(f'Using no signature method.')
print(f'Using "{args.subject.format_map(SafeDict(basedir=args.basedir, campaign=args.campaign, infix=args.infix, webserver=args.webserver, salt=args.salt))}" as mail subject.')
--
GitLab