Avoid concatenating default path when mainchainrpccookiefile is an absolute path

psgreco · psgreco · commit fe044838753a · 2025-02-23T14:34:19.000-08:00
diff --git a/src/rpc/request.cpp b/src/rpc/request.cpp
@@ -139,7 +139,10 @@ static fs::path GetMainchainAuthCookieFile()
     if (gArgs.GetChainName() == "liquidv1") {
         cookie_file = ".cookie";
     }
-    return fsbridge::AbsPathJoin(GetMainchainDefaultDataDir(), fs::PathFromString(gArgs.GetArg("-mainchainrpccookiefile", cookie_file)));
+    fs::path cookie_path = fs::PathFromString(gArgs.GetArg("-mainchainrpccookiefile", cookie_file));
+    if (cookie_path.is_absolute())
+        return cookie_path;
+    return fsbridge::AbsPathJoin(GetMainchainDefaultDataDir(), cookie_path);
 }
 
 bool GetMainchainAuthCookie(std::string *cookie_out)

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,10 @@ static fs::path GetMainchainAuthCookieFile()`
`139`	`139`	`if (gArgs.GetChainName() == "liquidv1") {`
`140`	`140`	`cookie_file = ".cookie";`
`141`	`141`	`}`
`142`		`- return fsbridge::AbsPathJoin(GetMainchainDefaultDataDir(), fs::PathFromString(gArgs.GetArg("-mainchainrpccookiefile", cookie_file)));`
	`142`	`+ fs::path cookie_path = fs::PathFromString(gArgs.GetArg("-mainchainrpccookiefile", cookie_file));`
	`143`	`+ if (cookie_path.is_absolute())`
	`144`	`+ return cookie_path;`
	`145`	`+ return fsbridge::AbsPathJoin(GetMainchainDefaultDataDir(), cookie_path);`
`143`	`146`	`}`
`144`	`147`
`145`	`148`	`bool GetMainchainAuthCookie(std::string *cookie_out)`