Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop prepare new main version #2557

Draft
wants to merge 233 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
233 commits
Select commit Hold shift + click to select a range
fa6eddc
Merge pull request #53 from CactuseSecurity/develop
alf-cactus Apr 8, 2024
5ac4207
test passwort
alf-cactus Apr 8, 2024
d7aad03
make frontend distributed
alf-cactus Apr 10, 2024
85a6017
bug in hosts
alf-cactus Apr 10, 2024
98c4dc4
make frontend distributed
alf-cactus Apr 10, 2024
cffa949
split test-web acording to hosts
alf-cactus Apr 12, 2024
bc88218
test dist install
alf-cactus Apr 18, 2024
d3635ae
inventory default
alf-cactus Apr 18, 2024
693887d
debug test-web
alf-cactus Apr 26, 2024
398804d
some cleanup
abarz722 Jun 24, 2024
2f3adde
Merge pull request #2466 from CactuseSecurity/main
tpurschke Jun 25, 2024
4286134
additional network import custom script
tpurschke Jun 25, 2024
e182cb1
rework config subscriptions
abarz722 Jun 26, 2024
e755267
help layout issue
abarz722 Jun 26, 2024
b5d24c7
add log for hasura roles
abarz722 Jun 26, 2024
5b8275d
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
abarz722 Jun 26, 2024
9dec786
set abs path in cust script
tpurschke Jun 26, 2024
c836580
fix recert object links
abarz722 Jun 28, 2024
d9dcc75
owner names in recert params
abarz722 Jun 28, 2024
5e4cda0
Merge pull request #2467 from abarz722/develop
tpurschke Jun 28, 2024
fe66748
userconf mods
tpurschke Jun 28, 2024
53cda70
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
tpurschke Jun 28, 2024
99f7d11
.
tpurschke Jun 28, 2024
d773c6b
fix subscr.
tpurschke Jun 29, 2024
046cd81
.
tpurschke Jun 29, 2024
5ef5a42
fix back to aba userconfig
tpurschke Jun 29, 2024
a4c44d5
rsb + role + cert fixes
abarz722 Jun 29, 2024
2a652bd
disposing configs and api conns
tpurschke Jun 29, 2024
fb45bc2
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
abarz722 Jun 29, 2024
b918a2f
fix(ui): temporarily highlight linked to object in rsb
Y4nnikH Jul 1, 2024
afb4f48
upgrade css to bootstrap 5.3.3
tpurschke Jul 1, 2024
8442edb
Merge pull request #2470 from tpurschke/develop
tpurschke Jul 1, 2024
eb630f9
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
tpurschke Jul 1, 2024
608fe00
Merge branch 'develop' into fix/readd-link-highlight
tpurschke Jul 1, 2024
7cd4902
Merge pull request #2472 from CactuseSecurity/fix/readd-link-highlight
tpurschke Jul 1, 2024
e4f2f1c
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
tpurschke Jul 1, 2024
ff0d4da
Merge branch 'develop' into develop
tpurschke Jul 1, 2024
c0a0f01
Bump MailKit and MimeKit in /roles
dependabot[bot] Jul 1, 2024
15cb8b2
Merge pull request #2473 from CactuseSecurity/dependabot/nuget/roles/…
tpurschke Jul 2, 2024
1a5ffbe
role handling + other fixes
abarz722 Jul 3, 2024
59461fe
Merge branch 'develop' of https://github.com/abarz722/firewall-orches…
abarz722 Jul 3, 2024
2a6a2c1
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
abarz722 Jul 3, 2024
e7fbb58
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
tpurschke Jul 3, 2024
af6fcff
Merge pull request #2471 from abarz722/develop
tpurschke Jul 3, 2024
f784eb4
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
tpurschke Jul 3, 2024
2c93ade
cp adding voip and vsx objects
tpurschke Jul 4, 2024
a97c9d1
external states + settings
abarz722 Jul 6, 2024
28ed820
texts + cleanup
abarz722 Jul 6, 2024
8aefa82
remove uniqueness of owner names
abarz722 Jul 8, 2024
8f6fc41
reject interface popup
abarz722 Jul 8, 2024
9097333
ignore possible header line in plain csv
tpurschke Jul 9, 2024
e68fbcf
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
abarz722 Jul 9, 2024
058027e
fix
abarz722 Jul 9, 2024
76e44c3
Last hit in AppRules Report
abarz722 Jul 9, 2024
ed45450
Bump Microsoft.AspNetCore.Components from 8.0.6 to 8.0.7 in /roles
dependabot[bot] Jul 9, 2024
2d0235c
Bump Microsoft.AspNetCore.Authentication.JwtBearer in /roles
dependabot[bot] Jul 9, 2024
c3e706b
Merge pull request #2479 from CactuseSecurity/dependabot/nuget/roles/…
tpurschke Jul 10, 2024
7d03f7b
Merge branch 'develop' into dependabot/nuget/roles/develop/Microsoft.…
tpurschke Jul 10, 2024
457920b
Merge pull request #2480 from CactuseSecurity/dependabot/nuget/roles/…
tpurschke Jul 10, 2024
322b716
first verision of details-level standard CP importer
tpurschke Jul 10, 2024
d441195
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
tpurschke Jul 10, 2024
2510d6d
adapt reject flow + some documentation
abarz722 Jul 10, 2024
47efdd0
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
abarz722 Jul 10, 2024
464479b
clenup + docu
abarz722 Jul 10, 2024
64b0465
Bump Microsoft.IdentityModel.Tokens from 7.6.2 to 7.6.3 in /roles
dependabot[bot] Jul 10, 2024
0a0646e
Merge pull request #2483 from CactuseSecurity/dependabot/nuget/roles/…
tpurschke Jul 11, 2024
4bdb62c
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
tpurschke Jul 11, 2024
fcc62b7
new data testserver v8.3.2 (details-level standard)
tpurschke Jul 11, 2024
2fddf0c
Bump System.IdentityModel.Tokens.Jwt from 7.6.2 to 7.6.3 in /roles
dependabot[bot] Jul 11, 2024
b7f8f61
Bump MimeKit from 4.7.0 to 4.7.1 in /roles
dependabot[bot] Jul 11, 2024
72d9fc7
Bump RestSharp from 111.3.0 to 111.4.0 in /roles
dependabot[bot] Jul 11, 2024
cfd2e92
Merge pull request #2486 from CactuseSecurity/dependabot/nuget/roles/…
tpurschke Jul 12, 2024
dafd3d6
Merge branch 'develop' into dependabot/nuget/roles/develop/System.Ide…
tpurschke Jul 12, 2024
7d66c3c
Merge branch 'develop' into dependabot/nuget/roles/develop/RestSharp-…
tpurschke Jul 12, 2024
f08b14b
Merge pull request #2485 from CactuseSecurity/dependabot/nuget/roles/…
tpurschke Jul 12, 2024
9645f71
Merge branch 'develop' into dependabot/nuget/roles/develop/RestSharp-…
tpurschke Jul 12, 2024
7533db8
db cosmetics
tpurschke Jul 12, 2024
4095dad
hasura upgrade 2.40.2
tpurschke Jul 12, 2024
d238056
docs only
tpurschke Jul 12, 2024
4d2fbbb
Bump MailKit from 4.7.0 to 4.7.1 in /roles
dependabot[bot] Jul 12, 2024
6342f16
Merge pull request #2487 from CactuseSecurity/dependabot/nuget/roles/…
tpurschke Jul 13, 2024
aa27406
Merge branch 'develop' into dependabot/nuget/roles/develop/MailKit-4.7.1
tpurschke Jul 13, 2024
cf473e5
Merge pull request #2488 from CactuseSecurity/dependabot/nuget/roles/…
tpurschke Jul 13, 2024
f13a966
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
tpurschke Jul 13, 2024
8c682d7
several fixes + refinements
abarz722 Jul 14, 2024
797bbcd
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
abarz722 Jul 14, 2024
adb1cf4
fix DummyAppRole
abarz722 Jul 15, 2024
fc082c5
Bump RestSharp and RestSharp.Serializers.NewtonsoftJson in /roles
dependabot[bot] Jul 15, 2024
eebda22
Bump MailKit and MimeKit in /roles
dependabot[bot] Jul 15, 2024
3b30ef7
Merge pull request #2491 from CactuseSecurity/dependabot/nuget/roles/…
tpurschke Jul 16, 2024
9cc691f
Merge branch 'develop' into develop
tpurschke Jul 16, 2024
0ce4dba
Merge pull request #2482 from abarz722/develop
tpurschke Jul 16, 2024
69225a0
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
tpurschke Jul 16, 2024
47cb152
Merge branch 'develop' into dependabot/nuget/roles/develop/multi-cd3d…
tpurschke Jul 16, 2024
89fbe39
Merge pull request #2490 from CactuseSecurity/dependabot/nuget/roles/…
tpurschke Jul 16, 2024
69ffe26
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
tpurschke Jul 16, 2024
699e447
Bump Microsoft.IdentityModel.Tokens from 7.6.3 to 8.0.0 in /roles
dependabot[bot] Jul 16, 2024
1b01ac8
Merge pull request #2492 from CactuseSecurity/dependabot/nuget/roles/…
tpurschke Jul 17, 2024
e1119b8
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
tpurschke Jul 17, 2024
b69654f
Bump System.IdentityModel.Tokens.Jwt from 7.6.3 to 8.0.0 in /roles
dependabot[bot] Jul 17, 2024
ab0f795
Merge pull request #2493 from CactuseSecurity/dependabot/nuget/roles/…
tpurschke Jul 18, 2024
4cb7256
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
tpurschke Jul 18, 2024
fb48bd2
revert System.IdentityModel.Tokens.Jwt
tpurschke Jul 18, 2024
d8d6d30
hasura upgrade 2.41.0
tpurschke Jul 18, 2024
9130cb2
cleanup import main function
tpurschke Jul 19, 2024
cdcf4b7
fixes
tpurschke Jul 19, 2024
65535c4
importState cont.
tpurschke Jul 19, 2024
59ed952
more importState conversions
tpurschke Jul 19, 2024
97e5985
Merge pull request #2494 from tpurschke/develop
tpurschke Jul 19, 2024
a6b52f7
fix monitoring, tickets desc, small rename
abarz722 Aug 27, 2024
44952a8
rename Request -> Wf
abarz722 Aug 27, 2024
40bf8a8
activate last-hit in AppRules report
abarz722 Aug 28, 2024
2a9ad45
fix CP Gw types
abarz722 Aug 29, 2024
7db2fff
Merge pull request #2518 from abarz722/develop
tpurschke Sep 3, 2024
255ca9f
Added the missing pager control
SolidProgramming Sep 6, 2024
16bcdc7
Added missing pager control
SolidProgramming Sep 6, 2024
d1032ec
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
alf-cactus Sep 6, 2024
3b55222
Changed login design
SolidProgramming Sep 6, 2024
86a67cc
merge conflicts due to long absence
alf-cactus Sep 6, 2024
8e2fc85
typo in docomentation
alf-cactus Sep 6, 2024
33a9382
remove undefined var
alf-cactus Sep 6, 2024
a75bdf8
Added some code guidelines for (blazor) frontend
SolidProgramming Sep 6, 2024
d3d789b
[~] Changed the spinner on the 'workflow' (sub-) pages to hide the 'l…
SolidProgramming Sep 6, 2024
6254627
[+] Added welcome message and (default-) settings respectively
SolidProgramming Sep 9, 2024
d3ac70f
[~] Changed all spinners to hide the rotating "loading..." text
SolidProgramming Sep 9, 2024
97c415c
[~] Changed table page size to display the pager control to be visible
SolidProgramming Sep 9, 2024
2220ea8
[~] Changed login UI for better responsiveness
SolidProgramming Sep 9, 2024
434ab07
[+] Added some guidelines
SolidProgramming Sep 9, 2024
cb8445b
[~] Login UI size changes
SolidProgramming Sep 9, 2024
db67946
enhance group_create + small fixes + renaming
abarz722 Sep 10, 2024
0bb575b
make dist changes ready for pr
alf-cactus Sep 11, 2024
f3c25f7
[~] Html Code will now be sanitized but linebreaks are possible
SolidProgramming Sep 11, 2024
32c3f4c
[~] Fixed overflow for blazor table
SolidProgramming Sep 11, 2024
db5bb96
[~] Fixed overflow for blazor table #2181
SolidProgramming Sep 11, 2024
190b2c1
Merge branch 'develop' of https://github.com/SolidProgramming/firewal…
SolidProgramming Sep 11, 2024
b0e5142
Merge pull request #2522 from SolidProgramming/develop
tpurschke Sep 12, 2024
2f12943
fix main import loop mgmId parameter
tpurschke Sep 12, 2024
f4af0ea
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
abarz722 Sep 12, 2024
f40a5a6
Merge pull request #2531 from tpurschke/cactus-develop
tpurschke Sep 12, 2024
e869932
fix duplicateobjects
abarz722 Sep 13, 2024
652c235
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
abarz722 Sep 13, 2024
090fb86
fix voip domain handling in cp parser
tpurschke Sep 13, 2024
e97a7f6
Merge pull request #2532 from abarz722/develop
tpurschke Sep 13, 2024
970d362
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
tpurschke Sep 13, 2024
e93edff
user parsing re-added
tpurschke Sep 14, 2024
c9bcdd6
Merge pull request #2533 from tpurschke/cactus-develop
tpurschke Sep 14, 2024
314e1d8
Merge branch 'develop' into develop
tpurschke Sep 14, 2024
8313f4a
[+] Added working Page Size Control for monitoring main
SolidProgramming Sep 15, 2024
dc0e214
[+] Added working Page Size Control for monitoring main
SolidProgramming Sep 15, 2024
3ac2b24
Merge branch 'develop' of https://github.com/SolidProgramming/firewal…
SolidProgramming Sep 15, 2024
5664e50
[~] Moved PageSizeComponent to shared
SolidProgramming Sep 15, 2024
3be6deb
[+] Add page size component to monitoring pages
SolidProgramming Sep 15, 2024
751bed1
[~] Changed PageSizeComponent styles
SolidProgramming Sep 16, 2024
0110165
[~] This should fix #2181 and #2535
SolidProgramming Sep 16, 2024
0cf748b
Merge pull request #2528 from alf-cactus/develop
tpurschke Sep 16, 2024
773562e
[~] This should fix #2181
SolidProgramming Sep 16, 2024
92bc8a6
Merge branch 'develop' of https://github.com/SolidProgramming/firewal…
SolidProgramming Sep 16, 2024
309fec3
[~] This could fix #2535
SolidProgramming Sep 16, 2024
3ee294d
Merge branch 'develop' into develop
SolidProgramming Sep 16, 2024
04b3056
[~] Update RestSharp NuGet
SolidProgramming Sep 16, 2024
cc010ad
[~] Update RestSharp NuGet
SolidProgramming Sep 16, 2024
4cefbe0
[~] Update Microsoft.IdentityModel.Tokens NuGet
SolidProgramming Sep 16, 2024
d06d6e3
[~] Update System.IdentityModel.Tokens.Jwt NuGet
SolidProgramming Sep 16, 2024
8a97883
[~] Update NUnit3TestAdapter NuGet
SolidProgramming Sep 16, 2024
c597b65
[~] Update NUnit NuGet
SolidProgramming Sep 16, 2024
52184db
Merge branch 'develop' into fix_#2535
SolidProgramming Sep 16, 2024
9b5bf79
Merge pull request #2538 from SolidProgramming/develop
tpurschke Sep 16, 2024
542f480
Merge branch 'develop' into fix_#2535
tpurschke Sep 16, 2024
b45110f
Merge pull request #2539 from SolidProgramming/fix_#2535
tpurschke Sep 16, 2024
e2b0bf9
Bump Microsoft.AspNetCore.Authentication.JwtBearer in /roles
dependabot[bot] Sep 16, 2024
cb305b7
Bump Microsoft.AspNetCore.Components from 8.0.7 to 8.0.8 in /roles
dependabot[bot] Sep 16, 2024
f1b4c18
Bump Haukcode.WkHtmlToPdfDotNet from 1.5.90 to 1.5.93 in /roles
dependabot[bot] Sep 16, 2024
377f6ba
Bump Microsoft.NET.Test.Sdk from 17.10.0 to 17.11.1 in /roles
dependabot[bot] Sep 16, 2024
0a19bcc
[~] Changed E9015 Messagte #2529
SolidProgramming Sep 20, 2024
3fa30cf
Bump Swashbuckle.AspNetCore from 6.6.2 to 6.8.0 in /roles
dependabot[bot] Sep 23, 2024
7aa5f08
no need to delete test user, since he is never created
alf-cactus Sep 24, 2024
453bab4
Merge branch 'develop' of https://github.com/alf-cactus/firewall-orch…
alf-cactus Sep 24, 2024
e249971
reduce logic complexity
alf-cactus Sep 24, 2024
ab789e4
[~] Fixed Umlaute
SolidProgramming Sep 24, 2024
c8cb0aa
[~] Fixed Umlaute
SolidProgramming Sep 24, 2024
27fe124
Merge branch 'develop' of https://github.com/SolidProgramming/firewal…
SolidProgramming Sep 24, 2024
db66773
[~] Fix UI Message
SolidProgramming Sep 24, 2024
242605d
Merge pull request #2547 from alf-cactus/develop
tpurschke Sep 24, 2024
770a2a7
sample api call create nw group
tpurschke Sep 24, 2024
a2157b2
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall…
tpurschke Sep 24, 2024
5fb7e32
[~] Resized Login Form
SolidProgramming Sep 25, 2024
09d6c11
Merge pull request #2552 from tpurschke/cactus-develop
abarz722 Sep 25, 2024
2c05dfc
[~] Bump Swashbuckle.AspNetCore from 6.6.2 to 6.8.0 in /roles #2546
SolidProgramming Sep 25, 2024
9eae85a
Merge branch 'develop' into dependabot/nuget/roles/develop/Swashbuckl…
SolidProgramming Sep 25, 2024
84480aa
Bump Haukcode.WkHtmlToPdfDotNet from 1.5.90 to 1.5.93 in /roles #2544
SolidProgramming Sep 25, 2024
ef0ecab
Merge branch 'develop' into dependabot/nuget/roles/develop/Haukcode.W…
SolidProgramming Sep 25, 2024
0e37738
Bump Microsoft.AspNetCore.Authentication.JwtBearer from 8.0.7 to 8.0…
SolidProgramming Sep 25, 2024
331ca7e
Merge branch 'develop' into dependabot/nuget/roles/develop/Microsoft.…
SolidProgramming Sep 25, 2024
137131c
Bump Microsoft.NET.Test.Sdk from 17.10.0 to 17.11.1 in /roles #2545
SolidProgramming Sep 25, 2024
0f9bbdd
Merge branch 'develop' into dependabot/nuget/roles/develop/Microsoft.…
SolidProgramming Sep 25, 2024
92bb0a4
Bump Microsoft.AspNetCore.Components from 8.0.7 to 8.0.8 in /roles #…
SolidProgramming Sep 25, 2024
a80ba82
Merge branch 'develop' into dependabot/nuget/roles/develop/Microsoft.…
SolidProgramming Sep 25, 2024
838b8e2
[~] Nuget bumps
SolidProgramming Sep 25, 2024
e5a3df4
[~] Nuget bumps
SolidProgramming Sep 25, 2024
2734808
Merge branch 'develop' into nuget_bumps
SolidProgramming Sep 26, 2024
8045f73
[~] Leave out all header texts #1701
SolidProgramming Sep 26, 2024
f366ef4
[~] Changed error message title #2529
SolidProgramming Sep 26, 2024
223f212
[~] Fix c&p error #2529
SolidProgramming Sep 26, 2024
3ba457e
Merge branch 'develop' into develop
SolidProgramming Sep 26, 2024
c4cc916
Merge pull request #2554 from SolidProgramming/nuget_bumps
tpurschke Sep 26, 2024
62f2506
[~] Fix spelling error #2529
SolidProgramming Sep 26, 2024
519d95e
Merge branch 'develop' into dependabot/nuget/roles/develop/Swashbuckl…
tpurschke Sep 26, 2024
caa805c
Merge branch 'develop' into dependabot/nuget/roles/develop/Microsoft.…
tpurschke Sep 26, 2024
54b45ea
Merge branch 'develop' into develop
SolidProgramming Sep 26, 2024
3dbdd97
Merge pull request #2555 from SolidProgramming/develop
tpurschke Sep 26, 2024
20c9140
Merge branch 'develop' into dependabot/nuget/roles/develop/Microsoft.…
tpurschke Sep 26, 2024
8136f8e
Merge branch 'develop' into dependabot/nuget/roles/develop/Microsoft.…
tpurschke Sep 26, 2024
f60d12f
Merge branch 'develop' into dependabot/nuget/roles/develop/Haukcode.W…
tpurschke Sep 26, 2024
b4d7f72
Merge branch 'develop' into dependabot/nuget/roles/develop/Swashbuckl…
tpurschke Sep 26, 2024
c9dd787
Merge pull request #2542 from CactuseSecurity/dependabot/nuget/roles/…
tpurschke Sep 26, 2024
a66e61d
Merge branch 'develop' into dependabot/nuget/roles/develop/Microsoft.…
tpurschke Sep 26, 2024
d5c3987
Merge pull request #2543 from CactuseSecurity/dependabot/nuget/roles/…
tpurschke Sep 26, 2024
f5147cf
Merge branch 'develop' into dependabot/nuget/roles/develop/Haukcode.W…
tpurschke Sep 26, 2024
a6c9db2
Merge pull request #2544 from CactuseSecurity/dependabot/nuget/roles/…
tpurschke Sep 26, 2024
bf7a055
Merge branch 'develop' into dependabot/nuget/roles/develop/Swashbuckl…
tpurschke Sep 26, 2024
a9d51b7
Merge pull request #2546 from CactuseSecurity/dependabot/nuget/roles/…
tpurschke Sep 26, 2024
d2e2875
Merge branch 'develop' into dependabot/nuget/roles/develop/Microsoft.…
tpurschke Sep 26, 2024
d7f1a2e
Merge pull request #2545 from CactuseSecurity/dependabot/nuget/roles/…
tpurschke Sep 26, 2024
a94bae7
[~] ModellingConnectionHandler refresh after creating a new connectio…
SolidProgramming Sep 27, 2024
1b40d43
Merge branch 'develop' into 2549-network-modelling-new-data-is-not-di…
SolidProgramming Sep 27, 2024
502bbc4
[~] Moved reinit so it always reinit on save #2556
SolidProgramming Sep 27, 2024
4191abc
Merge branch '2549-network-modelling-new-data-is-not-displayed-after-…
SolidProgramming Sep 27, 2024
a5e941b
Merge pull request #2556 from SolidProgramming/2549-network-modelling…
tpurschke Sep 27, 2024
ed3c55d
Resolve merge conflicts
tpurschke Sep 27, 2024
0b5b6dc
[+] sort src/dst/svc columns alphabetically #2090
SolidProgramming Sep 27, 2024
87752d5
Merge branch 'develop' into 2090-reporting-sort-srcdstsvc-columns-alp…
SolidProgramming Sep 27, 2024
473fdd4
Merge pull request #2558 from SolidProgramming/2090-reporting-sort-sr…
tpurschke Sep 27, 2024
b0ec951
Merge branch 'develop' of github.com:cactusesecurity/firewall-orchest…
tpurschke Sep 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions CODING_GUIDELINES_FRONTEND.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

