ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-21 13:57:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up error flow for sso

Browse Source 
error messages can now propagate to the user's browser
This commit is contained in:
Grant Limberg 2022-05-12 17:00:43 -07:00
parent e7fee4c6ce
commit da179d9930
No known key found for this signature in database
GPG Key ID: 8F2F97D3BE8D7735
3 changed files with 68 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/OneService.cpp
View File

@ -1740,7 +1740,6 @@ public:
} else {
scode = 200;
sprintf(resBuf, ssoResponseTemplate, "Authentication Successful. You may now access the network.");
responseBody = std::string(resBuf);
}
} else {
// not an object? We got a problem
@ -1751,6 +1750,7 @@ public:
zeroidc::free_cstr(code);
zeroidc::free_cstr(ret);
responseBody = std::string(resBuf);
responseContentType = "text/html";
return scode;
} else {

10
zeroidc/src/ext.rs
View File

@ -247,11 +247,19 @@ pub extern "C" fn zeroidc_token_exchange(idc: *mut ZeroIDC, code: *const c_char)
let ret = idc.do_token_exchange(code);
match ret {
Ok(ret) => {
#[cfg(debug_assertions)]
{
println!("do_token_exchange ret: {}", ret);
}
let ret = CString::new(ret).unwrap();
ret.into_raw()
}
Err(e) => {
let errstr = format!("{{\"errorMessage\":\"{}\"\"}}", e);
#[cfg(debug_assertions)]
{
println!("do_token_exchange err: {}", e);
}
let errstr = format!("{{\"errorMessage\": \"{}\"}}", e);
let ret = CString::new(errstr).unwrap();
ret.into_raw()
}

12
zeroidc/src/lib.rs
View File

@ -579,6 +579,7 @@ impl ZeroIDC {
match res {
Ok(res) => {
if res.status() == 200 {
#[cfg(debug_assertions)]
{
println!("hit url: {}", res.url().as_str());
@ -630,6 +631,17 @@ impl ZeroIDC {
};
Ok(bytes)
} else {
if res.status() == 402 {
Err(SSOExchangeError::new(
"additional license seats required. Please contact your network administrator.".to_string(),
))
} else {
Err(SSOExchangeError::new(
"error from central endpoint".to_string(),
))
}
}
}
Err(res) => {
println!("error result: {}", res);