Skip to content

Commit ad6b017

Browse files
tpurschkeImat00abarz722ElutrixxNilsPur
authored
* add table and fks * introducing flag for reason of mapping * first deletion wave (DB) * db: rule_owner update, import_control rework * install problems test * install bug test * test * test * test * test * test * add metadata and smal fixes * rule_to_owner removed * update version * update version * update: graphqls - rule and any_changesfound to changes_found and policy_changes_found * Fix failed-test caused by removed field * fix: failed import test(2) - update name in python for rule_changes_found and any_changes_found to changes_found and policy_changes_found * fix: failed import test(3) * fix: swapped names * fix: swapped names(2) * ruff fixes + rename graphQl mutation * upgrade script * feat(import): - implement base structure for rule_owner imports - add foundation for custom field imports * feat(import): - implement base structure for rule_owner imports - add foundation for custom field imports * merge dev into rule_owner relations * fix test * fix test * fix test * fix test/ sonar * fix test * fix test * fix test * fix test / format * fix test / format * small changes * small fix * Fix minor issues and apply same logic for Owner import on Reinitialize button * add default recert active value * consolidate alert handling * create changelog_owner without permissions - first update from develop * permissions: owner_responsibles permissions deletion investigated; duplication found permissions: update changelog_owner * warn if no recertifiable owners exist * acknowledge all open alerts + iconify monitoring * fixes after merge * fixes * enhance usability of edit policy, small fix replace_metadata * merge dev to rule2owner * update ruleOwner * add owner filtering by one column * some unit tests for last PR * remove default language update in wrong sources * add owner_lifecycle_state * rollout removed app servers * adding composite id field * add truncation * some unit tests * adding deriving recert period from criticality * feat: fill changelog_owner table while import owner * update: permissions for changelog_owner table and import_control * responsibles normalization * update: track time_objects - add foreignkeys for changelog_owner * sonar fixes * fix: small mistake in fks and reduce complexity in ImportApps method * sonar complexity * sonar fix 3 * fix: move script updates from 9.0.5 to 9.0.7 * Fix: missing save for 9.0.5 * fix: small inconsistency in FK constraints * upgrade file * add missing foreign key in upgrade file * drop all remaining import related DB elements * fix upgrade * remove comment * API endpoint to filter rules by filters (CactuseSecurity#4304) * AdoITRequest POC done * IpAddressFeature * KFW upload rdy * United both endpoints * Reenable authorization * fix most code style concerns * Update query to exclude removed rules * Update loop from typo * Set redundant nullability checks * Additional null checks * Fix graphql error * update range loop error * Fix typo --------- Co-authored-by: Tim Purschke <tmp@cactus.de> * feat: trigger rule-owner mapping after owner import (custom field based) (CactuseSecurity#4318) * feat: owner import - rule_owner_mapping - custom_field * fix: small graphql call mistakes * add: global const for chars * Enhance Modelling Monitoring (CactuseSecurity#4321) * monitor modelling object usage + remove orphans * remove overwritten services + service groups * fix navbar loss * fix simulated user config * Submodules: Updated documentation + Automated submodule update (CactuseSecurity#4313) * Submodules: Updated documentation + Automated submodule update * pin actions to fixed commit * updated git documentation --------- Co-authored-by: Tim Purschke <tmp@cactus.de> * renaming test install action (CactuseSecurity#4322) * Disable submodule update workflow (CactuseSecurity#4323) * Submodules: Updated documentation + Automated submodule update * pin actions to fixed commit * updated git documentation * disable submodule update workflow --------- Co-authored-by: Tim Purschke <tmp@cactus.de> * Develop submodule docs (CactuseSecurity#4325) * renaming test install action * updatde submodule git docs * feat: Pre-Commit Hook C# Formatter (CactuseSecurity#4206) * feat: change settings * fix: pre commit hook only for .cs files * fix: spaces * feat: pre-commit hook * feat: added pyright to commit hook * fix: make path relative * feat: path absolut * fix: fully commit to .githooks structure * feat: implemented the suggestions --------- Co-authored-by: Tim Purschke <tmp@cactus.de> Co-authored-by: NilsPur <48684538+NilsPur@users.noreply.github.com> * fix dotnet10 install in ubuntu 22.04 (CactuseSecurity#4324) * wip * fix py 3.10 compat * ruff fix * fix pyright * cleanup * revert * cleanup import_mgm * update sbom * satisfy pyright * fix ruff * ruff format * removing outdated docs * main back to develop (CactuseSecurity#4330) * sbom update 8.8.8 * renaming test install action * updatde submodule git docs --------- Co-authored-by: cd <cd@cactus.de> Co-authored-by: abarz722 <achim.barz@gmx.de> Co-authored-by: abarz722 <61355649+abarz722@users.noreply.github.com> Co-authored-by: Elias Kolbenschlag <ekolbenschlag@online.de> Co-authored-by: NilsPur <48684538+NilsPur@users.noreply.github.com> Co-authored-by: ErikPre <60036402+ErikPre@users.noreply.github.com>
1 parent 06a37c8 commit ad6b017

136 files changed

Lines changed: 6366 additions & 9669 deletions

File tree

Some content is hidden

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

.githooks/pre-commit

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
if [ -d ".venv/Scripts" ]; then
5+
VENV_BIN=".venv/Scripts/"
6+
elif [ -d ".venv/bin" ]; then
7+
VENV_BIN=".venv/bin/"
8+
else
9+
VENV_BIN=""
10+
fi
11+
12+
RUFF_PATH=$VENV_BIN"ruff"
13+
PYRIGHT_PATH=$VENV_BIN"pyright"
14+
15+
# Assure ruff, pyright and dotnet are available -> otherwise inform user about it
16+
UNAVAILABLE_DEPENDENCIES=false
17+
for cmd in "$RUFF_PATH" "$PYRIGHT_PATH" "dotnet"; do
18+
command -v "$cmd" >/dev/null 2>&1 ||
19+
{
20+
echo "Error: '$cmd' not found. Please install it or activate your environment.";
21+
UNAVAILABLE_DEPENDENCIES=true;
22+
}
23+
done
24+
25+
if $UNAVAILABLE_DEPENDENCIES; then
26+
exit 1;
27+
fi
28+
29+
# Checks
30+
$RUFF_PATH check --fix
31+
$RUFF_PATH format
32+
33+
$PYRIGHT_PATH
34+
35+
dotnet format roles

.github/workflows/auto-sync-develop-to-importer-rework.yml.yml.disabled renamed to .github/workflows/auto-sync-develop-to-importer-rework.yml.disabled

File renamed without changes.

.github/workflows/test-install.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Checks
1+
name: FWO Test Install
22

33
on:
44
push:
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: Update agents submodule pointer
2+
3+
on:
4+
schedule:
5+
- cron: "*/5 * * * *"
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: write
10+
pull-requests: write
11+
12+
concurrency:
13+
group: update-agents-submodule-pointer
14+
cancel-in-progress: true
15+
16+
jobs:
17+
update-submodule:
18+
runs-on: ubuntu-latest
19+
20+
steps:
21+
- name: Checkout repository
22+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98
23+
with:
24+
fetch-depth: 0 # get full repo history
25+
submodules: recursive
26+
token: ${{ secrets.SUBMODULE_READ_TOKEN }} # read-only token for submodules / main repo
27+
persist-credentials: true
28+
29+
- name: Advance agents submodule to configured upstream branch
30+
id: submodule
31+
run: |
32+
set -euo pipefail
33+
34+
before_sha="$(git ls-tree HEAD agents | awk '{print $3}')"
35+
source_branch="$(git config -f .gitmodules --get submodule.agents.branch)"
36+
source_url="$(git config -f .gitmodules --get submodule.agents.url)"
37+
38+
git -C agents fetch origin "$source_branch" --quiet
39+
git -C agents checkout --quiet --detach "origin/$source_branch"
40+
after_sha="$(git -C agents rev-parse HEAD)"
41+
42+
echo "before_sha=$before_sha" >> "$GITHUB_OUTPUT"
43+
echo "after_sha=$after_sha" >> "$GITHUB_OUTPUT"
44+
echo "source_branch=$source_branch" >> "$GITHUB_OUTPUT"
45+
echo "source_url=$source_url" >> "$GITHUB_OUTPUT"
46+
47+
if [ "$before_sha" = "$after_sha" ]; then
48+
echo "changed=false" >> "$GITHUB_OUTPUT"
49+
exit 0
50+
fi
51+
52+
git add agents
53+
echo "changed=true" >> "$GITHUB_OUTPUT"
54+
55+
- name: Create or update pull request
56+
if: steps.submodule.outputs.changed == 'true'
57+
uses: peter-evans/create-pull-request@3f3b473b8c148f5a7520efb4d1f9a70eea3d9d1f
58+
with:
59+
base: develop # target
60+
token: ${{ secrets.GITHUB_TOKEN }}
61+
branch: bot/update-agents-submodule # source
62+
delete-branch: true # delete branch after merge
63+
commit-message: "Chore(submodule): Update agents to ${{ steps.submodule.outputs.after_sha }}"
64+
title: "Chore(submodule): Update agents to ${{ steps.submodule.outputs.after_sha }}"
65+
body: |
66+
Automated submodule pointer update for `agents`.
67+
68+
- Previous pointer: `${{ steps.submodule.outputs.before_sha }}`
69+
- New pointer: `${{ steps.submodule.outputs.after_sha }}`
70+
- Source repository: `${{ steps.submodule.outputs.source_url }}`
71+
- Source branch: `${{ steps.submodule.outputs.source_branch }}`

.pre-commit-config.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

agents

azure/app.zip

-2.04 KB
Binary file not shown.

azure/createUiDefinition.json

Lines changed: 0 additions & 91 deletions
This file was deleted.

0 commit comments

Comments
 (0)