Skip to content

Commit 18c6bf1

Browse files
SolidProgrammingSolidProgramming
committed
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop
2 parents 8b5a184 + 7a36043 commit 18c6bf1

Some content is hidden

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

50 files changed

+624
-458
lines changed

‎.vscode/launch.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
"name": "py-generate-tenant-data",
146146
"type": "debugpy",
147147
"request": "launch",
148-
"program": "${workspaceFolder}/roles/test/files/tenant_networks/create_tenant_network_data.py",
148+
"program": "${workspaceFolder}/roles/tests-unit/files/tenant_networks/create_tenant_network_data.py",
149149
"console": "integratedTerminal",
150150
"env": {
151151
"PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
@@ -352,7 +352,7 @@
352352
"args": [
353353
"test"
354354
],
355-
"cwd": "${workspaceFolder}/roles/test/files/FWO.Test",
355+
"cwd": "${workspaceFolder}/roles/tests-unit/files/FWO.Test",
356356
"stopAtEntry": false,
357357
"console": "integratedTerminal"
358358
},

‎documentation/revision-history-main.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,3 +475,7 @@ Fixes network modelling
475475
- UI interface search pop-up transformed into filterable table
476476

477477
Upgrade Hasura API to v2.45.1
478+
479+
# 8.6.2 03.01.2025 MAIN
480+
Hotfix for network modelling:
481+
- fix: when visiting the library for the second time, app servers were missing due to uninitialized area data.

‎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.6.1"
2+
product_version: "8.6.2"
33
ansible_user: "{{ lookup('env', 'USER') }}"
44
ansible_become_method: sudo
55
ansible_python_interpreter: /usr/bin/python3

‎roles/FWO.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{CE55F125-0CD
77
EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Middleware.Client", "lib\files\FWO.Middleware.Client\FWO.Middleware.Client.csproj", "{ECB165CE-BE81-4C5C-B27A-D73177D73E28}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Test", "test\files\FWO.Test\FWO.Test.csproj", "{9C66B86B-FFB2-44A9-A944-54B33D31D413}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Test", "tests-unit\files\FWO.Test\FWO.Test.csproj", "{9C66B86B-FFB2-44A9-A944-54B33D31D413}"
1111
EndProject
1212
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Report", "lib\files\FWO.Report\FWO.Report.csproj", "{84CA4892-7C35-4F1F-AF25-2A379112DFCA}"
1313
EndProject

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,10 @@ INSERT INTO txt VALUES ('requesting_owner', 'German', 'Beantragender Eigen
10261026
INSERT INTO txt VALUES ('requesting_owner', 'English', 'Requesting Owner');
10271027
INSERT INTO txt VALUES ('port_range', 'German', 'Port(bereich)');
10281028
INSERT INTO txt VALUES ('port_range', 'English', 'Port (range)');
1029+
INSERT INTO txt VALUES ('network_group', 'German', 'Netzwerkgruppe');
1030+
INSERT INTO txt VALUES ('network_group', 'English', 'Network Group');
1031+
INSERT INTO txt VALUES ('service_group', 'German', 'Servicegruppe');
1032+
INSERT INTO txt VALUES ('service_group', 'English', 'Service Group');
10291033

10301034
-- network analysis
10311035
INSERT INTO txt VALUES ('network_analysis', 'German', 'Netzanalyse');

‎roles/lib/files/FWO.Api.Client/APIcalls/monitor/getOwnerTickets.graphql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ query getOwnerTickets ($ownerId: Int!) {
88
common_service_possible
99
}
1010
ticket: ticket {
11-
...ticketDetails
11+
...ticketOverview
1212
}
1313
}
1414
}

‎roles/lib/files/FWO.Api.Client/APIcalls/request/fragments/reqTaskOverview.graphql‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
fragment reqTaskOverview on request_reqtask {
2+
id
3+
ticket_id
4+
title
5+
task_number
6+
state_id
7+
task_type
8+
request_action
9+
rule_action
10+
rule_tracking
11+
start
12+
stop
13+
reason
14+
additional_info
15+
on_management: management {
16+
id: mgm_id
17+
name: mgm_name
18+
}
19+
comments: reqtask_comments {
20+
comment: comment {
21+
comment_text
22+
}
23+
}
24+
}

‎roles/lib/files/FWO.Api.Client/APIcalls/request/fragments/ticketDetailsReqTaskOverview.graphql‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
fragment ticketDetailsReqTaskOverview on request_ticket {
2+
id
3+
title
4+
date_created
5+
date_completed
6+
state_id
7+
requester: uiuser {
8+
uiuser_id
9+
uiuser_username
10+
uuid
11+
uiuser_email
12+
}
13+
requester_dn
14+
requester_group
15+
tenant_id
16+
reason
17+
external_ticket_id
18+
external_ticket_source
19+
ticket_deadline
20+
ticket_priority
21+
reqtasks: reqtasks {
22+
...reqTaskOverview
23+
}
24+
comments: ticket_comments {
25+
comment: comment {
26+
...commentDetails
27+
}
28+
}
29+
}

‎roles/lib/files/FWO.Api.Client/APIcalls/request/fragments/ticketOverview.graphql‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
fragment ticketOverview on request_ticket {
2+
id
3+
title
4+
date_created
5+
date_completed
6+
state_id
7+
requester: uiuser {
8+
uiuser_username
9+
}
10+
reason
11+
external_ticket_id
12+
external_ticket_source
13+
ticket_deadline
14+
ticket_priority
15+
reqtasks: reqtasks {
16+
...reqTaskOverview
17+
}
18+
}

‎roles/lib/files/FWO.Api.Client/APIcalls/request/getFullTickets.graphql‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
query getFullTickets($fromState: Int!, $toState: Int!) {
2+
request_ticket(where: {_or: [{_and: [{state_id: {_gte: $fromState}}, {state_id: {_lt: $toState}}]}, {reqtasks: {_and: [{state_id: {_gte: $fromState}}, {state_id: {_lt: $toState}}]}}]}, order_by: {id: desc}) {
3+
...ticketDetails
4+
}
5+
}

0 commit comments

Comments
 (0)