make auth nullable again to avoid empty strings in the config that ca…

…n not be parsed back.
hivemq · Dec 11, 2024 · 1884c56 · 1884c56
1 parent 7610e3d
commit 1884c56
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 19 deletions.
diff --git a/...le-opcua/src/main/java/com/hivemq/edge/adapters/opcua/client/OpcUaClientConfigurator.java b/...le-opcua/src/main/java/com/hivemq/edge/adapters/opcua/client/OpcUaClientConfigurator.java
@@ -16,6 +16,7 @@
 package com.hivemq.edge.adapters.opcua.client;
 
 import com.google.common.collect.ImmutableList;
+import com.hivemq.edge.adapters.opcua.config.Auth;
 import com.hivemq.edge.adapters.opcua.config.BasicAuth;
 import com.hivemq.edge.adapters.opcua.config.Keystore;
 import com.hivemq.edge.adapters.opcua.config.OpcUaSpecificAdapterConfig;
@@ -50,8 +51,8 @@ public class OpcUaClientConfigurator implements Function<OpcUaClientConfigBuilde
     private final @NotNull OpcUaSpecificAdapterConfig adapterConfig;
     private final @NotNull String adapterId;
 
-    public OpcUaClientConfigurator(final @NotNull OpcUaSpecificAdapterConfig adapterConfig,
-                                   final @NotNull String adapterId) {
+    public OpcUaClientConfigurator(
+            final @NotNull OpcUaSpecificAdapterConfig adapterConfig, final @NotNull String adapterId) {
         this.adapterConfig = adapterConfig;
         this.adapterId = adapterId;
     }
@@ -112,10 +113,9 @@ public OpcUaClientConfigurator(final @NotNull OpcUaSpecificAdapterConfig adapter
 
     private boolean checkAuthEnabled() {
         //check that at least one auth method (Basic or X509) is enabled
-        return adapterConfig.getAuth() != null &&
-                (adapterConfig.getAuth().getBasicAuth() != null ||
-                        (adapterConfig.getAuth().getX509Auth() != null &&
-                                adapterConfig.getAuth().getX509Auth().isEnabled()));
+        final Auth auth = adapterConfig.getAuth();
+        return auth != null &&
+                (auth.getBasicAuth() != null || (auth.getX509Auth() != null && auth.getX509Auth().isEnabled()));
     }
 
     private void configureIdentityProvider(
@@ -124,16 +124,20 @@ private void configureIdentityProvider(
             final @Nullable KeystoreUtil.KeyPairWithChain keyPairWithChain) {
 
         final ImmutableList.Builder<IdentityProvider> identityProviderBuilder = ImmutableList.builder();
-        final X509Auth x509Auth = adapterConfig.getAuth().getX509Auth();
-        final boolean x509AuthEnabled = x509Auth != null && x509Auth.isEnabled();
-        if (x509AuthEnabled && tlsEnabled && keyPairWithChain != null) {
-            identityProviderBuilder.add(new X509IdentityProvider(Arrays.asList(keyPairWithChain.getCertificateChain()),
-                    keyPairWithChain.getPrivateKey()));
-        }
+        final Auth auth = adapterConfig.getAuth();
+
+        if (auth != null) {
+            final X509Auth x509Auth = auth.getX509Auth();
+            final boolean x509AuthEnabled = x509Auth != null && x509Auth.isEnabled();
+            if (x509AuthEnabled && tlsEnabled && keyPairWithChain != null) {
+                identityProviderBuilder.add(new X509IdentityProvider(Arrays.asList(keyPairWithChain.getCertificateChain()),
+                        keyPairWithChain.getPrivateKey()));
+            }
 
-        if (adapterConfig.getAuth().getBasicAuth() != null) {
-            final BasicAuth basicAuth = adapterConfig.getAuth().getBasicAuth();
-            identityProviderBuilder.add(new UsernameProvider(basicAuth.getUsername(), basicAuth.getPassword()));
+            if (auth.getBasicAuth() != null) {
+                final BasicAuth basicAuth = auth.getBasicAuth();
+                identityProviderBuilder.add(new UsernameProvider(basicAuth.getUsername(), basicAuth.getPassword()));
+            }
         }
 
         final ImmutableList<IdentityProvider> identityProviders = identityProviderBuilder.build();
@@ -145,7 +149,7 @@ private void configureIdentityProvider(
     }
 
     @NotNull
-    private DefaultClientCertificateValidator createServerCertificateValidator(@NotNull Tls tlsConfig) {
+    private DefaultClientCertificateValidator createServerCertificateValidator(@NotNull final Tls tlsConfig) {
         final List<X509Certificate> trustedCerts;
         final boolean truststoreAvailable = checkTruststoreAvailable(tlsConfig);
         if (truststoreAvailable) {

diff --git a/...opcua/src/main/java/com/hivemq/edge/adapters/opcua/config/OpcUaSpecificAdapterConfig.java b/...opcua/src/main/java/com/hivemq/edge/adapters/opcua/config/OpcUaSpecificAdapterConfig.java
@@ -56,9 +56,9 @@ public class OpcUaSpecificAdapterConfig implements ProtocolSpecificAdapterConfig
                        defaultValue = "false")
     private final boolean overrideUri;
 
-   // @JsonInclude(JsonInclude.Include.NON_EMPTY)
     @JsonProperty("auth")
-    private final @NotNull Auth auth;
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private final @Nullable Auth auth;
 
     @JsonProperty("tls")
     private final @NotNull Tls tls;
@@ -94,7 +94,7 @@ public OpcUaSpecificAdapterConfig(
         return uri;
     }
 
-    public @NotNull Auth getAuth() {
+    public @Nullable Auth getAuth() {
         return auth;
     }