You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2019/11/22 13:54:58 UTC
[syncope] branch 2_1_X updated: [SYNCOPE-1499] Fix: usernames are
to be returned, not keys
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new d398241 [SYNCOPE-1499] Fix: usernames are to be returned, not keys
d398241 is described below
commit d3982415a2f88ecec3c82b0b08e590f1fb6ba27a
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Nov 22 14:52:37 2019 +0100
[SYNCOPE-1499] Fix: usernames are to be returned, not keys
---
.../java/org/apache/syncope/core/logic/oidc/OIDCUserManager.java | 3 ++-
.../src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java | 7 +++----
.../java/org/apache/syncope/core/logic/saml2/SAML2UserManager.java | 3 ++-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ext/oidcclient/logic/src/main/java/org/apache/syncope/core/logic/oidc/OIDCUserManager.java b/ext/oidcclient/logic/src/main/java/org/apache/syncope/core/logic/oidc/OIDCUserManager.java
index 633c841..4efc87a 100644
--- a/ext/oidcclient/logic/src/main/java/org/apache/syncope/core/logic/oidc/OIDCUserManager.java
+++ b/ext/oidcclient/logic/src/main/java/org/apache/syncope/core/logic/oidc/OIDCUserManager.java
@@ -37,6 +37,7 @@ import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.core.persistence.api.dao.UserDAO;
import org.apache.syncope.core.persistence.api.entity.OIDCProvider;
import org.apache.syncope.core.persistence.api.entity.OIDCProviderItem;
+import org.apache.syncope.core.persistence.api.entity.user.User;
import org.apache.syncope.core.provisioning.api.IntAttrName;
import org.apache.syncope.core.provisioning.api.OIDCProviderActions;
import org.apache.syncope.core.provisioning.api.UserProvisioningManager;
@@ -83,7 +84,7 @@ public class OIDCUserManager {
return inboundMatcher.matchByConnObjectKeyValue(
connObjectKeyItem, connObjectKeyValue, AnyTypeKind.USER, false, null).stream().
filter(match -> match.getAny() != null).
- map(match -> match.getAny().getKey()).
+ map(match -> ((User) match.getAny()).getUsername()).
collect(Collectors.toList());
}
diff --git a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
index f5e6ce1..aca5d7a 100644
--- a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
+++ b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
@@ -521,8 +521,8 @@ public class SAML2SPLogic extends AbstractSAML2Logic<EntityTO> {
if (idp.isUpdateMatching()) {
LOG.debug("About to update {} for {}", matchingUsers.get(0), keyValue);
- username = AuthContextUtils.execWithAuthContext(AuthContextUtils.getDomain(), ()
- -> userManager.update(matchingUsers.get(0), idp, responseTO));
+ username = AuthContextUtils.execWithAuthContext(AuthContextUtils.getDomain(),
+ () -> userManager.update(matchingUsers.get(0), idp, responseTO));
} else {
username = matchingUsers.get(0);
}
@@ -541,8 +541,7 @@ public class SAML2SPLogic extends AbstractSAML2Logic<EntityTO> {
byte[] authorities = null;
try {
authorities = ENCRYPTOR.encode(POJOHelper.serialize(
- authDataAccessor.getAuthorities(responseTO.getUsername())), CipherAlgorithm.AES).
- getBytes();
+ authDataAccessor.getAuthorities(responseTO.getUsername())), CipherAlgorithm.AES).getBytes();
} catch (Exception e) {
LOG.error("Could not fetch authorities", e);
}
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 ba8024f..6dc16fa 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
@@ -37,6 +37,7 @@ import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.core.persistence.api.dao.SAML2IdPDAO;
import org.apache.syncope.core.persistence.api.dao.UserDAO;
import org.apache.syncope.core.persistence.api.entity.SAML2IdP;
+import org.apache.syncope.core.persistence.api.entity.user.User;
import org.apache.syncope.core.provisioning.api.IntAttrName;
import org.apache.syncope.core.provisioning.api.SAML2IdPActions;
import org.apache.syncope.core.provisioning.api.UserProvisioningManager;
@@ -92,7 +93,7 @@ public class SAML2UserManager {
return inboundMatcher.matchByConnObjectKeyValue(
idp.getConnObjectKeyItem().get(), connObjectKeyValue, AnyTypeKind.USER, false, null).stream().
filter(match -> match.getAny() != null).
- map(match -> match.getAny().getKey()).
+ map(match -> ((User) match.getAny()).getUsername()).
collect(Collectors.toList());
}