Skip to content

Commit 1ee23e3

Browse files
tpurschketpurschke
authored
Merge pull request #3002 from CactuseSecurity/develop
v8.7.1 Hotfix release
2 parents b647577 + adaa996 commit 1ee23e3

Some content is hidden

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

45 files changed

+1141
-949
lines changed

‎documentation/revision-history-develop.md

+3
Original file line numberDiff line numberDiff line change
@@ -257,3 +257,6 @@ bugfix release:
257257

258258
# 8.6.3 - 20.02.2025 DEVELOP
259259
- dns lookup for app server names
260+
261+
# 8.7.1 - 05.03.2025 DEVELOP
262+
- ldap writepath for groups

‎documentation/revision-history-main.md

+5
Original file line numberDiff line numberDiff line change
@@ -492,3 +492,8 @@ Hotfix for network modelling:
492492
- adding option to name all application servers by reverse DNS and fall-back to prefix + ip
493493
- API: upgrade Hasura to 2.45.2
494494
- Workflow: some performance improvements
495+
496+
# 8.7.1 07.03.2025 MAIN
497+
- fix modelling select existing interfac
498+
- fix modelling settings ldap selection
499+
- fix workflow ticket close spinner

‎inventory/group_vars/all.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### general settings
2-
product_version: "8.7"
2+
product_version: "8.7.1"
33
ansible_user: "{{ lookup('env', 'USER') }}"
44
ansible_become_method: sudo
55
ansible_python_interpreter: /usr/bin/python3

‎roles/api/files/replace_metadata.json

+4
Original file line numberDiff line numberDiff line change
@@ -7206,6 +7206,7 @@
72067206
"ldap_type",
72077207
"ldap_write_user",
72087208
"ldap_write_user_pwd",
7209+
"ldap_writepath_for_groups",
72097210
"tenant_id"
72107211
]
72117212
}
@@ -7243,6 +7244,7 @@
72437244
"ldap_type",
72447245
"ldap_write_user",
72457246
"ldap_write_user_pwd",
7247+
"ldap_writepath_for_groups",
72467248
"tenant_id"
72477249
],
72487250
"filter": {}
@@ -7293,6 +7295,7 @@
72937295
"ldap_type",
72947296
"ldap_write_user",
72957297
"ldap_write_user_pwd",
7298+
"ldap_writepath_for_groups",
72967299
"tenant_id"
72977300
],
72987301
"filter": {}
@@ -7395,6 +7398,7 @@
73957398
"ldap_type",
73967399
"ldap_write_user",
73977400
"ldap_write_user_pwd",
7401+
"ldap_writepath_for_groups",
73987402
"tenant_id"
73997403
],
74007404
"filter": {},

‎roles/database/files/sql/creation/fworch-create-tables.sql

+1
Original file line numberDiff line numberDiff line change
@@ -1012,6 +1012,7 @@ Create table "ldap_connection"
10121012
"tenant_id" Integer,
10131013
"ldap_write_user_pwd" Varchar,
10141014
"ldap_searchpath_for_groups" Varchar,
1015+
"ldap_writepath_for_groups" Varchar,
10151016
"ldap_type" Integer NOT NULL Default 0,
10161017
"ldap_pattern_length" Integer NOT NULL Default 0,
10171018
"ldap_name" Varchar,

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

