Skip to content

Commit 4aeae54

Browse files
tpurschketpurschke
authored
Merge pull request CactuseSecurity#3329 from CactuseSecurity/develop
main bugfix release v8.8.4 - adding Check Point importer DLP actions
2 parents c40c905 + c0784f7 commit 4aeae54

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+510
-187
lines changed

‎.vscode/launch.json‎ renamed to ‎.vscode/launch.template.json‎

File renamed without changes.

‎.vscode/settings.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,11 @@
33
"editor.formatOnSave": false,
44
"[csharp]": {
55
"editor.defaultFormatter": "ms-dotnettools.csharp"
6-
}
6+
},
7+
"[razor]": {
8+
"editor.defaultFormatter": "ms-dotnettools.csharp"
9+
},
10+
"files.associations": {
11+
"launch.template.json": "jsonc"
12+
},
713
}

‎SECURITY.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,8 @@ A public disclosure date is negotiated by the security team and the bug submitte
3838
| 1.x | :x: |
3939
| 2.x | :x: |
4040
| 3.x | :x: |
41-
| 4.x | :white_check_mark: (until 2022-12-31) |
42-
| 5.x | :white_check_mark: |
41+
| 4.x | :x: (until 2022-12-31) |
42+
| 5.x | :x: (until 2023-12-31) |
43+
| 6.x | :x: (until 2024-12-31) |
44+
| 7.x | :white_check_mark: (until 2025-12-31) |
45+
| 8.x | :white_check_mark: |

‎documentation/revision-history-develop.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,3 +267,9 @@ bugfix release:
267267

268268
# 8.8.2 - 07.05.2025 DEVELOP
269269
- displayed state via variance analysis
270+
271+
# 8.8.3 - 15.05.2025 DEVELOP
272+
- deactivation of connections
273+
274+
# 8.8.4 - 02.06.2025 DEVELOP
275+
- hotfix for Check Point importer suppor for DLP actions (ask, inform)

‎inventory/group_vars/all.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### general settings
2-
product_version: "8.8.2"
2+
product_version: "8.8.4"
33
ansible_user: "{{ lookup('env', 'USER') }}"
44
ansible_become_method: sudo
55
ansible_python_interpreter: /usr/bin/python3

‎roles/api/files/replace_metadata.json‎

