3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

authorization: use database to store API Key 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-04-12 08:30:35 -04:00
parent dee9055347
commit 24e6fded91
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
moonraker/components/authorization.py
View File

@ -20,9 +20,13 @@ PRUNE_CHECK_TIME = 300 * 1000
class Authorization: class Authorization:
def __init__(self, config): def __init__(self, config):
self.server = config.get_server() self.server = config.get_server()
api_key_file = config.get('api_key_file', "~/.moonraker_api_key") database = self.server.lookup_component('database')
self.api_key_file = os.path.expanduser(api_key_file) database.register_local_namespace('authorization', forbidden=True)
self.api_key = self._read_api_key() self.auth_db = database.wrap_namespace('authorization')
self.api_key = self.auth_db.get('api_key', None)
if self.api_key is None:
self.api_key = uuid.uuid4().hex
self.auth_db['api_key'] = self.api_key
self.trusted_connections = {} self.trusted_connections = {}
self.access_tokens = {} self.access_tokens = {}
@ -87,30 +91,13 @@ class Authorization:
async def _handle_apikey_request(self, web_request): async def _handle_apikey_request(self, web_request):
action = web_request.get_action() action = web_request.get_action()
if action.upper() == 'POST': if action.upper() == 'POST':
self.api_key = self._create_api_key() self.api_key = uuid.uuid4().hex
self.auth_db['api_key'] = self.api_key
return self.api_key return self.api_key
async def _handle_token_request(self, web_request): async def _handle_token_request(self, web_request):
return self.get_access_token() return self.get_access_token()
def _read_api_key(self):
if os.path.exists(self.api_key_file):
with open(self.api_key_file, 'r') as f:
api_key = f.read()
return api_key
# API Key file doesn't exist. Generate
# a new api key and create the file.
logging.info(
f"No API Key file found, creating new one at:"
f"\n{self.api_key_file}")
return self._create_api_key()
def _create_api_key(self):
api_key = uuid.uuid4().hex
with open(self.api_key_file, 'w') as f:
f.write(api_key)
return api_key
def _check_authorized_ip(self, ip): def _check_authorized_ip(self, ip):
if ip in self.trusted_ips: if ip in self.trusted_ips:
return True return True