@puca/puca-core 14.11.2 → 14.12.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/core/services/install.service.js +25 -0
- package/dist/core/services/install.service.js.map +1 -1
- package/dist/core/services/report.service.d.ts +8 -0
- package/dist/core/services/report.service.js +81 -16
- package/dist/core/services/report.service.js.map +1 -1
- package/dist/core/services/table-permission.service.js +3 -1
- package/dist/core/services/table-permission.service.js.map +1 -1
- package/dist/models/crud-controller-especification-environment.d.ts +4 -1
- package/dist/models/crud-controller-especification.d.ts +4 -0
- package/dist/models/crud-controller-especification.js.map +1 -1
- package/dist/models/table-dictionary.d.ts +6 -0
- package/dist/orm/services/sql/column-security.helper.d.ts +22 -0
- package/dist/orm/services/sql/column-security.helper.js +108 -0
- package/dist/orm/services/sql/column-security.helper.js.map +1 -0
- package/dist/orm/services/sql/sql-security-layer.service.d.ts +4 -0
- package/dist/orm/services/sql/sql-security-layer.service.js +137 -9
- package/dist/orm/services/sql/sql-security-layer.service.js.map +1 -1
- package/dist/orm/services/sql/table-permission.helper.d.ts +2 -0
- package/dist/orm/services/sql/table-permission.helper.js +113 -1
- package/dist/orm/services/sql/table-permission.helper.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/docs/column-level-security/column-level-security-analysis.md +156 -0
- package/docs/column-level-security/column-level-security-by-rule-analysis.md +201 -0
- package/docs/column-level-security/dictionary-admin-permission-plan.md +164 -0
- package/docs/column-level-security/pending-flow-runtime-function-columns.md +39 -0
- package/docs/column-level-security/pending-javascript-source-columns.md +19 -0
- package/docs/column-level-security/puca-flow-dictionary-admin-exception-plan.md +164 -0
- package/package.json +1 -1
- package/sqli-pesquisa-consolidada.md +368 -0
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { CrudControllerEspecificationEnvironmentDetails, CrudControllerEspecificationTable, CrudControllerEspecificationFeatures, CrudControllerEspecificationEnvironmentsModule, AccessControl, UseAccessControlEachRow, JoinAccessControl, WhereAccessControl, CompanyAccessControl, RuleAccessControl } from './crud-controller-especification-environment';
|
|
2
|
+
import { ColumnAccessConfig } from './table-dictionary';
|
|
2
3
|
export interface CrudControllerEspecification extends CrudControllerEspecificationEnvironmentDetails {
|
|
3
4
|
table: CrudControllerEspecificationTable;
|
|
4
5
|
module: CrudControllerEspecificationEnvironmentsModule;
|
|
@@ -18,6 +19,9 @@ export interface CrudControllerEspecification extends CrudControllerEspecificati
|
|
|
18
19
|
companyAccessControl?: CompanyAccessControl;
|
|
19
20
|
ruleAccessControl?: RuleAccessControl;
|
|
20
21
|
ignoreModuleAccessVerification?: boolean;
|
|
22
|
+
columnAccess?: {
|
|
23
|
+
[columnName: string]: ColumnAccessConfig;
|
|
24
|
+
};
|
|
21
25
|
incrementalSearchConfig?: {
|
|
22
26
|
disabled?: boolean;
|
|
23
27
|
fields: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crud-controller-especification.js","sourceRoot":"","sources":["../../src/models/crud-controller-especification.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"crud-controller-especification.js","sourceRoot":"","sources":["../../src/models/crud-controller-especification.ts"],"names":[],"mappings":";;AA6CC,CAAC"}
|
|
@@ -2,6 +2,9 @@ import { Where } from "../orm/cases/bo/interfaces";
|
|
|
2
2
|
import { JoinTable } from "../orm/cases/vanilla/interfaces";
|
|
3
3
|
import { UseAccessControlEachRow } from "./crud-controller-especification-environment";
|
|
4
4
|
import { UserAccessControlMode } from "./user-access-control-mode";
|
|
5
|
+
export interface ColumnAccessConfig {
|
|
6
|
+
accessControl: UserAccessControlMode | string[];
|
|
7
|
+
}
|
|
5
8
|
export interface PermissionConfig {
|
|
6
9
|
args?: any;
|
|
7
10
|
where?: Where;
|
|
@@ -9,6 +12,9 @@ export interface PermissionConfig {
|
|
|
9
12
|
accessControl?: UserAccessControlMode;
|
|
10
13
|
useAccessControl?: UserAccessControlMode;
|
|
11
14
|
useAccessControlEachRow?: UseAccessControlEachRow;
|
|
15
|
+
columnAccess?: {
|
|
16
|
+
[columnName: string]: ColumnAccessConfig;
|
|
17
|
+
};
|
|
12
18
|
}
|
|
13
19
|
export interface PermissionType {
|
|
14
20
|
select?: PermissionConfig;
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { SelectField } from '../../cases/vanilla/interfaces';
|
|
2
|
+
import { ColumnAccessConfig, PermissionConfig } from '../../../models/table-dictionary';
|
|
3
|
+
import { UserAccessControlMode } from '../../../models/user-access-control-mode';
|
|
4
|
+
export declare const SECURITY_COLUMN_NULL_ARG = "security_column_null";
|
|
5
|
+
export interface DeniedColumnRef {
|
|
6
|
+
tableName: string;
|
|
7
|
+
columnName: string;
|
|
8
|
+
}
|
|
9
|
+
export declare function getColumnAccess(selectRules?: PermissionConfig): {
|
|
10
|
+
[columnName: string]: ColumnAccessConfig;
|
|
11
|
+
};
|
|
12
|
+
export declare function resolveColumnAccessArgs(tableName: string, columnName: string, cfg: ColumnAccessConfig): string[] | null;
|
|
13
|
+
export declare function resolveColumnAccessMode(cfg: ColumnAccessConfig): UserAccessControlMode;
|
|
14
|
+
export declare function hasRestrictedColumnAccess(selectRules?: PermissionConfig): boolean;
|
|
15
|
+
export declare function columnPermissionCteAlias(mode: UserAccessControlMode.User | UserAccessControlMode.Rule, tableName: string, columnName: string): string;
|
|
16
|
+
export declare function resolveSimpleColumnRef(field: SelectField, contextTableName: string, contextTableAlias: string): DeniedColumnRef | null;
|
|
17
|
+
export declare function nullifyDeniedColumnField(alias: string): SelectField;
|
|
18
|
+
export declare function wrapFieldWithColumnPermissionCase({ field, alias, cteAlias, }: {
|
|
19
|
+
field: SelectField;
|
|
20
|
+
alias: string;
|
|
21
|
+
cteAlias: string;
|
|
22
|
+
}): SelectField;
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.wrapFieldWithColumnPermissionCase = exports.nullifyDeniedColumnField = exports.resolveSimpleColumnRef = exports.columnPermissionCteAlias = exports.hasRestrictedColumnAccess = exports.resolveColumnAccessMode = exports.resolveColumnAccessArgs = exports.getColumnAccess = exports.SECURITY_COLUMN_NULL_ARG = void 0;
|
|
4
|
+
const user_access_control_mode_1 = require("../../../models/user-access-control-mode");
|
|
5
|
+
exports.SECURITY_COLUMN_NULL_ARG = 'security_column_null';
|
|
6
|
+
function getColumnAccess(selectRules) {
|
|
7
|
+
return (selectRules === null || selectRules === void 0 ? void 0 : selectRules.columnAccess) || {};
|
|
8
|
+
}
|
|
9
|
+
exports.getColumnAccess = getColumnAccess;
|
|
10
|
+
function resolveColumnAccessArgs(tableName, columnName, cfg) {
|
|
11
|
+
if (Array.isArray(cfg.accessControl)) {
|
|
12
|
+
return cfg.accessControl;
|
|
13
|
+
}
|
|
14
|
+
switch (cfg.accessControl) {
|
|
15
|
+
case user_access_control_mode_1.UserAccessControlMode.Disabled:
|
|
16
|
+
return null;
|
|
17
|
+
case user_access_control_mode_1.UserAccessControlMode.SystemAdmin:
|
|
18
|
+
case user_access_control_mode_1.UserAccessControlMode.SystemAdminNoAccess:
|
|
19
|
+
return [];
|
|
20
|
+
case user_access_control_mode_1.UserAccessControlMode.User:
|
|
21
|
+
case user_access_control_mode_1.UserAccessControlMode.Rule:
|
|
22
|
+
return [`${tableName}-column-${columnName}`];
|
|
23
|
+
default:
|
|
24
|
+
return null;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
exports.resolveColumnAccessArgs = resolveColumnAccessArgs;
|
|
28
|
+
function resolveColumnAccessMode(cfg) {
|
|
29
|
+
if (Array.isArray(cfg.accessControl)) {
|
|
30
|
+
return user_access_control_mode_1.UserAccessControlMode.Rule;
|
|
31
|
+
}
|
|
32
|
+
return cfg.accessControl;
|
|
33
|
+
}
|
|
34
|
+
exports.resolveColumnAccessMode = resolveColumnAccessMode;
|
|
35
|
+
function hasRestrictedColumnAccess(selectRules) {
|
|
36
|
+
const columnAccess = getColumnAccess(selectRules);
|
|
37
|
+
return Object.entries(columnAccess).some(([columnName, cfg]) => {
|
|
38
|
+
const args = resolveColumnAccessArgs('_', columnName, cfg);
|
|
39
|
+
return args !== null;
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
exports.hasRestrictedColumnAccess = hasRestrictedColumnAccess;
|
|
43
|
+
function columnPermissionCteAlias(mode, tableName, columnName) {
|
|
44
|
+
const prefix = mode === user_access_control_mode_1.UserAccessControlMode.User ? 'user_access_col' : 'rule_access_col';
|
|
45
|
+
return `${prefix}_${tableName}_${columnName}`;
|
|
46
|
+
}
|
|
47
|
+
exports.columnPermissionCteAlias = columnPermissionCteAlias;
|
|
48
|
+
function resolveSimpleColumnRef(field, contextTableName, contextTableAlias) {
|
|
49
|
+
if (field == null) {
|
|
50
|
+
return null;
|
|
51
|
+
}
|
|
52
|
+
if (typeof field === 'string') {
|
|
53
|
+
if (field.startsWith('$')) {
|
|
54
|
+
return null;
|
|
55
|
+
}
|
|
56
|
+
if (field.includes('__')) {
|
|
57
|
+
const [joinAlias, columnName] = field.split('__');
|
|
58
|
+
return {
|
|
59
|
+
tableName: joinAlias || contextTableName,
|
|
60
|
+
columnName,
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
if (field.includes('.')) {
|
|
64
|
+
const [tableOrAlias, columnName] = field.split('.');
|
|
65
|
+
return {
|
|
66
|
+
tableName: tableOrAlias === contextTableAlias ? contextTableName : tableOrAlias,
|
|
67
|
+
columnName,
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
return { tableName: contextTableName, columnName: field };
|
|
71
|
+
}
|
|
72
|
+
if (typeof field === 'object' && 'field' in field && typeof field.field === 'string') {
|
|
73
|
+
if (field.field.startsWith('$')) {
|
|
74
|
+
return null;
|
|
75
|
+
}
|
|
76
|
+
const tableName = !field.table || field.table === contextTableAlias
|
|
77
|
+
? contextTableName
|
|
78
|
+
: field.table;
|
|
79
|
+
return { tableName, columnName: field.field };
|
|
80
|
+
}
|
|
81
|
+
return null;
|
|
82
|
+
}
|
|
83
|
+
exports.resolveSimpleColumnRef = resolveSimpleColumnRef;
|
|
84
|
+
function nullifyDeniedColumnField(alias) {
|
|
85
|
+
return {
|
|
86
|
+
field: `$${exports.SECURITY_COLUMN_NULL_ARG}`,
|
|
87
|
+
alias,
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
exports.nullifyDeniedColumnField = nullifyDeniedColumnField;
|
|
91
|
+
function wrapFieldWithColumnPermissionCase({ field, alias, cteAlias, }) {
|
|
92
|
+
return {
|
|
93
|
+
conditions: [
|
|
94
|
+
{
|
|
95
|
+
when: {
|
|
96
|
+
exists: {
|
|
97
|
+
from: cteAlias,
|
|
98
|
+
},
|
|
99
|
+
},
|
|
100
|
+
then: field,
|
|
101
|
+
},
|
|
102
|
+
],
|
|
103
|
+
else: `$${exports.SECURITY_COLUMN_NULL_ARG}`,
|
|
104
|
+
alias,
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
exports.wrapFieldWithColumnPermissionCase = wrapFieldWithColumnPermissionCase;
|
|
108
|
+
//# sourceMappingURL=column-security.helper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"column-security.helper.js","sourceRoot":"","sources":["../../../../src/orm/services/sql/column-security.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,6 +61,7 @@ export interface AddRuleWhereArgs {
|
|
|
61
61
|
args?: any;
|
|
62
62
|
};
|
|
63
63
|
}
|
|
64
|
+
export type ColumnSecurityMode = 'projection' | 'filter';
|
|
64
65
|
export interface SafeResolveWhereArgs {
|
|
65
66
|
where: Where;
|
|
66
67
|
td: SimpleTableDictionary;
|
|
@@ -71,6 +72,7 @@ export interface SafeResolveWhereArgs {
|
|
|
71
72
|
parentAlias: string;
|
|
72
73
|
parentTableName: string;
|
|
73
74
|
tableName: string;
|
|
75
|
+
columnSecurityMode?: ColumnSecurityMode;
|
|
74
76
|
}
|
|
75
77
|
export interface TableRulesArgs {
|
|
76
78
|
td: SimpleTableDictionary;
|
|
@@ -92,6 +94,7 @@ export interface SafeResolveValueArgs {
|
|
|
92
94
|
parentAlias: string;
|
|
93
95
|
parentTableName: string;
|
|
94
96
|
tableName: string;
|
|
97
|
+
columnSecurityMode?: ColumnSecurityMode;
|
|
95
98
|
}
|
|
96
99
|
export interface SafeResolveSelectArgs {
|
|
97
100
|
select: Select;
|
|
@@ -130,6 +133,7 @@ export declare class SqlSecurityLayerService {
|
|
|
130
133
|
private _select;
|
|
131
134
|
private _safeResolveWhere;
|
|
132
135
|
private _checkCircularReference;
|
|
136
|
+
private _applyColumnSecurityToField;
|
|
133
137
|
private _filterWhereByActiveOn;
|
|
134
138
|
private _tableRules;
|
|
135
139
|
private _safeResolveValue;
|
|
@@ -16,6 +16,7 @@ const _ = require("lodash");
|
|
|
16
16
|
const logger_1 = require("../../../core/services/logger");
|
|
17
17
|
const interfaces_1 = require("../../cases/vanilla/interfaces");
|
|
18
18
|
const helpers_1 = require("./helpers");
|
|
19
|
+
const column_security_helper_1 = require("./column-security.helper");
|
|
19
20
|
const table_permission_helper_1 = require("./table-permission.helper");
|
|
20
21
|
const user_access_control_mode_1 = require("../../../models/user-access-control-mode");
|
|
21
22
|
const crud_controller_especification_environment_1 = require("../../../models/crud-controller-especification-environment");
|
|
@@ -499,12 +500,12 @@ class SqlSecurityLayerService {
|
|
|
499
500
|
};
|
|
500
501
|
const td = this.getSimpleTableDictionary({
|
|
501
502
|
tableName: insert.tableName,
|
|
502
|
-
statementType: '
|
|
503
|
+
statementType: 'insert',
|
|
503
504
|
statement: insert,
|
|
504
505
|
});
|
|
505
|
-
const mode = '
|
|
506
|
+
const mode = 'insert';
|
|
506
507
|
const rootMode = mode;
|
|
507
|
-
const path = `${this.prefix}.
|
|
508
|
+
const path = `${this.prefix}.insert`;
|
|
508
509
|
this._addRuleWhere({
|
|
509
510
|
response,
|
|
510
511
|
rule: this._tableRules({
|
|
@@ -804,7 +805,7 @@ class SqlSecurityLayerService {
|
|
|
804
805
|
throw e;
|
|
805
806
|
}
|
|
806
807
|
}
|
|
807
|
-
_safeResolveWhere({ where, td, tableAlias, mode, rootMode, path, parentAlias, parentTableName, tableName, }) {
|
|
808
|
+
_safeResolveWhere({ where, td, tableAlias, mode, rootMode, path, parentAlias, parentTableName, tableName, columnSecurityMode = 'filter', }) {
|
|
808
809
|
this._checkCircularReference({ path });
|
|
809
810
|
const defaultResponse = {
|
|
810
811
|
args: {},
|
|
@@ -840,6 +841,7 @@ class SqlSecurityLayerService {
|
|
|
840
841
|
parentAlias,
|
|
841
842
|
parentTableName,
|
|
842
843
|
tableName,
|
|
844
|
+
columnSecurityMode,
|
|
843
845
|
});
|
|
844
846
|
return {
|
|
845
847
|
where: {
|
|
@@ -862,6 +864,7 @@ class SqlSecurityLayerService {
|
|
|
862
864
|
parentAlias,
|
|
863
865
|
parentTableName,
|
|
864
866
|
tableName,
|
|
867
|
+
columnSecurityMode,
|
|
865
868
|
});
|
|
866
869
|
})
|
|
867
870
|
.filter(w => w.where);
|
|
@@ -891,6 +894,7 @@ class SqlSecurityLayerService {
|
|
|
891
894
|
parentAlias,
|
|
892
895
|
parentTableName,
|
|
893
896
|
tableName,
|
|
897
|
+
columnSecurityMode,
|
|
894
898
|
});
|
|
895
899
|
})
|
|
896
900
|
.filter(w => w.where);
|
|
@@ -918,6 +922,7 @@ class SqlSecurityLayerService {
|
|
|
918
922
|
parentAlias,
|
|
919
923
|
parentTableName,
|
|
920
924
|
tableName,
|
|
925
|
+
columnSecurityMode,
|
|
921
926
|
});
|
|
922
927
|
const resolvedV2 = this._safeResolveValue({
|
|
923
928
|
field: where.v2,
|
|
@@ -929,6 +934,7 @@ class SqlSecurityLayerService {
|
|
|
929
934
|
parentAlias,
|
|
930
935
|
parentTableName,
|
|
931
936
|
tableName,
|
|
937
|
+
columnSecurityMode,
|
|
932
938
|
});
|
|
933
939
|
return {
|
|
934
940
|
args: Object.assign(Object.assign({}, resolvedV1.args), resolvedV2.args),
|
|
@@ -946,6 +952,68 @@ class SqlSecurityLayerService {
|
|
|
946
952
|
throw new Error('circular reference');
|
|
947
953
|
}
|
|
948
954
|
}
|
|
955
|
+
_applyColumnSecurityToField({ field, tableName, tableAlias, columnSecurityMode, }) {
|
|
956
|
+
var _a;
|
|
957
|
+
const columnRef = (0, column_security_helper_1.resolveSimpleColumnRef)(field, tableName, tableAlias);
|
|
958
|
+
if (!columnRef) {
|
|
959
|
+
return { field, args: {}, denied: false };
|
|
960
|
+
}
|
|
961
|
+
let accessTableName = columnRef.tableName;
|
|
962
|
+
if (!this.tableDictionary.has(accessTableName)) {
|
|
963
|
+
if (accessTableName === tableAlias || accessTableName === tableName) {
|
|
964
|
+
accessTableName = tableName;
|
|
965
|
+
}
|
|
966
|
+
else {
|
|
967
|
+
return { field, args: {}, denied: false };
|
|
968
|
+
}
|
|
969
|
+
}
|
|
970
|
+
const td = this.tableDictionary.get(accessTableName);
|
|
971
|
+
const cfg = (0, column_security_helper_1.getColumnAccess)((_a = td === null || td === void 0 ? void 0 : td.rules) === null || _a === void 0 ? void 0 : _a.select)[columnRef.columnName];
|
|
972
|
+
if (!cfg) {
|
|
973
|
+
return { field, args: {}, denied: false };
|
|
974
|
+
}
|
|
975
|
+
const permissionArgs = (0, column_security_helper_1.resolveColumnAccessArgs)(accessTableName, columnRef.columnName, cfg);
|
|
976
|
+
if (permissionArgs === null) {
|
|
977
|
+
return { field, args: {}, denied: false };
|
|
978
|
+
}
|
|
979
|
+
const alias = columnSecurityMode === 'projection' &&
|
|
980
|
+
typeof field === 'object' &&
|
|
981
|
+
field &&
|
|
982
|
+
'alias' in field &&
|
|
983
|
+
typeof field.alias === 'string' &&
|
|
984
|
+
field.alias
|
|
985
|
+
? field.alias
|
|
986
|
+
: columnRef.columnName;
|
|
987
|
+
if (permissionArgs.length === 0 ||
|
|
988
|
+
columnSecurityMode === 'filter') {
|
|
989
|
+
if (columnSecurityMode === 'projection') {
|
|
990
|
+
return {
|
|
991
|
+
field: (0, column_security_helper_1.nullifyDeniedColumnField)(alias),
|
|
992
|
+
args: { [column_security_helper_1.SECURITY_COLUMN_NULL_ARG]: null },
|
|
993
|
+
denied: true,
|
|
994
|
+
};
|
|
995
|
+
}
|
|
996
|
+
return {
|
|
997
|
+
field: `$${column_security_helper_1.SECURITY_COLUMN_NULL_ARG}`,
|
|
998
|
+
args: { [column_security_helper_1.SECURITY_COLUMN_NULL_ARG]: null },
|
|
999
|
+
denied: true,
|
|
1000
|
+
};
|
|
1001
|
+
}
|
|
1002
|
+
const mode = (0, column_security_helper_1.resolveColumnAccessMode)(cfg);
|
|
1003
|
+
const cteMode = mode === user_access_control_mode_1.UserAccessControlMode.User
|
|
1004
|
+
? user_access_control_mode_1.UserAccessControlMode.User
|
|
1005
|
+
: user_access_control_mode_1.UserAccessControlMode.Rule;
|
|
1006
|
+
const cteAlias = (0, column_security_helper_1.columnPermissionCteAlias)(cteMode, accessTableName, columnRef.columnName);
|
|
1007
|
+
return {
|
|
1008
|
+
field: (0, column_security_helper_1.wrapFieldWithColumnPermissionCase)({
|
|
1009
|
+
field,
|
|
1010
|
+
alias,
|
|
1011
|
+
cteAlias,
|
|
1012
|
+
}),
|
|
1013
|
+
args: { [column_security_helper_1.SECURITY_COLUMN_NULL_ARG]: null },
|
|
1014
|
+
denied: true,
|
|
1015
|
+
};
|
|
1016
|
+
}
|
|
949
1017
|
_filterWhereByActiveOn(where, rootMode) {
|
|
950
1018
|
if (!where) {
|
|
951
1019
|
return null;
|
|
@@ -1072,7 +1140,7 @@ class SqlSecurityLayerService {
|
|
|
1072
1140
|
where: rules.where,
|
|
1073
1141
|
};
|
|
1074
1142
|
}
|
|
1075
|
-
_safeResolveValue({ field, td, tableAlias, mode, rootMode, path, parentAlias, parentTableName, tableName, }) {
|
|
1143
|
+
_safeResolveValue({ field, td, tableAlias, mode, rootMode, path, parentAlias, parentTableName, tableName, columnSecurityMode = 'filter', }) {
|
|
1076
1144
|
this._checkCircularReference({ path });
|
|
1077
1145
|
if (!field) {
|
|
1078
1146
|
return {
|
|
@@ -1081,6 +1149,19 @@ class SqlSecurityLayerService {
|
|
|
1081
1149
|
tables: [],
|
|
1082
1150
|
};
|
|
1083
1151
|
}
|
|
1152
|
+
const columnSecurity = this._applyColumnSecurityToField({
|
|
1153
|
+
field,
|
|
1154
|
+
tableName,
|
|
1155
|
+
tableAlias,
|
|
1156
|
+
columnSecurityMode,
|
|
1157
|
+
});
|
|
1158
|
+
if (columnSecurity.denied) {
|
|
1159
|
+
return {
|
|
1160
|
+
field: columnSecurity.field,
|
|
1161
|
+
args: columnSecurity.args,
|
|
1162
|
+
tables: [],
|
|
1163
|
+
};
|
|
1164
|
+
}
|
|
1084
1165
|
if (typeof field === 'string') {
|
|
1085
1166
|
const result = this.unsafeResolver.unsafeResolveValue({
|
|
1086
1167
|
field: field,
|
|
@@ -1113,6 +1194,7 @@ class SqlSecurityLayerService {
|
|
|
1113
1194
|
parentAlias,
|
|
1114
1195
|
parentTableName,
|
|
1115
1196
|
tableName,
|
|
1197
|
+
columnSecurityMode,
|
|
1116
1198
|
});
|
|
1117
1199
|
tables.push(...result.tables);
|
|
1118
1200
|
Object.entries(result.args).forEach(([k, v]) => {
|
|
@@ -1131,6 +1213,7 @@ class SqlSecurityLayerService {
|
|
|
1131
1213
|
parentAlias,
|
|
1132
1214
|
parentTableName,
|
|
1133
1215
|
tableName,
|
|
1216
|
+
columnSecurityMode,
|
|
1134
1217
|
});
|
|
1135
1218
|
tables.push(...result.tables);
|
|
1136
1219
|
Object.entries(result.args).forEach(([k, v]) => {
|
|
@@ -1168,6 +1251,7 @@ class SqlSecurityLayerService {
|
|
|
1168
1251
|
parentAlias,
|
|
1169
1252
|
parentTableName,
|
|
1170
1253
|
tableName,
|
|
1254
|
+
columnSecurityMode,
|
|
1171
1255
|
});
|
|
1172
1256
|
tables.push(...resolved.tables);
|
|
1173
1257
|
Object.entries(resolved.args).forEach(([k, v]) => {
|
|
@@ -1184,7 +1268,8 @@ class SqlSecurityLayerService {
|
|
|
1184
1268
|
path,
|
|
1185
1269
|
parentAlias,
|
|
1186
1270
|
parentTableName,
|
|
1187
|
-
tableName
|
|
1271
|
+
tableName,
|
|
1272
|
+
columnSecurityMode,
|
|
1188
1273
|
});
|
|
1189
1274
|
tables.push(...resolved.tables);
|
|
1190
1275
|
Object.entries(resolved.args).forEach(([k, v]) => {
|
|
@@ -1212,6 +1297,7 @@ class SqlSecurityLayerService {
|
|
|
1212
1297
|
parentAlias,
|
|
1213
1298
|
parentTableName,
|
|
1214
1299
|
tableName,
|
|
1300
|
+
columnSecurityMode,
|
|
1215
1301
|
});
|
|
1216
1302
|
const over = resolveOver(resolved.tables, resolved.args);
|
|
1217
1303
|
return {
|
|
@@ -1266,6 +1352,7 @@ class SqlSecurityLayerService {
|
|
|
1266
1352
|
parentAlias,
|
|
1267
1353
|
parentTableName,
|
|
1268
1354
|
tableName,
|
|
1355
|
+
columnSecurityMode,
|
|
1269
1356
|
});
|
|
1270
1357
|
tables.push(...e.tables);
|
|
1271
1358
|
Object.entries(e.args).forEach(([k, v]) => {
|
|
@@ -1284,6 +1371,7 @@ class SqlSecurityLayerService {
|
|
|
1284
1371
|
parentAlias,
|
|
1285
1372
|
parentTableName,
|
|
1286
1373
|
tableName,
|
|
1374
|
+
columnSecurityMode,
|
|
1287
1375
|
});
|
|
1288
1376
|
const then = this._safeResolveValue({
|
|
1289
1377
|
field: c.then,
|
|
@@ -1295,6 +1383,7 @@ class SqlSecurityLayerService {
|
|
|
1295
1383
|
parentAlias,
|
|
1296
1384
|
parentTableName,
|
|
1297
1385
|
tableName,
|
|
1386
|
+
columnSecurityMode,
|
|
1298
1387
|
});
|
|
1299
1388
|
tables.push(...when.tables, ...then.tables);
|
|
1300
1389
|
Object.entries(when.args).forEach(([k, v]) => {
|
|
@@ -1358,7 +1447,7 @@ class SqlSecurityLayerService {
|
|
|
1358
1447
|
};
|
|
1359
1448
|
}
|
|
1360
1449
|
_safeResolveSelect({ select: oSelect, mode, rootMode, path, parentAlias, parentTableName, includePermissionCtes, }) {
|
|
1361
|
-
var _a, _b;
|
|
1450
|
+
var _a, _b, _c, _d;
|
|
1362
1451
|
this._checkCircularReference({ path });
|
|
1363
1452
|
const currentTableName = typeof oSelect.from === 'string' ? oSelect.from : (typeof oSelect.from.table === 'string' ? oSelect.from.table : oSelect.from.alias);
|
|
1364
1453
|
const currentTableAlias = (typeof oSelect.from === 'string' ? oSelect.from : oSelect.from.alias) ||
|
|
@@ -1369,6 +1458,9 @@ class SqlSecurityLayerService {
|
|
|
1369
1458
|
statementType: 'select',
|
|
1370
1459
|
statement: select,
|
|
1371
1460
|
});
|
|
1461
|
+
if ((0, column_security_helper_1.hasRestrictedColumnAccess)((_a = td === null || td === void 0 ? void 0 : td.rules) === null || _a === void 0 ? void 0 : _a.select) && (!select.fields || !select.fields.length)) {
|
|
1462
|
+
throw new Error('Proibido o uso de *');
|
|
1463
|
+
}
|
|
1372
1464
|
const response = {
|
|
1373
1465
|
args: Object.assign({}, select.args),
|
|
1374
1466
|
tables: [],
|
|
@@ -1376,6 +1468,9 @@ class SqlSecurityLayerService {
|
|
|
1376
1468
|
and: [],
|
|
1377
1469
|
},
|
|
1378
1470
|
};
|
|
1471
|
+
if (td && (0, column_security_helper_1.hasRestrictedColumnAccess)((_b = td.rules) === null || _b === void 0 ? void 0 : _b.select)) {
|
|
1472
|
+
response.tables.push(td);
|
|
1473
|
+
}
|
|
1379
1474
|
const resolvedWhere = this._safeResolveWhere({
|
|
1380
1475
|
where: select.where,
|
|
1381
1476
|
td,
|
|
@@ -1401,8 +1496,9 @@ class SqlSecurityLayerService {
|
|
|
1401
1496
|
this._addRuleWhere({ response, rule: tableRules });
|
|
1402
1497
|
const join = ([
|
|
1403
1498
|
...(select.join || []),
|
|
1404
|
-
...(((
|
|
1499
|
+
...(((_d = (_c = td === null || td === void 0 ? void 0 : td.rules) === null || _c === void 0 ? void 0 : _c.select) === null || _d === void 0 ? void 0 : _d.join) || [])
|
|
1405
1500
|
]).map((join, i) => {
|
|
1501
|
+
var _a;
|
|
1406
1502
|
const jResponse = {
|
|
1407
1503
|
args: {},
|
|
1408
1504
|
tables: [],
|
|
@@ -1418,6 +1514,12 @@ class SqlSecurityLayerService {
|
|
|
1418
1514
|
statementType: 'select',
|
|
1419
1515
|
statement: select,
|
|
1420
1516
|
});
|
|
1517
|
+
if (td && (0, column_security_helper_1.hasRestrictedColumnAccess)((_a = td.rules) === null || _a === void 0 ? void 0 : _a.select)) {
|
|
1518
|
+
this._addRuleWhere({
|
|
1519
|
+
response: jResponse,
|
|
1520
|
+
rule: { where: null, args: {}, tables: [td] },
|
|
1521
|
+
});
|
|
1522
|
+
}
|
|
1421
1523
|
this._addRuleWhere({
|
|
1422
1524
|
response: jResponse,
|
|
1423
1525
|
rule: this._safeResolveWhere({
|
|
@@ -1430,6 +1532,7 @@ class SqlSecurityLayerService {
|
|
|
1430
1532
|
parentAlias: currentTableAlias,
|
|
1431
1533
|
parentTableName: currentTableName,
|
|
1432
1534
|
tableName: jTableName,
|
|
1535
|
+
columnSecurityMode: 'filter',
|
|
1433
1536
|
}),
|
|
1434
1537
|
});
|
|
1435
1538
|
this._addRuleWhere({
|
|
@@ -1572,6 +1675,7 @@ class SqlSecurityLayerService {
|
|
|
1572
1675
|
parentAlias,
|
|
1573
1676
|
parentTableName,
|
|
1574
1677
|
tableName: currentTableName,
|
|
1678
|
+
columnSecurityMode: 'projection',
|
|
1575
1679
|
});
|
|
1576
1680
|
this._addRuleWhere({
|
|
1577
1681
|
response,
|
|
@@ -1596,7 +1700,7 @@ class SqlSecurityLayerService {
|
|
|
1596
1700
|
if (typeof f === 'string') {
|
|
1597
1701
|
return resolved.field;
|
|
1598
1702
|
}
|
|
1599
|
-
return Object.assign(Object.assign({}, resolved.field), { cast: f.cast, alias: f.alias });
|
|
1703
|
+
return Object.assign(Object.assign({}, resolved.field), { cast: f.cast, alias: f.alias || resolved.field.alias });
|
|
1600
1704
|
}),
|
|
1601
1705
|
query: (select.query || []).map(q => {
|
|
1602
1706
|
const resolvedField = this._safeResolveValue({
|
|
@@ -1754,6 +1858,30 @@ class SqlSecurityLayerService {
|
|
|
1754
1858
|
select
|
|
1755
1859
|
});
|
|
1756
1860
|
}
|
|
1861
|
+
const columnAccess = (0, column_security_helper_1.getColumnAccess)(rules.select);
|
|
1862
|
+
Object.entries(columnAccess).forEach(([columnName, cfg]) => {
|
|
1863
|
+
const permissionNames = (0, column_security_helper_1.resolveColumnAccessArgs)(table.name, columnName, cfg);
|
|
1864
|
+
if (!permissionNames || permissionNames.length === 0) {
|
|
1865
|
+
return;
|
|
1866
|
+
}
|
|
1867
|
+
const mode = (0, column_security_helper_1.resolveColumnAccessMode)(cfg);
|
|
1868
|
+
const isUser = mode === user_access_control_mode_1.UserAccessControlMode.User;
|
|
1869
|
+
const cteMode = isUser
|
|
1870
|
+
? user_access_control_mode_1.UserAccessControlMode.User
|
|
1871
|
+
: user_access_control_mode_1.UserAccessControlMode.Rule;
|
|
1872
|
+
const cteAlias = (0, column_security_helper_1.columnPermissionCteAlias)(cteMode, table.name, columnName);
|
|
1873
|
+
const colVariablePrefix = `${table.name}_${columnName}`;
|
|
1874
|
+
const select = isUser
|
|
1875
|
+
? (0, table_permission_helper_1.userPermissionByNames)(colVariablePrefix, permissionNames)
|
|
1876
|
+
: (0, table_permission_helper_1.rulePermissionByNames)(colVariablePrefix, permissionNames);
|
|
1877
|
+
Object.entries(select.args || {}).forEach(([k, v]) => {
|
|
1878
|
+
result.select.args[k] = v;
|
|
1879
|
+
});
|
|
1880
|
+
withSet.set(cteAlias, {
|
|
1881
|
+
alias: cteAlias,
|
|
1882
|
+
select,
|
|
1883
|
+
});
|
|
1884
|
+
});
|
|
1757
1885
|
});
|
|
1758
1886
|
result.select.with = [...withSet.values(), ...result.select.with];
|
|
1759
1887
|
}
|