config and peer managment, masters WIP

README.md

@@ -1,7 +1,5 @@
-## See the main README (under branch: gps) for more on the operation of the application.
-
-This branch is really no different than the other branches. It just has the dashboard disabled, and the example configs modified to make it easier to run on an Android device.
 
+### This is a branch of HBLink3 for development of a user authentication system for hotspots for PNW Digital.
 ---
 ### FOR SUPPORT, DISCUSSION, GETTING INVOLVED ###
 

bridge.py

@@ -42,12 +42,13 @@ from twisted.protocols.basic import NetstringReceiver
 from twisted.internet import reactor, task
 
 # Things we import from the main hblink module
-from hblink import HBSYSTEM, OPENBRIDGE, systems, hblink_handler, reportFactory, REPORT_OPCODES, mk_aliases
+from hblink import HBSYSTEM, OPENBRIDGE, systems, hblink_handler, reportFactory, REPORT_OPCODES, mk_aliases, download_burnlist
 from dmr_utils3.utils import bytes_3, int_id, get_alias
 from dmr_utils3 import decode, bptc, const
 import config
 import log
 from const import *
+from hashlib import sha256
 
 # Stuff for socket reporting
 import pickle
@@ -55,11 +56,8 @@ import pickle
 # The module needs logging, but handlers, etc. are controlled by the parent
 import logging
 logger = logging.getLogger(__name__)
-
-# Import UNIT time from rules.py
-from rules import UNIT_TIME, STATIC_UNIT
-
-
+import os, ast
+import json, requests
 # Does anybody read this stuff? There's a PEP somewhere that says I should do this.
 __author__     = 'Cortney T. Buffington, N0MJS'
 __copyright__  = 'Copyright (c) 2016-2019 Cortney T. Buffington, N0MJS and the K0USY Group'
@@ -68,6 +66,86 @@ __license__    = 'GNU GPLv3'
 __maintainer__ = 'Cort Buffington, N0MJS'
 __email__      = 'n0mjs@me.com'
 
+##import os, ast
+def download_config(L_CONFIG_FILE, cli_file):
+    user_man_url = L_CONFIG_FILE['USER_MANAGER']['URL']
+    shared_secret = str(sha256(L_CONFIG_FILE['USER_MANAGER']['SHARED_SECRET'].encode()).hexdigest())
+    config_check = {
+    'get_config':L_CONFIG_FILE['USER_MANAGER']['THIS_SERVER_NAME'],
+    'secret':shared_secret
+    }
+    json_object = json.dumps(config_check, indent = 4)
+    
+    try:
+        req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
+        resp = json.loads(req.text)
+        print(resp)
+
+##        print(type(resp))
+##        conf = config.build_config(resp['config'])
+##        print(conf)
+##        with open('/tmp/conf_telp.cfg', 'w') as f:
+##            f.write(str(resp['config']))
+##        print(resp)
+        iterate_config = resp['peers'].copy()
+        
+        corrected_config = resp['config'].copy()
+        corrected_config['SYSTEMS'] = {}
+        corrected_config['LOGGER'] = {}
+        corrected_config['SYSTEMS'].update(iterate_config)
+        corrected_config['LOGGER'].update(L_CONFIG_FILE['LOGGER'])
+        corrected_config['USER_MANAGER'].update(L_CONFIG_FILE['USER_MANAGER'])
+        print(iterate_config)
+
+##        corrected_config = CONFIG_FILE.copy()
+
+        
+##        print(corrected_config)
+##        print()
+##        print(iterate_config['config']['SYSTEMS'])
+##        print(resp['config'])
+##        print((iterate_config['test']))
+##        print(corrected_config)
+        
+        corrected_config['GLOBAL']['TG1_ACL'] = config.acl_build(corrected_config['GLOBAL']['TG1_ACL'], 16776415)
+        corrected_config['GLOBAL']['TG2_ACL'] = config.acl_build(corrected_config['GLOBAL']['TG2_ACL'], 16776415)
+        corrected_config['GLOBAL']['REG_ACL'] = config.acl_build(corrected_config['GLOBAL']['REG_ACL'], 16776415)
+        corrected_config['GLOBAL']['SUB_ACL'] = config.acl_build(corrected_config['GLOBAL']['SUB_ACL'], 16776415)
+##        corrected_config['SYSTEMS'] = {}
+        for i in iterate_config:
+            print(i)
+##            corrected_config['SYSTEMS'][i] = {}
+            if iterate_config[i]['MODE'] == 'MASTER' or iterate_config[i]['MODE'] == 'PROXY':
+                corrected_config['SYSTEMS'][i]['TG1_ACL'] = config.acl_build(iterate_config[i]['TG1_ACL'], 16776415)
+                corrected_config['SYSTEMS'][i]['TG2_ACL'] = config.acl_build(iterate_config[i]['TG2_ACL'], 16776415)
+            else:
+                corrected_config['SYSTEMS'][i]['RADIO_ID'] = int(iterate_config[i]['RADIO_ID']).to_bytes(4, 'big')
+                corrected_config['SYSTEMS'][i]['TG1_ACL'] = config.acl_build(iterate_config[i]['TG1_ACL'], 16776415)
+                corrected_config['SYSTEMS'][i]['TG2_ACL'] = config.acl_build(iterate_config[i]['TG2_ACL'], 16776415)
+            corrected_config['SYSTEMS'][i]['USE_ACL'] = iterate_config[i]['USE_ACL']
+            corrected_config['SYSTEMS'][i]['SUB_ACL'] = config.acl_build(iterate_config[i]['SUB_ACL'], 16776415)
+            corrected_config['SYSTEMS'][i]['MASTER_SOCKADDR'] = tuple(iterate_config[i]['MASTER_SOCKADDR'])
+            corrected_config['SYSTEMS'][i]['SOCK_ADDR'] = tuple(iterate_config[i]['SOCK_ADDR'])
+            corrected_config['SYSTEMS'][i].update({'STATS':{
+                'CONNECTION': 'NO',             # NO, RTPL_SENT, AUTHENTICATED, CONFIG-SENT, YES 
+                        'CONNECTED': None,
+                        'PINGS_SENT': 0,
+                        'PINGS_ACKD': 0,
+                        'NUM_OUTSTANDING': 0,
+                        'PING_OUTSTANDING': False,
+                        'LAST_PING_TX_TIME': 0,
+                        'LAST_PING_ACK_TIME': 0,
+                    }})
+        print(corrected_config)
+##        config.process_acls(corrected_config)
+##        print(corrected_config)
+        print('-------')
+        return corrected_config
+    # For exception, write blank dict
+    except requests.ConnectionError:
+        logger.error('Config server unreachable, defaulting to local config')
+        return config.build_config(cli_file)
+
 # Module gobal varaibles
 
 # Dictionary for dynamically mapping unit (subscriber) to a system.
@@ -76,14 +154,6 @@ __email__      = 'n0mjs@me.com'
 # format 'unit_id': ('SYSTEM', time)
 UNIT_MAP = {} 
 
-# UNIX time for end of year 2060. This is used to keep subscribers in UNIT_MAP indefinitely to accomplish static routes for unit calls
-#time_2060 = 2871763199.0000000
-# 20 years in seconds. added to current at time of start to keep static units from being trimmed.
-time_20 = 630720000
-
-# Build a UNIT_MAP based on values in STATIC_MAP.
-for i in STATIC_UNIT:
-	UNIT_MAP[bytes_3(i[0])] = i[1], time() + time_20
 
 # Timed loop used for reporting HBP status
 #
@@ -163,12 +233,11 @@ def rule_timer_loop():
             else:
                 logger.debug('(ROUTER) Conference Bridge NO ACTION: System: %s, Bridge: %s, TS: %s, TGID: %s', _system['SYSTEM'], _bridge, _system['TS'], int_id(_system['TGID']))
 
-    _then = _now - 60 * UNIT_TIME
+    _then = _now - 60
     remove_list = []
-    #logger.info(UNIT_MAP)
     for unit in UNIT_MAP:
-       if UNIT_MAP[unit][1] < (_then):
-           remove_list.append(unit)
+        if UNIT_MAP[unit][1] < (_then):
+            remove_list.append(unit)
 
     for unit in remove_list:
         del UNIT_MAP[unit]
@@ -439,18 +508,9 @@ class routerOBP(OPENBRIDGE):
         pkt_time = time()
         dmrpkt = _data[20:53]
         _bits = _data[15]
-
-        # Check if subscriber is in STATIC_UNIT
-        for i in STATIC_UNIT:
-            # Subscriber is static. Add 20 years of time.
-            if i[0] == int_id(_rf_src):
-                map_time = pkt_time + time_20
-                logger.debug('Static Unit, update time.')
-            # Proceed as normal
-            else:
-                map_time = pkt_time        
+ 
         # Make/update this unit in the UNIT_MAP cache
-        UNIT_MAP[_rf_src] = (self.name, map_time)
+        UNIT_MAP[_rf_src] = (self.name, pkt_time)
         
         
         # Is this a new call stream?
@@ -596,11 +656,8 @@ class routerOBP(OPENBRIDGE):
             self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
         elif _call_type == 'unit':
             self.unit_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
-        elif _call_type == 'vcsbk':
-            # Route CSBK packets to destination TG. Necessary for group data to work with GPS/Data decoder.
-            self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
-            logger.debug('CSBK recieved, but HBlink does not process them currently. Packets routed to talkgroup.')
-
+        elif _call_type == 'vscsbk':
+            logger.debug('CSBK recieved, but HBlink does not process them currently')
         else:
             logger.error('Unknown call type recieved -- not processed')
 
@@ -930,20 +987,9 @@ class routerHBP(HBSYSTEM):
         pkt_time = time()
         dmrpkt = _data[20:53]
         _bits = _data[15]
-
-        # Check if subscriber is in STATIC_UNIT
-        for i in STATIC_UNIT:
-            # Subscriber is static. Add 20 years of time.
-            if i[0] == int_id(_rf_src):
-                map_time = pkt_time + time_20
-                logger.debug('Static Unit, update time.')
-            # Proceed as normal
-            else:
-                map_time = pkt_time
  
-
         # Make/update this unit in the UNIT_MAP cache
-        UNIT_MAP[_rf_src] = (self.name, map_time)
+        UNIT_MAP[_rf_src] = (self.name, pkt_time)
         
         
         # Is this a new call stream?
@@ -1086,9 +1132,7 @@ class routerHBP(HBSYSTEM):
             else:
                 self.unit_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
         elif _call_type == 'vcsbk':
-            # Route CSBK packets to destination TG. Necessary for group data to work with GPS/Data decoder.
-            self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
-            logger.debug('CSBK recieved, but HBlink does not process them currently. Packets routed to talkgroup.')
+            logger.debug('CSBK recieved, but HBlink does not process them currently')
         else:
             logger.error('Unknown call type recieved -- not processed')
 
@@ -1133,7 +1177,27 @@ if __name__ == '__main__':
         cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/hblink.cfg'
 
     # Call the external routine to build the configuration dictionary
-    CONFIG = config.build_config(cli_args.CONFIG_FILE)
+    LOCAL_CONFIG = config.build_config(cli_args.CONFIG_FILE)
+    #print(LOCAL_CONFIG)
+    #print(download_config(LOCAL_CONFIG))
+    #if LOCAL_CONFIG['USER_MANAGER']['REMOTE_CONFIG_ENABLED']:
+    #print(download_config(LOCAL_CONFIG)['config'])
+##    CONFIG = config.build_config(download_config(LOCAL_CONFIG))
+    #CONFIG = download_config(LOCAL_CONFIG)
+    #if not LOCAL_CONFIG['USER_MANAGER']['REMOTE_CONFIG_ENABLED']:
+##    print(download_config(LOCAL_CONFIG)['config'])
+##    CONFIG = config.build_config(cli_args.CONFIG_FILE)
+    #print((CONFIG))
+
+
+##    config.process_acls(LOCAL_CONFIG)
+    if LOCAL_CONFIG['USER_MANAGER']['REMOTE_CONFIG_ENABLED']:
+        CONFIG = download_config(LOCAL_CONFIG, cli_args.CONFIG_FILE)
+    else:
+        CONFIG = config.build_config(cli_args.CONFIG_FILE)
+
+    
+##    print(CONFIG)
 
     # Ensure we have a path for the rules file, if one wasn't specified, then use the default (top of file)
     if not cli_args.RULES_FILE:
@@ -1207,4 +1271,10 @@ if __name__ == '__main__':
     stream_trimmer = stream_trimmer_task.start(5)
     stream_trimmer.addErrback(loopingErrHandle)
 
+
+    # Download burn list
+    with open(CONFIG['USER_MANAGER']['BURN_FILE'], 'w') as f:
+        f.write(str(download_burnlist(CONFIG)))
+    
+
     reactor.run()

bridge_gps_data-SAMPLE.cfg

