From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Tue, 18 Apr 2017 12:46:51 +0000 (+0200)
Subject: rgw: make the get_v4_canonical_request_hash identified shorter.
X-Git-Tag: v12.1.0~155^2~42
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a33eb152f9716994f0384c8628a30927b78a558a;p=ceph.git

rgw: make the get_v4_canonical_request_hash identified shorter.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---

diff --git a/src/rgw/rgw_auth_s3.cc b/src/rgw/rgw_auth_s3.cc
index 4afcae3e8035..8aee844aa4b7 100644
--- a/src/rgw/rgw_auth_s3.cc
+++ b/src/rgw/rgw_auth_s3.cc
@@ -634,14 +634,16 @@ static std::string assemble_v4_canonical_request(
 
 /*
  * create canonical request for signature version 4
+ *
+ * http://docs.aws.amazon.com/general/latest/gr/sigv4-create-canonical-request.html
  */
-std::string get_v4_canonical_request_hash(CephContext* cct,
-                                          const std::string& http_verb,
-                                          const std::string& canonical_uri,
-                                          const std::string& canonical_qs,
-                                          const std::string& canonical_hdrs,
-                                          const std::string& signed_hdrs,
-                                          const std::string& request_payload_hash)
+std::string get_v4_canon_req_hash(CephContext* cct,
+                                  const std::string& http_verb,
+                                  const std::string& canonical_uri,
+                                  const std::string& canonical_qs,
+                                  const std::string& canonical_hdrs,
+                                  const std::string& signed_hdrs,
+                                  const std::string& request_payload_hash)
 {
   ldout(cct, 10) << "payload request hash = " << request_payload_hash << dendl;
 
diff --git a/src/rgw/rgw_auth_s3.h b/src/rgw/rgw_auth_s3.h
index e41c44a3cd9c..b80fad3139f1 100644
--- a/src/rgw/rgw_auth_s3.h
+++ b/src/rgw/rgw_auth_s3.h
@@ -194,13 +194,13 @@ boost::optional<std::string> get_v4_canonical_headers(const req_info& info,
 
 std::string hash_string_sha256(const char* data, int len);
 
-std::string get_v4_canonical_request_hash(CephContext* cct,
-                                          const std::string& http_verb,
-                                          const std::string& canonical_uri,
-                                          const std::string& canonical_qs,
-                                          const std::string& canonical_hdrs,
-                                          const std::string& signed_hdrs,
-                                          const std::string& request_payload_hash);
+std::string get_v4_canon_req_hash(CephContext* cct,
+                                  const std::string& http_verb,
+                                  const std::string& canonical_uri,
+                                  const std::string& canonical_qs,
+                                  const std::string& canonical_hdrs,
+                                  const std::string& signed_hdrs,
+                                  const std::string& request_payload_hash);
 
 std::string get_v4_string_to_sign(CephContext* cct,
                                   const std::string& algorithm,
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 8649f602b85a..b40754fdbebd 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -3535,13 +3535,13 @@ int RGW_Auth_S3::authorize_v4(RGWRados *store, struct req_state *s, bool force_b
 
   /* craft canonical request */
   std::string canonical_req_hash = \
-    rgw::auth::s3::get_v4_canonical_request_hash(s->cct,
-                                                 s->info.method,
-                                                 canonical_uri,
-                                                 canonical_qs,
-                                                 *canonical_headers,
-                                                 signed_hdrs,
-                                                 expected_request_payload_hash);
+    rgw::auth::s3::get_v4_canon_req_hash(s->cct,
+                                         s->info.method,
+                                         canonical_uri,
+                                         canonical_qs,
+                                         *canonical_headers,
+                                         signed_hdrs,
+                                         expected_request_payload_hash);
 
   /*
    * create a string to sign