p3lib 1.1.63__py3-none-any.whl → 1.1.64__py3-none-any.whl

p3lib/bokeh_auth.py

@@ -80,11 +80,11 @@ class CredentialsHasher(object):
               recommended for high security systems but is aimed at providing 
               a simple credentials storage solution for Bokeh servers."""
               
-    def __init__(self, userHashFile):
+    def __init__(self, credentialsJsonFile):
         """@brief Construct an object that can be used to generate a credentials has file and check 
                   credentials entered by a user. 
-           @param userHashFile A file that contains the hashed (via argon2) login credentials."""
-        self._userHashFile = userHashFile
+           @param credentialsJsonFile A file that contains the hashed (via argon2) login credentials."""
+        self._credentialsJsonFile = credentialsJsonFile
         self._passwordHasher = PasswordHasher()
         self._credDict = self._getCredDict()
         
@@ -95,9 +95,9 @@ class CredentialsHasher(object):
                    key = hashed password."""
         credDict = {}
         # If the hash file exists
-        if os.path.isfile(self._userHashFile):
+        if os.path.isfile(self._credentialsJsonFile):
             # Add the hash a a line in the file 
-            with open(self._userHashFile, 'r') as fd:
+            with open(self._credentialsJsonFile, 'r') as fd:
                 contents = fd.read()
             credDict = json.loads(contents)
         return credDict
@@ -113,7 +113,7 @@ class CredentialsHasher(object):
         
     def _saveCredentials(self):
         """@brief Save the cr3edentials to the file."""
-        with open(self._userHashFile, 'w', encoding='utf-8') as f:
+        with open(self._credentialsJsonFile, 'w', encoding='utf-8') as f:
             json.dump(self._credDict, f, ensure_ascii=False, indent=4)
                 
     def add(self, username, password):
@@ -170,13 +170,13 @@ class CredentialsHasher(object):
 class CredentialsManager(object):
     """@brief Responsible for allowing the user to add and remove credentials to a a local file."""
     
-    def __init__(self, uio, userHashFile):
+    def __init__(self, uio, credentialsJsonFile):
         """@brief Constructor.
            @param uio A UIO instance that allows user input output.
-           @param userHashFile A file that contains the hashed (via argon2) login credentials."""
+           @param credentialsJsonFile A file that contains the hashed (via argon2) login credentials."""
         self._uio = uio
-        self._userHashFile = userHashFile
-        self.credentialsHasher = CredentialsHasher(self._userHashFile)
+        self._credentialsJsonFile = credentialsJsonFile
+        self.credentialsHasher = CredentialsHasher(self._credentialsJsonFile)
         
     def _add(self):
         """@brief Add a username/password to the list of credentials."""
@@ -223,7 +223,7 @@ class CredentialsManager(object):
         while True:
             self._uio.info("")
             self._showUsernames()
-            self._uio.info(f"{self.credentialsHasher.getCredentialCount()} credentials stored in {self._userHashFile}")
+            self._uio.info(f"{self.credentialsHasher.getCredentialCount()} credentials stored in {self._credentialsJsonFile}")
             self._uio.info("")
             self._uio.info("A - Add a username/password.")
             self._uio.info("D - Delete a username/password.")

p3lib/bokeh_gui.py

@@ -759,19 +759,19 @@ class MultiAppServer(object):
            @return The TCP port or -1 if no port is available."""
         return SingleAppServer.GetNextUnusedPort(basePort=basePort, maxPort=maxPort, bindAddress=bindAddress)
 
-    def __init__(self, address="0.0.0.0", bokehPort=0, wsOrigin="*:*", userHashFile=None):
+    def __init__(self, address="0.0.0.0", bokehPort=0, wsOrigin="*:*", credentialsJsonFile=None):
         """@Constructor
            @param address The address of the bokeh server.
            @param bokehPort The TCP port to run the server on. If left at the default
                   of 0 then a spare TCP port will be used.
