From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 20 Nov 2018 22:00:57 +0000 (-0800)
Subject: Merge pull request #16658 from rzarzynski/wip-rgw-20795
X-Git-Tag: v14.1.0~856
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9c873b2a2d0ff5de690591b07039cba1b83b30dd;p=ceph.git

Merge pull request #16658 from rzarzynski/wip-rgw-20795

rgw: Swift's TempURL can handle temp_url_expires written in ISO8601.

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
---

9c873b2a2d0ff5de690591b07039cba1b83b30dd
diff --cc src/rgw/rgw_swift_auth.h
index 9f57b2985b9c,0fb95d741ec5..5bfd2749a57c
--- a/src/rgw/rgw_swift_auth.h
+++ b/src/rgw/rgw_swift_auth.h
@@@ -43,9 -43,9 +43,10 @@@ class TempURLEngine : public rgw::auth:
    const TempURLApplier::Factory* const apl_factory;
  
    /* Helper methods. */
 -  void get_owner_info(const req_state* s,
 +  void get_owner_info(const DoutPrefixProvider* dpp, 
 +                      const req_state* s,
                        RGWUserInfo& owner_info) const;
+   std::string convert_from_iso8601(std::string expires) const;
    bool is_applicable(const req_state* s) const noexcept;
    bool is_expired(const std::string& expires) const;