dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

oidc stuff coming across the wire properly and generating a working login URL

Browse source
This commit is contained in:
Grant Limberg 2021-12-01 13:01:32 -08:00
parent eaccce743f
commit 663a09b38d
No known key found for this signature in database
GPG key ID: 2BA62CCABBB4095A
6 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
service/OneService.cpp
View file

@ -251,9 +251,7 @@ public:
const char* nwid = Utils::hex(nwc->nwid, nwbuf);
fprintf(stderr, "NetworkState::setConfig(%s)\n", nwid);
fprintf(stderr, "issuerUrl before: %s\n", nwc->issuerURL);
memcpy(&_config, nwc, sizeof(ZT_VirtualNetworkConfig));
fprintf(stderr, "issuerUrl after: %s\n", _config.issuerURL);
fprintf(stderr, "ssoEnabled: %s, ssoVersion: %d\n",
_config.ssoEnabled ? "true" : "false", _config.ssoVersion);
@ -443,7 +441,9 @@ static void _networkToJson(nlohmann::json &nj,NetworkState &ns)
}
nj["dns"] = m;
if (ns.config().ssoEnabled) {
nj["authenticationURL"] = ns.getAuthURL();
const char* authURL = ns.getAuthURL();
fprintf(stderr, "Auth URL: %s\n", authURL);
nj["authenticationURL"] = authURL;
nj["authenticationExpiryTime"] = ns.config().authenticationExpiryTime;
nj["ssoEnabled"] = ns.config().ssoEnabled;
}
@ -2665,7 +2665,6 @@ public:
// After setting up tap, fall through to CONFIG_UPDATE since we also want to do this...
case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE:
fprintf(stderr, "conf update issuerURL: %s\n", nwc->issuerURL);
n.setConfig(nwc);
if (n.tap()) { // sanity check