Merge pull request #10 from TrustNetPK/dev

agency stable code

Author: osancus

README.md

@@ -47,6 +47,10 @@ The administrative API exposed by the agent for the controller to use must be pr
 `--admin-insecure-mode` command line arg. The latter should not be used other than in development if the API
 is not otherwise secured.
 
+
+> Storage and some other modules were modified in aca-py to create this multi-tenant agency. This particular code base requires security and storage improvements!
+
+
 ## API
 
 Follows same api as ACA-PY with additional parameters in header see 'Usage' section.

aries_cloudagency/admin/server.py

@@ -237,6 +237,8 @@ async def agency_middleware(request, handler):
                 self.context.injector.clear_binding(BaseStorage)
 
                 wallet_instance: BaseWallet = await agency_wallet.get(wallet_name, wallet_key)
+                if wallet_instance is None:
+                    raise web.HTTPUnauthorized()
                 self.context.injector.bind_instance(BaseWallet, wallet_instance)
 
                 storage = IndyStorage(wallet_instance)

aries_cloudagency/agency/wallet.py

@@ -50,10 +50,13 @@ async def close(name, key):
 
 
 async def get(name, key):
-    wlt = open_wallets.get(name)
-    if wlt:
-        # print("Wallet already exist!")
-        return wlt
+    agency_storage = AgencyStorage()
+    wallet_info = await agency_storage.get_wallet(name, key)
+    if wallet_info is not None:
+        wlt = open_wallets.get(name)
+        if wlt:
+            return wlt
+        else:
+            return await open(name, key)
     else:
-        # print("Opening new wallet!")
-        return await open(name, key)
+        return None

aries_cloudagency/transport/pack_format.py

@@ -131,6 +131,8 @@ async def unpack(
             context.injector.clear_binding(BaseStorage)
 
             wallet_instance: BaseWallet = await agency_wallet.get(recipient_wallet_name, wallet_info['wallet_secret'])
+            if wallet_instance is None:
+                raise MessageParseError("Wallet doesn't exist in agency!")
             context.injector.bind_instance(BaseWallet, wallet_instance)
 
             storage = IndyStorage(wallet_instance)