Skip to content

[SYNCOPE-1751] moves random password generation to propagation task execution #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrea-patricelli merged 4 commits into from
Apr 14, 2023
Merged

[SYNCOPE-1751] moves random password generation to propagation task execution #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31d818f
[SYNCOPE-1751] initial implementation, needs test fixes
andrea-patricelli Apr 13, 2023
62c4c97
manages linked account without password propagation
andrea-patricelli Apr 14, 2023
5693096
Minor edits
ilgrosso Apr 14, 2023
391e1ab
Restoring working removal of __PASSWORD__ from MANDATORY_MISSING
ilgrosso Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,8 @@ public void issueSYNCOPE391() {

@Test
public void testPasswordGenerator() {
String password = passwordGenerator.generate(resourceDAO.find("ws-target-resource-nopropagation"));
String password = passwordGenerator.generate(resourceDAO.find("ws-target-resource-nopropagation"),
List.of(realmDAO.getRoot()));
assertNotNull(password);

User user = userDAO.find("c9b2dec2-00a7-4855-97c0-d854842b4b24");
Expand All @@ -270,7 +271,8 @@ public void testPasswordGenerator() {
@Test
public void passwordGeneratorFailing() {
assertThrows(IllegalArgumentException.class, () -> {
String password = passwordGenerator.generate(resourceDAO.find("ws-target-resource-nopropagation"));
String password = passwordGenerator.generate(resourceDAO.find("ws-target-resource-nopropagation"),
List.of(realmDAO.getRoot()));
assertNotNull(password);

User user = userDAO.find("c9b2dec2-00a7-4855-97c0-d854842b4b24");
Expand Down
9 changes: 0 additions & 9 deletions ...g-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultMappingManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
import org.apache.syncope.core.provisioning.java.utils.ConnObjectUtils;
import org.apache.syncope.core.provisioning.java.utils.MappingUtils;
import org.apache.syncope.core.spring.security.Encryptor;
import org.apache.syncope.core.spring.security.PasswordGenerator;
import org.identityconnectors.framework.common.FrameworkUtil;
import org.identityconnectors.framework.common.objects.Attribute;
import org.identityconnectors.framework.common.objects.AttributeBuilder;
Expand Down Expand Up @@ -135,8 +134,6 @@ public class DefaultMappingManager implements MappingManager {

protected final VirAttrCache virAttrCache;

protected final PasswordGenerator passwordGenerator;

protected final AnyUtilsFactory anyUtilsFactory;

protected final IntAttrNameParser intAttrNameParser;
Expand All @@ -153,7 +150,6 @@ public DefaultMappingManager(
final DerAttrHandler derAttrHandler,
final VirAttrHandler virAttrHandler,
final VirAttrCache virAttrCache,
final PasswordGenerator passwordGenerator,
final AnyUtilsFactory anyUtilsFactory,
final IntAttrNameParser intAttrNameParser) {

Expand All @@ -168,7 +164,6 @@ public DefaultMappingManager(
this.derAttrHandler = derAttrHandler;
this.virAttrHandler = virAttrHandler;
this.virAttrCache = virAttrCache;
this.passwordGenerator = passwordGenerator;
this.anyUtilsFactory = anyUtilsFactory;
this.intAttrNameParser = intAttrNameParser;
}
Expand Down Expand Up @@ -532,10 +527,6 @@ protected String getPasswordAttrValue(
}
}

if (passwordAttrValue == null && resource.isRandomPwdIfNotProvided()) {
passwordAttrValue = passwordGenerator.generate(resource);
}

return passwordAttrValue;
}

Expand Down
8 changes: 5 additions & 3 deletions ...ing-java/src/main/java/org/apache/syncope/core/provisioning/java/ProvisioningContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,6 @@ public VirAttrHandler virAttrHandler(
@ConditionalOnMissingBean
@Bean
public MappingManager mappingManager(
final PasswordGenerator passwordGenerator,
final AnyUtilsFactory anyUtilsFactory,
final AnyTypeDAO anyTypeDAO,
final UserDAO userDAO,
Expand All @@ -474,7 +473,6 @@ public MappingManager mappingManager(
derAttrHandler,
virAttrHandler,
virAttrCache,
passwordGenerator,
anyUtilsFactory,
intAttrNameParser);
}
Expand Down Expand Up @@ -559,12 +557,14 @@ public PropagationTaskExecutor propagationTaskExecutor(
final TaskDAO taskDAO,
final ExternalResourceDAO resourceDAO,
final PlainSchemaDAO plainSchemaDAO,
final RealmDAO realmDAO,
final NotificationManager notificationManager,
final AuditManager auditManager,
final TaskDataBinder taskDataBinder,
final OutboundMatcher outboundMatcher,
final PlainAttrValidationManager validator,
final ApplicationEventPublisher publisher) {
final ApplicationEventPublisher publisher,
final PasswordGenerator passwordGenerator) {

return new PriorityPropagationTaskExecutor(
connectorManager,
Expand All @@ -575,6 +575,7 @@ public PropagationTaskExecutor propagationTaskExecutor(
taskDAO,
resourceDAO,
plainSchemaDAO,
realmDAO,
notificationManager,
auditManager,
taskDataBinder,
Expand All @@ -583,6 +584,7 @@ public PropagationTaskExecutor propagationTaskExecutor(
outboundMatcher,
validator,
publisher,
passwordGenerator,
propagationTaskExecutorAsyncExecutor);
}

Expand Down
Loading