Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/nuget/roles/develop/Swashbuckl…
Browse files Browse the repository at this point in the history
…e.AspNetCore-6.5.0
  • Loading branch information
tpurschke authored Apr 30, 2024
2 parents 953fd3b + a5af4da commit ee550b9
Show file tree
Hide file tree
Showing 899 changed files with 57,037 additions and 67,066 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -53,7 +53,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -67,4 +67,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
12 changes: 7 additions & 5 deletions .github/workflows/test-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ name: Build

on:
push:
branches: [ main,develop ]
branches: [ main, develop ]
paths-ignore:
- 'documentation/**'
- 'design/**'

pull_request:
types: [ ready_for_review review_requested ]
branches: [ main,develop ]
types: [ ready_for_review, review_requested ]
branches: [ main, develop ]
paths-ignore:
- 'documentation/**'
- 'design/**'
Expand All @@ -36,12 +36,14 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: do test install in case of merged pull request
run: cd /home/runner/work/firewall-orchestrator/firewall-orchestrator && ansible-playbook -e run_on_github=yes --skip-tags test site.yml -K
run: cd /home/runner/work/firewall-orchestrator/firewall-orchestrator && ansible-playbook -e run_on_github=yes site.yml -K
# run: cd /home/runner/work/firewall-orchestrator/firewall-orchestrator && ansible-playbook -e run_on_github=yes --skip-tags test site.yml -K

