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

Apply suggestions from code review 

Co-authored-by: A.J. Beamon <aj.beamon@snowflake.com>
Co-authored-by: Junhyun Shim <junhyun.shim@snowflake.com>
This commit is contained in:
Markus Pilman 2022-07-08 10:42:44 -06:00 committed by GitHub
parent a2ef5dc72a
commit f268265d96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbclient/NativeAPI.actor.cpp
View File

@ -3649,7 +3649,7 @@ ACTOR Future<Void> watchStorageServerResp(int64_t tenantId, Key key, Database cx
ACTOR Future<Void> sameVersionDiffValue(Database cx, Reference<WatchParameters> parameters) { ACTOR Future<Void> sameVersionDiffValue(Database cx, Reference<WatchParameters> parameters) {
state ReadYourWritesTransaction tr( state ReadYourWritesTransaction tr(
cx, parameters->tenant.name.present() ? parameters->tenant.name.get() : Optional<TenantName>()); cx, parameters->tenant.name.castTo<TenantName>());
loop { loop {
try { try {
if (!parameters->tenant.name.present()) { if (!parameters->tenant.name.present()) {

4
fdbrpc/TokenCache.cpp
View File

@ -40,7 +40,7 @@ bool TokenCacheImpl::validate(TenantNameRef name, StringRef token) {
auto sig = authz::jwt::signaturePart(token); auto sig = authz::jwt::signaturePart(token);
auto cachedEntry = cache.get(sig); auto cachedEntry = cache.get(sig);
double currentTime = g_network->timer(); double currentTime = g_network->timer();
NetworkAddress peer = FlowTransport::transport().loadedEndpoint(UID()).getPrimaryAddress(); NetworkAddress peer = FlowTransport::transport().currentDeliveryPeerAddress();
if (cachedEntry.has_value()) { if (cachedEntry.has_value()) {
auto& entry = cachedEntry.get(); auto& entry = cachedEntry.get();
@ -49,6 +49,8 @@ bool TokenCacheImpl::validate(TenantNameRef name, StringRef token) {
throw permission_denied(); throw permission_denied();
} }
if (entry.tenants.count(name) == 0) { if (entry.tenants.count(name) == 0) {
TraceEvent(SevWarn, "TenantTokenMismatch").detail("From", peer).detail("Tenant", name.toString());
throw permission_denied();
} }
return true; return true;
} else { } else {

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

@ -1,5 +1,5 @@
/* /*
* TenantManagement.actor.cpp * CreateTenant.actor.cpp
* *
* This source file is part of the FoundationDB open source project * This source file is part of the FoundationDB open source project
* *

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

@ -69,7 +69,7 @@ struct CycleWorkload : TestWorkload, CycleMembers<MultiTenancy> {
ASSERT(g_network->isSimulated()); ASSERT(g_network->isSimulated());
auto k = g_simulator.authKeys.begin(); auto k = g_simulator.authKeys.begin();
this->tenant = getOption(options, "tenant"_sr, "CycleTenant"_sr); this->tenant = getOption(options, "tenant"_sr, "CycleTenant"_sr);
// make it confortably longer than the timeout of the workload // make it comfortably longer than the timeout of the workload
auto currentTime = uint64_t(lround(g_network->timer())); auto currentTime = uint64_t(lround(g_network->timer()));
this->token.algorithm = authz::Algorithm::ES256; this->token.algorithm = authz::Algorithm::ES256;
this->token.issuedAtUnixTime = currentTime; this->token.issuedAtUnixTime = currentTime;