Merge pull request #190 from olcf/ngin_no_cache_connector

allow no cache to be used inside the interpreter
olcf · Oct 27, 2020 · 8c79f78 · 8c79f78
2 parents 24400d4 + 3eacea2
commit 8c79f78
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 56 deletions.
diff --git a/libpkpass/commands/command.py b/libpkpass/commands/command.py
@@ -63,7 +63,7 @@ def _run_command_setup(self, parsedargs):
         self._build_recipient_list()
 
         # If there are defined repositories of keys and certificates, load them
-        if not self.iddbcached:
+        if not self.iddbcached or self.args['no_cache']:
             self.identities.cabundle = self.args['cabundle']
             self.identities.load_certs_from_directory(
                 self.args['certpath'],

diff --git a/libpkpass/commands/interpreter.py b/libpkpass/commands/interpreter.py
@@ -168,7 +168,7 @@ def postcmd(self, stop, line):
         """ Fix command line arguments, this is a hack to allow argparse
         function as we expect """
         ####################################################################
-        if str(line) == "edit":
+        if str(line) == "edit" or '--no-cache' in line:
             self._reload_config()
         return Cmd.postcmd(self, stop, line)
 

diff --git a/test/passwords/gentest b/test/passwords/gentest
@@ -12,34 +12,34 @@ recipients:
     encrypted_secrets:
       64:E6:E2:73:E4:EE:B2:98:80:55:B4:43:10:33:FF:2B:9F:D2:E8:EF:
         derived_key: !!binary |
-          c3lyMUh5cU1uOWtZYmJBc1VXUjlYbmJGeWFCQldUT2xkcmJXeFJxRE1JYWp6RURxV3RSZ1pwWFN1
-          WU16TEJzSnA2WEJZSXY3T01BUmNid2laOTljaWV3M04ySTBESGZXMGtTVFdEZG9CX3piRmNtUi1H
-          aTJIMHE1d3pFRzNkWFhrbzZCQUVCZmNwbUJGdzNkdDBnMldnV0NqMThVZzhGbi03YmNYVFNRUmtN
-          c0JxcEVLQkwzNFd5MU5YRFVUNkVwMWtrRGZRNzU3TFRjYk9XbzFoVEoxOFk5WnNHSWp2Y2tUeE53
-          a1hpQnRKQnBxblB4MFhiRjRlMnJuSm51anhSWTk0ZFRhY214TklaaUNKM3JZNHlZSF9Dc09nc1RY
-          RTd0UXQxZTdwb2RxTjRrb2ItVF9KWFE5WmFmVUd1QTdsWGZiYjFqeDU0NnpNREp0d09qTl9CX3lH
-          eDdVaW5jaGpmZHRmcXhIa0FrdG45NFB6bzAxNWNob2pSMk1XVXpJYnA5OEpSUEo0VURHdmJDdnNC
-          di13YnNzbnd3b19OMXdXaURIZEV6ZlJlWVVaUTJaM3pJb21pLW1PdnRXOFVyWk1uMFpWM0JhWm5H
-          NjJnbUs2MkRaX25QMDNrM0l6aXVyWjk0VkVYcDRiVExJS0VkWHcxQ3RiUlM0Vjd1SHZpN2d5cXRX
-          ZjFEQ1JFbTlKdG1USlNyWGtjandZcmVMMGI1aTFZU3FJdF9EOXhSUUtRQmoteDljekdsRVZrTWg5
-          M01FX3FpclhoTFJ0SFdGZFlGcnZDSnJLT0hCVnk3NnU3d0RYa0dFa1NfX3U0MzBSQ0tqRzF6Rldz
-          Z0V3NUlQejZxRkpKVzI0RFpRVGFwb1BHOFVpTFl3Qk15NktxZldUVXB0dDdSQ2xWRjRWQjZsN3c9
+          aWYzNHBfa2duRzlIR1g0aVVDN3FvbjZEb1NmbHR3Y2JwbURuNy04dTgxX1ozaUx6R0tXdGEycUFj
+          VFBTRzBvNVlkTngyem5JTWhfaFNTdV9CYWNqSmNyZVZnQjJyUnE5V0RJU1p3bXhzUzBBbWMtX3Jm
+          aGMwUkh4eDJlb1VhUXdHeThWMDQ4aTd2eVhVemRjckxPemJOYmtMOC1fQUpyTmRQRkZGM3g0VVdI
+          d3RtYUlscVBzYk9CM3k5aEJJS25feHZvVEFNTzBjR0hveHNLVldIekk1SmRPdE5KUVVHMUNrTlZM
+          TFl2VkxZa2EzN1ZscGl2bjZJanBtYTIxQ0V2OWtNSkNzVTMyZHRNbHlJa0pQcGdWc2dmcUlIOTM2
+          Q2IySkw1U2xUODVJellEOF9BMXN0N2d0eVJTaTJxUTdrYncwU0huUllKUnpnamxaZlRLWWl3eDNN
+          YmpqbERyZnNtWmFCZGxqNm5MaXIxY2RqdXJTSWptR19ZR1NLVWN1NnhraWc4ZUJGQ3VlbWFiM1N4
+          OWNOWE5MczF1ZWU3VVhtcDlYcGhQY2YxeDk2TFI0QVJQbUI0dVpRZ0hqMWNIUGVPam1oQjY1X0hQ
+          YzhrdEsyYkJCa0VFMC1NOXdTX2Y2cU1tLVRjZ09WdVE1QXFjNThkQncyTlFXYmlVaWY4S1VhemF0
+          T2xjUlJ5WVNUMklxX3lQM2Y4cUlHS0VuVFUyZ2Jza3F4LU45SFoxWW9EUHBtWXhDVFd6T0k3a0pO
+          czMxVTlsNzJqTDZla1duc2NCMXhHd1RiUXlHMUNBZEFiX0lLR1RSQ3BWV29RTmxHUWxmb2ZRV3BL
+          c1lGLWpIQlZqTnViRDk1aGNPcXVRbWxCVUlRMkh4M2RwMUtGbTZOWmxGUHZyNzJ5dXlJR1NMT0E9
         encrypted_secret: !!binary |
-          Z0FBQUFBQmZtR2hKWGJaTUlVV2Y0b3dqdWk2Z2dsX2V4T3NSWEp2Rm1QUVpyckNrVTEwaExYLXhi
-          b3Z1QkkwMWtGSElVekdpeW15OVpFdkF3alVDWkZoVHVJQXhYRm1PQUE9PQ==
+          Z0FBQUFBQmZtSFU1bXY3ZTl5ck9QY05WVDI1WWdhYVcwOUhTbm5LbUhROFNORWFNRzRoNFN6Wklj
+          dVh4aEFLcVhXdWVpWXQxY3ZUT3R1U081WDRsOXVrZy1hYmhRUWJ2aEE9PQ==
         recipient_hash: b779ae6e
     encryption_algorithm: rsautl
     signature: !!binary |
-      dnhzTmRWczRJQlFBb1E0ZTVXeDdweU5jQ0taN3R2UkF2SlppVmcwLUFfOVhzV2hvdXNmQzkzb1JH
-      Y1hsSTU1MmZSUnlPWjZEdGU1dnh3WnJkRzNWQWxHZHpzVXYweXlRVlNWSFFtY2JMSFd6dXNSWmFC
-      Z1Q5MEkydnN3RFY3Zms4RkIzbTVHUU5hZEh1Y3ByLVJ5TUNCM28wYzNkUXphem5aVVZXZWtSQ3B6
-      NnU0OUo2SWRCYWg4VGdrSnlvdEw5X0RmVXhDUzl4OExFYUlRekFwQXR5MUh4ZGQ3bEtlLUFreU53
-      VThRbkRDQ0Ywc2FySDFfYnBRM1pIQk1IVHhHczcwd3hVcEpOLU9mMlQxR21SR2Q0SGZGRWltbUVP
-      a0NvTXZCRE5VQmRhckdtejFHdVJJYjU2X0xTRFdDUFJfTF9mcFhOQURTTjdwT3hpendFVE1Eblhw
-      aU9lb0FFU1FSUlBFaThGRFJQX2FrN0VJQUtsTVJlWFFzMmx0WmRVaHFWeEd5eHByM0V5NVQ1TGtH
-      N1ZjR2V0V3puZ2lzbnN2ZWhSQjlSY0dad2hUc1k2RVl1M3ZxZmJKNmxVYlJuRUtBb0lWVEdFVlFN
-      ZUdoaXlvak1NVDlOVXNZYjlpd0pSUFlDVTV4Y0lYTUVvOWc2VTFPOF9CU2xnT1ZNZlBteWE2TmZ0
-      Vi0yNXo2d0VNSlJCb2tVMHRkMWVFc2RpVFNZMHhxTE94Rmkwc2ZuQjl3N0kxcmxkdjQtUHkyWW5w
-      bXNCTUg5N1RucG5YTG1TT0x4NHBZRnMyWE00bXU3TlVWNlk3ZHMzRFpRZHdHZXRqZmN6U2RaZC1L
-      ZUw4ZkNKcUJRenhMT0NCM3M1aTlFUE9Qbm5WRGE0MHZXUWVxYVF3ZVFGV0pqMUQwSzFic2VYLUE9
-    timestamp: '1603823689.37'
+      UG9iLThnd2YzVVNuTVJudUNDNHUycWVhU1VINEdpR3pqMjJETGNsYlVoWVlnSWxJWVhsdFdxUnc0
+      UVhldWI4Mmt4Xy1EQnV3WHdPdVlmVEdDR1JBVjZpdUZjZEg0ckJwSE9kalNrZnhXLXE4UVNhRVAw
+      dGdRRW8wZENJc0JieU1vTjViY3pNUXBlX1NfN3RyY1lJME5mY2ljTUhGekQwaVJGazdNM2UteTB3
+      M0NYRDl5bFFwTFlfWV93cFV1RW5Wb3BkVHBqWDZISzZUSGI2MW0tZjZxNWhqdFlVQUFMVmlfY3la
+      UDlBeGdLNTB3X1dWdGo5Zm1UdjBLa05IekJES181QTFYYVlHM1JlR3ctTXdzbDFJb2p4V1VCd3lq
+      X2k0dkZJU2xVTklpQUtRVGwzVkJyczYxbkxSMVh1d05zcXc4Q3BmN3JabFhubV8yY1FrMjhCNm9r
+      UWdpMkVYWklmb05sU3Q2bmNkUFoxdjhRdFF4ZHVRN3ZfUHVaWFBMWnZkbEx0R2ZtWUFsTFN3eV9q
+      blhlN3NiX1FIWlltZG1BYllfdUZwY0xERUsxYUtoeEFMaG1yS2tlZHEwUmRSVFZRRUZzYmFqUkVv
+      d0NONER6ejRSY25BdVVKQWJqbmMtcmxiVFRNb0xEZ2dOaXhsNmthaGFNeTNVMkk3aXhqU3VzZVZS
+      RmhadEdEd1prT21RZGYzbkk2THVoallkeGt5TzZEZ1RWczJWenhGSDlDVmJidWRNS0dSVDZXeGhF
+      TGhKWTB1aU90cnZYbG5EYzhIcmlLUjNYOEZ5RUFvdXk3TlFKOUtybHVyUEVUZ0dzeFdmalVNWkxt
+      NHcxQjQ5dy1oQmhPY1RRQ2laRTZsY3czbEw5M01NRFlnVnI5amJsLWpzcXJNUUI2czRERDhMc1E9
+    timestamp: '1603827001.54'
diff --git a/test/passwords/test b/test/passwords/test
@@ -12,34 +12,34 @@ recipients:
     encrypted_secrets:
       E4:9E:31:9E:53:3C:91:C5:8F:A2:27:8C:DC:77:AE:9E:91:19:0E:6B:
         derived_key: !!binary |
-          YjloX3pCVkpyTU9lSzdZaVJpOU83cnNISjJDWmU5MFNRWlZxYXBqUUFaV0JqM1VObzZoOVc2d1U1
-          bXItckRObXlvcVhiaE1taUc0V3BzU3JjVHA3SjBPZTVsWDZwd2xrVVpEbHYwLVpGeVV6VkN4YkxL
-          cmlzZWlmdlJnMXBkbUZuVXZTVGhrSVI0Mi1Fc19qcUQ1WV9MaVlMcHEzSTlxNWZudFgyaTZHdVBj
-          Mmg3N0R1NjI5RXlfQjJ5WHY5SVJpbzMyZnAwVWNyczNOeThqZTJhNmZQaUhiSUFnT3o2bjAtLTVm
-          dW15UE9fQ0NtWTB6RHZsVi00WS0zc2VIWFFNV0dkUkZ2TVN3aXRSQjdNY0NKQUs3RXVkWFRmRVFS
-          dHk0czRxdVhWR2JsZHRGem1xZm0zalVERGZKck9EQ2hQLVUyRGpJb3J4V211TjFKZHpjWllrUnZE
-          bEJ5VUwwdE5kWGE0TzF3NUVvdnJjdVJBQmxaRzRkSXpHbWZBVHB4TDZKLUJ6dV9yRm9ZUG9TQUdY
-          VXdZLVNQUFRLc1lfeUFvZGhxb09DVFNXVlVvUFlNZEJ4MjR5UjNzUmFOWTloZ1hQcURRTVNGYktF
-          MTQ4U044MXpZazJ6Nm1fU3VJUk1xa3ZuTld6VUFsaktUYXp1V0JrcDVTZUhBeWpMWWtLMVVxRHlM
-          NFluOEdka2pTdXZlaTJIWjRCbGFJeVJxYklVUGd6cGNjQ2h6eWk4OTZOdVB6dGc4MG1GbFJFN0V3
-          UzQwWWh6VUl0SXpZUHVWWENUVW1wV2VESFUwc0tQLU1TVFB4LU85ZkRKbHZCMVM5NTl5VmVQOEkz
-          aFdmZnVKNnBSS0dtQkRNdXdTc2c2OFdQcUszZHRJT2NzRHNWdl9rMGxDVDNGNUFNdWdJR05WZTQ9
+          VDVDVTFZcmxMWl95RWhfVktNRmxhZHdYQW44blBLeXl6OXU1dTFhbVBuUVhaa1E0VWxGd1cwclot
+          azB4eDBXbl95V3F3UHhkSWZPZHNwZ3QtdXo5SVgtb1QxUnp6eno1aV9WT1Q1X0x4dXp6RkFqR1dF
+          WHFfbHZwdlMyYjJrS0tGck9yM0FDZHEtLUQ1T21veDlDUEdjSVJSOW5Cc0NPSlEybG5zc0ZSemdF
+          V1llZWs4WWxvWlRaYnlwWHc4ajFyMXpFSmNEVzZUdDNjeXNqQnR0ZC1qR3k2NlU0RzRsQnRrcVMt
+          X0VyNHRRNURDMWpvUjg5YkJROEhFT1BJUDY2WXZPaHd0bzNkV0tSX0ZVam8teFJ3cHZ5NlQzZVZO
+          UWJLVlB0cjN1dm5sSU5ZdExiR3NDeFFCazVhb25lMnFjMzlzemJkeEw1dENrZW04dmlteFU2WmZn
+          b19Ga2pkWDVaOHRIYjVsQnlFa2FwUkE4bEdtWVpkOWI3QlFhai1NRXlBeTlaSVIyXzVOZlhNWFZO
+          QWY4NDZkTHREczFoeHZjcjZRWjdMSkJTTjF1NkJ1T1Z0V3V1RkE0R3dGT2t0aUpLNERyWFUzOElE
+          OGp4WDJRQTV0RTNEenpHeUhQR2xqNGdrMU1YWnVsb2xzcktEelA2ZkNtWlgxMzJLWXRXTHhFZm54
+          b0R4X3dSVjhMbDBwNnZ2V2tqbWF6UWQ1NGlCT09ydjVuZmRSQlFQVXJYcU5XTWhvTzJ5Qzk5YXJu
+          Vnc4NlhDZnhjSElfTFdPVmdfUWJMRUtqZF8yekY2RTFOQldJaVY3YnZ5S3B2TGNjalBsbEhObF9M
+          eGNkLUI2c1E0QVlZendJaVdhTXBoei03UDNzeTlnNUJxRXIxMVlmMU0zUElLZjJKVklFT2hhZ3c9
         encrypted_secret: !!binary |
-          Z0FBQUFBQmZtR2hHdXBRWDBVbWNHbnRYVVFMdHE4NWh6UmN2VWtyM0kzMEh2dXp0NWZRczNGY29y
-          dERUNzQ0NTFDcHNJaGw0NXhsS2M4U1dJWUc5LVg0VlhJMS1tUFFsTnc9PQ==
+          Z0FBQUFBQmZtSFUzRWltYnpORWpya0ZyTy1VbzM1M2tvTU51Q3BZaTBsVGpEZVJHdnk4QzhnN2tr
+          VUxjWVF2Z3BOeUJOMU9rSVFGR2RGZW9YQ1d0Nm9qLU5mV2plU0xTTEE9PQ==
         recipient_hash: 63b96030
     encryption_algorithm: rsautl
     signature: !!binary |
-      UkxRTnhRdmp2YlpyNnhZaHBiN3Nzb3ZoNjRRUjhvdGZhYkduQUk5ai0yenhZSTI0NkM0NmxRSlQ2
-      VUh0VDBQTTFVamlLS1oyS3JJMTdibGk0cU1SaDFibElzTGNRc0RpUzlWSzdlcGh3RGxwekdKM1BH
-      czlLUFl4bnlUd1hWLVBlUy1WcGRzOW1hTmp1YU15NU0xTHBhdW4tYUI0eUJsbnBoYnFIdnR5RGpl
-      dnFkY25kM0xUajFiTm1qWXBWYjdaTDI1Y1hFVTZiTGxaOWpqWUFHMGF3ZTdpZGNKa0FaVUtXN0pQ
-      bEczaERsTlhpOTVGLUhGRy11cjh5VnhROVhjZFJBLWFKeW96ZTN1RnF6OWhZWi1wYlU2Z0FkZzdO
-      WC1wYk93ajd2RmtjNHNlekVMblczd0FfSDUzWTdocHVQeXdpRGZfaVdvOUplNERRTjgzMUlYaVlz
-      TzN2ZWl1TG1BcHYxSndGSnlnS0N2bTVESDVFQjJuNjRuMllueW9teE12SjhZZTNhczViSk1OeVdy
-      N2h5cjM1TlFyUXJRbGZvUmhoNlZHbUpXNU1rNkkwblF4NkhZeWhaUWk5bk9CQ0d6RzVIb0RXcHU0
-      cnlsVnBxS29NSGZkbE5YUVdWZzFkNTV2aWdmWjVmWUZJQ0hPbjNCYkJxdTFZYy16SGU1ZnVPRmxG
-      aEpDTnJOS3FFajdvekx3Z0NQT0tFRkpBdFJwQm0xT21JTUpOVjhhUGNWRmFOMHF0aVRiaG43UlJ3
-      N3Y5X08yTkdITWQ0dmc2bHMxN3VVeXlETnM5VEE3NC1DQnE2MndsYk1TUFhxX0k3d2N0ZFZUX19a
-      bWE5NDgwUlBkMjZUdUJpck9nRmdXYjQ2bnVyalZXdDFnVGVGZHlNRS1YT3VKS1djN3V0OGUxZ2s9
-    timestamp: '1603823686.91'
+      QVMyRV9qSkRxSmJ1cUlTcGxURVBhc1VINTdmU000UjFsMkltWDNwdFRsWUxiT1liVFZlelhqazF2
+      ZVBhdWV1NG9QdzByYlVhUmc3MnlOSVh0cmRnb1RLbi1zRUVIVzdPMTRXdV9Bd3lsN0JKREZLVmU0
+      YVd5UjlKOElZSHRNSGgtWm1yWjNyWmpCbHpaU29YWUItNHkxM1I5RGpTMVJKVTdNamN1WloxVEFT
+      dEZKQmlxeWx4RzVtNW1kOHpQbnRLS2pMSmVFZUpXSHFpakktcW9yWTdkNmhOWkVYZnd4VEhkR3hT
+      QnE0eEF1ZUpOd2kzdzhPLU5CNUZQdWFjQklrc1VaUXBvaElIaTNWcnV3b0lua0RSRGNGd3lCcW1N
+      WXBfM0lGWVFzeVVjRDRtek03bDBXUk5oLUlOZWgtRmQzQUl5Wi1CZjN6a20yWjNHOWFvRjV4Rmcz
+      RDQ4RXFCRHdZN0VBdFp2Zm9leGs4X0F3WkhkMGdLV2ZGMmp0RjBGOTFLVEpBODExeFpSWmZoY0Nf
+      T0VQcVJib0JiVWNEeFdxNmluOWY1VTJOendRQ2hINTRBQ0gxVWhlZlZkWGs2RG84WmJvNHRaeUdD
+      dXNxMDl0eEl3eW1fYVh0R3l6WDRxdnE5RVNFd3NzODNnbGQ3VlcwSkFWU0d5SlRIaWtoRFBmbE1h
+      STIwUnY1cVpndWMwRmdYWmRiRnFwMlBQRjBPYjJHLTZadXVSeFlWZVZiTzhDNjF2VFJTdkJiQlpU
+      anJiME02ZVVmbUJwWE1NSkN4Vm9ueEpxNXFtTHBtQ1R6MUNjUVppOFZvMUs0cVZQUy1JNThGbEZ0
+      Wk9rWWlCOHNpUW82aHJtcVpOamNzckMxdW14NTlxcDhiRnNzV3BpUklJSjVYNmJNWHdkS2xJcDA9
+    timestamp: '1603826999.09'