Incorporate feedback

Author: duanemay

model/src/test/java/org/cloudfoundry/identity/uaa/zone/LoginConsentTest.java

@@ -1,12 +1,10 @@
 package org.cloudfoundry.identity.uaa.zone;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Disabled
 class LoginConsentTest {
 
     private final ObjectMapper objectMapper = new ObjectMapper();

server/src/main/java/org/cloudfoundry/identity/uaa/login/LoginConsentHashUtil.java

@@ -1,13 +1,12 @@
 package org.cloudfoundry.identity.uaa.login;
 
-import org.apache.http.impl.auth.UnsupportedDigestAlgorithmException;
 import org.cloudfoundry.identity.uaa.zone.LoginConsent;
 import org.springframework.util.StringUtils;
 
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Utility class for calculating consent hashes used to track consent versioning.
@@ -16,7 +15,8 @@
  */
 public class LoginConsentHashUtil {
 
-    private static final WeakHashMap<String, String> consentHashCache = new WeakHashMap<>();
+    private static final int DEFAULT_SESSION_DURATION = 24 * 60 * 60; // 24 hours in seconds
+    private static final ConcurrentHashMap<String, String> consentHashCache = new ConcurrentHashMap<>();
 
     private LoginConsentHashUtil() {
         // Utility class
@@ -45,7 +45,7 @@ public static String calculateConsentHash(LoginConsent consent) {
                 byte[] hash = digest.digest(c.getBytes(StandardCharsets.UTF_8));
                 return bytesToHex(hash);
             } catch (NoSuchAlgorithmException e) {
-                throw new UnsupportedDigestAlgorithmException("SHA-256 algorithm not available", e);
+                throw new IllegalStateException("SHA-256 algorithm not available", e);
             }
         });
     }
@@ -73,11 +73,12 @@ private static String bytesToHex(byte[] bytes) {
      * Supports formats: 0, 15m, 12h, 7d, 1w, 1y
      *
      * @param duration the duration string (e.g., "12h", "7d", "0")
-     * @return duration in seconds, or 0 if duration is "0" or invalid
+     * @return duration in seconds; returns 0 only if duration is "0", otherwise defaults
+     *         to 24 hours (in seconds) for missing or invalid values
      */
     public static long parseDurationToSeconds(String duration) {
         if (!StringUtils.hasText(duration)) {
-            return 24 * 60 * 60; // Default: 24 hours
+            return DEFAULT_SESSION_DURATION;
         }
 
         duration = duration.trim();
@@ -91,7 +92,7 @@ public static long parseDurationToSeconds(String duration) {
             // Extract number and unit
             int length = duration.length();
             if (length < 2) {
-                return 24 * 60 * 60; // Default if invalid
+                return DEFAULT_SESSION_DURATION; // Default if invalid
             }
 
             String numberPart = duration.substring(0, length - 1);
@@ -105,10 +106,10 @@ public static long parseDurationToSeconds(String duration) {
                 case "d" -> value * 24 * 60 * 60;      // days
                 case "w" -> value * 7 * 24 * 60 * 60;  // weeks (7 days)
                 case "y" -> value * 365 * 24 * 60 * 60; // years (365 days)
-                default -> 24 * 60 * 60;               // Default: 1 day (24 hours)
+                default -> DEFAULT_SESSION_DURATION;
             };
         } catch (NumberFormatException e) {
-            return 24 * 60 * 60; // Default: 24 hours
+            return DEFAULT_SESSION_DURATION; // Default: if not parsable
         }
     }
 }

server/src/main/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpoint.java

@@ -1004,7 +1004,6 @@ protected Map<String, String> getSelfServiceLinks() {
     }
 
     private void addLoginConsentToModel(Model model) {
-        log.info("in addLoginConsentToModel()");
         IdentityZone zone = IdentityZoneHolder.get();
         if (zone.getConfig() != null && 
             zone.getConfig().getBranding() != null && 
@@ -1014,7 +1013,6 @@ private void addLoginConsentToModel(Model model) {
 
             if (loginConsent.isEnabled()) {
                 model.addAttribute("loginConsent", loginConsent);
-                log.info("addLoginConsentToModel: " + loginConsent);
 
                 // Calculate and add the consent hash for client-side verification
                 String consentHash = LoginConsentHashUtil.calculateConsentHash(loginConsent);

server/src/test/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpointTests.java

@@ -1846,8 +1846,8 @@ void testLoginConsentAddedToModelWhenEnabled() throws Exception {
     @Test
     void testLoginConsentNotAddedWhenDisabled() throws Exception {
         // Set up login consent configuration (disabled)
-        org.cloudfoundry.identity.uaa.zone.BrandingInformation branding = new org.cloudfoundry.identity.uaa.zone.BrandingInformation();
-        org.cloudfoundry.identity.uaa.zone.LoginConsent loginConsent = new org.cloudfoundry.identity.uaa.zone.LoginConsent();
+        BrandingInformation branding = new BrandingInformation();
+        LoginConsent loginConsent = new LoginConsent();
         loginConsent.setEnabled(false);
         branding.setLoginConsent(loginConsent);
 

server/src/test/java/org/cloudfoundry/identity/uaa/zone/LoginConsentValidatorTest.java

@@ -165,12 +165,13 @@ void testValidateValidHttpsUrl() {
 
     @Test
     void testValidateValidHttpUrl() {
+        //noinspection HttpUrlsUsage
         LoginConsent consent = new LoginConsent(
             true,
             "Notice",
             "Text",
             "Accept",
-            "https://example.com",
+            "http://example.com",
             "12h"
         );