From cc19985b6c8312e693458fec0ff9944a73e4f27d Mon Sep 17 00:00:00 2001 From: yuliyang Date: Sun, 4 Jun 2017 19:06:27 +0800 Subject: [PATCH] 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 --- src/rgw/rgw_auth_s3.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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) { -- 2.47.3