Canithesis/checkpoint
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fs: dedup functions, fix absolute paths in cfg

Browse Source 
fixes #2

closes #12
This commit is contained in:
Vaxry
2025-04-14 21:03:10 +01:00
parent ab01c2c469
commit 1bdc60b8d2
5 changed files with 54 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/Crypto.cpp
View File

@@ -3,9 +3,9 @@
#include "../GlobalState.hpp"
#include "../config/Config.hpp"
#include "../debug/log.hpp"
#include "../helpers/FsUtils.hpp"
#include <filesystem>
#include <fstream>
#include <vector>
#include <string_view>
@@ -16,28 +16,15 @@
constexpr const char* KEY_FILENAME = "privateKey.key";
static std::string dataDir() {
static const std::string dir = std::filesystem::canonical(g_pGlobalState->cwd + "/" + g_pConfig->m_config.data_dir).string();
return dir;
}
static std::string readFileAsText(const std::string& path) {
std::ifstream ifs(path);
auto res = std::string((std::istreambuf_iterator<char>(ifs)), (std::istreambuf_iterator<char>()));
if (res.back() == '\n')
res.pop_back();
return res;
}
CCrypto::CCrypto() {
if (!std::filesystem::exists(dataDir() + "/" + KEY_FILENAME)) {
if (!std::filesystem::exists(NFsUtils::dataDir() + "/" + KEY_FILENAME)) {
Debug::log(LOG, "No private key, generating one.");
if (!genKey()) {
Debug::log(CRIT, "Couldn't generate a key.");
throw std::runtime_error("Keygen failed");
}
} else {
auto f = fopen((dataDir() + "/" + KEY_FILENAME).c_str(), "r");
auto f = fopen((NFsUtils::dataDir() + "/" + KEY_FILENAME).c_str(), "r");
PEM_read_PrivateKey(f, &m_evpPkey, nullptr, nullptr);
fclose(f);
}
@@ -113,7 +100,7 @@ bool CCrypto::genKey() {
return false;
}
auto f = fopen((dataDir() + "/" + KEY_FILENAME).c_str(), "w");
auto f = fopen((NFsUtils::dataDir() + "/" + KEY_FILENAME).c_str(), "w");
PEM_write_PrivateKey(f, m_evpPkey, nullptr, nullptr, 0, nullptr, nullptr);
fclose(f);

19
src/core/Handler.cpp
View File

@@ -11,8 +11,8 @@
#include "../debug/log.hpp"
#include "../GlobalState.hpp"
#include "../config/Config.hpp"
#include "../helpers/FsUtils.hpp"
#include <fstream>
#include <filesystem>
#include <random>
#include <sstream>
@@ -26,13 +26,6 @@ constexpr const uint64_t TOKEN_MAX_AGE_MS = 1000 * 60 * 60; // 1hr
constexpr const char* TOKEN_COOKIE_NAME = "checkpoint-token";
//
static std::string readFileAsText(const std::string& path) {
std::ifstream ifs(path);
auto res = std::string((std::istreambuf_iterator<char>(ifs)), (std::istreambuf_iterator<char>()));
if (res.back() == '\n')
res.pop_back();
return res;
}
static std::string generateNonce() {
static std::random_device dev;
@@ -186,8 +179,8 @@ void CServerHandler::onRequest(const Pistache::Http::Request& req, Pistache::Htt
}
if (isResourceCheckpoint(req.resource())) {
response.send(Pistache::Http::Code::Ok,
readFileAsText(g_pGlobalState->cwd + "/" + g_pConfig->m_config.html_dir + "/" + req.resource().substr(req.resource().find("checkpoint/") + 11)));
// no directory traversal is possible when resource is checkpoint
response.send(Pistache::Http::Code::Ok, NFsUtils::readFileAsString(NFsUtils::htmlPath(req.resource().substr(req.resource().find("checkpoint/") + 11))).value());
return;
}
@@ -282,10 +275,10 @@ void CServerHandler::challengeSubmitted(const Pistache::Http::Request& req, Pist
}
void CServerHandler::serveStop(const Pistache::Http::Request& req, Pistache::Http::ResponseWriter& response) {
static const auto PATH = std::filesystem::canonical(g_pGlobalState->cwd + "/" + g_pConfig->m_config.html_dir).string();
static const auto PAGE_INDEX = readFileAsText(PATH + "/index.min.html");
static const auto PAGE_INDEX = NFsUtils::readFileAsString(NFsUtils::htmlPath("/index.min.html")).value();
static const auto PAGE_ROOT = PAGE_INDEX.substr(0, PAGE_INDEX.find_last_of("/") + 1);
CTinylates page(PAGE_INDEX);
page.setTemplateRoot(PATH);
page.setTemplateRoot(PAGE_ROOT);
const auto NONCE = generateNonce();
const auto DIFFICULTY = 4;