Lines changed: 48 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,21 +1060,24 @@
10601060
]
10611061
},
10621062
"columns": [
1063-
"app_id",
1063+
"ticket_id",
10641064
"common_service",
1065-
"conn_prop",
1066-
"creation_date",
1067-
"creator",
1068-
"extra_params",
1069-
"id",
10701065
"is_interface",
10711066
"is_published",
10721067
"is_requested",
1068+
"removed",
1069+
"requested_on_fw",
1070+
"conn_prop",
1071+
"creator",
1072+
"extra_params",
10731073
"name",
1074+
"app_id",
1075+
"id",
10741076
"proposed_app_id",
1077+
"used_interface_id",
10751078
"reason",
1076-
"ticket_id",
1077-
"used_interface_id"
1079+
"creation_date",
1080+
"removal_date"
10781081
]
10791082
},
10801083
"comment": ""
@@ -1085,21 +1088,24 @@
10851088
"role": "auditor",
10861089
"permission": {
10871090
"columns": [
1088-
"app_id",
1091+
"ticket_id",
10891092
"common_service",
1090-
"conn_prop",
1091-
"creation_date",
1092-
"creator",
1093-
"extra_params",
1094-
"id",
10951093
"is_interface",
10961094
"is_published",
10971095
"is_requested",
1096+
"removed",
1097+
"requested_on_fw",
1098+
"conn_prop",
1099+
"creator",
1100+
"extra_params",
10981101
"name",
1102+
"app_id",
1103+
"id",
10991104
"proposed_app_id",
1105+
"used_interface_id",
11001106
"reason",
1101-
"ticket_id",
1102-
"used_interface_id"
1107+
"creation_date",
1108+
"removal_date"
11031109
],
11041110
"filter": {},
11051111
"allow_aggregations": true
@@ -1115,6 +1121,8 @@
11151121
"is_interface",
11161122
"is_published",
11171123
"is_requested",
1124+
"removed",
1125+
"requested_on_fw",
11181126
"conn_prop",
11191127
"creator",
11201128
"extra_params",
@@ -1124,7 +1132,8 @@
11241132
"proposed_app_id",
11251133
"used_interface_id",
11261134
"reason",
1127-
"creation_date"
1135+
"creation_date",
1136+
"removal_date"
11281137
],
11291138
"filter": {}
11301139
},
@@ -1134,21 +1143,24 @@
11341143
"role": "modeller",
11351144
"permission": {
11361145
"columns": [
1137-
"app_id",
1146+
"ticket_id",
11381147
"common_service",
1139-
"conn_prop",
1140-
"creation_date",
1141-
"creator",
1142-
"extra_params",
1143-
"id",
11441148
"is_interface",
11451149
"is_published",
11461150
"is_requested",
1151+
"removed",
1152+
"requested_on_fw",
1153+
"conn_prop",
1154+
"creator",
1155+
"extra_params",
11471156
"name",
1157+
"app_id",
1158+
"id",
11481159
"proposed_app_id",
1160+
"used_interface_id",
11491161
"reason",
1150-
"ticket_id",
1151-
"used_interface_id"
1162+
"creation_date",
1163+
"removal_date"
11521164
],
11531165
"filter": {},
11541166
"allow_aggregations": true
@@ -1183,21 +1195,24 @@
11831195
"role": "modeller",
11841196
"permission": {
11851197
"columns": [
1186-
"app_id",
1198+
"ticket_id",
11871199
"common_service",
1188-
"conn_prop",
1189-
"creation_date",
1190-
"creator",
1191-
"extra_params",
1192-
"id",
11931200
"is_interface",
11941201
"is_published",
11951202
"is_requested",
1203+
"removed",
1204+
"requested_on_fw",
1205+
"conn_prop",
1206+
"creator",
1207+
"extra_params",
11961208
"name",
1209+
"app_id",
1210+
"id",
11971211
"proposed_app_id",
1212+
"used_interface_id",
11981213
"reason",
1199-
"ticket_id",
1200-
"used_interface_id"
1214+
"creation_date",
1215+
"removal_date"
12011216
],
12021217
"filter": {},
12031218
"check": {}

‎roles/database/files/sql/creation/fworch-create-tables.sql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,10 @@ create table modelling.connection
13851385
creator Varchar,
13861386
creation_date timestamp default now(),
13871387
conn_prop Varchar,
1388-
extra_params Varchar
1388+
extra_params Varchar,
1389+
requested_on_fw boolean default false,
1390+
removed boolean default false,
1391+
removal_date timestamp
13891392
);
13901393

13911394
create table modelling.selected_objects

‎roles/database/files/sql/creation/fworch-fill-stm.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,8 @@ insert into stm_action (action_id,action_name) VALUES (25,'NAT dst, svc') ON CON
322322
insert into stm_action (action_id,action_name) VALUES (26,'NAT svc') ON CONFLICT DO NOTHING; -- port nat
323323
insert into stm_action (action_id,action_name) VALUES (27,'NAT src, svc') ON CONFLICT DO NOTHING; -- source ip nat plus port nat
324324
insert into stm_action (action_id,action_name) VALUES (28,'NAT') ON CONFLICT DO NOTHING; -- generic NAT
325-
insert into stm_action (action_id,action_name) VALUES (29,'inform'); -- cp
325+
insert into stm_action (action_id,action_name) VALUES (29,'inform'); -- cp DLP
326+
insert into stm_action (action_id,action_name) VALUES (30,'ask'); -- cp DLP
326327

327328
insert into stm_track (track_id,track_name) VALUES (1,'log');
328329
insert into stm_track (track_id,track_name) VALUES (2,'none');

‎roles/database/files/sql/idempotent/fworch-texts.sql‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -758,18 +758,20 @@ INSERT INTO txt VALUES ('app_roles_with_diffs', 'German', 'App Rollen mit Abwe
758758
INSERT INTO txt VALUES ('app_roles_with_diffs', 'English', 'App Roles with difference');
759759
INSERT INTO txt VALUES ('remaining_rules', 'German', 'Verbleibende Regeln');
760760
INSERT INTO txt VALUES ('remaining_rules', 'English', 'Remaining rules');
761-
INSERT INTO txt VALUES ('implemented', 'German', 'implementiert');
762-
INSERT INTO txt VALUES ('implemented', 'English', 'implemented');
763-
INSERT INTO txt VALUES ('not_implemented', 'German', 'nicht implementiert');
764-
INSERT INTO txt VALUES ('not_implemented', 'English', 'not implemented');
765-
INSERT INTO txt VALUES ('with_diffs', 'German', 'mit Abweichungen');
766-
INSERT INTO txt VALUES ('with_diffs', 'English', 'with differences');
761+
INSERT INTO txt VALUES ('implemented', 'German', 'Implementiert');
762+
INSERT INTO txt VALUES ('implemented', 'English', 'Implemented');
763+
INSERT INTO txt VALUES ('not_implemented', 'German', 'Nicht Implementiert');
764+
INSERT INTO txt VALUES ('not_implemented', 'English', 'Not Implemented');
765+
INSERT INTO txt VALUES ('with_diffs', 'German', 'Mit Abweichungen');
766+
INSERT INTO txt VALUES ('with_diffs', 'English', 'With Differences');
767767
INSERT INTO txt VALUES ('missing_app_servers', 'German', 'Fehlende App Server auf Device');
768768
INSERT INTO txt VALUES ('missing_app_servers', 'English', 'Missing App Servers on Device');
769769
INSERT INTO txt VALUES ('surplus_app_servers', 'German', 'Überschüssige App Server auf Device');
770770
INSERT INTO txt VALUES ('surplus_app_servers', 'English', 'Surplus App Servers on Device');
771771
INSERT INTO txt VALUES ('missing_objects', 'German', 'Fehlende Objekte auf Device');
772772
INSERT INTO txt VALUES ('missing_objects', 'English', 'Missing Objects on Device');
773+
INSERT INTO txt VALUES ('fully_modelled', 'German', 'Vollständig Modelliert');
774+
INSERT INTO txt VALUES ('fully_modelled', 'English', 'Fully Modelled');
773775

774776
-- schedule
775777
INSERT INTO txt VALUES ('schedule', 'German', 'Terminplan');

‎roles/database/files/upgrade/8.8.3.sql‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
ALTER TABLE modelling.connection ADD COLUMN IF NOT EXISTS requested_on_fw boolean default false;
2+
ALTER TABLE modelling.connection ADD COLUMN IF NOT EXISTS removed boolean default false;
3+
ALTER TABLE modelling.connection ADD COLUMN IF NOT EXISTS removal_date timestamp;
4+
5+
UPDATE modelling.connection SET requested_on_fw=true WHERE requested_on_fw=false;

0 commit comments

Comments
 (0)