This is an automated email from the ASF dual-hosted git repository.

mmoayyed pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new 82deeee  cherry-pick from 2_1_X: check for presence of value before 
using Optional
82deeee is described below

commit 82deeeefb6c6d8b324e27de6f00de39959498850
Author: Misagh Moayyed <[email protected]>
AuthorDate: Thu Jan 30 16:15:54 2020 +0400

    cherry-pick from 2_1_X: check for presence of value before using Optional
---
 .../client/console/panels/ConnObjectListViewPanel.java |  2 +-
 .../client/console/wizards/any/AbstractAttrs.java      | 13 ++++++++++++-
 .../apache/syncope/core/logic/ReconciliationLogic.java |  5 ++++-
 .../core/provisioning/java/MappingManagerImpl.java     | 18 +++++++++++++-----
 .../provisioning/java/pushpull/InboundMatcher.java     |  2 +-
 .../syncope/core/spring/security/AuthDataAccessor.java | 17 +++++++++++++++--
 .../syncope/core/logic/saml2/SAML2UserManager.java     |  6 +++++-
 7 files changed, 51 insertions(+), 12 deletions(-)

diff --git 
a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
 
b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
index 3e959c0..338854f 100644
--- 
a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
+++ 
b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
@@ -184,7 +184,7 @@ public abstract class ConnObjectListViewPanel extends Panel 
{
                     Optional<Attr> attr =
                             bean.getAttrs().stream().filter(object -> 
object.getSchema().equals(key)).findAny();
 
-                    return !attr.isPresent() || 
attr.get().getValues().isEmpty()
+                    return attr.isEmpty() || attr.get().getValues().isEmpty()
                             ? new Label("field", StringUtils.EMPTY)
                             : new CollectionPanel("field", 
attr.get().getValues());
                 }
diff --git 
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
 
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
index a326681..48608f9 100644
--- 
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
+++ 
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
@@ -23,6 +23,7 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.syncope.client.console.rest.GroupRestClient;
@@ -33,14 +34,18 @@ import org.apache.syncope.common.lib.Attr;
 import org.apache.syncope.common.lib.to.EntityTO;
 import org.apache.syncope.common.lib.to.GroupTO;
 import org.apache.syncope.common.lib.to.MembershipTO;
+import org.apache.syncope.common.lib.to.TypeExtensionTO;
 import org.apache.wicket.WicketRuntimeException;
 import org.apache.wicket.core.util.lang.PropertyResolver;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.util.ListModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class AbstractAttrs<S extends SchemaTO> extends 