@@ -1,329 +0,0 @@
-# PROGRAM-WIDE PARAMETERS GO HERE
-# PATH - working path for files, leave it alone unless you NEED to change it
-# PING_TIME - the interval that peers will ping the master, and re-try registraion
-#           - how often the Master maintenance loop runs
-# MAX_MISSED - how many pings are missed before we give up and re-register
-#           - number of times the master maintenance loop runs before de-registering a peer
-#
-# ACLs:
-#
-# Access Control Lists are a very powerful tool for administering your system.
-# But they consume packet processing time. Disable them if you are not using them.
-# But be aware that, as of now, the configuration stanzas still need the ACL
-# sections configured even if you're not using them.
-#
-# REGISTRATION ACLS ARE ALWAYS USED, ONLY SUBSCRIBER AND TGID MAY BE DISABLED!!!
-#
-# The 'action' May be PERMIT|DENY
-# Each entry may be a single radio id, or a hypenated range (e.g. 1-2999)
-# Format:
-# 	ACL = 'action:id|start-end|,id|start-end,....'
-#		--for example--
-#	SUB_ACL: DENY:1,1000-2000,4500-60000,17
-#
-# ACL Types:
-# 	REG_ACL: peer radio IDs for registration (only used on HBP master systems)
-# 	SUB_ACL: subscriber IDs for end-users
-# 	TGID_TS1_ACL: destination talkgroup IDs on Timeslot 1
-# 	TGID_TS2_ACL: destination talkgroup IDs on Timeslot 2
-#
-# ACLs may be repeated for individual systems if needed for granularity
-# Global ACLs will be processed BEFORE the system level ACLs
-# Packets will be matched against all ACLs, GLOBAL first. If a packet 'passes'
-# All elements, processing continues. Packets are discarded at the first
-# negative match, or 'reject' from an ACL element.
-#
-# If you do not wish to use ACLs, set them to 'PERMIT:ALL'
-# TGID_TS1_ACL in the global stanza is used for OPENBRIDGE systems, since all
-# traffic is passed as TS 1 between OpenBridges
-[GLOBAL]
-PATH: ./
-PING_TIME: 5
-MAX_MISSED: 3
-USE_ACL: True
-REG_ACL: PERMIT:ALL
-SUB_ACL: DENY:1
-TGID_TS1_ACL: PERMIT:ALL
-TGID_TS2_ACL: PERMIT:ALL
-
-
-# NOT YET WORKING: NETWORK REPORTING CONFIGURATION
-#   Enabling "REPORT" will configure a socket-based reporting
-#   system that will send the configuration and other items
-#   to a another process (local or remote) that may process
-#   the information for some useful purpose, like a web dashboard.
-#
-#   REPORT - True to enable, False to disable
-#   REPORT_INTERVAL - Seconds between reports
-#   REPORT_PORT - TCP port to listen on if "REPORT_NETWORKS" = NETWORK
-#   REPORT_CLIENTS - comma separated list of IPs you will allow clients
-#       to connect on. Entering a * will allow all.
-#
-# ****FOR NOW MUST BE TRUE - USE THE LOOPBACK IF YOU DON'T USE THIS!!!****
-[REPORTS]
-REPORT: True
-REPORT_INTERVAL: 60
-REPORT_PORT: 4321
-REPORT_CLIENTS: 127.0.0.1
-
-
-# SYSTEM LOGGER CONFIGURAITON
-#   This allows the logger to be configured without chaning the individual
-#   python logger stuff. LOG_FILE should be a complete path/filename for *your*
-#   system -- use /dev/null for non-file handlers.
-#   LOG_HANDLERS may be any of the following, please, no spaces in the
-#   list if you use several:
-#       null
-#       console
-#       console-timed
-#       file
-#       file-timed
-#       syslog
-#   LOG_LEVEL may be any of the standard syslog logging levels, though
-#   as of now, DEBUG, INFO, WARNING and CRITICAL are the only ones
-#   used.
-#
-[LOGGER]
-LOG_FILE: ./hblink.log
-LOG_HANDLERS: console-timed
-LOG_LEVEL: DEBUG
-LOG_NAME: HBlink
-
-# DOWNLOAD AND IMPORT SUBSCRIBER, PEER and TGID ALIASES
-# Ok, not the TGID, there's no master list I know of to download
-# This is intended as a facility for other applcations built on top of
-# HBlink to use, and will NOT be used in HBlink directly.
-# STALE_DAYS is the number of days since the last download before we
-# download again. Don't be an ass and change this to less than a few days.
-[ALIASES]
-TRY_DOWNLOAD: True
-PATH: ./
-PEER_FILE: peer_ids.json
-SUBSCRIBER_FILE: subscriber_ids.json
-TGID_FILE: talkgroup_ids.json
-PEER_URL: https://www.radioid.net/static/rptrs.json
-SUBSCRIBER_URL: https://www.radioid.net/static/users.json
-STALE_DAYS: 1
-
-# GPS/Data Application - by KF7EEL
-# Configure the settings for the DMR GPS to APRS position application here.
-#
-# DATA_DMR_ID - This is the DMR ID that users send DMR GPS data.
-# CALL_TYPE - group, unit, or both. Group if you want users to send data to a talkgroup,
-# unit if you want users to send data as a private call, or both if you want both options.
-# USER_APRS_SSID - Default APRS SSID assigned to user APRS positions.
-# USER_APRS_COMMENT - Default Comment attached to user APRS positions.
-# APRS_LOGIN_CALL, PASSCODE, SERVER, and PORT - Login settings for APRS-IS.
-[GPS_DATA]
-DATA_DMR_ID: 9099
-CALL_TYPE: both
-USER_APRS_SSID: 15
-USER_APRS_COMMENT: HBLink3 D-APRS -
-
-# Setting APRS_LOGIN_CALL to N0CALL will cause the gateway to not upload packets to APRS server.
-APRS_LOGIN_CALL: N0CALL
-APRS_LOGIN_PASSCODE: 12345
-APRS_SERVER: rotate.aprs2.net
-APRS_PORT: 14580
-
-# The following settings are only applicable if you are using the gps_data_beacon_igate script.
-# They do not affect the operation gps_data itself.
-# Time in minutes.
-IGATE_BEACON_TIME = 45
-IGATE_BEACON_COMMENT = HBLink3 D-APRS Gateway
-IGATE_BEACON_ICON = /I
-IGATE_LATITUDE = 0000.00N
-IGATE_LONGITUDE = 00000.00W
-
-# The email gateway settingns below are OPTIONAL. They are NOT REQUIRED if you don't want
-# to enable the email gateway. Leave as is to disable.
-EMAIL_SENDER: 
-EMAIL_PASSWORD: 
-SMTP_SERVER: smtp.gmail.com
-SMTP_PORT: 465
-
-# OPENBRIDGE INSTANCES - DUPLICATE SECTION FOR MULTIPLE CONNECTIONS
-# OpenBridge is a protocol originall created by DMR+ for connection between an
-# IPSC2 server and Brandmeister. It has been implemented here at the suggestion
-# of the Brandmeister team as a way to legitimately connect HBlink to the
-# Brandemiester network.
-# It is recommended to name the system the ID of the Brandmeister server that
-# it connects to, but is not necessary. TARGET_IP and TARGET_PORT are of the
-# Brandmeister or IPSC2 server you are connecting to. PASSPHRASE is the password
-# that must be agreed upon between you and the operator of the server you are
-# connecting to. NETWORK_ID is a number in the format of a DMR Radio ID that
-# will be sent to the other server to identify this connection.
-# other parameters follow the other system types.
-#
-# ACLs:
-# OpenBridge does not 'register', so registration ACL is meaningless.
-# Proper OpenBridge passes all traffic on TS1.
-# HBlink can extend OPB to use both slots for unit calls only.
-# Setting "BOTH_SLOTS" True ONLY affects unit traffic!
-# Otherwise ACLs work as described in the global stanza
-[OBP-1]
-MODE: OPENBRIDGE
-ENABLED: False
-IP:
-PORT: 62035
-NETWORK_ID: 3129100
-PASSPHRASE: password
-TARGET_IP: 1.2.3.4
-TARGET_PORT: 62035
-BOTH_SLOTS: True
-USE_ACL: True
-SUB_ACL: DENY:1
-TGID_ACL: PERMIT:ALL
-
-# MASTER INSTANCES - DUPLICATE SECTION FOR MULTIPLE MASTERS
-# HomeBrew Protocol Master instances go here.
-# IP may be left blank if there's one interface on your system.
-# Port should be the port you want this master to listen on. It must be unique
-# and unused by anything else.
-# Repeat - if True, the master repeats traffic to peers, False, it does nothing.
-#
-# MAX_PEERS -- maximun number of peers that may be connect to this master
-# at any given time. This is very handy if you're allowing hotspots to
-# connect, or using a limited computer like a Raspberry Pi.
-#
-# ACLs:
-# See comments in the GLOBAL stanza
-[MASTER-1]
-MODE: MASTER
-ENABLED: True
-REPEAT: True
-MAX_PEERS: 10
-EXPORT_AMBE: False
-IP:
-PORT: 54000
-PASSPHRASE: s3cr37w0rd
-GROUP_HANGTIME: 5
-USE_ACL: True
-REG_ACL: DENY:1
-SUB_ACL: DENY:1
-TGID_TS1_ACL: PERMIT:ALL
-TGID_TS2_ACL: PERMIT:ALL
-
-[D-APRS]
-MODE: MASTER
-ENABLED: True
-REPEAT: True
-MAX_PEERS: 2
-EXPORT_AMBE: False
-IP:
-PORT: 54070
-PASSPHRASE: passw0rd
-GROUP_HANGTIME: 5
-USE_ACL: True
-REG_ACL: DENY:1
-SUB_ACL: DENY:1
-TGID_TS1_ACL: PERMIT:ALL
-TGID_TS2_ACL: PERMIT:ALL
-
-# PEER INSTANCES - DUPLICATE SECTION FOR MULTIPLE PEERS
-# There are a LOT of errors in the HB Protocol specifications on this one!
-# MOST of these items are just strings and will be properly dealt with by the program
-# The TX & RX Frequencies are 9-digit numbers, and are the frequency in Hz.
-# Latitude is an 8-digit unsigned floating point number.
-# Longitude is a 9-digit signed floating point number.
-# Height is in meters
-# Setting Loose to True relaxes the validation on packets received from the master.
-# This will allow HBlink to connect to a non-compliant system such as XLXD, DMR+ etc.
-#
-# ACLs:
-# See comments in the GLOBAL stanza
-[REPEATER-1]
-MODE: PEER
-ENABLED: False
-LOOSE: False
-EXPORT_AMBE: False
-IP: 
-PORT: 54001
-MASTER_IP: 172.16.1.1
-MASTER_PORT: 54000
-PASSPHRASE: homebrew
-CALLSIGN: W1ABC
-RADIO_ID: 312000
-RX_FREQ: 449000000
-TX_FREQ: 444000000
-TX_POWER: 25
-COLORCODE: 1
-SLOTS: 1
-LATITUDE: 38.0000
-LONGITUDE: -095.0000
-HEIGHT: 75
-LOCATION: Anywhere, USA
-DESCRIPTION: This is a cool repeater
-URL: www.w1abc.org
-SOFTWARE_ID: 20170620
-PACKAGE_ID: MMDVM_HBlink
-GROUP_HANGTIME: 5
-OPTIONS:
-USE_ACL: True
-SUB_ACL: DENY:1
-TGID_TS1_ACL: PERMIT:ALL
-TGID_TS2_ACL: PERMIT:ALL
-
-[ECHO]
-MODE: PEER
-ENABLED: True
-LOOSE: False
-EXPORT_AMBE: False
-IP: 
-PORT: 54073
-MASTER_IP: localhost
-MASTER_PORT: 54072
-passphrase: passw0rd
-CALLSIGN: ECHO
-RADIO_ID: 9999
-RX_FREQ: 000000000
-TX_FREQ: 000000000
-TX_POWER: 0
-COLORCODE: 1
-SLOTS: 1
-LATITUDE: 00.0000
-LONGITUDE: 000.0000
-HEIGHT: 0
-LOCATION: This Server
-DESCRIPTION: Echo Server
-URL: www.github.com/kf7eel/hblink3
-SOFTWARE_ID: 20170620
-PACKAGE_ID: MMDVM_HBlink
-GROUP_HANGTIME: 5
-OPTIONS:
-USE_ACL: True
-SUB_ACL: DENY:1
-TGID_TS1_ACL: PERMIT:ALL
-TGID_TS2_ACL: PERMIT:ALL
-
-[XLX-1]
-MODE: XLXPEER
-ENABLED: False
-LOOSE: True
-EXPORT_AMBE: False
-IP: 
-PORT: 54002
-MASTER_IP: 172.16.1.1
-MASTER_PORT: 62030
-PASSPHRASE: passw0rd
-CALLSIGN: W1ABC
-RADIO_ID: 312000
-RX_FREQ: 449000000
-TX_FREQ: 444000000
-TX_POWER: 25
-COLORCODE: 1
-SLOTS: 1
-LATITUDE: 38.0000
-LONGITUDE: -095.0000
-HEIGHT: 75
-LOCATION: Anywhere, USA
-DESCRIPTION: This is a cool repeater
-URL: www.w1abc.org
-SOFTWARE_ID: 20170620
-PACKAGE_ID: MMDVM_HBlink
-GROUP_HANGTIME: 5
-XLXMODULE: 4004
-USE_ACL: True
-SUB_ACL: DENY:1
-TGID_TS1_ACL: PERMIT:ALL
-TGID_TS2_ACL: PERMIT:ALL

config.py

@@ -106,8 +106,8 @@ def build_config(_config_file):
     CONFIG['GLOBAL'] = {}
     CONFIG['REPORTS'] = {}
     CONFIG['LOGGER'] = {}
-    CONFIG['GPS_DATA'] = {}
     CONFIG['ALIASES'] = {}
+    CONFIG['USER_MANAGER'] = {}
     CONFIG['SYSTEMS'] = {}
 
     try:
@@ -142,30 +142,6 @@ def build_config(_config_file):
                 if not CONFIG['LOGGER']['LOG_FILE']:
                     CONFIG['LOGGER']['LOG_FILE'] = '/dev/null'
 
-            elif section == 'GPS_DATA':
-                CONFIG['GPS_DATA'].update({
-                    'DATA_DMR_ID': config.get(section, 'DATA_DMR_ID'),
-                    'USER_APRS_SSID': config.get(section, 'USER_APRS_SSID'),
-                    'CALL_TYPE': config.get(section, 'CALL_TYPE'),
-                    'USER_APRS_COMMENT': config.get(section, 'USER_APRS_COMMENT'),
-                    'APRS_LOGIN_CALL': config.get(section, 'APRS_LOGIN_CALL'),
-                    'APRS_LOGIN_PASSCODE': config.get(section, 'APRS_LOGIN_PASSCODE'),
-                    'APRS_SERVER': config.get(section, 'APRS_SERVER'),
-                    'APRS_PORT': config.get(section, 'APRS_PORT'),
-                    'IGATE_BEACON_TIME': config.get(section, 'IGATE_BEACON_TIME'),
-                    'IGATE_BEACON_ICON': config.get(section, 'IGATE_BEACON_ICON'),
-                    'IGATE_BEACON_COMMENT': config.get(section, 'IGATE_BEACON_COMMENT'),
-                    'IGATE_LATITUDE': config.get(section, 'IGATE_LATITUDE'),
-                    'IGATE_LONGITUDE': config.get(section, 'IGATE_LONGITUDE'),
-                    'EMAIL_SENDER': config.get(section, 'EMAIL_SENDER'),
-                    'EMAIL_PASSWORD': config.get(section, 'EMAIL_PASSWORD'),
-                    'SMTP_SERVER': config.get(section, 'SMTP_SERVER'),
-                    'SMTP_PORT': config.get(section, 'SMTP_PORT'),
-
-                })
-                if not CONFIG['LOGGER']['LOG_FILE']:
-                    CONFIG['LOGGER']['LOG_FILE'] = '/dev/null'
-
             elif section == 'ALIASES':
                 CONFIG['ALIASES'].update({
                     'TRY_DOWNLOAD': config.getboolean(section, 'TRY_DOWNLOAD'),
@@ -178,6 +154,19 @@ def build_config(_config_file):
                     'STALE_TIME': config.getint(section, 'STALE_DAYS') * 86400,
                 })
 
