chn/hpcstat
1
0
Fork 0
mirror of https://github.com/CHN-beta/hpcstat.git synced 2026-01-11 02:09:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

调整打包

Browse Source
This commit is contained in:
陈浩南
2024-05-04 12:22:41 +08:00
parent 86e85f87e3
commit 1e0cc1ec74
14 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/env.cpp
View File

@@ -15,5 +15,4 @@ namespace hpcstat::env
}
else return value;
}
// XDG_SESSION_ID HPCSTAT_SUBACCOUNT SSH_CONNECTION
}

16
src/ssh.cpp
View File

@@ -14,12 +14,12 @@ namespace hpcstat::ssh
{
std::optional<std::string> fingerprint()
{
if (auto datadir = env::env("HPCSTAT_DATADIR", true); !datadir)
if (auto sharedir = env::env("HPCSTAT_SHAREDIR", true); !sharedir)
return std::nullopt;
else if
(
auto output =
exec(std::filesystem::path(*datadir) / "ssh-add", { "-l" });
exec(std::filesystem::path(*sharedir) / "ssh-add", { "-l" });
!output
)
{ std::cerr << "Failed to get ssh fingerprints\n"; return std::nullopt; }
@@ -39,16 +39,16 @@ namespace hpcstat::ssh
}
std::optional<std::string> sign(std::string message, std::string fingerprint)
{
if (auto datadir = env::env("HPCSTAT_DATADIR", true); !datadir)
if (auto sharedir = env::env("HPCSTAT_SHAREDIR", true); !sharedir)
return std::nullopt;
else if
(
auto output = exec
(
std::filesystem::path(*datadir) / "ssh-keygen",
std::filesystem::path(*sharedir) / "ssh-keygen",
{
"-Y", "sign", "-q",
"-f", fmt::format("{}/keys/{}", *datadir, Keys[fingerprint].PubkeyFilename),
"-f", fmt::format("{}/keys/{}", *sharedir, Keys[fingerprint].PubkeyFilename),
"-n", "hpcstat@chn.moe", "-"
},
message
@@ -60,7 +60,7 @@ namespace hpcstat::ssh
}
bool verify(std::string message, std::string signature, std::string fingerprint)
{
if (auto datadir = env::env("HPCSTAT_DATADIR", true); !datadir)
if (auto sharedir = env::env("HPCSTAT_SHAREDIR", true); !sharedir)
return false;
else
{
@@ -71,10 +71,10 @@ namespace hpcstat::ssh
std::ofstream(signaturefile) << signature;
return exec
(
std::filesystem::path(*datadir) / "ssh-keygen",
std::filesystem::path(*sharedir) / "ssh-keygen",
{
"-Y", "verify",
"-f", fmt::format("{}/keys/{}", *datadir, Keys[fingerprint].PubkeyFilename),
"-f", fmt::format("{}/keys/{}", *sharedir, Keys[fingerprint].PubkeyFilename),
"-n", "hpcstat@chn.moe", "-s", signaturefile.string()
},
message