Uri: make sure all local URIs are absolute

Some platforms like QNX have problems with relative local sockets. To be
consistent across all platforms we make sure all local URIs are
represented/treated as absolute paths.

Issues: SILKIT-1779

Signed-off-by: Jan Kraemer <jan.kraemer@vector.com>

Author: VJanKraemer

SilKit/source/core/vasio/Test_ConnectKnownParticipants.cpp

@@ -221,7 +221,6 @@ TEST_F(Test_ConnectKnownParticipants, direct_connect_fallback_to_remote_connect_
     ioContext.Run();
 }
 
-
 TEST_F(Test_ConnectKnownParticipants, remote_connect_timer_expiry_fallback_to_proxy)
 {
     auto MakeFailingConnectPeer{[this](const VAsioPeerInfo& peerInfo) { return MakeConnectPeerThatFails(peerInfo); }};
@@ -272,6 +271,47 @@ TEST_F(Test_ConnectKnownParticipants, remote_connect_timer_expiry_fallback_to_pr
     ioContext.Run();
 }
 
+TEST_F(Test_ConnectKnownParticipants, direct_connect_failure_qnx_with_windows_paths)
+{
+    auto MakeFailingConnectPeer{[this](const VAsioPeerInfo& peerInfo) { return MakeConnectPeerThatFails(peerInfo); }};
+
+    VAsioPeerInfo peerInfo;
+    peerInfo.participantName = "A";
+    peerInfo.participantId = SilKit::Util::Hash::Hash(peerInfo.participantName);
+    peerInfo.acceptorUris.emplace_back("local://C:\\\\tmp\\win.sock");
+    peerInfo.capabilities = "";
+
+    // Arrange
+
+    Sequence s1;
+
+    StrictMock<MockConnectionMethods> connectionMethods;
+    MockConnectKnownParticipantsListener listener;
+
+    EXPECT_CALL(connectionMethods, MakeConnectPeer(WithParticipantName(peerInfo.participantName)))
+        .InSequence(s1)
+        .WillOnce(MakeFailingConnectPeer);
+
+    EXPECT_CALL(connectionMethods, TryRemoteConnectRequest(WithParticipantName(peerInfo.participantName)))
+        .InSequence(s1)
+        .WillOnce(Return(false));
+
+    EXPECT_CALL(connectionMethods, TryProxyConnect(WithParticipantName(peerInfo.participantName)))
+        .InSequence(s1)
+        .WillOnce(Return(false));
+
+    EXPECT_CALL(listener, OnConnectKnownParticipantsFailure).Times(1).InSequence(s1);
+
+    // Act
+
+    ConnectKnownParticipants connectKnownParticipants{ioContext, connectionMethods, listener, settings};
+    connectKnownParticipants.SetLogger(logger);
+
+    connectKnownParticipants.SetKnownParticipants({peerInfo});
+    connectKnownParticipants.StartConnecting();
+
+    ioContext.Run();
+}
 
 TEST_F(Test_ConnectKnownParticipants, remote_connect_waits_for_replies_after_connecting_and_announcement_notifications)
 {

SilKit/source/util/Uri.cpp

@@ -5,11 +5,13 @@
 #include "Uri.hpp"
 
 #include <cctype>
+#include <filesystem>
 
 #include "silkit/participant/exception.hpp"
 
 #include "fmt/format.h"
 
+namespace fs = std::filesystem;
 
 namespace {
 
@@ -154,8 +156,22 @@ auto Uri::Parse(std::string rawUri) -> Uri
 
     if (uri.Type() == UriType::Local)
     {
+#if defined(__QNX__)
         //must be a path, might contain ':' (currently not quoted)
+        if(!rawUri.empty() && !fs::path(rawUri).is_absolute())
+        {
+            // Make sure we always get a proper absolute Path
+            // Treat all relative paths as relative from CWD
+            uri._path = fs::current_path() / rawUri;
+        }
+        else
+        {
+            uri._path = rawUri;
+        }
+#else
         uri._path = rawUri;
+#endif
+
     }
     else
     {

SilKit/source/util/tests/Test_Uri.cpp

@@ -80,6 +80,29 @@ void CheckLocalUri(const std::string& uriString, const std::string& path)
 }
 
 
+#if defined(_WIN32)
+void CheckPlatformLocalPath()
+{
+    //Windows local paths (contains C:\)
+    auto uri = Uri::Parse(R"aw(local://C:\\temp\hello\ world")aw");
+    ASSERT_EQ(uri.Scheme(), "local");
+    ASSERT_EQ(uri.Host(), "");
+    ASSERT_EQ(uri.Port(), 0);
+    ASSERT_EQ(uri.Path(), R"aw(C:\\temp\hello\ world")aw");
+
+    // Check forward slash Paths
+    CheckLocalUri("local:///", "/");
+}
+#else
+// Assume Unix/Posix like local Paths
+void CheckPlatformLocalPath()
+{
+    CheckLocalUri("local:///one/two/three", "/one/two/three");
+    CheckLocalUri("local:///", "/");
+}
+#endif
+
+
 TEST(Test_Uri, parse_silkit_scheme)
 {
     CheckSilKitUri("silkit://localhost:8500", "localhost", 8500);
@@ -143,23 +166,6 @@ TEST(Test_Uri, parse_tcp_scheme)
                 8500);
 }
 
-
-TEST(Test_Uri, parse_local_scheme_posix_path)
-{
-    CheckLocalUri("local:///one/two/three", "/one/two/three");
-    CheckLocalUri("local:///", "/");
-}
-
-
-TEST(Test_Uri, parse_local_scheme_windows_path_slash)
-{
-    CheckLocalUri("local:///", "/");
-}
-
-
-TEST(Test_Uri, parse_local_scheme_windows_path_backslash) {}
-
-
 TEST(Test_Uri, parse_uris)
 {
     auto uri = Uri::Parse("silkit://hostname:1234/path");
@@ -200,13 +206,6 @@ TEST(Test_Uri, parse_uris)
     ASSERT_EQ(uri.Port(), 3456);
     ASSERT_EQ(uri.Path(), "");
 
-    //Windows local paths (contains C:\)
-    uri = Uri::Parse(R"aw(local://C:\\temp\hello\ world")aw");
-    ASSERT_EQ(uri.Scheme(), "local");
-    ASSERT_EQ(uri.Host(), "");
-    ASSERT_EQ(uri.Port(), 0);
-    ASSERT_EQ(uri.Path(), R"aw(C:\\temp\hello\ world")aw");
-
     // No Port given results in default port
     uri = Uri::Parse("silkit://localhost");
     ASSERT_EQ(uri.Scheme(), "silkit");
@@ -219,6 +218,8 @@ TEST(Test_Uri, parse_uris)
     ASSERT_EQ(uri.Host(), "localhost");
     ASSERT_EQ(uri.Port(), 0);
     ASSERT_EQ(uri.Path(), "");
+
+    CheckPlatformLocalPath();
 }