Merge branch 'CactuseSecurity:develop' into develop

Author: SolidProgramming

documentation/revision-history-develop.md

@@ -362,3 +362,6 @@ A complete 80K lines rework of FWO, including
 
 # 9.0.8 - 25.02.2026 DEVELOP
 - new config value for removed App Server handling
+
+# 9.0.10 - 28.02.2026 DEVELOP
+- new config value for User synchronization in owner data import

inventory/group_vars/all.yml

@@ -1,5 +1,5 @@
 ### general settings
-product_version: "9.0.9"
+product_version: "9.0.10"
 ansible_user: "{{ lookup('env', 'USER') }}"
 ansible_become_method: sudo
 ansible_python_interpreter: /usr/bin/python3

…-api-calls/owner/deleteLifeCycle.graphql …calls/owner/deleteOwnerLifeCycle.graphqlroles/common/files/fwo-api-calls/owner/deleteLifeCycle.graphql renamed to roles/common/files/fwo-api-calls/owner/deleteOwnerLifeCycle.graphql roles/common/files/fwo-api-calls/owner/deleteLifeCycle.graphql renamed to roles/common/files/fwo-api-calls/owner/deleteOwnerLifeCycle.graphql

@@ -1,4 +1,4 @@
-mutation deleteLifeCycle($id: Int!) {
+mutation deleteOwnerLifeCycle($id: Int!) {
   delete_owner_lifecycle_state(where: {id: {_eq: $id}}) {
     affected_rows
   }

…fwo-api-calls/owner/newLifeCycle.graphql …pi-calls/owner/newOwnerLifeCycle.graphqlroles/common/files/fwo-api-calls/owner/newLifeCycle.graphql renamed to roles/common/files/fwo-api-calls/owner/newOwnerLifeCycle.graphql roles/common/files/fwo-api-calls/owner/newLifeCycle.graphql renamed to roles/common/files/fwo-api-calls/owner/newOwnerLifeCycle.graphql

@@ -1,4 +1,4 @@
-mutation newLifeCycle(
+mutation newOwnerLifeCycle(
   $name: String!
   ) {
   insert_owner_lifecycle_state(objects: {

…-api-calls/owner/updateLifeCycle.graphql …calls/owner/updateOwnerLifeCycle.graphqlroles/common/files/fwo-api-calls/owner/updateLifeCycle.graphql renamed to roles/common/files/fwo-api-calls/owner/updateOwnerLifeCycle.graphql roles/common/files/fwo-api-calls/owner/updateLifeCycle.graphql renamed to roles/common/files/fwo-api-calls/owner/updateOwnerLifeCycle.graphql

@@ -1,4 +1,4 @@
-mutation updateLifeCycle(
+mutation updateOwnerLifeCycle(
   $id: Int!
   $name: String!
   ) {

roles/common/files/fwo-api-calls/stmTables/getOwnerMappingSources.graphql

@@ -139,6 +139,7 @@ insert into config (config_key, config_value, config_user) VALUES ('autoReplaceA
 insert into config (config_key, config_value, config_user) VALUES ('ownerLdapId', '1', 0);
 insert into config (config_key, config_value, config_user) VALUES ('ownerLdapGroupNames', 'ModellerGroup_@@ExternalAppId@@', 0);
 insert into config (config_key, config_value, config_user) VALUES ('manageOwnerLdapGroups', 'true', 0);
+insert into config (config_key, config_value, config_user) VALUES ('ownerDataImportSyncUsers', 'true', 0);
 insert into config (config_key, config_value, config_user) VALUES ('modModelledMarker', 'FWOC', 0);
 insert into config (config_key, config_value, config_user) VALUES ('modModelledMarkerLocation', 'rulename', 0);
 insert into config (config_key, config_value, config_user) VALUES ('ruleRecognitionOption', '{"nwRegardIp":true,"nwRegardName":false,"nwRegardGroupName":false,"nwResolveGroup":false,"svcRegardPortAndProt":true,"svcRegardName":false,"svcRegardGroupName":false,"svcResolveGroup":true,"svcSplitPortRanges":false}', 0);
@@ -569,4 +570,4 @@ INSERT INTO stm_import (import_type_id, import_type_name) VALUES (3, 'admin via
 INSERT INTO stm_owner_mapping_source (owner_mapping_source_type_id, owner_mapping_source_type_name) VALUES (1, 'ip_based');
 INSERT INTO stm_owner_mapping_source (owner_mapping_source_type_id, owner_mapping_source_type_name) VALUES (2, 'custom_field');
 INSERT INTO stm_owner_mapping_source (owner_mapping_source_type_id, owner_mapping_source_type_name) VALUES (3, 'name_field');
-INSERT INTO stm_owner_mapping_source (owner_mapping_source_type_id, owner_mapping_source_type_name) VALUES (4, 'manual');
+INSERT INTO stm_owner_mapping_source (owner_mapping_source_type_id, owner_mapping_source_type_name) VALUES (4, 'manual');

roles/database/files/sql/creation/fworch-fill-stm.sql

@@ -0,0 +1 @@
+insert into config (config_key, config_value, config_user) VALUES ('ownerDataImportSyncUsers', 'true', 0) ON CONFLICT DO NOTHING;

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

@@ -16,12 +16,12 @@ public class OwnerQueries : Queries
         public static readonly string getOwnersForDnsWithConn;
         public static readonly string getOwnersForDnsWithModellingWithConn;
         public static readonly string newOwner;
-        public static readonly string newLifeCycle;
+        public static readonly string newOwnerLifeCycle;
         public static readonly string updateOwner;
-        public static readonly string updateLifeCycle;
+        public static readonly string updateOwnerLifeCycle;
         public static readonly string deactivateOwner;
         public static readonly string deleteOwner;
-        public static readonly string deleteLifeCycle;
+        public static readonly string deleteOwnerLifeCycle;
         public static readonly string getOwnerLifeCycleStates;
         // public static readonly string setDefaultOwner;
         public static readonly string setOwnerLastCheck;
@@ -67,12 +67,12 @@ static OwnerQueries()
                 getOwnersForDnsWithConn = ownerDetailsFragment + GetQueryText("owner/getOwnersForDnsWithConn.graphql");
                 getOwnersForDnsWithModellingWithConn = ownerDetailsFragment + GetQueryText("owner/getOwnersForDnsWithModellingWithConn.graphql");
                 newOwner = GetQueryText("owner/newOwner.graphql");
-                newLifeCycle = GetQueryText("owner/newLifeCycle.graphql");
+                newOwnerLifeCycle = GetQueryText("owner/newOwnerLifeCycle.graphql");
                 updateOwner = GetQueryText("owner/updateOwner.graphql");
-                updateLifeCycle = GetQueryText("owner/updateLifeCycle.graphql");
+                updateOwnerLifeCycle = GetQueryText("owner/updateOwnerLifeCycle.graphql");
                 deactivateOwner = GetQueryText("owner/deactivateOwner.graphql");
                 deleteOwner = GetQueryText("owner/deleteOwner.graphql");
-                deleteLifeCycle = GetQueryText("owner/deleteLifeCycle.graphql");
+                deleteOwnerLifeCycle = GetQueryText("owner/deleteOwnerLifeCycle.graphql");
                 getOwnerLifeCycleStates = GetQueryText("owner/getOwnerLifeCycleStates.graphql");
                 setOwnerLastCheck = GetQueryText("owner/setOwnerLastCheck.graphql");
                 setOwnerLastRecert = GetQueryText("owner/setOwnerLastRecert.graphql");