fix(opcua): fix issues with empty port

apache · Aug 3, 2023 · 40644f7 · 40644f7
1 parent 68fc264
commit 40644f7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/plc4go/assets/testing/protocols/opcua/DriverTestsuite.xml b/plc4go/assets/testing/protocols/opcua/DriverTestsuite.xml
@@ -39,16 +39,16 @@
           <messageType dataType="string" bitLength="24" encoding="UTF-8">HEL</messageType>
           <OpcuaHelloRequest>
             <chunk dataType="string" bitLength="8" encoding="UTF-8">F</chunk>
-            <messageSize dataType="int" bitLength="32">52</messageSize>
+            <messageSize dataType="int" bitLength="32">47</messageSize>
             <version dataType="int" bitLength="32">0</version>
             <receiveBufferSize dataType="int" bitLength="32">65535</receiveBufferSize>
             <sendBufferSize dataType="int" bitLength="32">65535</sendBufferSize>
             <maxMessageSize dataType="int" bitLength="32">2097152</maxMessageSize>
             <maxChunkCount dataType="int" bitLength="32">64</maxChunkCount>
             <endpoint>
               <PascalString>
-                <sLength dataType="int" bitLength="32">20</sLength>
-                <stringValue dataType="string" bitLength="160" encoding="UTF-8">opc.test://hurz:null</stringValue>
+                <sLength dataType="int" bitLength="32">15</sLength>
+                <stringValue dataType="string" bitLength="120" encoding="UTF-8">opc.test://hurz</stringValue>
               </PascalString>
             </endpoint>
           </OpcuaHelloRequest>

diff --git a/plc4go/internal/opcua/Driver.go b/plc4go/internal/opcua/Driver.go
@@ -128,7 +128,12 @@ func (d *Driver) GetConnectionWithContext(ctx context.Context, transportUrl url.
 	configuration.host = transportHost
 	configuration.port = transportPort
 	configuration.transportEndpoint = transportEndpoint
-	configuration.endpoint = "opc." + transportCode + "://" + transportHost + ":" + transportPort + "" + transportEndpoint
+	portAddition := ""
+	if transportPort != "" {
+		portAddition += ":" + transportPort
+	}
+	configuration.endpoint = "opc." + transportCode + "://" + transportHost + portAddition + "" + transportEndpoint
+	d.log.Debug().Stringer("configuration", &configuration).Msg("working with configurartion")
 
 	if securityPolicy := configuration.securityPolicy; securityPolicy != "" && securityPolicy != "None" {
 		d.log.Trace().Str("securityPolicy", securityPolicy).Msg("working with security policy")
@@ -151,7 +156,8 @@ func (d *Driver) GetConnectionWithContext(ctx context.Context, transportUrl url.
 
 	// Create the new connection
 	connection := NewConnection(
-		codec, configuration,
+		codec,
+		configuration,
 		driverContext,
 		d.GetPlcTagHandler(),
 		driverOptions,

diff --git a/plc4go/internal/opcua/SecureChannel.go b/plc4go/internal/opcua/SecureChannel.go
@@ -279,13 +279,15 @@ func (s *SecureChannel) onConnect(ctx context.Context, connection *Connection, c
 	s.log.Debug().Msg("Opcua Driver running in ACTIVE mode.")
 	s.codec = connection.messageCodec // TODO: why would we need to set that?
 
-	hello := readWriteModel.NewOpcuaHelloRequest(FINAL_CHUNK,
+	hello := readWriteModel.NewOpcuaHelloRequest(
+		FINAL_CHUNK,
 		VERSION,
 		DEFAULT_RECEIVE_BUFFER_SIZE,
 		DEFAULT_SEND_BUFFER_SIZE,
 		DEFAULT_MAX_MESSAGE_SIZE,
 		DEFAULT_MAX_CHUNK_COUNT,
-		s.endpoint)
+		s.endpoint,
+	)
 
 	requestConsumer := func(transactionId int32) {
 		s.log.Trace().Int32("transactionId", transactionId).Msg("request consumer called")

diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/OpcuaPlcDriver.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/OpcuaPlcDriver.java
@@ -48,8 +48,8 @@ public class OpcuaPlcDriver extends GeneratedDriverBase<OpcuaAPU> {
 
     public static final Pattern URI_PATTERN = Pattern.compile("^(?<protocolCode>opcua)" +
         INET_ADDRESS_PATTERN +
-        "(?<transportEndpoint>[\\w/=]*)[\\?]?" +
-        "(?<paramString>([^\\=]+\\=[^\\=&]+[&]?)*)"
+        "(?<transportEndpoint>[\\w/=]*)[?]?" +
+        "(?<paramString>([^=]+=[^=&]+&?)*)"
     );
 
     private boolean isEncrypted;
@@ -156,7 +156,8 @@ public PlcConnection getConnection(String connectionString) throws PlcConnection
         configuration.setHost(transportHost);
         configuration.setPort(transportPort);
         configuration.setTransportEndpoint(transportEndpoint);
-        configuration.setEndpoint("opc." + transportCode + "://" + transportHost + ":" + transportPort + "" + transportEndpoint);
+        String portAddition = transportPort != null ? ":" + transportPort : "";
+        configuration.setEndpoint("opc." + transportCode + "://" + transportHost + portAddition + transportEndpoint);
 
         // Try to find a transport in order to create a communication channel.
         Transport transport = null;