+3
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ insert into config (config_key, config_value, config_user) VALUES ('welcomeMessa
124124
insert into config (config_key, config_value, config_user) VALUES ('dnsLookup', 'False', 0);
125125
insert into config (config_key, config_value, config_user) VALUES ('overwriteExistingNames', 'False', 0);
126126
insert into config (config_key, config_value, config_user) VALUES ('autoReplaceAppServer', 'False', 0);
127+
insert into config (config_key, config_value, config_user) VALUES ('ownerLdapId', '1', 0);
128+
insert into config (config_key, config_value, config_user) VALUES ('ownerLdapGroupNames', 'ModellerGroup_@@ExternalAppId@@', 0);
129+
insert into config (config_key, config_value, config_user) VALUES ('manageOwnerLdapGroups', 'true', 0);
127130

128131
INSERT INTO "report_format" ("report_format_name") VALUES ('json');
129132
INSERT INTO "report_format" ("report_format_name") VALUES ('pdf');

‎roles/database/files/sql/idempotent/fworch-encryption.sql

+3-2
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ CREATE OR REPLACE FUNCTION insertLocalLdapWithEncryptedPasswords(
136136
userSearchPath TEXT,
137137
roleSearchPath TEXT,
138138
groupSearchPath TEXT,
139+
groupWritePath TEXT,
139140
tenantLevel INTEGER,
140141
searchUser TEXT,
141142
searchUserPwd TEXT,
@@ -154,9 +155,9 @@ BEGIN
154155
SELECT INTO t_encryptedReadPwd * FROM encryptText(searchUserPwd, t_key);
155156
SELECT INTO t_encryptedWritePwd * FROM encryptText(writeUserPwd, t_key);
156157
INSERT INTO ldap_connection
157-
(ldap_server, ldap_port, ldap_searchpath_for_users, ldap_searchpath_for_roles, ldap_searchpath_for_groups,
158+
(ldap_server, ldap_port, ldap_searchpath_for_users, ldap_searchpath_for_roles, ldap_searchpath_for_groups, ldap_writepath_for_groups,
158159
ldap_tenant_level, ldap_search_user, ldap_search_user_pwd, ldap_write_user, ldap_write_user_pwd, ldap_type)
159-
VALUES (serverName, port, userSearchPath, roleSearchPath, groupSearchPath, tenantLevel, searchUser, t_encryptedReadPwd, writeUser, t_encryptedWritePwd, ldapType);
160+
VALUES (serverName, port, userSearchPath, roleSearchPath, groupSearchPath, groupWritePath, tenantLevel, searchUser, t_encryptedReadPwd, writeUser, t_encryptedWritePwd, ldapType);
160161
END IF;
161162
END;
162163
$$ LANGUAGE plpgsql;

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

+6
Original file line numberDiff line numberDiff line change
@@ -1501,6 +1501,8 @@ INSERT INTO txt VALUES ('regular_connections', 'German', 'Standard-Verbindungen
15011501
INSERT INTO txt VALUES ('regular_connections', 'English', 'Regular Connections');
15021502
INSERT INTO txt VALUES ('show_all', 'German', 'Alle darstellen');
15031503
INSERT INTO txt VALUES ('show_all', 'English', 'Show all');
1504+
INSERT INTO txt VALUES ('fetch_limit', 'German', 'Limit');
1505+
INSERT INTO txt VALUES ('fetch_limit', 'English', 'limit');
15041506
INSERT INTO txt VALUES ('as_source', 'German', 'Als Quelle');
15051507
INSERT INTO txt VALUES ('as_source', 'English', 'As Source');
15061508
INSERT INTO txt VALUES ('send_email', 'German', 'Email senden');
@@ -1911,6 +1913,8 @@ INSERT INTO txt VALUES ('role_search_path', 'German', 'Suchpfad Rollen');
19111913
INSERT INTO txt VALUES ('role_search_path', 'English', 'Role Search Path');
19121914
INSERT INTO txt VALUES ('group_search_path', 'German', 'Suchpfad Gruppen');
19131915
INSERT INTO txt VALUES ('group_search_path', 'English', 'Group Search Path');
1916+
INSERT INTO txt VALUES ('group_write_path', 'German', 'Schreibpfad Gruppen');
1917+
INSERT INTO txt VALUES ('group_write_path', 'English', 'Group Write Path');
19141918
INSERT INTO txt VALUES ('search_user', 'German', 'Nutzer für Suche');
19151919
INSERT INTO txt VALUES ('search_user', 'English', 'Search User');
19161920
INSERT INTO txt VALUES ('search_user_pwd', 'German', 'Passwort Nutzer für Suche');
@@ -4482,6 +4486,8 @@ INSERT INTO txt VALUES ('H5225', 'English', 'Global Tenant Name: If the Ldap is
44824486
');
44834487
INSERT INTO txt VALUES ('H5226', 'German', 'Aktiv: Wenn das Ldap nicht auf aktiv gesetzt ist, wird es für andere Aktionen (Autorisierungen, Rollenzuweisung etc.) nicht berücksichtigt.');
44844488
INSERT INTO txt VALUES ('H5226', 'English', 'Active: If not set to active, the Ldap is not involved in other actions (authorization, role assignment etc.).');
4489+
INSERT INTO txt VALUES ('H5227', 'German', 'Schreibpfad Gruppen: Der Distinguished name (Dn) des Wurzelverzeichnisses des Gruppensbaums. Dieser Parameter kann vom Suchpfad abweichen (was er im internen Ldap nicht tut).');
4490+
INSERT INTO txt VALUES ('H5227', 'English', 'Group Write Path: The distinguished name (Dn) of the root of the group writ tree. This parameter may differ from the search path (in the internal Ldap it does not).');
44854491
INSERT INTO txt VALUES ('H5231', 'German', 'Die verf&uuml;gbaren Mandanten werden hier mit den zugeordneten Gateways dargestellt.<br>
44864492
Es ist m&ouml;glich, Mandanten im lokalen Ldap sowie Verkn&uuml;pfungen zu den vorhandenen <a href="/help/settings/gateways">Gateways</a> anzulegen oder zu l&ouml;schen.
44874493
Wenn Beispieldaten (definiert durch die Endung "_demo" vom Mandantennamen) existieren, wird eine Schaltfl&auml;che angezeigt, um diese zu l&ouml;schen.

‎roles/database/files/upgrade/8.6.3.sql

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ CREATE TABLE IF NOT EXISTS refresh_log (
1212
status TEXT
1313
);
1414

15+
DROP FUNCTION IF EXISTS refresh_view_rule_with_owner();
1516
CREATE OR REPLACE FUNCTION refresh_view_rule_with_owner()
1617
RETURNS SETOF refresh_log AS $$
1718
DECLARE

0 commit comments

Comments
 (0)