Release 3.1.6

- Less strict version check in CLI (prep. for 3.2.0).
- Fixed getFacilitiesByAttribute() for non string values.
- Added getAllowedRichGroupsWithAttributes() for Facilities.
- Added attribute searcher for resources and members.
- Added methods to get resources where user is admin.
- Updated attr module for eduPersonScopedAffiliationManuallyAssigned.
- LDAPc can handle entities with newlines in properties.
- Fixed passing boolean values to CHAR(1) column of Service object.

Author: zlamalp

perun-auditer-exporter/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>perun</artifactId>
 		<groupId>cz.metacentrum</groupId>
-		<version>3.1.5</version>
+		<version>3.1.6</version>
 	</parent>
 
 	<groupId>cz.metacentrum.perun</groupId>

perun-auditparser/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>perun</artifactId>
 		<groupId>cz.metacentrum</groupId>
-		<version>3.1.5</version>
+		<version>3.1.6</version>
 	</parent>
 
 	<groupId>cz.metacentrum.perun</groupId>

perun-base/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>perun</artifactId>
 		<groupId>cz.metacentrum</groupId>
-		<version>3.1.5</version>
+		<version>3.1.6</version>
 	</parent>
 
 	<groupId>cz.metacentrum.perun</groupId>

perun-base/src/main/java/cz/metacentrum/perun/rpc/deserializer/JsonDeserializer.java

