From b4504cd118575b63b634d70bf0bad020dc4ddc24 Mon Sep 17 00:00:00 2001 From: Peter Balcirak Date: Tue, 27 Jul 2021 13:17:21 +0200 Subject: [PATCH 1/9] Release 3.28.0 - New method getGroupRichMembersByIds, which can retrieve group members by ids. - Search methods fo members/users now support uuid. - Optimalized methods getMembersPage, findUsers a findMembers. - Removed method for preferred mail changed which used i/m parameters. - Module urn_perun_group_attribute_def_def_adGroupname now support dash in value. - Methods remove group from resource now support also inactive assignments. - Object assignedResource now contains also assigned tags. - Einfra and MU password modules now generate shorter password without some characters, which were confusing for users. - Methods like assignGroupsToResources now support assignment in async mode. - Created component for group-resource assignment revalidation. - Support for notification tags which support attributes from submitted application. - Support for prefiling attributes from submitted VO application to a new Group application. --- perun-auditlogger/pom.xml | 2 +- perun-auditparser/pom.xml | 2 +- perun-base/pom.xml | 2 +- perun-cabinet/pom.xml | 2 +- perun-cli-java/pom.xml | 2 +- perun-core/pom.xml | 2 +- perun-dispatcher/pom.xml | 2 +- perun-engine/pom.xml | 2 +- perun-ldapc/pom.xml | 2 +- perun-notification/pom.xml | 2 +- perun-openapi/pom.xml | 2 +- perun-registrar-lib/pom.xml | 2 +- perun-rpc/pom.xml | 2 +- perun-scim/pom.xml | 2 +- perun-web-gui/pom.xml | 2 +- pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/perun-auditlogger/pom.xml b/perun-auditlogger/pom.xml index 3bac6df682..f1c5fcc693 100644 --- a/perun-auditlogger/pom.xml +++ b/perun-auditlogger/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.28.0-SNAPSHOT + 3.28.0 cz.metacentrum.perun diff --git a/perun-auditparser/pom.xml b/perun-auditparser/pom.xml index 97ac163e0c..bc57272aa2 100644 --- a/perun-auditparser/pom.xml +++ b/perun-auditparser/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.28.0-SNAPSHOT + 3.28.0 cz.metacentrum.perun diff --git a/perun-base/pom.xml b/perun-base/pom.xml index 5db16937d2..a3452188f7 100644 --- a/perun-base/pom.xml +++ b/perun-base/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.28.0-SNAPSHOT + 3.28.0 cz.metacentrum.perun diff --git a/perun-cabinet/pom.xml b/perun-cabinet/pom.xml index 73b0f9330d..9041caa0a7 100644 --- a/perun-cabinet/pom.xml +++ b/perun-cabinet/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.28.0-SNAPSHOT + 3.28.0 cz.metacentrum.perun diff --git a/perun-cli-java/pom.xml b/perun-cli-java/pom.xml index 46f0449e0c..2052cea08a 100644 --- a/perun-cli-java/pom.xml +++ b/perun-cli-java/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 3.28.0-SNAPSHOT + 3.28.0 cz.metacentrum.perun diff --git a/perun-core/pom.xml b/perun-core/pom.xml index e61dc4474e..afcc77c332 100644 --- a/perun-core/pom.xml +++ b/perun-core/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.28.0-SNAPSHOT + 3.28.0 cz.metacentrum.perun diff --git a/perun-dispatcher/pom.xml b/perun-dispatcher/pom.xml index b6a54b5a7a..3ade352101 100644 --- a/perun-dispatcher/pom.xml +++ b/perun-dispatcher/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.28.0-SNAPSHOT + 3.28.0 cz.metacentrum.perun diff --git a/perun-engine/pom.xml b/perun-engine/pom.xml index 7ffee0b275..46723fd661 100644 --- a/perun-engine/pom.xml +++ b/perun-engine/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.28.0-SNAPSHOT + 3.28.0 cz.metacentrum.perun diff --git a/perun-ldapc/pom.xml b/perun-ldapc/pom.xml index 1f01fe93dc..9d8ac23ff5 100644 --- a/perun-ldapc/pom.xml +++ b/perun-ldapc/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 3.28.0-SNAPSHOT + 3.28.0 cz.metacentrum.perun diff --git a/perun-notification/pom.xml b/perun-notification/pom.xml index fdd6bd2a0a..8f30eebb8f 100644 --- a/perun-notification/pom.xml +++ b/perun-notification/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.28.0-SNAPSHOT + 3.28.0 cz.metacentrum.perun diff --git a/perun-openapi/pom.xml b/perun-openapi/pom.xml index 321f5ada24..283f4552f1 100644 --- a/perun-openapi/pom.xml +++ b/perun-openapi/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 3.28.0-SNAPSHOT + 3.28.0 cz.metacentrum.perun diff --git a/perun-registrar-lib/pom.xml b/perun-registrar-lib/pom.xml index 3a0fd93bc3..5bcc6c3625 100644 --- a/perun-registrar-lib/pom.xml +++ b/perun-registrar-lib/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.28.0-SNAPSHOT + 3.28.0 cz.metacentrum.perun diff --git a/perun-rpc/pom.xml b/perun-rpc/pom.xml index a464510bcd..556342a7a8 100644 --- a/perun-rpc/pom.xml +++ b/perun-rpc/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.28.0-SNAPSHOT + 3.28.0 cz.metacentrum.perun diff --git a/perun-scim/pom.xml b/perun-scim/pom.xml index 556db990f4..311907c5d2 100644 --- a/perun-scim/pom.xml +++ b/perun-scim/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.28.0-SNAPSHOT + 3.28.0 cz.metacentrum.perun diff --git a/perun-web-gui/pom.xml b/perun-web-gui/pom.xml index baf87ee956..e5fff556a4 100644 --- a/perun-web-gui/pom.xml +++ b/perun-web-gui/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.28.0-SNAPSHOT + 3.28.0 cz.metacentrum.perun diff --git a/pom.xml b/pom.xml index c63162b87b..0238636076 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ cz.metacentrum perun - 3.28.0-SNAPSHOT + 3.28.0 pom From 3029368098595b3cce1a21f0ea38fbf01ad81611 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 10 Aug 2021 10:22:04 +0000 Subject: [PATCH 2/9] chore(release): 3.29.0 # [3.29.0](https://github.com/CESNET/perun/compare/v3.28.0...v3.29.0) (2021-08-10) ### Bug Fixes * **core:** allowed included groups in modules sendAs, sendOnBehalf ([b9e5aa1](https://github.com/CESNET/perun/commit/b9e5aa1743638cb95d2c4a0a8fce58dcfe1d6bf1)) * **core:** wait before member async validation ([62b1238](https://github.com/CESNET/perun/commit/62b1238a79d3dc1859512ada7fd7901af52c5b0a)) * **gui:** Fixed unresponsive tabs for form item editing ([722ef63](https://github.com/CESNET/perun/commit/722ef63eded254775442ce96f0ddf6060a6df809)) * **registrar:** Constant-time MAC comparison ([df03683](https://github.com/CESNET/perun/commit/df036833a850351435500745244e2454ea849a23)) ### Features * **core:** allow empty login in module login-namespace:mu-adm ([51e970b](https://github.com/CESNET/perun/commit/51e970bdbe139947e47bc25714866aa4247eba53)) * **core:** module studentIdentifiers changed to create and remove userExtSources with attributes ([b5bc9fd](https://github.com/CESNET/perun/commit/b5bc9fd2f8e79cbcb168c62e967209f6019c288f)) * **core:** new user virtual attribute studentIdentifiers ([550e515](https://github.com/CESNET/perun/commit/550e515575945a126384ad2340c23ce632f5cc51)) * **ldap:** Add attribute studentIdentifiers to LDAP schema ([5721459](https://github.com/CESNET/perun/commit/572145980f7a8ba3f282b0300a5e6bd6ac765e51)) * **registrar:** VO and group application notifications adjustment ([2af55a2](https://github.com/CESNET/perun/commit/2af55a2b76583326de3126a1901b43e8bdcfe7b7)) * add method reserveRandomPassword to OpenAPI ([2c69369](https://github.com/CESNET/perun/commit/2c69369eb29949b6016d8e12f765b142f4495c81)) * **core:** store cause of group-resource assignment failure ([d670408](https://github.com/CESNET/perun/commit/d6704080a03125f59763c461e970017d5f768271)) * **perun:** method isLoginAvailable added to OpenAPI ([a5d361d](https://github.com/CESNET/perun/commit/a5d361dd05ce74fb8f0f3a720d4a1f2bf5e0a6e9)) ### Performance Improvements * **core:** adjust threads pool for async tasks ([dc6a339](https://github.com/CESNET/perun/commit/dc6a339bb9911fccd9c4a217d3aebd8c9dd30777)) --- perun-auditlogger/pom.xml | 2 +- perun-auditparser/pom.xml | 2 +- perun-base/pom.xml | 2 +- perun-cabinet/pom.xml | 2 +- perun-cli-java/pom.xml | 2 +- perun-core/pom.xml | 2 +- perun-dispatcher/pom.xml | 2 +- perun-engine/pom.xml | 2 +- perun-ldapc/pom.xml | 2 +- perun-notification/pom.xml | 2 +- perun-openapi/openapi.yml | 2 +- perun-openapi/pom.xml | 2 +- perun-registrar-lib/pom.xml | 2 +- perun-rpc/pom.xml | 2 +- perun-scim/pom.xml | 2 +- perun-web-gui/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/perun-auditlogger/pom.xml b/perun-auditlogger/pom.xml index 5a184ea998..8ee7d13bd7 100644 --- a/perun-auditlogger/pom.xml +++ b/perun-auditlogger/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 0.0.0-development + 3.29.0 cz.metacentrum.perun diff --git a/perun-auditparser/pom.xml b/perun-auditparser/pom.xml index 88f706526f..3ad62038c5 100644 --- a/perun-auditparser/pom.xml +++ b/perun-auditparser/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 0.0.0-development + 3.29.0 cz.metacentrum.perun diff --git a/perun-base/pom.xml b/perun-base/pom.xml index 55ba4e794f..cd9beb080f 100644 --- a/perun-base/pom.xml +++ b/perun-base/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 0.0.0-development + 3.29.0 cz.metacentrum.perun diff --git a/perun-cabinet/pom.xml b/perun-cabinet/pom.xml index 47a41b7c99..0cda6e9a22 100644 --- a/perun-cabinet/pom.xml +++ b/perun-cabinet/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 0.0.0-development + 3.29.0 cz.metacentrum.perun diff --git a/perun-cli-java/pom.xml b/perun-cli-java/pom.xml index b34181cb17..bbddafbf38 100644 --- a/perun-cli-java/pom.xml +++ b/perun-cli-java/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 0.0.0-development + 3.29.0 cz.metacentrum.perun diff --git a/perun-core/pom.xml b/perun-core/pom.xml index fd38ee8379..28b6cd4fe7 100644 --- a/perun-core/pom.xml +++ b/perun-core/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 0.0.0-development + 3.29.0 cz.metacentrum.perun diff --git a/perun-dispatcher/pom.xml b/perun-dispatcher/pom.xml index d070328110..16f7e8ec85 100644 --- a/perun-dispatcher/pom.xml +++ b/perun-dispatcher/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 0.0.0-development + 3.29.0 cz.metacentrum.perun diff --git a/perun-engine/pom.xml b/perun-engine/pom.xml index 580cc49ede..1ab21bb530 100644 --- a/perun-engine/pom.xml +++ b/perun-engine/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 0.0.0-development + 3.29.0 cz.metacentrum.perun diff --git a/perun-ldapc/pom.xml b/perun-ldapc/pom.xml index 6e5bc6577a..e6337dc432 100644 --- a/perun-ldapc/pom.xml +++ b/perun-ldapc/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 0.0.0-development + 3.29.0 cz.metacentrum.perun diff --git a/perun-notification/pom.xml b/perun-notification/pom.xml index 70dd1cbe35..38684bb00e 100644 --- a/perun-notification/pom.xml +++ b/perun-notification/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 0.0.0-development + 3.29.0 cz.metacentrum.perun diff --git a/perun-openapi/openapi.yml b/perun-openapi/openapi.yml index 331f31efbb..41e793128c 100644 --- a/perun-openapi/openapi.yml +++ b/perun-openapi/openapi.yml @@ -1,7 +1,7 @@ openapi: 3.0.2 info: - version: 0.0.0 + version: 3.29.0 title: Perun RPC API description: Perun Remote Procedure Calls Application Programming Interface contact: diff --git a/perun-openapi/pom.xml b/perun-openapi/pom.xml index adcdb0d620..3308a19255 100644 --- a/perun-openapi/pom.xml +++ b/perun-openapi/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 0.0.0-development + 3.29.0 cz.metacentrum.perun diff --git a/perun-registrar-lib/pom.xml b/perun-registrar-lib/pom.xml index 51534c4516..3125abf31e 100644 --- a/perun-registrar-lib/pom.xml +++ b/perun-registrar-lib/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 0.0.0-development + 3.29.0 cz.metacentrum.perun diff --git a/perun-rpc/pom.xml b/perun-rpc/pom.xml index 5bb4425e80..ec1b25d8af 100644 --- a/perun-rpc/pom.xml +++ b/perun-rpc/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 0.0.0-development + 3.29.0 cz.metacentrum.perun diff --git a/perun-scim/pom.xml b/perun-scim/pom.xml index fc5ecdf079..42f105dec8 100644 --- a/perun-scim/pom.xml +++ b/perun-scim/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 0.0.0-development + 3.29.0 cz.metacentrum.perun diff --git a/perun-web-gui/pom.xml b/perun-web-gui/pom.xml index d8d2ef0a07..ca16c11129 100644 --- a/perun-web-gui/pom.xml +++ b/perun-web-gui/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 0.0.0-development + 3.29.0 cz.metacentrum.perun diff --git a/pom.xml b/pom.xml index 0a67a28bf4..5dbc08fea7 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ cz.metacentrum perun - 0.0.0-development + 3.29.0 pom From 7bc71cc8dee6eda877c9ba21e1424eac6dfc0041 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 10 Aug 2021 13:42:37 +0000 Subject: [PATCH 3/9] chore(release): 3.29.1 ## [3.29.1](https://github.com/CESNET/perun/compare/v3.29.0...v3.29.1) (2021-08-10) ### Bug Fixes * **core:** fixed audit logging for group-resource assignement without services on resource ([8824735](https://github.com/CESNET/perun/commit/8824735968dc6d6e3593decaa96b7067232d304c)) --- perun-auditlogger/pom.xml | 2 +- perun-auditparser/pom.xml | 2 +- perun-base/pom.xml | 2 +- perun-cabinet/pom.xml | 2 +- perun-cli-java/pom.xml | 2 +- perun-core/pom.xml | 2 +- perun-dispatcher/pom.xml | 2 +- perun-engine/pom.xml | 2 +- perun-ldapc/pom.xml | 2 +- perun-notification/pom.xml | 2 +- perun-openapi/openapi.yml | 2 +- perun-openapi/pom.xml | 2 +- perun-registrar-lib/pom.xml | 2 +- perun-rpc/pom.xml | 2 +- perun-scim/pom.xml | 2 +- perun-web-gui/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/perun-auditlogger/pom.xml b/perun-auditlogger/pom.xml index 8ee7d13bd7..b56dcdc9c8 100644 --- a/perun-auditlogger/pom.xml +++ b/perun-auditlogger/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.0 + 3.29.1 cz.metacentrum.perun diff --git a/perun-auditparser/pom.xml b/perun-auditparser/pom.xml index 3ad62038c5..427bd6958b 100644 --- a/perun-auditparser/pom.xml +++ b/perun-auditparser/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.0 + 3.29.1 cz.metacentrum.perun diff --git a/perun-base/pom.xml b/perun-base/pom.xml index cd9beb080f..00272fe7fd 100644 --- a/perun-base/pom.xml +++ b/perun-base/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.0 + 3.29.1 cz.metacentrum.perun diff --git a/perun-cabinet/pom.xml b/perun-cabinet/pom.xml index 0cda6e9a22..bcfdf2a7b2 100644 --- a/perun-cabinet/pom.xml +++ b/perun-cabinet/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.0 + 3.29.1 cz.metacentrum.perun diff --git a/perun-cli-java/pom.xml b/perun-cli-java/pom.xml index bbddafbf38..51a4b7e183 100644 --- a/perun-cli-java/pom.xml +++ b/perun-cli-java/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 3.29.0 + 3.29.1 cz.metacentrum.perun diff --git a/perun-core/pom.xml b/perun-core/pom.xml index 28b6cd4fe7..567fdcbb31 100644 --- a/perun-core/pom.xml +++ b/perun-core/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.0 + 3.29.1 cz.metacentrum.perun diff --git a/perun-dispatcher/pom.xml b/perun-dispatcher/pom.xml index 16f7e8ec85..df7e844255 100644 --- a/perun-dispatcher/pom.xml +++ b/perun-dispatcher/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.0 + 3.29.1 cz.metacentrum.perun diff --git a/perun-engine/pom.xml b/perun-engine/pom.xml index 1ab21bb530..2f50da2952 100644 --- a/perun-engine/pom.xml +++ b/perun-engine/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.0 + 3.29.1 cz.metacentrum.perun diff --git a/perun-ldapc/pom.xml b/perun-ldapc/pom.xml index e6337dc432..04c661f808 100644 --- a/perun-ldapc/pom.xml +++ b/perun-ldapc/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 3.29.0 + 3.29.1 cz.metacentrum.perun diff --git a/perun-notification/pom.xml b/perun-notification/pom.xml index 38684bb00e..0ab99f58cc 100644 --- a/perun-notification/pom.xml +++ b/perun-notification/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.0 + 3.29.1 cz.metacentrum.perun diff --git a/perun-openapi/openapi.yml b/perun-openapi/openapi.yml index 41e793128c..4a10add08e 100644 --- a/perun-openapi/openapi.yml +++ b/perun-openapi/openapi.yml @@ -1,7 +1,7 @@ openapi: 3.0.2 info: - version: 3.29.0 + version: 3.29.1 title: Perun RPC API description: Perun Remote Procedure Calls Application Programming Interface contact: diff --git a/perun-openapi/pom.xml b/perun-openapi/pom.xml index 3308a19255..418392d1c0 100644 --- a/perun-openapi/pom.xml +++ b/perun-openapi/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 3.29.0 + 3.29.1 cz.metacentrum.perun diff --git a/perun-registrar-lib/pom.xml b/perun-registrar-lib/pom.xml index 3125abf31e..6179e3556e 100644 --- a/perun-registrar-lib/pom.xml +++ b/perun-registrar-lib/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.0 + 3.29.1 cz.metacentrum.perun diff --git a/perun-rpc/pom.xml b/perun-rpc/pom.xml index ec1b25d8af..e7501882ce 100644 --- a/perun-rpc/pom.xml +++ b/perun-rpc/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.0 + 3.29.1 cz.metacentrum.perun diff --git a/perun-scim/pom.xml b/perun-scim/pom.xml index 42f105dec8..bb6b8490e1 100644 --- a/perun-scim/pom.xml +++ b/perun-scim/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.0 + 3.29.1 cz.metacentrum.perun diff --git a/perun-web-gui/pom.xml b/perun-web-gui/pom.xml index ca16c11129..bf08d9ff58 100644 --- a/perun-web-gui/pom.xml +++ b/perun-web-gui/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.0 + 3.29.1 cz.metacentrum.perun diff --git a/pom.xml b/pom.xml index 5dbc08fea7..7e1b7c1f7c 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ cz.metacentrum perun - 3.29.0 + 3.29.1 pom From c11c5a2263bd466e285406aa323669daf3d4dee6 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 12 Aug 2021 08:31:21 +0000 Subject: [PATCH 4/9] chore(release): 3.29.2 ## [3.29.2](https://github.com/CESNET/perun/compare/v3.29.1...v3.29.2) (2021-08-12) ### Bug Fixes * **githubci:** fix version update in cli on release ([c57bb3e](https://github.com/CESNET/perun/commit/c57bb3e0d3ab78d7c852f14efb38e0ead4c689f4)) --- perun-auditlogger/pom.xml | 2 +- perun-auditparser/pom.xml | 2 +- perun-base/pom.xml | 2 +- perun-cabinet/pom.xml | 2 +- perun-cli-java/pom.xml | 2 +- perun-cli/Perun/Agent.pm | 2 +- perun-core/pom.xml | 2 +- perun-dispatcher/pom.xml | 2 +- perun-engine/pom.xml | 2 +- perun-ldapc/pom.xml | 2 +- perun-notification/pom.xml | 2 +- perun-openapi/openapi.yml | 2 +- perun-openapi/pom.xml | 2 +- perun-registrar-lib/pom.xml | 2 +- perun-rpc/pom.xml | 2 +- perun-scim/pom.xml | 2 +- perun-web-gui/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/perun-auditlogger/pom.xml b/perun-auditlogger/pom.xml index b56dcdc9c8..17ae9833a5 100644 --- a/perun-auditlogger/pom.xml +++ b/perun-auditlogger/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.1 + 3.29.2 cz.metacentrum.perun diff --git a/perun-auditparser/pom.xml b/perun-auditparser/pom.xml index 427bd6958b..597736916a 100644 --- a/perun-auditparser/pom.xml +++ b/perun-auditparser/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.1 + 3.29.2 cz.metacentrum.perun diff --git a/perun-base/pom.xml b/perun-base/pom.xml index 00272fe7fd..b1a860b5f0 100644 --- a/perun-base/pom.xml +++ b/perun-base/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.1 + 3.29.2 cz.metacentrum.perun diff --git a/perun-cabinet/pom.xml b/perun-cabinet/pom.xml index bcfdf2a7b2..0b0ec87dad 100644 --- a/perun-cabinet/pom.xml +++ b/perun-cabinet/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.1 + 3.29.2 cz.metacentrum.perun diff --git a/perun-cli-java/pom.xml b/perun-cli-java/pom.xml index 51a4b7e183..767e67ce11 100644 --- a/perun-cli-java/pom.xml +++ b/perun-cli-java/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 3.29.1 + 3.29.2 cz.metacentrum.perun diff --git a/perun-cli/Perun/Agent.pm b/perun-cli/Perun/Agent.pm index a6d06f31b5..2a0699970b 100644 --- a/perun-cli/Perun/Agent.pm +++ b/perun-cli/Perun/Agent.pm @@ -1,5 +1,5 @@ package Perun::Agent; -my $agentVersion = '0.0.0'; +my $agentVersion = '3.29.2'; my $agentVersionMajor; if ($agentVersion !~ /^(\d+)(?{ $agentVersionMajor = $^N })\..*/i) { diff --git a/perun-core/pom.xml b/perun-core/pom.xml index 567fdcbb31..cb4f1479e3 100644 --- a/perun-core/pom.xml +++ b/perun-core/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.1 + 3.29.2 cz.metacentrum.perun diff --git a/perun-dispatcher/pom.xml b/perun-dispatcher/pom.xml index df7e844255..158bcbc952 100644 --- a/perun-dispatcher/pom.xml +++ b/perun-dispatcher/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.1 + 3.29.2 cz.metacentrum.perun diff --git a/perun-engine/pom.xml b/perun-engine/pom.xml index 2f50da2952..b691a2c033 100644 --- a/perun-engine/pom.xml +++ b/perun-engine/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.1 + 3.29.2 cz.metacentrum.perun diff --git a/perun-ldapc/pom.xml b/perun-ldapc/pom.xml index 04c661f808..5f98cb39d4 100644 --- a/perun-ldapc/pom.xml +++ b/perun-ldapc/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 3.29.1 + 3.29.2 cz.metacentrum.perun diff --git a/perun-notification/pom.xml b/perun-notification/pom.xml index 0ab99f58cc..c1f919cb93 100644 --- a/perun-notification/pom.xml +++ b/perun-notification/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.1 + 3.29.2 cz.metacentrum.perun diff --git a/perun-openapi/openapi.yml b/perun-openapi/openapi.yml index 4a10add08e..0999f6360d 100644 --- a/perun-openapi/openapi.yml +++ b/perun-openapi/openapi.yml @@ -1,7 +1,7 @@ openapi: 3.0.2 info: - version: 3.29.1 + version: 3.29.2 title: Perun RPC API description: Perun Remote Procedure Calls Application Programming Interface contact: diff --git a/perun-openapi/pom.xml b/perun-openapi/pom.xml index 418392d1c0..257e6493ae 100644 --- a/perun-openapi/pom.xml +++ b/perun-openapi/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 3.29.1 + 3.29.2 cz.metacentrum.perun diff --git a/perun-registrar-lib/pom.xml b/perun-registrar-lib/pom.xml index 6179e3556e..c44cc44edf 100644 --- a/perun-registrar-lib/pom.xml +++ b/perun-registrar-lib/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.1 + 3.29.2 cz.metacentrum.perun diff --git a/perun-rpc/pom.xml b/perun-rpc/pom.xml index e7501882ce..cb6c7ac561 100644 --- a/perun-rpc/pom.xml +++ b/perun-rpc/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.1 + 3.29.2 cz.metacentrum.perun diff --git a/perun-scim/pom.xml b/perun-scim/pom.xml index bb6b8490e1..00dfa6a878 100644 --- a/perun-scim/pom.xml +++ b/perun-scim/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.1 + 3.29.2 cz.metacentrum.perun diff --git a/perun-web-gui/pom.xml b/perun-web-gui/pom.xml index bf08d9ff58..bf4ad773bd 100644 --- a/perun-web-gui/pom.xml +++ b/perun-web-gui/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.1 + 3.29.2 cz.metacentrum.perun diff --git a/pom.xml b/pom.xml index 7e1b7c1f7c..bace1ec745 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ cz.metacentrum perun - 3.29.1 + 3.29.2 pom From c9c14986e49afc9d636899c049a4fec230c2272c Mon Sep 17 00:00:00 2001 From: Vojtech Sassmann Date: Tue, 24 Aug 2021 12:32:42 +0200 Subject: [PATCH 5/9] fix(core): correctly close connection to extSources * In some scenarios we didn't close connectinos to extSources. This might cause a problem on the extsource system. * Missing closements were detected and added. --- .../core/blImpl/ExtSourcesManagerBlImpl.java | 10 +++ .../core/blImpl/GroupsManagerBlImpl.java | 64 +++++++++++-------- .../core/blImpl/MembersManagerBlImpl.java | 10 +++ .../perun/core/blImpl/VosManagerBlImpl.java | 20 ++++++ .../core/entry/ExtSourcesManagerEntry.java | 17 ++++- 5 files changed, 94 insertions(+), 27 deletions(-) diff --git a/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/ExtSourcesManagerBlImpl.java b/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/ExtSourcesManagerBlImpl.java index 26cb39f328..bc454b81f3 100644 --- a/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/ExtSourcesManagerBlImpl.java +++ b/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/ExtSourcesManagerBlImpl.java @@ -180,6 +180,16 @@ public List getInvalidUsers(PerunSession sess, ExtSource source) { invalidUsers.add(user); } catch (ExtSourceUnsupportedOperationException e) { log.warn("ExtSource {} doesn't support getSubjectByLogin", source.getName()); + } finally { + if (source instanceof ExtSourceSimpleApi) { + try { + ((ExtSourceSimpleApi) source).close(); + } catch (ExtSourceUnsupportedOperationException e) { + // silently skip + } catch (Exception e) { + log.error("Failed to close connection to extsource", e); + } + } } } diff --git a/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/GroupsManagerBlImpl.java b/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/GroupsManagerBlImpl.java index 02058cfdde..ef4930129a 100644 --- a/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/GroupsManagerBlImpl.java +++ b/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/GroupsManagerBlImpl.java @@ -1787,45 +1787,57 @@ public List synchronizeGroupStructure(PerunSession sess, Group baseGroup //get extSource for group structure ExtSource source = getGroupExtSourceForSynchronization(sess, baseGroup); + try { - //get login attribute for structure - AttributeDefinition loginAttributeDefinition = getLoginAttributeForGroupStructure(sess, baseGroup); - //get login prefix if exists - String loginPrefix = getLoginPrefixForGroupStructure(sess, baseGroup); + //get login attribute for structure + AttributeDefinition loginAttributeDefinition = getLoginAttributeForGroupStructure(sess, baseGroup); + //get login prefix if exists + String loginPrefix = getLoginPrefixForGroupStructure(sess, baseGroup); - List candidateGroupsToAdd = new ArrayList<>(); - Map groupsToUpdate = new HashMap<>(); - List groupsToRemove = new ArrayList<>(); + List candidateGroupsToAdd = new ArrayList<>(); + Map groupsToUpdate = new HashMap<>(); + List groupsToRemove = new ArrayList<>(); - Map actualGroups = getAllSubGroupsWithLogins(sess, baseGroup, loginAttributeDefinition); - List> subjectGroups = getSubjectGroupsFromExtSource(sess, source, baseGroup); + Map actualGroups = getAllSubGroupsWithLogins(sess, baseGroup, loginAttributeDefinition); + List> subjectGroups = getSubjectGroupsFromExtSource(sess, source, baseGroup); - if (isThisFlatSynchronization(sess, baseGroup)) { - for(Map subjectGroup : subjectGroups) { - subjectGroup.put(PARENT_GROUP_LOGIN, null); + if (isThisFlatSynchronization(sess, baseGroup)) { + for(Map subjectGroup : subjectGroups) { + subjectGroup.put(PARENT_GROUP_LOGIN, null); + } } - } - List mergeAttributes = getAttributesListFromExtSource(source, MERGE_GROUP_ATTRIBUTES); + List mergeAttributes = getAttributesListFromExtSource(source, MERGE_GROUP_ATTRIBUTES); - List candidateGroups = getPerunBl().getExtSourcesManagerBl().generateCandidateGroups(sess, subjectGroups, source, loginPrefix); + List candidateGroups = getPerunBl().getExtSourcesManagerBl().generateCandidateGroups(sess, subjectGroups, source, loginPrefix); - categorizeGroupsForSynchronization(actualGroups, candidateGroups, candidateGroupsToAdd, groupsToUpdate, groupsToRemove); + categorizeGroupsForSynchronization(actualGroups, candidateGroups, candidateGroupsToAdd, groupsToUpdate, groupsToRemove); - //order of operations is important here - //removing need to go first to be able to replace groups with same name but different login - //updating need to be last to set right order of groups again - List removedGroupsIds = removeFormerGroupsWhileSynchronization(sess, baseGroup, groupsToRemove, skippedGroups); - addMissingGroupsWhileSynchronization(sess, baseGroup, candidateGroupsToAdd, loginAttributeDefinition, skippedGroups, mergeAttributes); - updateExistingGroupsWhileSynchronization(sess, baseGroup, groupsToUpdate, removedGroupsIds, loginAttributeDefinition, skippedGroups, mergeAttributes); + //order of operations is important here + //removing need to go first to be able to replace groups with same name but different login + //updating need to be last to set right order of groups again + List removedGroupsIds = removeFormerGroupsWhileSynchronization(sess, baseGroup, groupsToRemove, skippedGroups); + addMissingGroupsWhileSynchronization(sess, baseGroup, candidateGroupsToAdd, loginAttributeDefinition, skippedGroups, mergeAttributes); + updateExistingGroupsWhileSynchronization(sess, baseGroup, groupsToUpdate, removedGroupsIds, loginAttributeDefinition, skippedGroups, mergeAttributes); - setUpSynchronizationAttributesForAllSubGroups(sess, baseGroup, source, loginAttributeDefinition, loginPrefix); + setUpSynchronizationAttributesForAllSubGroups(sess, baseGroup, source, loginAttributeDefinition, loginPrefix); - syncResourcesForSynchronization(sess, baseGroup, loginAttributeDefinition, skippedGroups); + syncResourcesForSynchronization(sess, baseGroup, loginAttributeDefinition, skippedGroups); - log.info("Group structure synchronization {}: ended.", baseGroup); + log.info("Group structure synchronization {}: ended.", baseGroup); - return skippedGroups; + return skippedGroups; + } finally { + if (source instanceof ExtSourceSimpleApi) { + try { + ((ExtSourceSimpleApi) source).close(); + } catch (ExtSourceUnsupportedOperationException e) { + // silently skip + } catch (Exception e) { + log.error("Failed to close extsource after structure synchronization.", e); + } + } + } } /** diff --git a/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/MembersManagerBlImpl.java b/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/MembersManagerBlImpl.java index 7095f95455..92910b43e2 100644 --- a/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/MembersManagerBlImpl.java +++ b/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/MembersManagerBlImpl.java @@ -612,6 +612,16 @@ public Member createMember(PerunSession sess, Vo vo, ExtSource extSource, String throw new InternalErrorException("Can't find candidate for login " + login + " in extSource " + extSource, ex); } catch (ExtSourceUnsupportedOperationException ex) { throw new InternalErrorException("Some operation is not allowed for extSource " + extSource, ex); + } finally { + if (extSource instanceof ExtSourceSimpleApi) { + try { + ((ExtSourceSimpleApi) extSource).close(); + } catch (ExtSourceUnsupportedOperationException e) { + // silently skip + } catch (Exception e) { + log.error("Failed to close connection to extsource", e); + } + } } return this.createMember(sess, vo, candidate, groups); diff --git a/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/VosManagerBlImpl.java b/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/VosManagerBlImpl.java index b96a345c96..d2e93c3b2f 100644 --- a/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/VosManagerBlImpl.java +++ b/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/VosManagerBlImpl.java @@ -377,6 +377,16 @@ public List findCandidates(PerunSession sess, Vo vo, String searchStr } catch (InternalErrorException e) { log.error("Failed to get candidates from ExtSource: {}", source); + } finally { + if (source instanceof ExtSourceSimpleApi) { + try { + ((ExtSourceSimpleApi) source).close(); + } catch (ExtSourceUnsupportedOperationException e) { + // silently skip + } catch (Exception e) { + log.error("Failed to close connection to extsource", e); + } + } } // Stop walking through next sources if the number of already retrieved members exceeded the maxNumOfResults if (maxNumOfResults > 0 && numOfResults >= maxNumOfResults) { @@ -493,6 +503,16 @@ public List findCandidates(PerunSession sess, Group group, String sea } } catch (InternalErrorException e) { log.error("Failed to get candidates from ExtSource: {}", source); + } finally { + if (source instanceof ExtSourceSimpleApi) { + try { + ((ExtSourceSimpleApi) source).close(); + } catch (ExtSourceUnsupportedOperationException e) { + // silently skip + } catch (Exception e) { + log.error("Failed to close connection to extsource", e); + } + } } } diff --git a/perun-core/src/main/java/cz/metacentrum/perun/core/entry/ExtSourcesManagerEntry.java b/perun-core/src/main/java/cz/metacentrum/perun/core/entry/ExtSourcesManagerEntry.java index 46d003da6b..6409d65f3f 100644 --- a/perun-core/src/main/java/cz/metacentrum/perun/core/entry/ExtSourcesManagerEntry.java +++ b/perun-core/src/main/java/cz/metacentrum/perun/core/entry/ExtSourcesManagerEntry.java @@ -22,6 +22,7 @@ import cz.metacentrum.perun.core.bl.ExtSourcesManagerBl; import cz.metacentrum.perun.core.bl.PerunBl; import cz.metacentrum.perun.core.impl.Utils; +import cz.metacentrum.perun.core.implApi.ExtSourceSimpleApi; import cz.metacentrum.perun.core.implApi.ExtSourcesManagerImplApi; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -278,7 +279,21 @@ public Candidate getCandidate(PerunSession sess, ExtSource source, String login) if (!AuthzResolver.authorizedInternal(sess, "getCandidate_ExtSource_String_policy", source)) throw new PrivilegeException(sess, "getCandidate"); - return new Candidate(getExtSourcesManagerBl().getCandidate(sess, source, login)); + try { + return new Candidate(getExtSourcesManagerBl().getCandidate(sess, source, login)); + + // we need to close the extsource here because we don't want to always do it in the BL layer + } finally { + if (source instanceof ExtSourceSimpleApi) { + try { + ((ExtSourceSimpleApi) source).close(); + } catch (ExtSourceUnsupportedOperationException e) { + // silently skip + } catch (Exception e) { + log.error("Failed to close connection to extsource", e); + } + } + } } @Override From a368f95845959a0252c4722752ff2a5ea23f1726 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 24 Aug 2021 13:52:05 +0000 Subject: [PATCH 6/9] chore(release): 3.29.3 ## [3.29.3](https://github.com/CESNET/perun/compare/v3.29.2...v3.29.3) (2021-08-24) ### Bug Fixes * **core:** correctly close connection to extSources ([c9c1498](https://github.com/CESNET/perun/commit/c9c14986e49afc9d636899c049a4fec230c2272c)) --- perun-auditlogger/pom.xml | 2 +- perun-auditparser/pom.xml | 2 +- perun-base/pom.xml | 2 +- perun-cabinet/pom.xml | 2 +- perun-cli-java/pom.xml | 2 +- perun-cli/Perun/Agent.pm | 2 +- perun-core/pom.xml | 2 +- perun-dispatcher/pom.xml | 2 +- perun-engine/pom.xml | 2 +- perun-ldapc/pom.xml | 2 +- perun-notification/pom.xml | 2 +- perun-openapi/openapi.yml | 2 +- perun-openapi/pom.xml | 2 +- perun-registrar-lib/pom.xml | 2 +- perun-rpc/pom.xml | 2 +- perun-scim/pom.xml | 2 +- perun-web-gui/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/perun-auditlogger/pom.xml b/perun-auditlogger/pom.xml index 17ae9833a5..a07e26c6a7 100644 --- a/perun-auditlogger/pom.xml +++ b/perun-auditlogger/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.2 + 3.29.3 cz.metacentrum.perun diff --git a/perun-auditparser/pom.xml b/perun-auditparser/pom.xml index 597736916a..1199c1723b 100644 --- a/perun-auditparser/pom.xml +++ b/perun-auditparser/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.2 + 3.29.3 cz.metacentrum.perun diff --git a/perun-base/pom.xml b/perun-base/pom.xml index b1a860b5f0..40550574c7 100644 --- a/perun-base/pom.xml +++ b/perun-base/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.2 + 3.29.3 cz.metacentrum.perun diff --git a/perun-cabinet/pom.xml b/perun-cabinet/pom.xml index 0b0ec87dad..341725587b 100644 --- a/perun-cabinet/pom.xml +++ b/perun-cabinet/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.2 + 3.29.3 cz.metacentrum.perun diff --git a/perun-cli-java/pom.xml b/perun-cli-java/pom.xml index 767e67ce11..ed50ae0b00 100644 --- a/perun-cli-java/pom.xml +++ b/perun-cli-java/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 3.29.2 + 3.29.3 cz.metacentrum.perun diff --git a/perun-cli/Perun/Agent.pm b/perun-cli/Perun/Agent.pm index 2a0699970b..8eb27e8b2a 100644 --- a/perun-cli/Perun/Agent.pm +++ b/perun-cli/Perun/Agent.pm @@ -1,5 +1,5 @@ package Perun::Agent; -my $agentVersion = '3.29.2'; +my $agentVersion = '3.29.3'; my $agentVersionMajor; if ($agentVersion !~ /^(\d+)(?{ $agentVersionMajor = $^N })\..*/i) { diff --git a/perun-core/pom.xml b/perun-core/pom.xml index cb4f1479e3..97a1d59368 100644 --- a/perun-core/pom.xml +++ b/perun-core/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.2 + 3.29.3 cz.metacentrum.perun diff --git a/perun-dispatcher/pom.xml b/perun-dispatcher/pom.xml index 158bcbc952..b023eb0167 100644 --- a/perun-dispatcher/pom.xml +++ b/perun-dispatcher/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.2 + 3.29.3 cz.metacentrum.perun diff --git a/perun-engine/pom.xml b/perun-engine/pom.xml index b691a2c033..786054f397 100644 --- a/perun-engine/pom.xml +++ b/perun-engine/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.2 + 3.29.3 cz.metacentrum.perun diff --git a/perun-ldapc/pom.xml b/perun-ldapc/pom.xml index 5f98cb39d4..6f731dc3f6 100644 --- a/perun-ldapc/pom.xml +++ b/perun-ldapc/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 3.29.2 + 3.29.3 cz.metacentrum.perun diff --git a/perun-notification/pom.xml b/perun-notification/pom.xml index c1f919cb93..dac9dfc0ae 100644 --- a/perun-notification/pom.xml +++ b/perun-notification/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.2 + 3.29.3 cz.metacentrum.perun diff --git a/perun-openapi/openapi.yml b/perun-openapi/openapi.yml index 0999f6360d..735f7d9ec0 100644 --- a/perun-openapi/openapi.yml +++ b/perun-openapi/openapi.yml @@ -1,7 +1,7 @@ openapi: 3.0.2 info: - version: 3.29.2 + version: 3.29.3 title: Perun RPC API description: Perun Remote Procedure Calls Application Programming Interface contact: diff --git a/perun-openapi/pom.xml b/perun-openapi/pom.xml index 257e6493ae..2a4cde91ce 100644 --- a/perun-openapi/pom.xml +++ b/perun-openapi/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 3.29.2 + 3.29.3 cz.metacentrum.perun diff --git a/perun-registrar-lib/pom.xml b/perun-registrar-lib/pom.xml index c44cc44edf..7fb669fa3a 100644 --- a/perun-registrar-lib/pom.xml +++ b/perun-registrar-lib/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.2 + 3.29.3 cz.metacentrum.perun diff --git a/perun-rpc/pom.xml b/perun-rpc/pom.xml index cb6c7ac561..2442765ee5 100644 --- a/perun-rpc/pom.xml +++ b/perun-rpc/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.2 + 3.29.3 cz.metacentrum.perun diff --git a/perun-scim/pom.xml b/perun-scim/pom.xml index 00dfa6a878..4c083263d9 100644 --- a/perun-scim/pom.xml +++ b/perun-scim/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.2 + 3.29.3 cz.metacentrum.perun diff --git a/perun-web-gui/pom.xml b/perun-web-gui/pom.xml index bf4ad773bd..2b3b5f1020 100644 --- a/perun-web-gui/pom.xml +++ b/perun-web-gui/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.2 + 3.29.3 cz.metacentrum.perun diff --git a/pom.xml b/pom.xml index bace1ec745..d6d187a7eb 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ cz.metacentrum perun - 3.29.2 + 3.29.3 pom From 72184ce93ba189492213be552cd049b81e30813d Mon Sep 17 00:00:00 2001 From: Vojtech Sassmann Date: Thu, 9 Sep 2021 17:34:39 +0200 Subject: [PATCH 7/9] fix(core): user correct authorization for getGroupAssignments * The resource parameter was not passed to the method which was used to filter returned groups. Therefore, all policies, which used the Resource or Facility object, were not evaluated correctly. --- .../metacentrum/perun/core/entry/ResourcesManagerEntry.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/perun-core/src/main/java/cz/metacentrum/perun/core/entry/ResourcesManagerEntry.java b/perun-core/src/main/java/cz/metacentrum/perun/core/entry/ResourcesManagerEntry.java index 784d603691..e0bc14e290 100644 --- a/perun-core/src/main/java/cz/metacentrum/perun/core/entry/ResourcesManagerEntry.java +++ b/perun-core/src/main/java/cz/metacentrum/perun/core/entry/ResourcesManagerEntry.java @@ -1332,7 +1332,9 @@ public List getGroupAssignments(PerunSession sess, Resource resou List filteredGroups = getResourcesManagerBl().getGroupAssignments(sess, resource, attrNames).stream() .filter(assignedGroup -> AuthzResolver.authorizedInternal(sess, - "filter-getGroupAssignments_Resource_policy", assignedGroup.getEnrichedGroup().getGroup())) + "filter-getGroupAssignments_Resource_policy", + assignedGroup.getEnrichedGroup().getGroup(), + resource)) .collect(Collectors.toList()); filteredGroups.forEach(assignedGroup -> From e48a54dca4b7e88caba1b5c87db4b2b2fec9a16b Mon Sep 17 00:00:00 2001 From: Vojtech Sassmann Date: Fri, 10 Sep 2021 09:20:57 +0200 Subject: [PATCH 8/9] fix(core): use correct authorization for getResourceAssignments * The group parameter was not passed to the method which was used to filter returned resources. Therefore, all policies, that used the Group object, were not evaluated correctly. --- .../metacentrum/perun/core/entry/ResourcesManagerEntry.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/perun-core/src/main/java/cz/metacentrum/perun/core/entry/ResourcesManagerEntry.java b/perun-core/src/main/java/cz/metacentrum/perun/core/entry/ResourcesManagerEntry.java index e0bc14e290..e48d365ce0 100644 --- a/perun-core/src/main/java/cz/metacentrum/perun/core/entry/ResourcesManagerEntry.java +++ b/perun-core/src/main/java/cz/metacentrum/perun/core/entry/ResourcesManagerEntry.java @@ -1310,7 +1310,9 @@ public List getResourceAssignments(PerunSession sess, Group gr List filteredResources = getResourcesManagerBl().getResourceAssignments(sess, group, attrNames).stream() .filter(assignedResource -> AuthzResolver.authorizedInternal(sess, - "filter-getResourceAssignments_Group_policy", assignedResource.getEnrichedResource().getResource())) + "filter-getResourceAssignments_Group_policy", + assignedResource.getEnrichedResource().getResource(), + group)) .collect(Collectors.toList()); filteredResources.forEach(assignedResource -> From f931ae45a886e0b2eefef65942a37f8bc7e1a0de Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 10 Sep 2021 08:34:16 +0000 Subject: [PATCH 9/9] chore(release): 3.29.4 ## [3.29.4](https://github.com/CESNET/perun/compare/v3.29.3...v3.29.4) (2021-09-10) ### Bug Fixes * **core:** use correct authorization for getResourceAssignments ([e48a54d](https://github.com/CESNET/perun/commit/e48a54dca4b7e88caba1b5c87db4b2b2fec9a16b)) * **core:** user correct authorization for getGroupAssignments ([72184ce](https://github.com/CESNET/perun/commit/72184ce93ba189492213be552cd049b81e30813d)) --- perun-auditlogger/pom.xml | 2 +- perun-auditparser/pom.xml | 2 +- perun-base/pom.xml | 2 +- perun-cabinet/pom.xml | 2 +- perun-cli-java/pom.xml | 2 +- perun-cli/Perun/Agent.pm | 2 +- perun-core/pom.xml | 2 +- perun-dispatcher/pom.xml | 2 +- perun-engine/pom.xml | 2 +- perun-ldapc/pom.xml | 2 +- perun-notification/pom.xml | 2 +- perun-openapi/openapi.yml | 2 +- perun-openapi/pom.xml | 2 +- perun-registrar-lib/pom.xml | 2 +- perun-rpc/pom.xml | 2 +- perun-scim/pom.xml | 2 +- perun-web-gui/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/perun-auditlogger/pom.xml b/perun-auditlogger/pom.xml index a07e26c6a7..903046339b 100644 --- a/perun-auditlogger/pom.xml +++ b/perun-auditlogger/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.3 + 3.29.4 cz.metacentrum.perun diff --git a/perun-auditparser/pom.xml b/perun-auditparser/pom.xml index 1199c1723b..1001bdb8fe 100644 --- a/perun-auditparser/pom.xml +++ b/perun-auditparser/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.3 + 3.29.4 cz.metacentrum.perun diff --git a/perun-base/pom.xml b/perun-base/pom.xml index 40550574c7..806f69be18 100644 --- a/perun-base/pom.xml +++ b/perun-base/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.3 + 3.29.4 cz.metacentrum.perun diff --git a/perun-cabinet/pom.xml b/perun-cabinet/pom.xml index 341725587b..f4558e6a20 100644 --- a/perun-cabinet/pom.xml +++ b/perun-cabinet/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.3 + 3.29.4 cz.metacentrum.perun diff --git a/perun-cli-java/pom.xml b/perun-cli-java/pom.xml index ed50ae0b00..11f22d70fa 100644 --- a/perun-cli-java/pom.xml +++ b/perun-cli-java/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 3.29.3 + 3.29.4 cz.metacentrum.perun diff --git a/perun-cli/Perun/Agent.pm b/perun-cli/Perun/Agent.pm index 8eb27e8b2a..43d5255580 100644 --- a/perun-cli/Perun/Agent.pm +++ b/perun-cli/Perun/Agent.pm @@ -1,5 +1,5 @@ package Perun::Agent; -my $agentVersion = '3.29.3'; +my $agentVersion = '3.29.4'; my $agentVersionMajor; if ($agentVersion !~ /^(\d+)(?{ $agentVersionMajor = $^N })\..*/i) { diff --git a/perun-core/pom.xml b/perun-core/pom.xml index 97a1d59368..8c9812f6eb 100644 --- a/perun-core/pom.xml +++ b/perun-core/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.3 + 3.29.4 cz.metacentrum.perun diff --git a/perun-dispatcher/pom.xml b/perun-dispatcher/pom.xml index b023eb0167..7c5ff0824d 100644 --- a/perun-dispatcher/pom.xml +++ b/perun-dispatcher/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.3 + 3.29.4 cz.metacentrum.perun diff --git a/perun-engine/pom.xml b/perun-engine/pom.xml index 786054f397..010b447a25 100644 --- a/perun-engine/pom.xml +++ b/perun-engine/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.3 + 3.29.4 cz.metacentrum.perun diff --git a/perun-ldapc/pom.xml b/perun-ldapc/pom.xml index 6f731dc3f6..e3a6ea1fd4 100644 --- a/perun-ldapc/pom.xml +++ b/perun-ldapc/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 3.29.3 + 3.29.4 cz.metacentrum.perun diff --git a/perun-notification/pom.xml b/perun-notification/pom.xml index dac9dfc0ae..be66a9263f 100644 --- a/perun-notification/pom.xml +++ b/perun-notification/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.3 + 3.29.4 cz.metacentrum.perun diff --git a/perun-openapi/openapi.yml b/perun-openapi/openapi.yml index 735f7d9ec0..1a07c7cd9e 100644 --- a/perun-openapi/openapi.yml +++ b/perun-openapi/openapi.yml @@ -1,7 +1,7 @@ openapi: 3.0.2 info: - version: 3.29.3 + version: 3.29.4 title: Perun RPC API description: Perun Remote Procedure Calls Application Programming Interface contact: diff --git a/perun-openapi/pom.xml b/perun-openapi/pom.xml index 2a4cde91ce..6660a6c17e 100644 --- a/perun-openapi/pom.xml +++ b/perun-openapi/pom.xml @@ -7,7 +7,7 @@ perun cz.metacentrum - 3.29.3 + 3.29.4 cz.metacentrum.perun diff --git a/perun-registrar-lib/pom.xml b/perun-registrar-lib/pom.xml index 7fb669fa3a..95a59debdf 100644 --- a/perun-registrar-lib/pom.xml +++ b/perun-registrar-lib/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.3 + 3.29.4 cz.metacentrum.perun diff --git a/perun-rpc/pom.xml b/perun-rpc/pom.xml index 2442765ee5..95608c85a9 100644 --- a/perun-rpc/pom.xml +++ b/perun-rpc/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.3 + 3.29.4 cz.metacentrum.perun diff --git a/perun-scim/pom.xml b/perun-scim/pom.xml index 4c083263d9..4fa1e89527 100644 --- a/perun-scim/pom.xml +++ b/perun-scim/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.3 + 3.29.4 cz.metacentrum.perun diff --git a/perun-web-gui/pom.xml b/perun-web-gui/pom.xml index 2b3b5f1020..b42b48f39c 100644 --- a/perun-web-gui/pom.xml +++ b/perun-web-gui/pom.xml @@ -6,7 +6,7 @@ perun cz.metacentrum - 3.29.3 + 3.29.4 cz.metacentrum.perun diff --git a/pom.xml b/pom.xml index d6d187a7eb..d23e115781 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ cz.metacentrum perun - 3.29.3 + 3.29.4 pom