Skip to content

strip down rule_metadata #4056

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.

Sign up for GitHub

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

Draft
tpurschke wants to merge 15 commits into
base: importer-rework
Choose a base branch
from
+427 −468
Draft

strip down rule_metadata #4056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
998613c
first attempt
tpurschke Dec 9, 2025
bbc52cd
Merge branch 'importer-rework' of https://github.com/CactuseSecurity/…
tpurschke Dec 16, 2025
7ec07c9
cont. metadata stripping
tpurschke Dec 16, 2025
6d05a8f
remove uno.rule_last_certified
tpurschke Dec 16, 2025
1dcb310
fix2
tpurschke Dec 16, 2025
9b426f7
-
tpurschke Dec 16, 2025
2507e83
remove commented out code
tpurschke Dec 16, 2025
24240fd
fix py forward ref
tpurschke Dec 16, 2025
d5525b3
sonar
tpurschke Dec 16, 2025
0e6b088
revert py rule_metadata
tpurschke Dec 16, 2025
f8e1767
Merge branch 'importer-rework' of https://github.com/CactuseSecurity/…
tpurschke Dec 16, 2025
b70d465
merge from rework
tpurschke Dec 18, 2025
5e29ae7
Merge branch 'importer-rework' into feature/rule-metadata-rework-4031
tpurschke Dec 18, 2025
bdd29ad
Merge branch 'importer-rework' into feature/rule-metadata-rework-4031
tpurschke Dec 19, 2025
87b6f72
Merge branch 'importer-rework' into feature/rule-metadata-rework-4031
tpurschke Dec 20, 2025
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
137 changes: 6 additions & 131 deletions roles/api/files/replace_metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16106,15 +16106,15 @@
}
},
{
"name": "uiuser",
"name": "created_import",
"using": {
"foreign_key_constraint_on": "rule_owner"
"foreign_key_constraint_on": "rule_created"
}
},
{
"name": "uiuserByRuleLastCertifier",
"name": "last_modified_import",
"using": {
"foreign_key_constraint_on": "rule_last_certifier"
"foreign_key_constraint_on": "rule_last_modified"
}
}
],
Expand Down Expand Up @@ -16162,22 +16162,13 @@
"permission": {
"check": {},
"columns": [
"last_change_admin",
"mgm_id",
"rule_created",
"rule_decert_date",
"rule_first_hit",
"rule_hit_counter",
"rule_last_certified",
"rule_last_certifier",
"rule_last_certifier_dn",
"rule_last_hit",
"rule_last_modified",
"rule_metadata_id",
"rule_owner",
"rule_owner_dn",
"rule_recertification_comment",
"rule_to_be_removed",
"rule_uid"
]
}
Expand All @@ -16188,22 +16179,13 @@
"role": "auditor",
"permission": {
"columns": [
"last_change_admin",
"mgm_id",
"rule_created",
"rule_decert_date",
"rule_first_hit",
"rule_hit_counter",
"rule_last_certified",
"rule_last_certifier",
"rule_last_certifier_dn",
"rule_last_hit",
"rule_last_modified",
"rule_metadata_id",
"rule_owner",
"rule_owner_dn",
"rule_recertification_comment",
"rule_to_be_removed",
"rule_uid"
],
"filter": {},
Expand All @@ -16214,22 +16196,13 @@
"role": "fw-admin",
"permission": {
"columns": [
"last_change_admin",
"mgm_id",
"rule_created",
"rule_decert_date",
"rule_first_hit",
"rule_hit_counter",
"rule_last_certified",
"rule_last_certifier",
"rule_last_certifier_dn",
"rule_last_hit",
"rule_last_modified",
"rule_metadata_id",
"rule_owner",
"rule_owner_dn",
"rule_recertification_comment",
"rule_to_be_removed",
"rule_uid"
],
"filter": {},
Expand All @@ -16240,22 +16213,13 @@
"role": "importer",
"permission": {
"columns": [
"last_change_admin",
"mgm_id",
"rule_created",
"rule_decert_date",
"rule_first_hit",
"rule_hit_counter",
"rule_last_certified",
"rule_last_certifier",
"rule_last_certifier_dn",
"rule_last_hit",
"rule_last_modified",
"rule_metadata_id",
"rule_owner",
"rule_owner_dn",
"rule_recertification_comment",
"rule_to_be_removed",
"rule_uid"
],
"filter": {},
Expand All @@ -16266,22 +16230,13 @@
"role": "middleware-server",
"permission": {
"columns": [
"last_change_admin",
"mgm_id",
"rule_created",
"rule_decert_date",
"rule_first_hit",
"rule_hit_counter",
"rule_last_certified",
"rule_last_certifier",
"rule_last_certifier_dn",
"rule_last_hit",
"rule_last_modified",
"rule_metadata_id",
"rule_owner",
"rule_owner_dn",
"rule_recertification_comment",
"rule_to_be_removed",
"rule_uid"
],
"filter": {},
Expand All @@ -16292,22 +16247,13 @@
"role": "modeller",
"permission": {
"columns": [
"last_change_admin",
"mgm_id",
"rule_created",
"rule_decert_date",
"rule_first_hit",
"rule_hit_counter",
"rule_last_certified",
"rule_last_certifier",
"rule_last_certifier_dn",
"rule_last_hit",
"rule_last_modified",
"rule_metadata_id",
"rule_owner",
"rule_owner_dn",
"rule_recertification_comment",
"rule_to_be_removed",
"rule_uid"
],
"filter": {},
Expand All @@ -16318,22 +16264,13 @@
"role": "recertifier",
"permission": {
"columns": [
"last_change_admin",
"mgm_id",
"rule_created",
"rule_decert_date",
"rule_first_hit",
"rule_hit_counter",
"rule_last_certified",
"rule_last_certifier",
"rule_last_certifier_dn",
"rule_last_hit",
"rule_last_modified",
"rule_metadata_id",
"rule_owner",
"rule_owner_dn",
"rule_recertification_comment",
"rule_to_be_removed",
"rule_uid"
],
"filter": {},
Expand All @@ -16344,22 +16281,13 @@
"role": "reporter",
"permission": {
"columns": [
"last_change_admin",
"mgm_id",
"rule_created",
"rule_decert_date",
"rule_first_hit",
"rule_hit_counter",
"rule_last_certified",
"rule_last_certifier",
"rule_last_certifier_dn",
"rule_last_hit",
"rule_last_modified",
"rule_metadata_id",
"rule_owner",
"rule_owner_dn",
"rule_recertification_comment",
"rule_to_be_removed",
"rule_uid"
],
"filter": {},
Expand All @@ -16370,22 +16298,13 @@
"role": "reporter-viewall",
"permission": {
"columns": [
"last_change_admin",
"mgm_id",
"rule_created",
"rule_decert_date",
"rule_first_hit",
"rule_hit_counter",
"rule_last_certified",
"rule_last_certifier",
"rule_last_certifier_dn",
"rule_last_hit",
"rule_last_modified",
"rule_metadata_id",
"rule_owner",
"rule_owner_dn",
"rule_recertification_comment",
"rule_to_be_removed",
"rule_uid"
],
"filter": {},
Expand All @@ -16398,22 +16317,13 @@
"role": "importer",
"permission": {
"columns": [
"last_change_admin",
"mgm_id",
"rule_created",
"rule_decert_date",
"rule_first_hit",
"rule_hit_counter",
"rule_last_certified",
"rule_last_certifier",
"rule_last_certifier_dn",
"rule_last_hit",
"rule_last_modified",
"rule_metadata_id",
"rule_owner",
"rule_owner_dn",
"rule_recertification_comment",
"rule_to_be_removed",
"rule_uid"
],
"filter": {},
Expand All @@ -16423,14 +16333,7 @@
{
"role": "recertifier",
"permission": {
"columns": [
"rule_decert_date",
"rule_last_certified",
"rule_last_certifier",
"rule_last_certifier_dn",
"rule_recertification_comment",
"rule_to_be_removed"
],
"columns": [],
"filter": {},
"check": {}
}
Expand Down Expand Up @@ -22258,30 +22161,6 @@
}
}
},
{
"name": "ruleMetadataByRuleOwner",
"using": {
"foreign_key_constraint_on": {
"column": "rule_owner",
"table": {
"name": "rule_metadata",
"schema": "public"
}
}
}
},
{
"name": "rule_metadata",
"using": {
"foreign_key_constraint_on": {
"column": "rule_last_certifier",
"table": {
"name": "rule_metadata",
"schema": "public"
}
}
}
},
{
"name": "rules",
"using": {
Expand Down Expand Up @@ -24077,7 +23956,6 @@
"owner_id",
"recert_interval",
"rule_from_zone",
"rule_last_certifier",
"rule_to_zone",
"track_id",
"rule_num_numeric",
Expand Down Expand Up @@ -24112,7 +23990,6 @@
"owner_id",
"recert_interval",
"rule_from_zone",
"rule_last_certifier",
"rule_to_zone",
"track_id",
"rule_num_numeric",
Expand Down Expand Up @@ -24155,7 +24032,6 @@
"owner_id",
"recert_interval",
"rule_from_zone",
"rule_last_certifier",
"rule_to_zone",
"track_id",
"rule_num_numeric",
Expand Down Expand Up @@ -24198,7 +24074,6 @@
"owner_id",
"recert_interval",
"rule_from_zone",
"rule_last_certifier",
"rule_to_zone",
"track_id",
"rule_num_numeric",
Expand Down Expand Up @@ -29310,4 +29185,4 @@
]
}
}
}
}
7 changes: 2 additions & 5 deletions roles/common/files/fwo-api-calls/recertification/fragments/ruleOpenCertOverview.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@ fragment ruleOpenCertOverview on rule {
rule_first_hit
rule_last_hit
rule_last_modified
rule_last_certified
rule_last_certifier_dn
rule_to_be_removed
rule_decert_date
rule_recertification_comment
created_import { start_time }
last_modified_import { start_time }
recertification: recertifications (where: { owner: $ownerWhere, recert_date: {_is_null: true}, next_recert_date: {_lte: $refdate1}}, order_by: { owner: { name: asc }}) {
recert_date
recertified
Expand Down
7 changes: 2 additions & 5 deletions roles/common/files/fwo-api-calls/rule/fragments/ruleDetailsChangesNew.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@
rule_first_hit
rule_last_hit
rule_last_modified
rule_last_certified
rule_last_certifier_dn
rule_to_be_removed
rule_decert_date
rule_recertification_comment
created_import { start_time }
last_modified_import { start_time }
}
active
rule_create
Expand Down
7 changes: 2 additions & 5 deletions roles/common/files/fwo-api-calls/rule/fragments/ruleDetailsChangesOld.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@
rule_first_hit
rule_last_hit
rule_last_modified
rule_last_certified
rule_last_certifier_dn
rule_to_be_removed
rule_decert_date
rule_recertification_comment
created_import { start_time }
last_modified_import { start_time }
}
active
rule_create
Expand Down
7 changes: 2 additions & 5 deletions roles/common/files/fwo-api-calls/rule/fragments/ruleDetailsForReport.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,8 @@
rule_first_hit
rule_last_hit
rule_last_modified
rule_last_certified
rule_last_certifier_dn
rule_to_be_removed
rule_decert_date
rule_recertification_comment
created_import { start_time }
last_modified_import { start_time }
}
active
rule_create
Expand Down
Loading
Loading