diff options
| author | omnom62 <omnom62@outlook.com> | 2026-08-05 09:14:32 +1000 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2026-08-26 13:33:34 -0500 |
| commit | f3012e652edef614d4f0ed169b320106a85d83b3 (patch) | |
| tree | a832563e49b79115497a078f98a748ef2e368113 /src/conf_mode/service_https.py | |
| parent | d2b54b9d01aee583a80a0cd48a790843d8c85b76 (diff) | |
| download | vyos-1x-f3012e652edef614d4f0ed169b320106a85d83b3.tar.gz vyos-1x-f3012e652edef614d4f0ed169b320106a85d83b3.zip | |
http-api: T8989: add REST Bearer token authentication
Add JWT Bearer token support to the REST API, as an additional
authentication method alongside the existing form-field key and
X-API-Key header.
- New POST /token endpoint mints a JWT for a valid API key
- auth_required() accepts Authorization: Bearer <token> alongside
existing key/X-API-Key auth
- New config nodes: service https api rest authentication
{expiration, secret-length} (defaults: 3600s / 32 bytes)
- REST tokens use an independent signing secret from GraphQL's,
since GraphQL may not be enabled on all deployments and the two
subsystems have different expiry requirements
- nginx location regex updated to allow /token
- service_https.py default-value merge generalized to also apply
to the rest node, not just graphql, so REST authentication
defaults populate correctly on commit
Diffstat (limited to 'src/conf_mode/service_https.py')
| -rwxr-xr-x | src/conf_mode/service_https.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/conf_mode/service_https.py b/src/conf_mode/service_https.py index 4a9311bfb..28985ead9 100755 --- a/src/conf_mode/service_https.py +++ b/src/conf_mode/service_https.py @@ -77,9 +77,13 @@ def get_config(config=None): # We have gathered the dict representation of the CLI, but there are default # options which we need to update into the dictionary retrieved. default_values = conf.get_config_defaults(**https.kwargs, recursive=True) - if 'api' not in https or 'graphql' not in https['api']: + if 'api' in https: + if 'graphql' not in https['api']: + del default_values['api']['graphql'] + if 'rest' not in https['api']: + del default_values['api']['rest'] + else: del default_values['api'] - # merge CLI and default dictionary https = config_dict_merge(default_values, https) |
