ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-20 17:52:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add sso version to network config object

Browse Source
This commit is contained in:
Grant Limberg 2021-10-14 11:40:48 -07:00
parent 3818351287
commit 95032cc74d
No known key found for this signature in database
GPG Key ID: 2BA62CCABBB4095A
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
node/NetworkConfig.cpp
View File

@ -188,6 +188,7 @@ bool NetworkConfig::toDictionary(Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> &d,b
if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_URL, this->authenticationURL)) return false; if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_URL, this->authenticationURL)) return false;
} }
if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_EXPIRY_TIME, this->authenticationExpiryTime)) return false; if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_EXPIRY_TIME, this->authenticationExpiryTime)) return false;
if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_SSO_VERSION, this->ssoVersion)) return false;
} }
delete tmp; delete tmp;
@ -383,9 +384,11 @@ bool NetworkConfig::fromDictionary(const Dictionary<ZT_NETWORKCONFIG_DICT_CAPACI
this->authenticationURL[0] = 0; this->authenticationURL[0] = 0;
} }
this->authenticationExpiryTime = d.getI(ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_EXPIRY_TIME, 0); this->authenticationExpiryTime = d.getI(ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_EXPIRY_TIME, 0);
this->ssoVersion = d.getUI(ZT_NETWORKCONFIG_DICT_KEY_SSO_VERSION, 0);
} else { } else {
this->authenticationURL[0] = 0; this->authenticationURL[0] = 0;
this->authenticationExpiryTime = 0; this->authenticationExpiryTime = 0;
this->ssoVersion = 0;
} }
} }

10
node/NetworkConfig.hpp
View File

@ -184,6 +184,8 @@ namespace ZeroTier {
#define ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_URL "aurl" #define ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_URL "aurl"
// authentication expiry // authentication expiry
#define ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_EXPIRY_TIME "aexpt" #define ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_EXPIRY_TIME "aexpt"
// sso impl. version
#define ZT_NETWORKCONFIG_DICT_KEY_SSO_VERSION "ssov"
// Legacy fields -- these are obsoleted but are included when older clients query // Legacy fields -- these are obsoleted but are included when older clients query
@ -242,7 +244,8 @@ public:
dnsCount(0), dnsCount(0),
ssoEnabled(false), ssoEnabled(false),
authenticationURL(), authenticationURL(),
authenticationExpiryTime(0) authenticationExpiryTime(0),
ssoVersion(0)
{ {
name[0] = 0; name[0] = 0;
memset(specialists, 0, sizeof(uint64_t)*ZT_MAX_NETWORK_SPECIALISTS); memset(specialists, 0, sizeof(uint64_t)*ZT_MAX_NETWORK_SPECIALISTS);
@ -628,6 +631,11 @@ public:
* Time current authentication expires or 0 if external authentication is disabled * Time current authentication expires or 0 if external authentication is disabled
*/ */
uint64_t authenticationExpiryTime; uint64_t authenticationExpiryTime;
/**
* SSO implementaiton version
*/
uint64_t ssoVersion;
}; };
} // namespace ZeroTier } // namespace ZeroTier