void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 20:13:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

About ready to test notify of SSO timeout...

Browse source
This commit is contained in:
Adam Ierymenko 2021-07-23 19:20:10 -04:00
parent 0310bfa3e3
commit c2d8fe46d5
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
controller/DBMirrorSet.cpp
View file

@ -246,10 +246,7 @@ std::set< std::pair<uint64_t, uint64_t> > DBMirrorSet::membersExpiringSoon()
std::unique_lock<std::mutex> l(_membersExpiringSoon_l); std::unique_lock<std::mutex> l(_membersExpiringSoon_l);
int64_t now = OSUtils::now(); int64_t now = OSUtils::now();
for(auto next=_membersExpiringSoon.begin();next!=_membersExpiringSoon.end();) { for(auto next=_membersExpiringSoon.begin();next!=_membersExpiringSoon.end();) {
if (next->first <= now) { if (next->first > now) {
// Already expired, so the node will need to re-auth.
_membersExpiringSoon.erase(next++);
} else {
const uint64_t nwid = next->second.first; const uint64_t nwid = next->second.first;
const uint64_t memberId = next->second.second; const uint64_t memberId = next->second.second;
nlohmann::json network, member; nlohmann::json network, member;
@ -267,17 +264,15 @@ std::set< std::pair<uint64_t, uint64_t> > DBMirrorSet::membersExpiringSoon()
} }
} else { } else {
// Obsolete entry, no longer authorized, or SSO exempt. // Obsolete entry, no longer authorized, or SSO exempt.
_membersExpiringSoon.erase(next++);
} }
} catch ( ... ) { } catch ( ... ) {
// Invalid member object, erase. // Invalid member object, erase.
_membersExpiringSoon.erase(next++);
} }
} else { } else {
// Not found, so erase. // Not found.
_membersExpiringSoon.erase(next++);
} }
} }
_membersExpiringSoon.erase(next++);
} }
return soon; return soon;
} }