UY-1520 CR-1308 fixes

Author: ppiernik

oauth/src/main/java/pl/edu/icm/unity/oauth/as/webauthz/ASConsentDeciderServlet.java

@@ -213,7 +213,7 @@ protected void autoReplay(OAuthClientSettings clientPreferences, OAuthAuthzConte
 			Collection<DynamicAttribute> attributes =  OAuthProcessor.filterAttributes(userInfo,
 					oauthCtx.getEffectiveRequestedAttrs());
 			Set<DynamicAttribute> filteredAttributes = AttributeValueFilter.filterAttributes(oauthCtx.getClaimValueFilters(), attributes);
-			ACRConsistencyValidator.verifyACRAttribute(oauthCtx, filteredAttributes);
+			EssentialACRConsistencyValidator.verifyEssentialRequestedACRisReturned(oauthCtx, filteredAttributes);
 			respDoc = oauthProcessor.prepareAuthzResponseAndRecordInternalState(filteredAttributes, selectedIdentity, oauthCtx,
 					statReporter, InvocationContext.getCurrent().getLoginSession().getAuthenticationTime(), oauthCtx.getClaimValueFilters());
 		} catch (OAuthErrorResponseException e)

oauth/src/main/java/pl/edu/icm/unity/oauth/as/webauthz/ACRConsistencyValidator.java renamed to oauth/src/main/java/pl/edu/icm/unity/oauth/as/webauthz/EssentialACRConsistencyValidator.java

@@ -18,19 +18,19 @@
 import pl.edu.icm.unity.oauth.as.OAuthAuthzContext;
 import pl.edu.icm.unity.oauth.as.OAuthErrorResponseException;
 
-public class ACRConsistencyValidator
+public class EssentialACRConsistencyValidator
 {
-	static void verifyACRAttribute(OAuthAuthzContext ctx, Collection<DynamicAttribute> attributes) throws OAuthErrorResponseException
+	static void verifyEssentialRequestedACRisReturned(OAuthAuthzContext ctx, Collection<DynamicAttribute> attributes) throws OAuthErrorResponseException
 	{
 		if (ctx.getAcr().isEmpty())
 			return;
 		if (ctx.getAcr().getEssentialACRs() == null || ctx.getAcr().getEssentialACRs().isEmpty())
 			return;
-		Optional<DynamicAttribute> any = attributes.stream().filter(a -> a.getAttribute().getName().equals(IDTokenClaimsSet.ACR_CLAIM_NAME)).findAny();
+		Optional<DynamicAttribute> acrAttribute = attributes.stream().filter(a -> a.getAttribute().getName().equals(IDTokenClaimsSet.ACR_CLAIM_NAME)).findAny();
 
-		if (any.isPresent())
+		if (acrAttribute.isPresent())
 		{
-			if (any.get().getAttribute().getValues().containsAll(ctx.getAcr().getEssentialACRs().stream().map(acr -> acr.getValue()).toList()))
+			if (acrAttribute.get().getAttribute().getValues().containsAll(ctx.getAcr().getEssentialACRs().stream().map(acr -> acr.getValue()).toList()))
 				return;
 		}	
 

oauth/src/main/java/pl/edu/icm/unity/oauth/as/webauthz/OAuthAuthzView.java

@@ -208,7 +208,7 @@ private void activeValueSelectionAndConsentStage(OAuthAuthzContext ctx, OAuthASP
 
 		try
 		{
-			ACRConsistencyValidator.verifyACRAttribute(ctx, filteredByClaimAttributes);
+			EssentialACRConsistencyValidator.verifyEssentialRequestedACRisReturned(ctx, filteredByClaimAttributes);
 		} catch (OAuthErrorResponseException e)
 		{
 			oauthResponseHandler.returnOauthResponseNotThrowingAndReportStatistic(e.getOauthResponse(), false, ctx,

oauth/src/test/java/pl/edu/icm/unity/oauth/as/webauthz/ACRConsistencyValidatorTest.java renamed to oauth/src/test/java/pl/edu/icm/unity/oauth/as/webauthz/EssentialACRConsistencyValidatorTest.java

@@ -25,7 +25,7 @@
 import pl.edu.icm.unity.oauth.as.OAuthAuthzContext;
 import pl.edu.icm.unity.oauth.as.OAuthErrorResponseException;
 
-public class ACRConsistencyValidatorTest
+public class EssentialACRConsistencyValidatorTest
 {
 	@Test
 	public void shouldThrowExceptionWhenReturnedACRNotContainsRequestedACR() throws OAuthErrorResponseException, URISyntaxException
@@ -34,7 +34,7 @@ public void shouldThrowExceptionWhenReturnedACRNotContainsRequestedACR() throws
 		context.setAcr(new ACRRequest(List.of(new ACR("essentialACR1")), null));
 		context.setReturnURI(new URI("return"));
 		List<DynamicAttribute> attrs = List.of(new DynamicAttribute(new Attribute("acr", null, null, List.of("acr1"))));
-		assertThrows(OAuthErrorResponseException.class, () -> ACRConsistencyValidator.verifyACRAttribute(context, attrs));
+		assertThrows(OAuthErrorResponseException.class, () -> EssentialACRConsistencyValidator.verifyEssentialRequestedACRisReturned(context, attrs));
 	}
 
 	@Test
@@ -44,7 +44,7 @@ public void shouldValidateSuccessfulltWhenACRContainsRequestedACR() throws OAuth
 		context.setAcr(new ACRRequest(List.of(new ACR("essentialACR1")), null));
 		context.setReturnURI(new URI("return"));
 		List<DynamicAttribute> attrs = List.of(new DynamicAttribute(new Attribute("acr", null, null, List.of("essentialACR1"))));
-		assertDoesNotThrow(() -> ACRConsistencyValidator.verifyACRAttribute(context, attrs));
+		assertDoesNotThrow(() -> EssentialACRConsistencyValidator.verifyEssentialRequestedACRisReturned(context, attrs));
 	}
 
 	@Test
@@ -54,6 +54,6 @@ public void shouldValidateSuccessfulltWhenRequestedACRisVoluntary() throws OAuth
 		context.setAcr(new ACRRequest(List.of(), List.of(new ACR("voluntaryACR1"))));
 		context.setReturnURI(new URI("return"));
 		List<DynamicAttribute> attrs = List.of(new DynamicAttribute(new Attribute("acr", null, null, List.of("anotherACR"))));
-		assertDoesNotThrow(() -> ACRConsistencyValidator.verifyACRAttribute(context, attrs));
+		assertDoesNotThrow(() -> EssentialACRConsistencyValidator.verifyEssentialRequestedACRisReturned(context, attrs));
 	}
 }