OMGeeky/yup-oauth2
1
0
Fork 0
mirror of https://github.com/OMGeeky/yup-oauth2.git synced 2025-12-26 16:27:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

cargo fmt

Browse Source
This commit is contained in:
Glenn Griffin
2019-11-08 15:25:52 -08:00
parent 2cf2e465d1
commit 4bd81c3263
10 changed files with 84 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/test-svc-acct/src/main.rs
View File

@@ -10,14 +10,8 @@ async fn main() {
let sa = yup_oauth2::ServiceAccountAccess::new(creds).build();
let scopes = &["https://www.googleapis.com/auth/pubsub"];
let tok = sa
.token(scopes)
.await
.unwrap();
let tok = sa.token(scopes).await.unwrap();
println!("token is: {:?}", tok);
let tok = sa
.token(scopes)
.await
.unwrap();
let tok = sa.token(scopes).await.unwrap();
println!("cached token is {:?} and should be identical", tok);
}

17
src/authenticator.rs
View File

@@ -202,10 +202,7 @@ where
let gettoken = &self.inner;
let appsecret = gettoken.application_secret();
loop {
match store.get(
scope_key,
scopes,
) {
match store.get(scope_key, scopes) {
Ok(Some(t)) => {
if !t.expired() {
return Ok(t);
@@ -233,11 +230,7 @@ where
return Err(RequestError::Refresh(rr));
}
RefreshResult::Success(t) => {
let x = store.set(
scope_key,
scopes,
Some(t.clone()),
);
let x = store.set(scope_key, scopes, Some(t.clone()));
if let Err(e) = x {
match delegate.token_storage_failure(true, &e) {
Retry::Skip => return Ok(t),
@@ -252,11 +245,7 @@ where
}
Ok(None) => {
let t = gettoken.token(scopes).await?;
if let Err(e) = store.set(
scope_key,
scopes,
Some(t.clone()),
) {
if let Err(e) = store.set(scope_key, scopes, Some(t.clone())) {
match delegate.token_storage_failure(true, &e) {
Retry::Skip => return Ok(t),
Retry::Abort => return Err(RequestError::Cache(Box::new(e))),

6
src/authenticator_delegate.rs
View File

@@ -95,11 +95,7 @@ pub trait AuthenticatorDelegate: Clone + Send + Sync {
/// Called if we could not acquire a refresh token for a reason possibly specified
/// by the server.
/// This call is made for the delegate's information only.
fn token_refresh_failed<S: AsRef<str>>(
&self,
error: S,
error_description: &Option<String>,
) {
fn token_refresh_failed<S: AsRef<str>>(&self, error: S, error_description: &Option<String>) {
{
let _ = error;
}

11
src/device.rs
View File

@@ -3,16 +3,14 @@ use std::time::Duration;
use ::log::{error, log};
use chrono::{self, Utc};
use futures::{prelude::*};
use futures::prelude::*;
use hyper;
use hyper::header;
use serde_json as json;
use url::form_urlencoded;
use crate::authenticator_delegate::{DefaultFlowDelegate, FlowDelegate, PollInformation, Retry};
use crate::types::{
ApplicationSecret, GetToken, JsonErrorOr, PollError, RequestError, Token,
};
use crate::types::{ApplicationSecret, GetToken, JsonErrorOr, PollError, RequestError, Token};
pub const GOOGLE_DEVICE_CODE_URL: &'static str = "https://accounts.google.com/o/oauth2/device/code";
@@ -128,10 +126,7 @@ where
{
/// Essentially what `GetToken::token` does: Retrieve a token for the given scopes without
/// caching.
pub async fn retrieve_device_token<T>(
&self,
scopes: &[T],
) -> Result<Token, RequestError>
pub async fn retrieve_device_token<T>(&self, scopes: &[T]) -> Result<Token, RequestError>
where
T: AsRef<str>,
{

41
src/installed.rs
View File

@@ -17,7 +17,7 @@ use url::form_urlencoded;
use url::percent_encoding::{percent_encode, QUERY_ENCODE_SET};
use crate::authenticator_delegate::{DefaultFlowDelegate, FlowDelegate};
use crate::types::{ApplicationSecret, GetToken, RequestError, Token, JsonErrorOr};
use crate::types::{ApplicationSecret, GetToken, JsonErrorOr, RequestError, Token};
const OOB_REDIRECT_URI: &'static str = "urn:ietf:wg:oauth:2.0:oob";
@@ -40,10 +40,7 @@ where
vec![
format!("?scope={}", scopes_string),
format!("&access_type=offline"),
format!(
"&redirect_uri={}",
redirect_uri.unwrap_or(OOB_REDIRECT_URI)
),
format!("&redirect_uri={}", redirect_uri.unwrap_or(OOB_REDIRECT_URI)),
format!("&response_type=code"),
format!("&client_id={}", client_id),
]
@@ -167,10 +164,7 @@ where
/// . Return that token
///
/// It's recommended not to use the DefaultFlowDelegate, but a specialized one.
async fn obtain_token<T>(
&self,
scopes: &[T],
) -> Result<Token, RequestError>
async fn obtain_token<T>(&self, scopes: &[T]) -> Result<Token, RequestError>
where
T: AsRef<str>,
{
@@ -281,7 +275,12 @@ where
match serde_json::from_slice::<JsonErrorOr<JSONTokenResponse>>(&body)? {
JsonErrorOr::Err(err) => Err(err.into()),
JsonErrorOr::Data(JSONTokenResponse{access_token, refresh_token, token_type, expires_in}) => {
JsonErrorOr::Data(JSONTokenResponse {
access_token,
refresh_token,
token_type,
expires_in,
}) => {
let mut token = Token {
access_token,
refresh_token: Some(refresh_token),
@@ -465,8 +464,8 @@ mod tests {
use std::fmt;
use std::str::FromStr;
use hyper::Uri;
use hyper::client::connect::HttpConnector;
use hyper::Uri;
use hyper_rustls::HttpsConnector;
use mockito::{self, mock};
use tokio;
@@ -539,10 +538,9 @@ mod tests {
.build::<_, hyper::Body>(https);
let fd = FD("authorizationcode".to_string(), client.clone());
let inf =
InstalledFlow::new(app_secret.clone(), InstalledFlowReturnMethod::Interactive)
.delegate(fd)
.build_token_getter(client.clone());
let inf = InstalledFlow::new(app_secret.clone(), InstalledFlowReturnMethod::Interactive)
.delegate(fd)
.build_token_getter(client.clone());
let rt = tokio::runtime::Builder::new()
.core_threads(1)
@@ -575,13 +573,12 @@ mod tests {
}
// Successful path with HTTP redirect.
{
let inf =
InstalledFlow::new(app_secret, InstalledFlowReturnMethod::HTTPRedirect(8081))
.delegate(FD(
"authorizationcodefromlocalserver".to_string(),
client.clone(),
))
.build_token_getter(client.clone());
let inf = InstalledFlow::new(app_secret, InstalledFlowReturnMethod::HTTPRedirect(8081))
.delegate(FD(
"authorizationcodefromlocalserver".to_string(),
client.clone(),
))
.build_token_getter(client.clone());
let _m = mock("POST", "/token")
.match_body(mockito::Matcher::Regex(".*code=authorizationcodefromlocalserver.*client_id=9022167.*".to_string()))
.with_body(r#"{"access_token": "accesstoken", "refresh_token": "refreshtoken", "token_type": "Bearer", "expires_in": 12345678}"#)

4
src/lib.rs
View File

@@ -100,6 +100,6 @@ pub use crate::installed::{InstalledFlow, InstalledFlowReturnMethod};
pub use crate::service_account::*;
pub use crate::storage::{DiskTokenStorage, MemoryStorage, NullStorage, TokenStorage};
pub use crate::types::{
ApplicationSecret, ConsoleApplicationSecret, GetToken, PollError, RefreshResult,
RequestError, Scheme, Token, TokenType,
ApplicationSecret, ConsoleApplicationSecret, GetToken, PollError, RefreshResult, RequestError,
Scheme, Token, TokenType,
};

41
src/refresh.rs
View File

@@ -66,18 +66,25 @@ impl RefreshFlow {
}
match serde_json::from_slice::<JsonErrorOr<JsonToken>>(&body) {
Err(_) => Ok(RefreshResult::RefreshError("failed to deserialized json token from refresh response".to_owned(), None)),
Ok(JsonErrorOr::Err(json_err)) => Ok(RefreshResult::RefreshError(json_err.error, json_err.error_description)),
Ok(JsonErrorOr::Data(JsonToken{access_token, token_type, expires_in})) => {
Ok(RefreshResult::Success(
Token{
access_token,
token_type,
refresh_token: Some(refresh_token.to_string()),
expires_in: None,
expires_in_timestamp: Some(Utc::now().timestamp() + expires_in),
}))
},
Err(_) => Ok(RefreshResult::RefreshError(
"failed to deserialized json token from refresh response".to_owned(),
None,
)),
Ok(JsonErrorOr::Err(json_err)) => Ok(RefreshResult::RefreshError(
json_err.error,
json_err.error_description,
)),
Ok(JsonErrorOr::Data(JsonToken {
access_token,
token_type,
expires_in,
})) => Ok(RefreshResult::Success(Token {
access_token,
token_type,
refresh_token: Some(refresh_token.to_string()),
expires_in: None,
expires_in_timestamp: Some(Utc::now().timestamp() + expires_in),
})),
}
}
}
@@ -121,13 +128,9 @@ mod tests {
.with_body(r#"{"access_token": "new-access-token", "token_type": "Bearer", "expires_in": 1234567}"#)
.create();
let fut = async {
let rr = RefreshFlow::refresh_token(
&client,
&app_secret,
refresh_token,
)
.await
.unwrap();
let rr = RefreshFlow::refresh_token(&client, &app_secret, refresh_token)
.await
.unwrap();
match rr {
RefreshResult::Success(tok) => {
assert_eq!("new-access-token", tok.access_token);

35
src/service_account.rs
View File

@@ -264,7 +264,7 @@ struct TokenResponse {
expires_in: Option<i64>,
}
impl<C> ServiceAccountAccessImpl<C>
impl<C> ServiceAccountAccessImpl<C>
where
C: hyper::client::connect::Connect + 'static,
{
@@ -303,9 +303,7 @@ where
.await
.map_err(RequestError::ClientError)?;
match serde_json::from_slice::<JsonErrorOr<TokenResponse>>(&body)? {
JsonErrorOr::Err(err) => {
Err(err.into())
},
JsonErrorOr::Err(err) => Err(err.into()),
JsonErrorOr::Data(TokenResponse {
access_token: Some(access_token),
token_type: Some(token_type),
@@ -320,13 +318,11 @@ where
expires_in: Some(expires_in),
expires_in_timestamp: Some(expires_ts),
})
},
JsonErrorOr::Data(token) => {
Err(RequestError::BadServerResponse(format!(
"Token response lacks fields: {:?}",
token
)))
}
JsonErrorOr::Data(token) => Err(RequestError::BadServerResponse(format!(
"Token response lacks fields: {:?}",
token
))),
}
}
@@ -336,11 +332,7 @@ where
{
let hash = hash_scopes(scopes);
let cache = &self.cache;
match cache
.lock()
.unwrap()
.get(hash, scopes)
{
match cache.lock().unwrap().get(hash, scopes) {
Ok(Some(token)) if !token.expired() => return Ok(token),
_ => {}
}
@@ -351,11 +343,7 @@ where
scopes,
)
.await?;
let _ = cache.lock().unwrap().set(
hash,
scopes,
Some(token.clone()),
);
let _ = cache.lock().unwrap().set(hash, scopes, Some(token.clone()));
Ok(token)
}
}
@@ -489,9 +477,7 @@ mod tests {
.hyper_client(client.clone())
.build();
let fut = async {
let result = acc
.token(&["https://www.googleapis.com/auth/pubsub"])
.await;
let result = acc.token(&["https://www.googleapis.com/auth/pubsub"]).await;
assert!(result.is_err());
Ok(()) as Result<(), ()>
};
@@ -520,8 +506,7 @@ mod tests {
rt.block_on(async {
println!(
"{:?}",
acc.token(&["https://www.googleapis.com/auth/pubsub"])
.await
acc.token(&["https://www.googleapis.com/auth/pubsub"]).await
);
});
}

43
src/storage.rs
View File

@@ -65,14 +65,14 @@ impl TokenStorage for NullStorage {
type Error = std::convert::Infallible;
fn set<T>(&self, _: u64, _: &[T], _: Option<Token>) -> Result<(), Self::Error>
where
T: AsRef<str>
T: AsRef<str>,
{
Ok(())
}
fn get<T>(&self, _: u64, _: &[T]) -> Result<Option<Token>, Self::Error>
where
T: AsRef<str>
T: AsRef<str>,
{
Ok(None)
}
@@ -93,14 +93,9 @@ impl MemoryStorage {
impl TokenStorage for MemoryStorage {
type Error = std::convert::Infallible;
fn set<T>(
&self,
scope_hash: u64,
scopes: &[T],
token: Option<Token>,
) -> Result<(), Self::Error>
fn set<T>(&self, scope_hash: u64, scopes: &[T], token: Option<Token>) -> Result<(), Self::Error>
where
T: AsRef<str>
T: AsRef<str>,
{
let mut tokens = self.tokens.lock().expect("poisoned mutex");
let matched = tokens.iter().find_position(|x| x.hash == scope_hash);
@@ -124,7 +119,7 @@ impl TokenStorage for MemoryStorage {
fn get<T>(&self, scope_hash: u64, scopes: &[T]) -> Result<Option<Token>, Self::Error>
where
T: AsRef<str>
T: AsRef<str>,
{
let tokens = self.tokens.lock().expect("poisoned mutex");
Ok(token_for_scopes(&tokens, scope_hash, scopes))
@@ -222,14 +217,9 @@ fn load_from_file(filename: &Path) -> Result<Vec<JSONToken>, io::Error> {
impl TokenStorage for DiskTokenStorage {
type Error = io::Error;
fn set<T>(
&self,
scope_hash: u64,
scopes: &[T],
token: Option<Token>,
) -> Result<(), Self::Error>
fn set<T>(&self, scope_hash: u64, scopes: &[T], token: Option<Token>) -> Result<(), Self::Error>
where
T: AsRef<str>
T: AsRef<str>,
{
{
let mut tokens = self.tokens.lock().expect("poisoned mutex");
@@ -255,7 +245,7 @@ impl TokenStorage for DiskTokenStorage {
fn get<T>(&self, scope_hash: u64, scopes: &[T]) -> Result<Option<Token>, Self::Error>
where
T: AsRef<str>
T: AsRef<str>,
{
let tokens = self.tokens.lock().expect("poisoned mutex");
Ok(token_for_scopes(&tokens, scope_hash, scopes))
@@ -268,11 +258,14 @@ where
{
for t in tokens.iter() {
if let Some(token_scopes) = &t.scopes {
if scopes.iter().all(|s| token_scopes.iter().any(|t| t == s.as_ref())) {
if scopes
.iter()
.all(|s| token_scopes.iter().any(|t| t == s.as_ref()))
{
return Some(t.token.clone());
}
} else if scope_hash == t.hash {
return Some(t.token.clone())
return Some(t.token.clone());
}
}
None
@@ -288,10 +281,16 @@ mod tests {
assert_eq!(hash_scopes(&["foo", "bar"]), hash_scopes(&["foo", "bar"]));
// The hash should be order independent.
assert_eq!(hash_scopes(&["bar", "foo"]), hash_scopes(&["foo", "bar"]));
assert_eq!(hash_scopes(&["bar", "baz", "bat"]), hash_scopes(&["baz", "bar", "bat"]));
assert_eq!(
hash_scopes(&["bar", "baz", "bat"]),
hash_scopes(&["baz", "bar", "bat"])
);
// Ensure hashes differ when the contents are different by more than
// just order.
assert_ne!(hash_scopes(&["foo", "bar", "baz"]), hash_scopes(&["foo", "bar"]));
assert_ne!(
hash_scopes(&["foo", "bar", "baz"]),
hash_scopes(&["foo", "bar"])
);
}
}

2
src/types.rs
View File

@@ -358,7 +358,7 @@ pub struct ApplicationSecret {
impl ApplicationSecret {
pub const fn empty() -> Self {
ApplicationSecret{
ApplicationSecret {
client_id: String::new(),
client_secret: String::new(),
token_uri: String::new(),