Add missing notify

CHANGELOG

@@ -1,5 +1,3 @@
-- 0.0.6
-	* Add cache encryption, with AES-CTR-128
 - 0.0.5
 	* Replace logs with colorized progress output on default loglevel
 	* Do not repeat already failed metadata lookups

clicada/cli/arg.py

@@ -1,7 +1,7 @@
 # import notifier
 from clicada.cli.notify import NotifyWriter
 notifier = NotifyWriter()
-#notifier.notify('loading script')
+notifier.notify('loading script')
 
 # standard imports
 import os
@@ -22,7 +22,6 @@ from clicada.cli.http import (
         HTTPSession,
         PGPClientSession,
         )
-from clicada.crypt.aes import AESCTREncrypt
 
 logg = logging.getLogger()
 
@@ -73,19 +72,8 @@ class CmdCtrl:
 
         self.remote_openers = {}
         if self.get('META_URL') != None:
-            sctx = None 
-            if self.cmd_args.cafile != None:
-                import ssl
-                sctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-                sctx.load_verify_locations(self.cmd_args.cafile)
-
             auth_client_session = PGPClientSession(self.__auth)
-            self.remote_openers['meta'] = HTTPSession(
-                    self.get('META_URL'),
-                    auth=auth_client_session,
-                    origin=self.config.get('META_HTTP_ORIGIN'),
-                    ssl_context=sctx,
-                    )
+            self.remote_openers['meta'] = HTTPSession(self.get('META_URL'), auth=auth_client_session, origin=self.config.get('META_HTTP_ORIGIN'))
 
 
     def blockchain(self):
@@ -162,7 +150,6 @@ class CmdCtrl:
         auth_db_path = self.get('AUTH_DB_PATH', default_auth_db_path)
         self.__auth = PGPAuthCrypt(auth_db_path, self.get('AUTH_KEY'), self.get('AUTH_KEYRING_PATH'))
         self.__auth.get_secret(self.get('AUTH_PASSPHRASE'))
-        self.encrypter = AESCTREncrypt(auth_db_path, self.__auth.secret)
 
 
     def get(self, k, default=None):

clicada/cli/auth.py

@@ -26,7 +26,6 @@ class PGPAuthCrypt:
             raise AuthError('invalid key {}'.format(auth_key))
         self.auth_key = auth_key
         self.gpg = gnupg.GPG(gnupghome=pgp_dir)
-        self.secret = None
 
 
     def get_secret(self, passphrase=''):
@@ -50,11 +49,10 @@ class PGPAuthCrypt:
             f.write(secret.data)
             f.close()
             f = open(p, 'rb')
-        secret = self.gpg.decrypt_file(f, passphrase=passphrase)
-        if not secret.ok:
+        self.secret = self.gpg.decrypt_file(f, passphrase=passphrase)
+        if not self.secret.ok:
             raise AuthError('could not decrypt encryption secret. wrong password?')
         f.close()
-        self.secret = secret.data
         self.__passphrase = passphrase
 
 

clicada/cli/http.py

@@ -3,7 +3,6 @@ import hashlib
 import urllib.parse
 import os
 import logging