# test_ubuntu_22:
# name: test build on ubuntu_22
# runs-on: ubuntu-22.04
# steps:
# - uses: actions/checkout@v3
# - name: do test install in case of merged pull request
# run: cd /home/runner/work/firewall-orchestrator/firewall-orchestrator && ansible-playbook -e run_on_github=yes --skip-tags test site.yml -K
# run: cd /home/runner/work/firewall-orchestrator/firewall-orchestrator && ansible-playbook -e run_on_github=yes site.yml -K
# run: cd /home/runner/work/firewall-orchestrator/firewall-orchestrator && ansible-playbook -e run_on_github=yes --skip-tags test site.yml -K
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
.idea/
.test_data/
roles/importer/venv/
ansible_venv/
92 changes: 69 additions & 23 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"request": "launch",
"preLaunchTask": "build_middleware",
"enableStepFiltering": false,
"program": "${workspaceFolder}/roles/middleware/files/FWO.Middleware.Server/bin/Debug/net6.0/FWO.Middleware.Server.dll",
"program": "${workspaceFolder}/roles/middleware/files/FWO.Middleware.Server/bin/Debug/net8.0/FWO.Middleware.Server.dll",
"args": [],
"cwd": "${workspaceFolder}/roles/middleware/files/FWO.Middleware.Server",
"console": "internalConsole",
Expand All @@ -17,14 +17,17 @@
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)",
"uriFormat": "%s/swagger"
},
"logging": {
"moduleLoad": false
}
},
{
"name": "c#-Blazor UI",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build_UI",
"program": "${workspaceFolder}/roles/ui/files/FWO.UI/bin/Debug/net6.0/FWO.Ui.dll",
"program": "${workspaceFolder}/roles/ui/files/FWO.UI/bin/Debug/net8.0/FWO.Ui.dll",
"args": [],
"cwd": "${workspaceFolder}/roles/ui/files/FWO.UI",
"stopAtEntry": false,
Expand All @@ -38,23 +41,53 @@
},
"sourceFileMap": {
"/Views": "${workspaceFolder}/Views"
},
"logging": {
"moduleLoad": false
}
},
{
"name": "py-normalizeRlmOwners",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/scripts/customizing/modelling/getOwnersFromTufinRlm.py",
"console": "integratedTerminal",
"env": {
"PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
},
"args": [
"-c${workspaceFolder}/scripts/customizing/modelling/customizingConfig.json"
]
},
{
"name": "py-normalizeNwData",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/scripts/customizing/modelling/convertNwObjDataExample.py",
"console": "integratedTerminal",
"env": {
"PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
},
"args": [
"-c${workspaceFolder}/scripts/customizing/modelling/customizingConfig.json"
]
},
{
"name": "py-import-mgm",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/roles/importer/files/importer/import-mgm.py",
"console": "integratedTerminal",
"env": {
"PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
},
"args": [
"-m55",
"-d3",
"-m5",
"-d1",
"-f",
"-s",
//"-c"
//"-l66",
// "-c"
//"-l250"
// 41 - lab fortimanager
//"-nhttps://fwodemodata.cactus.de/demo07_dummyGw1.json"
Expand All @@ -64,9 +97,22 @@
//"-ihttps://fwodemodata.cactus.de/big/xxx.json",
]
},
{
"name": "py-customize-FWO-sample",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/scripts/customizing/customizeFwoSampleScript.py",
"console": "integratedTerminal",
"env": {
"PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
},
"args": [
"-c${workspaceFolder}/scripts/customizing/sampleCustomSettings.json"
]
},
{
"name": "py-acquire-lock",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/roles/common/files/acquire_lock.py",
"console": "integratedTerminal",
Expand All @@ -79,7 +125,7 @@
},
{
"name": "py-generate-tenant-data",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/roles/test/files/tenant_networks/create_tenant_network_data.py",
"console": "integratedTerminal",
Expand All @@ -90,7 +136,7 @@
},
{
"name": "py-change-comment",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/roles/sample-data/files/config_changes/write_date_to_comment.py",
"console": "integratedTerminal",
Expand All @@ -101,7 +147,7 @@
},
{
"name": "py-change-rule",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/roles/sample-data/files/config_changes/enlarge_rule.py",
"console": "integratedTerminal",
Expand All @@ -112,7 +158,7 @@
},
{
"name": "py-cpr8x-get-config",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/roles/importer/files/importer/checkpointR8x/get_config.py",
"console": "integratedTerminal",
Expand All @@ -130,7 +176,7 @@
},
{
"name": "py-cpr8x-enrich-config",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/roles/importer/files/importer/checkpointR8x/enrich_config.py",
"console": "integratedTerminal",
Expand All @@ -147,7 +193,7 @@
},
{
"name": "py-cpr8x-parse-config",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/roles/importer/files/importer/checkpointR8x/parse_config.py",
"console": "integratedTerminal",
Expand All @@ -161,7 +207,7 @@
},
{
"name": "py-cpr8x-api-test-call",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/roles/importer/files/importer/checkpointR8x/api-test-call.py",
"console": "integratedTerminal",
Expand All @@ -174,7 +220,7 @@
},
{
"name": "py-get-config-fm7",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/roles/importer/files/importer/fortimanager5ff/get_config.py",
"console": "integratedTerminal",
Expand All @@ -192,7 +238,7 @@
},
{
"name": "py-export-itsecorg",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/roles/api/files/scripts/fwo-export-itsecorg-devices.py",
"console": "integratedTerminal",
Expand All @@ -209,7 +255,7 @@
},
{
"name": "py-export-config",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/roles/api/files/scripts/fwo-export-config.py",
"console": "integratedTerminal",
Expand All @@ -222,7 +268,7 @@
},
{
"name": "py-execute-graphql",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/roles/api/files/scripts/fwo-execute-graphql.py",
"console": "integratedTerminal",
Expand All @@ -235,7 +281,7 @@
},
{
"name": "py-execute-graphql-query",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/roles/api/files/scripts/fwo-execute-graphql-query.py",
"console": "integratedTerminal",
Expand All @@ -248,7 +294,7 @@
},
{
"name": "py-cpr8x-autodiscovery",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/roles/importer/files/importer/checkpointR8x/auto-discover.py",
"console": "integratedTerminal",
Expand All @@ -266,7 +312,7 @@
},
{
"name": "py-import-main-loop",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/roles/importer/files/importer/import-main-loop.py",
"console": "integratedTerminal",
Expand All @@ -283,13 +329,13 @@
"name": "c#-FWO Test",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build_test",
// "preLaunchTask": "build_test",
"program": "/usr/bin/dotnet",
"args": [
"test"
],
"cwd": "${workspaceFolder}/roles/test/files/FWO.Test",
"stopAtEntry": true,
"stopAtEntry": false,
"console": "integratedTerminal"
},
{
Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@
[![Open Source Love svg1](https://github.com/ellerbrock/open-source-badges/blob/master/badges/open-source-v1/open-source.svg)](https://github.com/ellerbrock/open-source-badges/)
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)

- Import firewall configurations (rules) of various brands (Check Point, Fortinet, Cisco, Juniper, Barracuda, Netscreen)
- Import firewall configurations (rules) of various brands (Check Point, Fortinet, Cisco, Azure, Palo Alto, Juniper, Barracuda, Netscreen)
- Request changes on your firewall configuration using the new workflow module in v6.0
- Display reports on firewall configuration and changes
- Regularly re-certify firewall rules to clean up your rulebase
- Use the built-in GraphQL API to integrate with your existing infrastructure (Directory Service, ITSM, IPAM, ...)

<b>Demo:</b> if you want to see what it looks like in advance, visit <https://fwodemo.cactus.de> (user: test, password: drive2).
<b>Reporting Demo:</b>
![fwo-demo-reporting-vsmall](https://github.com/CactuseSecurity/firewall-orchestrator/assets/19877770/f9ffe37f-b059-44cf-b056-30a8f3e008a6)


<b>Further Demo:</b> if you want to see what it looks like in advance, visit <https://fwodemo.cactus.de> (user: test, password: drive2).

## Installation instructions

Expand Down
7 changes: 4 additions & 3 deletions ansible.cfg
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# ansible.cfg
[defaults]
inventory = inventory
#timeout = 60
# interpreter_python = ~/.local/bin/ansible
# timeout = 60
force_handlers = True
stdout_callback = yaml

gathering = smart
gather_subset = !hardware,!facter,!ohai
# gathering = smart
# gather_subset = !hardware,!facter,!ohai

ansible_conditional_bare_vars=false

Expand Down
Binary file added azure/app.zip
Binary file not shown.
Loading

0 comments on commit ee550b9

Please sign in to comment.