diff --git a/reaction-mailcreate/createMails.py b/reaction-mailcreate/createMails.py index 189a828833ee25e5ff2948589f942b0e60e33951..3c0e3dacf2c146431ee798cc5bdab554fae2cf1f 100755 --- a/reaction-mailcreate/createMails.py +++ b/reaction-mailcreate/createMails.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # Reaction Mailcreate -# Copyright (C) 2020 Tobias Dussa <tobias-reaction-mailcreate@dussa.de> +# Copyright (C) 2020-2024 Tobias Dussa <tobias-reaction-mailcreate@dussa.de> # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published @@ -52,8 +52,10 @@ parser.add_argument('-F', '--force', dest='force', default=False, acti parser.add_argument('-H', '--hashstring', dest='hashstring', default='{salt}{campaign}{infix}-{site}', help='string to be hashed for the URL (default: "{salt}{campaign}{infix}-{site}" where "{salt}" is a random string)') parser.add_argument('-i', '--input', dest='input', default='{basedir}/{campaign}/Input{infix}.lst', help='input file (default: "{basedir}/{campaign}/Input{infix}.lst")') parser.add_argument('-o', '--output', dest='output', default='{basedir}/{campaign}/{site}/Mail{infix}.txt', help='output file name template (default: "{basedir}/{campaign}/{site}/Mail{infix}.txt")') -parser.add_argument( '--salt', dest='salt', default=None, help='salt to use for hashing (default: random 8-byte hex string)') 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=None, choices=['none', 'gpg', 'smime'], help='signature method (one of "none", "gpg", "smime"; default: "none")') +parser.add_argument( '--sign-as', dest='sign-as', default=None, help='signature key to use (default: autoselect)') parser.add_argument('-s', '--subject', dest='subject', default='Security Challenge for {site} -- {campaign}{infix}', help='mail subject (default: "Security Challenge Message -- {campaign}{infix}")') parser.add_argument('-S', '--smtpserver', dest='smtpserver', default='localhost', help='SMTP server to use (default: "localhost"); port can be specified with "<host>:<port>" notation and takes precedence over implied ports and port specification') parser.add_argument( '--smtpport', dest='smtpport', default=0, type=int, help='SMTP port to use (default: 25); takes precedence over implied ports')