prostgles-server 4.2.441 → 4.2.443
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/DboBuilder/DboBuilderTypes.d.ts +2 -1
- package/dist/DboBuilder/DboBuilderTypes.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.js +4 -4
- package/dist/DboBuilder/QueryBuilder/getNewQuery.js.map +1 -1
- package/dist/DboBuilder/TableHandler/insert/insertNestedRecords.d.ts +1 -1
- package/dist/DboBuilder/TableHandler/insert/insertNestedRecords.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/insert/insertNestedRecords.js +4 -4
- package/dist/DboBuilder/TableHandler/insert/insertNestedRecords.js.map +1 -1
- package/dist/DboBuilder/TableHandler/update.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/update.js +1 -1
- package/dist/DboBuilder/TableHandler/update.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getExistsCondition.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getExistsCondition.js +1 -1
- package/dist/DboBuilder/ViewHandler/getExistsCondition.js.map +1 -1
- package/dist/PublishParser/PublishParser.d.ts +3 -3
- package/dist/PublishParser/PublishParser.d.ts.map +1 -1
- package/dist/PublishParser/PublishParser.js +40 -13
- package/dist/PublishParser/PublishParser.js.map +1 -1
- package/dist/PublishParser/getFileTableRules.d.ts +2 -1
- package/dist/PublishParser/getFileTableRules.d.ts.map +1 -1
- package/dist/PublishParser/getFileTableRules.js +2 -2
- package/dist/PublishParser/getFileTableRules.js.map +1 -1
- package/dist/PublishParser/getSchemaFromPublish.d.ts.map +1 -1
- package/dist/PublishParser/getSchemaFromPublish.js +1 -1
- package/dist/PublishParser/getSchemaFromPublish.js.map +1 -1
- package/dist/runClientRequest.d.ts.map +1 -1
- package/dist/runClientRequest.js +2 -1
- package/dist/runClientRequest.js.map +1 -1
- package/lib/DboBuilder/DboBuilderTypes.ts +2 -1
- package/lib/DboBuilder/QueryBuilder/getNewQuery.ts +16 -13
- package/lib/DboBuilder/TableHandler/insert/insertNestedRecords.ts +21 -7
- package/lib/DboBuilder/TableHandler/update.ts +6 -1
- package/lib/DboBuilder/ViewHandler/getExistsCondition.ts +10 -7
- package/lib/PublishParser/PublishParser.ts +40 -14
- package/lib/PublishParser/getFileTableRules.ts +8 -6
- package/lib/PublishParser/getSchemaFromPublish.ts +5 -1
- package/lib/runClientRequest.ts +2 -0
- package/package.json +1 -1
|
@@ -2,7 +2,7 @@ import * as pgPromise from "pg-promise";
|
|
|
2
2
|
import type { AnyObject, ClientSchema, ColumnInfo, EXISTS_KEY, RawJoinPath, SQLHandler, TableInfo as TInfo, UserLike } from "prostgles-types";
|
|
3
3
|
import type { AuthClientRequest, BasicSession, SessionUser } from "../Auth/AuthTypes";
|
|
4
4
|
import type { BasicCallback } from "../PubSubManager/PubSubManager";
|
|
5
|
-
import type { PublishAllOrNothing } from "../PublishParser/PublishParser";
|
|
5
|
+
import type { PermissionScope, PublishAllOrNothing } from "../PublishParser/PublishParser";
|
|
6
6
|
import type { FieldSpec } from "./QueryBuilder/Functions/Functions";
|
|
7
7
|
import type { TableHandler } from "./TableHandler/TableHandler";
|
|
8
8
|
import type { ParsedJoinPath } from "./ViewHandler/parseJoinPath";
|
|
@@ -146,6 +146,7 @@ export type LocalParams = {
|
|
|
146
146
|
isRemoteRequest?: {
|
|
147
147
|
user?: UserLike | undefined;
|
|
148
148
|
};
|
|
149
|
+
scope?: PermissionScope | undefined;
|
|
149
150
|
func?: () => any;
|
|
150
151
|
testRule?: boolean;
|
|
151
152
|
tableAlias?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DboBuilderTypes.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilderTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EACZ,UAAU,EACV,UAAU,EACV,WAAW,EACX,UAAU,EACV,SAAS,IAAI,KAAK,EAClB,QAAQ,EACT,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACtF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"DboBuilderTypes.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilderTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNewQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAKV,YAAY,EAEb,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAuB,MAAM,eAAe,CAAC;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"getNewQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAKV,YAAY,EAEb,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAuB,MAAM,eAAe,CAAC;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAM9D,OAAO,KAAK,EAAE,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AAyE7D,wBAAsB,WAAW,CAC/B,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,MAAM,EACd,YAAY,GAAE,YAAY,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,aAAK,EACpD,aAAa,kBAAO,EACpB,UAAU,EAAE,eAAe,GAAG,SAAS,EACvC,WAAW,EAAE,WAAW,GAAG,SAAS,GACnC,OAAO,CAAC,QAAQ,CAAC,CA8KnB"}
|
|
@@ -4,9 +4,9 @@ exports.getNewQuery = getNewQuery;
|
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const parseJoinPath_1 = require("../ViewHandler/parseJoinPath");
|
|
6
6
|
const prepareSortItems_1 = require("../ViewHandler/prepareSortItems");
|
|
7
|
+
const COMPUTED_FIELDS_1 = require("./Functions/COMPUTED_FIELDS");
|
|
7
8
|
const Functions_1 = require("./Functions/Functions");
|
|
8
9
|
const QueryBuilder_1 = require("./QueryBuilder");
|
|
9
|
-
const COMPUTED_FIELDS_1 = require("./Functions/COMPUTED_FIELDS");
|
|
10
10
|
const JOIN_KEYS = ["$innerJoin", "$leftJoin"];
|
|
11
11
|
const JOIN_PARAM_KEYS = (0, prostgles_types_1.getKeys)({
|
|
12
12
|
$condition: 1,
|
|
@@ -32,7 +32,7 @@ const parseJoinSelect = (joinParams) => {
|
|
|
32
32
|
params: joinParams,
|
|
33
33
|
};
|
|
34
34
|
}
|
|
35
|
-
const [joinKey, ...otherKeys] = (0, prostgles_types_1.getKeys)(joinParams).filter((k) =>
|
|
35
|
+
const [joinKey, ...otherKeys] = (0, prostgles_types_1.getKeys)(joinParams).filter((k) => (0, prostgles_types_1.includes)(JOIN_KEYS, k));
|
|
36
36
|
if (otherKeys.length) {
|
|
37
37
|
return {
|
|
38
38
|
error: "Cannot specify more than one join type ( $innerJoin OR $leftJoin )",
|
|
@@ -40,7 +40,7 @@ const parseJoinSelect = (joinParams) => {
|
|
|
40
40
|
}
|
|
41
41
|
else if (joinKey) {
|
|
42
42
|
/* Full option join { field_name: db.innerJoin.table_name(filter, select) } */
|
|
43
|
-
const invalidParams = Object.keys(joinParams).filter((k) => ![...JOIN_PARAM_KEYS, ...JOIN_KEYS]
|
|
43
|
+
const invalidParams = Object.keys(joinParams).filter((k) => !(0, prostgles_types_1.includes)([...JOIN_PARAM_KEYS, ...JOIN_KEYS], k));
|
|
44
44
|
if (invalidParams.length) {
|
|
45
45
|
throw "Invalid join params: " + invalidParams.join(", ");
|
|
46
46
|
}
|
|
@@ -131,7 +131,7 @@ async function getNewQuery(_this, filter, selectParams = {}, param3_unused = nul
|
|
|
131
131
|
tableName: joinTableName,
|
|
132
132
|
command: "find",
|
|
133
133
|
clientReq: localParams.clientReq,
|
|
134
|
-
});
|
|
134
|
+
}, localParams.scope);
|
|
135
135
|
}
|
|
136
136
|
const isAllowedAccessToTable = isLocal || joinTableRules;
|
|
137
137
|
if (isAllowedAccessToTable) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNewQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":";;AA0FA,
|
|
1
|
+
{"version":3,"file":"getNewQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ export declare function insertNestedRecords(this: TableHandler, { data, insertPa
|
|
|
17
17
|
data?: AnyObject | AnyObject[];
|
|
18
18
|
insertResult?: AnyObject | AnyObject[];
|
|
19
19
|
}>;
|
|
20
|
-
export declare const getInsertTableRules: (tableHandler: TableHandler, targetTable: string, clientReq: AuthClientRequest | undefined) => Promise<ParsedTableRule>;
|
|
20
|
+
export declare const getInsertTableRules: (tableHandler: TableHandler, targetTable: string, clientReq: AuthClientRequest | undefined, scope: LocalParams["scope"]) => Promise<ParsedTableRule>;
|
|
21
21
|
type ReferenceColumnInsert<ExpectSingleInsert> = {
|
|
22
22
|
tableName: string;
|
|
23
23
|
insertedFieldName: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insertNestedRecords.d.ts","sourceRoot":"","sources":["../../../../lib/DboBuilder/TableHandler/insert/insertNestedRecords.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAML,KAAK,UAAU,EAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,KAAK,EAAE,WAAW,EAAiB,MAAM,kBAAkB,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,KAAK,uBAAuB,GAAG;IAC7B,IAAI,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;IAC9B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,UAAU,EAAE,eAAe,GAAG,SAAS,CAAC;IACxC,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;CACtC,CAAC;AAEF;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,YAAY,EAClB,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,uBAAuB,GACvE,OAAO,CAAC;IACT,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;IAC/B,YAAY,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;CACxC,CAAC,
|
|
1
|
+
{"version":3,"file":"insertNestedRecords.d.ts","sourceRoot":"","sources":["../../../../lib/DboBuilder/TableHandler/insert/insertNestedRecords.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAML,KAAK,UAAU,EAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,KAAK,EAAE,WAAW,EAAiB,MAAM,kBAAkB,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,KAAK,uBAAuB,GAAG;IAC7B,IAAI,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;IAC9B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,UAAU,EAAE,eAAe,GAAG,SAAS,CAAC;IACxC,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;CACtC,CAAC;AAEF;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,YAAY,EAClB,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,uBAAuB,GACvE,OAAO,CAAC;IACT,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;IAC/B,YAAY,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;CACxC,CAAC,CAwTD;AAGD,eAAO,MAAM,mBAAmB,GAC9B,cAAc,YAAY,EAC1B,aAAa,MAAM,EACnB,WAAW,iBAAiB,GAAG,SAAS,EACxC,OAAO,WAAW,CAAC,OAAO,CAAC,6BAa5B,CAAC;AAqDF,KAAK,qBAAqB,CAAC,kBAAkB,IAAI;IAC/C,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;IAC7D,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,kBAAkB,SAAS,IAAI,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,EAAE,CAAC;CAC7E,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,GAAI,kBAAkB,SAAS,OAAO,EAC1E,cAAc,YAAY,EAC1B,WAAW,SAAS,EACpB,qBAAqB,kBAAkB,KACtC,qBAAqB,CAAC,kBAAkB,CAAC,EAwC3C,CAAC"}
|
|
@@ -148,7 +148,7 @@ async function insertNestedRecords({ data, insertParams, tableRules, localParams
|
|
|
148
148
|
const joinPath = getJoinPath(this, targetTable);
|
|
149
149
|
const { path } = joinPath;
|
|
150
150
|
const [tbl1, tbl2, tbl3] = path;
|
|
151
|
-
targetTableRules = await (0, exports.getInsertTableRules)(this, targetTable, localParams?.clientReq);
|
|
151
|
+
targetTableRules = await (0, exports.getInsertTableRules)(this, targetTable, localParams?.clientReq, localParams?.scope);
|
|
152
152
|
const cols2 = this.dboBuilder.dbo[tbl2].columns || [];
|
|
153
153
|
if (!this.dboBuilder.dbo[tbl2])
|
|
154
154
|
throw "Invalid/disallowed table: " + tbl2;
|
|
@@ -237,12 +237,12 @@ async function insertNestedRecords({ data, insertParams, tableRules, localParams
|
|
|
237
237
|
return res;
|
|
238
238
|
}
|
|
239
239
|
/* Must be allowed to insert into referenced table */
|
|
240
|
-
const getInsertTableRules = async (tableHandler, targetTable, clientReq) => {
|
|
240
|
+
const getInsertTableRules = async (tableHandler, targetTable, clientReq, scope) => {
|
|
241
241
|
const childRules = await tableHandler.dboBuilder.publishParser?.getValidatedRequestRuleWusr({
|
|
242
242
|
tableName: targetTable,
|
|
243
243
|
command: "insert",
|
|
244
244
|
clientReq,
|
|
245
|
-
});
|
|
245
|
+
}, scope);
|
|
246
246
|
if (!childRules || !childRules.insert)
|
|
247
247
|
throw "Dissallowed nested insert into table " + targetTable;
|
|
248
248
|
return childRules;
|
|
@@ -261,7 +261,7 @@ const referencedInsert = async (tableHandler, dbTX, localParams, targetTable, ta
|
|
|
261
261
|
if (!dbTX?.[targetTable] || !("insert" in dbTX[targetTable])) {
|
|
262
262
|
throw new Error("childInsertErr: Table handler missing for referenced table: " + targetTable);
|
|
263
263
|
}
|
|
264
|
-
const childRules = await (0, exports.getInsertTableRules)(tableHandler, targetTable, localParams?.clientReq);
|
|
264
|
+
const childRules = await (0, exports.getInsertTableRules)(tableHandler, targetTable, localParams?.clientReq, localParams?.scope);
|
|
265
265
|
return Promise.all((Array.isArray(targetData) ? targetData : [targetData]).map((m) => dbTX[targetTable]
|
|
266
266
|
.insert(m, { returning: "*", onConflict }, undefined, childRules, localParams)
|
|
267
267
|
.catch((e) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insertNestedRecords.js","sourceRoot":"","sources":["../../../../lib/DboBuilder/TableHandler/insert/insertNestedRecords.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"insertNestedRecords.js","sourceRoot":"","sources":["../../../../lib/DboBuilder/TableHandler/insert/insertNestedRecords.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAKzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAGnD,wBAAsB,MAAM,CAC1B,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,SAAS,EACnB,MAAM,CAAC,EAAE,YAAY,EACrB,UAAU,CAAC,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAKzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAGnD,wBAAsB,MAAM,CAC1B,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,SAAS,EACnB,MAAM,CAAC,EAAE,YAAY,EACrB,UAAU,CAAC,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA6L3B"}
|
|
@@ -84,7 +84,7 @@ async function update(filter, _newData, params, tableRules, localParams) {
|
|
|
84
84
|
const nesedTableHandler = finalDBtx[nestedInsert.tableName];
|
|
85
85
|
if (!nesedTableHandler)
|
|
86
86
|
throw `nestedInsert Tablehandler not found for ${nestedInsert.tableName}`;
|
|
87
|
-
const refTableRules = !localParams ? undefined : (await (0, insertNestedRecords_1.getInsertTableRules)(this, nestedInsert.tableName, localParams.clientReq));
|
|
87
|
+
const refTableRules = !localParams ? undefined : (await (0, insertNestedRecords_1.getInsertTableRules)(this, nestedInsert.tableName, localParams.clientReq, localParams.scope));
|
|
88
88
|
const nestedLocalParams = {
|
|
89
89
|
...localParams,
|
|
90
90
|
nestedInsert: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":";;AAUA,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getExistsCondition.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAKjD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,kBAAkB,EAC3B,WAAW,EAAE,WAAW,GAAG,SAAS,GACnC,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"getExistsCondition.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAKjD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,kBAAkB,EAC3B,WAAW,EAAE,WAAW,GAAG,SAAS,GACnC,OAAO,CAAC,MAAM,CAAC,CAqEjB"}
|
|
@@ -25,7 +25,7 @@ async function getExistsCondition(eConfig, localParams) {
|
|
|
25
25
|
tableName: targetTable,
|
|
26
26
|
command: "find",
|
|
27
27
|
clientReq: localParams.clientReq,
|
|
28
|
-
}));
|
|
28
|
+
}, localParams.scope));
|
|
29
29
|
if (!t2Rules || !t2Rules.select)
|
|
30
30
|
throw "Dissallowed";
|
|
31
31
|
({ forcedFilter, filterFields } = t2Rules.select);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getExistsCondition.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":";;AAQA,
|
|
1
|
+
{"version":3,"file":"getExistsCondition.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":";;AAQA,gDAyEC;AAhFD,qDAAsD;AAKtD,2DAAwD;AAEjD,KAAK,UAAU,kBAAkB,CAEtC,OAA2B,EAC3B,WAAoC;IAEpC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC;IAC5B,MAAM,WAAW,GAAG,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEnF,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;IAEtC,mCAAmC;IACnC,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,6BAAW,CAAC,QAAQ,CAAC,EAAgB,CAAC,CAAC,EAAE,CAAC;QACxF,MAAM;YACJ,KAAK,EAAE,CAAC,yBAAyB,CAAC;YAClC,OAAO,EAAE,2BAA2B;SACrC,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,GAAgC,SAAS,EAClD,YAAmC,EACnC,YAAqC,EACrC,UAAU,CAAC;IAEb,uGAAuG;IACvG,IAAI,WAAW,EAAE,eAAe,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;QAC3D,MAAM,+DAA+D,CAAC;IACxE,CAAC;IACD,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;IAC9F,IAAI,WAAW,EAAE,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;QAC5D,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,2BAA2B,CACxE;YACE,SAAS,EAAE,WAAW;YACtB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,WAAW,CAAC,SAAS;SACjC,EACD,WAAW,CAAC,KAAK,CAClB,CAAgC,CAAC;QAElC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,MAAM,aAAa,CAAC;QACrD,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAAiB,CAAC;IACtE,MAAM,UAAU,GAAG,CACjB,MAAM,YAAY,CAAC,YAAY,CAAC;QAC9B,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,iBAAiB;QACzB,YAAY;QACZ,YAAY;QACZ,QAAQ,EAAE,KAAK;QACf,UAAU;QACV,WAAW;QACX,SAAS,EAAE,OAAO;KACnB,CAAC,CACH,CAAC,KAAK,CAAC;IAER,IAAI,UAAU,GAAG;QACf,UAAU;QACV,QAAQ,IAAA,wBAAM,EAAC,WAAW,CAAC,EAAE;QAC7B,GAAG,UAAU,CAAC,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;KAC7C,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,qCAAiB,EAAC;YAClC,IAAI,EAAE,OAAO,CAAC,UAAU;YACxB,cAAc,EAAE,SAAS;YACzB,IAAI,EAAE,QAAQ;YACd,UAAU;SACX,CAAC,CAAC;QACH,UAAU,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,eAAe,UAAU,OAAO,CAAC;AACxE,CAAC"}
|
|
@@ -17,10 +17,10 @@ export declare class PublishParser {
|
|
|
17
17
|
* Parses the first level of publish. (If false then nothing if * then all tables and views)
|
|
18
18
|
*/
|
|
19
19
|
getPublishAsObject(clientReq: AuthClientRequest, clientInfo: AuthResultWithSID | undefined): Promise<PublishObject | undefined>;
|
|
20
|
-
getValidatedRequestRuleWusr({ tableName, command, clientReq
|
|
21
|
-
getParsedTableRule({ tableName, clientReq }: Pick<DboTableCommand, "tableName" | "clientReq">, clientInfo: AuthResultWithSID | undefined): Promise<ParsedTableRule>;
|
|
20
|
+
getValidatedRequestRuleWusr({ tableName, command, clientReq }: DboTableCommand, scope: PermissionScope | undefined): Promise<ParsedTableRule>;
|
|
21
|
+
getParsedTableRule({ tableName, clientReq }: Pick<DboTableCommand, "tableName" | "clientReq">, clientInfo: AuthResultWithSID | undefined, scope: PermissionScope | undefined): Promise<ParsedTableRule>;
|
|
22
22
|
validateRequestRule({ tableName, command }: DboTableCommand, tableRule: ParsedTableRule, scope: PermissionScope | undefined): void;
|
|
23
|
-
getTableRules(args: DboTable, clientInfo: AuthResultWithSID | undefined): Promise<ParsedTableRule | undefined>;
|
|
23
|
+
getTableRules(args: DboTable, clientInfo: AuthResultWithSID | undefined, scope: PermissionScope | undefined): Promise<ParsedTableRule | undefined>;
|
|
24
24
|
getTableRulesWithoutFileTable: (args_0: DboTable, clientInfo: AuthResultWithSID | undefined, overridenPublish?: PublishObject | undefined) => Promise<import("./publishTypesAndUtils").ParsedPublishTable | undefined>;
|
|
25
25
|
getSchemaFromPublish: (args_0: AuthClientRequest & {
|
|
26
26
|
userData: AuthResultWithSID | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublishParser.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PublishParser.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE9E,OAAO,KAAK,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAIvE,OAAO,KAAK,EACV,QAAQ,EACR,eAAe,EACf,eAAe,EACf,aAAa,EACd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAGL,KAAK,eAAe,EACpB,KAAK,aAAa,EACnB,MAAM,wBAAwB,CAAC;AAEhC,qBAAa,aAAa;IACxB,OAAO,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACzC,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,EAAE,CAAC;IACP,SAAS,EAAE,SAAS,CAAC;gBAET,SAAS,EAAE,SAAS;IAY1B,gBAAgB,CACpB,SAAS,EAAE,iBAAiB,EAC5B,UAAU,EAAE,iBAAiB,GAAG,SAAS,GACxC,OAAO,CAAC,aAAa,CAAC;IAmBnB,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,EAAE,QAAQ,EAAE,iBAAiB,GAAG,SAAS;IAgB/F;;OAEG;IACG,kBAAkB,CACtB,SAAS,EAAE,iBAAiB,EAC5B,UAAU,EAAE,iBAAiB,GAAG,SAAS,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAe/B,2BAA2B,CAC/B,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,eAAe,EAClD,KAAK,EAAE,eAAe,GAAG,SAAS,GACjC,OAAO,CAAC,eAAe,CAAC;IAWrB,kBAAkB,CACtB,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,IAAI,CAAC,eAAe,EAAE,WAAW,GAAG,WAAW,CAAC,EAC1E,UAAU,EAAE,iBAAiB,GAAG,SAAS,EACzC,KAAK,EAAE,eAAe,GAAG,SAAS,GACjC,OAAO,CAAC,eAAe,CAAC;IAkC3B,mBAAmB,CACjB,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,eAAe,EACvC,SAAS,EAAE,eAAe,EAC1B,KAAK,EAAE,eAAe,GAAG,SAAS;IA2C9B,aAAa,CACjB,IAAI,EAAE,QAAQ,EACd,UAAU,EAAE,iBAAiB,GAAG,SAAS,EACzC,KAAK,EAAE,eAAe,GAAG,SAAS,GACjC,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IA6BvC,6BAA6B,0LAA4C;IAGzE,oBAAoB;;;;;;OAAmC;CACxD;AAED,cAAc,wBAAwB,CAAC"}
|
|
@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
exports.PublishParser = void 0;
|
|
18
|
+
const prostgles_types_1 = require("prostgles-types");
|
|
18
19
|
const AuthHandler_1 = require("../Auth/AuthHandler");
|
|
19
20
|
const getClientHandlers_1 = require("../WebsocketAPI/getClientHandlers");
|
|
20
21
|
const getFileTableRules_1 = require("./getFileTableRules");
|
|
@@ -83,16 +84,16 @@ class PublishParser {
|
|
|
83
84
|
}
|
|
84
85
|
return _publish || undefined;
|
|
85
86
|
}
|
|
86
|
-
async getValidatedRequestRuleWusr({ tableName, command, clientReq,
|
|
87
|
-
const rules = await this.getParsedTableRule({ tableName, clientReq }, undefined);
|
|
87
|
+
async getValidatedRequestRuleWusr({ tableName, command, clientReq }, scope) {
|
|
88
|
+
const rules = await this.getParsedTableRule({ tableName, clientReq }, undefined, scope);
|
|
88
89
|
const clientInfo = clientReq && (await this.prostgles.authHandler.getSidAndUserFromRequest(clientReq));
|
|
89
90
|
if (clientInfo === "new-session-redirect") {
|
|
90
91
|
throw "new-session-redirect";
|
|
91
92
|
}
|
|
92
|
-
this.validateRequestRule({ tableName, command, clientReq }, rules,
|
|
93
|
+
this.validateRequestRule({ tableName, command, clientReq }, rules, scope);
|
|
93
94
|
return rules;
|
|
94
95
|
}
|
|
95
|
-
async getParsedTableRule({ tableName, clientReq }, clientInfo) {
|
|
96
|
+
async getParsedTableRule({ tableName, clientReq }, clientInfo, scope) {
|
|
96
97
|
if (!tableName)
|
|
97
98
|
throw "tableName missing";
|
|
98
99
|
/* Must be local request -> allow everything */
|
|
@@ -110,7 +111,7 @@ class PublishParser {
|
|
|
110
111
|
Object.values(tableErrors ?? {}).forEach((errorInfo) => {
|
|
111
112
|
throw errorInfo.error;
|
|
112
113
|
});
|
|
113
|
-
const tableRule = await this.getTableRules({ tableName, clientReq }, clientInfo);
|
|
114
|
+
const tableRule = await this.getTableRules({ tableName, clientReq }, clientInfo, scope);
|
|
114
115
|
if (!tableRule) {
|
|
115
116
|
throw {
|
|
116
117
|
stack: ["getValidatedRequestRule()"],
|
|
@@ -122,14 +123,27 @@ class PublishParser {
|
|
|
122
123
|
validateRequestRule({ tableName, command }, tableRule, scope) {
|
|
123
124
|
if (!command || !tableName)
|
|
124
125
|
throw "command OR tableName are missing";
|
|
125
|
-
const rule = publishTypesAndUtils_1.RULE_TO_METHODS.find((
|
|
126
|
+
const rule = publishTypesAndUtils_1.RULE_TO_METHODS.find(({ methods }) => (0, prostgles_types_1.includes)(methods, command));
|
|
126
127
|
if (!rule) {
|
|
127
128
|
throw "Invalid command: " + command;
|
|
128
129
|
}
|
|
129
130
|
if (scope) {
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
131
|
+
if (scope.sql === "commited") {
|
|
132
|
+
// Allow all commands
|
|
133
|
+
}
|
|
134
|
+
else if (scope.sql === "rolledback") {
|
|
135
|
+
if (rule.sqlRule === "select") {
|
|
136
|
+
// Allow select
|
|
137
|
+
}
|
|
138
|
+
else {
|
|
139
|
+
throw `Invalid or disallowed command: ${tableName}.${command}. The PermissionsScope only allows ${scope.sql}`;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
else {
|
|
143
|
+
const tableScope = scope.tables;
|
|
144
|
+
if (!tableScope?.[tableName] || !tableScope[tableName][rule.sqlRule]) {
|
|
145
|
+
throw `Invalid or disallowed command: ${tableName}.${command}. The PermissionsScope does not allow this command.`;
|
|
146
|
+
}
|
|
133
147
|
}
|
|
134
148
|
}
|
|
135
149
|
if (command === "upsert") {
|
|
@@ -147,13 +161,26 @@ class PublishParser {
|
|
|
147
161
|
};
|
|
148
162
|
}
|
|
149
163
|
}
|
|
150
|
-
async getTableRules(args, clientInfo) {
|
|
164
|
+
async getTableRules(args, clientInfo, scope) {
|
|
151
165
|
const fileTablePublishRules = await this.getTableRulesWithoutFileTable(args, clientInfo);
|
|
166
|
+
const applyScopeToTableRules = (tableRules) => {
|
|
167
|
+
if (!tableRules)
|
|
168
|
+
return;
|
|
169
|
+
if (!scope || scope.sql === "commited")
|
|
170
|
+
return tableRules;
|
|
171
|
+
if (scope.sql === "rolledback") {
|
|
172
|
+
return (0, prostgles_types_1.pickKeys)(tableRules, ["select"]);
|
|
173
|
+
}
|
|
174
|
+
const tableScope = scope.tables?.[args.tableName];
|
|
175
|
+
if (!tableScope)
|
|
176
|
+
return;
|
|
177
|
+
return (0, prostgles_types_1.pickKeys)(tableRules, (0, prostgles_types_1.getKeys)(tableScope).filter((k) => tableScope[k]));
|
|
178
|
+
};
|
|
152
179
|
if (this.dbo[args.tableName]?.is_media) {
|
|
153
|
-
const { rules: fileTableRules } = await getFileTableRules_1.getFileTableRules.bind(this)(args.tableName, fileTablePublishRules, args.clientReq, clientInfo);
|
|
154
|
-
return (0, publishTypesAndUtils_1.parsePublishTableRule)(fileTableRules);
|
|
180
|
+
const { rules: fileTableRules } = await getFileTableRules_1.getFileTableRules.bind(this)(args.tableName, fileTablePublishRules, args.clientReq, clientInfo, scope);
|
|
181
|
+
return applyScopeToTableRules((0, publishTypesAndUtils_1.parsePublishTableRule)(fileTableRules));
|
|
155
182
|
}
|
|
156
|
-
return (0, publishTypesAndUtils_1.parsePublishTableRule)(fileTablePublishRules);
|
|
183
|
+
return applyScopeToTableRules((0, publishTypesAndUtils_1.parsePublishTableRule)(fileTablePublishRules));
|
|
157
184
|
}
|
|
158
185
|
getTableRulesWithoutFileTable = getTableRulesWithoutFileTable_1.getTableRulesWithoutFileTable.bind(this);
|
|
159
186
|
/* Prepares schema for client. Only allowed views and commands will be present */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublishParser.js","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"PublishParser.js","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { AuthClientRequest, AuthResultWithSID } from "../Auth/AuthTypes";
|
|
2
2
|
import type { PublishParser } from "./PublishParser";
|
|
3
3
|
import type { ParsedPublishTable } from "./publishTypesAndUtils";
|
|
4
|
+
import type { LocalParams } from "../DboBuilder/DboBuilder";
|
|
4
5
|
/**
|
|
5
6
|
* Permissions for referencedTables columns are propagated to the file table (even if file table has no permissions)
|
|
6
7
|
* File table existing permissions that include the referenced column resulting permissions are left as they are
|
|
@@ -9,7 +10,7 @@ import type { ParsedPublishTable } from "./publishTypesAndUtils";
|
|
|
9
10
|
* Update on a referenced column allows updating a file (delete and insert) only if it is a nested update from that table
|
|
10
11
|
* Delete on a referenced column table allows deleting any referenced file
|
|
11
12
|
*/
|
|
12
|
-
export declare function getFileTableRules(this: PublishParser, fileTableName: string, fileTablePublishRules: ParsedPublishTable | undefined, clientReq: AuthClientRequest | undefined, clientInfo: AuthResultWithSID | undefined): Promise<{
|
|
13
|
+
export declare function getFileTableRules(this: PublishParser, fileTableName: string, fileTablePublishRules: ParsedPublishTable | undefined, clientReq: AuthClientRequest | undefined, clientInfo: AuthResultWithSID | undefined, scope: LocalParams["scope"]): Promise<{
|
|
13
14
|
rules: ParsedPublishTable | undefined;
|
|
14
15
|
allowedInserts: {
|
|
15
16
|
table: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFileTableRules.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getFileTableRules.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE9E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAc,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"getFileTableRules.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getFileTableRules.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE9E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAc,MAAM,wBAAwB,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE5D;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,aAAa,EACnB,aAAa,EAAE,MAAM,EACrB,qBAAqB,EAAE,kBAAkB,GAAG,SAAS,EACrD,SAAS,EAAE,iBAAiB,GAAG,SAAS,EACxC,UAAU,EAAE,iBAAiB,GAAG,SAAS,EACzC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC;;;eAKU,MAAM;gBAAU,MAAM;;GAsH5D"}
|
|
@@ -11,7 +11,7 @@ const parseFieldFilter_1 = require("../DboBuilder/ViewHandler/parseFieldFilter")
|
|
|
11
11
|
* Update on a referenced column allows updating a file (delete and insert) only if it is a nested update from that table
|
|
12
12
|
* Delete on a referenced column table allows deleting any referenced file
|
|
13
13
|
*/
|
|
14
|
-
async function getFileTableRules(fileTableName, fileTablePublishRules, clientReq, clientInfo) {
|
|
14
|
+
async function getFileTableRules(fileTableName, fileTablePublishRules, clientReq, clientInfo, scope) {
|
|
15
15
|
const forcedDeleteFilters = [];
|
|
16
16
|
const forcedSelectFilters = [];
|
|
17
17
|
const forcedUpdateFilters = [];
|
|
@@ -31,7 +31,7 @@ async function getFileTableRules(fileTableName, fileTablePublishRules, clientReq
|
|
|
31
31
|
.filter(prostgles_types_1.isDefined);
|
|
32
32
|
if (referencedColumns?.length) {
|
|
33
33
|
for (const { tableName, fileColumns, allColumns } of referencedColumns) {
|
|
34
|
-
const tableRules = await this.getTableRules({ clientReq, tableName }, clientInfo);
|
|
34
|
+
const tableRules = await this.getTableRules({ clientReq, tableName }, clientInfo, scope);
|
|
35
35
|
if (tableRules) {
|
|
36
36
|
fileColumns.map((column) => {
|
|
37
37
|
const path = [{ table: tableName, on: [{ id: column }] }];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFileTableRules.js","sourceRoot":"","sources":["../../lib/PublishParser/getFileTableRules.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"getFileTableRules.js","sourceRoot":"","sources":["../../lib/PublishParser/getFileTableRules.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSchemaFromPublish.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getSchemaFromPublish.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAI9E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,iBAAiB,CAAC;AAE3E,KAAK,IAAI,GAAG,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,iBAAiB,GAAG,SAAS,CAAC;CACzC,CAAC;AAGF,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,aAAa,EACnB,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,EAAE,IAAI,EAChC,KAAK,EAAE,eAAe,GAAG,SAAS,GACjC,OAAO,CAAC;IACT,MAAM,EAAE,oBAAoB,CAAC;IAC7B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAAC,
|
|
1
|
+
{"version":3,"file":"getSchemaFromPublish.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getSchemaFromPublish.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAI9E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,iBAAiB,CAAC;AAE3E,KAAK,IAAI,GAAG,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,iBAAiB,GAAG,SAAS,CAAC;CACzC,CAAC;AAGF,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,aAAa,EACnB,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,EAAE,IAAI,EAChC,KAAK,EAAE,eAAe,GAAG,SAAS,GACjC,OAAO,CAAC;IACT,MAAM,EAAE,oBAAoB,CAAC;IAC7B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAAC,CAoKD"}
|
|
@@ -48,7 +48,7 @@ async function getSchemaFromPublish({ userData, ...clientReq }, scope) {
|
|
|
48
48
|
].join("\n");
|
|
49
49
|
throw errMsg;
|
|
50
50
|
}
|
|
51
|
-
const parsedTableRule = await this.getTableRules({ clientReq, tableName }, clientInfo);
|
|
51
|
+
const parsedTableRule = await this.getTableRules({ clientReq, tableName }, clientInfo, scope);
|
|
52
52
|
if (!parsedTableRule || (0, prostgles_types_1.isEmpty)(parsedTableRule))
|
|
53
53
|
return;
|
|
54
54
|
if (!(0, prostgles_types_1.isObject)(parsedTableRule)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSchemaFromPublish.js","sourceRoot":"","sources":["../../lib/PublishParser/getSchemaFromPublish.ts"],"names":[],"mappings":";;AAmBA,
|
|
1
|
+
{"version":3,"file":"getSchemaFromPublish.js","sourceRoot":"","sources":["../../lib/PublishParser/getSchemaFromPublish.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runClientRequest.d.ts","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAA0B,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAKL,KAAK,SAAS,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAK1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAM7C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sCAAsC,CAAC;AA0B5E,KAAK,IAAI,GAAG;IACV,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAUF,eAAO,MAAM,gBAAgB,GAC3B,MAAM,SAAS,EACf,kBAAkB,IAAI,EACtB,WAAW,iBAAiB,EAC5B,OAAO,eAAe,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"runClientRequest.d.ts","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAA0B,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAKL,KAAK,SAAS,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAK1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAM7C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sCAAsC,CAAC;AA0B5E,KAAK,IAAI,GAAG;IACV,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAUF,eAAO,MAAM,gBAAgB,GAC3B,MAAM,SAAS,EACf,kBAAkB,IAAI,EACtB,WAAW,iBAAiB,EAC5B,OAAO,eAAe,GAAG,SAAS,mCA6FnC,CAAC;AAEF,eAAO,MAAM,sBAAsB,GACjC,MAAM,SAAS,EACf,WAAW,iBAAiB;;;;;;;;EAiB7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,MAAM,SAAS,EACf,iBAAiB,UAAU,EAC3B,WAAW,iBAAiB,iBAqB7B,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AACF,eAAO,MAAM,eAAe,GAC1B,MAAM,SAAS,EACf,iBAAiB,UAAU,EAC3B,WAAW,iBAAiB,qBAuC7B,CAAC"}
|
package/dist/runClientRequest.js
CHANGED
|
@@ -53,7 +53,7 @@ const runClientRequest = async function (nonValidatedArgs, clientReq, scope) {
|
|
|
53
53
|
if (clientInfo === "new-session-redirect") {
|
|
54
54
|
throw clientInfo;
|
|
55
55
|
}
|
|
56
|
-
const parsedTableRule = await this.publishParser.getParsedTableRule({ tableName, clientReq }, clientInfo);
|
|
56
|
+
const parsedTableRule = await this.publishParser.getParsedTableRule({ tableName, clientReq }, clientInfo, scope);
|
|
57
57
|
this.publishParser.validateRequestRule({ tableName, command, clientReq }, parsedTableRule, scope);
|
|
58
58
|
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
59
59
|
if (!parsedTableRule) {
|
|
@@ -68,6 +68,7 @@ const runClientRequest = async function (nonValidatedArgs, clientReq, scope) {
|
|
|
68
68
|
const localParams = {
|
|
69
69
|
clientReq,
|
|
70
70
|
isRemoteRequest: { user: sessionUser },
|
|
71
|
+
scope,
|
|
71
72
|
};
|
|
72
73
|
if (param3 && param3.returnQuery) {
|
|
73
74
|
const isAllowed = await (0, runSQL_1.canRunSQL)(this, clientReq);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runClientRequest.js","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":";;;AACA,qDAMyB;AAIzB,gFAA6E;AAC7E,gDAAgD;AAShD,MAAM,aAAa,GAAG;IACpB,IAAI,EAAE,CAAC;IACP,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,CAAC;IACT,WAAW,EAAE,CAAC;IACd,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,SAAS,EAAE,CAAC;IACZ,YAAY,EAAE,CAAC;IACf,UAAU,EAAE,CAAC;IACb,OAAO,EAAE,CAAC;IACV,IAAI,EAAE,CAAC;CAC8E,CAAC;AAExF,MAAM,kBAAkB,GAAG,IAAA,yBAAO,EAAC,aAAa,CAAC,CAAC;AAClD,MAAM,oBAAoB,GAAG;IAC3B,WAAW;IACX,cAAc;IACd,MAAM;CACsC,CAAC;AAkBxC,MAAM,gBAAgB,GAAG,KAAK,WAEnC,gBAAsB,EACtB,SAA4B,EAC5B,KAAkC;IAElC,gGAAgG;IAChG,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACrC,MAAM,uCAAuC,CAAC;IAChD,CAAC;IAED,MAAM,UAAU,GAAG,IAAA,qDAAmC,EACpD;QACE,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC7B,OAAO,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE;QACrC,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE;QACvC,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE;QACvC,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE;KACxC,EACD,gBAAgB,EAChB,WAAW,CACZ,CAAC;IACF,IAAI,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACnC,MAAM,UAAU,CAAC,KAAK,CAAC;IACzB,CAAC;IACD,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC;IAEvE,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,EAAE,CAAC;QACzE,MAAM,CACJ,8EAA8E;YAC9E,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAChC,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3C,MAAM,aAAa,SAAS,4BAA4B,CAAC;IAC3D,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAC9E,IAAI,UAAU,KAAK,sBAAsB,EAAE,CAAC;QAC1C,MAAM,UAAU,CAAC;IACnB,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CACjE,EAAE,SAAS,EAAE,SAAS,EAAE,EACxB,UAAU,
|
|
1
|
+
{"version":3,"file":"runClientRequest.js","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ import type {
|
|
|
11
11
|
} from "prostgles-types";
|
|
12
12
|
import type { AuthClientRequest, BasicSession, SessionUser } from "../Auth/AuthTypes";
|
|
13
13
|
import type { BasicCallback } from "../PubSubManager/PubSubManager";
|
|
14
|
-
import type { PublishAllOrNothing } from "../PublishParser/PublishParser";
|
|
14
|
+
import type { PermissionScope, PublishAllOrNothing } from "../PublishParser/PublishParser";
|
|
15
15
|
import type { FieldSpec } from "./QueryBuilder/Functions/Functions";
|
|
16
16
|
import type { TableHandler } from "./TableHandler/TableHandler";
|
|
17
17
|
import type { ParsedJoinPath } from "./ViewHandler/parseJoinPath";
|
|
@@ -188,6 +188,7 @@ export type LocalParams = {
|
|
|
188
188
|
isRemoteRequest?: {
|
|
189
189
|
user?: UserLike | undefined;
|
|
190
190
|
};
|
|
191
|
+
scope?: PermissionScope | undefined;
|
|
191
192
|
func?: () => any;
|
|
192
193
|
testRule?: boolean;
|
|
193
194
|
tableAlias?: string;
|
|
@@ -6,17 +6,17 @@ import type {
|
|
|
6
6
|
SelectParams,
|
|
7
7
|
SimpleJoinSelect,
|
|
8
8
|
} from "prostgles-types";
|
|
9
|
-
import { getKeys, isEmpty, omitKeys } from "prostgles-types";
|
|
9
|
+
import { getKeys, includes, isEmpty, omitKeys } from "prostgles-types";
|
|
10
10
|
import type { ParsedTableRule } from "../../PublishParser/PublishParser";
|
|
11
11
|
import type { Filter, LocalParams, ValidatedTableRules } from "../DboBuilder";
|
|
12
12
|
import type { ViewHandler } from "../ViewHandler/ViewHandler";
|
|
13
13
|
import { parseJoinPath } from "../ViewHandler/parseJoinPath";
|
|
14
14
|
import { prepareSortItems } from "../ViewHandler/prepareSortItems";
|
|
15
15
|
import type { PrepareWhereParams } from "../ViewHandler/prepareWhere";
|
|
16
|
+
import { COMPUTED_FIELDS } from "./Functions/COMPUTED_FIELDS";
|
|
16
17
|
import { FUNCTIONS } from "./Functions/Functions";
|
|
17
18
|
import type { NewQuery, NewQueryJoin } from "./QueryBuilder";
|
|
18
19
|
import { SelectItemBuilder } from "./QueryBuilder";
|
|
19
|
-
import { COMPUTED_FIELDS } from "./Functions/COMPUTED_FIELDS";
|
|
20
20
|
|
|
21
21
|
const JOIN_KEYS = ["$innerJoin", "$leftJoin"] as const;
|
|
22
22
|
const JOIN_PARAM_KEYS = getKeys({
|
|
@@ -55,7 +55,7 @@ const parseJoinSelect = (joinParams: JoinSelect): ParsedJoin => {
|
|
|
55
55
|
params: joinParams,
|
|
56
56
|
};
|
|
57
57
|
}
|
|
58
|
-
const [joinKey, ...otherKeys] = getKeys(joinParams).filter((k) =>
|
|
58
|
+
const [joinKey, ...otherKeys] = getKeys(joinParams).filter((k) => includes(JOIN_KEYS, k));
|
|
59
59
|
if (otherKeys.length) {
|
|
60
60
|
return {
|
|
61
61
|
error: "Cannot specify more than one join type ( $innerJoin OR $leftJoin )",
|
|
@@ -63,7 +63,7 @@ const parseJoinSelect = (joinParams: JoinSelect): ParsedJoin => {
|
|
|
63
63
|
} else if (joinKey) {
|
|
64
64
|
/* Full option join { field_name: db.innerJoin.table_name(filter, select) } */
|
|
65
65
|
const invalidParams = Object.keys(joinParams).filter(
|
|
66
|
-
(k) => ![...JOIN_PARAM_KEYS, ...JOIN_KEYS]
|
|
66
|
+
(k) => !includes([...JOIN_PARAM_KEYS, ...JOIN_KEYS], k),
|
|
67
67
|
);
|
|
68
68
|
if (invalidParams.length) {
|
|
69
69
|
throw "Invalid join params: " + invalidParams.join(", ");
|
|
@@ -94,7 +94,7 @@ export async function getNewQuery(
|
|
|
94
94
|
selectParams: SelectParams & { alias?: string } = {},
|
|
95
95
|
param3_unused = null,
|
|
96
96
|
tableRules: ParsedTableRule | undefined,
|
|
97
|
-
localParams: LocalParams | undefined
|
|
97
|
+
localParams: LocalParams | undefined,
|
|
98
98
|
): Promise<NewQuery> {
|
|
99
99
|
const { columns } = _this;
|
|
100
100
|
|
|
@@ -175,11 +175,14 @@ export async function getNewQuery(
|
|
|
175
175
|
let isLocal = true;
|
|
176
176
|
if (localParams && localParams.clientReq) {
|
|
177
177
|
isLocal = false;
|
|
178
|
-
joinTableRules = await _this.dboBuilder.publishParser?.getValidatedRequestRuleWusr(
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
178
|
+
joinTableRules = await _this.dboBuilder.publishParser?.getValidatedRequestRuleWusr(
|
|
179
|
+
{
|
|
180
|
+
tableName: joinTableName,
|
|
181
|
+
command: "find",
|
|
182
|
+
clientReq: localParams.clientReq,
|
|
183
|
+
},
|
|
184
|
+
localParams.scope,
|
|
185
|
+
);
|
|
183
186
|
}
|
|
184
187
|
|
|
185
188
|
const isAllowedAccessToTable = isLocal || joinTableRules;
|
|
@@ -190,7 +193,7 @@ export async function getNewQuery(
|
|
|
190
193
|
{ ...j_selectParams, alias: j_alias },
|
|
191
194
|
param3_unused,
|
|
192
195
|
joinTableRules,
|
|
193
|
-
localParams
|
|
196
|
+
localParams,
|
|
194
197
|
);
|
|
195
198
|
joinQuery.isLeftJoin = j_isLeftJoin;
|
|
196
199
|
joinQuery.tableAlias = j_alias;
|
|
@@ -256,7 +259,7 @@ export async function getNewQuery(
|
|
|
256
259
|
allowedOrderByFields,
|
|
257
260
|
selectParams.alias,
|
|
258
261
|
select,
|
|
259
|
-
joinQueries
|
|
262
|
+
joinQueries,
|
|
260
263
|
),
|
|
261
264
|
offset: prepareOffsetQuery(selectParams.offset),
|
|
262
265
|
};
|
|
@@ -278,7 +281,7 @@ const prepareOffsetQuery = (offset?: number) => {
|
|
|
278
281
|
|
|
279
282
|
const prepareLimitQuery = (
|
|
280
283
|
limit: number | null | undefined = null,
|
|
281
|
-
p: ValidatedTableRules
|
|
284
|
+
p: ValidatedTableRules,
|
|
282
285
|
): number | null => {
|
|
283
286
|
if (limit !== null && !Number.isInteger(limit)) {
|
|
284
287
|
throw "Unexpected LIMIT. Must be null or an integer";
|
|
@@ -218,7 +218,12 @@ export async function insertNestedRecords(
|
|
|
218
218
|
|
|
219
219
|
const { path } = joinPath;
|
|
220
220
|
const [tbl1, tbl2, tbl3] = path;
|
|
221
|
-
targetTableRules = await getInsertTableRules(
|
|
221
|
+
targetTableRules = await getInsertTableRules(
|
|
222
|
+
this,
|
|
223
|
+
targetTable,
|
|
224
|
+
localParams?.clientReq,
|
|
225
|
+
localParams?.scope,
|
|
226
|
+
);
|
|
222
227
|
|
|
223
228
|
const cols2 = this.dboBuilder.dbo[tbl2!]!.columns || [];
|
|
224
229
|
if (!this.dboBuilder.dbo[tbl2!]) throw "Invalid/disallowed table: " + tbl2;
|
|
@@ -342,12 +347,16 @@ export const getInsertTableRules = async (
|
|
|
342
347
|
tableHandler: TableHandler,
|
|
343
348
|
targetTable: string,
|
|
344
349
|
clientReq: AuthClientRequest | undefined,
|
|
350
|
+
scope: LocalParams["scope"],
|
|
345
351
|
) => {
|
|
346
|
-
const childRules = await tableHandler.dboBuilder.publishParser?.getValidatedRequestRuleWusr(
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
352
|
+
const childRules = await tableHandler.dboBuilder.publishParser?.getValidatedRequestRuleWusr(
|
|
353
|
+
{
|
|
354
|
+
tableName: targetTable,
|
|
355
|
+
command: "insert",
|
|
356
|
+
clientReq,
|
|
357
|
+
},
|
|
358
|
+
scope,
|
|
359
|
+
);
|
|
351
360
|
if (!childRules || !childRules.insert)
|
|
352
361
|
throw "Dissallowed nested insert into table " + targetTable;
|
|
353
362
|
return childRules;
|
|
@@ -386,7 +395,12 @@ const referencedInsert = async (
|
|
|
386
395
|
throw new Error("childInsertErr: Table handler missing for referenced table: " + targetTable);
|
|
387
396
|
}
|
|
388
397
|
|
|
389
|
-
const childRules = await getInsertTableRules(
|
|
398
|
+
const childRules = await getInsertTableRules(
|
|
399
|
+
tableHandler,
|
|
400
|
+
targetTable,
|
|
401
|
+
localParams?.clientReq,
|
|
402
|
+
localParams?.scope,
|
|
403
|
+
);
|
|
390
404
|
|
|
391
405
|
return Promise.all(
|
|
392
406
|
((Array.isArray(targetData) ? targetData : [targetData]) as AnyObject[]).map((m) =>
|
|
@@ -116,7 +116,12 @@ export async function update(
|
|
|
116
116
|
throw `nestedInsert Tablehandler not found for ${nestedInsert.tableName}`;
|
|
117
117
|
const refTableRules =
|
|
118
118
|
!localParams ? undefined : (
|
|
119
|
-
await getInsertTableRules(
|
|
119
|
+
await getInsertTableRules(
|
|
120
|
+
this,
|
|
121
|
+
nestedInsert.tableName,
|
|
122
|
+
localParams.clientReq,
|
|
123
|
+
localParams.scope,
|
|
124
|
+
)
|
|
120
125
|
);
|
|
121
126
|
const nestedLocalParams: LocalParams = {
|
|
122
127
|
...localParams,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AnyObject, EXISTS_KEY, FieldFilter} from "prostgles-types";
|
|
1
|
+
import type { AnyObject, EXISTS_KEY, FieldFilter } from "prostgles-types";
|
|
2
2
|
import { EXISTS_KEYS, asName } from "prostgles-types";
|
|
3
3
|
import type { LocalParams, ExistsFilterConfig } from "../DboBuilder";
|
|
4
4
|
import type { ViewHandler } from "./ViewHandler";
|
|
@@ -9,7 +9,7 @@ import { getTableJoinQuery } from "./getTableJoinQuery";
|
|
|
9
9
|
export async function getExistsCondition(
|
|
10
10
|
this: ViewHandler,
|
|
11
11
|
eConfig: ExistsFilterConfig,
|
|
12
|
-
localParams: LocalParams | undefined
|
|
12
|
+
localParams: LocalParams | undefined,
|
|
13
13
|
): Promise<string> {
|
|
14
14
|
const thisTable = this.name;
|
|
15
15
|
const isNotExists = ["$notExists", "$notExistsJoined"].includes(eConfig.existType);
|
|
@@ -35,11 +35,14 @@ export async function getExistsCondition(
|
|
|
35
35
|
}
|
|
36
36
|
const targetTable = eConfig.isJoined ? eConfig.parsedPath.at(-1)!.table : eConfig.targetTable;
|
|
37
37
|
if (localParams?.clientReq && this.dboBuilder.publishParser) {
|
|
38
|
-
t2Rules = (await this.dboBuilder.publishParser.getValidatedRequestRuleWusr(
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
38
|
+
t2Rules = (await this.dboBuilder.publishParser.getValidatedRequestRuleWusr(
|
|
39
|
+
{
|
|
40
|
+
tableName: targetTable,
|
|
41
|
+
command: "find",
|
|
42
|
+
clientReq: localParams.clientReq,
|
|
43
|
+
},
|
|
44
|
+
localParams.scope,
|
|
45
|
+
)) as ParsedTableRule | undefined;
|
|
43
46
|
|
|
44
47
|
if (!t2Rules || !t2Rules.select) throw "Dissallowed";
|
|
45
48
|
({ forcedFilter, filterFields } = t2Rules.select);
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { getKeys, includes, pickKeys } from "prostgles-types";
|
|
1
2
|
import { getClientRequestIPsInfo } from "../Auth/AuthHandler";
|
|
2
3
|
import type { AuthClientRequest, AuthResultWithSID } from "../Auth/AuthTypes";
|
|
3
4
|
import type { DBOFullyTyped } from "../DBSchemaBuilder/DBSchemaBuilder";
|
|
@@ -99,24 +100,24 @@ export class PublishParser {
|
|
|
99
100
|
return _publish || undefined;
|
|
100
101
|
}
|
|
101
102
|
|
|
102
|
-
async getValidatedRequestRuleWusr(
|
|
103
|
-
tableName,
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
const rules = await this.getParsedTableRule({ tableName, clientReq }, undefined);
|
|
103
|
+
async getValidatedRequestRuleWusr(
|
|
104
|
+
{ tableName, command, clientReq }: DboTableCommand,
|
|
105
|
+
scope: PermissionScope | undefined,
|
|
106
|
+
): Promise<ParsedTableRule> {
|
|
107
|
+
const rules = await this.getParsedTableRule({ tableName, clientReq }, undefined, scope);
|
|
108
108
|
const clientInfo =
|
|
109
109
|
clientReq && (await this.prostgles.authHandler.getSidAndUserFromRequest(clientReq));
|
|
110
110
|
if (clientInfo === "new-session-redirect") {
|
|
111
111
|
throw "new-session-redirect";
|
|
112
112
|
}
|
|
113
|
-
this.validateRequestRule({ tableName, command, clientReq }, rules,
|
|
113
|
+
this.validateRequestRule({ tableName, command, clientReq }, rules, scope);
|
|
114
114
|
return rules;
|
|
115
115
|
}
|
|
116
116
|
|
|
117
117
|
async getParsedTableRule(
|
|
118
118
|
{ tableName, clientReq }: Pick<DboTableCommand, "tableName" | "clientReq">,
|
|
119
119
|
clientInfo: AuthResultWithSID | undefined,
|
|
120
|
+
scope: PermissionScope | undefined,
|
|
120
121
|
): Promise<ParsedTableRule> {
|
|
121
122
|
if (!tableName) throw "tableName missing";
|
|
122
123
|
|
|
@@ -140,7 +141,7 @@ export class PublishParser {
|
|
|
140
141
|
throw errorInfo.error;
|
|
141
142
|
});
|
|
142
143
|
|
|
143
|
-
const tableRule = await this.getTableRules({ tableName, clientReq }, clientInfo);
|
|
144
|
+
const tableRule = await this.getTableRules({ tableName, clientReq }, clientInfo, scope);
|
|
144
145
|
|
|
145
146
|
if (!tableRule) {
|
|
146
147
|
throw {
|
|
@@ -158,15 +159,25 @@ export class PublishParser {
|
|
|
158
159
|
) {
|
|
159
160
|
if (!command || !tableName) throw "command OR tableName are missing";
|
|
160
161
|
|
|
161
|
-
const rule = RULE_TO_METHODS.find((
|
|
162
|
+
const rule = RULE_TO_METHODS.find(({ methods }) => includes(methods, command));
|
|
162
163
|
if (!rule) {
|
|
163
164
|
throw "Invalid command: " + command;
|
|
164
165
|
}
|
|
165
166
|
|
|
166
167
|
if (scope) {
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
168
|
+
if (scope.sql === "commited") {
|
|
169
|
+
// Allow all commands
|
|
170
|
+
} else if (scope.sql === "rolledback") {
|
|
171
|
+
if (rule.sqlRule === "select") {
|
|
172
|
+
// Allow select
|
|
173
|
+
} else {
|
|
174
|
+
throw `Invalid or disallowed command: ${tableName}.${command}. The PermissionsScope only allows ${scope.sql}`;
|
|
175
|
+
}
|
|
176
|
+
} else {
|
|
177
|
+
const tableScope = scope.tables;
|
|
178
|
+
if (!tableScope?.[tableName] || !tableScope[tableName][rule.sqlRule]) {
|
|
179
|
+
throw `Invalid or disallowed command: ${tableName}.${command}. The PermissionsScope does not allow this command.`;
|
|
180
|
+
}
|
|
170
181
|
}
|
|
171
182
|
}
|
|
172
183
|
|
|
@@ -190,19 +201,34 @@ export class PublishParser {
|
|
|
190
201
|
async getTableRules(
|
|
191
202
|
args: DboTable,
|
|
192
203
|
clientInfo: AuthResultWithSID | undefined,
|
|
204
|
+
scope: PermissionScope | undefined,
|
|
193
205
|
): Promise<ParsedTableRule | undefined> {
|
|
194
206
|
const fileTablePublishRules = await this.getTableRulesWithoutFileTable(args, clientInfo);
|
|
207
|
+
const applyScopeToTableRules = (tableRules: ParsedTableRule | undefined) => {
|
|
208
|
+
if (!tableRules) return;
|
|
209
|
+
if (!scope || scope.sql === "commited") return tableRules;
|
|
210
|
+
if (scope.sql === "rolledback") {
|
|
211
|
+
return pickKeys(tableRules, ["select"]);
|
|
212
|
+
}
|
|
213
|
+
const tableScope = scope.tables?.[args.tableName];
|
|
214
|
+
if (!tableScope) return;
|
|
215
|
+
return pickKeys(
|
|
216
|
+
tableRules,
|
|
217
|
+
getKeys(tableScope).filter((k) => tableScope[k]),
|
|
218
|
+
);
|
|
219
|
+
};
|
|
195
220
|
if (this.dbo[args.tableName]?.is_media) {
|
|
196
221
|
const { rules: fileTableRules } = await getFileTableRules.bind(this)(
|
|
197
222
|
args.tableName,
|
|
198
223
|
fileTablePublishRules,
|
|
199
224
|
args.clientReq,
|
|
200
225
|
clientInfo,
|
|
226
|
+
scope,
|
|
201
227
|
);
|
|
202
|
-
return parsePublishTableRule(fileTableRules);
|
|
228
|
+
return applyScopeToTableRules(parsePublishTableRule(fileTableRules));
|
|
203
229
|
}
|
|
204
230
|
|
|
205
|
-
return parsePublishTableRule(fileTablePublishRules);
|
|
231
|
+
return applyScopeToTableRules(parsePublishTableRule(fileTablePublishRules));
|
|
206
232
|
}
|
|
207
233
|
|
|
208
234
|
getTableRulesWithoutFileTable = getTableRulesWithoutFileTable.bind(this);
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import type { AnyObject, FullFilter} from "prostgles-types";
|
|
1
|
+
import type { AnyObject, FullFilter } from "prostgles-types";
|
|
2
2
|
import { includes, isDefined } from "prostgles-types";
|
|
3
3
|
import type { AuthClientRequest, AuthResultWithSID } from "../Auth/AuthTypes";
|
|
4
4
|
import { parseFieldFilter } from "../DboBuilder/ViewHandler/parseFieldFilter";
|
|
5
5
|
import type { PublishParser } from "./PublishParser";
|
|
6
6
|
import type { ParsedPublishTable, UpdateRule } from "./publishTypesAndUtils";
|
|
7
|
+
import type { LocalParams } from "../DboBuilder/DboBuilder";
|
|
7
8
|
|
|
8
9
|
/**
|
|
9
10
|
* Permissions for referencedTables columns are propagated to the file table (even if file table has no permissions)
|
|
@@ -18,7 +19,8 @@ export async function getFileTableRules(
|
|
|
18
19
|
fileTableName: string,
|
|
19
20
|
fileTablePublishRules: ParsedPublishTable | undefined,
|
|
20
21
|
clientReq: AuthClientRequest | undefined,
|
|
21
|
-
clientInfo: AuthResultWithSID | undefined
|
|
22
|
+
clientInfo: AuthResultWithSID | undefined,
|
|
23
|
+
scope: LocalParams["scope"],
|
|
22
24
|
) {
|
|
23
25
|
const forcedDeleteFilters: FullFilter<AnyObject, void>[] = [];
|
|
24
26
|
const forcedSelectFilters: FullFilter<AnyObject, void>[] = [];
|
|
@@ -28,7 +30,7 @@ export async function getFileTableRules(
|
|
|
28
30
|
?.filter((t) => !t.is_view && t.name !== fileTableName)
|
|
29
31
|
.map((t) => {
|
|
30
32
|
const refCols = t.columns.filter((c) =>
|
|
31
|
-
c.references?.some((r) => r.ftable === fileTableName)
|
|
33
|
+
c.references?.some((r) => r.ftable === fileTableName),
|
|
32
34
|
);
|
|
33
35
|
if (!refCols.length) return undefined;
|
|
34
36
|
return {
|
|
@@ -40,7 +42,7 @@ export async function getFileTableRules(
|
|
|
40
42
|
.filter(isDefined);
|
|
41
43
|
if (referencedColumns?.length) {
|
|
42
44
|
for (const { tableName, fileColumns, allColumns } of referencedColumns) {
|
|
43
|
-
const tableRules = await this.getTableRules({ clientReq, tableName }, clientInfo);
|
|
45
|
+
const tableRules = await this.getTableRules({ clientReq, tableName }, clientInfo, scope);
|
|
44
46
|
if (tableRules) {
|
|
45
47
|
fileColumns.map((column) => {
|
|
46
48
|
const path = [{ table: tableName, on: [{ id: column }] }];
|
|
@@ -94,7 +96,7 @@ export async function getFileTableRules(
|
|
|
94
96
|
|
|
95
97
|
const getForcedFilter = (
|
|
96
98
|
rule: Pick<UpdateRule, "forcedFilter"> | undefined,
|
|
97
|
-
forcedFilters: FullFilter<AnyObject, void>[]
|
|
99
|
+
forcedFilters: FullFilter<AnyObject, void>[],
|
|
98
100
|
) => {
|
|
99
101
|
return rule && !rule.forcedFilter ?
|
|
100
102
|
{}
|
|
@@ -138,7 +140,7 @@ export async function getFileTableRules(
|
|
|
138
140
|
const rules = await this.getTableRulesWithoutFileTable.bind(this)(
|
|
139
141
|
{ clientReq, tableName: fileTableName },
|
|
140
142
|
clientInfo,
|
|
141
|
-
{ [fileTableName]: fileTableRule }
|
|
143
|
+
{ [fileTableName]: fileTableRule },
|
|
142
144
|
);
|
|
143
145
|
return { rules, allowedInserts: allowedNestedInserts };
|
|
144
146
|
}
|
|
@@ -77,7 +77,11 @@ export async function getSchemaFromPublish(
|
|
|
77
77
|
throw errMsg;
|
|
78
78
|
}
|
|
79
79
|
|
|
80
|
-
const parsedTableRule = await this.getTableRules(
|
|
80
|
+
const parsedTableRule = await this.getTableRules(
|
|
81
|
+
{ clientReq, tableName },
|
|
82
|
+
clientInfo,
|
|
83
|
+
scope,
|
|
84
|
+
);
|
|
81
85
|
|
|
82
86
|
if (!parsedTableRule || isEmpty(parsedTableRule)) return;
|
|
83
87
|
if (!isObject(parsedTableRule)) {
|
package/lib/runClientRequest.ts
CHANGED
|
@@ -105,6 +105,7 @@ export const runClientRequest = async function (
|
|
|
105
105
|
const parsedTableRule = await this.publishParser.getParsedTableRule(
|
|
106
106
|
{ tableName, clientReq },
|
|
107
107
|
clientInfo,
|
|
108
|
+
scope,
|
|
108
109
|
);
|
|
109
110
|
this.publishParser.validateRequestRule({ tableName, command, clientReq }, parsedTableRule, scope);
|
|
110
111
|
|
|
@@ -128,6 +129,7 @@ export const runClientRequest = async function (
|
|
|
128
129
|
const localParams: LocalParams = {
|
|
129
130
|
clientReq,
|
|
130
131
|
isRemoteRequest: { user: sessionUser },
|
|
132
|
+
scope,
|
|
131
133
|
};
|
|
132
134
|
if (param3 && (param3 as LocalParams).returnQuery) {
|
|
133
135
|
const isAllowed = await canRunSQL(this, clientReq);
|