UY-1521 CR-1307 fixes

Author: ppiernik

oauth/src/main/java/pl/edu/icm/unity/oauth/as/OAuthAuthzContext.java

@@ -53,7 +53,7 @@ public enum Prompt { NONE, LOGIN, CONSENT}
 	private ClientType clientType;
 	private boolean openIdMode;
 	private Optional<ClaimsInTokenAttribute> claimsInTokenAttribute = Optional.empty();
-	private ACRRequest acr;
+	private ACRRequest requestedACR;
 	private List<AttributeFilteringSpec> claimValueFilters;
 
 	public OAuthAuthzContext(AuthorizationRequest request, OAuthASProperties properties)
@@ -267,14 +267,14 @@ public boolean requestsAttributesInIdToken()
 		return claimsInTokenAttribute.get().values.contains(ClaimsInTokenAttribute.Value.id_token);	
 	}
 
-	public ACRRequest getAcr()
+	public ACRRequest getRequestedAcr()
 	{
-		return acr;
+		return requestedACR;
 	}
 
-	public void setAcr(ACRRequest acr)
+	public void setRequestedAcr(ACRRequest acr)
 	{
-		this.acr = acr;
+		this.requestedACR = acr;
 	}
 
 	public List<AttributeFilteringSpec> getClaimValueFilters()

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

@@ -22,15 +22,15 @@ public class EssentialACRConsistencyValidator
 {
 	static void verifyEssentialRequestedACRisReturned(OAuthAuthzContext ctx, Collection<DynamicAttribute> attributes) throws OAuthErrorResponseException
 	{
-		if (ctx.getAcr().isEmpty())
+		if (ctx.getRequestedAcr().isEmpty())
 			return;
-		if (ctx.getAcr().getEssentialACRs() == null || ctx.getAcr().getEssentialACRs().isEmpty())
+		if (ctx.getRequestedAcr().getEssentialACRs() == null || ctx.getRequestedAcr().getEssentialACRs().isEmpty())
 			return;
 		Optional<DynamicAttribute> acrAttribute = attributes.stream().filter(a -> a.getAttribute().getName().equals(IDTokenClaimsSet.ACR_CLAIM_NAME)).findAny();
 
 		if (acrAttribute.isPresent())
 		{
-			if (acrAttribute.get().getAttribute().getValues().containsAll(ctx.getAcr().getEssentialACRs().stream().map(acr -> acr.getValue()).toList()))
+			if (acrAttribute.get().getAttribute().getValues().containsAll(ctx.getRequestedAcr().getEssentialACRs().stream().map(acr -> acr.getValue()).toList()))
 				return;
 		}	
 

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

@@ -219,7 +219,7 @@ protected void processRequestInterruptible(HttpServletRequest request, HttpServl
 
 		AuthenticationPolicy.setPolicy(request.getSession(), mapPromptToAuthenticationPolicy(context.getPrompts()));
 		setLanguageCookie(response, parsedRequestParametersWithUILocales.uiLocales);
-		setRequestedAuthenticationContextClassReference(context.getAcr(), request.getSession(), contextKey);
+		setRequestedAuthenticationContextClassReference(context.getRequestedAcr(), request.getSession(), contextKey);
 		response.sendRedirect(oauthUiServletPath + getQueryToAppend(authzRequest, contextKey));
 	}
 

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

@@ -180,7 +180,7 @@ void validate(OAuthAuthzContext context) throws OAuthValidationException
 	private void recordACR(OAuthAuthzContext context, AuthorizationRequest authzRequest)
 	{
 		ACRRequest acrRequest = ACRRequest.resolve(authzRequest);
-		context.setAcr(acrRequest);
+		context.setRequestedAcr(acrRequest);
 	}
 
 	private void validateAndRecordClaimsInTokenAttribute(OAuthAuthzContext context, AuthorizationRequest authzRequest)
@@ -295,7 +295,7 @@ private void validateAndRecordScopesAndClaimFilters(Map<String, AttributeExt> cl
 
 			validRequestedScopes.forEach(si -> context.addEffectiveScopeInfo(si));
 			requestedScopes.forEach(si -> context.addRequestedScope(si.getValue()));
-			if (!context.getAcr().isEmpty())
+			if (!context.getRequestedAcr().isEmpty())
 			{
 				context.getEffectiveRequestedAttrs().add(IDTokenClaimsSet.ACR_CLAIM_NAME);
 			}			

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

@@ -31,7 +31,7 @@ public class EssentialACRConsistencyValidatorTest
 	public void shouldThrowExceptionWhenReturnedACRNotContainsRequestedACR() throws OAuthErrorResponseException, URISyntaxException
 	{
 		OAuthAuthzContext context = new OAuthAuthzContext(new AuthorizationRequest(new URI(""), ResponseType.TOKEN, new ClientID()), null);
-		context.setAcr(new ACRRequest(List.of(new ACR("essentialACR1")), null));
+		context.setRequestedAcr(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, () -> EssentialACRConsistencyValidator.verifyEssentialRequestedACRisReturned(context, attrs));
@@ -41,7 +41,7 @@ public void shouldThrowExceptionWhenReturnedACRNotContainsRequestedACR() throws
 	public void shouldValidateSuccessfulltWhenACRContainsRequestedACR() throws OAuthErrorResponseException, URISyntaxException
 	{
 		OAuthAuthzContext context = new OAuthAuthzContext(new AuthorizationRequest(new URI(""), ResponseType.TOKEN, new ClientID()), null);
-		context.setAcr(new ACRRequest(List.of(new ACR("essentialACR1")), null));
+		context.setRequestedAcr(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(() -> EssentialACRConsistencyValidator.verifyEssentialRequestedACRisReturned(context, attrs));
@@ -51,7 +51,7 @@ public void shouldValidateSuccessfulltWhenACRContainsRequestedACR() throws OAuth
 	public void shouldValidateSuccessfulltWhenRequestedACRisVoluntary() throws OAuthErrorResponseException, URISyntaxException
 	{
 		OAuthAuthzContext context = new OAuthAuthzContext(new AuthorizationRequest(new URI(""), ResponseType.TOKEN, new ClientID()), null);
-		context.setAcr(new ACRRequest(List.of(), List.of(new ACR("voluntaryACR1"))));
+		context.setRequestedAcr(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(() -> EssentialACRConsistencyValidator.verifyEssentialRequestedACRisReturned(context, attrs));