diff options
Diffstat (limited to 'zenserver/testing')
| -rw-r--r-- | zenserver/testing/launch.cpp | 27 | ||||
| -rw-r--r-- | zenserver/testing/launch.h | 10 |
2 files changed, 34 insertions, 3 deletions
diff --git a/zenserver/testing/launch.cpp b/zenserver/testing/launch.cpp index 55695ac9c..013aa28b8 100644 --- a/zenserver/testing/launch.cpp +++ b/zenserver/testing/launch.cpp @@ -2,6 +2,8 @@ #include "launch.h" +#if ZEN_WITH_COMPUTE_SERVICES + #include <zencore/compactbinary.h> #include <zencore/compactbinarybuilder.h> #include <zencore/filesystem.h> @@ -10,16 +12,17 @@ #include <zencore/iohash.h> #include <zencore/logging.h> #include <zencore/windows.h> -#include <zenstore/CAS.h> +#include <zenstore/cas.h> +ZEN_THIRD_PARTY_INCLUDES_START #include <AccCtrl.h> #include <AclAPI.h> +#include <atlbase.h> #include <sddl.h> - #include <UserEnv.h> +ZEN_THIRD_PARTY_INCLUDES_END #pragma comment(lib, "UserEnv.lib") -#include <atlbase.h> #include <filesystem> #include <span> @@ -127,6 +130,8 @@ BasicJob::ExitCode() return gsl::narrow_cast<int>(Ec); } +//////////////////////////////////////////////////////////////////////////////// + struct SandboxedJob { SandboxedJob() = default; @@ -317,6 +322,8 @@ SandboxedJob::SpawnJob(std::filesystem::path ExePath) return true; } +//////////////////////////////////////////////////////////////////////////////// + HttpLaunchService::HttpLaunchService(CasStore& Store, const std::filesystem::path& SandboxBaseDir) : m_Log(logging::Get("exec")) , m_CasStore(Store) @@ -336,6 +343,9 @@ HttpLaunchService::HttpLaunchService(CasStore& Store, const std::filesystem::pat case HttpVerb::kPost: break; + + default: + break; } }, HttpVerb::kGet | HttpVerb::kPost); @@ -362,6 +372,9 @@ HttpLaunchService::HttpLaunchService(CasStore& Store, const std::filesystem::pat Job.SpawnJob("c:\\windows\\system32\\cmd.exe"); } break; + + default: + break; } }, HttpVerb::kGet | HttpVerb::kPost); @@ -413,6 +426,9 @@ HttpLaunchService::HttpLaunchService(CasStore& Store, const std::filesystem::pat return HttpReq.WriteResponse(HttpResponseCode::OK, Response); } break; + + default: + break; } }, HttpVerb::kPost); @@ -496,6 +512,9 @@ HttpLaunchService::HttpLaunchService(CasStore& Store, const std::filesystem::pat return HttpReq.WriteResponse(HttpResponseCode::OK, Response.Save()); } break; + + default: + break; } }, HttpVerb::kGet | HttpVerb::kPost); @@ -530,3 +549,5 @@ HttpLaunchService::CreateNewSandbox() } } // namespace zen + +#endif // ZEN_WITH_COMPUTE_SERVICES diff --git a/zenserver/testing/launch.h b/zenserver/testing/launch.h index 49f12e2ec..13e3db4df 100644 --- a/zenserver/testing/launch.h +++ b/zenserver/testing/launch.h @@ -2,6 +2,14 @@ #pragma once +#include <zencore/zencore.h> + +#if !defined(ZEN_WITH_COMPUTE_SERVICES) +# define ZEN_WITH_COMPUTE_SERVICES ZEN_PLATFORM_WINDOWS +#endif + +#if ZEN_WITH_COMPUTE_SERVICES + #include <zencore/logging.h> #include <zenhttp/httpserver.h> @@ -36,3 +44,5 @@ private: }; } // namespace zen + +#endif // ZEN_WITH_COMPUTE_SERVICES |