carta-controller 5.0.0-beta.1 → 5.0.0-rc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.gitmodules +3 -0
- package/.prettierrc.json +1 -0
- package/dist/auth/external.js +20 -9
- package/dist/auth/external.js.map +1 -1
- package/dist/auth/google.js +5 -4
- package/dist/auth/google.js.map +1 -1
- package/dist/auth/index.js +2 -2
- package/dist/auth/index.js.map +1 -1
- package/dist/auth/ldap.js +10 -10
- package/dist/auth/ldap.js.map +1 -1
- package/dist/auth/local.js +2 -1
- package/dist/auth/local.js.map +1 -1
- package/dist/auth/oidc.js +6 -10
- package/dist/auth/oidc.js.map +1 -1
- package/dist/auth/oidcRefreshManager.js +18 -19
- package/dist/auth/oidcRefreshManager.js.map +1 -1
- package/dist/auth/pam.js +2 -1
- package/dist/auth/pam.js.map +1 -1
- package/dist/config.js +101 -17
- package/dist/controllerTests.js +31 -32
- package/dist/database.js +57 -35
- package/dist/index.js +14 -16
- package/dist/serverHandlers.js +32 -32
- package/dist/util.js +9 -13
- package/package.json +9 -6
- package/public/dashboard.js +20 -4
- package/schemas/.github/workflows/AddToCartaVisProject.yml +23 -0
- package/schemas/.prettierrc.json +18 -0
- package/schemas/CMakeLists.txt +15 -0
- package/schemas/README.md +1 -0
- package/schemas/_config.yml +7 -0
- package/schemas/controller_config_schema_1.json +343 -0
- package/{config/config_schema.json → schemas/controller_config_schema_2.json} +123 -262
- package/{config → schemas}/layout_schema_2.json +15 -2
- package/schemas/link_schemas.sh +6 -0
- package/schemas/preference_backend_schema_1.json +81 -0
- package/{config → schemas}/preference_backend_schema_2.json +24 -11
- package/schemas/preference_schema_1.json +410 -0
- package/schemas/preferences_schema_2.json +434 -0
- package/schemas/schemacompiler.c +200 -0
- package/{config/snippet_schema.json → schemas/snippet_schema_1.json} +2 -1
- package/schemas/test/validate_controller_config_objects.sh +16 -0
- package/schemas/test/validate_mongodb_objects.sh +50 -0
- package/schemas/test/validate_user_directory_objects.sh +15 -0
- package/schemas/workspace_schema_1.json +573 -0
- package/test/auth.external.test.ts +51 -0
- package/.readthedocs.yaml +0 -22
- package/config/example_backend.json +0 -7
- package/config/example_config.json +0 -28
- package/config/example_nginx.conf.stub +0 -26
- package/config/example_sudoers_conf.stub +0 -7
- package/config/preference_schema_2.json +0 -273
- package/config/usertable.txt.stub +0 -5
- package/config/workspace_schema_1.json +0 -255
- package/docs/Makefile +0 -20
- package/docs/requirements.txt +0 -3
- package/docs/src/_static/css/custom.css +0 -16
- package/docs/src/almalinux8_instructions.rst +0 -281
- package/docs/src/conf.py +0 -61
- package/docs/src/configuration.rst +0 -161
- package/docs/src/index.rst +0 -40
- package/docs/src/installation.rst +0 -48
- package/docs/src/introduction.rst +0 -51
- package/docs/src/schema.rst +0 -7
- package/docs/src/schema_backend.rst +0 -7
- package/docs/src/ubuntu_focal_instructions.rst +0 -127
package/.gitmodules
ADDED
package/.prettierrc.json
CHANGED
package/dist/auth/external.js
CHANGED
|
@@ -33,33 +33,44 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.populateUserMap = populateUserMap;
|
|
36
37
|
exports.watchUserTable = watchUserTable;
|
|
37
38
|
exports.generateExternalVerifiers = generateExternalVerifiers;
|
|
38
39
|
const fs = __importStar(require("fs"));
|
|
39
40
|
const jwt = require("jsonwebtoken");
|
|
41
|
+
const util_1 = require("../util");
|
|
40
42
|
function populateUserMap(userMaps, issuer, filename) {
|
|
41
43
|
const userMap = new Map();
|
|
44
|
+
const commentRegex = new RegExp(/\s*#.*$/);
|
|
45
|
+
const fieldRegex = new RegExp(/^(.*?)\s+(\S+)$/);
|
|
42
46
|
try {
|
|
43
47
|
const contents = fs.readFileSync(filename).toString();
|
|
44
48
|
const lines = contents.split("\n");
|
|
45
49
|
for (let line of lines) {
|
|
50
|
+
// Trim leading and trailing whitespace
|
|
46
51
|
line = line.trim();
|
|
47
|
-
//
|
|
48
|
-
|
|
52
|
+
// Strip comments
|
|
53
|
+
line = line.replace(commentRegex, "");
|
|
54
|
+
// Skip empty lines
|
|
55
|
+
if (!line) {
|
|
49
56
|
continue;
|
|
50
57
|
}
|
|
51
|
-
//
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
58
|
+
// Valid entry format: <username1> <username2>
|
|
59
|
+
// <username1> can be an arbitrary JSON string.
|
|
60
|
+
// <username2> is a POSIX username which definitely contains no spaces.
|
|
61
|
+
// The field separator can be any amount of whitespace.
|
|
62
|
+
const entry = line.match(fieldRegex);
|
|
63
|
+
if (!entry) {
|
|
64
|
+
util_1.logger.warning(`Ignoring malformed usermap line: ${line}`);
|
|
55
65
|
continue;
|
|
56
66
|
}
|
|
57
|
-
|
|
67
|
+
// Captured groups are 1-indexed (0 is the whole match)
|
|
68
|
+
userMap.set(entry[1], entry[2]);
|
|
58
69
|
}
|
|
59
|
-
|
|
70
|
+
util_1.logger.info(`Updated usermap with ${userMap.size} entries`);
|
|
60
71
|
}
|
|
61
72
|
catch (e) {
|
|
62
|
-
|
|
73
|
+
util_1.logger.error(`Error reading user table`);
|
|
63
74
|
}
|
|
64
75
|
if (Array.isArray(issuer)) {
|
|
65
76
|
for (const iss of issuer) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external.js","sourceRoot":"","sources":["../../src/auth/external.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"external.js","sourceRoot":"","sources":["../../src/auth/external.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/google.js
CHANGED
|
@@ -20,6 +20,7 @@ const google_auth_library_1 = require("google-auth-library");
|
|
|
20
20
|
const local_1 = require("./local");
|
|
21
21
|
const index_1 = require("./index");
|
|
22
22
|
const ms_1 = __importDefault(require("ms"));
|
|
23
|
+
const util_1 = require("../util");
|
|
23
24
|
function googleCallbackHandler(req, res, authConf) {
|
|
24
25
|
return __awaiter(this, void 0, void 0, function* () {
|
|
25
26
|
var _a;
|
|
@@ -35,12 +36,12 @@ function googleCallbackHandler(req, res, authConf) {
|
|
|
35
36
|
const username = authConf.useEmailAsId ? payload === null || payload === void 0 ? void 0 : payload.email : payload === null || payload === void 0 ? void 0 : payload.sub;
|
|
36
37
|
// check that username exists and email is verified
|
|
37
38
|
if (!username || !(payload === null || payload === void 0 ? void 0 : payload.email_verified)) {
|
|
38
|
-
|
|
39
|
+
util_1.logger.warning("Google auth rejected due to lack of unique ID or email verification");
|
|
39
40
|
return res.status(500).json({ "error": "An error occured processing your login" });
|
|
40
41
|
}
|
|
41
42
|
// check that domain is valid
|
|
42
43
|
if (authConf.validDomain && authConf.validDomain !== payload.hd) {
|
|
43
|
-
|
|
44
|
+
util_1.logger.warning(`Google auth rejected due to incorrect domain: ${payload.hd}`);
|
|
44
45
|
return res.status(500).json({ "error": "An error occured processing your login" });
|
|
45
46
|
}
|
|
46
47
|
// create initial refresh token
|
|
@@ -55,7 +56,7 @@ function googleCallbackHandler(req, res, authConf) {
|
|
|
55
56
|
return res.redirect(`${config_1.RuntimeConfig.dashboardAddress}?googleuser=${username}`);
|
|
56
57
|
}
|
|
57
58
|
catch (e) {
|
|
58
|
-
|
|
59
|
+
util_1.logger.debug(e);
|
|
59
60
|
return res.status(500).json({ "error": "An error occured processing your login" });
|
|
60
61
|
}
|
|
61
62
|
});
|
|
@@ -76,7 +77,7 @@ function generateGoogleRefreshHandler(authConf) {
|
|
|
76
77
|
}
|
|
77
78
|
else {
|
|
78
79
|
const access_token = (0, local_1.generateToken)(authConf, refreshToken.username, scriptingToken ? local_1.TokenType.Scripting : local_1.TokenType.Access);
|
|
79
|
-
|
|
80
|
+
util_1.logger.info(`Refreshed ${scriptingToken ? "scripting" : "access"} token for user ${refreshToken.username}`);
|
|
80
81
|
res.json({
|
|
81
82
|
access_token,
|
|
82
83
|
token_type: "bearer",
|
package/dist/auth/google.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../src/auth/google.ts"],"names":[],"mappings":";;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../src/auth/google.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/index.js
CHANGED
|
@@ -77,13 +77,13 @@ else if (config_1.ServerConfig.authProviders.oidc) {
|
|
|
77
77
|
callbackHandler = (req, res) => (0, oidc_1.oidcCallbackHandler)(req, res, authConf);
|
|
78
78
|
(0, oidc_1.initOidc)(authConf);
|
|
79
79
|
if (authConf.userLookupTable) {
|
|
80
|
-
|
|
80
|
+
util_1.logger.info(`Using ${authConf.userLookupTable} for user mapping`);
|
|
81
81
|
(0, external_1.watchUserTable)(userMaps, authConf.issuer, authConf.userLookupTable);
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
84
|
// Check for empty token verifies
|
|
85
85
|
if (!tokenVerifiers.size) {
|
|
86
|
-
|
|
86
|
+
util_1.logger.emerg("No valid token verifiers specified");
|
|
87
87
|
process.exit(1);
|
|
88
88
|
}
|
|
89
89
|
function verifyToken(cookieString) {
|
package/dist/auth/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AA0EA,kCAUC;AAED,0BAOC;AAGD,8BAqBC;AArHD,oCAAqC;AACrC,sDAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/ldap.js
CHANGED
|
@@ -10,15 +10,15 @@ const util_1 = require("../util");
|
|
|
10
10
|
let ldap;
|
|
11
11
|
function getLdapLoginHandler(authConf) {
|
|
12
12
|
ldap = new ldapauth_fork_1.default(authConf.ldapOptions);
|
|
13
|
-
ldap.on("error", err =>
|
|
13
|
+
ldap.on("error", err => util_1.logger.error("LdapAuth: ", err));
|
|
14
14
|
setTimeout(() => {
|
|
15
15
|
var _a;
|
|
16
16
|
const ldapConnected = (_a = ldap === null || ldap === void 0 ? void 0 : ldap._userClient) === null || _a === void 0 ? void 0 : _a.connected;
|
|
17
17
|
if (ldapConnected) {
|
|
18
|
-
|
|
18
|
+
util_1.logger.info("LDAP connected correctly");
|
|
19
19
|
}
|
|
20
20
|
else {
|
|
21
|
-
|
|
21
|
+
util_1.logger.error("LDAP not connected!");
|
|
22
22
|
}
|
|
23
23
|
}, 2000);
|
|
24
24
|
return (req, res) => {
|
|
@@ -30,20 +30,20 @@ function getLdapLoginHandler(authConf) {
|
|
|
30
30
|
}
|
|
31
31
|
const handleAuth = (err, user) => {
|
|
32
32
|
if (err) {
|
|
33
|
-
|
|
33
|
+
util_1.logger.error(err);
|
|
34
34
|
return res.status(403).json({ statusCode: 403, message: "Invalid username/password combo" });
|
|
35
35
|
}
|
|
36
36
|
if ((user === null || user === void 0 ? void 0 : user.uid) !== username) {
|
|
37
|
-
|
|
38
|
-
|
|
37
|
+
util_1.logger.warning(`Returned user "uid ${user === null || user === void 0 ? void 0 : user.uid}" does not match username "${username}"`);
|
|
38
|
+
util_1.logger.debug(user);
|
|
39
39
|
}
|
|
40
40
|
try {
|
|
41
41
|
const uid = (0, util_1.getUserId)(username);
|
|
42
|
-
|
|
42
|
+
util_1.logger.info(`Authenticated as user ${username} with uid ${uid} using LDAP`);
|
|
43
43
|
return (0, local_1.addTokensToResponse)(res, authConf, username);
|
|
44
44
|
}
|
|
45
45
|
catch (e) {
|
|
46
|
-
|
|
46
|
+
util_1.logger.debug(e);
|
|
47
47
|
return res.status(403).json({ statusCode: 403, message: "User does not exist" });
|
|
48
48
|
}
|
|
49
49
|
};
|
|
@@ -52,10 +52,10 @@ function getLdapLoginHandler(authConf) {
|
|
|
52
52
|
const errorObj = error;
|
|
53
53
|
// Need to reconnect to LDAP when we get a TLS error
|
|
54
54
|
if ((_a = errorObj === null || errorObj === void 0 ? void 0 : errorObj.name) === null || _a === void 0 ? void 0 : _a.includes("ConfidentialityRequiredError")) {
|
|
55
|
-
|
|
55
|
+
util_1.logger.warning(`TLS error encountered. Reconnecting to the LDAP server!`);
|
|
56
56
|
ldap.close();
|
|
57
57
|
ldap = new ldapauth_fork_1.default(authConf.ldapOptions);
|
|
58
|
-
ldap.on("error", err =>
|
|
58
|
+
ldap.on("error", err => util_1.logger.error("LdapAuth: ", err));
|
|
59
59
|
// Wait for the connection to be re-established
|
|
60
60
|
setTimeout(() => {
|
|
61
61
|
ldap.authenticate(username, password, handleAuth);
|
package/dist/auth/ldap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ldap.js","sourceRoot":"","sources":["../../src/auth/ldap.ts"],"names":[],"mappings":";;;;;AAQA,kDAwDC;AA/DD,kEAAqC;AAErC,mCAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"ldap.js","sourceRoot":"","sources":["../../src/auth/ldap.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/local.js
CHANGED
|
@@ -57,6 +57,7 @@ const index_1 = require("./index");
|
|
|
57
57
|
const config_1 = require("../config");
|
|
58
58
|
const ms_1 = __importDefault(require("ms"));
|
|
59
59
|
const util_1 = require("../util");
|
|
60
|
+
const util_2 = require("../util");
|
|
60
61
|
let privateKey;
|
|
61
62
|
var TokenType;
|
|
62
63
|
(function (TokenType) {
|
|
@@ -134,7 +135,7 @@ function generateLocalRefreshHandler(authConf) {
|
|
|
134
135
|
else {
|
|
135
136
|
const uid = (0, util_1.getUserId)(refreshToken.username);
|
|
136
137
|
const access_token = generateToken(authConf, refreshToken.username, scriptingToken ? TokenType.Scripting : TokenType.Access);
|
|
137
|
-
|
|
138
|
+
util_2.logger.info(`Refreshed ${scriptingToken ? "scripting" : "access"} token for user ${refreshToken.username} with uid ${uid}`);
|
|
138
139
|
res.json({
|
|
139
140
|
access_token,
|
|
140
141
|
token_type: "bearer",
|
package/dist/auth/local.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local.js","sourceRoot":"","sources":["../../src/auth/local.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"local.js","sourceRoot":"","sources":["../../src/auth/local.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/oidc.js
CHANGED
|
@@ -54,6 +54,7 @@ exports.oidcLogoutHandler = oidcLogoutHandler;
|
|
|
54
54
|
const axios_1 = __importDefault(require("axios"));
|
|
55
55
|
const fs = __importStar(require("fs"));
|
|
56
56
|
const jose = __importStar(require("jose"));
|
|
57
|
+
const util_1 = require("../util");
|
|
57
58
|
const config_1 = require("../config");
|
|
58
59
|
const crypto_1 = require("crypto");
|
|
59
60
|
const oidcRefreshManager_1 = require("./oidcRefreshManager");
|
|
@@ -80,7 +81,7 @@ function initOidc(authConf) {
|
|
|
80
81
|
oidcLogoutEndpoint = idpConfig.data['end_session_endpoint'];
|
|
81
82
|
oidcTokenEndpoint = idpConfig.data['token_endpoint'];
|
|
82
83
|
// Init JWKS key management
|
|
83
|
-
|
|
84
|
+
util_1.logger.info(`Setting up JWKS management for ${idpConfig.data['jwks_uri']}`);
|
|
84
85
|
jwksManager = jose.createRemoteJWKSet(new URL(idpConfig.data['jwks_uri']));
|
|
85
86
|
// Set logout redirect URL
|
|
86
87
|
if (authConf.postLogoutRedirect !== undefined) {
|
|
@@ -123,7 +124,6 @@ function callIdpTokenEndpoint(usp_1, req_1, res_1, authConf_1) {
|
|
|
123
124
|
}
|
|
124
125
|
// Create / retrieve session encryption key
|
|
125
126
|
if (sessionEncKey === undefined) {
|
|
126
|
-
//console.log("No session key received. Assuming initial login")
|
|
127
127
|
sessionEncKey = (0, crypto_1.randomBytes)(32);
|
|
128
128
|
}
|
|
129
129
|
let username = payload[authConf.uniqueField];
|
|
@@ -138,7 +138,6 @@ function callIdpTokenEndpoint(usp_1, req_1, res_1, authConf_1) {
|
|
|
138
138
|
//refreshData['access_token_expiry'] = floor(new Date().getTime() / 1000) + result.data['expires_in'];
|
|
139
139
|
if (result.data['expires_in'] !== undefined) {
|
|
140
140
|
(0, oidcRefreshManager_1.setAccessTokenExpiry)(username, sessionId, parseInt(result.data['expires_in']));
|
|
141
|
-
//console.log(`Access token expires in:\t${result.data['expires_in']}`)
|
|
142
141
|
}
|
|
143
142
|
// Check group membership
|
|
144
143
|
if (authConf.requiredGroup !== undefined) {
|
|
@@ -163,7 +162,6 @@ function callIdpTokenEndpoint(usp_1, req_1, res_1, authConf_1) {
|
|
|
163
162
|
sessionId,
|
|
164
163
|
sessionEncKey: sessionEncKey.toString('hex')
|
|
165
164
|
};
|
|
166
|
-
//console.log(`Session key in refresh token:\t${refreshData['sessionEncKey']}`)
|
|
167
165
|
const rt = yield new jose.EncryptJWT(refreshData)
|
|
168
166
|
.setProtectedHeader({ alg: 'dir', enc: authConf.symmetricKeyType })
|
|
169
167
|
.setIssuedAt()
|
|
@@ -218,7 +216,7 @@ function callIdpTokenEndpoint(usp_1, req_1, res_1, authConf_1) {
|
|
|
218
216
|
}
|
|
219
217
|
}
|
|
220
218
|
catch (err) {
|
|
221
|
-
|
|
219
|
+
util_1.logger.warning(err);
|
|
222
220
|
return returnErrorMsg(req, res, 500, "Error requesting tokens from identity provider");
|
|
223
221
|
}
|
|
224
222
|
});
|
|
@@ -226,7 +224,6 @@ function callIdpTokenEndpoint(usp_1, req_1, res_1, authConf_1) {
|
|
|
226
224
|
function generateLocalOidcRefreshHandler(authConf) {
|
|
227
225
|
return (req, res) => __awaiter(this, void 0, void 0, function* () {
|
|
228
226
|
var _a, _b;
|
|
229
|
-
//console.debug("Running OIDC refresh handler")
|
|
230
227
|
const refreshTokenCookie = req.cookies["Refresh-Token"];
|
|
231
228
|
const scriptingToken = ((_a = req.body) === null || _a === void 0 ? void 0 : _a.scripting) === true;
|
|
232
229
|
if (refreshTokenCookie) {
|
|
@@ -346,7 +343,7 @@ function oidcLoginStart(req, res, authConf) {
|
|
|
346
343
|
return res.redirect(`${oidcAuthEndpoint}?${usp.toString()}`);
|
|
347
344
|
}
|
|
348
345
|
catch (err) {
|
|
349
|
-
|
|
346
|
+
util_1.logger.error(err);
|
|
350
347
|
return returnErrorMsg(req, res, 500, err);
|
|
351
348
|
}
|
|
352
349
|
});
|
|
@@ -354,7 +351,6 @@ function oidcLoginStart(req, res, authConf) {
|
|
|
354
351
|
function oidcCallbackHandler(req, res, authConf) {
|
|
355
352
|
return __awaiter(this, void 0, void 0, function* () {
|
|
356
353
|
try {
|
|
357
|
-
//console.debug("Running OIDC callback handler");
|
|
358
354
|
const usp = new URLSearchParams();
|
|
359
355
|
if (req.cookies['oidcVerifier'] === undefined) {
|
|
360
356
|
return returnErrorMsg(req, res, 400, "Missing OIDC verifier");
|
|
@@ -378,7 +374,7 @@ function oidcCallbackHandler(req, res, authConf) {
|
|
|
378
374
|
return yield callIdpTokenEndpoint(usp, req, res, authConf, false, true, `${req.query.state}`, undefined);
|
|
379
375
|
}
|
|
380
376
|
catch (err) {
|
|
381
|
-
|
|
377
|
+
util_1.logger.error(err);
|
|
382
378
|
return returnErrorMsg(req, res, 500, err);
|
|
383
379
|
}
|
|
384
380
|
});
|
|
@@ -414,7 +410,7 @@ function oidcLogoutHandler(req, res) {
|
|
|
414
410
|
}
|
|
415
411
|
}
|
|
416
412
|
catch (err) {
|
|
417
|
-
|
|
413
|
+
util_1.logger.error(err);
|
|
418
414
|
return returnErrorMsg(req, res, 500, err);
|
|
419
415
|
}
|
|
420
416
|
});
|
package/dist/auth/oidc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../src/auth/oidc.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../src/auth/oidc.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,21 +34,21 @@ function initRefreshManager() {
|
|
|
34
34
|
const db = client.db(config_1.ServerConfig.database.databaseName);
|
|
35
35
|
// Ensure that locks and refresh tokens tables are there with appropriate indices
|
|
36
36
|
if (!(yield db.listCollections({ name: "tokenLock" }, { nameOnly: true }).hasNext())) {
|
|
37
|
-
|
|
37
|
+
util_1.logger.info("Creating token lock collection");
|
|
38
38
|
lockCollection = yield db.createCollection("tokenLock");
|
|
39
39
|
}
|
|
40
40
|
else {
|
|
41
41
|
lockCollection = yield db.collection("tokenLock");
|
|
42
42
|
}
|
|
43
43
|
if (!(yield db.listCollections({ name: "refreshTokens" }, { nameOnly: true }).hasNext())) {
|
|
44
|
-
|
|
44
|
+
util_1.logger.info("Creating refresh tokens collection");
|
|
45
45
|
refreshTokenCollection = yield db.createCollection("refreshTokens");
|
|
46
46
|
}
|
|
47
47
|
else {
|
|
48
48
|
refreshTokenCollection = yield db.collection("refreshTokens");
|
|
49
49
|
}
|
|
50
50
|
if (!(yield db.listCollections({ name: "accessTokenLifetimes" }, { nameOnly: true }).hasNext())) {
|
|
51
|
-
|
|
51
|
+
util_1.logger.info("Creating access token's lifetimes collection");
|
|
52
52
|
accessTokenLifeTimesCollection = yield db.createCollection("accessTokenLifetimes");
|
|
53
53
|
}
|
|
54
54
|
else {
|
|
@@ -58,30 +58,29 @@ function initRefreshManager() {
|
|
|
58
58
|
const hasLockSessionIndex = yield lockCollection.indexExists("lockSession");
|
|
59
59
|
if (!hasLockSessionIndex) {
|
|
60
60
|
yield lockCollection.createIndex({ sessionid: 1 }, { name: "lockSession", unique: true });
|
|
61
|
-
|
|
61
|
+
util_1.logger.info("Created session index for lockSession collection");
|
|
62
62
|
}
|
|
63
63
|
const hasLockExpiryIndex = yield lockCollection.indexExists("lockExpiry");
|
|
64
64
|
if (!hasLockExpiryIndex) {
|
|
65
65
|
yield lockCollection.createIndex({ "expireAt": 1 }, { name: "lockExpiry", expireAfterSeconds: 0 });
|
|
66
|
-
|
|
66
|
+
util_1.logger.info("Created expiry index for lockSession collection");
|
|
67
67
|
}
|
|
68
68
|
for (let coll of [refreshTokenCollection, accessTokenLifeTimesCollection]) {
|
|
69
69
|
const hasUserSessionIndex = yield coll.indexExists("userSession");
|
|
70
70
|
if (!hasUserSessionIndex) {
|
|
71
71
|
yield coll.createIndex({ username: 1, sessionid: 1 }, { name: "userSession", unique: true });
|
|
72
|
-
|
|
72
|
+
util_1.logger.info(`Created username/session index for collection ${coll.collectionName}`);
|
|
73
73
|
}
|
|
74
74
|
const hasExpiryIndex = yield coll.indexExists("expiryIndex");
|
|
75
75
|
if (!hasExpiryIndex) {
|
|
76
76
|
yield coll.createIndex({ "expireAt": 1 }, { name: "expiryIndex", expireAfterSeconds: 0 });
|
|
77
|
-
|
|
77
|
+
util_1.logger.info(`Created index adding TTL for collection ${coll.collectionName}`);
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
81
|
catch (err) {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
(0, util_1.verboseError)(err);
|
|
82
|
+
util_1.logger.emerg("Error with database connection");
|
|
83
|
+
util_1.logger.debug(err);
|
|
85
84
|
process.exit(1);
|
|
86
85
|
}
|
|
87
86
|
});
|
|
@@ -108,8 +107,8 @@ function acquireRefreshLock(sessionid_1, expiresIn_1) {
|
|
|
108
107
|
}
|
|
109
108
|
catch (e) {
|
|
110
109
|
if (e.code !== 11000) {
|
|
111
|
-
// Not a duplicate key error (which would
|
|
112
|
-
|
|
110
|
+
// Not a duplicate key error (which would indicate a failure to acquire the lock)
|
|
111
|
+
util_1.logger.warning(e);
|
|
113
112
|
}
|
|
114
113
|
}
|
|
115
114
|
// Wait the specified amount of time before trying again
|
|
@@ -129,7 +128,7 @@ function releaseRefreshLock(sessionid) {
|
|
|
129
128
|
return deleteResult.acknowledged;
|
|
130
129
|
}
|
|
131
130
|
catch (e) {
|
|
132
|
-
|
|
131
|
+
util_1.logger.warning(e);
|
|
133
132
|
return false;
|
|
134
133
|
}
|
|
135
134
|
});
|
|
@@ -150,7 +149,7 @@ function getRefreshToken(username, sessionid, symmKey) {
|
|
|
150
149
|
return decrypted;
|
|
151
150
|
}
|
|
152
151
|
catch (e) {
|
|
153
|
-
|
|
152
|
+
util_1.logger.error(e);
|
|
154
153
|
return;
|
|
155
154
|
}
|
|
156
155
|
});
|
|
@@ -173,7 +172,7 @@ function setRefreshToken(username, sessionid, refreshToken, symmKey, expiresIn)
|
|
|
173
172
|
return updateResult.acknowledged;
|
|
174
173
|
}
|
|
175
174
|
catch (e) {
|
|
176
|
-
|
|
175
|
+
util_1.logger.error(e);
|
|
177
176
|
return false;
|
|
178
177
|
}
|
|
179
178
|
});
|
|
@@ -190,7 +189,7 @@ function getAccessTokenExpiry(username, sessionid) {
|
|
|
190
189
|
}
|
|
191
190
|
}
|
|
192
191
|
catch (e) {
|
|
193
|
-
|
|
192
|
+
util_1.logger.error(e);
|
|
194
193
|
// Return 0 if record not found or an unexpected error occurs
|
|
195
194
|
return 0;
|
|
196
195
|
}
|
|
@@ -206,7 +205,7 @@ function setAccessTokenExpiry(username, sessionid, expiresIn) {
|
|
|
206
205
|
return updateResult.acknowledged;
|
|
207
206
|
}
|
|
208
207
|
catch (e) {
|
|
209
|
-
|
|
208
|
+
util_1.logger.error(e);
|
|
210
209
|
return false;
|
|
211
210
|
}
|
|
212
211
|
});
|
|
@@ -215,9 +214,9 @@ function clearTokens(username, sessionid) {
|
|
|
215
214
|
return __awaiter(this, void 0, void 0, function* () {
|
|
216
215
|
yield Promise.all([
|
|
217
216
|
accessTokenLifeTimesCollection.deleteOne({ username, sessionid })
|
|
218
|
-
.catch(e =>
|
|
217
|
+
.catch(e => util_1.logger.error(e)),
|
|
219
218
|
refreshTokenCollection.deleteOne({ username, sessionid })
|
|
220
|
-
.catch(e =>
|
|
219
|
+
.catch(e => util_1.logger.error(e))
|
|
221
220
|
]);
|
|
222
221
|
});
|
|
223
222
|
}
|