ShaYmez/hbnet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add commented line in hblink, allow all RIDs

Browse Source
This commit is contained in:
KF7EEL 2021-06-04 18:33:29 -07:00
parent 6d093b4b08
commit 1d93ef13ea
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hblink.py
View File

@ -287,12 +287,12 @@ class HBSYSTEM(DatagramProtocol):
'old_auth': old_auth 'old_auth': old_auth
} }
json_object = json.dumps(auth_conf, indent = 4) json_object = json.dumps(auth_conf, indent = 4)
#try: try:
req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'}) req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
# resp = json.loads(req.text) # resp = json.loads(req.text)
#return resp #return resp
#except requests.ConnectionError: except Exception as e:
# return {'allow':True} logger.info(e)
def calc_passphrase(self, peer_id, _salt_str): def calc_passphrase(self, peer_id, _salt_str):
burn_id = ast.literal_eval(os.popen('cat ' + self._CONFIG['USER_MANAGER']['BURN_FILE']).read()) burn_id = ast.literal_eval(os.popen('cat ' + self._CONFIG['USER_MANAGER']['BURN_FILE']).read())
@ -519,6 +519,8 @@ class HBSYSTEM(DatagramProtocol):
if self._config['USE_USER_MAN'] == True: 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]) self.ums_response = self.check_user_man(_peer_id, self._CONFIG['USER_MANAGER']['THIS_SERVER_NAME'], _sockaddr[0])
## print(self.ums_response) ## 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']: if acl_check(_peer_id, self._CONFIG['GLOBAL']['REG_ACL']) and self.ums_response['allow']:
user_auth = self.ums_response['allow'] user_auth = self.ums_response['allow']
else: else:

8
user_managment/app.py
View File

@ -993,7 +993,7 @@ def create_app():
<h4>&nbsp;Login IP&nbsp;</h4> <h4>&nbsp;Login IP&nbsp;</h4>
</td> </td>
<td style="text-align: center;"> <td style="text-align: center;">
<h4>&nbsp;Calculated Passphrase&nbsp;</h4> <h4>&nbsp;Passphrase&nbsp;</h4>
</td> </td>
<td style="text-align: center;"> <td style="text-align: center;">
<h4>&nbsp;Server&nbsp;</h4> <h4>&nbsp;Server&nbsp;</h4>
@ -1065,7 +1065,7 @@ def create_app():
<h4>&nbsp;Login IP&nbsp;</h4> <h4>&nbsp;Login IP&nbsp;</h4>
</td> </td>
<td style="text-align: center;"> <td style="text-align: center;">
<h4>&nbsp;Calculated Passphrase&nbsp;</h4> <h4>&nbsp;Passphrase&nbsp;</h4>
</td> </td>
<td style="text-align: center;"> <td style="text-align: center;">
<h4>&nbsp;Server&nbsp;</h4> <h4>&nbsp;Server&nbsp;</h4>
@ -1137,7 +1137,7 @@ def create_app():
<h4>&nbsp;Login IP&nbsp;</h4> <h4>&nbsp;Login IP&nbsp;</h4>
</td> </td>
<td style="text-align: center;"> <td style="text-align: center;">
<h4>&nbsp;Calculated Passphrase&nbsp;</h4> <h4>&nbsp;Passphrase&nbsp;</h4>
</td> </td>
<td style="text-align: center;"> <td style="text-align: center;">
<h4>&nbsp;Server&nbsp;</h4> <h4>&nbsp;Server&nbsp;</h4>
@ -1212,7 +1212,7 @@ def create_app():
<h4>&nbsp;Login IP&nbsp;</h4> <h4>&nbsp;Login IP&nbsp;</h4>
</td> </td>
<td style="text-align: center;"> <td style="text-align: center;">
<h4>&nbsp;Calculated Passphrase&nbsp;</h4> <h4>&nbsp;Passphrase&nbsp;</h4>
</td> </td>
<td style="text-align: center;"> <td style="text-align: center;">
<h4>&nbsp;Server&nbsp;</h4> <h4>&nbsp;Server&nbsp;</h4>