oxen-io/lokinet
1
1
Fork 0
mirror of https://github.com/oxen-io/lokinet synced 2023-12-14 06:53:00 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #917 from jagerman/remove-resolveConf

Browse source 
Remove shell globbing of path
This commit is contained in:
Jeff 2019-11-21 11:33:54 -05:00 committed by GitHub
commit 99d76280be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
daemon/main.cpp
View file

@ -7,10 +7,6 @@
#include <csignal>
#if !defined(_WIN32) && !defined(__OpenBSD__)
#include <wordexp.h>
#endif
#include <cxxopts.hpp>
#include <string>
#include <iostream>
@ -59,31 +55,6 @@ handle_signal_win32(DWORD fdwCtrlType)
}
#endif
/// resolve ~ and symlinks into actual paths (so we know the real path on disk,
/// to remove assumptions and confusion with permissions)
std::string
resolvePath(std::string conffname)
{
// implemented in netbsd, removed downstream for security reasons
// even though it is defined by POSIX.1-2001+
#if !defined(_WIN32) && !defined(__OpenBSD__)
wordexp_t exp_result;
wordexp(conffname.c_str(), &exp_result, 0);
char *resolvedPath = realpath(exp_result.we_wordv[0], NULL);
if(!resolvedPath)
{
// relative paths don't need to be resolved
// llarp::LogWarn("Can't resolve path: ", exp_result.we_wordv[0]);
return conffname;
}
return resolvedPath;
#else
// TODO(despair): dig through LLVM local patch set
// one of these exists deep in the bowels of LLVMSupport
return conffname; // eww, easier said than done outside of cygwin
#endif
}
/// this sets up, configures and runs the main context
static void
run_main_context(std::string conffname, llarp_main_runtime_opts opts)
@ -152,7 +123,7 @@ main(int argc, char *argv[])
bool genconfigOnly = false;
bool asRouter = false;
bool overWrite = false;
std::string conffname; // suggestions: confFName? conf_fname?
std::string conffname;
try
{
auto result = options.parse(argc, argv);
@ -225,34 +196,10 @@ main(int argc, char *argv[])
// when we have an explicit filepath
fs::path fname = fs::path(conffname);
fs::path basedir = fname.parent_path();
conffname = fname.string();
conffname = resolvePath(conffname);
std::error_code ec;
// llarp::LogDebug("Basedir: ", basedir);
if(basedir.string().empty())
if(!basedir.empty())
{
// relative path to config
// does this file exist?
if(genconfigOnly)
{
if(!llarp_ensure_config(conffname.c_str(), basedir.string().c_str(),
overWrite, asRouter))
return 1;
}
else
{
if(!fs::exists(fname, ec))
{
llarp::LogError("Config file not found ", conffname);
return 1;
}
}
}
else
{
// absolute path to config
std::error_code ec;
if(!fs::create_directories(basedir, ec))
{
if(ec)
@ -262,29 +209,27 @@ main(int argc, char *argv[])
return 1;
}
}
if(genconfigOnly)
}
if(genconfigOnly)
{
if(!llarp_ensure_config(conffname.c_str(), basedir.string().c_str(),
overWrite, asRouter))
return 1;
}
else
{
std::error_code ec;
if(!fs::exists(fname, ec))
{
// find or create file
if(!llarp_ensure_config(conffname.c_str(), basedir.string().c_str(),
overWrite, asRouter))
return 1;
}
else
{
// does this file exist?
if(!fs::exists(conffname, ec))
{
llarp::LogError("Config file not found ", conffname);
return 1;
}
llarp::LogError("Config file not found ", conffname);
return 1;
}
}
}
else
{
auto basepath = llarp::GetDefaultConfigDir();
// I don't think this is necessary with this condition
// conffname = resolvePath(conffname);
llarp::LogDebug("Find or create ", basepath.string());
std::error_code ec;

3
llarp/util/bencode.hpp
View file

@ -387,7 +387,8 @@ namespace llarp
return bencode_read_integer(buffer, &v);
}
return bencode_discard(buffer);
}, buf);
},
buf);
// rewind
buf->cur = buf->base;
return ret;