@cubejs-backend/api-gateway 0.34.25 → 0.34.27
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-server.d.ts","sourceRoot":"","sources":["../../src/sql-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,oBAAoB,EACpB,OAAO,IAAI,aAAa,EACxB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAIhC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,KAAK,EAAE,cAAc,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAE/F,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,CAAC,EAAE,cAAc,CAAC;IAC9B,gBAAgB,CAAC,EAAE,kBAAkB,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,qBAAa,SAAS;IAIlB,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU;IAH3C,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,IAAI,CAAQ;gBAG9C,UAAU,EAAE,UAAU;IAQ9B,IAAI,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"sql-server.d.ts","sourceRoot":"","sources":["../../src/sql-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,oBAAoB,EACpB,OAAO,IAAI,aAAa,EACxB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAIhC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,KAAK,EAAE,cAAc,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAE/F,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,CAAC,EAAE,cAAc,CAAC;IAC9B,gBAAgB,CAAC,EAAE,kBAAkB,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,qBAAa,SAAS;IAIlB,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU;IAH3C,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,IAAI,CAAQ;gBAG9C,UAAU,EAAE,UAAU;IAQ9B,IAAI,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoK3D,SAAS,CAAC,kBAAkB,CAAC,YAAY,EAAE,cAAc,GAAG,cAAc;IAW1E,SAAS,CAAC,+BAA+B,CAAC,OAAO,EAAE,gBAAgB,GAAG,kBAAkB;IAYxF,SAAS,CAAC,2BAA2B,CAAC,OAAO,EAAE,gBAAgB,GAAG,cAAc;cAmChE,kBAAkB,CAAC,GAAG,EAAE,aAAa,CAAC,eAAe,CAAC,EAAE,eAAe,KAAA,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAS/H,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAGpC"}
|
package/dist/src/sql-server.js
CHANGED
|
@@ -43,36 +43,37 @@ class SQLServer {
|
|
|
43
43
|
|| this.createDefaultCanSwitchSqlUserFn(options);
|
|
44
44
|
const contextByRequest = async (request, session) => {
|
|
45
45
|
let userForContext = session.user;
|
|
46
|
+
let { securityContext } = session;
|
|
46
47
|
if (request.meta.changeUser && request.meta.changeUser !== session.user) {
|
|
47
48
|
const canSwitch = session.superuser || await canSwitchSqlUser(session.user, request.meta.changeUser);
|
|
48
49
|
if (canSwitch) {
|
|
49
50
|
userForContext = request.meta.changeUser;
|
|
51
|
+
const current = await checkSqlAuth(request, userForContext, null);
|
|
52
|
+
securityContext = current.securityContext;
|
|
50
53
|
}
|
|
51
54
|
else {
|
|
52
55
|
throw new Error(`You cannot change security context via __user from ${session.user} to ${request.meta.changeUser}, because it's not allowed.`);
|
|
53
56
|
}
|
|
54
57
|
}
|
|
55
|
-
|
|
56
|
-
const current = await checkSqlAuth(request, userForContext);
|
|
57
|
-
return this.contextByNativeReq(request, current.securityContext, request.id);
|
|
58
|
+
return this.contextByNativeReq(request, securityContext, request.id);
|
|
58
59
|
};
|
|
59
60
|
const canSwitchUserForSession = async (session, user) => session.superuser || canSwitchSqlUser(session.user, user);
|
|
60
61
|
this.sqlInterfaceInstance = await (0, native_1.registerInterface)({
|
|
61
62
|
port: options.sqlPort,
|
|
62
63
|
pgPort: options.pgSqlPort,
|
|
63
64
|
nonce: options.sqlNonce,
|
|
64
|
-
checkAuth: async ({ request, user }) => {
|
|
65
|
-
const { password, superuser } = await checkSqlAuth(request, user);
|
|
65
|
+
checkAuth: async ({ request, user, password }) => {
|
|
66
|
+
const { password: returnedPassword, superuser, securityContext, skipPasswordCheck } = await checkSqlAuth(request, user, password);
|
|
66
67
|
// Strip securityContext to improve speed deserialization
|
|
67
68
|
return {
|
|
68
|
-
password,
|
|
69
|
+
password: returnedPassword,
|
|
69
70
|
superuser: superuser || false,
|
|
71
|
+
securityContext,
|
|
72
|
+
skipPasswordCheck,
|
|
70
73
|
};
|
|
71
74
|
},
|
|
72
75
|
meta: async ({ request, session }) => {
|
|
73
|
-
|
|
74
|
-
const { securityContext } = await checkSqlAuth(request, session.user);
|
|
75
|
-
const context = await this.apiGateway.contextByReq(request, securityContext, request.id);
|
|
76
|
+
const context = await this.apiGateway.contextByReq(request, session.securityContext, request.id);
|
|
76
77
|
// eslint-disable-next-line no-async-promise-executor
|
|
77
78
|
return new Promise(async (resolve, reject) => {
|
|
78
79
|
try {
|
|
@@ -168,9 +169,7 @@ class SQLServer {
|
|
|
168
169
|
sqlGenerators: async (paramsJson) => {
|
|
169
170
|
// TODO get rid of it
|
|
170
171
|
const { request, session } = JSON.parse(paramsJson);
|
|
171
|
-
|
|
172
|
-
const { securityContext } = await checkSqlAuth(request, session.user);
|
|
173
|
-
const context = await this.apiGateway.contextByReq(request, securityContext, request.id);
|
|
172
|
+
const context = await this.apiGateway.contextByReq(request, session.securityContext, request.id);
|
|
174
173
|
// eslint-disable-next-line no-async-promise-executor
|
|
175
174
|
return new Promise(async (resolve, reject) => {
|
|
176
175
|
try {
|
|
@@ -190,14 +189,11 @@ class SQLServer {
|
|
|
190
189
|
});
|
|
191
190
|
}
|
|
192
191
|
wrapCheckSqlAuthFn(checkSqlAuth) {
|
|
193
|
-
return async (req, user) => {
|
|
194
|
-
const response = await checkSqlAuth(req, user);
|
|
195
|
-
if (typeof response !== 'object'
|
|
192
|
+
return async (req, user, password) => {
|
|
193
|
+
const response = await checkSqlAuth(req, user, password);
|
|
194
|
+
if (typeof response !== 'object') {
|
|
196
195
|
throw new Error('checkSqlAuth must return an object');
|
|
197
196
|
}
|
|
198
|
-
if (!response.password) {
|
|
199
|
-
throw new Error('checkSqlAuth must return an object with password field');
|
|
200
|
-
}
|
|
201
197
|
return response;
|
|
202
198
|
};
|
|
203
199
|
}
|
|
@@ -229,7 +225,8 @@ class SQLServer {
|
|
|
229
225
|
}
|
|
230
226
|
return {
|
|
231
227
|
password: allowedPassword,
|
|
232
|
-
securityContext: {}
|
|
228
|
+
securityContext: {},
|
|
229
|
+
skipPasswordCheck: (0, shared_1.getEnv)('devMode') && !allowedPassword
|
|
233
230
|
};
|
|
234
231
|
};
|
|
235
232
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-server.js","sourceRoot":"","sources":["../../src/sql-server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAMgC;AAChC,mDAAmE;AAEnE,+CAAiC;AAejC,MAAa,SAAS;IAGpB,YACqB,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;QAHjC,yBAAoB,GAAgC,IAAI,CAAC;QAKjE,IAAA,oBAAW,EACT,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EACpC,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAC5D,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,OAAyB;QACzC,IAAI,IAAI,CAAC,oBAAoB,EAAE;YAC7B,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;SAC5D;QAED,MAAM,YAAY,GAAmB,CAAC,OAAO,CAAC,YAAY,IAAI,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;eACvG,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;QAE/C,MAAM,gBAAgB,GAAuB,OAAO,CAAC,gBAAgB;eAChE,IAAI,CAAC,+BAA+B,CAAC,OAAO,CAAC,CAAC;QAEnD,MAAM,gBAAgB,GAAG,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;YAClD,IAAI,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;YAElC,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,KAAK,OAAO,CAAC,IAAI,EAAE;gBACvE,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,MAAM,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBACrG,IAAI,SAAS,EAAE;oBACb,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"sql-server.js","sourceRoot":"","sources":["../../src/sql-server.ts"],"names":[],"mappings":"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"}
|
package/dist/src/types/auth.d.ts
CHANGED
|
@@ -46,13 +46,14 @@ type CheckSQLAuthSuccessResponse = {
|
|
|
46
46
|
password: string | null;
|
|
47
47
|
superuser?: boolean;
|
|
48
48
|
securityContext?: any;
|
|
49
|
+
skipPasswordCheck?: boolean;
|
|
49
50
|
};
|
|
50
51
|
/**
|
|
51
52
|
* Function that should provide SQL auth mechanic. Used as a part
|
|
52
53
|
* of a main configuration object of the server-core to provide SQL
|
|
53
54
|
* auth logic.
|
|
54
55
|
*/
|
|
55
|
-
type CheckSQLAuthFn = (ctx: any, user: string | null) => Promise<CheckSQLAuthSuccessResponse> | CheckSQLAuthSuccessResponse;
|
|
56
|
+
type CheckSQLAuthFn = (ctx: any, user: string | null, password: string | null) => Promise<CheckSQLAuthSuccessResponse> | CheckSQLAuthSuccessResponse;
|
|
56
57
|
/**
|
|
57
58
|
* Function that should provide changing of security context (__user field) for SQL. This function returns boolean which
|
|
58
59
|
* explains to SQL APi that it's possible to change current user to user.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/types/auth.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC;;GAEG;AACH,KAAK,cAAc,GAAG,SAAS,EAAE,CAAC;AAElC;;GAEG;AACH,KAAK,wBAAwB,GAAG;IAC9B,qBAAqB,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF;;;GAGG;AACH,UAAU,UAAU;IAElB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC;IAC/D,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAG1B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,KAAK,WAAW,GACd,CAAC,GAAG,EAAE,GAAG,EAAE,aAAa,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAE7D;;GAEG;AACH,KAAK,2BAA2B,GAAG;IACjC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,eAAe,CAAC,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/types/auth.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC;;GAEG;AACH,KAAK,cAAc,GAAG,SAAS,EAAE,CAAC;AAElC;;GAEG;AACH,KAAK,wBAAwB,GAAG;IAC9B,qBAAqB,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF;;;GAGG;AACH,UAAU,UAAU;IAElB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC;IAC/D,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAG1B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,KAAK,WAAW,GACd,CAAC,GAAG,EAAE,GAAG,EAAE,aAAa,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAE7D;;GAEG;AACH,KAAK,2BAA2B,GAAG;IACjC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF;;;;GAIG;AACH,KAAK,cAAc,GACjB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,KACrD,OAAO,CAAC,2BAA2B,CAAC,GACpC,2BAA2B,CAAC;AAEhC;;;GAGG;AACH,KAAK,kBAAkB,GACrB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,KACnC,OAAO,CAAC,OAAO,CAAC,GAChB,OAAO,CAAC;AAEZ;;GAEG;AACH,KAAK,oBAAoB,GACvB,CAAC,eAAe,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,cAAc,KAC7C,OAAO,CAAC,cAAc,CAAC,CAAC;AAE5B,OAAO,EACL,wBAAwB,EACxB,UAAU,EACV,WAAW,EACX,2BAA2B,EAC3B,cAAc,EACd,kBAAkB,EAClB,cAAc,EACd,oBAAoB,GACrB,CAAC"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@cubejs-backend/api-gateway",
|
|
3
3
|
"description": "Cube.js API Gateway",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "0.34.
|
|
5
|
+
"version": "0.34.27",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.git",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"dist/src/*"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@cubejs-backend/native": "^0.34.
|
|
30
|
+
"@cubejs-backend/native": "^0.34.27",
|
|
31
31
|
"@cubejs-backend/shared": "^0.34.25",
|
|
32
32
|
"@ungap/structured-clone": "^0.3.4",
|
|
33
33
|
"body-parser": "^1.19.0",
|
|
@@ -82,5 +82,5 @@
|
|
|
82
82
|
],
|
|
83
83
|
"snapshotResolver": "<rootDir>/test/snapshotResolver.js"
|
|
84
84
|
},
|
|
85
|
-
"gitHead": "
|
|
85
|
+
"gitHead": "869a81f0c85fa6557a15aa5885e24b6eee2bea9c"
|
|
86
86
|
}
|