ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-14 06:16:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove some noisy log lines & fix a query error

Browse Source
This commit is contained in:
Grant Limberg 2021-06-04 11:06:54 -07:00
parent c78792a705
commit 0702e581a1
No known key found for this signature in database
GPG Key ID: 2BA62CCABBB4095A
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller/DB.cpp
View File

@ -197,7 +197,6 @@ void DB::networks(std::set<uint64_t> &networks)
void DB::_memberChanged(nlohmann::json &old,nlohmann::json &memberConfig,bool notifyListeners)
{
fprintf(stderr, "DB::_memberChanged\n");
uint64_t memberId = 0;
uint64_t networkId = 0;
bool isAuth = false;
@ -313,7 +312,6 @@ void DB::_memberChanged(nlohmann::json &old,nlohmann::json &memberConfig,bool no
void DB::_networkChanged(nlohmann::json &old,nlohmann::json &networkConfig,bool notifyListeners)
{
fprintf(stderr, "DB::_networkChanged\n");
if (networkConfig.is_object()) {
const std::string ids = networkConfig["id"];
const uint64_t networkId = Utils::hexStrToU64(ids.c_str());

2
controller/EmbeddedNetworkController.cpp
View File

@ -1336,7 +1336,7 @@ void EmbeddedNetworkController::_request(
std::string memberId = member["id"];
fprintf(stderr, "ssoEnabled && !ssoExempt %s-%s\n", nwids, memberId.c_str());
int64_t authenticationExpiryTime = (int64_t)OSUtils::jsonInt(member["authenticationExpiryTime"], 0);
fprintf(stder, "authExpiryTime: %l\n", authenticationExpiryTime);
fprintf(stderr, "authExpiryTime: %l\n", authenticationExpiryTime);
if ((authenticationExpiryTime == 0) || (authenticationExpiryTime < now)) {
Dictionary<1024> authInfo;

4
controller/PostgreSQL.cpp
View File

@ -332,7 +332,7 @@ std::string PostgreSQL::getSSOAuthURL(const nlohmann::json &member)
// find an unused nonce, if one exists.
pqxx::result r = w.exec_params("SELECT nonce FROM ztc_sso_expiry "
"WHERE network_id = $1 AND member_id = $2 AND "
"WHERE network_id = $1 AND member_id = $2 "
"AND authentication_expiry_time IS NULL AND ((NOW() AT TIME ZONE 'UTC') <= nonce_expiry",
networkId, memberId);
@ -544,7 +544,6 @@ void PostgreSQL::initializeNetworks()
}
_networkChanged(empty, config, false);
fprintf(stderr, "Initialized Network: %s\n", nwid.c_str());
}
w.commit();
@ -706,7 +705,6 @@ void PostgreSQL::initializeMembers()
}
_memberChanged(empty, config, false);
fprintf(stderr, "Initialzed member %s-%s\n", networkId.c_str(), memberId.c_str());
}
w.commit();

2
controller/PostgreSQL.hpp
View File

@ -115,12 +115,10 @@ protected:
inline std::size_t operator()(const std::pair<uint64_t,uint64_t> &p) const { return (std::size_t)(p.first ^ p.second); }
};
virtual void _memberChanged(nlohmann::json &old,nlohmann::json &memberConfig,bool notifyListeners) {
fprintf(stderr, "PostgreSQL::_memberChanged\n");
DB::_memberChanged(old, memberConfig, notifyListeners);
}
virtual void _networkChanged(nlohmann::json &old,nlohmann::json &networkConfig,bool notifyListeners) {
fprintf(stderr, "PostgreSQL::_networkChanged\n");
DB::_networkChanged(old, networkConfig, notifyListeners);
}