Support wasm32

sugyan · sugyan · commit dcd91c469cd6 · 2024-09-01T14:04:08.000+09:00
diff --git a/atrium-oauth/oauth-client/src/atproto.rs b/atrium-oauth/oauth-client/src/atproto.rs
@@ -1,6 +1,7 @@
 use crate::keyset::Keyset;
 use crate::types::{OAuthClientMetadata, TryIntoOAuthClientMetadata};
 use atrium_xrpc::http::Uri;
+use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
 #[derive(Error, Debug)]
@@ -21,7 +22,8 @@ pub enum Error {
 
 pub type Result<T> = core::result::Result<T, Error>;
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
 pub enum AuthMethod {
     None,
     // https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication
@@ -37,7 +39,8 @@ impl From<AuthMethod> for String {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
 pub enum GrantType {
     AuthorizationCode,
     RefreshToken,
@@ -52,7 +55,8 @@ impl From<GrantType> for String {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
 pub enum Scope {
     Atproto,
 }
@@ -65,19 +69,19 @@ impl From<Scope> for String {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
 pub struct AtprotoLocalhostClientMetadata {
     pub redirect_uris: Vec<String>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct AtprotoClientMetadata {
     pub client_id: String,
     pub client_uri: String,
     pub redirect_uris: Vec<String>,
     pub token_endpoint_auth_method: AuthMethod,
     pub grant_types: Vec<GrantType>,
-    pub scope: Vec<Scope>,
+    pub scopes: Vec<Scope>,
     pub jwks_uri: Option<String>,
     pub token_endpoint_auth_signing_alg: Option<String>,
 }
@@ -117,7 +121,7 @@ impl TryIntoOAuthClientMetadata for AtprotoClientMetadata {
         if !self.grant_types.contains(&GrantType::AuthorizationCode) {
             return Err(Error::InvalidGrantTypes);
         }
-        if !self.scope.contains(&Scope::Atproto) {
+        if !self.scopes.contains(&Scope::Atproto) {
             return Err(Error::InvalidScope);
         }
         let (jwks_uri, mut jwks) = (self.jwks_uri, None);
@@ -147,7 +151,7 @@ impl TryIntoOAuthClientMetadata for AtprotoClientMetadata {
             token_endpoint_auth_method: Some(self.token_endpoint_auth_method.into()),
             grant_types: Some(self.grant_types.into_iter().map(|v| v.into()).collect()),
             scope: Some(
-                self.scope
+                self.scopes
                     .into_iter()
                     .map(|v| v.into())
                     .collect::<Vec<String>>()
diff --git a/atrium-oauth/oauth-client/src/http_client/dpop.rs b/atrium-oauth/oauth-client/src/http_client/dpop.rs
@@ -7,6 +7,7 @@ use atrium_xrpc::http::{Request, Response};
 use atrium_xrpc::HttpClient;
 use base64::engine::general_purpose::URL_SAFE_NO_PAD;
 use base64::Engine;
+use chrono::Utc;
 use jose_jwa::{Algorithm, Signing};
 use jose_jwk::{crypto, EcCurves, Jwk, Key};
 use rand::rngs::SmallRng;
@@ -30,8 +31,6 @@ pub enum Error {
     UnsupportedKey,
     #[error(transparent)]
     SerdeJson(#[from] serde_json::Error),
-    #[error(transparent)]
-    SystemTime(#[from] std::time::SystemTimeError),
 }
 
 type Result<T> = core::result::Result<T, Error>;
@@ -86,11 +85,7 @@ impl<T> DpopClient<T> {
                 let claims = Claims {
                     registered: RegisteredClaims {
                         jti: Some(Self::generate_jti()),
-                        iat: Some(
-                            std::time::SystemTime::now()
-                                .duration_since(std::time::UNIX_EPOCH)?
-                                .as_secs(),
-                        ),
+                        iat: Some(Utc::now().timestamp()),
                         ..Default::default()
                     },
                     public: PublicClaims {
diff --git a/atrium-oauth/oauth-client/src/jose/jwt.rs b/atrium-oauth/oauth-client/src/jose/jwt.rs
@@ -18,11 +18,11 @@ pub struct RegisteredClaims {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub aud: Option<RegisteredClaimsAud>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub exp: Option<u64>,
+    pub exp: Option<i64>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub nbf: Option<u64>,
+    pub nbf: Option<i64>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub iat: Option<u64>,
+    pub iat: Option<i64>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub jti: Option<String>,
 }
diff --git a/atrium-oauth/oauth-client/src/oauth_client.rs b/atrium-oauth/oauth-client/src/oauth_client.rs
@@ -259,8 +259,8 @@ where
             self.keyset.clone(),
         )?;
         let token_set = server.exchange_code(&params.code, &state.verifier).await?;
-        // TODO: verify id_token?
 
+        // TODO: create session?
         Ok(token_set)
     }
     fn generate_dpop_key(metadata: &OAuthAuthorizationServerMetadata) -> Option<Key> {
diff --git a/atrium-oauth/oauth-client/src/resolver.rs b/atrium-oauth/oauth-client/src/resolver.rs
@@ -19,7 +19,8 @@ use oauth_protected_resource_resolver::OAuthProtectedResourceMetadata;
 use std::marker::PhantomData;
 use std::sync::Arc;
 
-#[async_trait]
+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 pub trait Resolver {
     type Input;
     type Output;
diff --git a/atrium-oauth/oauth-client/src/resolver/did_resolver/base_resolver.rs b/atrium-oauth/oauth-client/src/resolver/did_resolver/base_resolver.rs
@@ -14,7 +14,8 @@ pub trait BaseResolver {
     fn get_resolver(&self, method: Method) -> Arc<dyn DidResolver + Send + Sync + 'static>;
 }
 
-#[async_trait]
+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 impl<T> Resolver for T
 where
     T: BaseResolver + Send + Sync + 'static,
diff --git a/atrium-oauth/oauth-client/src/resolver/did_resolver/plc_resolver.rs b/atrium-oauth/oauth-client/src/resolver/did_resolver/plc_resolver.rs
@@ -26,7 +26,8 @@ impl<T> PlcResolver<T> {
     }
 }
 
-#[async_trait]
+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 impl<T> Resolver for PlcResolver<T>
 where
     T: HttpClient + Send + Sync + 'static,
diff --git a/atrium-oauth/oauth-client/src/resolver/did_resolver/web_resolver.rs b/atrium-oauth/oauth-client/src/resolver/did_resolver/web_resolver.rs
@@ -17,7 +17,8 @@ impl<T> WebResolver<T> {
     }
 }
 
-#[async_trait]
+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 impl<T> Resolver for WebResolver<T>
 where
     T: HttpClient + Send + Sync + 'static,
diff --git a/atrium-oauth/oauth-client/src/resolver/handle_resolver/appview_resolver.rs b/atrium-oauth/oauth-client/src/resolver/handle_resolver/appview_resolver.rs
@@ -23,7 +23,8 @@ impl<T> AppViewResolver<T> {
     }
 }
 
-#[async_trait]
+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 impl<T> Resolver for AppViewResolver<T>
 where
     T: HttpClient + Send + Sync + 'static,
diff --git a/atrium-oauth/oauth-client/src/resolver/oauth_authorization_server_resolver.rs b/atrium-oauth/oauth-client/src/resolver/oauth_authorization_server_resolver.rs
@@ -17,7 +17,8 @@ impl<T> DefaultOAuthAuthorizationServerResolver<T> {
     }
 }
 
-#[async_trait]
+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 impl<T> Resolver for DefaultOAuthAuthorizationServerResolver<T>
 where
     T: HttpClient + Send + Sync + 'static,
diff --git a/atrium-oauth/oauth-client/src/resolver/oauth_protected_resource_resolver.rs b/atrium-oauth/oauth-client/src/resolver/oauth_protected_resource_resolver.rs
@@ -32,7 +32,8 @@ impl<T> DefaultOAuthProtectedResourceResolver<T> {
     }
 }
 
-#[async_trait]
+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 impl<T> Resolver for DefaultOAuthProtectedResourceResolver<T>
 where
     T: HttpClient + Send + Sync + 'static,
diff --git a/atrium-oauth/oauth-client/src/server_agent.rs b/atrium-oauth/oauth-client/src/server_agent.rs
@@ -11,12 +11,11 @@ use crate::utils::{compare_algos, generate_nonce};
 use atrium_api::types::string::Datetime;
 use atrium_xrpc::http::{Method, Request, StatusCode};
 use atrium_xrpc::HttpClient;
-use chrono::TimeDelta;
+use chrono::{TimeDelta, Utc};
 use jose_jwk::Key;
 use serde::Serialize;
 use serde_json::Value;
 use std::sync::Arc;
-use std::time::{SystemTime, UNIX_EPOCH};
 use thiserror::Error;
 
 // https://datatracker.ietf.org/doc/html/rfc7523#section-2.2
@@ -49,8 +48,6 @@ pub enum Error {
     SerdeHtmlForm(#[from] serde_html_form::ser::Error),
     #[error(transparent)]
     SerdeJson(#[from] serde_json::Error),
-    #[error(transparent)]
-    SystemTime(#[from] std::time::SystemTimeError),
 }
 
 pub type Result<T> = core::result::Result<T, Error>;
@@ -160,7 +157,6 @@ where
             aud: identity.pds,
             iss: metadata.issuer,
             scope: token_response.scope,
-            id_token: token_response.id_token,
             access_token: token_response.access_token,
             refresh_token: token_response.refresh_token,
             token_type: token_response.token_type,
@@ -240,7 +236,7 @@ where
                         .clone()
                         .unwrap_or(vec![FALLBACK_ALG.into()]);
                     algs.sort_by(compare_algos);
-                    let iat = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs();
+                    let iat = Utc::now().timestamp();
                     return Ok((
                         Some(String::from(CLIENT_ASSERTION_TYPE_JWT_BEARER)),
                         Some(
diff --git a/atrium-oauth/oauth-client/src/types/response.rs b/atrium-oauth/oauth-client/src/types/response.rs
@@ -12,13 +12,16 @@ pub enum OAuthTokenType {
     Bearer,
 }
 
+// https://datatracker.ietf.org/doc/html/rfc6749#section-5.1
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
 pub struct OAuthTokenResponse {
     pub access_token: String,
     pub token_type: OAuthTokenType,
-    pub id_token: Option<String>,
+    pub expires_in: Option<i64>,
     pub refresh_token: Option<String>,
     pub scope: Option<String>,
-    pub expires_in: Option<i64>,
+    // ATPROTO extension: add the sub claim to the token response to allow
+    // clients to resolve the PDS url (audience) using the did resolution
+    // mechanism.
     pub sub: Option<String>,
 }
diff --git a/atrium-oauth/oauth-client/src/types/token.rs b/atrium-oauth/oauth-client/src/types/token.rs
@@ -9,7 +9,6 @@ pub struct TokenSet {
     pub aud: String,
     pub scope: Option<String>,
 
-    pub id_token: Option<String>,
     pub refresh_token: Option<String>,
     pub access_token: String,
     pub token_type: OAuthTokenType,
diff --git a/atrium-oauth/oauth-client/src/utils.rs b/atrium-oauth/oauth-client/src/utils.rs
@@ -7,6 +7,7 @@ use std::cmp::Ordering;
 
 pub fn generate_key(allowed_algos: &[String]) -> Option<Key> {
     for alg in allowed_algos {
+        #[allow(clippy::single_match)]
         match alg.as_str() {
             "ES256" => {
                 return Some(Key::from(&crypto::Key::from(

Original file line number	Diff line number	Diff line change
`@@ -259,8 +259,8 @@ where`
`259`	`259`	`self.keyset.clone(),`
`260`	`260`	`)?;`
`261`	`261`	`let token_set = server.exchange_code(&params.code, &state.verifier).await?;`
`262`		`- // TODO: verify id_token?`
`263`	`262`
	`263`	`+ // TODO: create session?`
`264`	`264`	`Ok(token_set)`
`265`	`265`	`}`
`266`	`266`	`fn generate_dpop_key(metadata: &OAuthAuthorizationServerMetadata) -> Option<Key> {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ pub trait BaseResolver {`
`14`	`14`	`fn get_resolver(&self, method: Method) -> Arc<dyn DidResolver + Send + Sync + 'static>;`
`15`	`15`	`}`
`16`	`16`
`17`		`-#[async_trait]`
	`17`	`+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]`
	`18`	`+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]`
`18`	`19`	`impl<T> Resolver for T`
`19`	`20`	`where`
`20`	`21`	`T: BaseResolver + Send + Sync + 'static,`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@ impl<T> PlcResolver<T> {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`-#[async_trait]`
	`29`	`+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]`
	`30`	`+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]`
`30`	`31`	`impl<T> Resolver for PlcResolver<T>`
`31`	`32`	`where`
`32`	`33`	`T: HttpClient + Send + Sync + 'static,`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ impl<T> WebResolver<T> {`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
`20`		`-#[async_trait]`
	`20`	`+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]`
	`21`	`+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]`
`21`	`22`	`impl<T> Resolver for WebResolver<T>`
`22`	`23`	`where`
`23`	`24`	`T: HttpClient + Send + Sync + 'static,`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ impl<T> AppViewResolver<T> {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`-#[async_trait]`
	`26`	`+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]`
	`27`	`+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]`
`27`	`28`	`impl<T> Resolver for AppViewResolver<T>`
`28`	`29`	`where`
`29`	`30`	`T: HttpClient + Send + Sync + 'static,`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ impl<T> DefaultOAuthAuthorizationServerResolver<T> {`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
`20`		`-#[async_trait]`
	`20`	`+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]`
	`21`	`+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]`
`21`	`22`	`impl<T> Resolver for DefaultOAuthAuthorizationServerResolver<T>`
`22`	`23`	`where`
`23`	`24`	`T: HttpClient + Send + Sync + 'static,`