Fix OPC Discovery Handler resolving IP bug (#584)

* fix opc ip duplicate path error Signed-off-by: harrisontin <[email protected]> * Update patch version Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * address feedback Signed-off-by: harrisontin <[email protected]> --------- Signed-off-by: harrisontin <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
project-akri · Apr 17, 2023 · adb2df9 · adb2df9
1 parent 0171597
commit adb2df9
Show file tree

Hide file tree

Showing 18 changed files with 57 additions and 43 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "agent"
-version = "0.10.2"
+version = "0.10.3"
 authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

diff --git a/controller/Cargo.toml b/controller/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "controller"
-version = "0.10.2"
+version = "0.10.3"
 authors = ["<[email protected]>", "<[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml
@@ -15,9 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.10.2
+version: 0.10.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.10.2
+appVersion: 0.10.3
diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "debug-echo-discovery-handler"
-version = "0.10.2"
+version = "0.10.3"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "onvif-discovery-handler"
-version = "0.10.2"
+version = "0.10.3"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "opcua-discovery-handler"
-version = "0.10.2"
+version = "0.10.3"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "udev-discovery-handler"
-version = "0.10.2"
+version = "0.10.3"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-debug-echo"
-version = "0.10.2"
+version = "0.10.3"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-onvif"
-version = "0.10.2"
+version = "0.10.3"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-opcua"
-version = "0.10.2"
+version = "0.10.3"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

diff --git a/discovery-handlers/opcua/src/discovery_impl.rs b/discovery-handlers/opcua/src/discovery_impl.rs
@@ -4,6 +4,7 @@ use super::wrappers::{
 };
 use ::url::Url;
 use akri_discovery_utils::filtering::{should_include, FilterList};
+use anyhow::Context;
 use log::{error, info, trace};
 use opcua::client::prelude::*;
 use opcua::core::constants::DEFAULT_OPC_UA_SERVER_PORT;
@@ -193,29 +194,37 @@ fn get_socket_addr(url: &str) -> Result<SocketAddr, anyhow::Error> {
 }
 
 // This checks if the discovery_url can be resolved, if not use ip address instead
-fn get_discovery_url_ip(ip_url: &str, discovery_url: String) -> Result<String, anyhow::Error> {
-    let url = Url::parse(&discovery_url)
-        .map_err(|_| anyhow::format_err!("could not parse url {discovery_url}"))?;
-    if url.scheme() != OPC_TCP_SCHEME {
+fn get_discovery_url_ip(
+    ip_url_str: &str,
+    discovery_url_str: String,
+) -> Result<String, anyhow::Error> {
+    let ip_url = Url::parse(ip_url_str).with_context(|| "could not parse url {ip_url_str}")?;
+    let discovery_url = Url::parse(&discovery_url_str)
+        .with_context(|| "could not parse url {discovery_url_str}")?;
+    if discovery_url.scheme() != OPC_TCP_SCHEME {
         return Err(anyhow::format_err!(
             "format of OPC UA url {} is not valid",
-            url
+            discovery_url
         ));
     }
-    let mut path = url.path().to_string();
-    let host = url.host_str().unwrap();
-    let port = url.port().unwrap_or(DEFAULT_OPC_UA_SERVER_PORT);
+    let mut path = discovery_url.path().to_string();
+    let host = discovery_url.host_str().unwrap();
+    let port = discovery_url.port().unwrap_or(DEFAULT_OPC_UA_SERVER_PORT);
 
     let addr_str = format!("{}:{}", host, port);
 
     // check if the hostname can be resolved to socket address
     match addr_str.to_socket_addrs() {
-        Ok(_url) => Ok(discovery_url),
+        Ok(_url) => Ok(discovery_url_str),
         Err(_) => {
-            if ip_url.ends_with('/') && path.starts_with('/') {
+            if ip_url_str.ends_with('/') && path.starts_with('/') {
                 path.remove(0);
             }
-            let url = format!("{}{}", ip_url, path);
+            let url = if ip_url.path() == "" || ip_url.path() == "/" {
+                format!("{}{}", ip_url, path)
+            } else {
+                ip_url_str.to_string()
+            };
             trace!(
                 "get_discovery_url_ip - cannot resolve the application url from server, using ip address instead of hostname: {}",
                 url
@@ -466,14 +475,19 @@ mod tests {
     #[test]
     // Test that it converts the discovery url to an ip address if the discovery url is a hostname that is not resolvable
     fn test_get_discovery_url_ip() {
-        let ip_url = "opc.tcp://192.168.0.1:50000/";
+        let ip_url = "opc.tcp://192.168.0.1:50000";
+        let ip_url2 = "opc.tcp://192.168.0.1:50000/OPCUA/Simluation";
 
         //  OPCTest.invalid is not a valid hostname, it should be overwritten by the ip_url
         let discovery_url = "opc.tcp://OPCTest.invalid:50000/OPCUA/Simluation";
         assert_eq!(
             get_discovery_url_ip(ip_url, discovery_url.to_string()).unwrap(),
             "opc.tcp://192.168.0.1:50000/OPCUA/Simluation"
         );
+        assert_eq!(
+            get_discovery_url_ip(ip_url2, discovery_url.to_string()).unwrap(),
+            "opc.tcp://192.168.0.1:50000/OPCUA/Simluation"
+        );
 
         // 192.168.0.2 is a valid ip address, it should not be overwritten
         let discovery_url = "opc.tcp://192.168.0.2:50000/OPCUA/Simluation";

diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-udev"
-version = "0.10.2"
+version = "0.10.3"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-discovery-utils"
-version = "0.10.2"
+version = "0.10.3"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "udev-video-broker"
-version = "0.10.2"
+version = "0.10.3"
 authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-shared"
-version = "0.10.2"
+version = "0.10.3"
 authors = ["<[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.10.2
+0.10.3
diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "webhook-configuration"
-version = "0.10.2"
+version = "0.10.3"
 authors = ["DazWilkin <[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"