-from socket import getservbyname
 
 # external imports
 from usumbufu.client.base import (
@@ -12,7 +11,6 @@ from usumbufu.client.base import (
         )
 from usumbufu.client.bearer import BearerClientSession
 from usumbufu.client.hoba import HobaClientSession
-from urlybird.host import url_apply_port_string
 
 logg = logging.getLogger(__name__)
 
@@ -22,7 +20,6 @@ class PGPClientSession(HobaClientSession):
     alg = '969'
 
     def __init__(self, auth):
-        super(PGPClientSession, self).__init__()
         self.auth = auth
         self.origin = None
         self.fingerprint = self.auth.fingerprint()
@@ -48,12 +45,15 @@ class HTTPSession:
     
     token_dir = '/run/user/{}/clicada/usumbufu/.token'.format(os.getuid())
 
-    def __init__(self, url, auth=None, origin=None, ssl_context=None):
+    def __init__(self, url, auth=None, origin=None):
         self.base_url = url
-
-        if origin == None:
-            origin = url_apply_port_string(url, as_origin=True)
+        url_parts = urllib.parse.urlsplit(self.base_url)
+        url_parts_origin = (url_parts[0], url_parts[1], '', '', '',)
         self.origin = origin
+        if self.origin == None:
+            self.origin = urllib.parse.urlunsplit(url_parts_origin)
+        else:
+            logg.debug('overriding http origin for {} with {}'.format(url, self.origin))
 
         h = hashlib.sha256()
         h.update(self.base_url.encode('utf-8'))
@@ -63,7 +63,7 @@ class HTTPSession:
         os.makedirs(token_store_dir, exist_ok=True)
         self.token_store = BaseTokenStore(path=token_store_dir)
 
-        self.session = ClientSession(self.origin, token_store=self.token_store, ssl_context=ssl_context)
+        self.session = ClientSession(self.origin, token_store=self.token_store)
 
         bearer_handler = BearerClientSession(self.origin, token_store=self.token_store)
         self.session.add_subhandler(bearer_handler)
@@ -79,9 +79,6 @@ class HTTPSession:
         url = urllib.parse.urljoin(self.base_url, endpoint)
         logg.debug('open {} with opener {}'.format(url, self))
         r = self.opener.open(url)
-        logg.debug('response code {} for {}'.format(r.code, endpoint))
-        if r.code == 404:
-            raise FileNotFoundError()
         return r.read().decode('utf-8')
 
 

clicada/cli/notify.py

@@ -1,13 +1,12 @@
 # standard imports
 import os
 import sys
-import shutil
 
 
 class NotifyWriter:
 
     def __init__(self, writer=sys.stdout):
-        (c, r) = shutil.get_terminal_size()
+        (c, r) = os.get_terminal_size()
         self.cols = c
         self.fmt = "\r{:" + "<{}".format(c) + "}"
         self.w = writer

clicada/cli/user.py

@@ -29,7 +29,6 @@ tx_normalizer = TxHexNormalizer()
 def process_args(argparser):
     argparser.add_argument('-m', '--method', type=str, help='lookup method')
     argparser.add_argument('--meta-url', dest='meta_url', type=str, help='Url to retrieve metadata from')
-    argparser.add_argument('--cafile', type=str, help='CA certificate chain file to use for verifying SSL session')
     argparser.add_argument('-f', '--force-update', dest='force_update', action='store_true', help='Update records of mutable entries')
     argparser.add_argument('identifier', type=str, help='user identifier')
 
@@ -57,7 +56,7 @@ def execute(ctrl):
 
     store_path = '.clicada'
     user_phone_file_label = 'phone'
-    user_phone_store = FileUserStore(ctrl.opener('meta'), ctrl.chain(), user_phone_file_label, store_path, int(ctrl.get('FILESTORE_TTL')), encrypter=ctrl.encrypter)
+    user_phone_store = FileUserStore(ctrl.opener('meta'), ctrl.chain(), user_phone_file_label, store_path, int(ctrl.get('FILESTORE_TTL')))
 
     ctrl.notify('resolving identifier {} to wallet address'.format(ctrl.get('_IDENTIFIER')))
     user_address = user_phone_store.by_phone(ctrl.get('_IDENTIFIER'), update=ctrl.get('_FORCE'))
@@ -79,7 +78,7 @@ def execute(ctrl):
     token_store = FileTokenStore(ctrl.chain(), ctrl.conn(), 'token', store_path)
 
     user_address_file_label = 'address'
-    user_address_store = FileUserStore(ctrl.opener('meta'), ctrl.chain(), user_address_file_label, store_path, int(ctrl.get('FILESTORE_TTL')), encrypter=ctrl.encrypter)
+    user_address_store = FileUserStore(ctrl.opener('meta'), ctrl.chain(), user_address_file_label, store_path, int(ctrl.get('FILESTORE_TTL')))
 
     ctrl.notify('resolving metadata for address {}'.format(user_address_normal))
     try:

clicada/crypt/aes.py

@@ -1,42 +0,0 @@
-# standard imports
-import os
-import logging
-import hashlib
-
-from Crypto.Cipher import AES
-from Crypto.Util import Counter
-
-from .base import Encrypter
-
-logg = logging.getLogger(__name__)
-
-
-class AESCTREncrypt(Encrypter):
-
-    aes_block_size = 1 << 7
-    counter_bytes = int(128 / 8)
-
-    def __init__(self, db_dir, secret):
-        self.secret = secret
-
-
-    def key_to_iv(self, k):
-        h = hashlib.sha256()
-        h.update(k.encode('utf-8'))
-        h.update(self.secret)
-        z = h.digest()
-        return int.from_bytes(z[:self.counter_bytes], 'big') 
-
-
-    def encrypt(self, k, v):
-        iv = self.key_to_iv(k)
-        ctr = Counter.new(self.aes_block_size, initial_value=iv)
-        cipher = AES.new(self.secret, AES.MODE_CTR, counter=ctr)
-        return cipher.encrypt(v)
-       
-
-    def decrypt(self, k, v):
-        iv = self.key_to_iv(k)
-        ctr = Counter.new(self.aes_block_size, initial_value=iv)
-        cipher = AES.new(self.secret, AES.MODE_CTR, counter=ctr)
-        return cipher.decrypt(v)

clicada/crypt/base.py

@@ -1,8 +0,0 @@
-class Encrypter:
-    
-    def encrypt(self, v):
-        raise NotImplementedError()
-
-
-    def decrypt(self, v):
-        raise NotImplementedError()

clicada/user/file.py

@@ -65,7 +65,7 @@ class Account(Person):
 
 class FileUserStore:
 
-    def __init__(self, metadata_opener, chain_spec, label, store_base_path, ttl, encrypter=None):
+    def __init__(self, metadata_opener, chain_spec, label, store_base_path, ttl):
         invalidate_before = datetime.datetime.now() - datetime.timedelta(seconds=ttl)
         self.invalidate_before = int(invalidate_before.timestamp())
         self.have_xattr = False
@@ -82,7 +82,6 @@ class FileUserStore:
         self.__validate_dir()
         self.metadata_opener = metadata_opener
         self.failed_entities = {}
-        self.encrypter = encrypter
 
 
     def __validate_dir(self):
@@ -109,14 +108,8 @@ class FileUserStore:
         if have_file and not its_time and not force:
             raise FileExistsError('user resolution already exists for {}'.format(k))
 
-        ve = v
-        f = None
-        if self.encrypter != None:
-            ve = self.encrypter.encrypt(k, ve.encode('utf-8'))
-            f = open(p, 'wb')
-        else:
-            f = open(p, 'w')
-        f.write(ve)
+        f = open(p, 'w')
+        f.write(v)
         f.close()
 
         logg.info('added user store {} record {} -> {}'.format(self.label, k, v))
@@ -181,21 +174,12 @@ class FileUserStore:
                 self.__unstick(p)
         self.check_expiry(p)
 
-        f = None
-        if self.encrypter != None:
-            f = open(p, 'rb')
-        else:
-            f = open(p, 'r')
-        v = f.read()
+        f = open(p, 'r')
+        r = f.read()
         f.close()
 
-        if self.encrypter != None:
-            v = self.encrypter.decrypt(k, v)
-            logg.debug('>>>>>>>>>>>>< v decoded {}'.format(v))
-            v = v.decode('utf-8')
-
         logg.debug('retrieved {} from {}'.format(k, p))
-        return v.strip()
+        return r.strip()
 
 
     def by_phone(self, phone, update=False):
@@ -268,7 +252,7 @@ class FileUserStore:
             r = getter.open(ptr)
         except Exception as e:
             logg.debug('no metadata found for {}: {}'.format(address, e))
-       
+        
         if r == None:
             self.failed_entities[address] = True
             raise MetadataNotFoundError()

requirements.txt

@@ -1,11 +1,7 @@
-usumbufu~=0.3.6
-confini~=0.5.4
+usumbufu~=0.3.4
+confini~=0.5.1
 cic-eth-registry~=0.6.1
 cic-types~=0.2.1a8
 phonenumbers==8.12.12
 eth-erc20~=0.1.2
 hexathon~=0.1.0
-pycryptodome~=3.10.1
-chainlib-eth~=0.0.21
-chainlib~=0.0.17
-urlybird~=0.0.2

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = clicada
-version = 0.0.6a2
+version = 0.0.5a1
 description = CLI CRM tool for the cic-stack custodial wallet system
 author = Louis Holbrook
 author_email = dev@holbrook.no
@@ -34,4 +34,3 @@ packages =
 	clicada.cli
 	clicada.tx
 	clicada.user
-	clicada.crypt