void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 13:03:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove some extra verbose logging

Browse source 
... and baby you got a full flow goin on
This commit is contained in:
Grant Limberg 2021-12-16 12:23:09 -08:00
parent f489862500
commit 2435ab70ab
No known key found for this signature in database
GPG key ID: 2BA62CCABBB4095A
2 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
service/OneService.cpp
View file

@ -458,7 +458,7 @@ static void _networkToJson(nlohmann::json &nj,NetworkState &ns)
nj["dns"] = m; nj["dns"] = m;
if (ns.config().ssoEnabled) { if (ns.config().ssoEnabled) {
const char* authURL = ns.getAuthURL(); const char* authURL = ns.getAuthURL();
fprintf(stderr, "Auth URL: %s\n", authURL); //fprintf(stderr, "Auth URL: %s\n", authURL);
nj["authenticationURL"] = authURL; nj["authenticationURL"] = authURL;
nj["authenticationExpiryTime"] = (ns.getExpiryTime()*1000); nj["authenticationExpiryTime"] = (ns.getExpiryTime()*1000);
nj["ssoEnabled"] = ns.config().ssoEnabled; nj["ssoEnabled"] = ns.config().ssoEnabled;

30
zeroidc/src/lib.rs
View file

@ -7,7 +7,7 @@ extern crate time;
extern crate url; extern crate url;
use bytes::Bytes; use bytes::Bytes;
use openidconnect::core::{CoreClient, CoreProviderMetadata, CoreResponseType}; use jsonwebtoken::{dangerous_insecure_decode};use openidconnect::core::{CoreClient, CoreProviderMetadata, CoreResponseType};
use openidconnect::reqwest::http_client; use openidconnect::reqwest::http_client;
use openidconnect::{AccessToken, AuthorizationCode, AuthenticationFlow, ClientId, CsrfToken, IssuerUrl, Nonce, OAuth2TokenResponse, PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, RefreshToken, Scope, TokenResponse}; use openidconnect::{AccessToken, AuthorizationCode, AuthenticationFlow, ClientId, CsrfToken, IssuerUrl, Nonce, OAuth2TokenResponse, PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, RefreshToken, Scope, TokenResponse};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -17,10 +17,8 @@ use std::thread::{sleep, spawn, JoinHandle};
use std::time::{SystemTime, UNIX_EPOCH, Duration}; use std::time::{SystemTime, UNIX_EPOCH, Duration};
use time::{OffsetDateTime, format_description}; use time::{OffsetDateTime, format_description};
use jsonwebtoken::{dangerous_insecure_decode};
use url::Url; use url::Url;
use time::ext::NumericalDuration;
pub struct ZeroIDC { pub struct ZeroIDC {
inner: Arc<Mutex<Inner>>, inner: Arc<Mutex<Inner>>,
@ -164,7 +162,9 @@ impl ZeroIDC {
let exp = UNIX_EPOCH + Duration::from_secs((*inner_local.lock().unwrap()).exp_time); let exp = UNIX_EPOCH + Duration::from_secs((*inner_local.lock().unwrap()).exp_time);
let now = SystemTime::now(); let now = SystemTime::now();
#[cfg(debug_assertions)] {
println!("refresh token thread tick, now: {}, exp: {}", systemtime_strftime(now, "[year]-[month]-[day] [hour]:[minute]:[second]"), systemtime_strftime(exp, "[year]-[month]-[day] [hour]:[minute]:[second]")); println!("refresh token thread tick, now: {}, exp: {}", systemtime_strftime(now, "[year]-[month]-[day] [hour]:[minute]:[second]"), systemtime_strftime(exp, "[year]-[month]-[day] [hour]:[minute]:[second]"));
}
let refresh_token = (*inner_local.lock().unwrap()).refresh_token.clone(); let refresh_token = (*inner_local.lock().unwrap()).refresh_token.clone();
if let Some(refresh_token) = refresh_token { if let Some(refresh_token) = refresh_token {
if now >= (exp - Duration::from_secs(30)) { if now >= (exp - Duration::from_secs(30)) {
@ -182,7 +182,9 @@ impl ZeroIDC {
Some(id_token) => { Some(id_token) => {
let params = [("id_token", id_token.to_string()),("state", "refresh".to_string())]; let params = [("id_token", id_token.to_string()),("state", "refresh".to_string())];
#[cfg(debug_assertions)] {
println!("New ID token: {}", id_token.to_string()); println!("New ID token: {}", id_token.to_string());
}
let client = reqwest::blocking::Client::new(); let client = reqwest::blocking::Client::new();
let r = client.post((*inner_local.lock().unwrap()).auth_endpoint.clone()) let r = client.post((*inner_local.lock().unwrap()).auth_endpoint.clone())
.form(&params) .form(&params)
@ -191,9 +193,10 @@ impl ZeroIDC {
match r { match r {
Ok(r) => { Ok(r) => {
if r.status().is_success() { if r.status().is_success() {
#[cfg(debug_assertions)] {
println!("hit url: {}", r.url().as_str()); println!("hit url: {}", r.url().as_str());
println!("status: {}", r.status()); println!("status: {}", r.status());
}
let access_token = res.access_token(); let access_token = res.access_token();
let at = access_token.secret(); let at = access_token.secret();
@ -205,10 +208,12 @@ impl ZeroIDC {
(*inner_local.lock().unwrap()).access_token = Some(access_token.clone()); (*inner_local.lock().unwrap()).access_token = Some(access_token.clone());
if let Some(t) = res.refresh_token() { if let Some(t) = res.refresh_token() {
println!("New Refresh Token: {}", t.secret()); // println!("New Refresh Token: {}", t.secret());
(*inner_local.lock().unwrap()).refresh_token = Some(t.clone()); (*inner_local.lock().unwrap()).refresh_token = Some(t.clone());
} }
#[cfg(debug_assertions)] {
println!("Central post succeeded"); println!("Central post succeeded");
}
} else { } else {
println!("Central post failed: {}", r.status().to_string()); println!("Central post failed: {}", r.status().to_string());
println!("hit url: {}", r.url().as_str()); println!("hit url: {}", r.url().as_str());
@ -218,10 +223,11 @@ impl ZeroIDC {
} }
}, },
Err(e) => { Err(e) => {
println!("Central post failed: {}", e.to_string()); println!("Central post failed: {}", e.to_string());
println!("hit url: {}", e.url().unwrap().as_str()); println!("hit url: {}", e.url().unwrap().as_str());
println!("Status: {}", e.status().unwrap()); println!("Status: {}", e.status().unwrap());
// (*inner_local.lock().unwrap()).exp_time = 0; (*inner_local.lock().unwrap()).exp_time = 0;
(*inner_local.lock().unwrap()).running = false; (*inner_local.lock().unwrap()).running = false;
} }
} }
@ -363,8 +369,10 @@ impl ZeroIDC {
Ok(res) =>{ Ok(res) =>{
return Some(res); return Some(res);
}, },
Err(e) => { Err(_e) => {
println!("token response error: {}", e.to_string()); #[cfg(debug_assertions)] {
println!("token response error: {}", _e.to_string());
}
return None; return None;
}, },
@ -373,7 +381,9 @@ impl ZeroIDC {
if let Some(Some(tok)) = token_response { if let Some(Some(tok)) = token_response {
let id_token = tok.id_token().unwrap(); let id_token = tok.id_token().unwrap();
#[cfg(debug_assertions)] {
println!("ID token: {}", id_token.to_string()); println!("ID token: {}", id_token.to_string());
}
let mut split = "".to_string(); let mut split = "".to_string();
match i.csrf_token.clone() { match i.csrf_token.clone() {
@ -394,8 +404,10 @@ impl ZeroIDC {
match res { match res {
Ok(res) => { Ok(res) => {
#[cfg(debug_assertions)] {
println!("hit url: {}", res.url().as_str()); println!("hit url: {}", res.url().as_str());
println!("Status: {}", res.status()); println!("Status: {}", res.status());
}
let at = tok.access_token().secret(); let at = tok.access_token().secret();
let exp = dangerous_insecure_decode::<Exp>(&at); let exp = dangerous_insecure_decode::<Exp>(&at);
@ -408,11 +420,13 @@ impl ZeroIDC {
i.refresh_token = Some(t.clone()); i.refresh_token = Some(t.clone());
should_start = true; should_start = true;
} }
#[cfg(debug_assertions)] {
let access_token = tok.access_token(); let access_token = tok.access_token();
println!("Access Token: {}", access_token.secret()); println!("Access Token: {}", access_token.secret());
let refresh_token = tok.refresh_token(); let refresh_token = tok.refresh_token();
println!("Refresh Token: {}", refresh_token.unwrap().secret()); println!("Refresh Token: {}", refresh_token.unwrap().secret());
}
let bytes = match res.bytes() { let bytes = match res.bytes() {
Ok(bytes) => bytes, Ok(bytes) => bytes,