diff options
| author | Daniil Baturin <daniil@baturin.org> | 2023-12-04 17:27:58 +0000 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2023-12-04 18:47:05 +0000 |
| commit | 5d6515765efa850493572852cee2cc4400191471 (patch) | |
| tree | b78015a33807315b7e6db1b143e79d0543a72dfc /src/conf_mode | |
| parent | f83fc70fb24f54f331386b102fc21ce4050c4ddf (diff) | |
| download | vyos-1x-5d6515765efa850493572852cee2cc4400191471.tar.gz vyos-1x-5d6515765efa850493572852cee2cc4400191471.zip | |
https: T5772: return from verify if HTTPS API is not configured
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/http-api.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/conf_mode/http-api.py b/src/conf_mode/http-api.py index c0c16cfc0..7a8ca883e 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 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 @@ -60,11 +60,14 @@ def get_config(): new_key = { 'id': name, 'key': key } http_api['api_keys'].append(new_key) else: - raise ConfigError('Missing HTTPS API key string for key id "}"'.format(name)) + raise ConfigError('Missing HTTPS API key string for key id "{}"'.format(name)) return http_api def verify(http_api): + if not http_api: + return None + # Verify API server settings, if present keys = http_api['api_keys'] |