wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

check SetVersionstampedKey offset

This commit is contained in:
Xiaoxi Wang 2023-01-10 23:58:51 -08:00
parent c9aa3f1458
commit 229565c791
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fdbclient/include/fdbclient/Atomic.h
View File

@ -255,6 +255,13 @@ static void placeVersionstamp(uint8_t* destination, Version version, uint16_t tr
memcpy(destination + sizeof(version), &transactionNumber, sizeof(transactionNumber));
}
inline int32_t parseGetVersionStampKetOffset(StringRef& key) {
ASSERT_GE(key.size(), 4);
int32_t pos;
memcpy(&pos, key.end() - sizeof(int32_t), sizeof(int32_t));
pos = littleEndian32(pos);
return pos;
}
/*
* Returns the range corresponding to the specified versionstamp key.
*/
@ -265,9 +272,7 @@ inline KeyRangeRef getVersionstampKeyRange(Arena& arena, const KeyRef& key, Vers
if (begin.size() < 4)
throw client_invalid_operation();
int32_t pos;
memcpy(&pos, begin.end() - sizeof(int32_t), sizeof(int32_t));
pos = littleEndian32(pos);
auto pos = parseGetVersionStampKetOffset(begin);
begin = begin.substr(0, begin.size() - 4);
end = end.substr(0, end.size() - 3);
mutateString(end)[end.size() - 1] = 0;
@ -285,9 +290,7 @@ inline void transformVersionstampKey(StringRef& key, Version version, uint16_t t
if (key.size() < 4)
throw client_invalid_operation();
int32_t pos;
memcpy(&pos, key.end() - sizeof(int32_t), sizeof(int32_t));
pos = littleEndian32(pos);
auto pos = parseGetVersionStampKetOffset(key);
if (pos < 0 || pos + 10 > key.size())
throw client_invalid_operation();
@ -299,9 +302,7 @@ inline void transformVersionstampMutation(MutationRef& mutation,
Version version,
uint16_t transactionNumber) {
if ((mutation.*param).size() >= 4) {
int32_t pos;
memcpy(&pos, (mutation.*param).end() - sizeof(int32_t), sizeof(int32_t));
pos = littleEndian32(pos);
auto pos = parseGetVersionStampKetOffset(mutation.*param);
mutation.*param = (mutation.*param).substr(0, (mutation.*param).size() - 4);
if (pos >= 0 && pos + 10 <= (mutation.*param).size()) {

3
fdbserver/CommitProxyServer.actor.cpp
View File

@ -1168,7 +1168,8 @@ int64_t extractTenantIdFromSingleKeyMutation(MutationRef m) {
ASSERT(!isSystemKey(m.param1));
// The first 8 bytes of the key of this OP is also an 8-byte number
if (m.type == MutationRef::SetVersionstampedKey) {
if (m.type == MutationRef::SetVersionstampedKey && m.param1.size() >= 4 &&
parseGetVersionStampKetOffset(m.param1) < 8) {
return TenantInfo::INVALID_TENANT;
}

2
fdbserver/workloads/FuzzApiCorrectness.actor.cpp
View File

@ -272,7 +272,7 @@ struct FuzzApiCorrectnessWorkload : TestWorkload {
}
Future<bool> check(Database const& cx) override {
if (useSystemKeys) { // there must be illegal access during data load
if (writeSystemKeys) { // there must be illegal access during data load
return illegalTenantAccess;
}
return success;

3
fdbserver/workloads/TenantManagementWorkload.actor.cpp
View File

@ -68,8 +68,7 @@ struct TenantManagementWorkload : TestWorkload {
int64_t maxId = -1;
const Key keyName = "key"_sr;
const Key testParametersKey =
"test_parameters"_sr; // nonMetadataSystemKeys.begin.withSuffix("/tenant_test/test_parameters"_sr);
const Key testParametersKey = nonMetadataSystemKeys.begin.withSuffix("/tenant_test/test_parameters"_sr);
const Value noTenantValue = "no_tenant"_sr;
const TenantName tenantNamePrefix = "tenant_management_workload_"_sr;
const ClusterName dataClusterName = "cluster1"_sr;