SOLR-15423 Fix test failures (apache#178)

SOLR-15484

solr/core/src/test-files/solr/security/jwt_plugin_idp_invalidcert.pem

@@ -1,46 +1,3 @@
 -----BEGIN CERTIFICATE-----
-MIIEKDCCAxCgAwIBAgIJANvA408KXcSFMA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
-BAYTAk5PMQ0wCwYDVQQIDARPU0xPMREwDwYDVQQHDAhJbnRlcm5ldDEOMAwGA1UE
-CgwFTElPcmcxDDAKBgNVBAsMA1ImRDEVMBMGA1UEAwwMU29sciBSb290IENBMB4X
-DTIxMDYwMzE1MDIyM1oXDTIyMDYwMzE1MDIyM1owZDELMAkGA1UEBhMCTk8xDTAL
-BgNVBAgMBE9TTE8xETAPBgNVBAcMCEludGVybmV0MQ4wDAYDVQQKDAVNeU9yZzEM
-MAoGA1UECwwDUiZEMRUwEwYDVQQDDAxTb2xyIFJvb3QgQ0EwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCnbrWbL/4GmmNBep++jQ55fu/5N3QyVNfpxHC7
-x5E5AZTSOU9kwh2vwUwfOp9EsaHSKQu2TZYdq3c1gHUgwaMimSFfHofFOTcio03V
-dOweGE+7ycoJbXWj74c+jujGnEBAfXzwvM3slf7bHtbRUQOwvwzbAsp2mR81jAJj
-XwHmyseJgbTUsYYYmHd4UcDGUkeud/4uJD0AxBlpzf+UUdFTtSfmwurYtzadRbVv
-hVGWLPIaZ+URwo/I3oTy1HZnDBQjou12wRwYh/+3Ls2CwRN/Lp2LrT+nGfnxvEhj
-jZFC5k2+fNO9Hh8TVR4PoaPRbAZ6KyoOLu6XTtUVtibvT/mdAgMBAAGjgdwwgdkw
-DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUwPv6mv2MylV47YKI/fJFSOpGbOow
-gZYGA1UdIwSBjjCBi4AUwPv6mv2MylV47YKI/fJFSOpGbOqhaKRmMGQxCzAJBgNV
-BAYTAk5PMQ0wCwYDVQQIDARPU0xPMREwDwYDVQQHDAhJbnRlcm5ldDEOMAwGA1UE
-CgwFTXlPcmcxDDAKBgNVBAsMA1ImRDEVMBMGA1UEAwwMU29sciBSb290IENBggkA
-28DjTwpdxIUwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4IBAQCkqzqX
-jdb4FicAOBA2Z0nPd6hWZWbWyWfS+ol5R1BCxOvUjrnUSZwAgAu6kY/SHvTXHP5l
-qXzXbox3TtJwFZwMUrR5nHfyZTpM6OBVn4rzhUURUijgOQiWboexk2qItnTzTWbj
-tM/7rebwUQ/sNyifRSn2vk2wV1guBgfhfE+jXkdtOk2g3HpJTp/mwy3v1lwg1Icb
-SCCtXc2zXX5K/MacdiNjiMzl9rC3nGlBPRzt/jLp7oIw04+SmP29ZwPE/DtHaXTo
-kY7D8mbOqQDPhIOMvV2yOi/3VFvZUZelmws/riXTsHtBvc3SzWWB5ClkksP5hD/m
-7h9IYFIUv6uw+Owm
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDhTCCAm2gAwIBAgIJAKQKBs1eUP8KMA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
-BAYTAk5PMQ0wCwYDVQQIDARPU0xPMREwDwYDVQQHDAhJbnRlcm5ldDEOMAwGA1UE
-CgwFTXlPcmcxDDAKBgNVBAsMA1ImRDEVMBMGA1UEAwwMU29sciBSb290IENBMB4X
-DTIxMDYXMzE1MDIyM1oXDTIyMDYwMzE1MDIyM1owZDELMAkGA1UEBhMCTk8xDTAL
-BgNVBAgMBE9TTE8xFDASBgNVBAcMC1NvbHIgU2VydmVyMQ4wDAYDVQQKDAVNeU9y
-ZzEMMAoGA1UECwwDUiZEMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDhRvXDYCpui4VqP2aQHtUiOne1wPygvFuvtwhn
-MjevkVbDYWGMWY7qS0/OuSOwd8hmNeh6r4/gkIasLBB5y8ttHgvCMf1nlDtbZc50
-catHg6OKCTkagr903CvaS7cIGCNSN+YReESRk1KUkW2+y37yfGmV2LSSK9bNDghf
-gIzEt/WjQ1DQLDKaRnOZFgTb1uBgqpKscarVWBZ7z1FqVhPlfs/ykHoRMHJuzzmS
-b6m/dADMjCCwTRwrshofOQyaVVIhCITSem8TYrKSLVTD27RRdJXQ3uzKfMuqgNPo
-SRYxrQCqUveKPd2488bxUZ4p68UaSPKpeMfW/jTcHCjNUXQtAgMBAAGjOjA4MBQG
-A1UdEQQNMAuCCWxvY2FsaG9zdDALBgNVHQ8EBAMCB4AwEwYDVR0lBAwwCgYIKwYB
-BQUHAwEwDQYJKoZIhvcNAQELBQADggEBAFcKRH6pZ0zPlGHInvWUzPTMAbWO7/sr
-In0vy5LB4iXDgov5iQsfRIR/MP0iajFcLVuJ4Onkrd7TBgDkCm7zA8lyTHIZMfor
-aBE/8AKS+hBOyI5EmhRu0f/v5vVVt7O/g86wZ2xwV4Jq+g45zKZPIJsWVhSz8LEh
-jU2MYIQtuic5hHEF+Ipe5seNo0JBC/njQLvFygXeD7BWP2dwpfY2MtzZP9Dqf36r
-NGhjo6lfjdn+w4vhBlcpseJiBoe9IhDFDAY/CxrUNaL2b862BsmhyV9BuP/KhWQM
-P0gPa0XmgbUOTdYu1qCdnmAENz8CbR9kQ0T+cBbE4ond52108BZaUZ8=
------END CERTIFICATE-----
+abcdefgh
+-----END CERTIFICATE-----

solr/core/src/test/org/apache/solr/security/JWTAuthPluginIntegrationTest.java

@@ -39,6 +39,7 @@
 import org.apache.solr.common.util.TimeSource;
 import org.apache.solr.common.util.Utils;
 import org.apache.solr.util.CryptoKeys;
+import org.apache.solr.util.RTimer;
 import org.apache.solr.util.TimeOut;
 import org.jose4j.jwk.PublicJsonWebKey;
 import org.jose4j.jwk.RsaJsonWebKey;
@@ -136,7 +137,7 @@ public void extractCertificateFromPem() throws IOException {
 
   @Test
   public void mockOAuth2Server() throws Exception {
-    configureClusterMockOauth(2, pemFilePath);
+    configureClusterMockOauth(2, pemFilePath, 10000);
 
     // First attempt without token fails
     Map<String, String> headers = getHeaders(baseUrl + "/admin/info/system", null);
@@ -150,7 +151,7 @@ public void mockOAuth2Server() throws Exception {
   @Test
   public void mockOAuth2ServerWrongPEMInTruststore() throws Exception {
     // JWTAuthPlugin throws SSLHandshakeException when fetching JWK, so this trips cluster init
-    configureClusterMockOauth(2, wrongPemFilePath);
+    assertThrows(Exception.class, () -> configureClusterMockOauth(2, wrongPemFilePath, 2000));
     // Auth is not setup
     assertNull(cluster.getJettySolrRunner(0).getCoreContainer().getAuthenticationPlugin());
   }
@@ -259,18 +260,21 @@ public void createCollectionUpdateAndQueryDistributed() throws Exception {
     assertPkiAuthMetricsMinimums(4, 4, 0, 0, 0, 0);
   }
 
-  private void configureClusterMockOauth(int numNodes, Path pemFilePath) throws Exception {
+  @SuppressWarnings("BusyWait")
+  private void configureClusterMockOauth(int numNodes, Path pemFilePath, long timeoutMs) throws Exception {
     configureCluster(numNodes)// nodes
         .addConfig("conf1", TEST_PATH().resolve("configsets").resolve("cloud-minimal").resolve("conf"))
         .withDefaultClusterProperty("useLegacyReplicaAssignment", "false")
         .configure();
     String securityJson = createMockOAuthSecurityJson(pemFilePath);
     cluster.getZkClient().setData("/security.json", securityJson.getBytes(Charset.defaultCharset()), true);
-    for(int i = 0; i < 5; i++) { // Wait up to 1s for the security.json change to take effect
-      if (cluster.getJettySolrRunner(0).getCoreContainer().getAuthenticationPlugin() == null) {
-        Thread.sleep(200);
-      } else break;
-    }
+    RTimer timer = new RTimer();
+    do { // Wait timeoutMs time for the security.json change to take effect
+      Thread.sleep(200);
+      if (timer.getTime() > timeoutMs) {
+        throw new Exception("Custom 'security.json' not applied in " + timeoutMs +"ms");
+      }
+    } while (cluster.getJettySolrRunner(0).getCoreContainer().getAuthenticationPlugin() == null);
     baseUrl = cluster.getRandomJetty(random()).getBaseUrl().toString();
     cluster.waitForAllNodes(10);
   }