Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SQL-230 add logout redirect url #365

Merged
merged 3 commits into from
Jan 24, 2024
Merged

SQL-230 add logout redirect url #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d47726e
SQL-230 add jwt-no-val-logout-url
milt Jan 24, 2024
da45e46
SQL-230 document LRSQL_JWT_NO_VAL_LOGOUT_URL
milt Jan 24, 2024
a387702
SQL-230 release ver of admin UI in makefile
milt Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Version of LRS Admin UI to use

LRS_ADMIN_UI_VERSION ?= v0.1.14
LRS_ADMIN_UI_VERSION ?= v0.1.15
LRS_ADMIN_UI_LOCATION ?= https://github.com/yetanalytics/lrs-admin-ui/releases/download/${LRS_ADMIN_UI_VERSION}/lrs-admin-ui.zip
LRS_ADMIN_ZIPFILE ?= lrs-admin-ui-${LRS_ADMIN_UI_VERSION}.zip

Expand Down
1 change: 1 addition & 0 deletions doc/env_vars.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ _NOTE:_ `LRSQL_STMT_RETRY_LIMIT` and `LRSQL_STMT_RETRY_BUDGET` are used to mitig
| `LRSQL_JWT_NO_VAL_ISSUER` | `jwtNoValIssuer` | (**DANGEROUS!** See `LRSQL_JWT_NO_VAL`) This variable configures which claim key to use for the issuer when token validation is turned off. | Not Set |
| `LRSQL_JWT_NO_VAL_ROLE_KEY` | `jwtNoValRoleKey` | (**DANGEROUS!** See `LRSQL_JWT_NO_VAL`) This variable configures which claim key to look in for the role when token validation is turned off. | Not Set |
| `LRSQL_JWT_NO_VAL_ROLE` | `jwtNoValRole` | (**DANGEROUS!** See `LRSQL_JWT_NO_VAL`) This variable configures what role must be present in the key above when token validation is turned off. | Not Set |
| `LRSQL_JWT_NO_VAL_LOGOUT_URL` | `jwtNoValLogoutUrl` | (**DANGEROUS!** See `LRSQL_JWT_NO_VAL`) This variable specifies a logout URL that the client will redirect to on user logout when token validation is turned off. | Not Set |

#### OIDC

