From eed869f38b51140e9efa0c47f46b45481b8b97e4 Mon Sep 17 00:00:00 2001 From: Katarina Valalikova Date: Sun, 6 Nov 2016 12:59:39 +0100 Subject: [PATCH] metadata for nonce --- .../localization/Midpoint.properties | 3 ++- .../schema/constants/SchemaConstants.java | 4 ++++ .../lens/projector/CredentialsProcessor.java | 22 +++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties index b30b15bc03c..011c3d2c180 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint.properties @@ -3420,4 +3420,5 @@ PageXmlDataReview.aceEditorPanelTitle='{0}' historical xml data {1} PageLogin.selfRegistration=Sign up PageSelfRegistration.registration.failed.unsatisfied.registration.configuration=Registration process not allowed. Please contact system administrator. ObjectHistoryTabPanel.viewHistoricalObjectDataTitle=View object data -ObjectHistoryTabPanel.viewHistoricalObjectXmlTitle=View object xml \ No newline at end of file +ObjectHistoryTabPanel.viewHistoricalObjectXmlTitle=View object xml +PageRegistrationConfirmation.bad.credentials=Invalid username or password \ No newline at end of file diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java index 223118b4be1..b344690c812 100644 --- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java +++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java @@ -29,6 +29,7 @@ import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationType; import com.evolveum.midpoint.xml.ns._public.common.common_3.CredentialsType; import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.NonceType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationalStateType; import com.evolveum.midpoint.xml.ns._public.common.common_3.PasswordType; @@ -187,6 +188,9 @@ public abstract class SchemaConstants { public static final ItemPath PATH_PASSWORD = new ItemPath(C_CREDENTIALS, CredentialsType.F_PASSWORD); public static final ItemPath PATH_PASSWORD_VALUE = new ItemPath(C_CREDENTIALS, CredentialsType.F_PASSWORD, PasswordType.F_VALUE); + public static final ItemPath PATH_NONCE = new ItemPath(C_CREDENTIALS, CredentialsType.F_NONCE); + public static final ItemPath PATH_NONCE_VALUE = new ItemPath(C_CREDENTIALS, CredentialsType.F_NONCE, + NonceType.F_VALUE); public static final ItemPath PATH_ACTIVATION = new ItemPath(C_ACTIVATION); public static final ItemPath PATH_ACTIVATION_ADMINISTRATIVE_STATUS = new ItemPath(C_ACTIVATION, ActivationType.F_ADMINISTRATIVE_STATUS); diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java index ea5e1c83a93..7a203a7b9b7 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java @@ -85,6 +85,7 @@ public void processFocusCredentials(LensContext context XMLGregorianCalendar now, Task task, OperationResult result) throws ExpressionEvaluationException, ObjectNotFoundException, SchemaException, PolicyViolationException { processFocusPassword(context, now, task, result); + processFocusNonce(context, now, task, result); } private void processFocusPassword(LensContext context, XMLGregorianCalendar now, @@ -112,6 +113,27 @@ void processProjectionCredentials(LensContext context, passwordPolicyProcessor.processPasswordPolicy(projectionContext, context, task, result); } + + //for now just saving metadata + private void processFocusNonce(LensContext context, XMLGregorianCalendar now, + Task task, OperationResult result) throws ExpressionEvaluationException, ObjectNotFoundException, + SchemaException, PolicyViolationException { + + processFocusCredentialsCommon(context, SchemaConstants.PATH_NONCE, now, task, result); +// +// +// ObjectDelta focusDelta = focusContext.getDelta(); +// +// if (hasValueDelta(focusDelta, SchemaConstants.PATH_NONCE)) { +// Collection> metaDeltas = LensUtil.createModifyMetadataDeltas( +// context, SchemaConstants.PATH_NONCE.subPath(AbstractCredentialType.F_METADATA), +// focusContext.getObjectDefinition(), now, task); +// for (ItemDelta metaDelta : metaDeltas) { +// context.getFocusContext().swallowToSecondaryDelta(metaDelta); +// } +// } + + } private void processProjectionPassword(LensContext context, final LensProjectionContext projCtx, XMLGregorianCalendar now, Task task, OperationResult result)