From bad9ad53ae7b8ebacbbdb66d33c152ee993ac26e Mon Sep 17 00:00:00 2001
From: KF7EEL <kf7eel@qsl.net>
Date: Sun, 5 Sep 2021 08:17:50 -0700
Subject: [PATCH] fix incorrect value for user manager, improve EOBP

---
 bridge.py  |  3 ++-
 hblink.py  | 17 +++++++++++------
 web/app.py |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/bridge.py b/bridge.py
index 8d061c6..8c43ce6 100755
--- a/bridge.py
+++ b/bridge.py
@@ -145,7 +145,7 @@ def download_rules(L_CONFIG_FILE, cli_file):
     try:
         req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
         resp = json.loads(req.text)
-        print(resp)
+##        print(resp)
         return resp['rules']
     except requests.ConnectionError:
         logger.error('Config server unreachable, defaulting to local config')
@@ -189,6 +189,7 @@ def download_config(L_CONFIG_FILE, cli_file):
 ##            corrected_config['SYSTEMS'][i] = {}
 ##            print(iterate_config[i])
             if iterate_config[i]['MODE'] == 'MASTER' or iterate_config[i]['MODE'] == 'PROXY' or iterate_config[i]['MODE'] == 'OPENBRIDGE':
+##                print(iterate_config[i])
                 corrected_config['SYSTEMS'][i]['TG1_ACL'] = config.acl_build(iterate_config[i]['TG1_ACL'], 4294967295)
                 corrected_config['SYSTEMS'][i]['TG2_ACL'] = config.acl_build(iterate_config[i]['TG2_ACL'], 4294967295)
                 corrected_config['SYSTEMS'][i]['PASSPHRASE'] = bytes(iterate_config[i]['PASSPHRASE'], 'utf-8')
diff --git a/hblink.py b/hblink.py
index 6f161d6..40b0be0 100755
--- a/hblink.py
+++ b/hblink.py
@@ -159,14 +159,16 @@ class OPENBRIDGE(DatagramProtocol):
         logger.info('(%s) is mode OPENBRIDGE. No De-Registration required, continuing shutdown', self._system)
 
     def send_system(self, _packet):
-        if _packet[:4] == DMRD:
+        if _packet[:4] == DMRD or _packet[:4] == EOBP:
             #_packet = _packet[:11] + self._config['NETWORK_ID'] + _packet[15:]
             _packet = b''.join([_packet[:11], self._config['NETWORK_ID'], _packet[15:]])
             #_packet += hmac_new(self._config['PASSPHRASE'],_packet,sha1).digest()
             _packet = b''.join([_packet, (hmac_new(self._config['PASSPHRASE'],_packet,sha1).digest())])
-            if self._config['USE_ENCRYPTION'] == True:
+            if self._config['USE_ENCRYPTION'] == True or _packet[:4] == EOBP:
                 _enc_pkt = encrypt_packet(self._config['ENCRYPTION_KEY'], _packet)
                 _packet = b'EOBP' + _enc_pkt
+                print('Encrypting')
+                print(_packet)
             self.transport.write(_packet, (self._config['TARGET_IP'], self._config['TARGET_PORT']))
             # KEEP THE FOLLOWING COMMENTED OUT UNLESS YOU'RE DEBUGGING DEEPLY!!!!
             # logger.debug('(%s) TX Packet to OpenBridge %s:%s -- %s', self._system, self._config['TARGET_IP'], self._config['TARGET_PORT'], ahex(_packet))
@@ -188,8 +190,11 @@ class OPENBRIDGE(DatagramProtocol):
 ##        logger.debug('(%s) RX packet from %s -- %s', self._system, _sockaddr, ahex(_packet))
         if _packet[:4] == DMRD or _packet[:4] == EOBP:
             if _packet[:4] == EOBP:
+                print('dec')
+                print(_packet)
                 _d_pkt = decrypt_packet(self._config['ENCRYPTION_KEY'], _packet[4:])
                 _packet = _d_pkt
+                print(_packet)
 
             # DMRData -- encapsulated DMR data frame
             if _packet[:4] == DMRD:
@@ -252,7 +257,7 @@ class OPENBRIDGE(DatagramProtocol):
         # Server Data packet, decrypt and process it.
         elif _packet[:4] == SVRD:
             _d_pkt = decrypt_packet(self._config['ENCRYPTION_KEY'], _packet[4:])
-            print('svr pakcet')
+            print('SVRD')
             print(_d_pkt)
 #************************************************
 #     HB MASTER CLASS
@@ -309,7 +314,7 @@ class HBSYSTEM(DatagramProtocol):
             return resp
         except requests.ConnectionError:
             return {'allow':True}
-
+# Sends login confirmation for log
     def send_login_conf(self, _id, server_name, peer_ip, old_auth):
         #Change this to a config value
         user_man_url = self._CONFIG['USER_MANAGER']['URL']
@@ -331,7 +336,7 @@ class HBSYSTEM(DatagramProtocol):
         #return resp
         except Exception as e:
             logger.info(e)
-            
+# Sends PEER info for map and other stuff            
     def send_peer_loc(self, _id, call, lat, lon, url, description, loc, soft):
         #Change this to a config value
         user_man_url = self._CONFIG['USER_MANAGER']['URL']
@@ -592,7 +597,7 @@ class HBSYSTEM(DatagramProtocol):
                     else:
                         user_auth = False
                 elif self._config['USE_USER_MAN'] == False:
-                   # print('False')
+##                    print('False')
 ####                    print(self._config['REG_ACL'])
 ##                    print(self._CONFIG['USER_MANAGER']['REMOTE_CONFIG_ENABLED'])
                     b_acl = self._config['REG_ACL']
diff --git a/web/app.py b/web/app.py
index f1b0d9e..7c846b6 100644
--- a/web/app.py
+++ b/web/app.py
@@ -5139,7 +5139,7 @@ TG #: <strong> ''' + str(tg_d.tg) + '''</strong>
 <tr>
 <td><strong>&nbsp;User Manager for login:</strong></td>
 <td>&nbsp;<select name="enable_um">
-<option selected="selected" value="''' + str(m.enable_um) + '''">Current - ''' + str(m.static_positions) + '''</option>
+<option selected="selected" value="''' + str(m.enable_um) + '''">Current - ''' + str(m.enable_um) + '''</option>
 <option value="True">True</option>
 <option value="False">False</option>
 </select></td>