funga

commit fc30b9272f81d5207e76d8881ea8c4a098a2902c
parent 75eaf90205f30469344c1a1e46e7582579e77e87
Author: nolash <dev@holbrook.no>
Date:   Wed, 17 Mar 2021 22:08:20 +0100

Add passphrase prompt

Diffstat:
M
crypto_dev_signer/runnable/keyfile.py
 | 
42
++++++++++++++++++++++++++++--------------
M
setup.py
 | 
1
+

2 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/crypto_dev_signer/runnable/keyfile.py b/crypto_dev_signer/runnable/keyfile.py
@@ -4,6 +4,7 @@ import logging
 import sys
 import json
 import argparse
+import getpass
 
 # external impors
 import coincurve
@@ -21,23 +22,36 @@ logg = logging.getLogger()
 argparser = argparse.ArgumentParser()
 argparser.add_argument('-d', type=str, help='decrypt file')
 argparser.add_argument('-v', action='store_true', help='be verbose')
-argparser.add_argument('arg', type=str, help='decrypt file')
 args = argparser.parse_args()
 
 if args.v:
     logg.setLevel(logging.DEBUG)
 
-r = None
+mode = 'create'
 if args.d:
-    try:
-        r = from_file(args.d, args.arg).hex()
-    except AssertionError:
-        sys.stderr.write('Invalid passphrase\n')
-        sys.exit(1)
-else:
-    pk_bytes = os.urandom(32)
-    pk = coincurve.PrivateKey(secret=pk_bytes)
-    o = to_dict(pk, args.arg)
-    r = json.dumps(o)
-
-print(r) 
+    mode = 'decrypt'
+
+def main():
+    passphrase = os.environ.get('PASSPHRASE')
+    r = None
+    if mode == 'decrypt':
+        if passphrase == None:
+            passphrase = getpass.getpass('decryption phrase: ')
+        try:
+            r = from_file(args.d, passphrase).hex()
+        except AssertionError:
+            sys.stderr.write('Invalid passphrase\n')
+            sys.exit(1)
+    elif mode == 'create':
+        if passphrase == None:
+            passphrase = getpass.getpass('encryption phrase: ')
+        pk_bytes = os.urandom(32)
+        pk = coincurve.PrivateKey(secret=pk_bytes)
+        o = to_dict(pk, passphrase)
+        r = json.dumps(o)
+
+    print(r) 
+
+
+if __name__ == '__main__':
+    main()
diff --git a/setup.py b/setup.py
@@ -48,6 +48,7 @@ setup(
         entry_points = {
             'console_scripts': [
                 'crypto-dev-daemon=crypto_dev_signer.runnable.signer:main',
+                'eth-keyfile=crypto_dev_signer.runnable.keyfile:main',
                 ],
             },
         url='https://gitlab.com/nolash/crypto-dev-signer',