summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2023-12-04 11:16:25 -0600
committerDaniil Baturin <daniil@baturin.org>2023-12-04 17:38:23 +0000
commit7c6de792279350c980160096887524836b44be47 (patch)
tree9a30ee97a97a700a406916296e35f9c35bba6cb9 /src
parent976c800c4ba5bd1f4856ea2fa112e89af979bacf (diff)
downloadvyos-1x-7c6de792279350c980160096887524836b44be47.tar.gz
vyos-1x-7c6de792279350c980160096887524836b44be47.zip
https: T5772: return from verify if None
​ Signed-off-by: Daniil Baturin <daniil@baturin.org>
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/http-api.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/conf_mode/http-api.py b/src/conf_mode/http-api.py
index dc75e79b7..d96dbc789 100755
--- a/src/conf_mode/http-api.py
+++ b/src/conf_mode/http-api.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
-# Copyright (C) 2019-2021 VyOS maintainers and contributors
+# Copyright (C) 2019-2023 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as
@@ -38,7 +38,7 @@ vyos_conf_scripts_dir=vyos.defaults.directories['conf_mode']
def get_config(config=None):
http_api = deepcopy(vyos.defaults.api_data)
- x = http_api.get('api_keys')
+ x = http_api.get('api_keys', [])
if not x:
default_key = None
else:
@@ -100,13 +100,15 @@ def get_config(config=None):
return http_api
def verify(http_api):
+ if http_api is None:
+ return
# Verify API server settings, if present
keys = http_api['api_keys']
if not keys:
raise ConfigError('At least one HTTPS API key is required')
- return None
+ return
def generate(http_api):
if http_api is None: