Skip to content

fix(resourceinfo): reject manifest paths escaping the destination #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rakdos8 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(resourceinfo): reject manifest paths escaping the destination #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 66 additions & 0 deletions src/ResourceInfo/ResourceInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,47 @@
namespace CarbonResources
{

namespace
{

bool IsPathWithinBase( const std::filesystem::path& base, const std::filesystem::path& candidate )
{
std::error_code ec;

std::filesystem::path normalizedBase = std::filesystem::weakly_canonical( base, ec );
if( ec )
{
normalizedBase = base.lexically_normal();
}

ec.clear();

std::filesystem::path normalizedCandidate = std::filesystem::weakly_canonical( candidate, ec );
if( ec )
{
normalizedCandidate = candidate.lexically_normal();
}

std::filesystem::path relative = normalizedCandidate.lexically_relative( normalizedBase );

if( relative.empty() )
{
return false;
}

for( const auto& part : relative )
{
if( part == ".." )
{
return false;
}
}

return true;
}

}

std::string Location::CalculateLocationFromChecksums( const std::string& relativePathChecksum, const std::string& dataChecksum ) const
{
std::stringstream ss;
Expand Down Expand Up @@ -330,6 +371,11 @@ Result ResourceInfo::PutDataLocalRelative( ResourcePutDataParams& params ) const

std::filesystem::path path = params.resourceDestinationSettings.basePath / m_relativePath.GetValue();

if( !IsPathWithinBase( params.resourceDestinationSettings.basePath, path ) )
{
return Result{ ResultType::MALFORMED_RESOURCE_INPUT };
}

bool res = ResourceTools::SaveFile( path, data );

if( res )
Expand All @@ -349,6 +395,11 @@ Result ResourceInfo::PutDataRemoteCdn( ResourcePutDataParams& params ) const
// Construct path
std::filesystem::path dataPath = params.resourceDestinationSettings.basePath / m_location.GetValue().ToString();

if( !IsPathWithinBase( params.resourceDestinationSettings.basePath, dataPath ) )
{
return Result{ ResultType::MALFORMED_RESOURCE_INPUT };
}

std::string compressedData;

if( !ResourceTools::GZipCompressData( data, compressedData ) )
Expand All @@ -375,6 +426,11 @@ Result ResourceInfo::PutDataLocalCdn( ResourcePutDataParams& params ) const
// Construct path
std::filesystem::path dataPath = params.resourceDestinationSettings.basePath / m_location.GetValue().ToString();

if( !IsPathWithinBase( params.resourceDestinationSettings.basePath, dataPath ) )
{
return Result{ ResultType::MALFORMED_RESOURCE_INPUT };
}

bool res = ResourceTools::SaveFile( dataPath, data );

if( res )
Expand All @@ -391,6 +447,11 @@ Result ResourceInfo::PutDataStreamLocalRelative( ResourcePutDataStreamParams& pa
{
std::filesystem::path path = params.resourceDestinationSettings.basePath / m_relativePath.GetValue();

if( !IsPathWithinBase( params.resourceDestinationSettings.basePath, path ) )
{
return Result{ ResultType::MALFORMED_RESOURCE_INPUT };
}

bool res = params.dataStream->StartWrite( path );

if( res )
Expand All @@ -408,6 +469,11 @@ Result ResourceInfo::PutDataStreamLocalCdn( ResourcePutDataStreamParams& params
// Construct path
std::filesystem::path dataPath = params.resourceDestinationSettings.basePath / m_location.GetValue().ToString();

if( !IsPathWithinBase( params.resourceDestinationSettings.basePath, dataPath ) )
{
return Result{ ResultType::MALFORMED_RESOURCE_INPUT };
}

bool res = params.dataStream->StartWrite( dataPath );

if( res )
Expand Down