Use well-known OidcToken paths or command line arguments to determine OidcToken executable path

4 files changed, 36 insertions, 42 deletions

diff --git a/src/zenserver/config/config.cpp b/src/zenserver/config/config.cpp
index 18187711b..f5170add8 100644
--- a/src/zenserver/config/config.cpp
+++ b/src/zenserver/config/config.cpp
@@ -182,6 +182,7 @@ struct ZenServerCmdLineOptions
 	std::string DataDir;
 	std::string AbsLogFile;
 	std::string BaseSnapshotDir;
+	std::string OidcTokenExecutable;
 
 	void AddCliOptions(cxxopts::Options& options, ZenServerConfig& ServerOptions);
 	void ApplyOptions(cxxopts::Options& options, ZenServerConfig& ServerOptions);
@@ -374,6 +375,13 @@ ZenServerCmdLineOptions::AddCliOptions(cxxopts::Options& options, ZenServerConfi
 					   "",
 					   cxxopts::value<bool>(ServerOptions.StatsConfig.Enabled)->default_value("false"),
 					   "Enable statsd reporter (localhost:8125)");
+
+	options.add_option("auth",
+					   "",
+					   "oidctoken-exe-path",
+					   "Path to OidcToken executable",
+					   cxxopts::value<std::string>(OidcTokenExecutable)->default_value(""),
+					   "");
 }
 
 void
@@ -388,12 +396,13 @@ ZenServerCmdLineOptions::ApplyOptions(cxxopts::Options& options, ZenServerConfig
 			throw std::runtime_error(fmt::format("'--snapshot-dir' ('{}') must be a directory", ServerOptions.BaseSnapshotDir));
 	}
 
-	ServerOptions.SystemRootDir	  = MakeSafeAbsolutePath(SystemRootDir);
-	ServerOptions.DataDir		  = MakeSafeAbsolutePath(DataDir);
-	ServerOptions.ContentDir	  = MakeSafeAbsolutePath(ContentDir);
-	ServerOptions.AbsLogFile	  = MakeSafeAbsolutePath(AbsLogFile);
-	ServerOptions.ConfigFile	  = MakeSafeAbsolutePath(ConfigFile);
-	ServerOptions.BaseSnapshotDir = MakeSafeAbsolutePath(BaseSnapshotDir);
+	ServerOptions.SystemRootDir		  = MakeSafeAbsolutePath(SystemRootDir);
+	ServerOptions.DataDir			  = MakeSafeAbsolutePath(DataDir);
+	ServerOptions.ContentDir		  = MakeSafeAbsolutePath(ContentDir);
+	ServerOptions.AbsLogFile		  = MakeSafeAbsolutePath(AbsLogFile);
+	ServerOptions.ConfigFile		  = MakeSafeAbsolutePath(ConfigFile);
+	ServerOptions.BaseSnapshotDir	  = MakeSafeAbsolutePath(BaseSnapshotDir);
+	ServerOptions.OidcTokenExecutable = MakeSafeAbsolutePath(OidcTokenExecutable);
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/src/zenserver/config/config.h b/src/zenserver/config/config.h
index 40639da13..2d37697cd 100644
--- a/src/zenserver/config/config.h
+++ b/src/zenserver/config/config.h
@@ -55,14 +55,15 @@ struct ZenServerConfig
 	bool				  IsDedicated	  = false;	// Indicates a dedicated/shared instance, with larger resource requirements
 	bool				  ShouldCrash	  = false;	// Option for testing crash handling
 	bool				  IsFirstRun	  = false;
-	std::filesystem::path ConfigFile;		// Path to Lua config file
-	std::filesystem::path SystemRootDir;	// System root directory (used for machine level config)
-	std::filesystem::path ContentDir;		// Root directory for serving frontend content (experimental)
-	std::filesystem::path DataDir;			// Root directory for state (used for testing)
-	std::filesystem::path AbsLogFile;		// Absolute path to main log file
-	std::filesystem::path BaseSnapshotDir;	// Path to server state snapshot (will be copied into data dir on start)
-	std::string			  ChildId;			// Id assigned by parent process (used for lifetime management)
-	std::string			  LogId;			// Id for tagging log output
+	std::filesystem::path ConfigFile;			// Path to Lua config file
+	std::filesystem::path SystemRootDir;		// System root directory (used for machine level config)
+	std::filesystem::path ContentDir;			// Root directory for serving frontend content (experimental)
+	std::filesystem::path DataDir;				// Root directory for state (used for testing)
+	std::filesystem::path AbsLogFile;			// Absolute path to main log file
+	std::filesystem::path BaseSnapshotDir;		// Path to server state snapshot (will be copied into data dir on start)
+	std::filesystem::path OidcTokenExecutable;	// Path to OidcToken executable to use for auth
+	std::string			  ChildId;				// Id assigned by parent process (used for lifetime management)
+	std::string			  LogId;				// Id for tagging log output
 	std::string			  Loggers[zen::logging::level::LogLevelCount];
 #if ZEN_WITH_TRACE
 	bool		 HasTraceCommandlineOptions = false;
