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

CLI printing of URL.

Browse Source
This commit is contained in:
Adam Ierymenko
2021-05-25 12:58:33 -04:00
parent 8bb5bc736d
commit 2c1d7f3dcc
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
controller/EmbeddedNetworkController.cpp
View File

@ -1331,6 +1331,9 @@ void EmbeddedNetworkController::_request(
member["lastAuthorizedCredential"] = autoAuthCredential;
}
const int64_t authenticationExpiryTime = member["authenticationExpiryTime"];
const std::string authenticationURL = member["authenticationURL"];
if (authorized) {
// Update version info and meta-data if authorized and if this is a genuine request
if (requestPacketId) {
@ -1357,18 +1360,12 @@ void EmbeddedNetworkController::_request(
}
}
const int64_t authenticationExpiryTime = member["authenticationExpiryTime"];
if ((authenticationExpiryTime >= 0)&&(authenticationExpiryTime < now)) {
const std::string authenticationURL = member["authenticationURL"];
if (authenticationURL.empty()) {
_sender->ncSendError(nwid,requestPacketId,identity.address(),NetworkController::NC_ERROR_AUTHENTICATION_REQUIRED, nullptr, 0);
return;
} else {
Dictionary<1024> authInfo;
Dictionary<1024> authInfo;
if (!authenticationURL.empty())
authInfo.add("aU", authenticationURL.c_str());
_sender->ncSendError(nwid,requestPacketId,identity.address(),NetworkController::NC_ERROR_AUTHENTICATION_REQUIRED, authInfo.data(), authInfo.sizeBytes());
return;
}
_sender->ncSendError(nwid,requestPacketId,identity.address(),NetworkController::NC_ERROR_AUTHENTICATION_REQUIRED, authInfo.data(), authInfo.sizeBytes());
return;
}
} else {
// If they are not authorized, STOP!