# Code Guidelines


## General
- Close your tag - Leaving some tags open is simply a bad practice. Only self-closing tags are valid. Normal elements can never have self-closing tags.
- Don't use inline styles(if possible) - When creating your markup, do not use inline styling because it would be very hard to override these styles in case you need to.
- Try not to use "!important" - Using the !important declaration is often considered bad practice because it has side effects that mess with one of CSS's core mechanisms: specificity. In many cases, using it could indicate poor CSS architecture.

## Components
- Organize files and components in a folder structure like this. This makes it easy to find the code related to a page, without having to browse the entire file explorer. Try, as much as possible, to respect the SOLID principles. Mainly by creating autonomous and extensible components: inject the smallest possible service or parameter, manage all the possibilities offered by the component. For example, a data modification page should display the data, check their values and save the data at the end of the process.

## UI
# Responsiveness
- Use the bootstrap grid and it's column classes to have easy and responsive design. [Bootstrap](https://getbootstrap.com/docs/5.3/layout/columns/)
- Decide if you want to develop mobile or desktop design first and test respectively.
3 changes: 2 additions & 1 deletion documentation/developer-docs/importer/FWO-import-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ here we describe a single rule:
"rule_head_text": null, // string: for section headers this is the field to use
"rule_from_zone": null, // string: source zone (if applicable) of the rule
"rule_to_zone": null, // string: destination zone (if applicable) of the rule
"rule_type": "access" // string: type of the nat rule: "access|combined|original|xlate", default "access"
"rule_type": "access", // string: type of the nat rule: "access|combined|original|xlate", default "access"
"rule_custom_fields": "{\"field1\": \"value1\"}" // string: json serialized user defined fields
}
```
- rule_track can be any of log, none, alert, userdefined, mail, account, userdefined 1, userdefined 2, userdefined 3, snmptrap, log count, count, log alert, log alert count, log alert count alarm, log count alarm, count alarm, all, all start, utm, utm start, network log
Expand Down
18 changes: 15 additions & 3 deletions documentation/installer/install-advanced.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Advanced installation options

always change into the firewwall-orchestrator directory before starting the installation!
always change into the firewwall-orchestrator directory before starting the installation.

## Install parameters

Expand Down Expand Up @@ -38,7 +38,7 @@ ansible-playbook site.yml -K
### Installation behind a proxy (no direct Internet connection)

By default, during installation or upgrade the proxy settings are read from the OS environment of the installer host.
For example you may have a global system-wide config file /etc/profile.d/proxy.sh with the following content:
For example you may either use /etc/environment or add a global system-wide config file /etc/profile.d/proxy.sh and add the following content:

```console
export http_proxy=http://proxy.int:3128
Expand All @@ -49,7 +49,7 @@ export no_proxy=127.0.0.1,localhost
Also make sure that your proxy is configured in your .gitconfig to be able to do the initial repo cloning.
See https://gist.github.com/evantoli/f8c23a37eb3558ab8765.