Expand Down
1 change: 1 addition & 0 deletions resources/lrsql/config/prod/default/webserver.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
:jwt-no-val-issuer #or [#env LRSQL_JWT_NO_VAL_ISSUER nil]
:jwt-no-val-role-key #or [#env LRSQL_JWT_NO_VAL_ROLE_KEY nil]
:jwt-no-val-role #or [#env LRSQL_JWT_NO_VAL_ROLE nil]
:jwt-no-val-logout-url #or [#env LRSQL_JWT_NO_VAL_LOGOUT_URL nil]
:sec-head-hsts #or [#env LRSQL_SEC_HEAD_HSTS nil]
:sec-head-frame #or [#env LRSQL_SEC_HEAD_FRAME nil]
:sec-head-content-type #or [#env LRSQL_SEC_HEAD_CONTENT_TYPE nil]
Expand Down
1 change: 1 addition & 0 deletions resources/lrsql/config/test/default/webserver.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
:jwt-no-val-issuer nil
:jwt-no-val-role-key nil
:jwt-no-val-role nil
:jwt-no-val-logout-url nil
:enable-http true
:enable-http2 true
:ssl-port 8443
Expand Down
24 changes: 16 additions & 8 deletions src/main/lrsql/admin/interceptors/ui.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
config to inject:
:enable-admin-status - boolean, determines if the admin status endpoint is
enabled."
[{:keys [enable-admin-delete-actor enable-admin-status enable-reactions no-val? proxy-path]
[{:keys [enable-admin-delete-actor
enable-admin-status
enable-reactions
no-val?
no-val-logout-url
proxy-path]
:or {enable-admin-delete-actor false
enable-admin-status false
enable-reactions false
Expand All @@ -32,11 +37,14 @@
{:status 200
:body
(merge
{:url-prefix url-prefix
:proxy-path proxy-path
:enable-stmt-html (some? enable-stmt-html)
:enable-admin-delete-actor enable-admin-delete-actor
:enable-admin-status enable-admin-status
:enable-reactions enable-reactions
:no-val? no-val?}
(cond-> {:url-prefix url-prefix
:proxy-path proxy-path
:enable-stmt-html (some? enable-stmt-html)
:enable-admin-delete-actor enable-admin-delete-actor
:enable-admin-status enable-admin-status
:enable-reactions enable-reactions
:no-val? no-val?}
(and no-val?
(not-empty no-val-logout-url))
(assoc :no-val-logout-url no-val-logout-url))
oidc-env)})))}))
21 changes: 12 additions & 9 deletions src/main/lrsql/admin/routes.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@
no-val-uname
no-val-role-key
no-val-role
no-val-logout-url
enable-admin-delete-actor
enable-admin-ui
enable-admin-status
Expand All @@ -205,11 +206,11 @@
routes]
(let [common-interceptors (make-common-interceptors lrs head-opts)
common-interceptors-oidc (into common-interceptors oidc-interceptors)
no-val-opts {:no-val? no-val?
:no-val-uname no-val-uname
:no-val-issuer no-val-issuer
no-val-opts {:no-val? no-val?
:no-val-uname no-val-uname
:no-val-issuer no-val-issuer
:no-val-role-key no-val-role-key
:no-val-role no-val-role}]
:no-val-role no-val-role}]
(cset/union routes
(when enable-account-routes
(admin-account-routes
Expand All @@ -220,10 +221,11 @@
(admin-ui-routes
(into common-interceptors
oidc-ui-interceptors)
{:enable-admin-status enable-admin-status
:enable-reactions enable-reaction-routes
:no-val? no-val?
:proxy-path proxy-path
{:enable-admin-status enable-admin-status
:enable-reactions enable-reaction-routes
:no-val? no-val?
:no-val-logout-url no-val-logout-url
:proxy-path proxy-path
:enable-admin-delete-actor enable-admin-delete-actor}))
(when enable-admin-status
(admin-status-routes
Expand All @@ -232,4 +234,5 @@
(admin-reaction-routes
common-interceptors secret leeway no-val-opts))
(when enable-admin-delete-actor
(admin-lrs-management-routes common-interceptors-oidc secret leeway no-val-opts)))))
(admin-lrs-management-routes
common-interceptors-oidc secret leeway no-val-opts)))))
2 changes: 2 additions & 0 deletions src/main/lrsql/spec/config.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@
(s/def ::jwt-no-val-issuer (s/nilable string?))
(s/def ::jwt-no-val-role-key (s/nilable string?))
(s/def ::jwt-no-val-role (s/nilable string?))
(s/def ::jwt-no-val-logout-url (s/nilable string?))

(s/def ::key-file string?) ; TODO: correct file extension/path?
(s/def ::key-alias string?)
Expand Down Expand Up @@ -225,6 +226,7 @@
::jwt-no-val-issuer
::jwt-no-val-role
::jwt-no-val-role-key
::jwt-no-val-logout-url
::sec-head-hsts
::sec-head-frame
::sec-head-content-type
Expand Down
2 changes: 2 additions & 0 deletions src/main/lrsql/system/webserver.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
jwt-no-val-issuer
jwt-no-val-role-key
jwt-no-val-role
jwt-no-val-logout-url
enable-clamav
clamav-host
clamav-port]
Expand Down Expand Up @@ -87,6 +88,7 @@
:no-val-uname jwt-no-val-uname
:no-val-role-key jwt-no-val-role-key
:no-val-role jwt-no-val-role
:no-val-logout-url jwt-no-val-logout-url
:secret private-key
:enable-admin-delete-actor enable-admin-delete-actor
:enable-admin-ui enable-admin-ui
Expand Down
Loading