Enable saving system key and loading it again on start.

New JSON file - keys.json - system keystore

bridge_master.py

@@ -41,7 +41,7 @@ import copy
 from setproctitle import setproctitle
 from collections import deque
 from random import randint
-
+import secrets
 
 #from crccheck.crc import Crc32
 from hashlib import blake2b
@@ -69,6 +69,7 @@ from config import acl_build
 import log
 from const import *
 from mk_voice import pkt_gen
+from utils import load_json, save_json
 #from voice_lib import words
 
 #Read voices
@@ -2655,6 +2656,8 @@ if __name__ == '__main__':
     import signal
 
     global CONFIG
+    global KEYS
+    keys = {}
     
     # Higheset peer ID permitted by HBP
     PEER_MAX = 4294967295
@@ -2721,16 +2724,26 @@ if __name__ == '__main__':
         logger.info('(GLOBAL) SHUTDOWN: CONFBRIDGE IS TERMINATING WITH SIGNAL %s', str(_signal))
         hblink_handler(_signal, _frame)
         logger.info('(GLOBAL) SHUTDOWN: ALL SYSTEM HANDLERS EXECUTED - STOPPING REACTOR')
-        reactor.stop()
+        if reactor.running:
-        if CONFIG['ALIASES']['SUB_MAP_FILE']:
+            CONFIG['GLOBAL']['_KILL_SERVER'] = True
-            subMapWrite()
+        else:
+            exit()
+
 
     #Server kill routine
     def kill_server():
         try:
             if CONFIG['GLOBAL']['_KILL_SERVER']:
-                logger.info('(GLOBAL) SHUTDOWN: CONFBRIDGE IS TERMINATING - killserver called from API')
+                logger.info('(GLOBAL) SHUTDOWN: CONFBRIDGE IS TERMINATING - killserver called')
-                reactor.stop()
+                if reactor.running:
+                    reactor.stop()
+                if CONFIG['ALIASES']['SUB_MAP_FILE']:
+                    subMapWrite()
+                try:
+                    save_json(''.join([CONFIG['ALIASES']['PATH'], CONFIG['ALIASES']['KEYS_FILE']]),keys)
+                    logger.info('(KEYS) saved system keys to keystore')
+                except Exception as e:
+                    logger.error('(GLOBAL) Canot save key file: %s',e)
         except KeyError:
             pass
 
@@ -2909,6 +2922,11 @@ if __name__ == '__main__':
         logger.error('(GLOBAL) STOPPING REACTOR TO AVOID MEMORY LEAK: Unhandled error in timed loop.\n %s', failure)
         reactor.stop()
 
+    #load keys if exists
+    try:
+        keys = load_json(''.join([CONFIG['ALIASES']['PATH'], CONFIG['ALIASES']['KEYS_FILE']]))
+    except Exception as e:
+        logger.error('(KEYS) Cannot load keys: %s',e)
 
     #Initialize API
     if CONFIG['GLOBAL']['ENABLE_API']:
@@ -2917,7 +2935,13 @@ if __name__ == '__main__':
         api = False
     if api:
         logger.info('(API) API running')
-        logger.info('(API) Random system API Key is %s',CONFIG['GLOBAL']['SYSTEM_API_KEY'])
+        if 'SYSTEM_API_KEY' not in keys or not keys['SYSTEM_API_KEY']:
+            CONFIG['GLOBAL']['SYSTEM_API_KEY'] = secrets.token_hex(16)
+            keys['SYSTEM_API_KEY'] = CONFIG['GLOBAL']['SYSTEM_API_KEY']
+            logger.info('(API) Random system API Key generated: %s',CONFIG['GLOBAL']['SYSTEM_API_KEY'])
+        else:
+            CONFIG['GLOBAL']['SYSTEM_API_KEY'] = keys['SYSTEM_API_KEY']
+            logger.info('(API) System API Key loaded from system key store')
     else:
         logger.info('(API) API not started')
 
@@ -2978,7 +3002,7 @@ if __name__ == '__main__':
 
     #Server kill switch checker
     killserver_task = task.LoopingCall(kill_server)
-    killserver = killserver_task.start(10)
+    killserver = killserver_task.start(5)
     killserver.addErrback(loopingErrHandle)
     
     #more threads

config.py

@@ -32,7 +32,6 @@ import const
 
 import socket
 import ipaddress 
-import secrets
 from socket import gethostbyname
 from languages import languages
 
@@ -157,9 +156,6 @@ def build_config(_config_file):
                 if not CONFIG['GLOBAL']['ANNOUNCEMENT_LANGUAGES']:
                     CONFIG['GLOBAL']['ANNOUNCEMENT_LANGUAGES'] = languages
 
-                if CONFIG['GLOBAL']['ENABLE_API']:
-                    CONFIG['GLOBAL']['SYSTEM_API_KEY'] = secrets.token_hex(16)
-
             elif section == 'REPORTS':
                 CONFIG['REPORTS'].update({
                     'REPORT': config.getboolean(section, 'REPORT', fallback=True),
@@ -193,9 +189,8 @@ def build_config(_config_file):
                     'SERVER_ID_URL': config.get(section, 'SERVER_ID_URL', fallback='https://freedmr-lh.gb7fr.org.uk/json/server_ids.tsv'),
                     'SERVER_ID_FILE': config.get(section, 'SERVER_ID_FILE', fallback='server_ids.tsv'),
                     'CHECKSUM_URL': config.get(section, 'CHECKSUM_URL', fallback='https://freedmr-lh.gb7fr.org.uk/file_checksums.json'),
-                    'CHECKSUM_FILE': config.get(section, 'CHECKSUM_FILE', fallback='file_checksums.json')
+                    'CHECKSUM_FILE': config.get(section, 'CHECKSUM_FILE', fallback='file_checksums.json'),
-
+                    'KEYS_FILE': config.get(section, 'KEYS_FILE', fallback='keys.json')
-                    
                 })
                 
                 

hblink.py

@@ -1483,7 +1483,7 @@ def mk_aliases(_config):
                 shutil.copy(_config['ALIASES']['PATH'] + _config['ALIASES']['SERVER_ID_FILE'],_config['ALIASES']['PATH'] + _config['ALIASES']['SERVER_ID_FILE'] + '.bak')
             except IOError as g:
                 logger.info('(ALIAS) ID ALIAS MAPPER: couldn\'t make backup copy of server_ids file %s',g)
-        
+
         
     return peer_ids, subscriber_ids, talkgroup_ids, local_subscriber_ids, server_ids, checksums
 

utils.py

@@ -26,7 +26,7 @@ import ssl
 from time import time
 from os.path import isfile, getmtime
 from urllib.request import urlopen
-from json import load as jload
+from json import load as jload, dump as jdump
 import hashlib
 
 
@@ -92,6 +92,16 @@ def load_json(filename):
     else:
         return(data)
 
+def save_json(filename,data):
+    try:
+        with open(filename, 'w', encoding='utf-8') as f:
+            jdump(data, f, ensure_ascii=False, indent=4)
+    except:
+        raise
+    else:
+        return(True)
+
+
 
 #Calculate blake2b checksum of file
 def blake2bsum(filename):