diff --git a/src/zenserver/storage/projectstore/httpprojectstore.cpp b/src/zenserver/storage/projectstore/httpprojectstore.cpp
index 4e947f221..3a48ef595 100644
--- a/src/zenserver/storage/projectstore/httpprojectstore.cpp
+++ b/src/zenserver/storage/projectstore/httpprojectstore.cpp
@@ -23,6 +23,7 @@
 #include <zenstore/oplogreferencedset.h>
 #include <zenstore/projectstore.h>
 #include <zenstore/zenstore.h>
+#include <zenutil/authutils.h>
 #include <zenutil/openprocesscache.h>
 #include <zenutil/workerpools.h>
 
@@ -101,7 +102,6 @@ CSVWriteOp(CidStore&					   CidStore,
 //////////////////////////////////////////////////////////////////////////
 
 namespace {
-
 	void CbWriteOp(CidStore&					   CidStore,
 				   bool							   Details,
 				   bool							   OpDetails,
@@ -317,19 +317,9 @@ namespace {
 					AccessToken = GetEnvVariable(AccessTokenEnvVariable);
 				}
 			}
-			std::filesystem::path OidcExePath;
-			if (std::string_view OidcExePathString = Cloud["oidc-exe-path"].AsString(); !OidcExePathString.empty())
-			{
-				std::filesystem::path OidcExePathMaybe(OidcExePathString);
-				if (IsFile(OidcExePathMaybe))
-				{
-					OidcExePath = std::move(OidcExePathMaybe);
-				}
-				else
-				{
-					ZEN_WARN("Path to OidcToken executable '{}' can not be reached by server", OidcExePathString);
-				}
-			}
+
+			std::filesystem::path OidcExePath = FindOidcTokenExePath("");
+
 			std::string_view KeyParam = Cloud["key"sv].AsString();
 			if (KeyParam.empty())
 			{
@@ -435,20 +425,8 @@ namespace {
 					AccessToken = GetEnvVariable(AccessTokenEnvVariable);
 				}
 			}
-			std::filesystem::path OidcExePath;
-			if (std::string_view OidcExePathString = Builds["oidc-exe-path"].AsString(); !OidcExePathString.empty())
-			{
-				std::filesystem::path OidcExePathMaybe(OidcExePathString);
-				if (IsFile(OidcExePathMaybe))
-				{
-					OidcExePath = std::move(OidcExePathMaybe);
-				}
-				else
-				{
-					ZEN_WARN("Path to OidcToken executable '{}' can not be reached by server", OidcExePathString);
-				}
-			}
-			std::string_view BuildIdParam = Builds["buildsid"sv].AsString();
+			std::filesystem::path OidcExePath  = FindOidcTokenExePath("");
+			std::string_view	  BuildIdParam = Builds["buildsid"sv].AsString();
 			if (BuildIdParam.empty())
 			{
 				return {nullptr, "Missing build id"};
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index ab8dbb16b..d5c9558aa 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -24,6 +24,7 @@
 #include <zencore/workthreadpool.h>
 #include <zenhttp/httpserver.h>
 #include <zentelemetry/otlptrace.h>
+#include <zenutil/authutils.h>
 #include <zenutil/service.h>
 #include <zenutil/workerpools.h>
 #include <zenutil/zenserverprocess.h>
@@ -127,6 +128,11 @@ ZenServerBase::Initialize(const ZenServerConfig& ServerOptions, ZenServerState::
 
 	EnqueueSigIntTimer();
 
+	if (!ServerOptions.OidcTokenExecutable.empty())
+	{
+		SetEnvVariable(std::string(GetOidcTokenPathEnvVariableName()), ServerOptions.OidcTokenExecutable.string());
+	}
+
 	m_Http				  = CreateHttpServer(ServerOptions.HttpConfig);
 	int EffectiveBasePort = m_Http->Initialize(ServerOptions.BasePort, ServerOptions.DataDir);
 	if (EffectiveBasePort == 0)