This is an automated email from the ASF dual-hosted git repository.
gtully pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 5e232c25a4 ARTEMIS-4368 ensure predictable order for accurate logging
5e232c25a4 is described below
commit 5e232c25a4a0988a980e5a4f8ec1783df094faf4
Author: Gary Tully <[email protected]>
AuthorDate: Thu Jul 20 11:44:41 2023 +0100
ARTEMIS-4368 ensure predictable order for accurate logging
---
.../artemis/spi/core/security/jaas/CertificateLoginModule.java | 4 ++--
.../activemq/artemis/spi/core/security/jaas/GuestLoginModule.java | 4 ++--
.../activemq/artemis/spi/core/security/jaas/InVMLoginModule.java | 4 ++--
.../artemis/spi/core/security/jaas/KubernetesLoginModule.java | 4 ++--
.../artemis/spi/core/security/jaas/PropertiesLoginModule.java | 4 ++--
.../artemis/spi/core/security/jaas/SCRAMPropertiesLoginModule.java | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/CertificateLoginModule.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/CertificateLoginModule.java
index 12673ba1d9..704e789e5d 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/CertificateLoginModule.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/CertificateLoginModule.java
@@ -25,7 +25,7 @@ import javax.security.auth.login.LoginException;
import java.security.cert.X509Certificate;
import java.io.IOException;
import java.security.Principal;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
@@ -47,7 +47,7 @@ public abstract class CertificateLoginModule extends
PropertiesLoader implements
private X509Certificate[] certificates;
private String username;
- private final Set<Principal> principals = new HashSet<>();
+ private final Set<Principal> principals = new LinkedHashSet<>();
/**
* Overriding to allow for proper initialization. Standard JAAS.
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/GuestLoginModule.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/GuestLoginModule.java
index 4a4822908c..fbbc7aef8f 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/GuestLoginModule.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/GuestLoginModule.java
@@ -24,7 +24,7 @@ import
javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.LoginException;
import java.io.IOException;
import java.security.Principal;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
@@ -50,7 +50,7 @@ public class GuestLoginModule implements AuditLoginModule {
private Subject subject;
private boolean debug;
private boolean credentialsInvalidate;
- private final Set<Principal> principals = new HashSet<>();
+ private final Set<Principal> principals = new LinkedHashSet<>();
private CallbackHandler callbackHandler;
private boolean loginSucceeded;
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/InVMLoginModule.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/InVMLoginModule.java
index 8013becf30..f54f85647f 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/InVMLoginModule.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/InVMLoginModule.java
@@ -26,7 +26,7 @@ import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
import java.io.IOException;
import java.security.Principal;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -45,7 +45,7 @@ public class InVMLoginModule implements AuditLoginModule {
private SecurityConfiguration configuration;
private Subject subject;
private String user;
- private final Set<Principal> principals = new HashSet<>();
+ private final Set<Principal> principals = new LinkedHashSet<>();
private CallbackHandler callbackHandler;
private boolean loginSucceeded;
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/KubernetesLoginModule.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/KubernetesLoginModule.java
index cc0551ad2e..504324c0bf 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/KubernetesLoginModule.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/KubernetesLoginModule.java
@@ -18,7 +18,7 @@ package org.apache.activemq.artemis.spi.core.security.jaas;
import java.io.IOException;
import java.security.Principal;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
@@ -48,7 +48,7 @@ public class KubernetesLoginModule extends PropertiesLoader
implements AuditLogi
private TokenReview tokenReview = new TokenReview();
private boolean ignoreTokenReviewRoles = false;
private Map<String, Set<String>> roles;
- private final Set<Principal> principals = new HashSet<>();
+ private final Set<Principal> principals = new LinkedHashSet<>();
private final KubernetesClient client;
public KubernetesLoginModule(KubernetesClient client) {
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/PropertiesLoginModule.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/PropertiesLoginModule.java
index e5e1c6a6f9..d0151befa1 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/PropertiesLoginModule.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/PropertiesLoginModule.java
@@ -26,7 +26,7 @@ import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
import java.io.IOException;
import java.security.Principal;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -53,7 +53,7 @@ public class PropertiesLoginModule extends PropertiesLoader
implements AuditLogi
private Properties users;
private Map<String, Set<String>> roles;
private String user;
- private final Set<Principal> principals = new HashSet<>();
+ private final Set<Principal> principals = new LinkedHashSet<>();
private boolean loginSucceeded;
private HashProcessor hashProcessor;
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/SCRAMPropertiesLoginModule.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/SCRAMPropertiesLoginModule.java
index ec3eb9bc38..c9fccadb2b 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/SCRAMPropertiesLoginModule.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/SCRAMPropertiesLoginModule.java
@@ -22,7 +22,7 @@ import java.security.MessageDigest;
import java.security.Principal;
import java.security.SecureRandom;
import java.util.Arrays;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -63,7 +63,7 @@ public class SCRAMPropertiesLoginModule extends
PropertiesLoader implements Audi
private Map<String, Set<String>> roles;
private UserData userData;
private String user;
- private final Set<Principal> principals = new HashSet<>();
+ private final Set<Principal> principals = new LinkedHashSet<>();
@Override
public void initialize(Subject subject, CallbackHandler callbackHandler,
Map<String, ?> sharedState,
