diff options
| author | Zousar Shaker <[email protected]> | 2025-10-02 03:11:53 -0600 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-10-02 11:11:53 +0200 |
| commit | c153a4516968c453fce626133d5966682c6ae341 (patch) | |
| tree | 65c0eb5d3fb0f4216780c6dd0e9c1c583f3e38d1 | |
| parent | 5.7.4 (diff) | |
| download | zen-c153a4516968c453fce626133d5966682c6ae341.tar.xz zen-c153a4516968c453fce626133d5966682c6ae341.zip | |
Zs/OIDC exe path handling (#538)
* Fix handling of oidc-exe-path
The path was only being set if the file DIDN'T exist on the server (along with the warning about it not existing). Now set if it DOES exist, and the warning emitted if it DOESN'T.
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | src/zenserver/projectstore/projectstore.cpp | 14 |
2 files changed, 13 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index bc0664bd5..610e61b12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ ## +- Bugfix: Parsing of `zen oplog-import` `--oidctoken-exe-path` option fixed + +## 5.7.4 - Bugfix: Parsing of `zen builds` `--log-progress` option fixed - Bugfix: Rebuild State phase of `zen builds download` could read out of bound for target path array - Bugfix: Don't include oplogs pending delete when scanning for oplogs diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp index 0fe66bdf1..181177653 100644 --- a/src/zenserver/projectstore/projectstore.cpp +++ b/src/zenserver/projectstore/projectstore.cpp @@ -216,11 +216,14 @@ namespace { if (std::string_view OidcExePathString = Cloud["oidc-exe-path"].AsString(); !OidcExePathString.empty()) { std::filesystem::path OidcExePathMaybe(OidcExePathString); - if (!IsFile(OidcExePathMaybe)) + if (IsFile(OidcExePathMaybe)) { - ZEN_WARN("Path to OidcToken executable '{}' can not be reached by server", OidcExePathString); OidcExePath = std::move(OidcExePathMaybe); } + else + { + ZEN_WARN("Path to OidcToken executable '{}' can not be reached by server", OidcExePathString); + } } std::string_view KeyParam = Cloud["key"sv].AsString(); if (KeyParam.empty()) @@ -326,11 +329,14 @@ namespace { if (std::string_view OidcExePathString = Builds["oidc-exe-path"].AsString(); !OidcExePathString.empty()) { std::filesystem::path OidcExePathMaybe(OidcExePathString); - if (!IsFile(OidcExePathMaybe)) + if (IsFile(OidcExePathMaybe)) { - ZEN_WARN("Path to OidcToken executable '{}' can not be reached by server", OidcExePathString); 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(); if (BuildIdParam.empty()) |