From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 22 Oct 2018 18:16:59 +0000 (-0400)
Subject: rgw: aws:SecureTransport uses rgw_transport_is_secure()
X-Git-Tag: v12.2.11~119^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a48ccf0384de805d2590cd72f33f9f1cc1cbd351;p=ceph.git

rgw: aws:SecureTransport uses rgw_transport_is_secure()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit e515d92)
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index dce4549f6396..6e7daadcd228 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -608,9 +608,7 @@ rgw::IAM::Environment rgw_build_iam_environment(RGWRados* store,
     e.emplace("aws:Referer", i->second);
   }
 
-  // These seem to be the semantics, judging from rest_rgw_s3.cc
-  i = m.find("SERVER_PORT_SECURE");
-  if (i != m.end()) {
+  if (rgw_transport_is_secure(s->cct, *s->info.env)) {
     e.emplace("aws:SecureTransport", "true");
   }