From 1d93ef13ea42c522630582c1935e2eae1f0570d3 Mon Sep 17 00:00:00 2001
From: KF7EEL <kf7eel@qsl.net>
Date: Fri, 4 Jun 2021 18:33:29 -0700
Subject: [PATCH] add commented line in hblink, allow all RIDs

---
 hblink.py             | 10 ++++++----
 user_managment/app.py |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/hblink.py b/hblink.py
index 74666e9..23101ea 100755
--- a/hblink.py
+++ b/hblink.py
@@ -287,12 +287,12 @@ class HBSYSTEM(DatagramProtocol):
         'old_auth': old_auth
         }
         json_object = json.dumps(auth_conf, indent = 4)
-        #try:
-        req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
+        try:
+            req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
         #    resp = json.loads(req.text)
         #return resp
-        #except requests.ConnectionError:
-        #    return {'allow':True}
+        except Exception as e:
+            logger.info(e)
 
     def calc_passphrase(self, peer_id, _salt_str):
         burn_id = ast.literal_eval(os.popen('cat ' + self._CONFIG['USER_MANAGER']['BURN_FILE']).read())
@@ -519,6 +519,8 @@ class HBSYSTEM(DatagramProtocol):
                 if self._config['USE_USER_MAN'] == True:
                     self.ums_response = self.check_user_man(_peer_id, self._CONFIG['USER_MANAGER']['THIS_SERVER_NAME'], _sockaddr[0])
 ##                    print(self.ums_response)
+                    #Will allow anyone to attempt authentication, used for a transition period
+##                    if acl_check(_peer_id, self._CONFIG['GLOBAL']['REG_ACL']) and self.ums_response['allow'] or acl_check(_peer_id, self._CONFIG['GLOBAL']['REG_ACL']) and acl_check(_peer_id, self._config['REG_ACL']):
                     if acl_check(_peer_id, self._CONFIG['GLOBAL']['REG_ACL']) and self.ums_response['allow']:
                         user_auth = self.ums_response['allow']
                     else:
diff --git a/user_managment/app.py b/user_managment/app.py
index 09962e7..12154fa 100644
--- a/user_managment/app.py
+++ b/user_managment/app.py
@@ -993,7 +993,7 @@ def create_app():
     <h4>&nbsp;Login IP&nbsp;</h4>
     </td>
     <td style="text-align: center;">
-    <h4>&nbsp;Calculated Passphrase&nbsp;</h4>
+    <h4>&nbsp;Passphrase&nbsp;</h4>
     </td>
     <td style="text-align: center;">
     <h4>&nbsp;Server&nbsp;</h4>
@@ -1065,7 +1065,7 @@ def create_app():
     <h4>&nbsp;Login IP&nbsp;</h4>
     </td>
     <td style="text-align: center;">
-    <h4>&nbsp;Calculated Passphrase&nbsp;</h4>
+    <h4>&nbsp;Passphrase&nbsp;</h4>
     </td>
     <td style="text-align: center;">
     <h4>&nbsp;Server&nbsp;</h4>
@@ -1137,7 +1137,7 @@ def create_app():
     <h4>&nbsp;Login IP&nbsp;</h4>
     </td>
     <td style="text-align: center;">
-    <h4>&nbsp;Calculated Passphrase&nbsp;</h4>
+    <h4>&nbsp;Passphrase&nbsp;</h4>
     </td>
     <td style="text-align: center;">
     <h4>&nbsp;Server&nbsp;</h4>
@@ -1212,7 +1212,7 @@ def create_app():
     <h4>&nbsp;Login IP&nbsp;</h4>
     </td>
     <td style="text-align: center;">
-    <h4>&nbsp;Calculated Passphrase&nbsp;</h4>
+    <h4>&nbsp;Passphrase&nbsp;</h4>
     </td>
     <td style="text-align: center;">
     <h4>&nbsp;Server&nbsp;</h4>