+            elif section == 'USER_MANAGER':
+                CONFIG['USER_MANAGER'].update({
+                    'THIS_SERVER_NAME': config.get(section, 'THIS_SERVER_NAME'),
+                    'URL': config.get(section, 'URL'),
+                    'APPEND_INT': config.getint(section, 'APPEND_INT'),
+                    'SHARED_SECRET': config.get(section, 'SHARED_SECRET'),
+                    'SHORTEN_PASSPHRASE': config.getboolean(section, 'SHORTEN_PASSPHRASE'),
+                    'BURN_FILE': config.get(section, 'BURN_FILE'),
+                    'BURN_INT': config.getint(section, 'BURN_INT'),
+
+
+                })
+
             elif config.getboolean(section, 'ENABLED'):
                 if config.get(section, 'MODE') == 'PEER':
                     CONFIG['SYSTEMS'].update({section: {
@@ -207,7 +196,7 @@ def build_config(_config_file):
                         'SOFTWARE_ID': bytes(config.get(section, 'SOFTWARE_ID').ljust(40)[:40], 'utf-8'),
                         'PACKAGE_ID': bytes(config.get(section, 'PACKAGE_ID').ljust(40)[:40], 'utf-8'),
                         'GROUP_HANGTIME': config.getint(section, 'GROUP_HANGTIME'),
-                        'OPTIONS': bytes(config.get(section, 'OPTIONS'), 'utf-8'),
+                        'OPTIONS': b''.join([b'Type=HBlink;', bytes(config.get(section, 'OPTIONS'), 'utf-8')]),
                         'USE_ACL': config.getboolean(section, 'USE_ACL'),
                         'SUB_ACL': config.get(section, 'SUB_ACL'),
                         'TG1_ACL': config.get(section, 'TGID_TS1_ACL'),
@@ -274,6 +263,7 @@ def build_config(_config_file):
                     CONFIG['SYSTEMS'].update({section: {
                         'MODE': config.get(section, 'MODE'),
                         'ENABLED': config.getboolean(section, 'ENABLED'),
+                        'USE_USER_MAN': config.getboolean(section, 'USE_USER_MAN'),
                         'REPEAT': config.getboolean(section, 'REPEAT'),
                         'MAX_PEERS': config.getint(section, 'MAX_PEERS'),
                         'IP': gethostbyname(config.get(section, 'IP')),

db.txt

@@ -0,0 +1,4 @@
+{
+    3153597:b'passw0rd',
+    1234567:b'password'
+}

gps_data-SAMPLE.cfg

@@ -1,252 +0,0 @@
-# PROGRAM-WIDE PARAMETERS GO HERE
-# PATH - working path for files, leave it alone unless you NEED to change it
-# PING_TIME - the interval that peers will ping the master, and re-try registraion
-#           - how often the Master maintenance loop runs
-# MAX_MISSED - how many pings are missed before we give up and re-register
-#           - number of times the master maintenance loop runs before de-registering a peer
-#
-# ACLs:
-#
-# Access Control Lists are a very powerful tool for administering your system.
-# But they consume packet processing time. Disable them if you are not using them.
-# But be aware that, as of now, the configuration stanzas still need the ACL
-# sections configured even if you're not using them.
-#
-# REGISTRATION ACLS ARE ALWAYS USED, ONLY SUBSCRIBER AND TGID MAY BE DISABLED!!!
-#
-# The 'action' May be PERMIT|DENY
-# Each entry may be a single radio id, or a hypenated range (e.g. 1-2999)
-# Format:
-# 	ACL = 'action:id|start-end|,id|start-end,....'
-#		--for example--
-#	SUB_ACL: DENY:1,1000-2000,4500-60000,17
-#
-# ACL Types:
-# 	REG_ACL: peer radio IDs for registration (only used on HBP master systems)
-# 	SUB_ACL: subscriber IDs for end-users
-# 	TGID_TS1_ACL: destination talkgroup IDs on Timeslot 1
-# 	TGID_TS2_ACL: destination talkgroup IDs on Timeslot 2
-#
-# ACLs may be repeated for individual systems if needed for granularity
-# Global ACLs will be processed BEFORE the system level ACLs
-# Packets will be matched against all ACLs, GLOBAL first. If a packet 'passes'
-# All elements, processing continues. Packets are discarded at the first
-# negative match, or 'reject' from an ACL element.
-#
-# If you do not wish to use ACLs, set them to 'PERMIT:ALL'
-# TGID_TS1_ACL in the global stanza is used for OPENBRIDGE systems, since all
-# traffic is passed as TS 1 between OpenBridges
-[GLOBAL]
-PATH: ./
-PING_TIME: 5
-MAX_MISSED: 3
-USE_ACL: True
-REG_ACL: PERMIT:ALL
-SUB_ACL: DENY:1
-TGID_TS1_ACL: PERMIT:ALL
-TGID_TS2_ACL: PERMIT:ALL
-
-
-# NOT YET WORKING: NETWORK REPORTING CONFIGURATION
-#   Enabling "REPORT" will configure a socket-based reporting
-#   system that will send the configuration and other items
-#   to a another process (local or remote) that may process
-#   the information for some useful purpose, like a web dashboard.
-#
-#   REPORT - True to enable, False to disable
-#   REPORT_INTERVAL - Seconds between reports
-#   REPORT_PORT - TCP port to listen on if "REPORT_NETWORKS" = NETWORK
-#   REPORT_CLIENTS - comma separated list of IPs you will allow clients
-#       to connect on. Entering a * will allow all.
-#
-# ****FOR NOW MUST BE TRUE - USE THE LOOPBACK IF YOU DON'T USE THIS!!!****
-[REPORTS]
-REPORT: True
-REPORT_INTERVAL: 60
-REPORT_PORT: 4323
-REPORT_CLIENTS: 127.0.0.1
-
-
-# SYSTEM LOGGER CONFIGURAITON
-#   This allows the logger to be configured without chaning the individual
-#   python logger stuff. LOG_FILE should be a complete path/filename for *your*
-#   system -- use /dev/null for non-file handlers.
-#   LOG_HANDLERS may be any of the following, please, no spaces in the
-#   list if you use several:
-#       null
-#       console
-#       console-timed
-#       file
-#       file-timed
-#       syslog
-#   LOG_LEVEL may be any of the standard syslog logging levels, though
-#   as of now, DEBUG, INFO, WARNING and CRITICAL are the only ones
-#   used.
-#
-[LOGGER]
-LOG_FILE: ./gps_data.log
-LOG_HANDLERS: console-timed
-LOG_LEVEL: DEBUG
-LOG_NAME: HBlink3 GPS/Data
-
-# DOWNLOAD AND IMPORT SUBSCRIBER, PEER and TGID ALIASES
-# Ok, not the TGID, there's no master list I know of to download
-# This is intended as a facility for other applcations built on top of
-# HBlink to use, and will NOT be used in HBlink directly.
-# STALE_DAYS is the number of days since the last download before we
-# download again. Don't be an ass and change this to less than a few days.
-[ALIASES]
-TRY_DOWNLOAD: True
-PATH: ./
-PEER_FILE: peer_ids.json
-SUBSCRIBER_FILE: subscriber_ids.json
-TGID_FILE: talkgroup_ids.json
-PEER_URL: https://www.radioid.net/static/rptrs.json
-SUBSCRIBER_URL: https://www.radioid.net/static/users.json
-STALE_DAYS: 1
-
-# GPS/Data Application - by KF7EEL
-# Configure the settings for the DMR GPS to APRS position application here.
-#
-# DATA_DMR_ID - This is the DMR ID that users send DMR GPS data.
-# CALL_TYPE - group, unit, or both. Group if you want users to send data to a talkgroup,
-# unit if you want users to send data as a private call, or both if you want both options.
-# USER_APRS_SSID - Default APRS SSID assigned to user APRS positions.
-# USER_APRS_COMMENT - Default Comment attached to user APRS positions.
-# APRS_LOGIN_CALL, PASSCODE, SERVER, and PORT - Login settings for APRS-IS.
-[GPS_DATA]
-DATA_DMR_ID: 9099
-CALL_TYPE: unit
-USER_APRS_SSID: 15
-USER_APRS_COMMENT: HBLink3 D-APRS -
-
-# Setting APRS_LOGIN_CALL to N0CALL will cause the gateway to not upload packets to APRS server.
-APRS_LOGIN_CALL: N0CALL
-APRS_LOGIN_PASSCODE: 12345
-APRS_SERVER: rotate.aprs2.net
-APRS_PORT: 14580
-
-# The following settings are only applicable if you are using the gps_data_beacon_igate script.
-# They do not affect the operation gps_data itself.
-# Time in minutes.
-IGATE_BEACON_TIME = 45
-IGATE_BEACON_COMMENT = HBLink3 D-APRS Gateway
-IGATE_BEACON_ICON = /I
-IGATE_LATITUDE = 0000.00N
-IGATE_LONGITUDE = 00000.00W
-
-# The email gateway settingns below are OPTIONAL. They are NOT REQUIRED if you don't want
-# to enable the email gateway. Leave as is to disable.
-EMAIL_SENDER: test@example.org
-EMAIL_PASSWORD: letmein
-SMTP_SERVER: smtp.gmail.com
-SMTP_PORT: 465
-
-# OPENBRIDGE INSTANCES - DUPLICATE SECTION FOR MULTIPLE CONNECTIONS
-# OpenBridge is a protocol originall created by DMR+ for connection between an
-# IPSC2 server and Brandmeister. It has been implemented here at the suggestion
-# of the Brandmeister team as a way to legitimately connect HBlink to the
-# Brandemiester network.
-# It is recommended to name the system the ID of the Brandmeister server that
-# it connects to, but is not necessary. TARGET_IP and TARGET_PORT are of the
-# Brandmeister or IPSC2 server you are connecting to. PASSPHRASE is the password
-# that must be agreed upon between you and the operator of the server you are
-# connecting to. NETWORK_ID is a number in the format of a DMR Radio ID that
-# will be sent to the other server to identify this connection.
-# other parameters follow the other system types.
-#
-# ACLs:
-# OpenBridge does not 'register', so registration ACL is meaningless.
-# Proper OpenBridge passes all traffic on TS1.
-# HBlink can extend OPB to use both slots for unit calls only.
-# Setting "BOTH_SLOTS" True ONLY affects unit traffic!
-# Otherwise ACLs work as described in the global stanza
-
-##[OBP-1]
-##MODE: OPENBRIDGE
-##ENABLED: True
-##IP:
-##PORT: 62035
-##NETWORK_ID: 3129100
-##PASSPHRASE: password
-##TARGET_IP: 1.2.3.4
-##TARGET_PORT: 62035
-##BOTH_SLOTS: True
-##USE_ACL: True
-##SUB_ACL: DENY:1
-##TGID_ACL: PERMIT:ALL
-
-# MASTER INSTANCES - DUPLICATE SECTION FOR MULTIPLE MASTERS
-# HomeBrew Protocol Master instances go here.
-# IP may be left blank if there's one interface on your system.
-# Port should be the port you want this master to listen on. It must be unique
-# and unused by anything else.
-# Repeat - if True, the master repeats traffic to peers, False, it does nothing.
-#
-# MAX_PEERS -- maximun number of peers that may be connect to this master
-# at any given time. This is very handy if you're allowing hotspots to
-# connect, or using a limited computer like a Raspberry Pi.
-#
-# ACLs:
-# See comments in the GLOBAL stanza
-[MASTER-1]
-MODE: MASTER
-ENABLED: False
-REPEAT: True
-MAX_PEERS: 10
-EXPORT_AMBE: False
-IP:
-PORT: 54000
-PASSPHRASE: password
-GROUP_HANGTIME: 5
-USE_ACL: True
-REG_ACL: DENY:1
-SUB_ACL: DENY:1
-TGID_TS1_ACL: PERMIT:ALL
-TGID_TS2_ACL: PERMIT:ALL
-
-# PEER INSTANCES - DUPLICATE SECTION FOR MULTIPLE PEERS
-# There are a LOT of errors in the HB Protocol specifications on this one!
-# MOST of these items are just strings and will be properly dealt with by the program
-# The TX & RX Frequencies are 9-digit numbers, and are the frequency in Hz.
-# Latitude is an 8-digit unsigned floating point number.
-# Longitude is a 9-digit signed floating point number.
-# Height is in meters
-# Setting Loose to True relaxes the validation on packets received from the master.
-# This will allow HBlink to connect to a non-compliant system such as XLXD, DMR+ etc.
-#
-# ACLs:
-# See comments in the GLOBAL stanza
-
-[D-APRS]
-MODE: PEER
-ENABLED: True
-LOOSE: True
-EXPORT_AMBE: False
-IP: 
-PORT: 54071
-MASTER_IP: localhost
-MASTER_PORT: 54070
-PASSPHRASE: passw0rd
-CALLSIGN: D-APRS
-RADIO_ID: 9099
-RX_FREQ: 000000000
-TX_FREQ: 000000000
-TX_POWER: 0
-COLORCODE: 1
-SLOTS: 1
-LATITUDE: 00.0000
-LONGITUDE: 000.0000
-HEIGHT: 0
-LOCATION: This Server
-DESCRIPTION: GPS to APRS
-URL: www.github.com/kf7eel/hblink3
-SOFTWARE_ID: 20170620
-PACKAGE_ID: MMDVM_HBlink
-GROUP_HANGTIME: 5
-OPTIONS:
-USE_ACL: True
-SUB_ACL: DENY:1
-TGID_TS1_ACL: PERMIT:ALL
-TGID_TS2_ACL: PERMIT:ALL
-

gps_data.py

@@ -1,705 +0,0 @@
-#!/usr/bin/env python3
-#
-###############################################################################
-#   HBLink - Copyright (C) 2020 Cortney T. Buffington, N0MJS <n0mjs@me.com>
-#   GPS/Data - Copyright (C) 2020 Eric Craw, KF7EEL <kf7eel@qsl.net>
-#   Annotated modifications Copyright (C) 2021 Xavier FRS2013
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-###############################################################################
-
-'''
-This is a GPS and Data application. It decodes and reassambles DMR GPS packets and
-uploads them th APRS-IS.
-'''
-
-# Python modules we need
-import sys
-from bitarray import bitarray
-from time import time
-from importlib import import_module
-from types import ModuleType
-
-# Twisted is pretty important, so I keep it separate
-from twisted.internet.protocol import Factory, Protocol
-from twisted.protocols.basic import NetstringReceiver
-from twisted.internet import reactor, task
-
-# Things we import from the main hblink module
-from hblink import HBSYSTEM, OPENBRIDGE, systems, hblink_handler, reportFactory, REPORT_OPCODES, config_reports, mk_aliases, acl_check
-from dmr_utils3.utils import bytes_3, int_id, get_alias
-from dmr_utils3 import decode, bptc, const
-import config
-import log
-import const
-
-# The module needs logging logging, but handlers, etc. are controlled by the parent
-import logging
-logger = logging.getLogger(__name__)
-
-# Other modules we need for data and GPS
-from bitarray import bitarray
-from binascii import b2a_hex as ahex
-import re
-##from binascii import a2b_hex as bhex
-import aprslib
-import datetime
-from bitarray.util import ba2int as ba2num
-from bitarray.util import ba2hex as ba2hx
-import codecs
-import time
-#Needed for working with NMEA
-import pynmea2
-
-# Modules for executing commands/scripts
-import os
-from gps_functions import cmd_list
-
-# Module for maidenhead grids
-try:
-    import maidenhead as mh
-except:
-    logger.info('Error importing maidenhead module, make sure it is installed.')
-# Module for sending email
-try:
-    import smtplib
-except:
-    logger.info('Error importing smtplib module, make sure it is installed.')
-
-#Modules for APRS settings
-import ast
-from pathlib import Path
-
-
-# Does anybody read this stuff? There's a PEP somewhere that says I should do this.
-__author__     = 'Cortney T. Buffington, N0MJS; Eric Craw, KF7EEL'
-__copyright__  = 'Copyright (c) 2020 Cortney T. Buffington'
-__credits__    = 'Colin Durbridge, G4EML, Steve Zingman, N4IRS; Mike Zingman, N4IRR; Jonathan Naylor, G4KLX; Hans Barthen, DL5DI; Torsten Shultze, DG1HT'
-__license__    = 'GNU GPLv3'
-__maintainer__ = 'Eric Craw, KF7EEL'
-__email__      = 'kf7eel@qsl.net'
-__status__     = 'pre-alpha'
-
-# Must have the following at line 1054 in bridge.py to forward group vcsbk, also there is a typo there:
-# self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
-
-##################################################################################################
-
-# Headers for GPS by model of radio:
-# AT-D878 - Compressed UDP
-# MD-380 - Unified Data Transport
-hdr_type = ''
-btf = ''
-ssid = ''
-
-# From dmr_utils3, modified to decode entire packet. Works for 1/2 rate coded data. 
-def decode_full(_data):
-    binlc = bitarray(endian='big')   
-    binlc.extend([_data[136],_data[121],_data[106],_data[91], _data[76], _data[61], _data[46], _data[31]])
-    binlc.extend([_data[152],_data[137],_data[122],_data[107],_data[92], _data[77], _data[62], _data[47], _data[32], _data[17], _data[2]  ])
-    binlc.extend([_data[123],_data[108],_data[93], _data[78], _data[63], _data[48], _data[33], _data[18], _data[3],  _data[184],_data[169]])
-    binlc.extend([_data[94], _data[79], _data[64], _data[49], _data[34], _data[19], _data[4],  _data[185],_data[170],_data[155],_data[140]])
-    binlc.extend([_data[65], _data[50], _data[35], _data[20], _data[5],  _data[186],_data[171],_data[156],_data[141],_data[126],_data[111]])
-    binlc.extend([_data[36], _data[21], _data[6],  _data[187],_data[172],_data[157],_data[142],_data[127],_data[112],_data[97], _data[82] ])
-    binlc.extend([_data[7],  _data[188],_data[173],_data[158],_data[143],_data[128],_data[113],_data[98], _data[83]])
-    #This is the rest of the Full LC data -- the RS1293 FEC that we don't need
-    # This is extremely important for SMS and GPS though.
-    binlc.extend([_data[68],_data[53],_data[174],_data[159],_data[144],_data[129],_data[114],_data[99],_data[84],_data[69],_data[54],_data[39]])
-    binlc.extend([_data[24],_data[145],_data[130],_data[115],_data[100],_data[85],_data[70],_data[55],_data[40],_data[25],_data[10],_data[191]])
-    return binlc
-   
-
-n_packet_assembly = 0
-
-packet_assembly = ''
-
-final_packet = ''
-
-#Convert DMR packet to binary from MMDVM packet and remove Slot Type and EMB Sync stuff to allow for BPTC 196,96 decoding
-def bptc_decode(_data):
-        binary_packet = bitarray(decode.to_bits(_data[20:]))
-        del binary_packet[98:166]
-        return decode_full(binary_packet)
-# Placeholder for future header id
-def header_ID(_data):
-    hex_hdr = str(ahex(bptc_decode(_data)))
-    return hex_hdr[2:6]
-    # Work in progress, used to determine data format
-##    pass
-
-def aprs_send(packet):
-    if aprs_callsign == 'N0CALL':
-        logger.info('APRS callsighn set to N0CALL, packet not sent.')
-        pass
-    else:
-        AIS = aprslib.IS(aprs_callsign, passwd=aprs_passcode,host=aprs_server, port=aprs_port)
-        AIS.connect()
-        AIS.sendall(packet)
-        AIS.close()
-        logger.info('Packet sent to APRS-IS.')
-
-def dashboard_loc_write(call, lat, lon, time):
-    pass
-##    #try:
-##    dash_entries = ast.literal_eval(os.popen('cat /tmp/gps_data_user_loc.txt').read())
-##   # except:
-##    #    dash_entries = []
-##    dash_entries.insert(0, {'call': call, 'lat': lat, 'lon': lon, 'time':time})
-##    with open("/tmp/gps_data_user_loc.txt", 'w') as user_loc_file:
-##            user_loc_file.write(str(dash_entries[:15]))
-##            user_loc_file.close()
-##    logger.info('User location saved for dashboard')
-##    #logger.info(dash_entries)
-
-def dashboard_bb_write(call, dmr_id, time, bulletin):
-    pass
-##    #try:
-##    dash_bb = ast.literal_eval(os.popen('cat /tmp/gps_data_user_bb.txt').read())
-##   # except:
-##    #    dash_entries = []
-##    dash_bb.insert(0, {'call': call, 'dmr_id': dmr_id, 'time': time, 'bulliten':bulletin})
-##    with open("/tmp/gps_data_user_bb.txt", 'w') as user_bb_file:
-##            user_bb_file.write(str(dash_bb[:10]))
-##            user_bb_file.close()
-##    logger.info('User bulletin entry saved.')
-##    #logger.info(dash_bb)
-
-# Send email via SMTP function
-def send_email(to_email, email_subject, email_message):
-    global smtp_server
-    sender_address = email_sender
-    account_password = email_password
-    smtp_server = smtplib.SMTP_SSL(smtp_server, int(smtp_port))
-    smtp_server.login(sender_address, account_password)
-    message = "From: " + aprs_callsign + " D-APRS Gateway\nTo: " + to_email + "\nContent-type: text/html\nSubject: " + email_subject + "\n\n" + '<strong>' + email_subject + '</strong><p>&nbsp;</p><h3>' + email_message + '</h3><p>&nbsp;</p><p>This message was sent to you from a D-APRS gateway operated by <strong>' + aprs_callsign + '</strong>. Do not reply as this gateway is only one way at this time.</p>'
-    smtp_server.sendmail(sender_address, to_email, message)
-    smtp_server.close()
-
-# Thanks for this forum post for this - https://stackoverflow.com/questions/2579535/convert-dd-decimal-degrees-to-dms-degrees-minutes-seconds-in-python
-
-def decdeg2dms(dd):
-   is_positive = dd >= 0
-   dd = abs(dd)
-   minutes,seconds = divmod(dd*3600,60)
-   degrees,minutes = divmod(minutes,60)
-   degrees = degrees if is_positive else -degrees
-   return (degrees,minutes,seconds)
-
-def user_setting_write(dmr_id, setting, value):
-##    try:
-    # Open file and load as dict for modification
-        with open("./user_settings.txt", 'r') as f:
-##            if f.read() == '{}':
-##                user_dict = {}
-            user_dict = ast.literal_eval(f.read())
-            logger.info('Current settings: ' + str(user_dict))
-            if dmr_id not in user_dict:
-                user_dict[dmr_id] = [{'call': str(get_alias((dmr_id), subscriber_ids))}, {'ssid': ''}, {'icon': ''}, {'comment': ''}]
-
-            if setting.upper() == 'ICON':
-                user_dict[dmr_id][2]['icon'] = value
-            if setting.upper() == 'SSID':
-                user_dict[dmr_id][1]['ssid'] = value  
-            if setting.upper() == 'COM':
-                user_comment = user_dict[dmr_id][3]['comment'] = value[0:35]
-            f.close()
-            logger.info('Loaded user settings. Preparing to write...')
-    # Write modified dict to file
-        with open("./user_settings.txt", 'w') as user_dict_file:
-            user_dict_file.write(str(user_dict))
-            user_dict_file.close()
-            logger.info('User setting saved')
-            f.close()
-            packet_assembly = ''
-##    except:
-##        logger.info('No data file found, creating one.')
-##        #Path('./user_settings.txt').mkdir(parents=True, exist_ok=True)
-##        Path('./user_settings.txt').touch()
-        
-# Process SMS, do something bases on message
-
-def process_sms(_rf_src, sms):
-    if sms == 'ID':
-        logger.info(str(get_alias(int_id(from_id), subscriber_ids)) + ' - ' + str(int_id(from_id)))
-    elif sms == 'TEST':
-        logger.info('It works!')
-    elif '@ICON' in sms:
-        user_setting_write(int_id(_rf_src), re.sub(' .*|@','',sms), re.sub('@ICON| ','',sms))
-    elif '@SSID' in sms:
-        user_setting_write(int_id(_rf_src), re.sub(' .*|@','',sms), re.sub('@SSID| ','',sms))
-    elif '@COM' in sms:
-        user_setting_write(int_id(_rf_src), re.sub(' .*|@','',sms), re.sub('@COM |@COM','',sms))
-    elif '@BB' in sms:
-        dashboard_bb_write(get_alias(int_id(_rf_src), subscriber_ids), int_id(_rf_src), time.strftime('%H:%M:%S - %m/%d/%y'), re.sub('@BB|@BB ','',sms))
-    elif '@' and ' E-' in sms:
-        email_message = re.sub('.*@|.* E-', '', sms)
-        to_email = re.sub(' E-.*', '', sms)
-        email_subject = 'New message from ' + str(get_alias(int_id(_rf_src), subscriber_ids))
-        logger.info('Email to: ' + to_email)
-        logger.info('Message: ' + email_message)
-        try:
-            send_email(to_email, email_subject, email_message)
-            logger.info('Email sent.')
-        except:
-            logger.info('Failed to send email.')
-    elif '@MH' in sms:
-        grid_square = re.sub('@MH ', '', sms)
-        if len(grid_square) < 6:
-            pass
-        else:
-            lat = decdeg2dms(mh.to_location(grid_square)[0])
-            lon = decdeg2dms(mh.to_location(grid_square)[1])
-            
-            if lon[0] < 0:
-                lon_dir = 'W'
-            if lon[0] > 0:
-                lon_dir = 'E'
-            if lat[0] < 0:
-                lat_dir = 'S'
-            if lat[0] > 0:
-                lat_dir = 'N'
-            #logger.info(lat)
-            #logger.info(lat_dir)
-            aprs_lat = str(str(re.sub('\..*|-', '', str(lat[0]))) + str(re.sub('\..*', '', str(lat[1])) + '.')).zfill(5) + '  ' + lat_dir
-            aprs_lon = str(str(re.sub('\..*|-', '', str(lon[0]))) + str(re.sub('\..*', '', str(lon[1])) + '.')).zfill(6) + '  ' + lon_dir
-        logger.info('Latitude: ' + str(aprs_lat))
-        logger.info('Longitude: ' + str(aprs_lon))
-        # 14FRS2013 simplified and moved settings retrieval
-        user_settings = ast.literal_eval(os.popen('cat ./user_settings.txt').read())	
-        if int_id(_rf_src) not in user_settings:	
-            ssid = str(user_ssid)	
-            icon_table = '/'	
-            icon_icon = '['	
-            comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src)) 	
-        else:	
-            if user_settings[int_id(_rf_src)][1]['ssid'] == '':	
-                ssid = user_ssid	
-            if user_settings[int_id(_rf_src)][3]['comment'] == '':	
-                comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))	
-            if user_settings[int_id(_rf_src)][2]['icon'] == '':	
-                icon_table = '/'	
-                icon_icon = '['	
-            if user_settings[int_id(_rf_src)][2]['icon'] != '':	
-                icon_table = user_settings[int_id(_rf_src)][2]['icon'][0]	
-                icon_icon = user_settings[int_id(_rf_src)][2]['icon'][1]	
-            if user_settings[int_id(_rf_src)][1]['ssid'] != '':	
-                ssid = user_settings[int_id(_rf_src)][1]['ssid']	
-            if user_settings[int_id(_rf_src)][3]['comment'] != '':	
-                comment = user_settings[int_id(_rf_src)][3]['comment']	
-        aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:/' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(aprs_lat) + icon_table + str(aprs_lon) + icon_icon + '/' + str(comment)
-        logger.info(aprs_loc_packet)
-        logger.info('User comment: ' + comment)
-        logger.info('User SSID: ' + ssid)
-        logger.info('User icon: ' + icon_table + icon_icon)
-        try:
-            aprslib.parse(aprs_loc_packet)
-            aprs_send(aprs_loc_packet)
-            dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, aprs_lat, aprs_lon, time.strftime('%H:%M:%S - %m/%d/%y'))
-            #logger.info('Sent manual position to APRS')
-        except:
-            logger.info('Exception. Not uploaded')
-        packet_assembly = ''
-          
-            
-    elif 'A-' in sms and '@' in sms:
-        #Example SMS text: @ARMDS A-This is a test.
-        aprs_dest = re.sub('@| A-.*','',sms)
-        aprs_msg = re.sub('@.* A-|','',sms)
-        logger.info('APRS message to ' + aprs_dest.upper() + '. Message: ' + aprs_msg)
-        user_settings = ast.literal_eval(os.popen('cat ./user_settings.txt').read())
-        if int_id(_rf_src) in user_settings and user_settings[int_id(_rf_src)][1]['ssid'] != '':
-            ssid = user_settings[int_id(_rf_src)][1]['ssid']
-        else:
-            ssid = user_ssid
-        aprs_msg_pkt = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + str(ssid) + '>APHBL3,TCPIP*::' + str(aprs_dest).ljust(9).upper() + ':' + aprs_msg[0:73]
-        logger.info(aprs_msg_pkt)
-        try:
-            aprslib.parse(aprs_msg_pkt)
-            aprs_send(aprs_msg_pkt)
-            #logger.info('Packet sent.')
-        except:
-            logger.info('Error uploading MSG packet.')
-    try:
-        if sms in cmd_list:
-            logger.info('Executing command/script.')
-            os.popen(cmd_list[sms]).read()
-            packet_assembly = ''
-    except:
-        logger.info('Exception. Command possibly not in list, or other error.')
-        packet_assembly = ''
-    else:
-        pass
-
-###########
-
-    
-class DATA_SYSTEM(HBSYSTEM):
-##    global n_packet_assembly, packet_assembly
-
-    def __init__(self, _name, _config, _report):
-        HBSYSTEM.__init__(self, _name, _config, _report)
-
-    def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
-        # Capture data headers
-        global n_packet_assembly, hdr_type
-        #logger.info(_dtype_vseq)
-        logger.info(time.strftime('%H:%M:%S - %m/%d/%y'))
-        #logger.info('Special debug for developement:')
-        #logger.info(ahex(bptc_decode(_data)))
-        #logger.info(hdr_type)
-        #logger.info((ba2num(bptc_decode(_data)[8:12])))
-        if int_id(_dst_id) == data_id:
-            #logger.info(type(_seq))
-            if type(_seq) is bytes:
-                pckt_seq = int.from_bytes(_seq, 'big')
-            else:
-                pckt_seq = _seq
-            # Try to classify header
-            # UDT header has DPF of 0101, which is 5.
-            # If 5 is at position 3, then this should be a UDT header for MD-380 type radios.
-            # Coordinates are usually in the very next block after the header, we will discard the rest.
-            #logger.info(ahex(bptc_decode(_data)[0:10]))
-            if _call_type == call_type and header_ID(_data)[3] == '5' and ba2num(bptc_decode(_data)[69:72]) == 0 and ba2num(bptc_decode(_data)[8:12]) == 0 or (_call_type == 'vcsbk' and header_ID(_data)[3] == '5' and ba2num(bptc_decode(_data)[69:72]) == 0 and ba2num(bptc_decode(_data)[8:12]) == 0):
-                global udt_block
-                logger.info('MD-380 type UDT header detected. Very next packet should be location.')
-                hdr_type = '380'
-            if _dtype_vseq == 6 and hdr_type == '380' or _dtype_vseq == 'group' and hdr_type == '380':
-                udt_block = 1
-            if _dtype_vseq == 7 and hdr_type == '380':
-                udt_block = udt_block - 1
-                if udt_block == 0:
-                    logger.info('MD-380 type packet. This should contain the GPS location.')
-                    logger.info('Packet: ' + str(ahex(bptc_decode(_data))))
-                    if ba2num(bptc_decode(_data)[1:2]) == 1:
-                        lat_dir = 'N'
-                    if ba2num(bptc_decode(_data)[1:2]) == 0:
-                        lat_dir = 'S'
-                    if ba2num(bptc_decode(_data)[2:3]) == 1:
-                        lon_dir = 'E'
-                    if ba2num(bptc_decode(_data)[2:3]) == 0:
-                        lon_dir = 'W'
-                    lat_deg = ba2num(bptc_decode(_data)[11:18])
-                    lon_deg = ba2num(bptc_decode(_data)[38:46])
-                    lat_min = ba2num(bptc_decode(_data)[18:24])
-                    lon_min = ba2num(bptc_decode(_data)[46:52])
-                    lat_min_dec = str(ba2num(bptc_decode(_data)[24:38])).zfill(4)
-                    lon_min_dec = str(ba2num(bptc_decode(_data)[52:66])).zfill(4)
-                    aprs_lat = str(str(lat_deg) + str(lat_min) + '.' + str(lat_min_dec)[0:2]).zfill(7) + lat_dir
-                    aprs_lon = str(str(lon_deg) + str(lon_min) + '.' + str(lon_min_dec)[0:2]).zfill(8) + lon_dir
-                    # Form APRS packet
-                    #logger.info(aprs_loc_packet)
-                    logger.info('Lat: ' + str(aprs_lat) + ' Lon: ' + str(aprs_lon))
-                    # 14FRS2013 simplified and moved settings retrieval
-                    user_settings = ast.literal_eval(os.popen('cat ./user_settings.txt').read())
-                    if int_id(_rf_src) not in user_settings:	
-                        ssid = str(user_ssid)	
-                        icon_table = '/'	
-                        icon_icon = '['	
-                        comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src)) 	
-                    else:	
-                        if user_settings[int_id(_rf_src)][1]['ssid'] == '':	
-                            ssid = user_ssid	
-                        if user_settings[int_id(_rf_src)][3]['comment'] == '':	
-                            comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))	
-                        if user_settings[int_id(_rf_src)][2]['icon'] == '':	
-                            icon_table = '/'	
-                            icon_icon = '['	
-                        if user_settings[int_id(_rf_src)][2]['icon'] != '':	
-                            icon_table = user_settings[int_id(_rf_src)][2]['icon'][0]	
-                            icon_icon = user_settings[int_id(_rf_src)][2]['icon'][1]	
-                        if user_settings[int_id(_rf_src)][1]['ssid'] != '':	
-                            ssid = user_settings[int_id(_rf_src)][1]['ssid']	
-                        if user_settings[int_id(_rf_src)][3]['comment'] != '':	
-                            comment = user_settings[int_id(_rf_src)][3]['comment']
-                    aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:/' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(aprs_lat) + icon_table + str(aprs_lon) + icon_icon + '/' + str(comment)
-                    logger.info(aprs_loc_packet)
-                    logger.info('User comment: ' + comment)
-                    logger.info('User SSID: ' + ssid)
-                    logger.info('User icon: ' + icon_table + icon_icon)
-                    # Attempt to prevent malformed packets from being uploaded.
-                    try:
-                        aprslib.parse(aprs_loc_packet)
-                        float(lat_deg) < 91
-                        float(lon_deg) < 121
-                        aprs_send(aprs_loc_packet)
-                        dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, aprs_lat, aprs_lon, time.strftime('%H:%M:%S - %m/%d/%y'))
-                        #logger.info('Sent APRS packet')
-                    except:
-                        logger.info('Error. Failed to send packet. Packet may be malformed.')
-                    udt_block = 1
-                    hdr_type = ''
-                else:
-                      pass
-            #NMEA type packets for Anytone like radios.
-            #if _call_type == call_type or (_call_type == 'vcsbk' and pckt_seq > 3): #int.from_bytes(_seq, 'big') > 3 ):
-            # 14FRS2013 contributed improved header filtering, KF7EEL added conditions to allow both call types at the same time
-            if _call_type == call_type or (_call_type == 'vcsbk' and pckt_seq > 3 and call_type != 'unit') or (_call_type == 'group' and pckt_seq > 3 and call_type != 'unit') or (_call_type == 'group' and pckt_seq > 3 and call_type == 'both') or (_call_type == 'vcsbk' and pckt_seq > 3 and call_type == 'both') or (_call_type == 'unit' and pckt_seq > 3 and call_type == 'both'): #int.from_bytes(_seq, 'big') > 3 ):
-                global packet_assembly, btf
-                if _dtype_vseq == 6 or _dtype_vseq == 'group':
-                    global btf, hdr_start
-                    hdr_start = str(header_ID(_data))
-                    logger.info('Header from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + '. DMR ID: ' + str(int_id(_rf_src)))
-                    logger.info(ahex(bptc_decode(_data)))
-                    logger.info('Blocks to follow: ' + str(ba2num(bptc_decode(_data)[65:72])))
-                    btf = ba2num(bptc_decode(_data)[65:72])
-                    # Try resetting packet_assembly
-                    packet_assembly = ''
-                # Data blocks at 1/2 rate, see https://github.com/g4klx/MMDVM/blob/master/DMRDefines.h for data types. _dtype_seq defined here also
-                if _dtype_vseq == 7:
-                    btf = btf - 1
-                    logger.info('Block #: ' + str(btf))
-                    #logger.info(_seq)
-                    logger.info('Data block from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + '. DMR ID: ' + str(int_id(_rf_src)) + '. Destination: ' + str(int_id(_dst_id)))
-                    logger.info(ahex(bptc_decode(_data)))
-                    if _seq == 0:
-                        n_packet_assembly = 0
-                        packet_assembly = ''
-                        
-                    #if btf < btf + 1:
-                    # 14FRS2013 removed condition, works great!
-                    n_packet_assembly = n_packet_assembly + 1
-                    packet_assembly = packet_assembly + str(bptc_decode(_data)) #str((decode_full_lc(b_packet)).strip('bitarray('))
-                    # Use block 0 as trigger. $GPRMC must also be in string to indicate NMEA.
-                    # This triggers the APRS upload
-                    if btf == 0:
-                        final_packet = str(bitarray(re.sub("\)|\(|bitarray|'", '', packet_assembly)).tobytes().decode('utf-8', 'ignore'))
-                        sms_hex = str(ba2hx(bitarray(re.sub("\)|\(|bitarray|'", '', packet_assembly))))
-
-                        sms_hex_string = re.sub("b'|'", '', str(sms_hex))
-                        #NMEA GPS sentence
-                        if '$GPRMC' in final_packet or '$GNRMC' in final_packet:
-                            logger.info(final_packet + '\n')
-                            # Eliminate excess bytes based on NMEA type
-                            # GPRMC
-                            if 'GPRMC' in final_packet:
-                                logger.info('GPRMC location')
-                                #nmea_parse = re.sub('A\*.*|.*\$', '', str(final_packet))
-                                nmea_parse = re.sub('A\*.*|.*\$|\n.*', '', str(final_packet))
-                            # GNRMC
-                            if 'GNRMC' in final_packet:
-                                logger.info('GNRMC location')
-                                nmea_parse = re.sub('.*\$|\n.*|V\*.*', '', final_packet)
-                            loc = pynmea2.parse(nmea_parse, check=False)
-                            logger.info('Latitude: ' + str(loc.lat) + str(loc.lat_dir) + ' Longitude: ' + str(loc.lon) + str(loc.lon_dir) + ' Direction: ' + str(loc.true_course) + ' Speed: ' + str(loc.spd_over_grnd) + '\n')
-                            try:
-                                # Begin APRS format and upload
-                                # Disable opening file for reading to reduce "collision" or reading and writing at same time.
-                                # 14FRS2013 simplified and moved settings retrieval
-                                user_settings = ast.literal_eval(os.popen('cat ./user_settings.txt').read())	
-                                if int_id(_rf_src) not in user_settings:	
-                                    ssid = str(user_ssid)	
-                                    icon_table = '/'	
-                                    icon_icon = '['	
-                                    comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src)) 	
-                                else:	
-                                    if user_settings[int_id(_rf_src)][1]['ssid'] == '':	
-                                        ssid = user_ssid	
-                                    if user_settings[int_id(_rf_src)][3]['comment'] == '':	
-                                        comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))	
-                                    if user_settings[int_id(_rf_src)][2]['icon'] == '':	
-                                        icon_table = '/'	
-                                        icon_icon = '['	
-                                    if user_settings[int_id(_rf_src)][2]['icon'] != '':	
-                                        icon_table = user_settings[int_id(_rf_src)][2]['icon'][0]	
-                                        icon_icon = user_settings[int_id(_rf_src)][2]['icon'][1]	
-                                    if user_settings[int_id(_rf_src)][1]['ssid'] != '':	
-                                        ssid = user_settings[int_id(_rf_src)][1]['ssid']	
-                                    if user_settings[int_id(_rf_src)][3]['comment'] != '':	
-                                        comment = user_settings[int_id(_rf_src)][3]['comment']	
-                                aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:/' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(loc.lat[0:7]) + str(loc.lat_dir) + icon_table + str(loc.lon[0:8]) + str(loc.lon_dir) + icon_icon + str(round(loc.true_course)).zfill(3) + '/' + str(round(loc.spd_over_grnd)).zfill(3) + '/' + str(comment)
-                                logger.info(aprs_loc_packet)
-                                logger.info('User comment: ' + comment)
-                                logger.info('User SSID: ' + ssid)
-                                logger.info('User icon: ' + icon_table + icon_icon)
-                            except:
-                                logger.info('Error or user settings file not found, proceeding with default settings.')
-                                aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + str(user_ssid) + '>APHBL3,TCPIP*:/' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(loc.lat[0:7]) + str(loc.lat_dir) + '/' + str(loc.lon[0:8]) + str(loc.lon_dir) + '[' + str(round(loc.true_course)).zfill(3) + '/' + str(round(loc.spd_over_grnd)).zfill(3) + '/' + aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))
-                            try:
-                            # Try parse of APRS packet. If it fails, it will not upload to APRS-IS
-                                aprslib.parse(aprs_loc_packet)
-                            # Float values of lat and lon. Anything that is not a number will cause it to fail.
-                                float(loc.lat)
-                                float(loc.lon)
-                                aprs_send(aprs_loc_packet)
-                                dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, str(loc.lat[0:7]) + str(loc.lat_dir), str(loc.lon[0:8]) + str(loc.lon_dir), time.strftime('%H:%M:%S - %m/%d/%y'))
-                            except:
-                                logger.info('Failed to parse packet. Packet may be deformed. Not uploaded.')
-                            #final_packet = ''
-                            # Get callsign based on DMR ID
-                            # End APRS-IS upload
-                        # Assume this is an SMS message
-                        elif '$GPRMC' not in final_packet or '$GNRMC' not in final_packet:
-                            
-####                            # Motorola type SMS header
-##                            if '824a' in hdr_start or '024a' in hdr_start:
-##                                logger.info('\nMotorola type SMS')
-##                                sms = codecs.decode(bytes.fromhex(''.join(sms_hex[74:-8].split('00'))), 'utf-8')
-##                                logger.info('\n\n' + 'Received SMS from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + ', DMR ID: ' + str(int_id(_rf_src)) + ': ' + str(sms) + '\n')
-##                                process_sms(_rf_src, sms)
-##                                packet_assembly = ''
-##                            # ETSI? type SMS header    
-##                            elif '0244' in hdr_start or '8244' in hdr_start:
-##                                logger.info('ETSI? type SMS')
-##                                sms = codecs.decode(bytes.fromhex(''.join(sms_hex[64:-8].split('00'))), 'utf-8')
-##                                logger.info('\n\n' + 'Received SMS from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + ', DMR ID: ' + str(int_id(_rf_src)) + ': ' + str(sms) + '\n')
-##                                #logger.info(final_packet)
-##                                #logger.info(sms_hex[64:-8])
-##                                process_sms(_rf_src, sms)
-##                                packet_assembly = ''
-####                                
-##                            else:
-                                logger.info('\nSMS detected. Attempting to parse.')
-                                #logger.info(final_packet)
-                                logger.info(sms_hex)
-##                                logger.info(type(sms_hex))
-                                logger.info('Attempting to find command...')
-##                                sms = codecs.decode(bytes.fromhex(''.join(sms_hex[:-8].split('00'))), 'utf-8', 'ignore')
-                                sms = codecs.decode(bytes.fromhex(''.join(sms_hex_string[:-8].split('00'))), 'utf-8', 'ignore')
-                                msg_found = re.sub('.*\n', '', sms)
-                                logger.info('\n\n' + 'Received SMS from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + ', DMR ID: ' + str(int_id(_rf_src)) + ': ' + str(msg_found) + '\n')
-                                process_sms(_rf_src, msg_found)
-                                #packet_assembly = ''
-                                pass
-                                #logger.info(bitarray(re.sub("\)|\(|bitarray|'", '', str(bptc_decode(_data)).tobytes().decode('utf-8', 'ignore'))))
-                            #logger.info('\n\n' + 'Received SMS from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + ', DMR ID: ' + str(int_id(_rf_src)) + ': ' + str(sms) + '\n')
-                        # Reset the packet assembly to prevent old data from returning.
-                        # 14FRS2013 moved variable reset
-                        hdr_start = ''
-                        n_packet_assembly = 0	
-                        packet_assembly = ''	
-                        btf = 0
-                    #logger.info(_seq)
-                    #packet_assembly = '' #logger.info(_dtype_vseq)
-                #logger.info(ahex(bptc_decode(_data)).decode('utf-8', 'ignore'))
-                #logger.info(bitarray(re.sub("\)|\(|bitarray|'", '', str(bptc_decode(_data)).tobytes().decode('utf-8', 'ignore'))))
-
-        else:
-            pass
-
-
-#************************************************
-#      MAIN PROGRAM LOOP STARTS HERE
-#************************************************
-
-if __name__ == '__main__':
-    #global aprs_callsign, aprs_passcode, aprs_server, aprs_port, user_ssid, aprs_comment, call_type, data_id
-    import argparse
-    import sys
-    import os
-    import signal
-    from dmr_utils3.utils import try_download, mk_id_dict
-
-    # Change the current directory to the location of the application
-    os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
-
-    # Check if user_settings (for APRS settings of users) exists. Creat it if not.
-    if Path('./user_settings.txt').is_file():
-        pass
-    else:
-        Path('./user_settings.txt').touch()
-        with open("./user_settings.txt", 'w') as user_dict_file:
-            user_dict_file.write("{1: [{'call': 'N0CALL'}, {'ssid': ''}, {'icon': ''}, {'comment': ''}]}")
-            user_dict_file.close()
-##    # Check to see if dashboard files exist
-##    if Path('/tmp/gps_data_user_loc.txt').is_file():
-##        pass
-##    else:
-##        Path('/tmp/gps_data_user_loc.txt').touch()
-##        with open("/tmp/gps_data_user_loc.txt", 'w') as user_loc_file:
-##            user_loc_file.write("[]")
-##            user_loc_file.close()
-##    if Path('/tmp/gps_data_user_bb.txt').is_file():
-##        pass
-##    else:
-##        Path('/tmp/gps_data_user_bb.txt').touch()
-##        with open("/tmp/gps_data_user_bb.txt", 'w') as user_bb_file:
-##            user_bb_file.write("[]")
-##            user_bb_file.close()
-    # CLI argument parser - handles picking up the config file from the command line, and sending a "help" message
-    parser = argparse.ArgumentParser()
-    parser.add_argument('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually gps_data.cfg)')
-    parser.add_argument('-l', '--logging', action='store', dest='LOG_LEVEL', help='Override config file logging level.')
-    cli_args = parser.parse_args()
-
-    # Ensure we have a path for the config file, if one wasn't specified, then use the default (top of file)
-    if not cli_args.CONFIG_FILE:
-        cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/gps_data.cfg'
-
-    # Call the external routine to build the configuration dictionary
-    CONFIG = config.build_config(cli_args.CONFIG_FILE)
-
-    data_id = int(CONFIG['GPS_DATA']['DATA_DMR_ID'])
-
-    # Group call or Unit (private) call
-    call_type = CONFIG['GPS_DATA']['CALL_TYPE']
-    # APRS-IS login information
-    aprs_callsign = CONFIG['GPS_DATA']['APRS_LOGIN_CALL']
-    aprs_passcode = int(CONFIG['GPS_DATA']['APRS_LOGIN_PASSCODE'])
-    aprs_server = CONFIG['GPS_DATA']['APRS_SERVER']
-    aprs_port = int(CONFIG['GPS_DATA']['APRS_PORT'])
-    user_ssid = CONFIG['GPS_DATA']['USER_APRS_SSID']
-    aprs_comment = CONFIG['GPS_DATA']['USER_APRS_COMMENT']
-    # EMAIL variables
-    email_sender = CONFIG['GPS_DATA']['EMAIL_SENDER']
-    email_password = CONFIG['GPS_DATA']['EMAIL_PASSWORD']
-    smtp_server = CONFIG['GPS_DATA']['SMTP_SERVER']
-    smtp_port = CONFIG['GPS_DATA']['SMTP_PORT']
-    
-    # Start the system logger
-    if cli_args.LOG_LEVEL:
-        CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL
-    logger = log.config_logging(CONFIG['LOGGER'])
-    logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018, 2019\n\tThe Regents of the K0USY Group. All rights reserved.\n GPS and Data decoding by Eric, KF7EEL')
-    logger.debug('Logging system started, anything from here on gets logged')
-
-    # Set up the signal handler
-    def sig_handler(_signal, _frame):
-        logger.info('SHUTDOWN: >>>GPS and Data Decoder<<< IS TERMINATING WITH SIGNAL %s', str(_signal))
-        hblink_handler(_signal, _frame)
-        logger.info('SHUTDOWN: ALL SYSTEM HANDLERS EXECUTED - STOPPING REACTOR')
-        reactor.stop()
-
-    # Set signal handers so that we can gracefully exit if need be
-    for sig in [signal.SIGTERM, signal.SIGINT]:
-        signal.signal(sig, sig_handler)
-
-    # Create the name-number mapping dictionaries
-    peer_ids, subscriber_ids, talkgroup_ids = mk_aliases(CONFIG)
-    
-    
-    # INITIALIZE THE REPORTING LOOP
-    if CONFIG['REPORTS']['REPORT']:
-        report_server = config_reports(CONFIG, reportFactory)
-    else:
-        report_server = None
-        logger.info('(REPORT) TCP Socket reporting not configured')
-
-    # HBlink instance creation
-    logger.info('HBlink \'gps_data.py\' -- SYSTEM STARTING...')
-    for system in CONFIG['SYSTEMS']:
-        if CONFIG['SYSTEMS'][system]['ENABLED']:
-            if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
-                systems[system] = OPENBRIDGE(system, CONFIG, report_server)
-            else:
-                systems[system] = DATA_SYSTEM(system, CONFIG, report_server)
-                
-            reactor.listenUDP(CONFIG['SYSTEMS'][system]['PORT'], systems[system], interface=CONFIG['SYSTEMS'][system]['IP'])
-            logger.debug('%s instance created: %s, %s', CONFIG['SYSTEMS'][system]['MODE'], system, systems[system])
-
-    reactor.run()
-
-    
-# John 3:16 - For God so loved the world, that he gave his only Son,
-# that whoever believes in him should not perish but have eternal life.

gps_data_igate_beacon.py

@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-#
-###############################################################################
-#   HBLink - Copyright (C) 2020 Cortney T. Buffington, N0MJS <n0mjs@me.com>
-#   GPS/Data - Copyright (C) 2020 Eric Craw, KF7EEL <kf7eel@qsl.net>
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-###############################################################################
-
-'''
-This script uploads a beacon to APRS-IS for the GPS/Data Application itself, cuasing it to appear as an igate
-an aprs.fi.
-'''
-
-import aprslib
-import argparse
-import os
-import config
-import time
-
-parser = argparse.ArgumentParser()
-parser.add_argument('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually gps_data.cfg)')
-cli_args = parser.parse_args()
-
-if not cli_args.CONFIG_FILE:
-    cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/gps_data.cfg'
-CONFIG = config.build_config(cli_args.CONFIG_FILE)
-
-print('''
-GPS/Data Application Beacon Script by Eric, KF7EEL. https://github.com/kf7eel/hblink3 \n
-This script will upload an APRS position for the GPS/Data Application. This usually causes most APRS-IS clients to see the GPS/Data Application
-as an i-gate. \n
-Using the following setting to upload beacon.\n
-Callsign: ''' + CONFIG['GPS_DATA']['APRS_LOGIN_CALL'] + ''' - Position comment: ''' + CONFIG['GPS_DATA']['IGATE_BEACON_COMMENT'] + '''
-Beacon time: ''' + CONFIG['GPS_DATA']['IGATE_BEACON_TIME'] + '''
-''')
-
-beacon_packet = CONFIG['GPS_DATA']['APRS_LOGIN_CALL'] + '>APHBL3,TCPIP*:!' + CONFIG['GPS_DATA']['IGATE_LATITUDE'] + str(CONFIG['GPS_DATA']['IGATE_BEACON_ICON'][0]) + CONFIG['GPS_DATA']['IGATE_LONGITUDE'] + str(CONFIG['GPS_DATA']['IGATE_BEACON_ICON'][1]) + '/' + CONFIG['GPS_DATA']['IGATE_BEACON_COMMENT']
-#print(beacon_packet)
-AIS = aprslib.IS(CONFIG['GPS_DATA']['APRS_LOGIN_CALL'], passwd=CONFIG['GPS_DATA']['APRS_LOGIN_PASSCODE'],host=CONFIG['GPS_DATA']['APRS_SERVER'], port=CONFIG['GPS_DATA']['APRS_PORT'])
-
-while int(CONFIG['GPS_DATA']['IGATE_BEACON_TIME']) > 15:
-    
-    AIS.connect()
-    AIS.sendall(beacon_packet)
-    print(beacon_packet)
-    AIS.close()
-    time.sleep(int(CONFIG['GPS_DATA']['IGATE_BEACON_TIME'])*60)

gps_functions.py

@@ -1,11 +0,0 @@
-# Various configurable options used in the GPS/Data application.
-
-# SMS message that triggers command
-
-
-cmd_list = {
-
-    'COMMAND' : 'echo "command to execute"',
-    'UPTIME' : 'uptime'
-
-    }

hblink-SAMPLE.cfg

@@ -84,7 +84,7 @@ REPORT_CLIENTS: 127.0.0.1
 #   used.
 #
 [LOGGER]
-LOG_FILE: ./hblink.log
+LOG_FILE: /tmp/hblink.log
 LOG_HANDLERS: console-timed
 LOG_LEVEL: DEBUG
 LOG_NAME: HBlink
@@ -138,6 +138,23 @@ USE_ACL: True
 SUB_ACL: DENY:1
 TGID_ACL: PERMIT:ALL
 
+# USER MANAGER
+# This is where to configure the details for use with a user managment script
+[USER_MANAGER]
+THIS_SERVER_NAME: My MMDVM Server
+USE_USER_MAN: True
+# URL of the user managment server
+URL: http://localhost:8080/auth
+# Integer appended to DMR ID during the generation of a passphrase
+APPEND_INT: 1
+# Secret used to authenticate with user managment server, before checking if user login is approved
+SHARED_SECRET: test
+# Shorten passphrases to 8 characters
+SHORTEN_PASSPHRASE: False
+BURN_FILE: ./burn_ids.txt
+BURN_INT: 5
+
+
 # MASTER INSTANCES - DUPLICATE SECTION FOR MULTIPLE MASTERS
 # HomeBrew Protocol Master instances go here.
 # IP may be left blank if there's one interface on your system.
@@ -154,6 +171,10 @@ TGID_ACL: PERMIT:ALL
 [MASTER-1]
 MODE: MASTER
 ENABLED: True
+
+# Use the user manager? If False, MASTER instance will operate as normal.
+USE_USER_MAN: False
+
 REPEAT: True
 MAX_PEERS: 10
 EXPORT_AMBE: False
@@ -167,22 +188,6 @@ SUB_ACL: DENY:1
 TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL
 
-[D-APRS]
-MODE: MASTER
-ENABLED: True
-REPEAT: True
-MAX_PEERS: 2
-EXPORT_AMBE: False
-IP:
-PORT: 54070
-PASSPHRASE: passw0rd
-GROUP_HANGTIME: 5
-USE_ACL: True
-REG_ACL: DENY:1
-SUB_ACL: DENY:1
-TGID_TS1_ACL: PERMIT:ALL
-TGID_TS2_ACL: PERMIT:ALL
-
 # PEER INSTANCES - DUPLICATE SECTION FOR MULTIPLE PEERS
 # There are a LOT of errors in the HB Protocol specifications on this one!
 # MOST of these items are just strings and will be properly dealt with by the program
@@ -227,38 +232,6 @@ SUB_ACL: DENY:1
 TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL
 
-[ECHO]
-MODE: PEER
-ENABLED: True
-LOOSE: False
-EXPORT_AMBE: False
-IP: 
-PORT: 54073
-MASTER_IP: localhost
-MASTER_PORT: 54072
-passphrase: passw0rd
-CALLSIGN: ECHO
-RADIO_ID: 9999
-RX_FREQ: 000000000
-TX_FREQ: 000000000
-TX_POWER: 0
-COLORCODE: 1
-SLOTS: 1
-LATITUDE: 00.0000
-LONGITUDE: 000.0000
-HEIGHT: 0
-LOCATION: This Server
-DESCRIPTION: Echo Server
-URL: www.github.com/kf7eel/hblink3
-SOFTWARE_ID: 20170620
-PACKAGE_ID: MMDVM_HBlink
-GROUP_HANGTIME: 5
-OPTIONS:
-USE_ACL: True
-SUB_ACL: DENY:1
-TGID_TS1_ACL: PERMIT:ALL
-TGID_TS2_ACL: PERMIT:ALL
-
 [XLX-1]
 MODE: XLXPEER
 ENABLED: False

hblink.py

@@ -55,6 +55,13 @@ from reporting_const import *
 import logging
 logger = logging.getLogger(__name__)
 
+# Used for user auth
+import os, ast
+import requests, json
+import base64
+import libscrc
+
+
 # Does anybody read this stuff? There's a PEP somewhere that says I should do this.
 __author__     = 'Cortney T. Buffington, N0MJS'
 __copyright__  = 'Copyright (c) 2016-2019 Cortney T. Buffington, N0MJS and the K0USY Group'
@@ -100,6 +107,23 @@ def acl_check(_id, _acl):
     return not _acl[0]
 
 
+def download_burnlist(_CONFIG):
+    user_man_url = _CONFIG['USER_MANAGER']['URL']
+    shared_secret = str(sha256(_CONFIG['USER_MANAGER']['SHARED_SECRET'].encode()).hexdigest())
+    burn_check = {
+    'burn_list':True,
+    'secret':shared_secret
+    }
+    json_object = json.dumps(burn_check, indent = 4)
+    try:
+        req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
+        resp = json.loads(req.text)
+        return resp['burn_list']
+    # For exception, write blank dict
+    except requests.ConnectionError:
+        return {}
+
+   
 #************************************************
 #    OPENBRIDGE CLASS
 #************************************************
@@ -229,6 +253,91 @@ class HBSYSTEM(DatagramProtocol):
             self.maintenance_loop = self.peer_maintenance_loop
             self.datagramReceived = self.peer_datagramReceived
             self.dereg = self.peer_dereg
+            
+    def check_user_man(self, _id, server_name, peer_ip):
+        #Change this to a config value
+        user_man_url = self._CONFIG['USER_MANAGER']['URL']
+        shared_secret = str(sha256(self._CONFIG['USER_MANAGER']['SHARED_SECRET'].encode()).hexdigest())
+        #print(int(str(int_id(_id))[:7]))
+        auth_check = {
+        'secret':shared_secret,
+        'login_id':int(str(int_id(_id))[:7]),
+        'login_ip': peer_ip,
+        'login_server': server_name
+        }
+        json_object = json.dumps(auth_check, indent = 4)
+        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}
+
+    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']
+        shared_secret = str(sha256(self._CONFIG['USER_MANAGER']['SHARED_SECRET'].encode()).hexdigest())
+        #print(int(str(int_id(_id))[:7]))
+        auth_conf = {
+        'secret':shared_secret,
+        'login_id':int(str(int_id(_id))[:7]),
+        'login_ip': peer_ip,
+        'login_server': server_name,
+        'login_confirmed': True,
+        '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'})
+        #    resp = json.loads(req.text)
+        #return resp
+        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())
+        peer_id_trimmed = int(str(int_id(peer_id))[:7])
+        try:
+            print(self.ums_response)
+            if self.ums_response['mode'] == 'legacy':
+                _calc_hash = bhex(sha256(_salt_str+self._config['PASSPHRASE']).hexdigest())
+                calc_passphrase = self._config['PASSPHRASE']
+            if self.ums_response['mode'] == 'override':
+                _calc_hash = bhex(sha256(_salt_str+str.encode(self.ums_response['value'])).hexdigest())
+            if self.ums_response['mode'] == 'normal':
+                _new_peer_id = bytes_4(int(str(int_id(peer_id))[:7]))
+                peer_id_trimmed = str(peer_id_trimmed)
+                try:
+                    if burn_id[peer_id_trimmed]:
+                        logger.info('User ID has been burned. Requiring passphrase version: ' + str(burn_id[peer_id_trimmed]))
+                        calc_passphrase = base64.b64encode(bytes.fromhex(str(hex(libscrc.ccitt((_new_peer_id) + burn_id[peer_id_trimmed].to_bytes(2, 'big') + self._CONFIG['USER_MANAGER']['BURN_INT'].to_bytes(2, 'big') + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + burn_id[peer_id_trimmed].to_bytes(2, 'big') + self._CONFIG['USER_MANAGER']['BURN_INT'].to_bytes(2, 'big') + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8)))))[2:].zfill(4)) + (_new_peer_id) + burn_id[peer_id_trimmed].to_bytes(2, 'big') + self._CONFIG['USER_MANAGER']['BURN_INT'].to_bytes(2, 'big') + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + burn_id[peer_id_trimmed].to_bytes(2, 'big') + self._CONFIG['USER_MANAGER']['BURN_INT'].to_bytes(2, 'big') + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8)))
+                except:
+                    calc_passphrase = base64.b64encode(bytes.fromhex(str(hex(libscrc.ccitt((_new_peer_id) + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8)))))[2:].zfill(4)) + (_new_peer_id) + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8)))
+                if self._CONFIG['USER_MANAGER']['SHORTEN_PASSPHRASE'] == True:
+                    calc_passphrase = calc_passphrase[-8:]
+                if self._CONFIG['USER_MANAGER']['SHORTEN_PASSPHRASE'] == False:
+                    pass
+                _calc_hash = bhex(sha256(_salt_str+calc_passphrase).hexdigest())
+        #If exception, assume UMS down and default to calculated passphrase
+        except Exception as e:
+            logger.info('Execption, UMS possibly down')
+            _new_peer_id = bytes_4(int(str(int_id(peer_id))[:7]))
+            if peer_id_trimmed in burn_id:
+                logger.info('User ID has been burned. Requiring passphrase version: ' + str(burn_id[peer_id_trimmed]))
+                calc_passphrase = base64.b64encode(bytes.fromhex(str(hex(libscrc.ccitt((_new_peer_id) + burn_id[peer_id_trimmed].to_bytes(2, 'big') + self._CONFIG['USER_MANAGER']['BURN_INT'].to_bytes(2, 'big') + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + burn_id[peer_id_trimmed].to_bytes(2, 'big') + self._CONFIG['USER_MANAGER']['BURN_INT'].to_bytes(2, 'big') + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8)))))[2:].zfill(4)) + (_new_peer_id) + burn_id[peer_id_trimmed].to_bytes(2, 'big') + self._CONFIG['USER_MANAGER']['BURN_INT'].to_bytes(2, 'big') + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + burn_id[peer_id_trimmed].to_bytes(2, 'big') + self._CONFIG['USER_MANAGER']['BURN_INT'].to_bytes(2, 'big') + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8)))
+            else:
+                calc_passphrase = base64.b64encode(bytes.fromhex(str(hex(libscrc.ccitt((_new_peer_id) + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8)))))[2:].zfill(4)) + (_new_peer_id) + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8)))
+
+            #calc_passphrase = base64.b64encode(bytes.fromhex(str(hex(libscrc.ccitt((_new_peer_id) + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8)))))[2:].zfill(4)) + (_new_peer_id) + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + self._CONFIG['USER_MANAGER']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8)))
+            if self._CONFIG['USER_MANAGER']['SHORTEN_PASSPHRASE'] == True:
+                calc_passphrase = calc_passphrase[-8:]
+            if self._CONFIG['USER_MANAGER']['SHORTEN_PASSPHRASE'] == False:
+                pass
+            _calc_hash = bhex(sha256(_salt_str+calc_passphrase).hexdigest())
+        print(calc_passphrase)
+        #    print(_calc_hash)
+        return _calc_hash
+
 
     def startProtocol(self):
         # Set up periodic loop for tracking pings from peers. Run every 'PING_TIME' seconds
