RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 19:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39656 from pritha-srivastava/wip-rgw-sts-user-fix

Browse Source 
rgw/sts: fix for encoding/decoding user namespace
This commit is contained in:
Matt Benjamin 2021-03-04 07:57:58 -05:00 committed by GitHub
commit c0e65f7496
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rgw/rgw_common.h
View File

@ -707,7 +707,7 @@ struct RGWUserInfo
}
void encode(bufferlist& bl) const {
ENCODE_START(21, 9, bl);
ENCODE_START(22, 9, bl);
encode((uint64_t)0, bl); // old auid
string access_key;
string secret_key;
@ -750,10 +750,11 @@ struct RGWUserInfo
encode(type, bl);
encode(mfa_ids, bl);
encode(assumed_role_arn, bl);
encode(user_id.ns, bl);
ENCODE_FINISH(bl);
}
void decode(bufferlist::const_iterator& bl) {
DECODE_START_LEGACY_COMPAT_LEN_32(21, 9, 9, bl);
DECODE_START_LEGACY_COMPAT_LEN_32(22, 9, 9, bl);
if (struct_v >= 2) {
uint64_t old_auid;
decode(old_auid, bl);
@ -834,6 +835,11 @@ struct RGWUserInfo
if (struct_v >= 21) {
decode(assumed_role_arn, bl);
}
if (struct_v >= 22) {
decode(user_id.ns, bl);
} else {
user_id.ns.clear();
}
DECODE_FINISH(bl);
}
void dump(Formatter *f) const;