@@ -41,7 +41,7 @@ public class JsonDeserializer extends Deserializer {
 	@JsonIgnoreProperties({"name","baseFriendlyName", "friendlyNameParameter", "entity", "beanName"})
 	private interface AttributeMixIn {}
 
-	@JsonIgnoreProperties({"name", "value", "baseFriendlyName", "friendlyNameParameter", "entity", "beanName"})
+	@JsonIgnoreProperties({"name", "value", "baseFriendlyName", "friendlyNameParameter", "entity", "beanName", "writable"})
 	private interface AttributeDefinitionMixIn {}
 
 	@JsonIgnoreProperties({"commonName", "displayName", "beanName", "specificUser", "majorSpecificType"})

perun-cabinet/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>perun</artifactId>
 		<groupId>cz.metacentrum</groupId>
-		<version>3.1.5</version>
+		<version>3.1.6</version>
 	</parent>
 
 	<groupId>cz.metacentrum.perun</groupId>

perun-cli/Perun/Agent.pm

@@ -1,5 +1,8 @@
 package Perun::Agent;
-my $agentVersion = '3.0.0';
+my $agentVersionMajor = '3';
+my $agentVersionMinor = '2';
+my $agentVersionPatch = '0';
+my $agentVersion = $agentVersionMajor . "." . $agentVersionMinor . "." . $agentVersionPatch;
 
 use strict;
 use warnings;
@@ -126,8 +129,8 @@ sub new {
 	}
 
 	# Check the version of the Perun server
-	if ($response->content !~ /Version: $agentVersion/) {
-		$response->content =~ m/Version: ([0-9]+.[0-9]+.[0-9]+)/;
+	if ($response->content !~ /Version: $agentVersionMajor.[0-9]+.[0-9]+/) {
+		$response->content =~ m/Version: ([0-9]+.[0-9]+.[0-9]+([^ ]*))/;
 		my $perunVersion = $1;
 		die Perun::Exception->fromHash( { type => WRONG_AGENT_VERSION, errorInfo =>
 					"Tools version $agentVersion, Perun version $perunVersion" } );

perun-core/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>perun</artifactId>
 		<groupId>cz.metacentrum</groupId>
-		<version>3.1.5</version>
+		<version>3.1.6</version>
 	</parent>
 
 	<groupId>cz.metacentrum.perun</groupId>

perun-core/src/main/java/cz/metacentrum/perun/core/api/FacilitiesManager.java

@@ -158,6 +158,23 @@ public interface FacilitiesManager {
 	 */
 	List<Group> getAllowedGroups(PerunSession perunSession, Facility facility, Vo specificVo, Service specificService) throws InternalErrorException, PrivilegeException, FacilityNotExistsException, ServiceNotExistsException, VoNotExistsException;
 
+	/**
+	 * Get all RichGroups which can use this facility (Groups must be assigned to Resource which belongs to this facility)
+	 * specificVo and specificService can choose concrete groups
+	 * if specificVo, specificService or both are null, they do not specific (all possible results are returned)
+	 * We also retrieve attributes specified by attrNames for each returned RichGroup.
+	 *
+	 * @param facility        searching for this facility
+	 * @param specificVo      specific only those results which are in specific VO (with null, all results)
+	 * @param specificService specific only those results, which have resource with assigned specific service (if null, all results)
+	 * @param attrNames       with each returned RichGroup we get also attributes specified by this list
+	 * @return list of allowed groups
+	 * @throws FacilityNotExistsException if facility not exist, return this exception
+	 * @throws ServiceNotExistsException  if service is not null and not exist
+	 * @throws VoNotExistsException       if vo is not null and not exist
+	 */
+	List<RichGroup> getAllowedRichGroupsWithAttributes(PerunSession perunSession, Facility facility, Vo specificVo, Service specificService, List<String> attrNames) throws InternalErrorException, PrivilegeException, FacilityNotExistsException, ServiceNotExistsException, VoNotExistsException;
+
 	/**
 	 * Return all users who can use this facility
 	 *

perun-core/src/main/java/cz/metacentrum/perun/core/api/ResourcesManager.java

@@ -793,6 +793,40 @@ public interface ResourcesManager {
 	 */
 	List<Resource> getResourcesWhereUserIsAdmin(PerunSession sess, User user) throws InternalErrorException, UserNotExistsException, PrivilegeException;
 
+	/**
+	 * Return all resources for the facility and the vo where user is authorized as resource manager.
+	 *
+	 * @param sess
+	 * @param facility the facility to which resources should be assigned to
+	 * @param vo the vo to which resources should be assigned to
+	 * @param authorizedUser user with resource manager role for all those resources
+	 * @return list of defined resources where user has role resource manager
+	 *
+	 * @throws InternalErrorException
+	 * @throws PrivilegeException
+	 * @throws UserNotExistsException
+	 * @throws FacilityNotExistsException
+	 * @throws VoNotExistsException
+	 */
+	List<Resource> getResourcesWhereUserIsAdmin(PerunSession sess, Facility facility, Vo vo, User authorizedUser) throws InternalErrorException, PrivilegeException, UserNotExistsException, FacilityNotExistsException, VoNotExistsException;
+
+	/**
+	 * Return all resources for the facility and the vo where the group is authorized as resource manager.
+	 *
+	 * @param sess
+	 * @param facility the facility to which resources should be assigned to
+	 * @param vo the vo to which resources should be assigned to
+	 * @param authorizedGroup group with resource manager role for all those resources
+	 * @return list of defined resources where groups has role resource manager
+	 *
+	 * @throws InternalErrorException
+	 * @throws PrivilegeException
+	 * @throws GroupNotExistsException
+	 * @throws FacilityNotExistsException
+	 * @throws VoNotExistsException
+	 */
+	List<Resource> getResourcesWhereGroupIsAdmin(PerunSession sess, Facility facility, Vo vo, Group authorizedGroup) throws InternalErrorException, PrivilegeException, GroupNotExistsException, FacilityNotExistsException, VoNotExistsException;
+
 	/**
 	 * Gets list of all group administrators of the Resource.
 	 *

perun-core/src/main/java/cz/metacentrum/perun/core/api/Searcher.java

@@ -133,4 +133,25 @@ public interface Searcher {
 	 * @throws WrongAttributeAssignmentException wrong attribute assignment
 	 */
 	List<Facility> getFacilities(PerunSession sess, Map<String, String> attributesWithSearchingValues) throws PrivilegeException, InternalErrorException, AttributeNotExistsException, WrongAttributeAssignmentException;
+
+	/**
+	 * This method get Map of Attributes with searching values and try to find all resources, which have specific attributes in format.
+	 * Better information about format below. When there are more than 1 attribute in Map, it means all must be true "looking for all of them" (AND)
+	 *
+	 * @param sess perun session
+	 * @param attributesWithSearchingValues map of attributes names
+	 *        when attribute is type String, so value is string and we are looking for total match (Partial is not supported now, will be supported later by symbol *)
+	 *        when attribute is type Integer, so value is integer in String and we are looking for total match
+	 *        when attribute is type List<String>, so value is String and we are looking for at least one total or partial matching element
+	 *        when attribute is type Map<String> so value is String in format "key=value" and we are looking total match of both or if is it "key" so we are looking for total match of key
+	 *        IMPORTANT: In map there is not allowed char '=' in key. First char '=' is delimiter in MAP item key=value!!!
+	 * @return list of resources that have attributes with specific values (behaviour above)
+	 *        if no such resource exists, returns empty list
+	 *
+	 * @throws PrivilegeException insufficient permission
+	 * @throws InternalErrorException internal error
+	 * @throws AttributeNotExistsException when specified attribute does not exist
+	 * @throws WrongAttributeAssignmentException wrong attribute assignment
+	 */
+	List<Resource> getResources(PerunSession sess, Map<String, String> attributesWithSearchingValues) throws PrivilegeException, InternalErrorException, AttributeNotExistsException, WrongAttributeAssignmentException;
 }