[EJBCLIENT-400] Refactoring classes & decreasing visibility

Author: ropalka

src/main/java/org/jboss/ejb/_private/SystemProperties.java

@@ -25,7 +25,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.jboss.ejb._private.Logs;
-import org.jboss.ejb._private.SystemProperties;
 import org.wildfly.common.Assert;
 
 /**
@@ -91,7 +90,7 @@ public String selectNode(final String clusterName, final String[] connectedNodes
      * If no local node is used the DEFAULT will be used and connect a minimum of 5 nodes and select it randomly.
      */
   ClusterNodeSelector DEFAULT_PREFER_LOCAL = new ClusterNodeSelector() {
-      private final String localNodeName = SystemProperties.getString(SystemProperties.JBOSS_NODE_NAME);
+      private final String localNodeName = SecurityUtils.getString(SystemProperties.JBOSS_NODE_NAME);
 
 		public String selectNode(String clusterName, String[] connectedNodes, String[] totalAvailableNodes) {
           // Check if more than one node is available
@@ -110,7 +109,7 @@ public String selectNode(String clusterName, String[] connectedNodes, String[] t
 	};
 
     ClusterNodeSelector RANDOM_PREFER_LOCAL = new ClusterNodeSelector() {
-        private final String localNodeName = SystemProperties.getString(SystemProperties.JBOSS_NODE_NAME);
+        private final String localNodeName = SecurityUtils.getString(SystemProperties.JBOSS_NODE_NAME);
 
 		public String selectNode(String clusterName, String[] connectedNodes, String[] totalAvailableNodes) {
 	          // Check if more than one node is available

src/main/java/org/jboss/ejb/client/ClusterNodeSelector.java

@@ -26,7 +26,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.jboss.ejb._private.Logs;
-import org.jboss.ejb._private.SystemProperties;
 import org.wildfly.common.Assert;
 
 /**
@@ -124,7 +123,7 @@ public String selectNode(final String[] eligibleNodes, final String appName, fin
      * A deployment node selector which check the server name if inside and prefer it if available for selection.
      */
     DeploymentNodeSelector RANDOM_PREFER_LOCAL = new DeploymentNodeSelector() {
-        private final String localNodeName = SystemProperties.getString(SystemProperties.JBOSS_NODE_NAME);
+        private final String localNodeName = SecurityUtils.getString(SystemProperties.JBOSS_NODE_NAME);
 
         public String selectNode(final String[] eligibleNodes, final String appName, final String moduleName, final String distinctName) {
             if(Logs.MAIN.isTraceEnabled()) {

src/main/java/org/jboss/ejb/client/DeploymentNodeSelector.java

@@ -49,7 +49,6 @@
 
 import org.jboss.ejb._private.Keys;
 import org.jboss.ejb._private.Logs;
-import org.jboss.ejb._private.SystemProperties;
 import org.jboss.ejb.client.annotation.ClientInterceptorPriority;
 import org.wildfly.common.Assert;
 import org.wildfly.common.net.CidrAddress;
@@ -74,11 +73,11 @@ public final class DiscoveryEJBClientInterceptor implements EJBClientInterceptor
     private static final Supplier<Discovery> DISCOVERY_SUPPLIER = doPrivileged((PrivilegedAction<Supplier<Discovery>>) Discovery.getContextManager()::getPrivilegedSupplier);
 
     private static final String[] NO_STRINGS = new String[0];
-    private static final boolean WILDFLY_TESTSUITE_HACK = SystemProperties.getBoolean(SystemProperties.WILDFLY_TESTSUITE_HACK);
+    private static final boolean WILDFLY_TESTSUITE_HACK = SecurityUtils.getBoolean(SystemProperties.WILDFLY_TESTSUITE_HACK);
     // This provides a way timeout a discovery, avoiding blocking on some edge cases. See EJBCLIENT-311.
-    private static final long DISCOVERY_TIMEOUT = SystemProperties.getLong(SystemProperties.DISCOVERY_TIMEOUT, 0L);
+    private static final long DISCOVERY_TIMEOUT = SecurityUtils.getLong(SystemProperties.DISCOVERY_TIMEOUT, 0L);
     //how long to wait if at least one node has already been discovered. This one is in ms rather than s
-    private static final long DISCOVERY_ADDITIONAL_TIMEOUT = SystemProperties.getLong(SystemProperties.DISCOVERY_ADDITIONAL_NODE_TIMEOUT, 0L);
+    private static final long DISCOVERY_ADDITIONAL_TIMEOUT = SecurityUtils.getLong(SystemProperties.DISCOVERY_ADDITIONAL_NODE_TIMEOUT, 0L);
 
     /**
      * This interceptor's priority.
@@ -87,7 +86,7 @@ public final class DiscoveryEJBClientInterceptor implements EJBClientInterceptor
 
     private static final AttachmentKey<Set<URI>> BL_KEY = new AttachmentKey<>();
     private static final Map<URI, Long> blacklist = new ConcurrentHashMap<>();
-    private static final long BLACKLIST_TIMEOUT = TimeUnit.MILLISECONDS.toNanos(SystemProperties.getLong(SystemProperties.DISCOVERY_BLACKLIST_TIMEOUT, 5000L));
+    private static final long BLACKLIST_TIMEOUT = TimeUnit.MILLISECONDS.toNanos(SecurityUtils.getLong(SystemProperties.DISCOVERY_BLACKLIST_TIMEOUT, 5000L));
 
     /**
      * Construct a new instance.

src/main/java/org/jboss/ejb/client/DiscoveryEJBClientInterceptor.java

@@ -33,7 +33,6 @@
 import javax.ejb.EJBObject;
 
 import org.jboss.ejb._private.Logs;
-import org.jboss.ejb._private.SystemProperties;
 import org.wildfly.common.Assert;
 import org.wildfly.discovery.Discovery;
 import org.wildfly.security.auth.client.AuthenticationContext;
@@ -50,7 +49,7 @@ final class EJBInvocationHandler<T> extends Attachable implements InvocationHand
 
     private static final Supplier<Discovery> DISCOVERY_SUPPLIER = doPrivileged((PrivilegedAction<Supplier<Discovery>>) Discovery.getContextManager()::getPrivilegedSupplier);
 
-    private static final int MAX_RETRIES = SystemProperties.getInteger(SystemProperties.MAX_ENTRIES, 8);
+    private static final int MAX_RETRIES = SecurityUtils.getInteger(SystemProperties.MAX_ENTRIES, 8);
 
     private final transient boolean async;
 

src/main/java/org/jboss/ejb/client/EJBInvocationHandler.java

@@ -36,7 +36,6 @@
 import javax.ejb.EJBHome;
 import javax.ejb.EJBObject;
 
-import org.jboss.ejb._private.SystemProperties;
 import org.jboss.ejb.client.annotation.ClientAsynchronous;
 import org.jboss.ejb.client.annotation.ClientInterceptors;
 import org.jboss.ejb.client.annotation.ClientTransaction;
@@ -51,7 +50,7 @@
  */
 final class EJBProxyInformation<T> {
 
-    static final boolean ENABLE_SCANNING = SystemProperties.getBoolean(SystemProperties.VIEW_ANNOTATION_SCAN_ENABLED, true);
+    static final boolean ENABLE_SCANNING = SecurityUtils.getBoolean(SystemProperties.VIEW_ANNOTATION_SCAN_ENABLED, true);
 
     static final Class<?>[] JUST_INV_HANDLER = new Class<?>[] { InvocationHandler.class };
 

src/main/java/org/jboss/ejb/client/EJBProxyInformation.java

@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2021 Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.ejb.client;
+
+import org.wildfly.security.manager.WildFlySecurityManager;
+
+/**
+ * Security sensitive operations being used in this package.
+ *
+ * @author <a href="mailto:[email protected]">Richard Opálka</a>
+ */
+final class SecurityUtils {
+
+    private SecurityUtils() {
+        // forbidden instantiation
+    }
+
+    static boolean getBoolean(final String propertyName) {
+        return getBoolean(propertyName, false);
+    }
+
+    static boolean getBoolean(final String propertyName, final boolean defaultValue) {
+        try {
+            final String propertyValue = getString(propertyName);
+            return propertyValue != null ? Boolean.valueOf(propertyValue) : defaultValue;
+        } catch (Throwable t) {
+            return defaultValue;
+        }
+    }
+
+    static int getInteger(final String propertyName, final int defaultValue) {
+        try {
+            final String propertyValue = getString(propertyName);
+            return propertyValue != null ? Integer.parseInt(propertyValue) : defaultValue;
+        } catch (Throwable t) {
+            return defaultValue;
+        }
+    }
+
+    static long getLong(final String propertyName, final long defaultValue) {
+        try {
+            final String propertyValue = getString(propertyName);
+            return propertyValue != null ? Long.parseLong(propertyValue) : defaultValue;
+        } catch (Throwable t) {
+            return defaultValue;
+        }
+    }
+
+    static String getString(final String propertyName) {
+        return getString(propertyName, null);
+    }
+
+    static String getString(final String propertyName, final String defaultValue) {
+        return WildFlySecurityManager.getPropertyPrivileged(propertyName, defaultValue);
+    }
+
+}

src/main/java/org/jboss/ejb/client/SecurityUtils.java

@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2021 Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.ejb.client;
+
+/**
+ * System properties being used in this package.
+ *
+ * @author <a href="mailto:[email protected]">Richard Opálka</a>
+ */
+final class SystemProperties {
+
+    static final String DISCOVERY_ADDITIONAL_NODE_TIMEOUT = "org.jboss.ejb.client.discovery.additional-node-timeout";
+    static final String DISCOVERY_BLACKLIST_TIMEOUT = "org.jboss.ejb.client.discovery.blacklist.timeout";
+    static final String DISCOVERY_TIMEOUT = "org.jboss.ejb.client.discovery.timeout";
+    static final String JBOSS_NODE_NAME = "jboss.node.name";
+    static final String MAX_ENTRIES = "org.jboss.ejb.client.max-retries";
+    static final String VIEW_ANNOTATION_SCAN_ENABLED = "org.jboss.ejb.client.view.annotation.scan.enabled";
+    static final String WILDFLY_TESTSUITE_HACK = "org.jboss.ejb.client.wildfly-testsuite-hack";
+
+    private SystemProperties() {
+        // forbidden instantiation
+    }
+
+}

src/main/java/org/jboss/ejb/client/SystemProperties.java

@@ -24,7 +24,6 @@
 import javax.security.auth.callback.CallbackHandler;
 
 import org.jboss.ejb._private.Logs;
-import org.jboss.ejb._private.SystemProperties;
 import org.kohsuke.MetaInfServices;
 import org.wildfly.common.function.ExceptionSupplier;
 import org.wildfly.security.auth.client.AuthenticationConfiguration;
@@ -47,7 +46,7 @@
 @MetaInfServices
 public final class ElytronLegacyConfiguration implements LegacyConfiguration {
 
-    private static final boolean QUIET_AUTH = SystemProperties.getBoolean(SystemProperties.QUIET_AUTH);
+    private static final boolean QUIET_AUTH = SecurityUtils.getBoolean(SystemProperties.QUIET_AUTH);
     private static final String[] NO_STRINGS = new String[0];
 
     public AuthenticationContext getConfiguredAuthenticationContext() {

src/main/java/org/jboss/ejb/client/legacy/ElytronLegacyConfiguration.java

@@ -46,7 +46,6 @@
 import javax.security.auth.callback.CallbackHandler;
 
 import org.jboss.ejb._private.Logs;
-import org.jboss.ejb._private.SystemProperties;
 import org.jboss.ejb.client.ClusterNodeSelector;
 import org.jboss.ejb.client.DeploymentNodeSelector;
 import org.wildfly.common.Assert;
@@ -112,8 +111,8 @@ public final class JBossEJBProperties implements Contextual<JBossEJBProperties>
     private static final String PROPERTY_KEY_PROTOCOL = "protocol";
     private static final String DEFAULT_PROTOCOL = "http-remoting";
 
-    private static final boolean EXPAND_PASSWORDS = SystemProperties.getBoolean(SystemProperties.EXPAND_PASSWORDS);
-    private static final String CONFIGURED_PATH_NAME = SystemProperties.getString(SystemProperties.PROPERTIES_FILE_PATH);
+    private static final boolean EXPAND_PASSWORDS = SecurityUtils.getBoolean(SystemProperties.EXPAND_PASSWORDS);
+    private static final String CONFIGURED_PATH_NAME = SecurityUtils.getString(SystemProperties.PROPERTIES_FILE_PATH);
 
     private static final String PROPERTY_KEY_HTTP_CONNECTIONS = "http.connections";
 
@@ -131,7 +130,7 @@ public final class JBossEJBProperties implements Contextual<JBossEJBProperties>
                             if (CONFIGURED_PATH_NAME != null) try {
                                 File propertiesFile = new File(CONFIGURED_PATH_NAME);
                                 if (! propertiesFile.isAbsolute()) {
-                                    propertiesFile = new File(SystemProperties.getString(SystemProperties.USER_DIR), propertiesFile.toString());
+                                    propertiesFile = new File(SecurityUtils.getString(SystemProperties.USER_DIR), propertiesFile.toString());
                                 }
                                 value = JBossEJBProperties.fromFile(propertiesFile);
                             } catch (IOException e) {