Skip to content
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

Fix issue with host header and canonicalURI #9

Merged
merged 2 commits into from
Feb 8, 2024
Merged

Fix issue with host header and canonicalURI #9

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
584d7b9
Fix issue with host header and canonicalURI
jhiemstrawisc Feb 7, 2024
e4676a2
Add function comment
jhiemstrawisc Feb 8, 2024
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
12 changes: 7 additions & 5 deletions src/S3Commands.cc
View file
Open in desktop
jhiemstrawisc marked this conversation as resolved.
Show resolved Hide resolved
jhiemstrawisc marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[lint] reported by reviewdog 🐶

Suggested change
// Takes in the configured `s3.service_url` and uses the bucket/object requested
// to generate the virtual host URL, as well as the canonical URI (which is the
// path to the object).
bool AmazonRequest::parseURL(const std::string &url, const std::string &bucket,
const std::string &object, std::string &host,
std::string &path) {
auto i = url.find("://");
if (i == std::string::npos) {
return false;
}
// protocol = substring( url, 0, i );
auto j = url.find("/", i + 3);
if (j == std::string::npos) {
host = bucket + "." + substring(url, i + 3);
path = "/" + object;

Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ std::string AmazonRequest::canonicalizeQueryString() {
}

bool AmazonRequest::parseURL( const std::string & url,
jhiemstrawisc marked this conversation as resolved.
Show resolved Hide resolved
const std::string & bucket,
const std::string & object,
std::string & host,
std::string & path ) {
auto i = url.find( "://" );
Expand All @@ -43,13 +45,13 @@ bool AmazonRequest::parseURL( const std::string & url,

auto j = url.find( "/", i + 3 );
if( j == std::string::npos ) {
host = substring( url, i + 3 );
path = "/";
host = bucket + "." + substring( url, i + 3 );
path = "/" + object;
return true;
}

host = substring( url, i + 3, j );
path = substring( url, j );
host = bucket + "." + substring( url, i + 3, j );
path = substring( url, j ) + object;
return true;
}
jhiemstrawisc marked this conversation as resolved.
Show resolved Hide resolved

Expand Down Expand Up @@ -164,7 +166,7 @@ bool AmazonRequest::createV4Signature( const std::string & payload,
std::string payloadHash;
convertMessageDigestToLowercaseHex( messageDigest, mdLength, payloadHash );
if( sendContentSHA ) {
headers[ "x-amz-content-sha256" ] = payloadHash;
headers[ "X-Amz-Content-Sha256" ] = payloadHash;
}

// The canonical list of headers is a sorted list of lowercase header
Expand Down
55 changes: 22 additions & 33 deletions src/S3Commands.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,33 @@ public:
const std::string & s,
const std::string & akf,
const std::string & skf,
const std::string & b,
const std::string & o,
int sv = 4
) :
HTTPRequest( s ),
accessKeyFile(akf),
secretKeyFile(skf),
signatureVersion(sv)
signatureVersion(sv),
bucket(b),
object(o)
{
requiresSignature = true;
if (! parseURL(hostUrl, host, canonicalURI)) {
// Start off by parsing the hostUrl, which we use in conjunction with the bucket to fill in the host (for setting host header).
// For example, if the incoming hostUrl (which we get from config) is "https://my-url.com:443", the bucket is "my-bucket", and
// the object is "my-object", then the host will be "my-bucket.my-url.com:443" and the canonicalURI will be "/my-object".
if (! parseURL(hostUrl, b, o, host, canonicalURI)) {
errorCode = "E_INVALID_SERVICE_URL";
errorMessage = "Failed to parse host and canonicalURI from service URL.";
}

if( canonicalURI.empty() ) { canonicalURI = "/"; }

// Now that we have the host and canonicalURI, we can build the actual url we perform the curl against.
// Using the previous example, we'd get a new hostUrl of "https://my-bucket.my-url.com:443/my-object".
hostUrl = protocol + "://" +
host + canonicalURI;

// If we can, set the region based on the host.
size_t secondDot = host.find( ".", 2 + 1 );
if( host.find( "s3." ) == 0 ) {
Expand All @@ -38,6 +50,8 @@ public:
return &secretKeyFile; }

bool parseURL( const std::string & url,
const std::string & bucket,
const std::string & object,
std::string & host,
std::string & path );

Expand All @@ -57,6 +71,9 @@ protected:
std::string host;
std::string canonicalURI;

std::string bucket;
std::string object;

std::string region;
std::string service;

Expand All @@ -76,21 +93,13 @@ public:
const std::string & b,
const std::string & o
) :
AmazonRequest(s, akf, skf),
bucket(b),
object(o)
{
hostUrl = protocol + "://" + bucket + "." +
host + canonicalURI + object;
}
AmazonRequest(s, akf, skf, b, o){}

virtual ~AmazonS3Upload();

virtual bool SendRequest( const std::string & payload, off_t offset, size_t size );

protected:
std::string bucket;
std::string object;
std::string path;
};

Expand All @@ -104,21 +113,11 @@ public:
const std::string & b,
const std::string & o
) :
AmazonRequest(s, akf, skf),
bucket(b),
object(o)
{
hostUrl = protocol + "://" + bucket + "." +
host + canonicalURI + object;
}
AmazonRequest(s, akf, skf, b, o){}

virtual ~AmazonS3Download();

virtual bool SendRequest( off_t offset, size_t size );

protected:
std::string bucket;
std::string object;
};

class AmazonS3Head : public AmazonRequest {
Expand All @@ -131,21 +130,11 @@ public:
const std::string & b,
const std::string & o
) :
AmazonRequest(s, akf, skf),
bucket(b),
object(o)
{
hostUrl = protocol + "://" + bucket + "." +
host + canonicalURI + object;
}
AmazonRequest(s, akf, skf, b, o){}

virtual ~AmazonS3Head();

virtual bool SendRequest();

protected:
std::string bucket;
std::string object;
};

#endif /* S3_COMMANDS_H */
Loading