Skip to content

Commit

Permalink
other improvements for self registration.. default role implementatio…
Browse files Browse the repository at this point in the history 
…n etc
  • Loading branch information
@katkav
katkav committed Oct 27, 2016
1 parent 34bd3ba commit fbc00b4
Show file tree
Hide file tree
Showing 5 changed files with 227 additions and 77 deletions.
9 changes: 9 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationBase.java
View file
@@ -1,8 +1,10 @@
package com.evolveum.midpoint.web.page.login;

import org.apache.wicket.RestartResponseException;
import org.apache.wicket.spring.injection.annot.SpringBean;

import com.evolveum.midpoint.gui.api.page.PageBase;
import com.evolveum.midpoint.model.api.AuthenticationEvaluator;
import com.evolveum.midpoint.schema.constants.SchemaConstants;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.task.api.Task;
Expand All @@ -21,6 +23,9 @@ public class PageRegistrationBase extends PageBase {

private static final Trace LOGGER = TraceManager.getTrace(PageSelfRegistration.class);

@SpringBean(name = "authenticationEvaluator")
private AuthenticationEvaluator authenticationEvaluator;

private SelfRegistrationDto selfRegistrationDto;

public PageRegistrationBase() {
Expand Down Expand Up @@ -77,5 +82,9 @@ public SelfRegistrationDto getSelfRegistrationConfiguration() {
return selfRegistrationDto;

}

public AuthenticationEvaluator getAuthenticationEvaluator() {
return authenticationEvaluator;
}

}
141 changes: 106 additions & 35 deletions ...-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java
View file
Expand Up @@ -14,33 +14,42 @@
import org.apache.wicket.util.string.StringValue;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.core.context.SecurityContextHolder;

import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
import com.evolveum.midpoint.model.api.AuthenticationEvaluator;
import com.evolveum.midpoint.prism.delta.ContainerDelta;
import com.evolveum.midpoint.prism.delta.ItemDelta;
import com.evolveum.midpoint.prism.delta.ObjectDelta;
import com.evolveum.midpoint.prism.delta.PropertyDelta;
import com.evolveum.midpoint.prism.path.ItemPath;
import com.evolveum.midpoint.schema.constants.ObjectTypes;
import com.evolveum.midpoint.schema.constants.SchemaConstants;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.schema.result.OperationResultStatus;
import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
import com.evolveum.midpoint.security.api.ConnectionEnvironment;
import com.evolveum.midpoint.security.api.MidPointPrincipal;
import com.evolveum.midpoint.security.api.SecurityUtil;
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.util.Producer;
import com.evolveum.midpoint.util.exception.SchemaException;
import com.evolveum.midpoint.web.application.PageDescriptor;
import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
import com.evolveum.midpoint.web.util.MidPointPageParametersEncoder;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.CredentialsType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.NonceType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;

import net.sf.jasperreports.components.map.ItemData;

//CONFIRMATION_LINK = "http://localhost:8080/midpoint/confirm/registration/";
@PageDescriptor(url = "/confirm", encoder = MidPointPageParametersEncoder.class)
public class PageRegistrationConfirmation extends PageRegistrationBase {

@SpringBean(name = "authenticationEvaluator")
private AuthenticationEvaluator authenticationEvaluator;

private static final String DOT_CLASS = PageRegistrationConfirmation.class.getName() + ".";

private static final String ID_LABEL_SUCCESS = "successLabel";
Expand Down Expand Up @@ -77,53 +86,115 @@ private void init(final PageParameters pageParameters) {
ConnectionEnvironment connEnv = new ConnectionEnvironment();
connEnv.setChannel(SchemaConstants.CHANNEL_GUI_SELF_REGISTRATION_URI);

OperationResult result = new OperationResult(OPERATION_FINISH_REGISTRATION);
UsernamePasswordAuthenticationToken token = null;
try {
token = authenticationEvaluator.authenticateUserNonce(connEnv,
userNameValue.toString(), tokenValue.toString(),
getSelfRegistrationConfiguration().getNoncePolicy());
} catch (AuthenticationException ex ) {
getSession().error(createStringResource("PageRegistrationConfirmation.bad.credentials").getString());
throw new RestartResponseException(PageLogin.class);
token = getAuthenticationEvaluator().authenticateUserNonce(connEnv, userNameValue.toString(),
tokenValue.toString(), getSelfRegistrationConfiguration().getNoncePolicy());
} catch (AuthenticationException ex) {
getSession()
.error(createStringResource("PageRegistrationConfirmation.bad.credentials").getString());
result.recordFatalError("Failed to validate user");
initLayout(result);
return;
}

final MidPointPrincipal principal = (MidPointPrincipal) token.getPrincipal();

OperationResult result = runPrivileged(new Producer<OperationResult>() {

final NonceType nonceClone = principal.getUser().getCredentials().getNonce().clone();

result = runPrivileged(new Producer<OperationResult>() {

@Override
public OperationResult run() {

Task task = createAnonymousTask(OPERATION_FINISH_REGISTRATION);

OperationResult result = new OperationResult(OPERATION_FINISH_REGISTRATION);

ObjectDelta<UserType> assignRoleDelta;
List<ObjectReferenceType> defaultRoles = getSelfRegistrationConfiguration().getDefaultRoles();
List<ContainerDelta<AssignmentType>> assignmentDeltas = new ArrayList<>(defaultRoles.size());

OperationResult result = new OperationResult("assignDefaultRoles");
Task task = createAnonymousTask("assignDefaultRoles");

ObjectDelta<UserType> userAssignmentsDelta;
try {
for (ObjectReferenceType defaultRole : defaultRoles) {
AssignmentType assignment = new AssignmentType();
assignment.setTargetRef(defaultRole);
getPrismContext().adopt(assignment);
assignmentDeltas.add(ContainerDelta.createModificationAdd(UserType.F_ASSIGNMENT,
UserType.class, getPrismContext(), assignment));
}
assignRoleDelta = ObjectDelta.createModifyDelta(principal.getOid(), assignmentDeltas,
UserType.class, getPrismContext());
assignRoleDelta.setPrismContext(getPrismContext());
userAssignmentsDelta = ObjectDelta.createModificationDeleteContainer(UserType.class, principal.getOid(), new ItemPath(UserType.F_CREDENTIALS, CredentialsType.F_NONCE), getPrismContext(), nonceClone);
} catch (SchemaException e) {
result.recordFatalError("Could not create delta");
return result;
}

WebModelServiceUtils.save(assignRoleDelta, result, task, PageRegistrationConfirmation.this);
result.computeStatus();
WebModelServiceUtils.save(userAssignmentsDelta, result, task, PageRegistrationConfirmation.this);
result.computeStatusIfUnknown();
return result;

}
});

// if (result.getS)

// final String oid = principal.getOid();
// result = runPrivileged(new Producer<OperationResult>() {
//
// @Override
// public OperationResult run() {
// OperationResult result = new OperationResult("assignDefaultRoles");
// Task task = createAnonymousTask("assignDefaultRoles");
// List<ContainerDelta<AssignmentType>> assignmentDelta = new ArrayList<ContainerDelta<AssignmentType>>();
// for (ObjectReferenceType defaultRole : getSelfRegistrationConfiguration().getDefaultRoles()) {
// AssignmentType assignment = new AssignmentType();
// assignment.setTargetRef(defaultRole);
// try {
// assignmentDelta.add(ContainerDelta.createModificationAdd(UserType.F_ASSIGNMENT, UserType.class, getPrismContext(), assignment));
// getPrismContext().adopt(assignment);
// } catch (SchemaException e) {
// //nothing to do
// }
//
// }
// ObjectDelta<UserType> userAssignmentsDelta = ObjectDelta.createModifyDelta(oid, assignmentDelta, UserType.class, getPrismContext());
// WebModelServiceUtils.save(userAssignmentsDelta, result, task, PageRegistrationConfirmation.this);
// result.computeStatusIfUnknown();
// return result;
// }
// });

// token = getAuthenticationEvaluator().authenticateUserNonce(connEnv, userNameValue.toString(),
// tokenValue.toString(), getSelfRegistrationConfiguration().getNoncePolicy());
// principal = (MidPointPrincipal) token.getPrincipal();
//
List<ItemDelta> userDeltas = new ArrayList<>();
// userDeltas.add(PropertyDelta.createModificationReplaceProperty(
// SchemaConstants.PATH_ACTIVATION_ADMINISTRATIVE_STATUS,
// principal.getUser().asPrismObject().getDefinition(), (ActivationStatusType) null));


SecurityContextHolder.getContext().setAuthentication(token);

if (nonceClone.getResetType() != null) {

Task task = createSimpleTask(OPERATION_FINISH_REGISTRATION);

ObjectDelta<UserType> assignRoleDelta = null;

try {
AssignmentType assignment = new AssignmentType();
assignment.setTargetRef(
ObjectTypeUtil.createObjectRef(nonceClone.getResetType(), ObjectTypes.ABSTRACT_ROLE));
getPrismContext().adopt(assignment);
userDeltas.add((ItemDelta) ContainerDelta.createModificationAdd(UserType.F_ASSIGNMENT,
UserType.class, getPrismContext(), assignment));

assignRoleDelta = ObjectDelta.createModifyDelta(principal.getOid(), userDeltas,
UserType.class, getPrismContext());
assignRoleDelta.setPrismContext(getPrismContext());
} catch (SchemaException e) {
result.recordFatalError("Could not create delta");
initLayout(result);
return;

}

WebModelServiceUtils.save(assignRoleDelta, result, task, PageRegistrationConfirmation.this);
result.computeStatusIfUnknown();

}
SecurityContextHolder.getContext().setAuthentication(null);




initLayout(result);
}

Expand Down

0 comments on commit fbc00b4

Please sign in to comment.