From: yuliyang <yuliyang@cmss.chinamobile.com>
Date: Sun, 4 Jun 2017 11:06:27 +0000 (+0800)
Subject: fix s3 aws v2 signature priority between header['X-Amz-Date'] and header['Date']
X-Git-Tag: v12.1.1~93^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc19985b6c8312e693458fec0ff9944a73e4f27d;p=ceph.git

fix s3 aws v2 signature priority between header['X-Amz-Date'] and header['Date']

fix http://tracker.ceph.com/issues/20176

Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
---

diff --git a/src/rgw/rgw_auth_s3.cc b/src/rgw/rgw_auth_s3.cc
index 0788974635df..692c915189b8 100644
--- a/src/rgw/rgw_auth_s3.cc
+++ b/src/rgw/rgw_auth_s3.cc
@@ -178,16 +178,15 @@ bool rgw_create_s3_canonical_header(const req_info& info,
   if (qsr) {
     date = info.args.get("Expires");
   } else {
-    const char *str = info.env->get("HTTP_DATE");
+    const char *str = info.env->get("HTTP_X_AMZ_DATE");
     const char *req_date = str;
-    if (str) {
-      date = str;
-    } else {
-      req_date = info.env->get("HTTP_X_AMZ_DATE");
+    if (str == NULL) {
+      req_date = info.env->get("HTTP_DATE");
       if (!req_date) {
         dout(0) << "NOTICE: missing date for auth header" << dendl;
         return false;
       }
+      date = req_date;
     }
 
     if (header_time) {