Use configs from server

Avery-Dunn · Avery-Dunn · commit 11abc43952e4 · 2025-06-08T12:44:09.000-07:00
diff --git a/msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/RunnerHelper.java b/msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/RunnerHelper.java
@@ -2,12 +2,11 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-import static com.microsoft.aad.msal4j.ManagedIdentitySourceType.SERVICE_FABRIC;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.microsoft.aad.msal4j.Shortcuts.TestConfig;
@@ -31,7 +30,7 @@ static Map<String, ManagedIdentityApplication> createAppsFromConfig(TestConfig c
             if ("ManagedIdentityClient".equals(appObject.getType())) {
                 ManagedIdentityId identityId = createManagedIdentityId(appObject);
                 List<String> capabilities = extractClientCapabilities(appObject);
-                IEnvironmentVariables envVars = createEnvironmentVariables(config);
+                IEnvironmentVariables envVars = setEnvironmentVariables(config);
                 // TODO: other application properties
 
                 ManagedIdentityApplication app = ManagedIdentityApplication.builder(identityId)
@@ -53,21 +52,19 @@ static Map<String, ManagedIdentityApplication> createAppsFromConfig(TestConfig c
      */
     static IAuthenticationResult executeAction(ManagedIdentityApplication app, TestAction action) throws Exception {
         if (action.getMethodName().equals("AcquireTokenForManagedIdentity")) {
-            LOG.info(String.format("Executing action: %s", action.getMethodName()));
-
+            LOG.info(String.format("===Executing action: %s", action.getMethodName()));
             ManagedIdentityParameters params = buildManagedIdentityParameters(action);
-
             IAuthenticationResult result = app.acquireTokenForManagedIdentity(params).get();
 
-            LOG.info("Action result:");
-            LOG.info(String.format("Access Token: %s", result.accessToken()));
-            LOG.info(String.format("ID Token    : %s", result.idToken()));
-            LOG.info(String.format("Account     : %s", result.account()));
-            LOG.info(String.format("Token Source: %s", result.metadata().tokenSource()));
+            LOG.info("---Action result");
+            LOG.info(String.format("-Access Token: %s", result.accessToken()));
+            LOG.info(String.format("-ID Token    : %s", result.idToken()));
+            LOG.info(String.format("-Account     : %s", result.account()));
+            LOG.info(String.format("-Token Source: %s", result.metadata().tokenSource()));
 
             return result;
         } else {
-            //TODO: other token calls and apps
+            //TODO: other token calls and confidential/public client apps
             throw new UnsupportedOperationException("Unsupported action: " + action.getMethodName());
         }
     }
@@ -80,10 +77,10 @@ static void validateAssertions(IAuthenticationResult result, Map<String, JsonNod
         assertions.forEach((key, value) -> {
             switch (key) {
                 case "token_source":
-                    LOG.info("Validating token source");
+                    LOG.info("===Validating token source");
                     validateTokenSource(value.asText(), result);
                     break;
-                //TODO: other assertions
+                //TODO: other assertions, such as exceptions checks, token content, etc.
                 default:
                     // Optional: Handle unknown assertion types
                     break;
@@ -95,13 +92,23 @@ static void validateAssertions(IAuthenticationResult result, Map<String, JsonNod
      * Create managed identity ID from test object
      */
     static ManagedIdentityId createManagedIdentityId(TestObject appObject) {
-        String idType = appObject.getProperty("managed_identity").get("ManagedIdentityIdType").asText();
-
-        if ("SystemAssigned".equals(idType)) {
-            return ManagedIdentityId.systemAssigned();
-        } else {
-            // TODO: handle user assertions
-            return null;
+        JsonNode managedIdentityNode = appObject.getProperty("managed_identity");
+        String idType = managedIdentityNode.get("ManagedIdentityIdType").asText();
+
+        switch (idType) {
+            case "SystemAssigned":
+                return ManagedIdentityId.systemAssigned();
+            case "ClientId":
+                String clientId = managedIdentityNode.get("Id").asText();
+                return ManagedIdentityId.userAssignedClientId(clientId);
+            case "ObjectId":
+                String objectId = managedIdentityNode.get("Id").asText();
+                return ManagedIdentityId.userAssignedObjectId(objectId);
+            case "ResourceId":
+                String resourceId = managedIdentityNode.get("Id").asText();
+                return ManagedIdentityId.userAssignedResourceId(resourceId);
+            default:
+                throw new IllegalArgumentException("Unsupported ManagedIdentityIdType: " + idType);
         }
     }
 
@@ -116,16 +123,29 @@ static List<String> extractClientCapabilities(TestObject testObject) {
             capabilitiesNode.forEach(node -> capabilities.add(node.asText()));
         }
 
-        LOG.info(String.format("Extracted client capabilities: %s", capabilities));
+        LOG.info(String.format("---Extracted client capabilities: %s", capabilities));
 
         return capabilities;
     }
 
-    //TODO: Re-used from other Managed Identity tests, specific to this proof-of-concept but should be more generic
-    static IEnvironmentVariables createEnvironmentVariables(TestConfig config) {
-        return new EnvironmentVariablesHelper(
-                SERVICE_FABRIC,
-                config.getEnvironmentVariable("IDENTITY_ENDPOINT"));
+    /**
+     * Creates provider for mocked environment variables using the test configuration.
+     *
+     * @param config The test configuration containing the environment variables
+     * @return An IEnvironmentVariables implementation with the configured variables
+     */
+    static IEnvironmentVariables setEnvironmentVariables(TestConfig config) {
+        // Get all environment variables from the config
+        final Map<String, String> envVars = config.getAllEnvironmentVariables();
+
+        LOG.info(String.format("---Configured environment variables: %s", envVars.keySet()));
+
+        return new IEnvironmentVariables() {
+            @Override
+            public String getEnvironmentVariable(String envVariable) {
+                return envVars.get(envVariable);
+            }
+        };
     }
 
     /**
@@ -141,7 +161,8 @@ static ManagedIdentityParameters buildManagedIdentityParameters(TestAction actio
 
         // Add optional claims challenge
         if (action.hasParameter("claims_challenge")) {
-            builder.claims(action.getParameter("claims_challenge").asText());
+            String validatedClaimsChallenge = Shortcuts.validateAndGetClaimsChallenge(action);
+            builder.claims(validatedClaimsChallenge);
         }
 
         //TODO: other parameters
@@ -155,9 +176,42 @@ static ManagedIdentityParameters buildManagedIdentityParameters(TestAction actio
     static void validateTokenSource(String expectedSource, IAuthenticationResult result) {
         TokenSource expected = "identity_provider".equals(expectedSource) ?
                 TokenSource.IDENTITY_PROVIDER : TokenSource.CACHE;
-        LOG.info(String.format("Expected token source: %s", expected));
-        LOG.info(String.format("Actual token source  : %s", result.metadata().tokenSource()));
+        LOG.info(String.format("---Expected token source: %s", expected));
+        LOG.info(String.format("---Actual token source  : %s", result.metadata().tokenSource()));
 
         assertEquals(expected, result.metadata().tokenSource());
     }
+
+    /**
+     * Complete workflow to get all test case configs
+     *
+     * @param indexEndpoint The URL of the index containing test case URLs
+     * @return Map of test case names to their JSON configurations
+     */
+    static Map<String, JsonNode> getAllTestCaseConfigs(String indexEndpoint) throws IOException {
+        // Get list of SML test case URLs
+        List<String> smlUrls = RunnerJsonHelper.getTestCaseUrlsFromEndpoint(indexEndpoint);
+
+        // Convert SML URLs to JSON URLs
+        List<String> jsonUrls = Shortcuts.convertSmlUrlsToJsonUrls(smlUrls);
+
+        // Fetch content for each JSON URL
+        Map<String, JsonNode> testCaseConfigs = new HashMap<>();
+        for (String jsonUrl : jsonUrls) {
+            String testCaseName = extractTestCaseName(jsonUrl);
+            JsonNode config = RunnerJsonHelper.fetchJsonContent(jsonUrl);
+            testCaseConfigs.put(testCaseName, config);
+        }
+
+        return testCaseConfigs;
+    }
+
+    /**
+     * Extract test case name from URL
+     */
+    private static String extractTestCaseName(String url) {
+        String[] parts = url.split("/");
+        String fileName = parts[parts.length - 1];
+        return fileName.substring(0, fileName.lastIndexOf('.'));
+    }
 }
diff --git a/msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/RunnerJsonHelper.java b/msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/RunnerJsonHelper.java
@@ -2,7 +2,13 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -11,6 +17,8 @@
 import com.microsoft.aad.msal4j.Shortcuts.TestStep;
 import com.microsoft.aad.msal4j.Shortcuts.TestAction;
 
+import javax.net.ssl.HttpsURLConnection;
+
 //TODO: Too specific for the test case used in this proof-of-concept, should be able to reuse the regular JsonHelper class
 class RunnerJsonHelper {
     private static final ObjectMapper mapper = new ObjectMapper();
@@ -101,4 +109,77 @@ private static Map<String, JsonNode> parseAssertions(JsonNode assertNode) {
             return assertions;
         }
     }
+
+    /**
+     * Fetches test case URLs from an endpoint containing JSON with a "testcases" array.
+     *
+     * @param endpointUrl The URL to fetch test cases from
+     * @return List of test case URLs
+     */
+    static List<String> getTestCaseUrlsFromEndpoint(String endpointUrl) throws IOException {
+        List<String> testCaseUrls = new ArrayList<>();
+
+        URL url = new URL(endpointUrl);
+        HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
+        connection.setRequestMethod("GET");
+        connection.setRequestProperty("Content-Type", "application/json");
+
+        int responseCode = connection.getResponseCode();
+        if (responseCode == HttpsURLConnection.HTTP_OK) {
+            try (BufferedReader reader = new BufferedReader(
+                    new InputStreamReader(connection.getInputStream()))) {
+                StringBuilder response = new StringBuilder();
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    response.append(line);
+                }
+
+                ObjectMapper mapper = new ObjectMapper();
+                JsonNode rootNode = mapper.readTree(response.toString());
+
+                if (rootNode.has("testcases") && rootNode.get("testcases").isArray()) {
+                    JsonNode testcasesNode = rootNode.get("testcases");
+                    for (JsonNode testcase : testcasesNode) {
+                        testCaseUrls.add(testcase.asText());
+                    }
+                } else {
+                    throw new IllegalStateException("JSON response does not contain a 'testcases' array");
+                }
+            }
+        } else {
+            throw new IOException("HTTP request failed with status code: " + responseCode);
+        }
+
+        return testCaseUrls;
+    }
+
+    /**
+     * Fetches JSON content from a URL
+     *
+     * @param jsonUrl The URL to fetch JSON content from
+     * @return The JSON content parsed as a JsonNode
+     */
+    static JsonNode fetchJsonContent(String jsonUrl) throws IOException {
+        URL url = new URL(jsonUrl);
+        HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
+        connection.setRequestMethod("GET");
+        connection.setRequestProperty("Content-Type", "application/json");
+
+        int responseCode = connection.getResponseCode();
+        if (responseCode == HttpsURLConnection.HTTP_OK) {
+            try (BufferedReader reader = new BufferedReader(
+                    new InputStreamReader(connection.getInputStream()))) {
+                StringBuilder response = new StringBuilder();
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    response.append(line);
+                }
+
+                ObjectMapper mapper = new ObjectMapper();
+                return mapper.readTree(response.toString());
+            }
+        } else {
+            throw new IOException("Failed to fetch JSON content. HTTP status: " + responseCode);
+        }
+    }
 }
diff --git a/msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/RunnerTest.java b/msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/RunnerTest.java
@@ -1,29 +1,59 @@
 package com.microsoft.aad.msal4j;
 
-import org.junit.jupiter.api.Test;
-
+import com.fasterxml.jackson.databind.JsonNode;
 import com.microsoft.aad.msal4j.Shortcuts.TestConfig;
 import com.microsoft.aad.msal4j.Shortcuts.TestStep;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Map;
+import java.util.stream.Stream;
 
 class RunnerTest {
+    private static final Logger LOG = LoggerFactory.getLogger(RunnerTest.class);
+
+    /**
+     * Defines a set of test cases for a single unit test to run.
+     */
+    static Stream<String> managedIdentityTestsProvider() {
+        return Stream.of(
+                "mi_capability",
+                "token_sha256_to_refresh",
+                "mi_vm_pod"
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("managedIdentityTestsProvider")
+    void runManagedIdentityTest(String testCaseName) throws Exception {
+        LOG.info("==========Executing Test Case==========");
+
+        // Get all test configurations
+        Map<String, JsonNode> configs = RunnerHelper.getAllTestCaseConfigs("https://smile-test.azurewebsites.net/testcases.json");
 
-    @Test
-    void testManagedIdentityWithJsonConfig() throws Exception {
-        //TODO: get test cases list from the server
-        TestConfig config = RunnerJsonHelper.parseTestConfig(Shortcuts.getTestConfigJson());
+        LOG.info(String.format("---Found test case: %s", configs.get(testCaseName).toString()));
+
+        TestConfig config = RunnerJsonHelper.parseTestConfig(configs.get(testCaseName).toString());
+
+        // Create applications from the configuration
         Map<String, ManagedIdentityApplication> apps = RunnerHelper.createAppsFromConfig(config);
 
+        // For each application, execute all steps
         for (ManagedIdentityApplication app : apps.values()) {
-            //Execute the "steps" section of the test config
+            app.tokenCache.accessTokens.clear(); // Clear the static token cache for each test run
+
+            // Execute each step in the test configuration
             for (TestStep step : config.getSteps()) {
-                //Execute the "act" section of the test config
+                LOG.info("----------Executing step----------");
+
+                // Execute the action
                 IAuthenticationResult result = RunnerHelper.executeAction(app, step.getAction());
 
-                //Execute the "assert" section of the test config
+                // Validate assertions
                 RunnerHelper.validateAssertions(result, step.getAssertions());
             }
         }
     }
-}
+}
diff --git a/msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/Shortcuts.java b/msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/Shortcuts.java
