summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2023-11-22 00:53:35 +0000
committerChristian Breunig <christian@breunig.cc>2023-11-23 11:32:45 +0100
commit1b7e8f9ff7a86125ca7c8a2035650d5203dc54c5 (patch)
tree337fa11842302140887bfc5738ead6566829c521 /src/conf_mode
parented0570b31eac62a9c4f3fa794ca4b9848ae1f279 (diff)
downloadvyos-1x-1b7e8f9ff7a86125ca7c8a2035650d5203dc54c5.tar.gz
vyos-1x-1b7e8f9ff7a86125ca7c8a2035650d5203dc54c5.zip
https api: T5772: check if keys are configured unless PAM auth is enabled for GraphQL
(cherry picked from commit 8c450ea7f538beb0b2cd21d35c05d18db49a1802)
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/https.py25
1 files changed, 25 insertions, 0 deletions
diff --git a/src/conf_mode/https.py b/src/conf_mode/https.py
index 078c2d5f5..349cec888 100755
--- a/src/conf_mode/https.py
+++ b/src/conf_mode/https.py
@@ -23,6 +23,7 @@ import jinja2
import vyos.defaults
from vyos.config import Config
+from vyos.util import dict_search
from vyos import ConfigError
config_file = '/etc/nginx/sites-available/default'
@@ -143,8 +144,32 @@ def get_config():
return https
def verify(https):
+ # Verify API server settings, if present
+ if 'api' in https:
+ keys = dict_search('api.keys.id', https)
+ gql_auth_type = dict_search('api.graphql.authentication.type', https)
+
+ # If "api graphql" is not defined and `gql_auth_type` is None,
+ # there's certainly no JWT auth option, and keys are required
+ jwt_auth = (gql_auth_type == "token")
+
+ # Check for incomplete key configurations in every case
+ valid_keys_exist = False
+ if keys:
+ for k in keys:
+ if 'key' not in keys[k]:
+ raise ConfigError(f'Missing HTTPS API key string for key id "{k}"')
+ else:
+ valid_keys_exist = True
+
+ # If only key-based methods are enabled,
+ # fail the commit if no valid key configurations are found
+ if (not valid_keys_exist) and (not jwt_auth):
+ raise ConfigError('At least one HTTPS API key is required unless GraphQL token authentication is enabled')
+
return None
+
def generate(https):
if https is None:
return None