mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-01-31 00:23:58 +00:00
provide issuer URL, client ID and local web port to constructor
also construct the oidc client
This commit is contained in:
parent
0069b1bac3
commit
31888f5ef8
2
zeroidc/Cargo.lock
generated
2
zeroidc/Cargo.lock
generated
@ -1325,6 +1325,8 @@ dependencies = [
|
|||||||
name = "zeroidc"
|
name = "zeroidc"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"base64 0.13.0",
|
||||||
"cbindgen",
|
"cbindgen",
|
||||||
"openidconnect",
|
"openidconnect",
|
||||||
|
"url",
|
||||||
]
|
]
|
||||||
|
@ -12,6 +12,8 @@ crate-type = ["staticlib"]
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
openidconnect = "2.1.0"
|
openidconnect = "2.1.0"
|
||||||
|
base64 = "0.13.0"
|
||||||
|
url = "2.2.2"
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
cbindgen = "0.20.0"
|
cbindgen = "0.20.0"
|
||||||
|
@ -1,7 +1,20 @@
|
|||||||
|
extern crate base64;
|
||||||
|
extern crate openidconnect;
|
||||||
|
extern crate url;
|
||||||
|
|
||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{Arc, Mutex};
|
||||||
use std::thread::{sleep, spawn, JoinHandle};
|
use std::thread::{sleep, spawn, JoinHandle};
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use openidconnect::core::{CoreClient, CoreProviderMetadata};
|
||||||
|
use openidconnect::reqwest::http_client;
|
||||||
|
use openidconnect::{ClientId, IssuerUrl, RedirectUrl};
|
||||||
|
|
||||||
|
use url::Url;
|
||||||
|
|
||||||
|
use std::ffi::CStr;
|
||||||
|
use std::os::raw::c_char;
|
||||||
|
|
||||||
pub struct ZeroIDC {
|
pub struct ZeroIDC {
|
||||||
inner: Arc<Mutex<Inner>>,
|
inner: Arc<Mutex<Inner>>,
|
||||||
}
|
}
|
||||||
@ -9,16 +22,50 @@ pub struct ZeroIDC {
|
|||||||
struct Inner {
|
struct Inner {
|
||||||
running: bool,
|
running: bool,
|
||||||
oidc_thread: Option<JoinHandle<()>>,
|
oidc_thread: Option<JoinHandle<()>>,
|
||||||
|
oidc_client: Option<openidconnect::core::CoreClient>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ZeroIDC {
|
impl ZeroIDC {
|
||||||
fn new() -> ZeroIDC {
|
fn new(issuer: &str, client_id: &str, port: u16) -> Result<ZeroIDC, String> {
|
||||||
ZeroIDC {
|
let idc = ZeroIDC {
|
||||||
inner: Arc::new(Mutex::new(Inner {
|
inner: Arc::new(Mutex::new(Inner {
|
||||||
running: false,
|
running: false,
|
||||||
oidc_thread: None,
|
oidc_thread: None,
|
||||||
|
oidc_client: None,
|
||||||
})),
|
})),
|
||||||
}
|
};
|
||||||
|
|
||||||
|
let iss = match IssuerUrl::new(issuer.to_string()) {
|
||||||
|
Ok(i) => i,
|
||||||
|
Err(e) => return Err(e.to_string()),
|
||||||
|
};
|
||||||
|
|
||||||
|
let provider_meta = match CoreProviderMetadata::discover(&iss, http_client) {
|
||||||
|
Ok(m) => m,
|
||||||
|
Err(e) => return Err(e.to_string()),
|
||||||
|
};
|
||||||
|
|
||||||
|
let r = format!("http://localhost:{}", port);
|
||||||
|
let redir_url = match Url::parse(&r) {
|
||||||
|
Ok(s) => s,
|
||||||
|
Err(e) => return Err(e.to_string()),
|
||||||
|
};
|
||||||
|
|
||||||
|
let redirect = match RedirectUrl::new(redir_url.to_string()) {
|
||||||
|
Ok(s) => s,
|
||||||
|
Err(e) => return Err(e.to_string()),
|
||||||
|
};
|
||||||
|
|
||||||
|
(*idc.inner.lock().unwrap()).oidc_client = Some(
|
||||||
|
CoreClient::from_provider_metadata(
|
||||||
|
provider_meta,
|
||||||
|
ClientId::new(client_id.to_string()),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.set_redirect_uri(redirect),
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(idc)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn start(&mut self) {
|
fn start(&mut self) {
|
||||||
@ -50,19 +97,59 @@ impl ZeroIDC {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub extern "C" fn zeroidc_new() -> Box<ZeroIDC> {
|
pub extern "C" fn zeroidc_new(
|
||||||
Box::new(ZeroIDC::new())
|
issuer: *const c_char,
|
||||||
|
client_id: *const c_char,
|
||||||
|
web_port: u16,
|
||||||
|
) -> *mut ZeroIDC {
|
||||||
|
if issuer.is_null() {
|
||||||
|
println!("issuer is null");
|
||||||
|
return std::ptr::null_mut();
|
||||||
|
}
|
||||||
|
|
||||||
|
if client_id.is_null() {
|
||||||
|
println!("client_id is null");
|
||||||
|
return std::ptr::null_mut();
|
||||||
|
}
|
||||||
|
|
||||||
|
let iss = unsafe { CStr::from_ptr(issuer) };
|
||||||
|
let c_id = unsafe { CStr::from_ptr(client_id) };
|
||||||
|
|
||||||
|
match ZeroIDC::new(iss.to_str().unwrap(), c_id.to_str().unwrap(), web_port) {
|
||||||
|
Ok(idc) => {
|
||||||
|
return Box::into_raw(Box::new(idc));
|
||||||
|
}
|
||||||
|
Err(s) => {
|
||||||
|
println!("Error creating ZeroIDC instance: {}", s);
|
||||||
|
return std::ptr::null_mut();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub extern "C" fn zeroidc_delete(_: Option<Box<ZeroIDC>>) {}
|
pub extern "C" fn zeroidc_delete(ptr: *mut ZeroIDC) {
|
||||||
|
if ptr.is_null() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
unsafe {
|
||||||
|
Box::from_raw(ptr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub extern "C" fn zeroidc_start(idc: &'static mut ZeroIDC) {
|
pub extern "C" fn zeroidc_start(ptr: *mut ZeroIDC) {
|
||||||
|
let idc = unsafe {
|
||||||
|
assert!(!ptr.is_null());
|
||||||
|
&mut *ptr
|
||||||
|
};
|
||||||
idc.start();
|
idc.start();
|
||||||
}
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub extern "C" fn zeroidc_stop(idc: &'static mut ZeroIDC) {
|
pub extern "C" fn zeroidc_stop(ptr: *mut ZeroIDC) {
|
||||||
|
let idc = unsafe {
|
||||||
|
assert!(!ptr.is_null());
|
||||||
|
&mut *ptr
|
||||||
|
};
|
||||||
idc.stop();
|
idc.stop();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user