If instead you need to individually set a proxy before installation/upgrade, use the following comamnds in your terminal:
If instead you need to individually set a proxy before installation/upgrade, use the following commands in your terminal:
```console
export http_proxy=http://proxy.int:3128
export https_proxy=http://proxy.int:3128
Expand Down Expand Up @@ -88,6 +88,8 @@ NB: for vscode-debugging, you also need access to
visualstudio.com


#### Pyhton proxy config

Remember if your server resides behind a proxy that you will have to set the proxy for pip as follows before installing ansible:

pip config set global.proxy http://proxy:3128
Expand All @@ -97,6 +99,16 @@ In case of timeout issues (you might be behind a security proxy that does intens

pip --default-timeout=3600 install ansible

##### issues with existing pip config

In case of errors with existing pip config, do not use the script to create the venv but proceed as follows:

remove any local pip config and install manually:

rm -f $HOME/.config/pip/pip.conf
python3 -m venv ansible-venv
source ansible-venv/bin/activate
pip install ansible

### Parameter "api_no_metadata" to prevent meta data import

Expand Down
2 changes: 1 addition & 1 deletion documentation/installer/install-for-testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This includes:
Note: the relevant secrets are displayed at the very end of the installation. They can also be found in the etc/secrets directory.

```console
ansible-playbook/ site.yml -e "testkeys=yes" -K
ansible-playbook site.yml -e "testkeys=yes" -K
```

A static jwt key helps with debugging c# code in visual studio (code) - you can use a static backend (ldap & api) with these keys.
Expand Down
8 changes: 8 additions & 0 deletions documentation/revision-history-develop.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,3 +217,11 @@ bugfix release:
# 8.2.4 - 19.06.2024 DEVELOP
- owner-filtering for new report type
- new setting for email recipients

# 8.3.1 - 08.07.2024 DEVELOP
- workflow: external state handling
- fix config value
- remove uniqueness of owner names

# 8.3.2 - 09.09.2024 DEVELOP
- Added welcome message and settings
2 changes: 1 addition & 1 deletion inventory/group_vars/all.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### general settings
product_version: "8.3.1"
product_version: "8.3.2"
ansible_user: "{{ lookup('env', 'USER') }}"
ansible_become_method: sudo
ansible_python_interpreter: /usr/bin/python3
Expand Down
2 changes: 1 addition & 1 deletion inventory/group_vars/apiserver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ api_hasura_admin_test_password: "not4production"
api_user_email: "{{ api_user }}@{{ api_network_listening_ip_address }}"
api_home: "{{ fworch_home }}/api"
api_hasura_cli_bin: "{{ fworch_home }}/api/bin/hasura"
api_hasura_version: "v2.40.0"
api_hasura_version: "v2.41.0"
api_project_name: api
api_no_metadata: false
api_rollback_is_running: false
Expand Down
2 changes: 1 addition & 1 deletion inventory/group_vars/sampleserver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ sample_fortigate_basename: fortigate
sample_fortigate_name: "{{ sample_fortigate_basename }}_demo"
sample_checkpoint_basename: "checkpoint"
sample_checkpoint_name: "{{ sample_checkpoint_basename }}_demo"
sample_checkpoint_uri: "https://fwodemodata.cactus.de/demo04_cpr8x.json"
sample_checkpoint_uri: "https://fwodemodata.cactus.de/demo11-r82.json"
demo_cpr8x_name_without_demo: "CPR81"
demo_cpr8x_name: "{{ demo_cpr8x_name_without_demo}}_demo"
demo_cpr8x_uri: "https://fwodemodata.cactus.de/demo09_cpr81.json"
Expand Down
8 changes: 4 additions & 4 deletions inventory/hosts.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# If you want to use distributed installation, follow the steps on localhost
# 1. ssh-keygen -t rsa
# Press enter for each line
# 2. cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
# 3. chmod og-wx ~/.ssh/authorized_keys
# 4. change ansible_connection to ssh and ansible_host to your host
# 4. ssh-copy-id <user>@<remote-server>
# 5. add remote servers below

all:
hosts:
localhost:
ip_address: 127.0.0.1
ansible_connection: local
# ansible_connection: local
# ansible_host: localhost
# Add servers for distributed installation here. Use these servers in the children dictionary below.
# ui-srv:
# ansible_connection: ssh
# ansible_host: 192.168.121.2
# ansible_host: 192.168.2.3
children:

frontends:
Expand Down
10 changes: 3 additions & 7 deletions roles/FWO.sln
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Recert", "lib\files\FWO
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "files", "files", "{B48F8BD5-1056-4670-BEFA-F4A260293B6F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FWO.Encryption", "lib\files\FWO.Encryption\FWO.Encryption.csproj", "{6EBEBF57-3399-4008-BA10-0D21F6827244}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Encryption", "lib\files\FWO.Encryption\FWO.Encryption.csproj", "{6EBEBF57-3399-4008-BA10-0D21F6827244}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FWO.GlobalConstants", "lib\files\FWO.GlobalConstants\FWO.GlobalConstants.csproj", "{0CBD4CC5-3E39-4134-A0E1-4DB8999619F3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.GlobalConstants", "lib\files\FWO.GlobalConstants\FWO.GlobalConstants.csproj", "{0CBD4CC5-3E39-4134-A0E1-4DB8999619F3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FWO.Tufin.SecureChange", "lib\files\FWO.Tufin.SecureChange\FWO.Tufin.SecureChange.csproj", "{17AA0E0C-BB46-42FE-A08C-68539EA7FD53}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Tufin.SecureChange", "lib\files\FWO.Tufin.SecureChange\FWO.Tufin.SecureChange.csproj", "{17AA0E0C-BB46-42FE-A08C-68539EA7FD53}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -103,10 +103,6 @@ Global
{520779B1-20EB-45D9-8A02-D0C4DFEC9302}.Debug|Any CPU.Build.0 = Debug|Any CPU
{520779B1-20EB-45D9-8A02-D0C4DFEC9302}.Release|Any CPU.ActiveCfg = Release|Any CPU
{520779B1-20EB-45D9-8A02-D0C4DFEC9302}.Release|Any CPU.Build.0 = Release|Any CPU
{14B56819-F629-4CE9-BBC0-7579392EFC83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{14B56819-F629-4CE9-BBC0-7579392EFC83}.Debug|Any CPU.Build.0 = Debug|Any CPU
{14B56819-F629-4CE9-BBC0-7579392EFC83}.Release|Any CPU.ActiveCfg = Release|Any CPU
{14B56819-F629-4CE9-BBC0-7579392EFC83}.Release|Any CPU.Build.0 = Release|Any CPU
{6EBEBF57-3399-4008-BA10-0D21F6827244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6EBEBF57-3399-4008-BA10-0D21F6827244}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6EBEBF57-3399-4008-BA10-0D21F6827244}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
Loading
Loading