@puca/puca-core 14.4.1 → 14.5.1
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/crud-base-testable.service.d.ts +9 -0
- package/dist/core/services/crud-base-testable.service.js +19 -0
- package/dist/core/services/crud-base-testable.service.js.map +1 -1
- package/dist/core/services/crud-base.controller.d.ts +1 -0
- package/dist/core/services/crud-base.controller.js +43 -0
- package/dist/core/services/crud-base.controller.js.map +1 -1
- package/dist/core/services/crud-base.service.d.ts +1 -0
- package/dist/core/services/crud-base.service.js.map +1 -1
- package/dist/core/services/crud-front-base.service.js +5 -2
- package/dist/core/services/crud-front-base.service.js.map +1 -1
- package/dist/core/services/index.d.ts +0 -2
- package/dist/core/services/index.js +1 -3
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/install.service.js +3 -1
- package/dist/core/services/install.service.js.map +1 -1
- package/dist/core/services/llm/llm.service.d.ts +10 -0
- package/dist/core/services/llm/llm.service.js +45 -18
- package/dist/core/services/llm/llm.service.js.map +1 -1
- package/dist/core/services/table-permission.service.js +9 -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/orm/cases/vanilla/sql-builder/select.service.js +1 -0
- package/dist/orm/cases/vanilla/sql-builder/select.service.js.map +1 -1
- package/dist/orm/services/repository-factory.js +1 -1
- package/dist/orm/services/repository-factory.js.map +1 -1
- package/dist/orm/services/repository.d.ts +8 -1
- package/dist/orm/services/repository.js +64 -4
- package/dist/orm/services/repository.js.map +1 -1
- package/dist/orm/services/sql/helpers.d.ts +2 -2
- package/dist/orm/services/sql/helpers.js +5 -4
- package/dist/orm/services/sql/helpers.js.map +1 -1
- package/dist/orm/services/sql/sql-security-layer.service.d.ts +6 -1
- package/dist/orm/services/sql/sql-security-layer.service.js +155 -13
- package/dist/orm/services/sql/sql-security-layer.service.js.map +1 -1
- package/dist/plugins/final-user-query-language/fuql-2-pql-conversor.js +15 -2
- package/dist/plugins/final-user-query-language/fuql-2-pql-conversor.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/core/services/llm/natural-language-to-fuql.service.d.ts +0 -28
- package/dist/core/services/llm/natural-language-to-fuql.service.js +0 -209
- package/dist/core/services/llm/natural-language-to-fuql.service.js.map +0 -1
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
3
|
+
var t = {};
|
|
4
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
5
|
+
t[p] = s[p];
|
|
6
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
7
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
8
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
9
|
+
t[p[i]] = s[p[i]];
|
|
10
|
+
}
|
|
11
|
+
return t;
|
|
12
|
+
};
|
|
2
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
14
|
exports.SqlSecurityLayerService = void 0;
|
|
4
15
|
const _ = require("lodash");
|
|
@@ -7,6 +18,7 @@ const interfaces_1 = require("../../cases/vanilla/interfaces");
|
|
|
7
18
|
const helpers_1 = require("./helpers");
|
|
8
19
|
const table_permission_helper_1 = require("./table-permission.helper");
|
|
9
20
|
const user_access_control_mode_1 = require("../../../models/user-access-control-mode");
|
|
21
|
+
const crud_controller_especification_environment_1 = require("../../../models/crud-controller-especification-environment");
|
|
10
22
|
const is_primitive_type_1 = require("../../../helpers/is-primitive-type");
|
|
11
23
|
const DISABLE_PERMISSION_SYSTEM_FOR_PUCA_USER = process.env.DISABLE_PERMISSION_SYSTEM_FOR_PUCA_USER === 'false' ? false : true;
|
|
12
24
|
var PermissionSystemStatus;
|
|
@@ -365,7 +377,7 @@ class SqlSecurityLayerService {
|
|
|
365
377
|
return select;
|
|
366
378
|
}
|
|
367
379
|
}
|
|
368
|
-
const result = this._select(select);
|
|
380
|
+
const result = this._select(select, { rootMode: 'select' });
|
|
369
381
|
if (result.tables.find(t => { var _a; return (_a = t.rules) === null || _a === void 0 ? void 0 : _a.select; }) && !select.user) {
|
|
370
382
|
const msg = 'Permission denied to read on ' + result.tables.map(t => t.name).join(', ');
|
|
371
383
|
this.logger.warn('select', msg);
|
|
@@ -484,6 +496,7 @@ class SqlSecurityLayerService {
|
|
|
484
496
|
statement: insert,
|
|
485
497
|
});
|
|
486
498
|
const mode = 'update';
|
|
499
|
+
const rootMode = mode;
|
|
487
500
|
const path = `${this.prefix}.update`;
|
|
488
501
|
this._addRuleWhere({
|
|
489
502
|
response,
|
|
@@ -491,6 +504,7 @@ class SqlSecurityLayerService {
|
|
|
491
504
|
td,
|
|
492
505
|
alias: insert.tableName,
|
|
493
506
|
mode,
|
|
507
|
+
rootMode,
|
|
494
508
|
path,
|
|
495
509
|
parentAlias: null,
|
|
496
510
|
parentTableName: null,
|
|
@@ -533,7 +547,7 @@ class SqlSecurityLayerService {
|
|
|
533
547
|
const f = this._select({
|
|
534
548
|
from: insert.tableName,
|
|
535
549
|
user: insert.user,
|
|
536
|
-
});
|
|
550
|
+
}, { rootMode: 'insert' });
|
|
537
551
|
if (!f.select.with) {
|
|
538
552
|
f.select.with = [];
|
|
539
553
|
}
|
|
@@ -610,6 +624,7 @@ class SqlSecurityLayerService {
|
|
|
610
624
|
statement: update,
|
|
611
625
|
});
|
|
612
626
|
const mode = 'update';
|
|
627
|
+
const rootMode = mode;
|
|
613
628
|
const path = `${this.prefix}.update`;
|
|
614
629
|
this._addRuleWhere({
|
|
615
630
|
response,
|
|
@@ -618,6 +633,7 @@ class SqlSecurityLayerService {
|
|
|
618
633
|
td,
|
|
619
634
|
tableAlias: update.tableName,
|
|
620
635
|
mode,
|
|
636
|
+
rootMode,
|
|
621
637
|
path,
|
|
622
638
|
parentAlias: null,
|
|
623
639
|
parentTableName: null,
|
|
@@ -630,6 +646,7 @@ class SqlSecurityLayerService {
|
|
|
630
646
|
td,
|
|
631
647
|
alias: update.tableName,
|
|
632
648
|
mode,
|
|
649
|
+
rootMode,
|
|
633
650
|
path,
|
|
634
651
|
parentAlias: null,
|
|
635
652
|
parentTableName: null,
|
|
@@ -652,7 +669,7 @@ class SqlSecurityLayerService {
|
|
|
652
669
|
v2: '$puca_pid',
|
|
653
670
|
}]
|
|
654
671
|
}
|
|
655
|
-
});
|
|
672
|
+
}, { rootMode: 'update' });
|
|
656
673
|
return {
|
|
657
674
|
puca_pid: update.puca_pid,
|
|
658
675
|
set: update.set,
|
|
@@ -691,6 +708,7 @@ class SqlSecurityLayerService {
|
|
|
691
708
|
statement: d,
|
|
692
709
|
});
|
|
693
710
|
const mode = 'delete';
|
|
711
|
+
const rootMode = mode;
|
|
694
712
|
const path = `${this.prefix}.delete`;
|
|
695
713
|
this._addRuleWhere({
|
|
696
714
|
response,
|
|
@@ -699,6 +717,7 @@ class SqlSecurityLayerService {
|
|
|
699
717
|
td,
|
|
700
718
|
tableAlias: d.tableName,
|
|
701
719
|
mode,
|
|
720
|
+
rootMode,
|
|
702
721
|
path,
|
|
703
722
|
parentAlias: null,
|
|
704
723
|
parentTableName: null,
|
|
@@ -711,6 +730,7 @@ class SqlSecurityLayerService {
|
|
|
711
730
|
td,
|
|
712
731
|
alias: d.tableName,
|
|
713
732
|
mode,
|
|
733
|
+
rootMode,
|
|
714
734
|
path,
|
|
715
735
|
parentAlias: null,
|
|
716
736
|
parentTableName: null,
|
|
@@ -726,7 +746,7 @@ class SqlSecurityLayerService {
|
|
|
726
746
|
args: {
|
|
727
747
|
puca_pid: d.puca_pid
|
|
728
748
|
}
|
|
729
|
-
});
|
|
749
|
+
}, { rootMode: 'delete' });
|
|
730
750
|
return {
|
|
731
751
|
puca_pid: d.puca_pid,
|
|
732
752
|
tableName: d.tableName,
|
|
@@ -746,7 +766,7 @@ class SqlSecurityLayerService {
|
|
|
746
766
|
throw e;
|
|
747
767
|
}
|
|
748
768
|
}
|
|
749
|
-
_select(select) {
|
|
769
|
+
_select(select, opts) {
|
|
750
770
|
try {
|
|
751
771
|
let rules;
|
|
752
772
|
const getRules = () => {
|
|
@@ -756,10 +776,11 @@ class SqlSecurityLayerService {
|
|
|
756
776
|
rules = this._safeResolveSelect({
|
|
757
777
|
select,
|
|
758
778
|
mode: 'select',
|
|
779
|
+
rootMode: opts === null || opts === void 0 ? void 0 : opts.rootMode,
|
|
759
780
|
path: `${this.prefix}.select`,
|
|
760
781
|
parentAlias: null,
|
|
761
782
|
parentTableName: null,
|
|
762
|
-
|
|
783
|
+
includePermissionCtes: true
|
|
763
784
|
});
|
|
764
785
|
return rules;
|
|
765
786
|
};
|
|
@@ -776,7 +797,7 @@ class SqlSecurityLayerService {
|
|
|
776
797
|
throw e;
|
|
777
798
|
}
|
|
778
799
|
}
|
|
779
|
-
_safeResolveWhere({ where, td, tableAlias, mode, path, parentAlias, parentTableName, tableName, }) {
|
|
800
|
+
_safeResolveWhere({ where, td, tableAlias, mode, rootMode, path, parentAlias, parentTableName, tableName, }) {
|
|
780
801
|
this._checkCircularReference({ path });
|
|
781
802
|
const defaultResponse = {
|
|
782
803
|
args: {},
|
|
@@ -790,6 +811,7 @@ class SqlSecurityLayerService {
|
|
|
790
811
|
const rules = this._safeResolveSelect({
|
|
791
812
|
select: Object.assign(Object.assign({}, where.exists), { user: null }),
|
|
792
813
|
mode: 'select',
|
|
814
|
+
rootMode,
|
|
793
815
|
path: `${path}.e`,
|
|
794
816
|
parentAlias: tableAlias,
|
|
795
817
|
parentTableName: tableName
|
|
@@ -806,6 +828,7 @@ class SqlSecurityLayerService {
|
|
|
806
828
|
td,
|
|
807
829
|
tableAlias,
|
|
808
830
|
mode,
|
|
831
|
+
rootMode,
|
|
809
832
|
path: `${path}.n`,
|
|
810
833
|
parentAlias,
|
|
811
834
|
parentTableName,
|
|
@@ -827,6 +850,7 @@ class SqlSecurityLayerService {
|
|
|
827
850
|
td,
|
|
828
851
|
tableAlias,
|
|
829
852
|
mode,
|
|
853
|
+
rootMode,
|
|
830
854
|
path: `${path}.${i}`,
|
|
831
855
|
parentAlias,
|
|
832
856
|
parentTableName,
|
|
@@ -855,6 +879,7 @@ class SqlSecurityLayerService {
|
|
|
855
879
|
td,
|
|
856
880
|
tableAlias,
|
|
857
881
|
mode,
|
|
882
|
+
rootMode,
|
|
858
883
|
path: `${path}.${i}`,
|
|
859
884
|
parentAlias,
|
|
860
885
|
parentTableName,
|
|
@@ -881,6 +906,7 @@ class SqlSecurityLayerService {
|
|
|
881
906
|
td,
|
|
882
907
|
tableAlias,
|
|
883
908
|
mode,
|
|
909
|
+
rootMode,
|
|
884
910
|
path,
|
|
885
911
|
parentAlias,
|
|
886
912
|
parentTableName,
|
|
@@ -891,6 +917,7 @@ class SqlSecurityLayerService {
|
|
|
891
917
|
td,
|
|
892
918
|
tableAlias,
|
|
893
919
|
mode,
|
|
920
|
+
rootMode,
|
|
894
921
|
path,
|
|
895
922
|
parentAlias,
|
|
896
923
|
parentTableName,
|
|
@@ -912,12 +939,93 @@ class SqlSecurityLayerService {
|
|
|
912
939
|
throw new Error('circular reference');
|
|
913
940
|
}
|
|
914
941
|
}
|
|
915
|
-
|
|
942
|
+
_filterWhereByActiveOn(where, rootMode) {
|
|
943
|
+
if (!where) {
|
|
944
|
+
return null;
|
|
945
|
+
}
|
|
946
|
+
if ('activeOn' in where) {
|
|
947
|
+
const activeOn = where.activeOn;
|
|
948
|
+
const shouldApply = !activeOn ||
|
|
949
|
+
activeOn.includes('all') ||
|
|
950
|
+
activeOn.includes(rootMode);
|
|
951
|
+
if (!shouldApply) {
|
|
952
|
+
return null;
|
|
953
|
+
}
|
|
954
|
+
}
|
|
955
|
+
if ('and' in where) {
|
|
956
|
+
const filtered = where.and
|
|
957
|
+
.map((w) => this._filterWhereByActiveOn(w, rootMode))
|
|
958
|
+
.filter((w) => w !== null);
|
|
959
|
+
if (filtered.length === 0) {
|
|
960
|
+
return null;
|
|
961
|
+
}
|
|
962
|
+
const result = { and: filtered };
|
|
963
|
+
if ('activeOn' in where) {
|
|
964
|
+
const { activeOn } = where, rest = __rest(where, ["activeOn"]);
|
|
965
|
+
return Object.assign(Object.assign({}, rest), { and: filtered });
|
|
966
|
+
}
|
|
967
|
+
return result;
|
|
968
|
+
}
|
|
969
|
+
if ('or' in where) {
|
|
970
|
+
const filtered = where.or
|
|
971
|
+
.map((w) => this._filterWhereByActiveOn(w, rootMode))
|
|
972
|
+
.filter((w) => w !== null);
|
|
973
|
+
if (filtered.length === 0) {
|
|
974
|
+
return null;
|
|
975
|
+
}
|
|
976
|
+
const result = { or: filtered };
|
|
977
|
+
if ('activeOn' in where) {
|
|
978
|
+
const { activeOn } = where, rest = __rest(where, ["activeOn"]);
|
|
979
|
+
return Object.assign(Object.assign({}, rest), { or: filtered });
|
|
980
|
+
}
|
|
981
|
+
return result;
|
|
982
|
+
}
|
|
983
|
+
if ('not' in where) {
|
|
984
|
+
const filteredNot = this._filterWhereByActiveOn(where.not, rootMode);
|
|
985
|
+
if (filteredNot === null) {
|
|
986
|
+
return null;
|
|
987
|
+
}
|
|
988
|
+
const result = { not: filteredNot };
|
|
989
|
+
if ('activeOn' in where) {
|
|
990
|
+
const { activeOn } = where, rest = __rest(where, ["activeOn"]);
|
|
991
|
+
return Object.assign(Object.assign({}, rest), { not: filteredNot });
|
|
992
|
+
}
|
|
993
|
+
return result;
|
|
994
|
+
}
|
|
995
|
+
if ('exists' in where) {
|
|
996
|
+
const select = where.exists;
|
|
997
|
+
let filteredSelect = Object.assign({}, select);
|
|
998
|
+
if (select.where) {
|
|
999
|
+
const filteredWhere = this._filterWhereByActiveOn(select.where, rootMode);
|
|
1000
|
+
if (filteredWhere === null) {
|
|
1001
|
+
return null;
|
|
1002
|
+
}
|
|
1003
|
+
filteredSelect.where = filteredWhere;
|
|
1004
|
+
}
|
|
1005
|
+
const result = { exists: filteredSelect };
|
|
1006
|
+
if ('activeOn' in where) {
|
|
1007
|
+
const { activeOn } = where, rest = __rest(where, ["activeOn"]);
|
|
1008
|
+
return Object.assign(Object.assign({}, rest), { exists: filteredSelect });
|
|
1009
|
+
}
|
|
1010
|
+
return result;
|
|
1011
|
+
}
|
|
1012
|
+
if ('activeOn' in where) {
|
|
1013
|
+
const { activeOn } = where, rest = __rest(where, ["activeOn"]);
|
|
1014
|
+
return rest;
|
|
1015
|
+
}
|
|
1016
|
+
return where;
|
|
1017
|
+
}
|
|
1018
|
+
_tableRules({ td, alias: tableAlias, tableName, path, mode, rootMode, parentAlias, parentTableName, }) {
|
|
916
1019
|
if (!td) {
|
|
917
1020
|
return { where: null, args: {}, tables: [] };
|
|
918
1021
|
}
|
|
1022
|
+
const originalWhere = _.get(td.rules, [mode, 'where']);
|
|
1023
|
+
const filteredWhere = this._filterWhereByActiveOn(originalWhere, rootMode);
|
|
1024
|
+
if (!filteredWhere) {
|
|
1025
|
+
return { where: null, args: {}, tables: [] };
|
|
1026
|
+
}
|
|
919
1027
|
const where = this.unsafeResolver.unsafeResolveWhere({
|
|
920
|
-
where:
|
|
1028
|
+
where: filteredWhere,
|
|
921
1029
|
alias: tableAlias,
|
|
922
1030
|
path,
|
|
923
1031
|
parentAlias,
|
|
@@ -929,6 +1037,7 @@ class SqlSecurityLayerService {
|
|
|
929
1037
|
const rules = this._safeResolveWhere({
|
|
930
1038
|
where,
|
|
931
1039
|
mode,
|
|
1040
|
+
rootMode,
|
|
932
1041
|
tableAlias,
|
|
933
1042
|
td,
|
|
934
1043
|
path: `${path}.tr`,
|
|
@@ -956,7 +1065,7 @@ class SqlSecurityLayerService {
|
|
|
956
1065
|
where: rules.where,
|
|
957
1066
|
};
|
|
958
1067
|
}
|
|
959
|
-
_safeResolveValue({ field, td, tableAlias, mode, path, parentAlias, parentTableName, tableName, }) {
|
|
1068
|
+
_safeResolveValue({ field, td, tableAlias, mode, rootMode, path, parentAlias, parentTableName, tableName, }) {
|
|
960
1069
|
this._checkCircularReference({ path });
|
|
961
1070
|
if (!field) {
|
|
962
1071
|
return {
|
|
@@ -992,6 +1101,7 @@ class SqlSecurityLayerService {
|
|
|
992
1101
|
td,
|
|
993
1102
|
tableAlias,
|
|
994
1103
|
mode,
|
|
1104
|
+
rootMode,
|
|
995
1105
|
path,
|
|
996
1106
|
parentAlias,
|
|
997
1107
|
parentTableName,
|
|
@@ -1009,6 +1119,7 @@ class SqlSecurityLayerService {
|
|
|
1009
1119
|
td,
|
|
1010
1120
|
tableAlias,
|
|
1011
1121
|
mode,
|
|
1122
|
+
rootMode,
|
|
1012
1123
|
path,
|
|
1013
1124
|
parentAlias,
|
|
1014
1125
|
parentTableName,
|
|
@@ -1045,6 +1156,7 @@ class SqlSecurityLayerService {
|
|
|
1045
1156
|
td,
|
|
1046
1157
|
tableAlias,
|
|
1047
1158
|
mode,
|
|
1159
|
+
rootMode,
|
|
1048
1160
|
path,
|
|
1049
1161
|
parentAlias,
|
|
1050
1162
|
parentTableName,
|
|
@@ -1061,6 +1173,7 @@ class SqlSecurityLayerService {
|
|
|
1061
1173
|
td,
|
|
1062
1174
|
tableAlias,
|
|
1063
1175
|
mode,
|
|
1176
|
+
rootMode,
|
|
1064
1177
|
path,
|
|
1065
1178
|
parentAlias,
|
|
1066
1179
|
parentTableName,
|
|
@@ -1087,6 +1200,7 @@ class SqlSecurityLayerService {
|
|
|
1087
1200
|
td,
|
|
1088
1201
|
tableAlias,
|
|
1089
1202
|
mode,
|
|
1203
|
+
rootMode,
|
|
1090
1204
|
path,
|
|
1091
1205
|
parentAlias,
|
|
1092
1206
|
parentTableName,
|
|
@@ -1149,6 +1263,7 @@ class SqlSecurityLayerService {
|
|
|
1149
1263
|
td,
|
|
1150
1264
|
tableAlias,
|
|
1151
1265
|
mode,
|
|
1266
|
+
rootMode,
|
|
1152
1267
|
path,
|
|
1153
1268
|
parentAlias,
|
|
1154
1269
|
parentTableName,
|
|
@@ -1166,6 +1281,7 @@ class SqlSecurityLayerService {
|
|
|
1166
1281
|
td,
|
|
1167
1282
|
tableAlias,
|
|
1168
1283
|
mode,
|
|
1284
|
+
rootMode,
|
|
1169
1285
|
path,
|
|
1170
1286
|
parentAlias,
|
|
1171
1287
|
parentTableName,
|
|
@@ -1176,6 +1292,7 @@ class SqlSecurityLayerService {
|
|
|
1176
1292
|
td,
|
|
1177
1293
|
tableAlias,
|
|
1178
1294
|
mode,
|
|
1295
|
+
rootMode,
|
|
1179
1296
|
path,
|
|
1180
1297
|
parentAlias,
|
|
1181
1298
|
parentTableName,
|
|
@@ -1208,6 +1325,7 @@ class SqlSecurityLayerService {
|
|
|
1208
1325
|
const resolved = this._safeResolveSelect({
|
|
1209
1326
|
select: Object.assign(Object.assign({}, field.exists), { user: null }),
|
|
1210
1327
|
mode: 'select',
|
|
1328
|
+
rootMode,
|
|
1211
1329
|
path: `${path}.e`,
|
|
1212
1330
|
parentAlias: tableAlias,
|
|
1213
1331
|
parentTableName: tableName
|
|
@@ -1230,6 +1348,7 @@ class SqlSecurityLayerService {
|
|
|
1230
1348
|
const resolved = this._safeResolveSelect({
|
|
1231
1349
|
select: Object.assign(Object.assign({}, field), { user: null }),
|
|
1232
1350
|
mode: 'select',
|
|
1351
|
+
rootMode,
|
|
1233
1352
|
path: `${path}.f`,
|
|
1234
1353
|
parentAlias: tableAlias,
|
|
1235
1354
|
parentTableName: tableName
|
|
@@ -1240,7 +1359,7 @@ class SqlSecurityLayerService {
|
|
|
1240
1359
|
tables: resolved.tables,
|
|
1241
1360
|
};
|
|
1242
1361
|
}
|
|
1243
|
-
_safeResolveSelect({ select: oSelect, mode, path, parentAlias, parentTableName,
|
|
1362
|
+
_safeResolveSelect({ select: oSelect, mode, rootMode, path, parentAlias, parentTableName, includePermissionCtes, }) {
|
|
1244
1363
|
var _a, _b;
|
|
1245
1364
|
this._checkCircularReference({ path });
|
|
1246
1365
|
const currentTableName = typeof oSelect.from === 'string' ? oSelect.from : (typeof oSelect.from.table === 'string' ? oSelect.from.table : oSelect.from.alias);
|
|
@@ -1264,6 +1383,7 @@ class SqlSecurityLayerService {
|
|
|
1264
1383
|
td,
|
|
1265
1384
|
tableAlias: currentTableAlias,
|
|
1266
1385
|
mode,
|
|
1386
|
+
rootMode,
|
|
1267
1387
|
path,
|
|
1268
1388
|
parentAlias,
|
|
1269
1389
|
parentTableName,
|
|
@@ -1274,6 +1394,7 @@ class SqlSecurityLayerService {
|
|
|
1274
1394
|
td,
|
|
1275
1395
|
alias: currentTableAlias,
|
|
1276
1396
|
mode,
|
|
1397
|
+
rootMode,
|
|
1277
1398
|
path,
|
|
1278
1399
|
parentAlias,
|
|
1279
1400
|
parentTableName,
|
|
@@ -1306,6 +1427,7 @@ class SqlSecurityLayerService {
|
|
|
1306
1427
|
td,
|
|
1307
1428
|
tableAlias: jAlias,
|
|
1308
1429
|
mode,
|
|
1430
|
+
rootMode,
|
|
1309
1431
|
path: `${path}.${i}`,
|
|
1310
1432
|
parentAlias: currentTableAlias,
|
|
1311
1433
|
parentTableName: currentTableName,
|
|
@@ -1318,6 +1440,7 @@ class SqlSecurityLayerService {
|
|
|
1318
1440
|
td,
|
|
1319
1441
|
alias: jAlias,
|
|
1320
1442
|
mode,
|
|
1443
|
+
rootMode,
|
|
1321
1444
|
path: `${path}.${i}`,
|
|
1322
1445
|
parentAlias: currentTableAlias,
|
|
1323
1446
|
parentTableName: currentTableName,
|
|
@@ -1338,6 +1461,7 @@ class SqlSecurityLayerService {
|
|
|
1338
1461
|
const w = (select.with || []).map(w => {
|
|
1339
1462
|
const rules = this._safeResolveSelect({
|
|
1340
1463
|
mode: 'select',
|
|
1464
|
+
rootMode,
|
|
1341
1465
|
path: `${path}.with`,
|
|
1342
1466
|
select: Object.assign(Object.assign({}, w.select), { user: null }),
|
|
1343
1467
|
parentAlias: null,
|
|
@@ -1361,6 +1485,7 @@ class SqlSecurityLayerService {
|
|
|
1361
1485
|
td,
|
|
1362
1486
|
tableAlias: currentTableAlias,
|
|
1363
1487
|
mode,
|
|
1488
|
+
rootMode,
|
|
1364
1489
|
path,
|
|
1365
1490
|
parentAlias,
|
|
1366
1491
|
parentTableName,
|
|
@@ -1384,6 +1509,7 @@ class SqlSecurityLayerService {
|
|
|
1384
1509
|
union: (select.union || []).map(u => {
|
|
1385
1510
|
const result = this._safeResolveSelect({
|
|
1386
1511
|
mode: 'select',
|
|
1512
|
+
rootMode,
|
|
1387
1513
|
path: `${path}.union`,
|
|
1388
1514
|
select: u,
|
|
1389
1515
|
parentAlias: currentTableAlias,
|
|
@@ -1398,6 +1524,7 @@ class SqlSecurityLayerService {
|
|
|
1398
1524
|
unionAll: (select.unionAll || []).map(u => {
|
|
1399
1525
|
const result = this._safeResolveSelect({
|
|
1400
1526
|
mode: 'select',
|
|
1527
|
+
rootMode,
|
|
1401
1528
|
path: `${path}.unionAll`,
|
|
1402
1529
|
select: u,
|
|
1403
1530
|
parentAlias: currentTableAlias,
|
|
@@ -1415,6 +1542,7 @@ class SqlSecurityLayerService {
|
|
|
1415
1542
|
td,
|
|
1416
1543
|
tableAlias: currentTableAlias,
|
|
1417
1544
|
mode,
|
|
1545
|
+
rootMode,
|
|
1418
1546
|
path,
|
|
1419
1547
|
parentAlias,
|
|
1420
1548
|
parentTableName,
|
|
@@ -1441,6 +1569,7 @@ class SqlSecurityLayerService {
|
|
|
1441
1569
|
td,
|
|
1442
1570
|
tableAlias: currentTableAlias,
|
|
1443
1571
|
mode,
|
|
1572
|
+
rootMode,
|
|
1444
1573
|
path,
|
|
1445
1574
|
parentAlias,
|
|
1446
1575
|
parentTableName,
|
|
@@ -1467,6 +1596,7 @@ class SqlSecurityLayerService {
|
|
|
1467
1596
|
td,
|
|
1468
1597
|
tableAlias: currentTableAlias,
|
|
1469
1598
|
mode,
|
|
1599
|
+
rootMode,
|
|
1470
1600
|
path,
|
|
1471
1601
|
parentAlias,
|
|
1472
1602
|
parentTableName,
|
|
@@ -1484,6 +1614,7 @@ class SqlSecurityLayerService {
|
|
|
1484
1614
|
td,
|
|
1485
1615
|
tableAlias: currentTableAlias,
|
|
1486
1616
|
mode,
|
|
1617
|
+
rootMode,
|
|
1487
1618
|
path,
|
|
1488
1619
|
parentAlias,
|
|
1489
1620
|
parentTableName,
|
|
@@ -1516,6 +1647,7 @@ class SqlSecurityLayerService {
|
|
|
1516
1647
|
td,
|
|
1517
1648
|
tableAlias: currentTableAlias,
|
|
1518
1649
|
mode,
|
|
1650
|
+
rootMode,
|
|
1519
1651
|
path,
|
|
1520
1652
|
parentAlias,
|
|
1521
1653
|
parentTableName,
|
|
@@ -1541,7 +1673,7 @@ class SqlSecurityLayerService {
|
|
|
1541
1673
|
args: response.args,
|
|
1542
1674
|
tables: _.uniqBy(response.tables, 'name'),
|
|
1543
1675
|
};
|
|
1544
|
-
if (
|
|
1676
|
+
if (includePermissionCtes) {
|
|
1545
1677
|
const withSet = new Map();
|
|
1546
1678
|
const tableList = _.uniqBy(response.tables, 'name');
|
|
1547
1679
|
tableList.forEach((table) => {
|
|
@@ -1592,7 +1724,7 @@ class SqlSecurityLayerService {
|
|
|
1592
1724
|
select
|
|
1593
1725
|
});
|
|
1594
1726
|
}
|
|
1595
|
-
if (rules.select.useAccessControlEachRow) {
|
|
1727
|
+
if (rules.select.useAccessControlEachRow === crud_controller_especification_environment_1.UseAccessControlEachRow.User) {
|
|
1596
1728
|
const select = (0, table_permission_helper_1.permissionByRow)(variablePrefix, table.name, ['allow', 'admin'], rules.select.useAccessControlEachRow);
|
|
1597
1729
|
Object.entries(select.args).forEach(([k, v]) => {
|
|
1598
1730
|
result.select.args[k] = v;
|
|
@@ -1602,6 +1734,16 @@ class SqlSecurityLayerService {
|
|
|
1602
1734
|
select
|
|
1603
1735
|
});
|
|
1604
1736
|
}
|
|
1737
|
+
if (rules.select.useAccessControlEachRow === crud_controller_especification_environment_1.UseAccessControlEachRow.Rule) {
|
|
1738
|
+
const select = (0, table_permission_helper_1.permissionByRow)(variablePrefix, table.name, ['allow', 'admin'], rules.select.useAccessControlEachRow);
|
|
1739
|
+
Object.entries(select.args).forEach(([k, v]) => {
|
|
1740
|
+
result.select.args[k] = v;
|
|
1741
|
+
});
|
|
1742
|
+
withSet.set(`rule_access_by_row_${table.name}`, {
|
|
1743
|
+
alias: `rule_access_by_row_${table.name}`,
|
|
1744
|
+
select
|
|
1745
|
+
});
|
|
1746
|
+
}
|
|
1605
1747
|
});
|
|
1606
1748
|
result.select.with = [...withSet.values(), ...result.select.with];
|
|
1607
1749
|
}
|