From d8543eb332a28f750c134b52177ec3b4830c8580 Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Sun, 13 Sep 2020 07:15:05 +0100 Subject: [PATCH] updates --- komrade/backend/keymaker.py | 2 +- komrade/backend/switchboard.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py index 1213a65..f001f6b 100644 --- a/komrade/backend/keymaker.py +++ b/komrade/backend/keymaker.py @@ -71,7 +71,7 @@ class KomradeSymmetricKeyWithPassphrase(KomradeSymmetricKey): def __init__(self,passphrase=DEBUG_DEFAULT_PASSPHRASE, why=WHY_MSG): if not passphrase: - raise KomradeException + # raise KomradeException self.passphrase=hasher(getpass(why)) else: self.passphrase=hasher(passphrase) diff --git a/komrade/backend/switchboard.py b/komrade/backend/switchboard.py index 29bdec6..a66f2da 100644 --- a/komrade/backend/switchboard.py +++ b/komrade/backend/switchboard.py @@ -6,6 +6,7 @@ from komrade.backend import * # external imports from flask import Flask, request, jsonify from flask_classful import FlaskView +OP_PASS = None class TheSwitchboard(FlaskView, Logger): default_methods = ['GET'] @@ -13,12 +14,13 @@ class TheSwitchboard(FlaskView, Logger): @property def op(self): + global OP_PASS from komrade.backend.the_operator import TheOperator if type(self)==TheOperator: return self if hasattr(self,'_op'): return self._op global OPERATOR,OPERATOR_KEYCHAIN if OPERATOR: return OPERATOR - self._op=OPERATOR=TheOperator() + self._op=OPERATOR=TheOperator(passphrase=OP_PASS) return OPERATOR @@ -46,9 +48,11 @@ class TheSwitchboard(FlaskView, Logger): return resp_data_b64_str def run_forever(port='8080'): + global OP_PASS + OP_PASS = getpass('@op pass? ') TELEPHONE = TheTelephone() from getpass import getpass - OPERATOR = TheOperator(passphrase=getpass('@op pass? ')) + OPERATOR = TheOperator(passphrase=OP_PASS) print(OPERATOR,'!?',OPERATOR.keychain()) app = Flask(__name__) TheSwitchboard.register(app, route_base='/op/', route_prefix=None)