AbstractAttrsWizardStep<S> {
+    private static final Logger LOG = 
LoggerFactory.getLogger(AbstractAttrs.class);
 
     private static final long serialVersionUID = -5387344116983102292L;
 
@@ -105,7 +110,13 @@ public abstract class AbstractAttrs<S extends SchemaTO> 
extends AbstractAttrsWiz
     protected List<String> getMembershipAuxClasses(final MembershipTO 
membershipTO, final String anyType) {
         try {
             final GroupTO groupTO = 
groupRestClient.read(membershipTO.getGroupKey());
-            return groupTO.getTypeExtension(anyType).get().getAuxClasses();
+            Optional<TypeExtensionTO> typeExtension = 
groupTO.getTypeExtension(anyType);
+            if (typeExtension.isEmpty()) {
+                LOG.trace("Unable to locate type extension for " + anyType);
+                return Collections.emptyList();
+            }
+            return typeExtension.get().getAuxClasses();
+
         } catch (Exception e) {
             return List.of();
         }
diff --git 
a/core/idm/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java
 
b/core/idm/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java
index ec5976f..5c2f488 100644
--- 
a/core/idm/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java
+++ 
b/core/idm/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java
@@ -344,7 +344,7 @@ public class ReconciliationLogic extends 
AbstractTransactionalLogic<EntityTO> {
             Any<?> any = getAny(provision, query.getAnyKey());
             connObjectKeyValue = mappingManager.getConnObjectKeyValue(any, 
provision);
         }
-        if (!connObjectKeyValue.isPresent()) {
+        if (connObjectKeyValue.isEmpty()) {
             throw new NotFoundException(
                     "ConnObjectKey for " + provision.getAnyType().getKey()
                     + " on resource '" + provision.getResource().getKey() + 
"'");
@@ -353,6 +353,9 @@ public class ReconciliationLogic extends 
AbstractTransactionalLogic<EntityTO> {
         if (pullTask.getDestinationRealm() == null || 
realmDAO.findByFullPath(pullTask.getDestinationRealm()) == null) {
             throw new NotFoundException("Realm " + 
pullTask.getDestinationRealm());
         }
+        if (provision.getMapping().getConnObjectKeyItem().isEmpty()) {
+            throw new NotFoundException("ConnObjectKey cannot be determined 
for mapping " + provision.getMapping().getKey());
+        }
 
         SyncopeClientException sce = 
SyncopeClientException.build(ClientExceptionType.Reconciliation);
         try {
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
index e84d043..c2ef89a 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
@@ -851,7 +851,12 @@ public class MappingManagerImpl implements MappingManager {
     @Transactional(readOnly = true)
     @Override
     public Optional<String> getConnObjectKeyValue(final Any<?> any, final 
Provision provision) {
-        MappingItem mapItem = 
provision.getMapping().getConnObjectKeyItem().get();
+        Optional<? extends MappingItem> connObjectKeyItem = 
provision.getMapping().getConnObjectKeyItem();
+        if (connObjectKeyItem.isEmpty()) {
+             LOG.error("Unable to locate conn object key item for " + 
provision.getMapping().getKey());
+             return Optional.empty();
+        }
+        MappingItem mapItem = connObjectKeyItem.get();
         Pair<AttrSchemaType, List<PlainAttrValue>> intValues;
         try {
             intValues = getIntValues(provision,
@@ -873,10 +878,13 @@ public class MappingManagerImpl implements MappingManager 
{
     @Transactional(readOnly = true)
     @Override
     public Optional<String> getConnObjectKeyValue(final Realm realm, final 
OrgUnit orgUnit) {
-        OrgUnitItem orgUnitItem = orgUnit.getConnObjectKeyItem().get();
-
-        return Optional.ofNullable(Optional.of(orgUnitItem)
-                .map(unitItem -> getIntValue(realm, unitItem)).orElse(null));
+        Optional<? extends OrgUnitItem> connObjectKeyItem = 
orgUnit.getConnObjectKeyItem();
+        if (connObjectKeyItem.isEmpty()) {
+            LOG.error("Unable to locate conn object key item for " + 
orgUnit.getKey());
+            return Optional.empty();
+        }
+        OrgUnitItem orgUnitItem = connObjectKeyItem.get();
+        return Optional.ofNullable(getIntValue(realm, orgUnitItem));
     }
 
     @Transactional(readOnly = true)
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/InboundMatcher.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/InboundMatcher.java
index 3646a76..4c3ab19 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/InboundMatcher.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/InboundMatcher.java
@@ -119,7 +119,7 @@ public class InboundMatcher {
             final Connector connector) {
 
         Optional<? extends Provision> provision = 
resource.getProvision(anyType);
-        if (!provision.isPresent()) {
+        if (provision.isEmpty()) {
             return Optional.empty();
         }
 
diff --git 
a/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java
 
b/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java
index 38d5e0b..eb041ed 100644
--- 
a/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java
+++ 
b/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java
@@ -24,10 +24,13 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import org.apache.commons.lang3.ArrayUtils;
+import javax.security.auth.login.AccountNotFoundException;
+
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.syncope.common.keymaster.client.api.ConfParamOps;
@@ -39,6 +42,8 @@ import org.apache.syncope.common.lib.types.IdRepoEntitlement;
 import org.apache.syncope.core.persistence.api.ImplementationLookup;
 import org.apache.syncope.core.persistence.api.dao.AccessTokenDAO;
 import org.apache.syncope.core.persistence.api.dao.AnySearchDAO;
+import org.apache.syncope.core.persistence.api.entity.AnyType;
+import org.apache.syncope.core.persistence.api.entity.resource.Provision;
 import org.apache.syncope.core.persistence.api.dao.AnyTypeDAO;
 import org.apache.syncope.core.persistence.api.dao.GroupDAO;
 import org.apache.syncope.core.persistence.api.dao.RealmDAO;
@@ -231,8 +236,16 @@ public class AuthDataAccessor {
             ExternalResource resource = itor.next();
             String connObjectKey = null;
             try {
-                connObjectKey = mappingManager.getConnObjectKeyValue(
-                        user, 
resource.getProvision(anyTypeDAO.findUser()).get()).get();
+                AnyType userType = anyTypeDAO.findUser();
+                Optional<? extends Provision> provision = 
resource.getProvision(userType);
+                if (provision.isEmpty()) {
+                    throw new AccountNotFoundException("Unable to locate 
provision for user type " + userType.getKey());
+                }
+                Optional<String> connObjectKeyValue = 
mappingManager.getConnObjectKeyValue(user, provision.get());
+                if (connObjectKeyValue.isEmpty()) {
+                    throw new AccountNotFoundException("Unable to locate conn 
object key value for " + userType.getKey());
+                }
+                connObjectKey = connObjectKeyValue.get();
                 Uid uid = 
connFactory.getConnector(resource).authenticate(connObjectKey, password, null);
                 if (uid != null) {
                     authenticated = true;
diff --git 
a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2UserManager.java
 
b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2UserManager.java
index c3c0a3e..798b4aa 100644
--- 
a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2UserManager.java
+++ 
b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2UserManager.java
@@ -20,6 +20,7 @@ package org.apache.syncope.core.logic.saml2;
 
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -93,7 +94,10 @@ public class SAML2UserManager {
             LOG.warn("Invalid IdP: {}", idpKey);
             return List.of();
         }
-
+        if (idp.getConnObjectKeyItem().isEmpty()) {
+            LOG.warn("Unable to determine conn object key item for  IdP: {}", 
idpKey);
+            return Collections.emptyList();
+        }
         return inboundMatcher.matchByConnObjectKeyValue(
                 idp.getConnObjectKeyItem().get(), connObjectKeyValue, 
AnyTypeKind.USER, false, null).stream().
                 filter(match -> match.getAny() != null).

Reply via email to