jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

oidc: initial logout redirect URI support

Browse Source
This commit is contained in:
Johannes Zellner
2023-03-17 11:29:03 +01:00
parent 39f2308ba1
commit 27ff2316b9
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/oidc.js
+16 -11
View File
@@ -33,15 +33,16 @@ const assert = require('assert'),
settings = require('./settings.js');
const OIDC_CLIENTS_TABLE_NAME = 'oidcClients';
const OIDC_CLIENTS_FIELDS = [ 'id', 'secret', 'redirectUri' ];
const OIDC_CLIENTS_FIELDS = [ 'id', 'secret', 'loginRedirectUri', 'logoutRedirectUri' ];
async function clientsAdd(id, secret, redirectUri) {
async function clientsAdd(id, secret, loginRedirectUri, logoutRedirectUri) {
assert.strictEqual(typeof id, 'string');
assert.strictEqual(typeof secret, 'string');
assert.strictEqual(typeof redirectUri, 'string');
assert.strictEqual(typeof loginRedirectUri, 'string');
assert.strictEqual(typeof logoutRedirectUri, 'string');
const query = 'INSERT INTO oidcClients (id, secret, redirectUri) VALUES (?, ?, ?)';
const args = [ id, secret, redirectUri ];
const query = 'INSERT INTO oidcClients (id, secret, loginRedirectUri, logoutRedirectUri) VALUES (?, ?, ?)';
const args = [ id, secret, loginRedirectUri, logoutRedirectUri ];
const [error] = await safe(database.query(query, args));
if (error && error.code === 'ER_DUP_ENTRY') throw new BoxError(BoxError.ALREADY_EXISTS, 'client already exists');
@@ -59,12 +60,13 @@ async function clientsGet(id) {
return result[0];
}
async function clientsUpdate(id, secret, redirectUri) {
async function clientsUpdate(id, secret, loginRedirectUri, logoutRedirectUri) {
assert.strictEqual(typeof id, 'string');
assert.strictEqual(typeof secret, 'string');
assert.strictEqual(typeof redirectUri, 'string');
assert.strictEqual(typeof loginRedirectUri, 'string');
assert.strictEqual(typeof logoutRedirectUri, 'string');
const result = await database.query(`UPDATE ${OIDC_CLIENTS_TABLE_NAME} SET secret=?, redirectUri=? WHERE id = ?`, [ secret, redirectUri, id]);
const result = await database.query(`UPDATE ${OIDC_CLIENTS_TABLE_NAME} SET secret=?, loginRedirectUri=?, logoutRedirectUri=? WHERE id = ?`, [ secret, loginRedirectUri, logoutRedirectUri, id]);
if (result.affectedRows !== 1) throw new BoxError(BoxError.NOT_FOUND, 'client not found');
}
@@ -160,7 +162,8 @@ class CloudronAdapter {
return {
client_id: id,
client_secret: client.secret,
redirect_uris: [ client.redirectUri ],
redirect_uris: [ client.loginRedirectUri ],
post_logout_redirect_uri: client.logoutRedirectUri,
};
} else {
if (!this.store[id]) return false;
@@ -285,9 +288,11 @@ function renderSessionEndPage(routePrefix, provider) {
assert.strictEqual(typeof routePrefix, 'string');
assert.strictEqual(typeof provider, 'object');
debug(`route session end get`);
return async function (req, res, next) {
debug(`route session end get`);
return res.render('session_end', {});
return res.render('session_end', {});
};
}
function renderInteractionPage(routePrefix, provider) {