put AWSClient2 back where it belongs, start implementing AWSv4 signatures

Author: svdgraaf

src/common/AWSClient2.cpp

@@ -18,9 +18,9 @@
 static const char* CANONICAL_FORM_POST_LINE = "POST\n/\n\n";
 static const int CANONICAL_FORM_POST_LINE_LEN = 8;
 static const char* HTTPS_REQUEST_POST_LINE =
-        "POST https://%s/ HTTP/1.1\n";
+        "POST https://%s.%s.%s/ HTTP/1.1\n";
 static const int HTTPS_REQUEST_POST_LINE_LEN = 28;
-static const char* HTTP_REQUEST_POST_LINE = "POST http://%s/ HTTP/1.1\n";
+static const char* HTTP_REQUEST_POST_LINE = "POST http://%s.%s.%s/ HTTP/1.1\n";
 static const int HTTP_REQUEST_POST_LINE_LEN = 27;
 static const char* TO_SIGN_TEMPLATE =
         "AWS4-HMAC-SHA256\n%sT%sZ\n%s/%s/%s/aws4_request\n%s";
@@ -62,11 +62,6 @@ void AWSClient2::setAWSEndpoint(const char * awsEndpoint) {
     this->awsEndpoint = new char[len]();
     strcpy(this->awsEndpoint, awsEndpoint);
 }
-void AWSClient2::setAWSDomain(const char * awsDomain) {
-    int len = strlen(awsDomain) + 1;
-    this->awsDomain = new char[len]();
-    strcpy(this->awsDomain, awsDomain);
-}
 void AWSClient2::setAWSSecretKey(const char * awsSecKey) {
     int len = strlen(awsSecKey) + 1;
     this->awsSecKey = new char[len]();
@@ -125,16 +120,6 @@ void AWSClient2::initSignedHeaders() {
     headerLens[headersCreated++] = len;
 }
 
-char* AWSClient2::createHostString(void) {
-  if(awsDomain[0] != '\0') {
-    return awsDomain;
-  } else {
-    char* host = new char[200]();
-    sprintf(host, "%s.%s.%s", awsService, awsRegion, awsEndpoint);
-    return host;
-  }
-}
-
 char* AWSClient2::createStringToSign(void) {
     SHA256* sha256 = new SHA256();
     char* hashed;
@@ -266,8 +251,8 @@ char* AWSClient2::headersToRequest() {
             httpS ? HTTPS_REQUEST_POST_LINE : HTTP_REQUEST_POST_LINE;
 
     /* Calculate length of httpRequest string. */
-    char* host = createHostString();
-    int httpRequestLen = postLineLen + strlen(host);
+    int httpRequestLen = postLineLen + strlen(awsService) + strlen(awsRegion)
+            + strlen(awsEndpoint);
     for (int i = 0; i < headersCreated; i++) {
         /* +1 for newline. */
         httpRequestLen += *(headerLens + i) + 1;
@@ -278,7 +263,8 @@ char* AWSClient2::headersToRequest() {
     /* Create and write to the httpRequest string. */
     char* httpRequest = new char[httpRequestLen + 1]();
     int httpRequestWritten = 0;
-    httpRequestWritten += sprintf(httpRequest + httpRequestWritten, postLine, host);
+    httpRequestWritten += sprintf(httpRequest + httpRequestWritten, postLine,
+            awsService, awsRegion, awsEndpoint);
     for (int i = 0; i < headersCreated; i++) {
         httpRequestWritten += sprintf(httpRequest + httpRequestWritten, "%s\n",
                 *(headers + i));

src/common/AWSClient2.h

@@ -12,13 +12,13 @@
 #include "AWSFoundationalTypes.h"
 
 /* Total number of headers. */
-static const int HEADER_COUNT2 = 7;
+static const int HEADER_COUNT = 7;
 /* Size of the awsDate string. */
-static const int AWS_DATE_LEN2 = 8;
+static const int AWS_DATE_LEN = 8;
 /* Size of the awsTime string. */
-static const int AWS_TIME_LEN2 = 6;
+static const int AWS_TIME_LEN = 6;
 /* Size of sha hashes and signatures in hexidecimal. */
-static const int HASH_HEX_LEN2 = 64;
+static const int HASH_HEX_LEN = 64;
 
 /* Base class for an AWS Service Client. Creates http and https request in raw
  * http format or as a curl command. */
@@ -27,22 +27,20 @@ class AWSClient2 {
     char* awsRegion;
     /* Endpoint, eg. "amazonaws.com" in "kinesis.us-east-1.amazonaws.com". */
     char* awsEndpoint;
-    /* Subdomain, eg. "A2MBBEONHC7LUH" in "A2MBBEONHC9LUG.iot.us-east-1.amazonaws.com". */
-    char* awsDomain;
     /* The user's AWS Secret Key for accessing the AWS Resource. */
     char* awsSecKey;
     /* The user's AWS Access Key ID for accessing the AWS Resource. */
     char* awsKeyID;
     /* GMT date in yyyyMMdd format. */
-    char awsDate[AWS_DATE_LEN2 + 1];
+    char awsDate[AWS_DATE_LEN + 1];
     /* GMT time in HHmmss format. */
-    char awsTime[AWS_TIME_LEN2 + 1];
+    char awsTime[AWS_TIME_LEN + 1];
     /* Number of headers created. */
     int headersCreated;
     /* Array of the created http headers. */
-    char* headers[HEADER_COUNT2];
+    char* headers[HEADER_COUNT];
     /* Array of string lengths of the headers in the "headers" array. */
-    int headerLens[HEADER_COUNT2];
+    int headerLens[HEADER_COUNT];
     /* The payload of the httprequest to be created */
     MinimalString payload;
 
@@ -78,8 +76,6 @@ class AWSClient2 {
     const char* awsService;
     /* Content type of payload, eg. "application/x-amz-json-1.1". */
     const char* contentType;
-    // /* Generates the host based on subdomain, service, etc */
-    // char* createHostString(void);
     /* Creates a raw http request, given the payload and current GMT date in
      * yyyyMMddHHmmss format. Should be exposed to user by extending class.
      * Returns 0 if client is unititialized. */
@@ -92,11 +88,8 @@ class AWSClient2 {
 public:
     /* Setters for values used by createRequest and createCurlRequest. Must
      * be set or create[Curl]Request will return null. */
-    /* Generates the host based on subdomain, service, etc */
-    char* createHostString(void);
     void setAWSRegion(const char * awsRegion);
     void setAWSEndpoint(const char * awsEndpoint);
-    void setAWSDomain(const char * awsDomain);
     void setAWSSecretKey(const char * awsSecKey);
     void setAWSKeyID(const char * awsKeyID);
     void setHttpClient(IHttpClient* httpClient);