Merge branch 'master' of https://github.com/Evolveum/midpoint

gui/admin-gui/src/main/resources/localization/Midpoint_it.properties

@@ -429,7 +429,7 @@ ItemApprovalPanel.itemThatWasApproved=Elemento che è stato considerato (ed è s
 ItemApprovalPanel.itemThatWasCompleted=Elemento completato
 ItemApprovalPanel.itemThatWasRejected=Elemento che è stato considerato (ed è stato RIFIUTATO)
 ItemApprovalPanel.itemToBeApproved=Elemento da approvare
-ItemHeaderPanel.experimentalFeature=Experimental feature
+ItemHeaderPanel.experimentalFeature=Funzionalità sperimentale
 JasperReportConfigurationPanel.addField=Aggiungi campo
 JasperReportConfigurationPanel.addParameter=Aggiungi parametro
 JasperReportConfigurationPanel.deleteField=Elimina campo
@@ -480,10 +480,10 @@ LimitationsEditorDialog.label.presentation=Presentazione
 LimitationsEditorDialog.label.propertyAccess=Proprietà di accesso
 LimitationsEditorDialog.label.read=Leggi
 LimitationsEditorDialog.label.schema=Schema
-ListContainersPopup.selected=Selected
-ListContainersPopup.name=Name of container
+ListContainersPopup.selected=Selezionato
+ListContainersPopup.name=Nome del contenitore
 ListContainerPopup.select=Seleziona
-ListContainersPopup.availableContainers=Available Containers
+ListContainersPopup.availableContainers=Contenitori disponibili
 logger.duplicate=Il logger con nome '{0}' è già definito
 logger.emptyLogger=Il logger non può essere vuoto
 LoggingConfigPanel.appender=Appender
@@ -539,7 +539,7 @@ lower.ActivationStatusType.ARCHIVED=archiviato
 lower.ActivationStatusType.DISABLED=disabilitato
 lower.ActivationStatusType.ENABLED=abilitato
 lower.ActivationStatusType.null=non definito
-lower.LockoutStatusType.LOCKED=locked
+lower.LockoutStatusType.LOCKED=bloccato
 mainForm.category.null=Tutti
 mainForm.mailServer.nullValid=Scegline uno
 mainForm.state.null=Tutti
@@ -650,8 +650,8 @@ NotificationsStatistics.MinTime=Minimo
 NotificationsStatistics.TotalTime=Tempo totale
 NotificationsStatistics.Transport=Trasporto
 nullValid=Scegline uno
-ContainerListDataProvider.message.listContainers.fatalError=Couldn't list containers
-ContainerListDataProvider.message.countContainers.fatalError=Couldn't count containers
+ContainerListDataProvider.message.listContainers.fatalError=Impossibile elencare i contenitori
+ContainerListDataProvider.message.countContainers.fatalError=Impossibile contare i contenitori
 ObjectDataProvider.message.listObjects.fatalError=Impossibile elencare gli oggetti
 ObjectDataProvider.message.countObjects.fatalError=Impossibile contare gli oggetti.
 ObjectDataProvider.message.loadResourceForAccount.fatalError=Impossibile caricare la risorsa per l'account.
@@ -1024,7 +1024,7 @@ OrgUnitBrowser.search=Ricerca
 OrgUnitBrowser.title=Scegli nuovo padre per la org. unit
 PageAbout.allRightsReserved=©2014 Evolveum.
 PageAbout.button.testProvisioning=Provisioning self test
-PageAbout.button.checkWorkflowProcesses=Check workflow processes
+PageAbout.button.checkWorkflowProcesses=Controlla i processi del flusso di lavoro
 PageAbout.button.testRepositoryCheckOrgClosure=Controlla e ripara la coerenza della chiusura organizzativa
 PageAbout.button.reindexRepositoryObjects=Reindicizza oggetti del repository
 PageAbout.button.testRepository=Repository self test
@@ -1174,7 +1174,7 @@ PageAdmin.menu.top.workItems.listProcessInstancesAll=Tutte le richieste
 PageAdmin.menu.top.workItems.listProcessInstancesRequestedBy=Mie richieste
 PageAdmin.menu.top.workItems.listProcessInstancesRequestedFor=Richieste che mi riguardano
 PageAdmin.menu.top.workItems=Work items
-PageAdmin.menu.top.cases=Cases
+PageAdmin.menu.top.cases=Casi
 PageAdmin.menu.top.workItems.listAttorney=Elementi del procuratore
 PageAdmin.menu.top.caseWorkItems.list=I miei oggetti di lavoro
 PageAdmin.menu.top.caseWorkItems.listAll=Tutti gli elementi di lavoro

infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2018 Evolveum
+ * Copyright (c) 2010-2019 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinition;
 import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinitionImpl;
 import com.evolveum.midpoint.schema.processor.ResourceAttributeContainer;
+import com.evolveum.midpoint.schema.processor.SearchHierarchyScope;
 import com.evolveum.midpoint.schema.util.SchemaDebugUtil;
 import com.evolveum.midpoint.util.DebugUtil;
 import com.evolveum.midpoint.util.QNameUtil;
@@ -309,6 +310,11 @@ public ObjectClassComplexTypeDefinition getObjectClassDefinition() {
 	public ResourceObjectReferenceType getBaseContext() {
 		return structuralObjectClassDefinition.getBaseContext();
 	}
+
+	@Override
+	public SearchHierarchyScope getSearchHierarchyScope() {
+		return structuralObjectClassDefinition.getSearchHierarchyScope();
+	}
 
 	@Override
 	public ResourceObjectVolatilityType getVolatility() {

infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2018 Evolveum
+ * Copyright (c) 2010-2019 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -629,6 +629,11 @@ public RefinedObjectClassDefinition deepClone(Map<QName, ComplexTypeDefinition>
     public ResourceObjectReferenceType getBaseContext() {
 		return refinedObjectClassDefinition.getBaseContext();
 	}
+
+	@Override
+	public SearchHierarchyScope getSearchHierarchyScope() {
+		return refinedObjectClassDefinition.getSearchHierarchyScope();
+	}
 
 	@Override
 	public ResourceObjectVolatilityType getVolatility() {

infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java

@@ -24,6 +24,7 @@
 import com.evolveum.midpoint.prism.util.ItemPathTypeUtil;
 import com.evolveum.midpoint.schema.ResourceShadowDiscriminator;
 import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinition;
+import com.evolveum.midpoint.schema.processor.SearchHierarchyScope;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.CapabilityType;
 import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.PagedSearchCapabilityType;
@@ -123,6 +124,8 @@ default Collection<? extends RefinedAttributeDefinition<?>> getAllIdentifiers()
 	boolean isDefault();
 
 	ResourceObjectReferenceType getBaseContext();
+
+	SearchHierarchyScope getSearchHierarchyScope();
 
 	String getHumanReadableName();
 

infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java

@@ -78,6 +78,7 @@ public class RefinedObjectClassDefinitionImpl implements RefinedObjectClassDefin
 	@NotNull private final List<RefinedAttributeDefinition<?>> secondaryIdentifiers = new ArrayList<>();
 	@NotNull private final List<ResourceObjectPattern> protectedObjectPatterns = new ArrayList<>();
 	private ResourceObjectReferenceType baseContext;
+	private SearchHierarchyScope searchHierarchyScope;
 	private RefinedAttributeDefinition<?> displayNameAttributeDefinition;
 	private RefinedAttributeDefinition<?> namingAttributeDefinition;
 	private RefinedAttributeDefinition<?> descriptionAttributeDefinition;
@@ -288,6 +289,15 @@ public ResourceObjectReferenceType getBaseContext() {
 	private void setBaseContext(ResourceObjectReferenceType baseContext) {
 		this.baseContext = baseContext;
 	}
+
+	@Override
+	public SearchHierarchyScope getSearchHierarchyScope() {
+		return searchHierarchyScope;
+	}
+
+	public void setSearchHierarchyScope(SearchHierarchyScope searchHierarchyScope) {
+		this.searchHierarchyScope = searchHierarchyScope;
+	}
 
 	@Override
 	public String getIntent() {
@@ -551,11 +561,15 @@ public AttributeFetchStrategyType getActivationFetchStrategy(QName propertyName)
 	//region Capabilities ========================================================
 	@Override
 	public CapabilitiesType getCapabilities() {
+    	if (schemaHandlingObjectTypeDefinitionType == null) {
+    		return null;
+		}
+
     	CapabilityCollectionType configuredCapabilities = schemaHandlingObjectTypeDefinitionType.getConfiguredCapabilities();
 		if (configuredCapabilities == null) {
 			return null;
 		}
-		CapabilitiesType capabilitiesType = new CapabilitiesType();
+		CapabilitiesType capabilitiesType = new CapabilitiesType(getPrismContext());
 		capabilitiesType.setConfigured(configuredCapabilities);
 		return  capabilitiesType;
 	}
@@ -1015,6 +1029,19 @@ private static RefinedObjectClassDefinition parseRefinedObjectClass(ResourceObje
         if (rOcDef.schemaHandlingObjectTypeDefinitionType.getBaseContext() != null) {
         	rOcDef.setBaseContext(rOcDef.schemaHandlingObjectTypeDefinitionType.getBaseContext());
         }
+
+        if (rOcDef.schemaHandlingObjectTypeDefinitionType.getSearchHierarchyScope() != null) {
+        	switch (rOcDef.schemaHandlingObjectTypeDefinitionType.getSearchHierarchyScope()) {
+        		case ONE:
+        			rOcDef.setSearchHierarchyScope(SearchHierarchyScope.ONE);
+        			break;
+        		case SUB:
+        			rOcDef.setSearchHierarchyScope(SearchHierarchyScope.SUB);
+        			break;
+        		default:
+        			throw new SchemaException("Unknown search hierarchy scope: "+rOcDef.schemaHandlingObjectTypeDefinitionType.getSearchHierarchyScope());
+        	}
+        }
 
         return rOcDef;
 	}
@@ -1224,6 +1251,7 @@ public int hashCode() {
 		result = prime * result + attributeDefinitions.hashCode();
 		result = prime * result + auxiliaryObjectClassDefinitions.hashCode();
 		result = prime * result + ((baseContext == null) ? 0 : baseContext.hashCode());
+		result = prime * result + ((searchHierarchyScope == null) ? 0 : searchHierarchyScope.hashCode());
 		result = prime * result + ((description == null) ? 0 : description.hashCode());
 		result = prime * result + ((displayName == null) ? 0 : displayName.hashCode());
 		result = prime * result
@@ -1270,6 +1298,13 @@ public boolean equals(Object obj) {
 		} else if (!baseContext.equals(other.baseContext)) {
 			return false;
 		}
+		if (searchHierarchyScope == null) {
+			if (other.searchHierarchyScope != null) {
+				return false;
+			}
+		} else if (!searchHierarchyScope.equals(other.searchHierarchyScope)) {
+			return false;
+		}
 		if (description == null) {
 			if (other.description != null) {
 				return false;

infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SearchHierarchyScope.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015 Evolveum
+ * Copyright (c) 2015-2019 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,5 +20,16 @@
  *
  */
 public enum SearchHierarchyScope {
-	ONE, SUBTREE;
+	ONE("one"), SUB("sub");
+
+	private final String scopeString;
+
+	private SearchHierarchyScope(String scopeString) {
+		this.scopeString = scopeString;
+	}
+
+	public String getScopeString() {
+		return scopeString;
+	}
+
 }

infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

@@ -6598,6 +6598,18 @@
                     </xsd:documentation>
                 </xsd:annotation>
             </xsd:element>
+            <xsd:element name="searchHierarchyScope" type="tns:SearchHierarchyScopeType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Definition of search hierarchy scope. It specifies how "deep" the search should go
+                        into the object hierarchy. It is only applicable to resources that support hierarchical
+                        organization of objects (e.g. LDAP resources).
+                    </xsd:documentation>
+                    <xsd:appinfo>
+                    	<a:since>4.0</a:since>
+                    </xsd:appinfo>
+                </xsd:annotation>
+            </xsd:element>
             <xsd:element name="attribute" minOccurs="0" maxOccurs="unbounded"
                          type="tns:ResourceAttributeDefinitionType">
                 <xsd:annotation>
@@ -6712,6 +6724,41 @@
              </xsd:element>
         </xsd:sequence>
     </xsd:complexType>
+
+    <xsd:simpleType name="SearchHierarchyScopeType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Definition of search hierarchy scope. It specifies how "deep" the search should go
+                into the object hierarchy. It is only applicable to resources that support hierarchical
+                organization of objects (e.g. LDAP resources).
+            </xsd:documentation>
+            <xsd:appinfo>
+            	<a:since>4.0</a:since>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="sub">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Subtree search. The search go deep down the hierarchy, as deep as possible.
+                    </xsd:documentation>
+                    <xsd:appinfo>
+                        <jaxb:typesafeEnumMember name="SUB"/>
+                    </xsd:appinfo>
+                </xsd:annotation>
+            </xsd:enumeration>
+            <xsd:enumeration value="one">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        One-level search. The search is reaching just one level below the base context object.
+                    </xsd:documentation>
+                    <xsd:appinfo>
+                        <jaxb:typesafeEnumMember name="ONE"/>
+                    </xsd:appinfo>
+                </xsd:annotation>
+            </xsd:enumeration>
+        </xsd:restriction>
+    </xsd:simpleType>
 
     <xsd:complexType name="ResourceConsistencyType">
         <xsd:annotation>

provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2017 Evolveum
+ * Copyright (c) 2010-2019 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -239,17 +239,7 @@ private <S extends ShadowType,T> void postProcessEntitlementEntitlementToSubject
 
 		AttributesToReturn attributesToReturn = ProvisioningUtil.createAttributesToReturn(entitlementCtx);
 
-		SearchHierarchyConstraints searchHierarchyConstraints = null;
-		ResourceObjectReferenceType baseContextRef = entitlementDef.getBaseContext();
-		if (baseContextRef != null) {
-			// TODO: this should be done once per search. Not in every run of postProcessEntitlementEntitlementToSubject
-			// this has to go outside of this method
-			PrismObject<ShadowType> baseContextShadow = resourceObjectReferenceResolver.resolve(subjectCtx, baseContextRef,
-					null, "base context specification in "+entitlementDef, parentResult);
-			RefinedObjectClassDefinition baseContextObjectClassDefinition = subjectCtx.getRefinedSchema().determineCompositeObjectClassDefinition(baseContextShadow);
-			ResourceObjectIdentification baseContextIdentification =  ShadowUtil.getResourceObjectIdentification(baseContextShadow, baseContextObjectClassDefinition);
-			searchHierarchyConstraints = new SearchHierarchyConstraints(baseContextIdentification, null);
-		}
+		SearchHierarchyConstraints searchHierarchyConstraints = determineSearchHierarchyConstraints(entitlementCtx, parentResult);
 
 		ShadowResultHandler handler = new ShadowResultHandler() {
 			@Override
@@ -452,15 +442,7 @@ public <T> void collectEntitlementsAsObjectOperationDelete(ProvisioningContext s
 
 				AttributesToReturn attributesToReturn = ProvisioningUtil.createAttributesToReturn(entitlementCtx);
 
-				SearchHierarchyConstraints searchHierarchyConstraints = null;
-				ResourceObjectReferenceType baseContextRef = entitlementOcDef.getBaseContext();
-				if (baseContextRef != null) {
-					PrismObject<ShadowType> baseContextShadow = resourceObjectReferenceResolver.resolve(subjectCtx,
-							baseContextRef, null, "base context specification in "+entitlementOcDef, parentResult);
-					RefinedObjectClassDefinition baseContextObjectClassDefinition = subjectCtx.getRefinedSchema().determineCompositeObjectClassDefinition(baseContextShadow);
-					ResourceObjectIdentification baseContextIdentification =  ShadowUtil.getResourceObjectIdentification(baseContextShadow, baseContextObjectClassDefinition);
-					searchHierarchyConstraints = new SearchHierarchyConstraints(baseContextIdentification, null);
-				}
+				SearchHierarchyConstraints searchHierarchyConstraints = determineSearchHierarchyConstraints(entitlementCtx, parentResult);
 
 				ShadowResultHandler handler = new ShadowResultHandler() {
 					@Override
@@ -781,5 +763,26 @@ private ResourceAttributeContainer getIdentifiersAttributeContainer(PrismContain
 		return attributesContainer;
 	}
 
-
+	// This is perhaps not the best place for this method. It has nothing to do with entitlements.
+	// But given class dependencies this is a very convenient place. Let's leave it here for now.
+	public SearchHierarchyConstraints determineSearchHierarchyConstraints(final ProvisioningContext ctx, OperationResult parentResult) throws SchemaException, ConfigurationException, ObjectNotFoundException, CommunicationException, ExpressionEvaluationException, SecurityViolationException {
+		RefinedObjectClassDefinition objectClassDef = ctx.getObjectClassDefinition();
+		SearchHierarchyConstraints searchHierarchyConstraints = null;
+		ResourceObjectReferenceType baseContextRef = objectClassDef.getBaseContext();
+		ResourceObjectIdentification baseContextIdentification = null;
+		if (baseContextRef != null) {
+			PrismObject<ShadowType> baseContextShadow = resourceObjectReferenceResolver.resolve(ctx, baseContextRef, null, "base context specification in "+objectClassDef, parentResult);
+			if (baseContextShadow == null) {
+				throw new ObjectNotFoundException("No base context defined by "+baseContextRef+" in base context specification in "+objectClassDef);
+			}
+			RefinedObjectClassDefinition baseContextObjectClassDefinition = ctx.getRefinedSchema().determineCompositeObjectClassDefinition(baseContextShadow);
+			baseContextIdentification =  ShadowUtil.getResourceObjectIdentification(baseContextShadow, baseContextObjectClassDefinition);
+		}
+
+		SearchHierarchyScope scope = objectClassDef.getSearchHierarchyScope();
+		if (baseContextIdentification == null && scope == null) {
+			return null;
+		}
+		return new SearchHierarchyConstraints(baseContextIdentification, scope);
+	}
 }

provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java

@@ -1265,17 +1265,7 @@ public SearchResultMetadata searchResourceObjects(final ProvisioningContext ctx,
 
 		RefinedObjectClassDefinition objectClassDef = ctx.getObjectClassDefinition();
 		AttributesToReturn attributesToReturn = ProvisioningUtil.createAttributesToReturn(ctx);
-		SearchHierarchyConstraints searchHierarchyConstraints = null;
-		ResourceObjectReferenceType baseContextRef = objectClassDef.getBaseContext();
-		if (baseContextRef != null) {
-			PrismObject<ShadowType> baseContextShadow = resourceObjectReferenceResolver.resolve(ctx, baseContextRef, null, "base context specification in "+objectClassDef, parentResult);
-			if (baseContextShadow == null) {
-				throw new ObjectNotFoundException("No base context defined by "+baseContextRef+" in base context specification in "+objectClassDef);
-			}
-			RefinedObjectClassDefinition baseContextObjectClassDefinition = ctx.getRefinedSchema().determineCompositeObjectClassDefinition(baseContextShadow);
-			ResourceObjectIdentification baseContextIdentification =  ShadowUtil.getResourceObjectIdentification(baseContextShadow, baseContextObjectClassDefinition);
-			searchHierarchyConstraints = new SearchHierarchyConstraints(baseContextIdentification, null);
-		}
+		SearchHierarchyConstraints searchHierarchyConstraints = entitlementConverter.determineSearchHierarchyConstraints(ctx, parentResult);
 
 		if (InternalsConfig.consistencyChecks && query != null && query.getFilter() != null) {
 			query.getFilter().checkConsistence(true);
@@ -2564,7 +2554,7 @@ private void computeResultStatus(OperationResult parentResult) {
 
 	private <C extends CapabilityType> void checkForCapability(ProvisioningContext ctx, Class<C> capabilityClass, OperationResult result) throws ObjectNotFoundException, SchemaException, CommunicationException, ConfigurationException, ExpressionEvaluationException {
 		C capability = ctx.getEffectiveCapability(capabilityClass);
-		if (capability == null) {
+		if (capability == null || BooleanUtils.isFalse(capability.isEnabled())) {
 			UnsupportedOperationException e = new UnsupportedOperationException("Operation not supported "+ctx.getDesc()+" as "+capabilityClass.getSimpleName()+" is missing");
 			if (result != null) {
 				result.recordFatalError(e);