-           @param userHashFile A file that contains the hashed (via argon2) login credentials.
+           @param credentialsJsonFile A file that contains the json formatted hashed (via argon2) login credentials.
            """
         if bokehPort == 0:
             bokehPort = MultiAppServer.GetNextUnusedPort()
         self._bokehPort=bokehPort
         self._address=address
         os.environ[MultiAppServer.BOKEH_ALLOW_WS_ORIGIN]=wsOrigin
-        self._userHashFile = userHashFile
+        self._credentialsJsonFile = credentialsJsonFile
 
     def getServerPort(self):
         """@return The bokeh server port."""
@@ -800,7 +800,7 @@ class MultiAppServer(object):
         #As this gets run in a thread we need to start an event loop
         evtLoop = asyncio.new_event_loop()
         asyncio.set_event_loop(evtLoop)
-        if self._userHashFile is None:
+        if self._credentialsJsonFile is None:
             self._server = Server(appDict, 
                                   address=self._address,
                                   port=self._bokehPort)

{p3lib-1.1.63.dist-info → p3lib-1.1.64.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.63
+Version: 1.1.64
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 Home-page: https://github.com/pjaos/p3lib
 Author: Paul Austen

{p3lib-1.1.63.dist-info → p3lib-1.1.64.dist-info}/RECORD

@@ -1,7 +1,7 @@
 p3lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 p3lib/ate.py,sha256=_BiqMUYNAlp4O8MkP_PAUe62Bzd8dzV4Ipv62OFS6Ok,4759
-p3lib/bokeh_auth.py,sha256=tGPelSePfsge03hqxyHJx0-46_SF8qCRhIv92cPTIjs,9725
-p3lib/bokeh_gui.py,sha256=q5XABYaT43dqefGF3We_bozgKMOXXod8VkIwDjqJUMo,39785
+p3lib/bokeh_auth.py,sha256=u8lrdRRtnkBntwXU47ISM85myC_dhQXvv5SGYgeprdM,9816
+p3lib/bokeh_gui.py,sha256=Kx8mKcKrxsaf7md6Jk252nBC8yilUFRx3nMCfVc8S4Q,39835
 p3lib/boot_manager.py,sha256=-kbfYbFpO-ktKv_heUgYdvvIQrntfCQ7pBcPWqS3C0s,12551
 p3lib/conduit.py,sha256=jPkjdtyCx2I6SFqcEo8y2g7rgnZ-jNY7oCuYIETzT5Q,6046
 p3lib/database_if.py,sha256=mgTdSeCTQs1V10E7KuyK3xRkdaU3RXrqYpMQvosrA_M,11897
@@ -13,8 +13,8 @@ p3lib/netplotly.py,sha256=PMDx-w1jtRVW6Od5u_kuKbBxNpTS_Y88mMF60puMxLM,9363
 p3lib/pconfig.py,sha256=_ri9w3aauHXZp8u2YLYHBVroFR_iCqaTCwj_MRa3rHo,30153
 p3lib/ssh.py,sha256=YE1ddgiEt9EeBM8evuxCV8Gnj4jz1Sv52vEKidvjrJA,38369
 p3lib/uio.py,sha256=hMarPnYXnqVF23HUIeDfzREo7TMdBjrupXMY_ffuCbI,23133
-p3lib-1.1.63.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
-p3lib-1.1.63.dist-info/METADATA,sha256=V1qYHHOdUIy253DfPr-Z6ShUBxJ4eotG-nAn8DFu_pg,920
-p3lib-1.1.63.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-p3lib-1.1.63.dist-info/top_level.txt,sha256=SDCpXYh-19yCFp4Z8ZK4B-3J4NvTCJElZ42NPgcR6-U,6
-p3lib-1.1.63.dist-info/RECORD,,
+p3lib-1.1.64.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
+p3lib-1.1.64.dist-info/METADATA,sha256=C6TYAMUOgbrxycGFILpXgCLDcyRbxNgJKjGQBG8ytpE,920
+p3lib-1.1.64.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+p3lib-1.1.64.dist-info/top_level.txt,sha256=SDCpXYh-19yCFp4Z8ZK4B-3J4NvTCJElZ42NPgcR6-U,6
+p3lib-1.1.64.dist-info/RECORD,,