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

add "ssoRedirectURL" to local.conf

Browse Source 
plumbed it through to the central controller code
This commit is contained in:
Grant Limberg
2021-06-04 16:29:03 -07:00
parent c227330d09
commit e6b4fb5af7
8 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
service/OneService.cpp
View File

@ -575,6 +575,7 @@ public:
Mutex _run_m;
RedisConfig *_rc;
std::string _ssoRedirectURL;
// end member variables ----------------------------------------------------
@ -612,6 +613,7 @@ public:
#endif
,_run(true)
,_rc(NULL)
,_ssoRedirectURL()
{
_ports[0] = 0;
_ports[1] = 0;
@ -790,6 +792,9 @@ public:
// Network controller is now enabled by default for desktop and server
_controller = new EmbeddedNetworkController(_node,_homePath.c_str(),_controllerDbPath.c_str(),_ports[0], _rc);
if (!_ssoRedirectURL.empty()) {
_controller->setSSORedirectURL(_ssoRedirectURL);
}
_node->setNetconfMaster((void *)_controller);
// Join existing networks in networks.d
@ -1048,6 +1053,8 @@ public:
if (cdbp.length() > 0)
_controllerDbPath = cdbp;
_ssoRedirectURL = OSUtils::jsonString(settings["ssoRedirectURL"], "");
#ifdef ZT_CONTROLLER_USE_LIBPQ
// TODO: Redis config
json &redis = settings["redis"];