RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-12 14:10:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw/rest: fix url decode of post params for iam/sts/sns

Browse Source 
add the `in_query=true` argument to `url_decode()` to replace '+' with ' '

Fixes: https://tracker.ceph.com/issues/64189

Signed-off-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2024-01-26 09:53:30 -05:00
parent 1112689da4
commit 4bdc5d18dd
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rgw/rgw_rest_pubsub.cc
View File

@ -152,7 +152,7 @@ class RGWPSCreateTopicOp : public RGWOp {
return -EINVAL;
}
// Store topic Policy.
policy_text = url_decode(s->info.args.get("Policy"), true);
policy_text = s->info.args.get("Policy");
if (!policy_text.empty() && !get_policy_from_text(s, policy_text)) {
return -ERR_MALFORMED_DOC;
}
@ -562,7 +562,7 @@ class RGWPSSetTopicAttributesOp : public RGWOp {
return -EINVAL;
}
} else if (attribute_name == "Policy") {
policy_text = url_decode(s->info.args.get("AttributeValue"), true);
policy_text = s->info.args.get("AttributeValue");
if (!policy_text.empty() && !get_policy_from_text(s, policy_text)) {
return -ERR_MALFORMED_DOC;
}

3
src/rgw/rgw_rest_s3.cc
View File

@ -5198,8 +5198,9 @@ void parse_post_action(const std::string& post_body, req_state* s)
if (boost::starts_with(key, "Attributes.")) {
update_attribute_map(t, map);
} else {
constexpr bool in_query = true; // replace '+' with ' '
s->info.args.append(t.substr(0, pos),
url_decode(t.substr(pos+1, t.size() -1)));
url_decode(t.substr(pos+1, t.size() -1), in_query));
}
}
}

6
src/rgw/rgw_rest_user_policy.cc
View File

@ -92,9 +92,9 @@ uint64_t RGWPutUserPolicy::get_op()
int RGWPutUserPolicy::get_params()
{
policy_name = url_decode(s->info.args.get("PolicyName"), true);
user_name = url_decode(s->info.args.get("UserName"), true);
policy = url_decode(s->info.args.get("PolicyDocument"), true);
policy_name = s->info.args.get("PolicyName");
user_name = s->info.args.get("UserName");
policy = s->info.args.get("PolicyDocument");
if (policy_name.empty() || user_name.empty() || policy.empty()) {
ldpp_dout(this, 20) << "ERROR: one of policy name, user name or policy document is empty"