cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add exception guard to ReadFileCallback in CLI

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-04-20 23:32:42 +01:00
parent aa441668db
commit b7951be44a
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
solc/CommandLineInterface.cpp
View File

@ -618,32 +618,43 @@ bool CommandLineInterface::processInput()
{ {
ReadFile::Callback fileReader = [this](string const& _path) ReadFile::Callback fileReader = [this](string const& _path)
{ {
auto path = boost::filesystem::path(_path); try
auto canonicalPath = boost::filesystem::canonical(path);
bool isAllowed = false;
for (auto const& allowedDir: m_allowedDirectories)
{ {
// If dir is a prefix of boostPath, we are fine. auto path = boost::filesystem::path(_path);
if ( auto canonicalPath = boost::filesystem::canonical(path);
std::distance(allowedDir.begin(), allowedDir.end()) <= std::distance(canonicalPath.begin(), canonicalPath.end()) && bool isAllowed = false;
std::equal(allowedDir.begin(), allowedDir.end(), canonicalPath.begin()) for (auto const& allowedDir: m_allowedDirectories)
)
{ {
isAllowed = true; // If dir is a prefix of boostPath, we are fine.
break; if (
std::distance(allowedDir.begin(), allowedDir.end()) <= std::distance(canonicalPath.begin(), canonicalPath.end()) &&
std::equal(allowedDir.begin(), allowedDir.end(), canonicalPath.begin())
)
{
isAllowed = true;
break;
}
}
if (!isAllowed)
return ReadFile::Result{false, "File outside of allowed directories."};
else if (!boost::filesystem::exists(path))
return ReadFile::Result{false, "File not found."};
else if (!boost::filesystem::is_regular_file(canonicalPath))
return ReadFile::Result{false, "Not a valid file."};
else
{
auto contents = dev::contentsString(canonicalPath.string());
m_sourceCodes[path.string()] = contents;
return ReadFile::Result{true, contents};
} }
} }
if (!isAllowed) catch (Exception const& _exception)
return ReadFile::Result{false, "File outside of allowed directories."};
else if (!boost::filesystem::exists(path))
return ReadFile::Result{false, "File not found."};
else if (!boost::filesystem::is_regular_file(canonicalPath))
return ReadFile::Result{false, "Not a valid file."};
else
{ {
auto contents = dev::contentsString(canonicalPath.string()); return ReadFile::Result{false, "Exception in read callback: " + boost::diagnostic_information(_exception)};
m_sourceCodes[path.string()] = contents; }
return ReadFile::Result{true, contents}; catch (...)
{
return ReadFile::Result{false, "Unknown exception in read callback."};
} }
}; };