@budibase/backend-core 2.13.52 → 2.14.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/dist/index.js +37 -2
- package/dist/index.js.map +3 -3
- package/dist/index.js.meta.json +1 -1
- package/dist/package.json +4 -5
- package/dist/src/context/mainContext.d.ts +1 -1
- package/dist/src/context/mainContext.js.map +1 -1
- package/dist/src/index.d.ts +3 -2
- package/dist/src/index.js +2 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/security/auth.d.ts +8 -0
- package/dist/src/security/auth.js +22 -0
- package/dist/src/security/auth.js.map +1 -0
- package/dist/src/security/index.d.ts +1 -0
- package/dist/src/security/index.js +18 -0
- package/dist/src/security/index.js.map +1 -0
- package/dist/src/tenancy/tenancy.d.ts +1 -1
- package/dist/src/tenancy/tenancy.js +1 -1
- package/dist/src/tenancy/tenancy.js.map +1 -1
- package/dist/src/timers/timers.d.ts +1 -1
- package/dist/src/users/db.js +5 -0
- package/dist/src/users/db.js.map +1 -1
- package/dist/src/utils/utils.js +2 -2
- package/dist/src/utils/utils.js.map +1 -1
- package/dist/tests/core/utilities/structures/users.js +1 -1
- package/dist/tests/core/utilities/structures/users.js.map +1 -1
- package/package.json +4 -5
- package/src/context/mainContext.ts +1 -1
- package/src/index.ts +1 -0
- package/src/security/auth.ts +24 -0
- package/src/security/index.ts +1 -0
- package/src/security/tests/auth.spec.ts +45 -0
- package/src/tenancy/tenancy.ts +2 -2
- package/src/tenancy/tests/tenancy.spec.ts +3 -3
- package/src/users/db.ts +7 -0
- package/src/utils/utils.ts +3 -3
- package/tests/core/utilities/structures/users.ts +1 -1
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.14.0",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@budibase/nano": "10.1.4",
|
|
25
25
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
26
|
-
"@budibase/shared-core": "2.
|
|
27
|
-
"@budibase/types": "2.
|
|
26
|
+
"@budibase/shared-core": "2.14.0",
|
|
27
|
+
"@budibase/types": "2.14.0",
|
|
28
28
|
"@techpass/passport-openidconnect": "0.3.2",
|
|
29
29
|
"aws-cloudfront-sign": "3.0.2",
|
|
30
30
|
"aws-sdk": "2.1030.0",
|
|
@@ -65,7 +65,6 @@
|
|
|
65
65
|
"@types/cookies": "0.7.8",
|
|
66
66
|
"@types/jest": "29.5.5",
|
|
67
67
|
"@types/lodash": "4.14.200",
|
|
68
|
-
"@types/node": "18.17.0",
|
|
69
68
|
"@types/node-fetch": "2.6.4",
|
|
70
69
|
"@types/pouchdb": "6.4.0",
|
|
71
70
|
"@types/redlock": "4.0.3",
|
|
@@ -97,5 +96,5 @@
|
|
|
97
96
|
}
|
|
98
97
|
}
|
|
99
98
|
},
|
|
100
|
-
"gitHead": "
|
|
99
|
+
"gitHead": "099b1b7ffa7a54a523f212f79adac1d03e805daa"
|
|
101
100
|
}
|
|
@@ -18,7 +18,7 @@ export declare function doInAutomationContext<T>(params: {
|
|
|
18
18
|
task: () => T;
|
|
19
19
|
}): Promise<T>;
|
|
20
20
|
export declare function doInContext(appId: string, task: any): Promise<any>;
|
|
21
|
-
export declare function doInTenant<T>(tenantId: string |
|
|
21
|
+
export declare function doInTenant<T>(tenantId: string | undefined, task: () => T): Promise<T>;
|
|
22
22
|
export declare function doInAppContext<T>(appId: string, task: () => T): Promise<T>;
|
|
23
23
|
export declare function doInIdentityContext<T>(identity: IdentityContext, task: () => T): Promise<T>;
|
|
24
24
|
export declare function doInAppMigrationContext<T>(appId: string, task: () => T): Promise<T>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mainContext.js","sourceRoot":"","sources":["../../../src/context/mainContext.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mainContext.js","sourceRoot":"","sources":["../../../src/context/mainContext.ts"],"names":[],"mappings":"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"}
|
package/dist/src/index.d.ts
CHANGED
|
@@ -33,6 +33,7 @@ export * as docUpdates from "./docUpdates";
|
|
|
33
33
|
export * from "./utils/Duration";
|
|
34
34
|
export { SearchParams } from "./db";
|
|
35
35
|
export * as docIds from "./docIds";
|
|
36
|
+
export * as security from "./security";
|
|
36
37
|
import * as context from "./context";
|
|
37
38
|
export declare const tenancy: {
|
|
38
39
|
DEFAULT_TENANT_ID: "default";
|
|
@@ -51,7 +52,7 @@ export declare const tenancy: {
|
|
|
51
52
|
task: () => T;
|
|
52
53
|
}): Promise<T>;
|
|
53
54
|
doInContext(appId: string, task: any): Promise<any>;
|
|
54
|
-
doInTenant<T_1>(tenantId: string |
|
|
55
|
+
doInTenant<T_1>(tenantId: string | undefined, task: () => T_1): Promise<T_1>;
|
|
55
56
|
doInAppContext<T_2>(appId: string, task: () => T_2): Promise<T_2>;
|
|
56
57
|
doInIdentityContext<T_3>(identity: import("@budibase/types").IdentityContext, task: () => T_3): Promise<T_3>;
|
|
57
58
|
doInAppMigrationContext<T_4>(appId: string, task: () => T_4): Promise<T_4>;
|
|
@@ -73,7 +74,7 @@ export declare const tenancy: {
|
|
|
73
74
|
getTenantDB(tenantId: string): import("@budibase/types").Database;
|
|
74
75
|
addTenantToUrl(url: string): string;
|
|
75
76
|
isUserInAppTenant: (appId: string, user?: any) => boolean;
|
|
76
|
-
getTenantIDFromCtx: (ctx: import("@budibase/types").BBContext, opts: import("@budibase/types").GetTenantIdOptions) => string |
|
|
77
|
+
getTenantIDFromCtx: (ctx: import("@budibase/types").BBContext, opts: import("@budibase/types").GetTenantIdOptions) => string | undefined;
|
|
77
78
|
};
|
|
78
79
|
export * from "./errors";
|
|
79
80
|
export * from "./constants";
|
package/dist/src/index.js
CHANGED
|
@@ -29,7 +29,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
29
29
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
30
30
|
};
|
|
31
31
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
32
|
-
exports.init = exports.tenancy = exports.docIds = exports.docUpdates = exports.blacklist = exports.env = exports.timers = exports.errors = exports.utils = exports.locks = exports.RedisClient = exports.redis = exports.objectStore = exports.cache = exports.context = exports.db = exports.queue = exports.encryption = exports.plugins = exports.middleware = exports.logging = exports.constants = exports.auth = exports.platform = exports.sessions = exports.features = exports.featureFlags = exports.installation = exports.accounts = exports.permissions = exports.roles = exports.users = exports.migrations = exports.events = exports.configs = void 0;
|
|
32
|
+
exports.init = exports.tenancy = exports.security = exports.docIds = exports.docUpdates = exports.blacklist = exports.env = exports.timers = exports.errors = exports.utils = exports.locks = exports.RedisClient = exports.redis = exports.objectStore = exports.cache = exports.context = exports.db = exports.queue = exports.encryption = exports.plugins = exports.middleware = exports.logging = exports.constants = exports.auth = exports.platform = exports.sessions = exports.features = exports.featureFlags = exports.installation = exports.accounts = exports.permissions = exports.roles = exports.users = exports.migrations = exports.events = exports.configs = void 0;
|
|
33
33
|
exports.configs = __importStar(require("./configs"));
|
|
34
34
|
exports.events = __importStar(require("./events"));
|
|
35
35
|
exports.migrations = __importStar(require("./migrations"));
|
|
@@ -66,6 +66,7 @@ exports.blacklist = __importStar(require("./blacklist"));
|
|
|
66
66
|
exports.docUpdates = __importStar(require("./docUpdates"));
|
|
67
67
|
__exportStar(require("./utils/Duration"), exports);
|
|
68
68
|
exports.docIds = __importStar(require("./docIds"));
|
|
69
|
+
exports.security = __importStar(require("./security"));
|
|
69
70
|
// Add context to tenancy for backwards compatibility
|
|
70
71
|
// only do this for external usages to prevent internal
|
|
71
72
|
// circular dependencies
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAoC;AACpC,mDAAkC;AAClC,2DAA0C;AAC1C,iDAAgC;AAChC,0DAAyC;AACzC,sEAAqD;AACrD,uDAAsC;AACtC,+DAA8C;AAC9C,2DAA0C;AAC1C,oEAAmD;AACnD,gEAA+C;AAC/C,uDAAsC;AACtC,+CAA8B;AAC9B,yDAAwC;AACxC,qDAAoC;AACpC,2DAA0C;AAC1C,oDAAmC;AACnC,oEAAmD;AACnD,iDAAgC;AAChC,2CAA0B;AAC1B,qDAAoC;AACpC,iDAAgC;AAChC,6DAA4C;AAC5C,iDAAgC;AAChC,iCAA+C;AAAtC,oGAAA,MAAM,OAAe;AAC9B,6DAA4C;AAC5C,iDAAgC;AAChC,mDAAkC;AAClC,mDAAkC;AAClC,6CAA8C;AAArC,mHAAA,OAAO,OAAO;AACvB,yDAAwC;AACxC,2DAA0C;AAC1C,mDAAgC;AAEhC,mDAAkC;AAClC,qDAAqD;AACrD,uDAAuD;AACvD,wBAAwB;AACxB,mDAAoC;AACpC,oDAAqC;AAExB,QAAA,OAAO,mCACf,QAAQ,GACR,OAAO,EACX;AAED,gCAAgC;AAChC,2CAAwB;AAExB,4BAA4B;AAC5B,8CAA2B;AAE3B,+BAA+B;AAC/B,yCAA0B;AAEnB,MAAM,IAAI,GAAG,CAAC,OAAY,EAAE,EAAE,EAAE;IACrC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AAClB,CAAC,CAAA;AAFY,QAAA,IAAI,QAEhB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAoC;AACpC,mDAAkC;AAClC,2DAA0C;AAC1C,iDAAgC;AAChC,0DAAyC;AACzC,sEAAqD;AACrD,uDAAsC;AACtC,+DAA8C;AAC9C,2DAA0C;AAC1C,oEAAmD;AACnD,gEAA+C;AAC/C,uDAAsC;AACtC,+CAA8B;AAC9B,yDAAwC;AACxC,qDAAoC;AACpC,2DAA0C;AAC1C,oDAAmC;AACnC,oEAAmD;AACnD,iDAAgC;AAChC,2CAA0B;AAC1B,qDAAoC;AACpC,iDAAgC;AAChC,6DAA4C;AAC5C,iDAAgC;AAChC,iCAA+C;AAAtC,oGAAA,MAAM,OAAe;AAC9B,6DAA4C;AAC5C,iDAAgC;AAChC,mDAAkC;AAClC,mDAAkC;AAClC,6CAA8C;AAArC,mHAAA,OAAO,OAAO;AACvB,yDAAwC;AACxC,2DAA0C;AAC1C,mDAAgC;AAEhC,mDAAkC;AAClC,uDAAsC;AACtC,qDAAqD;AACrD,uDAAuD;AACvD,wBAAwB;AACxB,mDAAoC;AACpC,oDAAqC;AAExB,QAAA,OAAO,mCACf,QAAQ,GACR,OAAO,EACX;AAED,gCAAgC;AAChC,2CAAwB;AAExB,4BAA4B;AAC5B,8CAA2B;AAE3B,+BAA+B;AAC/B,yCAA0B;AAEnB,MAAM,IAAI,GAAG,CAAC,OAAY,EAAE,EAAE,EAAE;IACrC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AAClB,CAAC,CAAA;AAFY,QAAA,IAAI,QAEhB"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.validatePassword = exports.PASSWORD_MAX_LENGTH = exports.PASSWORD_MIN_LENGTH = void 0;
|
|
4
|
+
exports.PASSWORD_MIN_LENGTH = +(process.env.PASSWORD_MIN_LENGTH || 8);
|
|
5
|
+
exports.PASSWORD_MAX_LENGTH = +(process.env.PASSWORD_MAX_LENGTH || 512);
|
|
6
|
+
function validatePassword(password) {
|
|
7
|
+
if (!password || password.length < exports.PASSWORD_MIN_LENGTH) {
|
|
8
|
+
return {
|
|
9
|
+
valid: false,
|
|
10
|
+
error: `Password invalid. Minimum ${exports.PASSWORD_MIN_LENGTH} characters.`,
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
if (password.length > exports.PASSWORD_MAX_LENGTH) {
|
|
14
|
+
return {
|
|
15
|
+
valid: false,
|
|
16
|
+
error: `Password invalid. Maximum ${exports.PASSWORD_MAX_LENGTH} characters.`,
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
return { valid: true };
|
|
20
|
+
}
|
|
21
|
+
exports.validatePassword = validatePassword;
|
|
22
|
+
//# sourceMappingURL=auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/security/auth.ts"],"names":[],"mappings":";;;AAEa,QAAA,mBAAmB,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,CAAC,CAAC,CAAA;AAC7D,QAAA,mBAAmB,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,GAAG,CAAC,CAAA;AAE5E,SAAgB,gBAAgB,CAC9B,QAAgB;IAEhB,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,2BAAmB,EAAE;QACtD,OAAO;YACL,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,6BAA6B,2BAAmB,cAAc;SACtE,CAAA;KACF;IAED,IAAI,QAAQ,CAAC,MAAM,GAAG,2BAAmB,EAAE;QACzC,OAAO;YACL,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,6BAA6B,2BAAmB,cAAc;SACtE,CAAA;KACF;IAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;AACxB,CAAC;AAlBD,4CAkBC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from "./auth";
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./auth"), exports);
|
|
18
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/security/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAsB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { BBContext, GetTenantIdOptions } from "@budibase/types";
|
|
2
2
|
export declare function addTenantToUrl(url: string): string;
|
|
3
3
|
export declare const isUserInAppTenant: (appId: string, user?: any) => boolean;
|
|
4
|
-
export declare const getTenantIDFromCtx: (ctx: BBContext, opts: GetTenantIdOptions) => string |
|
|
4
|
+
export declare const getTenantIDFromCtx: (ctx: BBContext, opts: GetTenantIdOptions) => string | undefined;
|
|
@@ -119,7 +119,7 @@ const getTenantIDFromCtx = (ctx, opts) => {
|
|
|
119
119
|
if (!opts.allowNoTenant) {
|
|
120
120
|
ctx.throw(403, "Tenant id not set");
|
|
121
121
|
}
|
|
122
|
-
return
|
|
122
|
+
return undefined;
|
|
123
123
|
};
|
|
124
124
|
exports.getTenantIDFromCtx = getTenantIDFromCtx;
|
|
125
125
|
//# sourceMappingURL=tenancy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenancy.js","sourceRoot":"","sources":["../../../src/tenancy/tenancy.ts"],"names":[],"mappings":";;;AAAA,wCAMmB;AACnB,2CAIwB;AACxB,4CAAqC;AAErC,SAAgB,cAAc,CAAC,GAAW;IACxC,MAAM,QAAQ,GAAG,IAAA,qBAAW,GAAE,CAAA;IAE9B,IAAI,IAAA,uBAAa,GAAE,EAAE;QACnB,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAA;QAChD,GAAG,IAAI,GAAG,IAAI,YAAY,QAAQ,EAAE,CAAA;KACrC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC;AATD,wCASC;AAEM,MAAM,iBAAiB,GAAG,CAAC,KAAa,EAAE,IAAU,EAAE,EAAE;IAC7D,IAAI,YAAY,CAAA;IAChB,IAAI,IAAI,EAAE;QACR,YAAY,GAAG,IAAI,CAAC,QAAQ,IAAI,2BAAiB,CAAA;KAClD;SAAM;QACL,YAAY,GAAG,IAAA,qBAAW,GAAE,CAAA;KAC7B;IACD,MAAM,QAAQ,GAAG,IAAA,8BAAoB,EAAC,KAAK,CAAC,IAAI,2BAAiB,CAAA;IACjE,OAAO,QAAQ,KAAK,YAAY,CAAA;AAClC,CAAC,CAAA;AATY,QAAA,iBAAiB,qBAS7B;AAED,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,gCAAwB,CAAC,CAAA;AAEvD,MAAM,kBAAkB,GAAG,CAChC,GAAc,EACd,IAAwB,
|
|
1
|
+
{"version":3,"file":"tenancy.js","sourceRoot":"","sources":["../../../src/tenancy/tenancy.ts"],"names":[],"mappings":";;;AAAA,wCAMmB;AACnB,2CAIwB;AACxB,4CAAqC;AAErC,SAAgB,cAAc,CAAC,GAAW;IACxC,MAAM,QAAQ,GAAG,IAAA,qBAAW,GAAE,CAAA;IAE9B,IAAI,IAAA,uBAAa,GAAE,EAAE;QACnB,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAA;QAChD,GAAG,IAAI,GAAG,IAAI,YAAY,QAAQ,EAAE,CAAA;KACrC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC;AATD,wCASC;AAEM,MAAM,iBAAiB,GAAG,CAAC,KAAa,EAAE,IAAU,EAAE,EAAE;IAC7D,IAAI,YAAY,CAAA;IAChB,IAAI,IAAI,EAAE;QACR,YAAY,GAAG,IAAI,CAAC,QAAQ,IAAI,2BAAiB,CAAA;KAClD;SAAM;QACL,YAAY,GAAG,IAAA,qBAAW,GAAE,CAAA;KAC7B;IACD,MAAM,QAAQ,GAAG,IAAA,8BAAoB,EAAC,KAAK,CAAC,IAAI,2BAAiB,CAAA;IACjE,OAAO,QAAQ,KAAK,YAAY,CAAA;AAClC,CAAC,CAAA;AATY,QAAA,iBAAiB,qBAS7B;AAED,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,gCAAwB,CAAC,CAAA;AAEvD,MAAM,kBAAkB,GAAG,CAChC,GAAc,EACd,IAAwB,EACJ,EAAE;;IACtB,iCAAiC;IACjC,IAAI,CAAC,IAAA,uBAAa,GAAE,EAAE;QACpB,OAAO,2BAAiB,CAAA;KACzB;IAED,eAAe;IACf,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE;QACpC,IAAI,CAAC,aAAa,GAAG,KAAK,CAAA;KAC3B;IACD,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;QAC3B,IAAI,CAAC,iBAAiB,GAAG,cAAc,CAAA;KACxC;IACD,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;QAC3B,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAA;KAC5B;IAED,MAAM,SAAS,GAAG,CAAC,QAAkC,EAAE,EAAE;;QACvD,4BAA4B;QAC5B,IAAI,MAAA,IAAI,CAAC,iBAAiB,0CAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE;YAC9C,OAAO,KAAK,CAAA;SACb;QACD,IAAI,MAAA,IAAI,CAAC,iBAAiB,0CAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE;YAC9C,OAAO,IAAI,CAAA;SACZ;IACH,CAAC,CAAA;IAED,wBAAwB;IACxB,IAAI,SAAS,CAAC,gCAAwB,CAAC,IAAI,CAAC,EAAE;QAC5C,MAAM,YAAY,GAAG,MAAA,GAAG,CAAC,IAAI,0CAAE,QAAQ,CAAA;QACvC,IAAI,YAAY,EAAE;YAChB,OAAO,YAAY,CAAA;SACpB;KACF;IAED,SAAS;IACT,IAAI,SAAS,CAAC,gCAAwB,CAAC,MAAM,CAAC,EAAE;QAC9C,MAAM,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAM,CAAC,SAAS,CAAC,CAAA;QAC5D,IAAI,cAAc,EAAE;YAClB,OAAO,cAAwB,CAAA;SAChC;KACF;IAED,cAAc;IACd,IAAI,SAAS,CAAC,gCAAwB,CAAC,KAAK,CAAC,EAAE;QAC7C,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAA;QAChD,IAAI,aAAa,EAAE;YACjB,OAAO,aAAuB,CAAA;SAC/B;KACF;IAED,YAAY;IACZ,IAAI,SAAS,CAAC,gCAAwB,CAAC,SAAS,CAAC,EAAE;QACjD,uCAAuC;QACvC,IAAI,YAAY,CAAA;QAChB,IAAI;YACF,YAAY,GAAG,IAAI,GAAG,CAAC,IAAA,wBAAc,GAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;SAC5D;QAAC,OAAO,GAAQ,EAAE;YACjB,sDAAsD;YACtD,IAAI,GAAG,CAAC,IAAI,KAAK,iBAAiB,EAAE;gBAClC,MAAM,GAAG,CAAA;aACV;SACF;QACD,+CAA+C;QAC/C,MAAM,WAAW,GAAG,GAAG,CAAC,IAAI,CAAA;QAC5B,0CAA0C;QAC1C,IAAI,YAAY,IAAI,WAAW,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YACtD,MAAM,QAAQ,GAAG,WAAW,CAAC,SAAS,CACpC,CAAC,EACD,WAAW,CAAC,OAAO,CAAC,IAAI,YAAY,EAAE,CAAC,CACxC,CAAA;YACD,IAAI,QAAQ,EAAE;gBACZ,OAAO,QAAQ,CAAA;aAChB;SACF;KACF;IAED,OAAO;IACP,IAAI,SAAS,CAAC,gCAAwB,CAAC,IAAI,CAAC,EAAE;QAC5C,gEAAgE;QAChE,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAC5B,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CACnE,CAAA;QAED,kDAAkD;QAClD,MAAM,MAAM,GAAG,GAAG,CAAC,WAAW,CAAA;QAC9B,IAAI,GAAG,CAAA;QACP,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACxB,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;SAC3B;aAAM;YACL,GAAG,GAAG,MAAM,CAAA;SACb;QAED,IAAI,KAAK,EAAE;YACT,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAA;YACzD,IAAI,MAAM,CAAC,QAAQ,EAAE;gBACnB,OAAO,MAAM,CAAC,QAAQ,CAAA;aACvB;SACF;KACF;IAED,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;QACvB,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAA;KACpC;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AA7GY,QAAA,kBAAkB,sBA6G9B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
export declare function set(callback: () => any, period: number): NodeJS.
|
|
2
|
+
export declare function set(callback: () => any, period: number): NodeJS.Timeout;
|
|
3
3
|
export declare function clear(interval: NodeJS.Timeout): void;
|
|
4
4
|
export declare function cleanup(): void;
|
|
5
5
|
export declare class ExecutionTimeoutError extends Error {
|
package/dist/src/users/db.js
CHANGED
|
@@ -50,6 +50,7 @@ const types_1 = require("@budibase/types");
|
|
|
50
50
|
const utils_1 = require("./utils");
|
|
51
51
|
const lookup_1 = require("./lookup");
|
|
52
52
|
const utils_2 = require("../utils");
|
|
53
|
+
const security_1 = require("../security");
|
|
53
54
|
const bulkDeleteProcessing = (dbUser) => __awaiter(void 0, void 0, void 0, function* () {
|
|
54
55
|
const userId = dbUser._id;
|
|
55
56
|
yield platform.users.removeUser(dbUser);
|
|
@@ -100,6 +101,10 @@ class UserDB {
|
|
|
100
101
|
if (yield UserDB.isPreventPasswordActions(user, account)) {
|
|
101
102
|
throw new errors_1.HTTPError("Password change is disabled for this user", 400);
|
|
102
103
|
}
|
|
104
|
+
const passwordValidation = (0, security_1.validatePassword)(password);
|
|
105
|
+
if (!passwordValidation.valid) {
|
|
106
|
+
throw new errors_1.HTTPError(passwordValidation.error, 400);
|
|
107
|
+
}
|
|
103
108
|
hashedPassword = opts.hashPassword ? yield (0, utils_2.hash)(password) : password;
|
|
104
109
|
}
|
|
105
110
|
else if (dbUser) {
|
package/dist/src/users/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../../src/users/db.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../../src/users/db.ts"],"names":[],"mappings":"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"}
|
package/dist/src/utils/utils.js
CHANGED
|
@@ -59,7 +59,7 @@ function resolveAppUrl(ctx) {
|
|
|
59
59
|
const appUrl = ctx.path.split("/")[2];
|
|
60
60
|
let possibleAppUrl = `/${appUrl.toLowerCase()}`;
|
|
61
61
|
let tenantId = context.getTenantId();
|
|
62
|
-
if (environment_1.default.MULTI_TENANCY) {
|
|
62
|
+
if (!environment_1.default.isDev() && environment_1.default.MULTI_TENANCY) {
|
|
63
63
|
// always use the tenant id from the subdomain in multi tenancy
|
|
64
64
|
// this ensures the logged-in user tenant id doesn't overwrite
|
|
65
65
|
// e.g. in the case of viewing a public app while already logged-in to another tenant
|
|
@@ -67,7 +67,7 @@ function resolveAppUrl(ctx) {
|
|
|
67
67
|
includeStrategies: [types_1.TenantResolutionStrategy.SUBDOMAIN],
|
|
68
68
|
});
|
|
69
69
|
}
|
|
70
|
-
// search prod apps for
|
|
70
|
+
// search prod apps for an url that matches
|
|
71
71
|
const apps = yield context.doInTenant(tenantId, () => (0, db_1.getAllApps)({ dev: false }));
|
|
72
72
|
const app = apps.filter(a => a.url && a.url.toLowerCase() === possibleAppUrl)[0];
|
|
73
73
|
return app && app.appId ? app.appId : undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8BAAkC;AAClC,4CAA8E;AAC9E,iEAAgC;AAChC,oDAAqC;AACrC,oDAAqC;AACrC,2CAMwB;AAExB,gEAA0C;AAE1C,MAAM,UAAU,GAAG,wBAAY,CAAC,GAAG,GAAG,qBAAS,CAAA;AAC/C,MAAM,eAAe,GAAG,OAAO,CAAA;AAE/B,MAAM,oBAAoB,GAAG,cAAc,CAAA;AAC3C,MAAM,cAAc,GAAG,UAAU,CAAA;AACjC,MAAM,kBAAkB,GAAG,GAAG,cAAc,OAAO,CAAA;AACnD,MAAM,iBAAiB,GAAG,eAAe,CAAA;AAEzC,SAAS,YAAY,CAAC,aAAiC;IACrD,OAAO,aAAa,IAAI,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC;QAC1D,CAAC,CAAC,aAAa;QACf,CAAC,CAAC,SAAS,CAAA;AACf,CAAC;AAED,SAAsB,aAAa,CAAC,GAAQ;;QAC1C,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QACrC,IAAI,cAAc,GAAG,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE,CAAA;QAE/C,IAAI,QAAQ,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ const newEmail = () => {
|
|
|
11
11
|
exports.newEmail = newEmail;
|
|
12
12
|
const user = (userProps) => {
|
|
13
13
|
const userId = userProps === null || userProps === void 0 ? void 0 : userProps._id;
|
|
14
|
-
return Object.assign({ _id: userId, userId, email: (0, exports.newEmail)(), password: "
|
|
14
|
+
return Object.assign({ _id: userId, userId, email: (0, exports.newEmail)(), password: "password", roles: { app_test: "admin" }, firstName: generator_1.generator.first(), lastName: generator_1.generator.last(), pictureUrl: "http://test.com", tenantId: _1.tenant.id() }, userProps);
|
|
15
15
|
};
|
|
16
16
|
exports.user = user;
|
|
17
17
|
const adminUser = (userProps) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/users.ts"],"names":[],"mappings":";;;AAQA,+BAAmC;AACnC,qCAA+B;AAC/B,2CAAuC;AACvC,wBAA0B;AAEnB,MAAM,QAAQ,GAAG,GAAG,EAAE;IAC3B,OAAO,GAAG,IAAA,aAAI,GAAE,cAAc,CAAA;AAChC,CAAC,CAAA;AAFY,QAAA,QAAQ,YAEpB;AAEM,MAAM,IAAI,GAAG,CAAC,SAAyC,EAAQ,EAAE;IACtE,MAAM,MAAM,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,CAAA;IAC7B,uBACE,GAAG,EAAE,MAAM,EACX,MAAM,EACN,KAAK,EAAE,IAAA,gBAAQ,GAAE,EACjB,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/users.ts"],"names":[],"mappings":";;;AAQA,+BAAmC;AACnC,qCAA+B;AAC/B,2CAAuC;AACvC,wBAA0B;AAEnB,MAAM,QAAQ,GAAG,GAAG,EAAE;IAC3B,OAAO,GAAG,IAAA,aAAI,GAAE,cAAc,CAAA;AAChC,CAAC,CAAA;AAFY,QAAA,QAAQ,YAEpB;AAEM,MAAM,IAAI,GAAG,CAAC,SAAyC,EAAQ,EAAE;IACtE,MAAM,MAAM,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,CAAA;IAC7B,uBACE,GAAG,EAAE,MAAM,EACX,MAAM,EACN,KAAK,EAAE,IAAA,gBAAQ,GAAE,EACjB,QAAQ,EAAE,UAAU,EACpB,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAC5B,SAAS,EAAE,qBAAS,CAAC,KAAK,EAAE,EAC5B,QAAQ,EAAE,qBAAS,CAAC,IAAI,EAAE,EAC1B,UAAU,EAAE,iBAAiB,EAC7B,QAAQ,EAAE,SAAM,CAAC,EAAE,EAAE,IAClB,SAAS,EACb;AACH,CAAC,CAAA;AAdY,QAAA,IAAI,QAchB;AAEM,MAAM,SAAS,GAAG,CAAC,SAAe,EAAa,EAAE;IACtD,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,KAAK,EAAE;YACL,MAAM,EAAE,IAAI;SACb,EACD,OAAO,EAAE;YACP,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAVY,QAAA,SAAS,aAUrB;AAEM,MAAM,aAAa,GAAG,CAAC,SAAe,EAAiB,EAAE;IAC9D,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,KAAK,EAAE;YACL,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAPY,QAAA,aAAa,iBAOzB;AAEM,MAAM,WAAW,GAAG,CAAC,SAAyB,EAAe,EAAE;IACpE,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,OAAO,EAAE;YACP,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAPY,QAAA,WAAW,eAOvB;AAEM,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,SAAe,EAAe,EAAE;IAC5E,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,OAAO,EAAE;YACP,IAAI,EAAE,CAAC,KAAK,CAAC;SACd,IACF;AACH,CAAC,CAAA;AAPY,QAAA,cAAc,kBAO1B;AAED,SAAgB,OAAO,CACrB,OAAiD,EAAE;;IAEnD,MAAM,IAAI,GAAG,IAAA,YAAI,EAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC5B,OAAO,IAAI,CAAC,QAAQ,CAAA;IAEpB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACjB,IAAI,CAAC,OAAO,GAAG,IAAA,iBAAW,EAAC,IAAI,CAAC,CAAA;KACjC;IAED,uCACK,IAAI,KACP,kBAAkB,EAAE,KAAK,EACzB,MAAM,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,MAAM,EAC5B,QAAQ,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAS,EACjC,YAAY,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,YAAa,EACzC,iBAAiB,EAAE;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAI,CAAC,UAAU;SACzB,IACF;AACH,CAAC;AArBD,0BAqBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.14.0",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@budibase/nano": "10.1.4",
|
|
25
25
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
26
|
-
"@budibase/shared-core": "2.
|
|
27
|
-
"@budibase/types": "2.
|
|
26
|
+
"@budibase/shared-core": "2.14.0",
|
|
27
|
+
"@budibase/types": "2.14.0",
|
|
28
28
|
"@techpass/passport-openidconnect": "0.3.2",
|
|
29
29
|
"aws-cloudfront-sign": "3.0.2",
|
|
30
30
|
"aws-sdk": "2.1030.0",
|
|
@@ -65,7 +65,6 @@
|
|
|
65
65
|
"@types/cookies": "0.7.8",
|
|
66
66
|
"@types/jest": "29.5.5",
|
|
67
67
|
"@types/lodash": "4.14.200",
|
|
68
|
-
"@types/node": "18.17.0",
|
|
69
68
|
"@types/node-fetch": "2.6.4",
|
|
70
69
|
"@types/pouchdb": "6.4.0",
|
|
71
70
|
"@types/redlock": "4.0.3",
|
|
@@ -97,5 +96,5 @@
|
|
|
97
96
|
}
|
|
98
97
|
}
|
|
99
98
|
},
|
|
100
|
-
"gitHead": "
|
|
99
|
+
"gitHead": "099b1b7ffa7a54a523f212f79adac1d03e805daa"
|
|
101
100
|
}
|
|
@@ -134,7 +134,7 @@ export async function doInContext(appId: string, task: any): Promise<any> {
|
|
|
134
134
|
}
|
|
135
135
|
|
|
136
136
|
export async function doInTenant<T>(
|
|
137
|
-
tenantId: string |
|
|
137
|
+
tenantId: string | undefined,
|
|
138
138
|
task: () => T
|
|
139
139
|
): Promise<T> {
|
|
140
140
|
// make sure default always selected in single tenancy
|
package/src/index.ts
CHANGED
|
@@ -33,6 +33,7 @@ export * as docUpdates from "./docUpdates"
|
|
|
33
33
|
export * from "./utils/Duration"
|
|
34
34
|
export { SearchParams } from "./db"
|
|
35
35
|
export * as docIds from "./docIds"
|
|
36
|
+
export * as security from "./security"
|
|
36
37
|
// Add context to tenancy for backwards compatibility
|
|
37
38
|
// only do this for external usages to prevent internal
|
|
38
39
|
// circular dependencies
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { env } from ".."
|
|
2
|
+
|
|
3
|
+
export const PASSWORD_MIN_LENGTH = +(process.env.PASSWORD_MIN_LENGTH || 8)
|
|
4
|
+
export const PASSWORD_MAX_LENGTH = +(process.env.PASSWORD_MAX_LENGTH || 512)
|
|
5
|
+
|
|
6
|
+
export function validatePassword(
|
|
7
|
+
password: string
|
|
8
|
+
): { valid: true } | { valid: false; error: string } {
|
|
9
|
+
if (!password || password.length < PASSWORD_MIN_LENGTH) {
|
|
10
|
+
return {
|
|
11
|
+
valid: false,
|
|
12
|
+
error: `Password invalid. Minimum ${PASSWORD_MIN_LENGTH} characters.`,
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
if (password.length > PASSWORD_MAX_LENGTH) {
|
|
17
|
+
return {
|
|
18
|
+
valid: false,
|
|
19
|
+
error: `Password invalid. Maximum ${PASSWORD_MAX_LENGTH} characters.`,
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
return { valid: true }
|
|
24
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from "./auth"
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import { generator } from "../../../tests"
|
|
2
|
+
import { PASSWORD_MAX_LENGTH, validatePassword } from "../auth"
|
|
3
|
+
|
|
4
|
+
describe("auth", () => {
|
|
5
|
+
describe("validatePassword", () => {
|
|
6
|
+
it("a valid password returns successful", () => {
|
|
7
|
+
expect(validatePassword("password")).toEqual({ valid: true })
|
|
8
|
+
})
|
|
9
|
+
|
|
10
|
+
it.each([
|
|
11
|
+
["undefined", undefined],
|
|
12
|
+
["null", null],
|
|
13
|
+
["empty", ""],
|
|
14
|
+
])("%s returns unsuccessful", (_, password) => {
|
|
15
|
+
expect(validatePassword(password as string)).toEqual({
|
|
16
|
+
valid: false,
|
|
17
|
+
error: "Password invalid. Minimum 8 characters.",
|
|
18
|
+
})
|
|
19
|
+
})
|
|
20
|
+
|
|
21
|
+
it.each([
|
|
22
|
+
generator.word({ length: PASSWORD_MAX_LENGTH }),
|
|
23
|
+
generator.paragraph().substring(0, PASSWORD_MAX_LENGTH),
|
|
24
|
+
])(`can use passwords up to 512 characters in length`, password => {
|
|
25
|
+
expect(validatePassword(password)).toEqual({
|
|
26
|
+
valid: true,
|
|
27
|
+
})
|
|
28
|
+
})
|
|
29
|
+
|
|
30
|
+
it.each([
|
|
31
|
+
generator.word({ length: PASSWORD_MAX_LENGTH + 1 }),
|
|
32
|
+
generator
|
|
33
|
+
.paragraph({ sentences: 50 })
|
|
34
|
+
.substring(0, PASSWORD_MAX_LENGTH + 1),
|
|
35
|
+
])(
|
|
36
|
+
`passwords cannot have more than ${PASSWORD_MAX_LENGTH} characters`,
|
|
37
|
+
password => {
|
|
38
|
+
expect(validatePassword(password)).toEqual({
|
|
39
|
+
valid: false,
|
|
40
|
+
error: "Password invalid. Maximum 512 characters.",
|
|
41
|
+
})
|
|
42
|
+
}
|
|
43
|
+
)
|
|
44
|
+
})
|
|
45
|
+
})
|
package/src/tenancy/tenancy.ts
CHANGED
|
@@ -39,7 +39,7 @@ const ALL_STRATEGIES = Object.values(TenantResolutionStrategy)
|
|
|
39
39
|
export const getTenantIDFromCtx = (
|
|
40
40
|
ctx: BBContext,
|
|
41
41
|
opts: GetTenantIdOptions
|
|
42
|
-
): string |
|
|
42
|
+
): string | undefined => {
|
|
43
43
|
// exit early if not multi-tenant
|
|
44
44
|
if (!isMultiTenant()) {
|
|
45
45
|
return DEFAULT_TENANT_ID
|
|
@@ -144,5 +144,5 @@ export const getTenantIDFromCtx = (
|
|
|
144
144
|
ctx.throw(403, "Tenant id not set")
|
|
145
145
|
}
|
|
146
146
|
|
|
147
|
-
return
|
|
147
|
+
return undefined
|
|
148
148
|
}
|
|
@@ -157,12 +157,12 @@ describe("getTenantIDFromCtx", () => {
|
|
|
157
157
|
TenantResolutionStrategy.PATH,
|
|
158
158
|
],
|
|
159
159
|
}
|
|
160
|
-
expect(getTenantIDFromCtx(ctx, mockOpts)).
|
|
160
|
+
expect(getTenantIDFromCtx(ctx, mockOpts)).toBeUndefined()
|
|
161
161
|
expect(ctx.throw).toBeCalledTimes(1)
|
|
162
162
|
expect(ctx.throw).toBeCalledWith(403, "Tenant id not set")
|
|
163
163
|
})
|
|
164
164
|
|
|
165
|
-
it("returns
|
|
165
|
+
it("returns undefined if allowNoTenant is true", () => {
|
|
166
166
|
const ctx = createCtx({})
|
|
167
167
|
mockOpts = {
|
|
168
168
|
allowNoTenant: true,
|
|
@@ -172,7 +172,7 @@ describe("getTenantIDFromCtx", () => {
|
|
|
172
172
|
TenantResolutionStrategy.PATH,
|
|
173
173
|
],
|
|
174
174
|
}
|
|
175
|
-
expect(getTenantIDFromCtx(ctx, mockOpts)).
|
|
175
|
+
expect(getTenantIDFromCtx(ctx, mockOpts)).toBeUndefined()
|
|
176
176
|
})
|
|
177
177
|
})
|
|
178
178
|
|
package/src/users/db.ts
CHANGED
|
@@ -27,6 +27,7 @@ import {
|
|
|
27
27
|
} from "./utils"
|
|
28
28
|
import { searchExistingEmails } from "./lookup"
|
|
29
29
|
import { hash } from "../utils"
|
|
30
|
+
import { validatePassword } from "../security"
|
|
30
31
|
|
|
31
32
|
type QuotaUpdateFn = (
|
|
32
33
|
change: number,
|
|
@@ -110,6 +111,12 @@ export class UserDB {
|
|
|
110
111
|
if (await UserDB.isPreventPasswordActions(user, account)) {
|
|
111
112
|
throw new HTTPError("Password change is disabled for this user", 400)
|
|
112
113
|
}
|
|
114
|
+
|
|
115
|
+
const passwordValidation = validatePassword(password)
|
|
116
|
+
if (!passwordValidation.valid) {
|
|
117
|
+
throw new HTTPError(passwordValidation.error, 400)
|
|
118
|
+
}
|
|
119
|
+
|
|
113
120
|
hashedPassword = opts.hashPassword ? await hash(password) : password
|
|
114
121
|
} else if (dbUser) {
|
|
115
122
|
hashedPassword = dbUser.password
|
package/src/utils/utils.ts
CHANGED
|
@@ -31,8 +31,8 @@ export async function resolveAppUrl(ctx: Ctx) {
|
|
|
31
31
|
const appUrl = ctx.path.split("/")[2]
|
|
32
32
|
let possibleAppUrl = `/${appUrl.toLowerCase()}`
|
|
33
33
|
|
|
34
|
-
let tenantId: string |
|
|
35
|
-
if (env.MULTI_TENANCY) {
|
|
34
|
+
let tenantId: string | undefined = context.getTenantId()
|
|
35
|
+
if (!env.isDev() && env.MULTI_TENANCY) {
|
|
36
36
|
// always use the tenant id from the subdomain in multi tenancy
|
|
37
37
|
// this ensures the logged-in user tenant id doesn't overwrite
|
|
38
38
|
// e.g. in the case of viewing a public app while already logged-in to another tenant
|
|
@@ -41,7 +41,7 @@ export async function resolveAppUrl(ctx: Ctx) {
|
|
|
41
41
|
})
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
-
// search prod apps for
|
|
44
|
+
// search prod apps for an url that matches
|
|
45
45
|
const apps: App[] = await context.doInTenant(
|
|
46
46
|
tenantId,
|
|
47
47
|
() => getAllApps({ dev: false }) as Promise<App[]>
|
|
@@ -21,7 +21,7 @@ export const user = (userProps?: Partial<Omit<User, "userId">>): User => {
|
|
|
21
21
|
_id: userId,
|
|
22
22
|
userId,
|
|
23
23
|
email: newEmail(),
|
|
24
|
-
password: "
|
|
24
|
+
password: "password",
|
|
25
25
|
roles: { app_test: "admin" },
|
|
26
26
|
firstName: generator.first(),
|
|
27
27
|
lastName: generator.last(),
|