From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 25 Jan 2024 16:26:07 +0000 (-0500)
Subject: qa/tempest: use default tempurl_digest_hashlib=sha256
X-Git-Tag: v17.2.8~88^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F59355%2Fhead;p=ceph.git

qa/tempest: use default tempurl_digest_hashlib=sha256

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 5d0477eb1bda0f895ed2ee19db6f9cd3fc47f900)

`empty` takes `Object*`, not `std::unique_ptr<Object>'

Signed-off-by: Adam Emerson <aemerson@redhat.com>
---

diff --git a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
index ad9dc9dd5025..af09c49da050 100644
--- a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
+++ b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
@@ -35,8 +35,6 @@ tasks:
       object-storage-feature-enabled:
         container_sync: false
         discoverability: true
-        # TODO(tobias-urdin): Use sha256 when supported in RadosGW
-        tempurl_digest_hashlib: sha1
       blocklist:
         - .*test_account_quotas_negative.AccountQuotasNegativeTest.test_user_modify_quota
         - .*test_container_acl_negative.ObjectACLsNegativeTest.*
diff --git a/src/rgw/rgw_swift_auth.cc b/src/rgw/rgw_swift_auth.cc
index 9ee05946b98b..16a471b7ea7b 100644
--- a/src/rgw/rgw_swift_auth.cc
+++ b/src/rgw/rgw_swift_auth.cc
@@ -82,7 +82,7 @@ void TempURLEngine::get_owner_info(const DoutPrefixProvider* dpp, const req_stat
   const string& bucket_name = s->init_state.url_bucket;
 
   /* TempURL requires that bucket and object names are specified. */
-  if (bucket_name.empty() || rgw::sal::Object::empty(s->object)) {
+  if (bucket_name.empty() || rgw::sal::Object::empty(s->object.get())) {
     throw -EPERM;
   }