@@ -326,6 +435,7 @@ class HBSYSTEM(DatagramProtocol):
 
     # Aliased in __init__ to datagramReceived if system is a master
     def master_datagramReceived(self, _data, _sockaddr):
+        global user_db
         # Keep This Line Commented Unless HEAVILY Debugging!
         # logger.debug('(%s) RX packet from %s -- %s', self._system, _sockaddr, ahex(_data))
 
@@ -405,8 +515,23 @@ class HBSYSTEM(DatagramProtocol):
             # Check to see if we've reached the maximum number of allowed peers
             if len(self._peers) < self._config['MAX_PEERS']:
                 # Check for valid Radio ID
-                if acl_check(_peer_id, self._CONFIG['GLOBAL']['REG_ACL']) and acl_check(_peer_id, self._config['REG_ACL']):
-                    # Build the configuration data strcuture for the peer
+                #print(self.check_user_man(_peer_id))
+                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:
+                        user_auth = False
+                    print(user_auth)
+                if self._config['USE_USER_MAN'] == False:
+                   # print('False')
+                    if acl_check(_peer_id, self._CONFIG['GLOBAL']['REG_ACL']) and acl_check(_peer_id, self._config['REG_ACL']):
+                        user_auth = True
+                if user_auth == True:
+                # Build the configuration data strcuture for the peer
                     self._peers.update({_peer_id: {
                         'CONNECTION': 'RPTL-RECEIVED',
                         'CONNECTED': time(),
@@ -437,6 +562,7 @@ class HBSYSTEM(DatagramProtocol):
                     self.send_peer(_peer_id, b''.join([RPTACK, _salt_str]))
                     self._peers[_peer_id]['CONNECTION'] = 'CHALLENGE_SENT'
                     logger.info('(%s) Sent Challenge Response to %s for login: %s', self._system, int_id(_peer_id), self._peers[_peer_id]['SALT'])
+##                    print(self._peers)
                 else:
                     self.transport.write(b''.join([MSTNAK, _peer_id]), _sockaddr)
                     logger.warning('(%s) Invalid Login from %s Radio ID: %s Denied by Registation ACL', self._system, _sockaddr[0], int_id(_peer_id))
@@ -453,11 +579,27 @@ class HBSYSTEM(DatagramProtocol):
                 _this_peer['LAST_PING'] = time()
                 _sent_hash = _data[8:]
                 _salt_str = bytes_4(_this_peer['SALT'])
-                _calc_hash = bhex(sha256(_salt_str+self._config['PASSPHRASE']).hexdigest())
-                if _sent_hash == _calc_hash:
+                # Used to allow config passphrase AND calculated.
+                _ocalc_hash = bhex(sha256(_salt_str+self._config['PASSPHRASE']).hexdigest())
+                
+                #print(self.ums_response)
+                if self._config['USE_USER_MAN'] == True:
+                   # print(self.calc_passphrase(_peer_id, _salt_str))
+                    _calc_hash = self.calc_passphrase(_peer_id, _salt_str)
+                if self._config['USE_USER_MAN'] == False:
+                    _calc_hash = bhex(sha256(_salt_str+self._config['PASSPHRASE']).hexdigest())
+                # Uncomment below to only accept calculated passphrase
+#                if _sent_hash == _calc_hash:
+                # Condition below accepts either calculated passphrase or config passphrase
+                if _sent_hash == _calc_hash or _sent_hash == _ocalc_hash:
                     _this_peer['CONNECTION'] = 'WAITING_CONFIG'
                     self.send_peer(_peer_id, b''.join([RPTACK, _peer_id]))
                     logger.info('(%s) Peer %s has completed the login exchange successfully', self._system, _this_peer['RADIO_ID'])
+                    #self.send_login_conf(_peer_id, self._CONFIG['USER_MANAGER']['THIS_SERVER_NAME'], _sockaddr[0], False)
+                    if _sent_hash == _ocalc_hash:
+                        self.send_login_conf(_peer_id, self._CONFIG['USER_MANAGER']['THIS_SERVER_NAME'], _sockaddr[0], True)
+                    else:
+                        self.send_login_conf(_peer_id, self._CONFIG['USER_MANAGER']['THIS_SERVER_NAME'], _sockaddr[0], False)
                 else:
                     logger.info('(%s) Peer %s has FAILED the login exchange successfully', self._system, _this_peer['RADIO_ID'])
                     self.transport.write(b''.join([MSTNAK, _peer_id]), _sockaddr)
@@ -818,6 +960,7 @@ if __name__ == '__main__':
 
     peer_ids, subscriber_ids, talkgroup_ids = mk_aliases(CONFIG)
 
+
     # INITIALIZE THE REPORTING LOOP
     if CONFIG['REPORTS']['REPORT']:
         report_server = config_reports(CONFIG, reportFactory)
@@ -836,4 +979,8 @@ if __name__ == '__main__':
             reactor.listenUDP(CONFIG['SYSTEMS'][system]['PORT'], systems[system], interface=CONFIG['SYSTEMS'][system]['IP'])
             logger.debug('(GLOBAL) %s instance created: %s, %s', CONFIG['SYSTEMS'][system]['MODE'], system, systems[system])
 
+    # Download burn list
+    with open(CONFIG['USER_MANAGER']['BURN_FILE'], 'w') as f:
+        f.write(str(download_burnlist(CONFIG)))
+
     reactor.run()

install.sh

@@ -1,5 +0,0 @@
-#! /bin/bash
-
-# Install the required support programs
-apt-get install python3 python3-pip -y
-pip3 install -r requirements.txt

playback.cfg

@@ -1,209 +0,0 @@
-# PROGRAM-WIDE PARAMETERS GO HERE
-# PATH - working path for files, leave it alone unless you NEED to change it
-# PING_TIME - the interval that peers will ping the master, and re-try registraion
-#           - how often the Master maintenance loop runs
-# MAX_MISSED - how many pings are missed before we give up and re-register
-#           - number of times the master maintenance loop runs before de-registering a peer
-#
-# ACLs:
-#
-# Access Control Lists are a very powerful tool for administering your system.
-# But they consume packet processing time. Disable them if you are not using them.
-# But be aware that, as of now, the configuration stanzas still need the ACL
-# sections configured even if you're not using them.
-#
-# REGISTRATION ACLS ARE ALWAYS USED, ONLY SUBSCRIBER AND TGID MAY BE DISABLED!!!
-#
-# The 'action' May be PERMIT|DENY
-# Each entry may be a single radio id, or a hypenated range (e.g. 1-2999)
-# Format:
-# 	ACL = 'action:id|start-end|,id|start-end,....'
-#		--for example--
-#	SUB_ACL: DENY:1,1000-2000,4500-60000,17
-#
-# ACL Types:
-# 	REG_ACL: peer radio IDs for registration (only used on HBP master systems)
-# 	SUB_ACL: subscriber IDs for end-users
-# 	TGID_TS1_ACL: destination talkgroup IDs on Timeslot 1
-# 	TGID_TS2_ACL: destination talkgroup IDs on Timeslot 2
-#
-# ACLs may be repeated for individual systems if needed for granularity
-# Global ACLs will be processed BEFORE the system level ACLs
-# Packets will be matched against all ACLs, GLOBAL first. If a packet 'passes'
-# All elements, processing continues. Packets are discarded at the first
-# negative match, or 'reject' from an ACL element.
-#
-# If you do not wish to use ACLs, set them to 'PERMIT:ALL'
-# TGID_TS1_ACL in the global stanza is used for OPENBRIDGE systems, since all
-# traffic is passed as TS 1 between OpenBridges
-[GLOBAL]
-PATH: ./
-PING_TIME: 5
-MAX_MISSED: 3
-USE_ACL: True
-REG_ACL: PERMIT:ALL
-SUB_ACL: DENY:1
-TGID_TS1_ACL: PERMIT:ALL
-TGID_TS2_ACL: PERMIT:ALL
-
-
-# NOT YET WORKING: NETWORK REPORTING CONFIGURATION
-#   Enabling "REPORT" will configure a socket-based reporting
-#   system that will send the configuration and other items
-#   to a another process (local or remote) that may process
-#   the information for some useful purpose, like a web dashboard.
-#
-#   REPORT - True to enable, False to disable
-#   REPORT_INTERVAL - Seconds between reports
-#   REPORT_PORT - TCP port to listen on if "REPORT_NETWORKS" = NETWORK
-#   REPORT_CLIENTS - comma separated list of IPs you will allow clients
-#       to connect on. Entering a * will allow all.
-#
-# ****FOR NOW MUST BE TRUE - USE THE LOOPBACK IF YOU DON'T USE THIS!!!****
-[REPORTS]
-REPORT: True
-REPORT_INTERVAL: 60
-REPORT_PORT: 4322
-REPORT_CLIENTS: 127.0.0.1
-
-
-# SYSTEM LOGGER CONFIGURAITON
-#   This allows the logger to be configured without chaning the individual
-#   python logger stuff. LOG_FILE should be a complete path/filename for *your*
-#   system -- use /dev/null for non-file handlers.
-#   LOG_HANDLERS may be any of the following, please, no spaces in the
-#   list if you use several:
-#       null
-#       console
-#       console-timed
-#       file
-#       file-timed
-#       syslog
-#   LOG_LEVEL may be any of the standard syslog logging levels, though
-#   as of now, DEBUG, INFO, WARNING and CRITICAL are the only ones
-#   used.
-#
-[LOGGER]
-LOG_FILE: /tmp/hb-playback.log
-LOG_HANDLERS: console
-LOG_LEVEL: DEBUG
-LOG_NAME: HBlink3 Playback
-
-# DOWNLOAD AND IMPORT SUBSCRIBER, PEER and TGID ALIASES
-# Ok, not the TGID, there's no master list I know of to download
-# This is intended as a facility for other applcations built on top of
-# HBlink to use, and will NOT be used in HBlink directly.
-# STALE_DAYS is the number of days since the last download before we
-# download again. Don't be an ass and change this to less than a few days.
-[ALIASES]
-TRY_DOWNLOAD: False
-PATH: ./
-PEER_FILE: peer_ids.json
-SUBSCRIBER_FILE: subscriber_ids.json
-TGID_FILE: talkgroup_ids.json
-PEER_URL: https://www.radioid.net/static/rptrs.json
-SUBSCRIBER_URL: https://www.radioid.net/static/users.json
-STALE_DAYS: 7
-
-# OPENBRIDGE INSTANCES - DUPLICATE SECTION FOR MULTIPLE CONNECTIONS
-# OpenBridge is a protocol originall created by DMR+ for connection between an
-# IPSC2 server and Brandmeister. It has been implemented here at the suggestion
-# of the Brandmeister team as a way to legitimately connect HBlink to the
-# Brandemiester network.
-# It is recommended to name the system the ID of the Brandmeister server that
-# it connects to, but is not necessary. TARGET_IP and TARGET_PORT are of the
-# Brandmeister or IPSC2 server you are connecting to. PASSPHRASE is the password
-# that must be agreed upon between you and the operator of the server you are
-# connecting to. NETWORK_ID is a number in the format of a DMR Radio ID that
-# will be sent to the other server to identify this connection.
-# other parameters follow the other system types.
-#
-# ACLs:
-# OpenBridge does not 'register', so registration ACL is meaningless.
-# OpenBridge passes all traffic on TS1, so there is only 1 TGID ACL.
-# Otherwise ACLs work as described in the global stanza
-#[OBP-1]
-#MODE: OPENBRIDGE
-#ENABLED: True
-#IP:
-#PORT: 62035
-#NETWORK_ID: 3129100
-#PASSPHRASE: password
-#TARGET_IP: 1.2.3.4
-#TARGET_PORT: 62035
-#USE_ACL: True
-#SUB_ACL: DENY:1
-#TGID_ACL: PERMIT:ALL
-
-# MASTER INSTANCES - DUPLICATE SECTION FOR MULTIPLE MASTERS
-# HomeBrew Protocol Master instances go here.
-# IP may be left blank if there's one interface on your system.
-# Port should be the port you want this master to listen on. It must be unique
-# and unused by anything else.
-# Repeat - if True, the master repeats traffic to peers, False, it does nothing.
-#
-# MAX_PEERS -- maximun number of peers that may be connect to this master
-# at any given time. This is very handy if you're allowing hotspots to
-# connect, or using a limited computer like a Raspberry Pi.
-#
-# ACLs:
-# See comments in the GLOBAL stanza
-[MASTER]
-MODE: MASTER
-ENABLED: True
-REPEAT: True
-MAX_PEERS: 1
-EXPORT_AMBE: False
-IP:
-PORT: 54072
-PASSPHRASE: passw0rd
-GROUP_HANGTIME: 5
-USE_ACL: True
-REG_ACL: DENY:1
-SUB_ACL: DENY:1
-TGID_TS1_ACL: PERMIT:ALL
-TGID_TS2_ACL: PERMIT:ALL
-
-# PEER INSTANCES - DUPLICATE SECTION FOR MULTIPLE PEERS
-# There are a LOT of errors in the HB Protocol specifications on this one!
-# MOST of these items are just strings and will be properly dealt with by the program
-# The TX & RX Frequencies are 9-digit numbers, and are the frequency in Hz.
-# Latitude is an 8-digit unsigned floating point number.
-# Longitude is a 9-digit signed floating point number.
-# Height is in meters
-# Setting Loose to True relaxes the validation on packets received from the master.
-# This will allow HBlink to connect to a non-compliant system such as XLXD, DMR+ etc.
-#
-# ACLs:
-# See comments in the GLOBAL stanza
-#[REPEATER-1]
-#MODE: PEER
-#ENABLED: True
-#LOOSE: False
-#EXPORT_AMBE: False
-#IP: 
-#PORT: 54001
-#MASTER_IP: 172.16.1.1
-#MASTER_PORT: 54000
-#PASSPHRASE: homebrew
-#CALLSIGN: W1ABC
-#RADIO_ID: 312000
-#RX_FREQ: 449000000
-#TX_FREQ: 444000000
-#TX_POWER: 25
-#COLORCODE: 1
-#SLOTS: 1
-#LATITUDE: 38.0000
-#LONGITUDE: -095.0000
-#HEIGHT: 75
-#LOCATION: Anywhere, USA
-#DESCRIPTION: This is a cool repeater
-#URL: www.w1abc.org
-#SOFTWARE_ID: 20170620
-#PACKAGE_ID: MMDVM_HBlink
-#GROUP_HANGTIME: 5
-#OPTIONS:
-#USE_ACL: True
-#SUB_ACL: DENY:1
-#TGID_TS1_ACL: PERMIT:ALL
-#TGID_TS2_ACL: PERMIT:ALL

playback.py

@@ -169,13 +169,13 @@ if __name__ == '__main__':
 
     # CLI argument parser - handles picking up the config file from the command line, and sending a "help" message
     parser = argparse.ArgumentParser()
-    parser.add_argument('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually playback.cfg)')
+    parser.add_argument('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually hblink.cfg)')
     parser.add_argument('-l', '--logging', action='store', dest='LOG_LEVEL', help='Override config file logging level.')
     cli_args = parser.parse_args()
 
     # Ensure we have a path for the config file, if one wasn't specified, then use the default (top of file)
     if not cli_args.CONFIG_FILE:
-        cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/playback.cfg'
+        cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/hblink.cfg'
 
     # Call the external routine to build the configuration dictionary
     CONFIG = config.build_config(cli_args.CONFIG_FILE)

requirements.txt

@@ -3,8 +3,3 @@ bitarray>=0.8.1
 Twisted>=16.3.0
 dmr_utils3>=0.1.19
 configparser>=3.0.0
-aprslib
-pynmea2
-maidenhead
-flask
-smtplib

rules_SAMPLE.py

@@ -33,17 +33,17 @@ configuration file.
 '''
 
 BRIDGES = {
-##    'ENGLISH': [
-##            {'SYSTEM': 'CHANGE_ME-1',    'TS': 1, 'TGID': 13,   'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [3,], 'OFF': [8,10], 'RESET': []},
-##            {'SYSTEM': 'CHANGE_ME-2',    'TS': 1, 'TGID': 13,   'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [3,], 'OFF': [8,10], 'RESET': []},
-##        ],
-##    'STATEWIDE': [
-##            {'SYSTEM': 'CHANGE_ME-1',    'TS': 2, 'TGID': 3129, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [4,], 'OFF': [7,10], 'RESET': []},
-##            {'SYSTEM': 'CHANGE_ME-2',    'TS': 2, 'TGID': 3129, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [4,], 'OFF': [7,10], 'RESET': []},
-##        ],
-    'ECHO': [
-            {'SYSTEM': 'MASTER-1',    'TS': 2, 'TGID': 9999,    'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'ON',  'ON': [9999,], 'OFF': [9,10], 'RESET': []},
-            {'SYSTEM': 'ECHO',    'TS': 2, 'TGID': 9999, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'ON',  'ON': [9999,], 'OFF': [9,10], 'RESET': []},
+    'WORLDWIDE': [
+            {'SYSTEM': 'MASTER-1',    'TS': 1, 'TGID': 1,    'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'ON',  'ON': [2,], 'OFF': [9,10], 'RESET': []},
+            {'SYSTEM': 'CLIENT-1',    'TS': 1, 'TGID': 3100, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'ON',  'ON': [2,], 'OFF': [9,10], 'RESET': []},
+        ],
+    'ENGLISH': [
+            {'SYSTEM': 'MASTER-1',    'TS': 1, 'TGID': 13,   'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [3,], 'OFF': [8,10], 'RESET': []},
+            {'SYSTEM': 'CLIENT-2',    'TS': 1, 'TGID': 13,   'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [3,], 'OFF': [8,10], 'RESET': []},
+        ],
+    'STATEWIDE': [
+            {'SYSTEM': 'MASTER-1',    'TS': 2, 'TGID': 3129, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [4,], 'OFF': [7,10], 'RESET': []},
+            {'SYSTEM': 'CLIENT-2',    'TS': 2, 'TGID': 3129, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [4,], 'OFF': [7,10], 'RESET': []},
         ]
 }
 
@@ -51,29 +51,7 @@ BRIDGES = {
 list the names of each system that should bridge unit to unit (individual) calls.
 '''
 
-UNIT = ['MASTER-1', 'CHANGE_ME']
-
-'''
-Unit Call flood timeout:
-The amount of time to keep sending private calls to a single system before
-flooding all systems with the call. A higher value should be set for systems where subscribers
-are not moving between systems often. A lower value should be set for systems that have subscribers
-moving between systems often.
-
-Time is in minutes.
-'''
-UNIT_TIME = 1
-
-'''
-Input the DMR ID and SYSTEM of a subscriber that you would like to have always have private calls routed.
-This will not flood all systems.
-'''
-STATIC_UNIT = [
-#    [ 456, 'CLIENT-1'],
-#    [ 123, 'MASTER-1'],
-     [ 9099, 'D-APRS']
-    ]
-
+UNIT = ['ONE', 'TWO']
 
 '''
 This is for testing the syntax of the file. It won't eliminate all errors, but running this file
@@ -84,4 +62,3 @@ if __name__ == '__main__':
     from pprint import pprint
     pprint(BRIDGES)
     print(UNIT)
-    print(STATIC_UNIT)

scripts/dashboard/dashboard.py

@@ -1,130 +0,0 @@
-###############################################################################
-#   HBLink - Copyright (C) 2020 Cortney T. Buffington, N0MJS <n0mjs@me.com>
-#   GPS/Data - Copyright (C) 2020 Eric Craw, KF7EEL <kf7eel@qsl.net>
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-###############################################################################
-
-'''
-This is a web dashboard for the GPS/Data application.
-'''
-
-from flask import Flask, render_template
-import ast, os
-from dashboard_settings import *
-
-app = Flask(__name__)
-
-
-tbl_hdr = '''
-<table style="border-color: black; margin-left: auto; margin-right: auto;" border="2" cellspacing="6" cellpadding="2"><tbody>
-'''
-tbl_ftr = '''
-</tbody>
-</table>
-'''
-
-def get_loc_data():
-    try:
-        dash_loc = ast.literal_eval(os.popen('cat /tmp/gps_data_user_loc.txt').read())
-        tmp_loc = ''
-        loc_hdr = '''
-    <tr>
-    <td style="text-align: center;">
-    <h2><strong>&nbsp;Callsign&nbsp;</strong></h2>
-    </td>
-    <td style="text-align: center;">
-    <h2>&nbsp;<strong>Latitude</strong>&nbsp; </h2>
-    </td>
-    <td style="text-align: center;">
-    <h2>&nbsp;<strong>Longitude</strong>&nbsp;</h2>
-    </td>
-    <td style="text-align: center;">
-    <h2>&nbsp;<strong>Local Time</strong>&nbsp;</h2>
-    </td>
-    </tr>
-    '''
-        for e in dash_loc:
-            tmp_loc = tmp_loc + '''<tr>
-    <td style="text-align: center;"><a href="https://aprs.fi/''' + e['call'] + '''"><strong>''' + e['call'] + '''</strong></a></td>
-    <td style="text-align: center;"><strong>&nbsp;''' + str(e['lat']) + '''&nbsp;</strong></td>
-    <td style="text-align: center;"><strong>&nbsp;''' + str(e['lon']) + '''&nbsp;</strong></td>
-    <td style="text-align: center;">&nbsp;''' + e['time'] + '''&nbsp;</td>
-    </tr>'''
-        return str(str('<h1 style="text-align: center;">Positions Received</h1>') + tbl_hdr + loc_hdr + tmp_loc + tbl_ftr)
-    except:
-        return str('<h1 style="text-align: center;">No data</h1>')
-
-
-def get_bb_data():
-    try:
-        dash_bb = ast.literal_eval(os.popen('cat /tmp/gps_data_user_bb.txt').read())
-        tmp_bb = ''
-        
-        bb_hdr = '''
-    <tr>
-    <td style="text-align: center;">
-    <h2><strong>&nbsp;Callsign&nbsp;</strong></h2>
-    </td>
-    <td style="text-align: center;">
-    <h2>&nbsp;<strong>DMR ID</strong>&nbsp; </h2>
-    </td>
-    <td style="text-align: center;">
-    <h2>&nbsp;<strong>Bulletin</strong>&nbsp;</h2>
-    </td>
-    <td style="text-align: center;">
-    <h2>&nbsp;<strong>Local Time</strong>&nbsp;</h2>
-    </td>
-    </tr>
-    '''
-        
-        for e in dash_bb:
-            tmp_bb = tmp_bb + '''<tr>
-    <td style="text-align: center;"><strong>&nbsp;''' + e['call'] + '''&nbsp;</strong></td>
-    <td style="text-align: center;">''' + str(e['dmr_id']) + '''</td>
-    <td style="text-align: center;"><strong>&nbsp;''' + e['bulliten'] + '''&nbsp;</strong></td>
-    <td style="text-align: center;">&nbsp;''' + e['time'] + '''&nbsp;</td>
-    </tr>'''
-
-        return str('<h1 style="text-align: center;">Bulletin Board</h1>' + tbl_hdr + bb_hdr + tmp_bb + tbl_ftr)
-    except:
-        return str('<h1 style="text-align: center;">No data</h1>')
-
-@app.route('/')
-def index():
-    #return get_data()
-    return render_template('index.html', title = dashboard_title, logo = logo)
-@app.route('/bulletin_board')
-def dash_bb():
-    return get_bb_data()
-    #return render_template('index.html', data = str(get_data()))
-@app.route('/positions')
-def dash_loc():
-    return get_loc_data()
-    #return render_template('index.html', data = str(get_data()))
-##@app.route('/<string:page_name>/')
-##def render_static(page_name):
-##    return render_template('%s.html' % page_name, title = dashboard_title, logo = logo, description = description)
-@app.route('/help/')
-def help():
-    #return get_data()
-    return render_template('help.html', title = dashboard_title, logo = logo, description = description, data_call_type = data_call_type, data_call_id = data_call_id, aprs_ssid = aprs_ssid)
-@app.route('/about/')
-def about():
-    #return get_data()
-    return render_template('about.html', title = dashboard_title, logo = logo, contact_name = contact_name, contact_call = contact_call, contact_email = contact_email, contact_website = contact_website)
-
-if __name__ == '__main__':
-    app.run(debug = True, port=dash_port, host=dash_host)

scripts/dashboard/dashboard_settings-SAMPLE.py

@@ -1,49 +0,0 @@
-###############################################################################
-#   HBLink - Copyright (C) 2020 Cortney T. Buffington, N0MJS <n0mjs@me.com>
-#   GPS/Data - Copyright (C) 2020 Eric Craw, KF7EEL <kf7eel@qsl.net>
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-###############################################################################
-
-'''
-Settings for web dashboard.
-'''
-
-# Title of the Dashboard
-dashboard_title = 'HBLink3 D-APRS Dashboard'
-# Logo used on dashboard page
-logo = 'https://raw.githubusercontent.com/kf7eel/hblink3/gps/HBlink.png'
-# Port to run server
-dash_port = 8092
-# IP to run server on
-dash_host = '127.0.0.1'
-#Description of dashboard to show on main page
-description = '''
-Welcome to the ''' + dashboard_title + '''.
-'''
-# The following will generate a help page for your users.
-
-# Data call type
-data_call_type = 'Private Call'
-# DMR ID of GPS/Data application
-data_call_id = '9099'
-# Default APRS ssid
-aprs_ssid = '15'
-
-# Gateway contact info displayed on about page.
-contact_name = 'your name'
-contact_call = 'N0CALL'
-contact_email = 'email@example.org'
-contact_website = 'https://hbl.ink'

scripts/dashboard/templates/about.html

@@ -1,28 +0,0 @@
-{% include 'page.html' %}
-{% include 'header.html' %}
-{{description}}
-<p>&nbsp;</p>
-<p>Contact information for this gateway.</p>
-<table style="margin-left: auto; margin-right: auto;" border="black">
-<tbody>
-<tr>
-<td><strong>Name</strong></td>
-<td>{{contact_name}} </td>
-</tr>
-<tr>
-<td><strong>Callsign</strong></td>
-<td>&nbsp;{{contact_call}}</td>
-</tr>
-<tr>
-<td><strong>E-Mail</strong></td>
-<td>&nbsp;{{contact_email}}</td>
-</tr>
-<tr>
-<td><strong>Website</strong></td>
-<td>&nbsp;{{contact_website}}</td>
-</tr>
-</tbody>
-</table>
-<p>&nbsp;</p>
-{% include 'footer.html' %}
-

scripts/dashboard/templates/footer.html

@@ -1,5 +0,0 @@
-<div>
-<hr />
-<div style="text-align: center;">Dashboard created by KF7EEL - <a href="https://github.com/kf7eel/hblink3">https://github.com/kf7eel/hblink3</a><br />HBLink created by N0MJS.<br /><a href="https://github.com/HBLink-org">HBLink GitHub page</a><br />This is branch: <strong>gps<strong></div>
-</body>
- </html>

scripts/dashboard/templates/header.html

@@ -1,13 +0,0 @@
-<p><img style="display: block; margin-left: auto; margin-right: auto;" src="{{logo}}" alt="Logo" width="300" height="144" /></p>
-<h1 style="text-align: center;">{{title}}</h1>
-<hr />
-<table style="width: 500px; margin-left: auto; margin-right: auto;" border="black" cellspacing="3" cellpadding="3">
-<tbody>
-<tr>
-<td style="text-align: center;"><button onclick="window.location.href='/';"> D-APRS Dashboard </button></td>
-<td style="text-align: center;"><button onclick="window.location.href='/help';"> D-APRS Help </button></td>
-<td style="text-align: center;"><button onclick="window.location.href='/about';"> Gateway Contact </button></td>
-</tr>
-</tbody>
-</table>
-<hr />

scripts/dashboard/templates/help.html

@@ -1,79 +0,0 @@
-{% include 'page.html' %}
-{% include 'header.html' %}
-<h2 style="text-align: center;">Attention:</h2>
-<p><span style="color: #ff0000;"><strong>Please be aware that many (if not all) DMR radios DO NOT transmit your callsign when sending a GPS position. It is your responsibility to identify your station per the regulations of your country.</strong></span></p>
-<p>&nbsp;</p>
-<p>{{description}}</p>
-<p>Configure your radio to send GPS positions with the following settings:</p>
-<table style="margin-left: auto; margin-right: auto;" border="black">
-<tbody>
-<tr>
-<td style="text-align: center;"><strong>Data Call Type</strong></td>
-<td style="text-align: center;"><strong>DMR ID</strong></td>
-</tr>
-<tr>
-<td style="text-align: center;">&nbsp;{{data_call_type}}</td>
-<td style="text-align: center;">&nbsp;{{data_call_id}}</td>
-</tr>
-</tbody>
-</table>
-<p>&nbsp;</p>
-<p>When a position is received by this gateway, it will extract the coordinates and create an APRS position packet. This gateway will find your callsign based your radio's DMR ID. It is essential to have your information up to date with <a href="https://radioid.net/">RadioID.net</a>. A predefined APRS SSID of <strong>{{aprs_ssid}}</strong> is appended your callsign. The APRS location packet is then uploaded to APRS-IS. No setup or account creation is required beforehand. This is pretty much "plug and play."</p>
-<p>For example, N0CALL has a DMR ID of 1234567. N0CALL's radio sends a position to this gateway with the call type settings above. This gateway will query the <a href="https://radioid.net/">RadioID.net</a> database for DMR ID 1234567. The result will be an APRS location packet with APRS SSID&nbsp;{{aprs_ssid}}. </p>
-<p>You can change the default APRS settings for your radio via SMS.</p>
-<h2 style="text-align: center;">Commands</h2>
-<table style="margin-left: auto; margin-right: auto;" border="black">
-<tbody>
-<tr>
-<td style="text-align: center;">
-<h4><strong>Command</strong></h4>
-</td>
-<td style="text-align: center;">
-<h4><strong>Description</strong></h4>
-</td>
-<td style="text-align: center;">
-<h4><strong>Example</strong></h4>
-</td>
-</tr>
-<tr>
-<td><strong>@COM</strong></td>
-<td>Change the comment of the APRS.</td>
-<td><em><code>@COM This is a test comment.</code></em></td>
-</tr>
-<tr>
-<td><strong>@ICON</strong></td>
-<td>Change the icon of the APRS position. *See <a href="http://aprs.net/vm/DOS/SYMBOLS.HTM" rel="nofollow">http://aprs.net/vm/DOS/SYMBOLS.HTM</a> for icon list.</td>
-<td><em><code>@ICON /p</code></em></td>
-</tr>
-<tr>
-<td><strong>@SSID</strong></td>
-<td>Change SSID of your callsign.</td>
-<td><em><code>@SSID 7</code></em></td>
-</tr>
-<tr>
-<td><strong>@MH</strong></td>
-<td>Set you location by maidenhead grid square. Designed for radios with no GPS or that are not compatable yet.</td>
-<td><em><code>@MH DN97uk</code></em></td>
-</tr>
-<tr>
-<td><strong>@BB</strong></td>
-<td>Post a bulliten to the web dashboard.</td>
-<td><em><code>@BB This is a test bulletin.</code></em></td>
-</tr>
-<tr>
-<td><strong>@[CALLSIGN W/ SSID] A-[MESSAGE]</strong></td>
-<td>Send a message to another station via APRS.</td>
-<td><em><code>@N0CALL-15 A-This is a test.</code></em></td>
-</tr>
-<tr>
-<td><strong>[EMAIL ADDRESS] E-[MESSAGE]</strong></td>
-<td>Send an email to an email address.</td>
-<td><em><code>test@example.org E-This is a test.</code></em></td>
-</tr>  
-</tbody>
-</table>
-<p>&nbsp;</p>
-<p><strong>Commands should be in upper case.</strong> Send an SMS to <strong>{{data_call_id}}</strong> as a <strong>{{data_call_type}}</strong> with the desired command followed by the value. For example, to change your icon to a dog, the command would be <code>@ICON /p</code> (see the icon table for values). Changing your SSID is as simple as <code>@SSID 7</code>, and <code>@COM Testing 123</code> will change the comment.</p>
-<p>Sending <code>@BB Test</code> will result in a post to the bulletin board with the messaage of "Test".</p>
-<p><strong>To remove any of the stored values, just send the appropriate command without any input.</strong> <code>@COM</code> will remove the stored comment, <code>@ICON</code> will remove the stored icon, and <code>@ICON</code> will remove the strored icon. Any position reports sent will have the default settings.</p>
-{% include 'footer.html' %}

scripts/dashboard/templates/index.html

@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="refresh" content="120" > 
-    <title>{{title}}</title>
-    <style>
-body {background-color: D3D3D3;}
-h1   {color: green;}
-p {
-  padding: 10px;
-  margin: 20px;
-
-}
-.content {
-  max-width: 1200px;
-  min-width: 1200px;
-  margin: auto;
-}
-</style>
-</head>
-<div class="content">
-<body>
-{% include 'header.html' %}
-<p style="text-align: center;"><em>Page automatically reloads every 2 minutes.</em></p>
-<table>
-<tbody>
-<tr>
-<td><div><p align="center"><iframe style="border: none;" title="Bulletin Board" src="bulletin_board" width="480" height="950"></iframe></p></div></td>
-<td><div>
-<p align="center"><iframe style="border: none;" title="Positions Received" src="positions" width="620" height="950"></iframe></p>
-</div></td>
-</tr>
-</tbody>
-</table>
- {% include 'footer.html' %}
-

scripts/dashboard/templates/page.html

@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>{{title}}</title>
-    <style>
-body {background-color: D3D3D3;}
-h1   {color: green;}
-p {
-  padding: 10px;
-  margin: 20px;
-
-}
-.content {
-  max-width: 1200px;
-  min-width: 1200px;
-  margin: auto;
-}
-</style>
-</head>
-<div class="content">
-<body>

user_managment/config-SAMPLE.py

@@ -0,0 +1,62 @@
+
+'''
+Settings for user management portal.
+'''
+# Database location
+db_location = 'sqlite:///./users.db'
+
+# Legacy passphrase used in hblink.cfg
+legacy_passphrase = 'passw0rd'
+
+# Trim passphrases to 8 characters
+use_short_passphrase = False
+
+# Title of the Dashboard
+title = 'MMDVM User Portal'
+# Port to run server
+ums_port = 8080
+# IP to run server on
+ums_host = '127.0.0.1'
+
+url = 'http://localhost:8080'
+
+append_int = 1
+
+shared_secrets = ['test']
+
+
+burn_int = 5
+
+legacy_passphrase = 'passw0rd'
+
+# Email settings
+MAIL_SERVER = 'smtp.gmail.com'
+MAIL_PORT = 465
+MAIL_USE_SSL = True
+MAIL_USE_TLS = False
+MAIL_USERNAME = 'app@gmail.com'
+MAIL_PASSWORD = 'password'
+MAIL_DEFAULT_SENDER = '"' + title + '" <app@gmail.com>'
+
+# UMS settings
+secret_key = 'SUPER SECRET LONG KEY'
+
+USER_ENABLE_EMAIL = True
+USER_ENABLE_USERNAME = True    # Enable username authentication
+USER_REQUIRE_RETYPE_PASSWORD = True    # Simplify register form
+USER_ENABLE_CHANGE_USERNAME = False
+USER_ENABLE_MULTIPLE_EMAILS = True
+USER_ENABLE_CONFIRM_EMAIL = True
+USER_ENABLE_REGISTER = True
+USER_AUTO_LOGIN_AFTER_CONFIRM = False
+USER_SHOW_USERNAME_DOES_NOT_EXIST = True
+
+# Gateway contact info displayed on about page.
+contact_name = 'your name'
+contact_call = 'N0CALL'
+contact_email = 'email@example.org'
+contact_website = 'https://hbl.ink'
+
+# Time format for display
+time_format = '%H:%M:%S - %m/%d/%y'
+

user_managment/gen_script_template-SAMPLE.py

@@ -0,0 +1,5 @@
+def gen_script(dmr_id, passphrase):
+    script = '''
+DMR ID: ''' + str(dmr_id) + ''' \n Passphrase: ''' + str(passphrase) + '''
+'''
+    return script

user_managment/templates/flask_user/edit_user_profile.html

@@ -0,0 +1,30 @@
+{% extends 'flask_user/_authorized_base.html' %}
+
+{% block content %}
+{% from "flask_user/_macros.html" import render_field, render_checkbox_field, render_submit_field %}
+<h1>{%trans%}User profile{%endtrans%}</h1>
+
+<form action="" method="POST" class="form" role="form">
+    {{ form.hidden_tag() }}
+    {% for field in form %}
+        {% if not field.flags.hidden %}
+            {% if field.type=='SubmitField' %}
+                {{ render_submit_field(field, tabindex=loop.index*10) }}
+            {% else %}
+                {{ render_field(field, tabindex=loop.index*10) }}
+            {% endif %}
+        {% endif %}
+    {% endfor %}
+</form>
+<br/>
+<p><a href="../update_ids"><strong>Update your information from RadioID.net</strong></a></p>
+{% if not user_manager.USER_ENABLE_AUTH0 %}
+    {% if user_manager.USER_ENABLE_CHANGE_USERNAME %}
+        <p><a href="{{ url_for('user.change_username') }}">{%trans%}Change username{%endtrans%}</a></p>
+    {% endif %}
+    {% if user_manager.USER_ENABLE_CHANGE_PASSWORD %}
+        <p><a href="{{ url_for('user.change_password') }}">{%trans%}Change password{%endtrans%}</a></p>
+    {% endif %}
+{% endif %}
+
+{% endblock %}

user_managment/templates/flask_user/emails/base_message.html

@@ -0,0 +1,8 @@
+<p>Dear {{ user.email }} - {{ user.username }},</p>
+
+{% block message %}
+{% endblock %}
+
+<p>Sincerely,<br/>
+{{ app_name }}
+</p>

user_managment/templates/flask_user/login.html

@@ -0,0 +1,69 @@
+{% extends 'flask_user/_public_base.html' %}
+
+{% block content %}
+{% from "flask_user/_macros.html" import render_field, render_checkbox_field, render_submit_field %}
+<h1>{%trans%}Sign in{%endtrans%}</h1>
+<p>&nbsp;</p>
+
+<strong>Your username MUST be your callsign or email address.</strong>
+<p>&nbsp;</p>
+
+<form action="" method="POST" class="form" role="form">
+    {{ form.hidden_tag() }}
+
+    {# Username or Email field #}
+    {% set field = form.username if user_manager.USER_ENABLE_USERNAME else form.email %}
+    <div class="form-group {% if field.errors %}has-error{% endif %}">
+        {# Label on left, "New here? Register." on right #}
+        <div class="row">
+            <div class="col-xs-6">
+                <label for="{{ field.id }}" class="control-label">{{ field.label.text }}</label>
+            </div>
+            <div class="col-xs-6 text-right">
+                {% if user_manager.USER_ENABLE_REGISTER and not user_manager.USER_REQUIRE_INVITATION %}
+                    <a href="{{ url_for('user.register') }}" tabindex='190'>
+                        {%trans%}New here? Register.{%endtrans%}</a>
+                {% endif %}
+            </div>
+        </div>
+        {{ field(class_='form-control', tabindex=110) }}
+        {% if field.errors %}
+            {% for e in field.errors %}
+                <p class="help-block">{{ e }}</p>
+            {% endfor %}
+        {% endif %}
+    </div>
+
+    {# Password field #}
+    {% set field = form.password %}
+    <div class="form-group {% if field.errors %}has-error{% endif %}">
+        {# Label on left, "Forgot your Password?" on right #}
+        <div class="row">
+            <div class="col-xs-6">
+                <label for="{{ field.id }}" class="control-label">{{ field.label.text }}</label>
+            </div>
+            <div class="col-xs-6 text-right">
+                {% if user_manager.USER_ENABLE_FORGOT_PASSWORD %}
+                    <a href="{{ url_for('user.forgot_password') }}" tabindex='195'>
+                        {%trans%}Forgot your Password?{%endtrans%}</a>
+                {% endif %}
+            </div>
+        </div>
+        {{ field(class_='form-control', tabindex=120) }}
+        {% if field.errors %}
+            {% for e in field.errors %}
+                <p class="help-block">{{ e }}</p>
+            {% endfor %}
+        {% endif %}
+    </div>
+
+    {# Remember me #}
+    {% if user_manager.USER_ENABLE_REMEMBER_ME %}
+    {{ render_checkbox_field(login_form.remember_me, tabindex=130) }}
+    {% endif %}
+
+    {# Submit button #}
+    {{ render_submit_field(form.submit, tabindex=180) }}
+</form>
+
+{% endblock %}

user_managment/templates/flask_user/register.html

@@ -0,0 +1,50 @@
+{% extends 'flask_user/_public_base.html' %}
+
+{% block content %}
+{% from "flask_user/_macros.html" import render_field, render_submit_field %}
+<h1>{%trans%}Register{%endtrans%}</h1>
+<p>&nbsp;</p>
+
+<strong>Your username MUST be your callsign.</strong> After filling out the fields, a confirmation link will be emailed to you.
+<p>&nbsp;</p>
+
+<form action="" method="POST" novalidate formnovalidate class="form" role="form">
+    {{ form.hidden_tag() }}
+
+    {# Username or Email #}
+    {% set field = form.username if user_manager.USER_ENABLE_USERNAME else form.email %}
+    <div class="form-group {% if field.errors %}has-error{% endif %}">
+        {# Label on left, "Already registered? Sign in." on right #}
+        <div class="row">
+            <div class="col-xs-6">
+                <label for="{{ field.id }}" class="control-label">{{ field.label.text }}</label>
+            </div>
+            <div class="col-xs-6 text-right">
+                {% if user_manager.USER_ENABLE_REGISTER %}
+                    <a href="{{ url_for('user.login') }}" tabindex='290'>
+                        {%trans%}Already registered? Sign in.{%endtrans%}</a>
+                {% endif %}
+            </div>
+        </div>
+        {{ field(class_='form-control', tabindex=210) }}
+        {% if field.errors %}
+            {% for e in field.errors %}
+                <p class="help-block">{{ e }}</p>
+            {% endfor %}
+        {% endif %}
+    </div>
+
+    {% if user_manager.USER_ENABLE_EMAIL and user_manager.USER_ENABLE_USERNAME %}
+        {{ render_field(form.email, tabindex=220) }}
+    {% endif %}
+
+    {{ render_field(form.password, tabindex=230) }}
+
+    {% if user_manager.USER_REQUIRE_RETYPE_PASSWORD %}
+        {{ render_field(form.retype_password, tabindex=240) }}
+    {% endif %}
+
+    {{ render_submit_field(form.submit, tabindex=280) }}
+</form>
+
+{% endblock %}

user_managment/templates/flask_user_layout.html

@@ -0,0 +1,147 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{{ user_manager.USER_APP_NAME }}</title>
+
+    <!-- Bootstrap -->
+    <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- In-lining styles to avoid needing a separate .css file -->
+    <style>
+        hr { border-color: #cccccc; margin: 0; }
+        .no-margins { margin: 0px; }
+        .with-margins { margin: 10px; }
+        .col-centered { float: none; margin: 0 auto; }
+    </style>
+
+    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7/html5shiv.js"></script>
+      <script src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.js"></script>
+    <![endif]-->
+
+    {# *** Allow sub-templates to insert extra html to the head section *** #}
+    {% block extra_css %}{% endblock %}
+  </head>
+
+
+<body>
+<h1 style="text-align: center;">{{ user_manager.USER_APP_NAME }}</h1>
+    <p><img style="display: block; margin-left: auto; margin-right: auto;" src="{{ url_for('static', filename='HBlink.png') }}" alt="Logo" width="300" height="144" /></p>
+<h1 style="text-align: center;">{{title}}</h1>
+<hr />
+<table style="width: 700px; margin-left: auto; margin-right: auto;" border="black" cellspacing="3" cellpadding="3">
+<tbody>
+<tr>
+    
+<td style="text-align: center;"><a href={{url}}/>Home</a></td>
+        {% if not call_or_get(current_user.is_authenticated) %}
+<td style="text-align: center;"><a href={{ url_for('user.register') }}>Register</a></td>
+<td style="text-align: center;"><a href={{ url_for('user.login') }}>Sign in</a></td>
+    {% endif %}
+    {% if call_or_get(current_user.is_authenticated) %}
+            {% if call_or_get(current_user.has_roles('Admin')) %}
+    <td style="text-align: center;"><a href={{url}}/add_user><strong>Add a User</strong></a></td>
+    <td style="text-align: center;"><a href={{url}}/list_users><strong>Edit Users</strong></a></td>
+    <td style="text-align: center;"><a href={{url}}/approve_users><strong>Waiting Approval</strong></a></td>
+    <td style="text-align: center;"><a href={{url}}/auth_log><strong>Auth Log</strong></a></td>
+
+            {% endif %}
+<td style="text-align: center;"><a href={{url}}/help>Help</a></td>
+<td style="text-align: center;"><a href={{url}}/generate_passphrase>View Passphrase(s)</a></td>
+<td style="text-align: center;"><a href="{{ url_for('user.edit_user_profile') }}">Edit {{ current_user.username or current_user.email }}</a></td>
+<td style="text-align: center;"><a href={{ url_for('user.logout') }}>Sign out</a></td>
+            {% endif %}
+</tr>
+</tbody>
+</table>
+
+{% if call_or_get(current_user.is_authenticated) %}
+            {% if call_or_get(current_user.has_roles('Admin')) %}
+<table style="width: 700px; margin-left: auto; margin-right: auto;" border="black" cellspacing="3" cellpadding="3">
+<tbody>
+<tr>
+<td style="text-align: center;"><a href={{url}}/edit_server>Manage Server Configs</a></td>
+<td style="text-align: center;"><a href={{url}}/edit_peer>Manage Peers</a></td>
+<td style="text-align: center;"><a href={{url}}/edit_peer>Manage Masters Configs</a></td>
+</tr>
+</tbody>
+</table>
+        {% endif %}
+        {% endif %}
+
+<hr />
+    {% block body %}
+<!--
+    <div id="header-div" class="clearfix with-margins">
+        <div class="pull-left"><a href="/"><h1 class="no-margins">{{ user_manager.USER_APP_NAME }}</h1></a></div>
+        <div class="pull-right">
+            {% if call_or_get(current_user.is_authenticated) %}
+                <a href="{{ url_for('user.edit_user_profile') }}">{{ current_user.username or current_user.email }}</a>
+                &nbsp; | &nbsp;
+                <a href="{{ url_for('user.logout') }}">{%trans%}Sign out{%endtrans%}</a>
+            {% else %}
+                <a href="{{ url_for('user.login') }}">{%trans%}Sign in{%endtrans%}</a>
+            {% endif %}
+        </div>
+
+    </div>
+    {% block menu %}
+    <div id="menu-div" class="with-margins">
+        <a href="/">{%trans%}Home page{%endtrans%}</a>
+    </div>
+    {% endblock %}
+-->
+    <hr class="no-margins"/>
+
+    <div id="main-div" class="with-margins">
+    {# One-time system messages called Flash messages #}
+    {% block flash_messages %}
+        {%- with messages = get_flashed_messages(with_categories=true) -%}
+            {% if messages %}
+                {% for category, message in messages %}
+                    {% if category=='error' %}
+                        {% set category='danger' %}
+                    {% endif %}
+                    <div class="alert alert-{{category}}">{{ message|safe }}</div>
+                {% endfor %}
+            {% endif %}
+        {%- endwith %}
+    {% endblock %}
+    {% block main %}
+        {% block content %}
+
+                {{markup_content}}
+
+
+    {% endblock %}
+    {% endblock %}
+    </div>
+
+    <br/>
+    <hr class="no-margins"/>
+    <div id="footer-div" class="clearfix with-margins">
+    <p style="text-align: center;"><strong>{{ user_manager.USER_APP_NAME }}<br /></strong><a href="https://github.com/kf7eel/hblink3">HBNet DMR Server</a><br />Created by KF7EEL<br />Contributors:&nbsp; W7NCX, N9VW, KC7AAD, NO7RF</p>
+<!--
+
+        <div class="pull-left">{{ user_manager.USER_APP_NAME }}</div>
+        <div class="pull-right">Credits: KF7EEL, W7NCX, N9VW, KC7AAD, NO7RF</div>
+    -->
+
+    </div>
+    {% endblock %}
+
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
+    <!-- Bootstrap -->
+    <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
+    {# *** Allow sub-templates to insert extra html to the bottom of the body *** #}
+    {% block extra_js %}{% endblock %}
+
+  </body>
+</html>

user_managment/templates/help.html

@@ -0,0 +1,4 @@
+{% extends 'flask_user/_public_base.html' %}
+{% block content %}
+This is a help page.</p>
+{% endblock %}

user_managment/templates/index.html

@@ -0,0 +1,4 @@
+{% extends 'flask_user/_public_base.html' %}
+{% block content %}
+<p>Welcome to the <strong>{{ user_manager.USER_APP_NAME }}</strong>. This tool is used to manage your access.</p>
+{% endblock %}

user_managment/templates/view_passphrase.html

@@ -0,0 +1,34 @@
+{% extends 'flask_user/_public_base.html' %}
+{% block content %}
+<p>&nbsp;</p><h4 style="text-align: center;"><a href="/generate_passphrase/pi-star">Click here</a> for automated Pi-Star script.</h4><p>&nbsp;</p>
+<table style="width: 900px; margin-left: auto; margin-right: auto;">
+<tbody>
+<tr>
+<td>
+
+<table style="width: 218px;" border="1">
+<tbody>
+<tr>
+<td style="width: 53.8333px;">Name:</td>
+<td style="width: 147.167px; text-align: center;"><strong>My Server</strong></td>
+</tr>
+<tr>
+<td style="width: 53.8333px;">Host/IP:</td>
+<td style="width: 147.167px; text-align: center;"><strong>127.0.0.1</strong></td>
+</tr>
+<tr>
+<td style="width: 53.8333px;">Port:</td>
+<td style="width: 147.167px; text-align: center;"><strong>62030</strong></td>
+</tr>
+</tbody>
+</table>
+
+</td>
+<td>{{markup_content}}
+</td>
+
+</tr>
+</tbody>
+</table>
+<p>&nbsp;</p>
+{% endblock %}