commit 2b3a4515b60e94f49fafc52836b570280099b5e6 · nekomimi.pet/microcosm-rs

+1 -1

.github/workflows/checks.yml

···

       28
       28
        
             - name: get nightly toolchain for jetstream fmt

     

       29
       29
        
               run: rustup toolchain install nightly --allow-downgrade -c rustfmt

     

       30
       30
        
             - name: fmt

     

       31
       31
       -
               run: cargo fmt --package links --package constellation --package ufos --package spacedust --package who-am-i --package slingshot -- --check

     

       31
       31
       +
               run: cargo fmt --package links --package constellation --package ufos --package spacedust --package who-am-i --package slingshot --package pocket -- --check

     

       32
       32
        
             - name: fmt jetstream (nightly)

     

       33
       33
        
               run: cargo +nightly fmt --package jetstream -- --check

     

       34
       34
        
             - name: clippy

+1 -1

Makefile

···

       5
       5
        
       	cargo test --all-features

     

       6
       6
        
       

     

       7
       7
        
       fmt:

     

       8
       8
       -
       	cargo fmt --package links --package constellation --package ufos --package spacedust --package who-am-i --package slingshot

     

       8
       8
       +
       	cargo fmt --package links --package constellation --package ufos --package spacedust --package who-am-i --package slingshot --package pocket

     

       9
       9
        
       	cargo +nightly fmt --package jetstream

     

       10
       10
        
       

     

       11
       11
        
       clippy:

+17

pocket/api-description.md

···

       1
       1
       +
       _A pocket dimension to stash a bit of non-public user data._

     

       2
       2
       +
       

     

       3
       3
       +
       

     

       4
       4
       +
       # Pocket: user preference storage

     

       5
       5
       +
       

     

       6
       6
       +
       This API leverages atproto service proxying to offer a bit of per-user per-app non-public data storage.

     

       7
       7
       +
       Perfect for things like application preferences that might be better left out of the public PDS data.

     

       8
       8
       +
       

     

       9
       9
       +
       The intent is to use oauth scopes to isolate storage on a per-application basis, and to allow easy data migration from a community hosted instance to your own if you end up needing that.

     

       10
       10
       +
       

     

       11
       11
       +
       

     

       12
       12
       +
       ### Current status

     

       13
       13
       +
       

     

       14
       14
       +
       > [!important]

     

       15
       15
       +
       > Pocket is currently in a **v0, pre-release state**. There is one production instance and you can use it! Expect short downtimes for restarts as development progresses and occaisional data loss until it's stable.

     

       16
       16
       +
       

     

       17
       17
       +
       ATProto might end up adding a similar feature to [PDSs](https://atproto.com/guides/glossary#pds-personal-data-server). If/when that happens, you should use it instead of this!

+1 -1

pocket/src/lib.rs

···

       2
       2
        
       mod token;

     

       3
       3
        
       

     

       4
       4
        
       pub use server::serve;

     

       5
       5
       -
       pub use token::verify;

     

       5
       5
       +
       pub use token::TokenVerifier;

-1

pocket/src/main.rs

···

       6
       6
        
           println!("Hello, world!");

     

       7
       7
        
           serve("mac.cinnebar-tet.ts.net").await

     

       8
       8
        
       }

     

       9
       9
       -

+72 -78

pocket/src/server.rs

···

       1
       1
       +
       use crate::TokenVerifier;

     

       1
       2
        
       use poem::{

     

       2
       2
       -
           endpoint::make_sync,

     

       3
       3
       -
           Endpoint,

     

       4
       4
       -
           Route,

     

       5
       5
       -
           Server,

     

       6
       6
       -
           EndpointExt,

     

       7
       7
       -
           http::{Method, HeaderMap},

     

       3
       3
       +
           Endpoint, EndpointExt, Route, Server,

     

       4
       4
       +
           endpoint::{StaticFileEndpoint, make_sync},

     

       5
       5
       +
           http::Method,

     

       6
       6
       +
           listener::TcpListener,

     

       8
       7
        
           middleware::{CatchPanic, Cors, Tracing},

     

       9
       9
       -
           listener::TcpListener,

     

       10
       8
        
       };

     

       11
       9
        
       use poem_openapi::{

     

       12
       12
       -
           ContactObject,

     

       13
       13
       -
           ExternalDocumentObject,

     

       14
       14
       -
           OpenApi,

     

       15
       15
       -
           OpenApiService,

     

       16
       16
       -
           Tags,

     

       17
       17
       -
           Object,

     

       18
       18
       -
           ApiResponse,

     

       10
       10
       +
           ApiResponse, ContactObject, ExternalDocumentObject, Object, OpenApi, OpenApiService,

     

       11
       11
       +
           SecurityScheme, Tags,

     

       12
       12
       +
           auth::Bearer,

     

       13
       13
       +
           payload::{Json, PlainText},

     

       19
       14
        
           types::Example,

     

       20
       20
       -
           auth::Bearer,

     

       21
       21
       -
           payload::Json,

     

       22
       22
       -
           SecurityScheme,

     

       23
       15
        
       };

     

       24
       24
       -
       use crate::verify;

     

       25
       16
        
       use serde::Serialize;

     

       26
       17
        
       use serde_json::{Value, json};

     

       27
       27
       -
       

     

       28
       18
        
       

     

       29
       19
        
       #[derive(Debug, SecurityScheme)]

     

       30
       20
        
       #[oai(ty = "bearer")]

     

       31
       31
       -
       struct BlahAuth(Bearer);

     

       32
       32
       -
       

     

       21
       21
       +
       struct XrpcAuth(Bearer);

     

       33
       22
        
       

     

       34
       23
        
       #[derive(Tags)]

     

       35
       24
        
       enum ApiTags {

     

       36
       36
       -
           /// Bluesky-compatible APIs.

     

       37
       37
       -
           #[oai(rename = "app.bsky.* queries")]

     

       38
       38
       -
           AppBsky,

     

       25
       25
       +
           /// Custom pocket APIs

     

       26
       26
       +
           #[oai(rename = "Pocket APIs")]

     

       27
       27
       +
           Pocket,

     

       39
       28
        
       }

     

       40
       29
        
       

     

       41
       30
        
       #[derive(Object)]

     
···

       86
       75
        
           /// Bad request or no preferences to return

     

       87
       76
        
           #[oai(status = 400)]

     

       88
       77
        
           BadRequest(XrpcError),

     

       78
       78
       +
       }

     

       79
       79
       +
       

     

       80
       80
       +
       #[derive(ApiResponse)]

     

       81
       81
       +
       enum PutBskyPrefsResponse {

     

       82
       82
       +
           /// Record found

     

       83
       83
       +
           #[oai(status = 200)]

     

       84
       84
       +
           Ok(PlainText<String>),

     

       85
       85
       +
           /// Bad request or no preferences to return

     

       86
       86
       +
           #[oai(status = 400)]

     

       87
       87
       +
           BadRequest(XrpcError),

     

       89
       88
        
           // /// Server errors

     

       90
       89
        
           // #[oai(status = 500)]

     

       91
       90
        
           // ServerError(XrpcError),

     

       92
       91
        
       }

     

       93
       92
        
       

     

       94
       93
        
       struct Xrpc {

     

       95
       95
       -
           domain: String,

     

       94
       94
       +
           verifier: TokenVerifier,

     

       96
       95
        
       }

     

       97
       96
        
       

     

       98
       97
        
       #[OpenApi]

     

       99
       98
        
       impl Xrpc {

     

       100
       100
       -
           /// app.bsky.actor.getPreferences

     

       99
       99
       +
           /// com.bad-example.pocket.getPreferences

     

       101
       100
        
           ///

     

       102
       101
        
           /// get stored bluesky prefs

     

       103
       102
        
           #[oai(

     

       104
       104
       -
               path = "/app.bsky.actor.getPreferences",

     

       103
       103
       +
               path = "/com.bad-example.pocket.getPreferences",

     

       105
       104
        
               method = "get",

     

       106
       106
       -
               tag = "ApiTags::AppBsky"

     

       105
       105
       +
               tag = "ApiTags::Pocket"

     

       107
       106
        
           )]

     

       108
       108
       -
           async fn app_bsky_get_prefs(

     

       109
       109
       -
               &self,

     

       110
       110
       -
               BlahAuth(auth): BlahAuth,

     

       111
       111
       -
               m: &HeaderMap,

     

       112
       112
       -
           ) -> GetBskyPrefsResponse {

     

       113
       113
       -
               log::warn!("hm: {m:?}");

     

       114
       114
       -
               match verify(

     

       115
       115
       -
                   &format!("did:web:{}#bsky_appview", self.domain),

     

       116
       116
       -
                   "app.bsky.actor.getPreferences",

     

       117
       117
       -
                   &auth.token,

     

       118
       118
       -
               ).await {

     

       119
       119
       -
                   Ok(did) => log::info!("wooo! {did}"),

     

       120
       120
       -
                   Err(err) => return GetBskyPrefsResponse::BadRequest(xrpc_error("booo", err)),

     

       107
       107
       +
           async fn app_bsky_get_prefs(&self, XrpcAuth(auth): XrpcAuth) -> GetBskyPrefsResponse {

     

       108
       108
       +
               let did = match self

     

       109
       109
       +
                   .verifier

     

       110
       110
       +
                   .verify("app.bsky.actor.getPreferences", &auth.token)

     

       111
       111
       +
                   .await

     

       112
       112
       +
               {

     

       113
       113
       +
                   Ok(d) => d,

     

       114
       114
       +
                   Err(e) => return GetBskyPrefsResponse::BadRequest(xrpc_error("boooo", e.to_string())),

     

       121
       115
        
               };

     

       122
       122
       -
               log::warn!("got bearer: {:?}", auth.token);

     

       116
       116
       +
               log::info!("verified did: {did}");

     

       117
       117
       +
               // TODO: fetch from storage

     

       123
       118
        
               GetBskyPrefsResponse::Ok(Json(GetBskyPrefsResponseObject::example()))

     

       124
       119
        
           }

     

       125
       120
        
       

     

       126
       126
       -
           /// app.bsky.actor.putPreferences

     

       121
       121
       +
           /// com.bad-example.pocket.putPreferences

     

       127
       122
        
           ///

     

       128
       123
        
           /// store bluesky prefs

     

       129
       124
        
           #[oai(

     

       130
       130
       -
               path = "/app.bsky.actor.putPreferences",

     

       125
       125
       +
               path = "/com.bad-example.pocket.putPreferences",

     

       131
       126
        
               method = "post",

     

       132
       132
       -
               tag = "ApiTags::AppBsky"

     

       127
       127
       +
               tag = "ApiTags::Pocket"

     

       133
       128
        
           )]

     

       134
       129
        
           async fn app_bsky_put_prefs(

     

       135
       130
        
               &self,

     

       131
       131
       +
               XrpcAuth(auth): XrpcAuth,

     

       136
       132
        
               Json(prefs): Json<Value>,

     

       137
       137
       -
           ) -> () {

     

       133
       133
       +
           ) -> PutBskyPrefsResponse {

     

       134
       134
       +
               let did = match self

     

       135
       135
       +
                   .verifier

     

       136
       136
       +
                   .verify("app.bsky.actor.getPreferences", &auth.token)

     

       137
       137
       +
                   .await

     

       138
       138
       +
               {

     

       139
       139
       +
                   Ok(d) => d,

     

       140
       140
       +
                   Err(e) => return PutBskyPrefsResponse::BadRequest(xrpc_error("boooo", e.to_string())),

     

       141
       141
       +
               };

     

       142
       142
       +
               log::info!("verified did: {did}");

     

       138
       143
        
               log::warn!("received prefs: {prefs:?}");

     

       139
       139
       -
               ()

     

       144
       144
       +
               // TODO: put prefs into storage

     

       145
       145
       +
               PutBskyPrefsResponse::Ok(PlainText("hiiiiii".to_string()))

     

       140
       146
        
           }

     

       141
       147
        
       }

     

       142
       148
        
       

     
···

       157
       163
        
           let doc = poem::web::Json(AppViewDoc {

     

       158
       164
        
               id: format!("did:web:{domain}"),

     

       159
       165
        
               service: [AppViewService {

     

       160
       160
       -
                   id: "#bsky_appview".to_string(),

     

       161
       161
       -
                   r#type: "PocketBlueskyPreferences".to_string(),

     

       166
       166
       +
                   id: "#pocket_prefs".to_string(),

     

       167
       167
       +
                   r#type: "PocketPreferences".to_string(),

     

       162
       168
        
                   service_endpoint: format!("https://{domain}"),

     

       163
       169
        
               }],

     

       164
       170
        
           });

     

       165
       171
        
           make_sync(move |_| doc.clone())

     

       166
       172
        
       }

     

       167
       173
        
       

     

       168
       168
       -
       pub async fn serve(

     

       169
       169
       -
           domain: &str,

     

       170
       170
       -
       ) -> () {

     

       171
       171
       -
           let api_service = OpenApiService::new(

     

       172
       172
       -
               Xrpc { domain: domain.to_string() },

     

       173
       173
       -
               "Pocket",

     

       174
       174
       -
               env!("CARGO_PKG_VERSION"),

     

       175
       175
       -
           )

     

       176
       176
       -
           .server(domain)

     

       177
       177
       -
           .url_prefix("/xrpc")

     

       178
       178
       -
           .contact(

     

       179
       179
       -
               ContactObject::new()

     

       180
       180
       -
                   .name("@microcosm.blue")

     

       181
       181
       -
                   .url("https://bsky.app/profile/microcosm.blue"),

     

       182
       182
       -
           )

     

       183
       183
       -
           // .description(include_str!("../api-description.md"))

     

       184
       184
       -
           .external_document(ExternalDocumentObject::new(

     

       185
       185
       -
               "https://microcosm.blue/pocket",

     

       186
       186
       -
           ));

     

       174
       174
       +
       pub async fn serve(domain: &str) -> () {

     

       175
       175
       +
           let verifier = TokenVerifier::new(domain);

     

       176
       176
       +
           let api_service = OpenApiService::new(Xrpc { verifier }, "Pocket", env!("CARGO_PKG_VERSION"))

     

       177
       177
       +
               .server(domain)

     

       178
       178
       +
               .url_prefix("/xrpc")

     

       179
       179
       +
               .contact(

     

       180
       180
       +
                   ContactObject::new()

     

       181
       181
       +
                       .name("@microcosm.blue")

     

       182
       182
       +
                       .url("https://bsky.app/profile/microcosm.blue"),

     

       183
       183
       +
               )

     

       184
       184
       +
               .description(include_str!("../api-description.md"))

     

       185
       185
       +
               .external_document(ExternalDocumentObject::new("https://microcosm.blue/pocket"));

     

       187
       186
        
       

     

       188
       187
        
           let app = Route::new()

     

       189
       189
       -
               .at("/.well-known/did.json", get_did_doc(&domain))

     

       188
       188
       +
               .nest("/openapi", api_service.spec_endpoint())

     

       190
       189
        
               .nest("/xrpc/", api_service)

     

       191
       191
       -
               // .at("/", StaticFileEndpoint::new("./static/index.html"))

     

       192
       192
       -
               // .nest("/openapi", api_service.spec_endpoint())

     

       190
       190
       +
               .at("/.well-known/did.json", get_did_doc(domain))

     

       191
       191
       +
               .at("/", StaticFileEndpoint::new("./static/index.html"))

     

       193
       192
        
               .with(

     

       194
       193
        
                   Cors::new()

     

       195
       194
        
                       .allow_method(Method::GET)

     

       196
       196
       -
                       .allow_method(Method::POST)

     

       195
       195
       +
                       .allow_method(Method::POST),

     

       197
       196
        
               )

     

       198
       197
        
               .with(CatchPanic::new())

     

       199
       198
        
               .with(Tracing);

     

       200
       199
        
       

     

       201
       200
        
           let listener = TcpListener::bind("127.0.0.1:3000");

     

       202
       202
       -
           Server::new(listener)

     

       203
       203
       -
               .name("pocket")

     

       204
       204
       -
               .run(app)

     

       205
       205
       -
               .await

     

       206
       206
       -
               .unwrap();

     

       207
       207
       -
       

     

       201
       201
       +
           Server::new(listener).name("pocket").run(app).await.unwrap();

     

       208
       202
        
       }

+113 -52

pocket/src/token.rs

···

       1
       1
       -
       use jwt_compact::{Claims, UntrustedToken};

     

       2
       1
        
       use atrium_crypto::did::parse_multikey;

     

       3
       2
        
       use atrium_crypto::verify::Verifier;

     

       4
       4
       -
       use std::collections::HashMap;

     

       3
       3
       +
       use jwt_compact::UntrustedToken;

     

       5
       4
        
       use serde::Deserialize;

     

       5
       5
       +
       use std::collections::HashMap;

     

       6
       6
       +
       use std::time::Duration;

     

       7
       7
       +
       use thiserror::Error;

     

       6
       8
        
       

     

       7
       9
        
       #[derive(Debug, Deserialize)]

     

       8
       10
        
       struct MiniDoc {

     

       9
       11
        
           signing_key: String,

     

       12
       12
       +
           did: String,

     

       10
       13
        
       }

     

       11
       14
        
       

     

       12
       12
       -
       pub async fn verify(

     

       13
       13
       -
           expected_aud: &str,

     

       14
       14
       -
           expected_lxm: &str,

     

       15
       15
       -
           token: &str,

     

       16
       16
       -
       ) -> Result<String, &'static str> {

     

       17
       17
       -
           let untrusted = UntrustedToken::new(token).unwrap();

     

       15
       15
       +
       #[derive(Error, Debug)]

     

       16
       16
       +
       pub enum VerifyError {

     

       17
       17
       +
           #[error("The cross-service authorization token failed verification: {0}")]

     

       18
       18
       +
           VerificationFailed(&'static str),

     

       19
       19
       +
           #[error("Error trying to resolve the DID to a signing key, retry in a moment: {0}")]

     

       20
       20
       +
           ResolutionFailed(&'static str),

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       23
       23
       +
       pub struct TokenVerifier {

     

       24
       24
       +
           domain: String,

     

       25
       25
       +
           client: reqwest::Client,

     

       26
       26
       +
       }

     

       27
       27
       +
       

     

       28
       28
       +
       impl TokenVerifier {

     

       29
       29
       +
           pub fn new(domain: &str) -> Self {

     

       30
       30
       +
               let client = reqwest::Client::builder()

     

       31
       31
       +
                   .user_agent(format!(

     

       32
       32
       +
                       "microcosm pocket v{} (dev: @bad-example.com)",

     

       33
       33
       +
                       env!("CARGO_PKG_VERSION")

     

       34
       34
       +
                   ))

     

       35
       35
       +
                   .no_proxy()

     

       36
       36
       +
                   .timeout(Duration::from_secs(12)) // slingshot timeout is 10s

     

       37
       37
       +
                   .build()

     

       38
       38
       +
                   .unwrap();

     

       39
       39
       +
               Self {

     

       40
       40
       +
                   client,

     

       41
       41
       +
                   domain: domain.to_string(),

     

       42
       42
       +
               }

     

       43
       43
       +
           }

     

       44
       44
       +
       

     

       45
       45
       +
           pub async fn verify(&self, expected_lxm: &str, token: &str) -> Result<String, VerifyError> {

     

       46
       46
       +
               let untrusted = UntrustedToken::new(token).unwrap();

     

       47
       47
       +
       

     

       48
       48
       +
               // danger! unfortunately we need to decode the DID from the jwt body before we have a public key to verify the jwt with

     

       49
       49
       +
               let Ok(untrusted_claims) =

     

       50
       50
       +
                   untrusted.deserialize_claims_unchecked::<HashMap<String, String>>()

     

       51
       51
       +
               else {

     

       52
       52
       +
                   return Err(VerifyError::VerificationFailed(

     

       53
       53
       +
                       "could not deserialize jtw claims",

     

       54
       54
       +
                   ));

     

       55
       55
       +
               };

     

       18
       56
        
       

     

       19
       19
       -
           let claims: Claims<HashMap<String, String>> = untrusted.deserialize_claims_unchecked().unwrap();

     

       57
       57
       +
               // get the (untrusted!) claimed DID

     

       58
       58
       +
               let Some(untrusted_did) = untrusted_claims.custom.get("iss") else {

     

       59
       59
       +
                   return Err(VerifyError::VerificationFailed(

     

       60
       60
       +
                       "jwt must include the user's did in `iss`",

     

       61
       61
       +
                   ));

     

       62
       62
       +
               };

     

       20
       63
        
       

     

       21
       21
       -
           let Some(did) = claims.custom.get("iss") else {

     

       22
       22
       -
               return Err("jwt must include the user's did in `iss`");

     

       23
       23
       -
           };

     

       64
       64
       +
               // bail if it's not even a user-ish did

     

       65
       65
       +
               if !untrusted_did.starts_with("did:") {

     

       66
       66
       +
                   return Err(VerifyError::VerificationFailed("iss should be a did"));

     

       67
       67
       +
               }

     

       68
       68
       +
               if untrusted_did.contains("#") {

     

       69
       69
       +
                   return Err(VerifyError::VerificationFailed(

     

       70
       70
       +
                       "iss should be a user did without a service identifier",

     

       71
       71
       +
                   ));

     

       72
       72
       +
               }

     

       24
       73
        
       

     

       25
       25
       -
           if !did.starts_with("did:") {

     

       26
       26
       -
               return Err("iss should be a did");

     

       27
       27
       -
           }

     

       28
       28
       -
           if did.contains("#") {

     

       29
       29
       -
               return Err("iss should be a user did without a service identifier");

     

       30
       30
       -
           }

     

       74
       74
       +
               let endpoint =

     

       75
       75
       +
                   "https://slingshot.microcosm.blue/xrpc/com.bad-example.identity.resolveMiniDoc";

     

       76
       76
       +
               let doc: MiniDoc = self

     

       77
       77
       +
                   .client

     

       78
       78
       +
                   .get(format!("{endpoint}?identifier={untrusted_did}"))

     

       79
       79
       +
                   .send()

     

       80
       80
       +
                   .await

     

       81
       81
       +
                   .map_err(|_| VerifyError::ResolutionFailed("failed to fetch minidoc"))?

     

       82
       82
       +
                   .error_for_status()

     

       83
       83
       +
                   .map_err(|_| VerifyError::ResolutionFailed("non-ok response for minidoc"))?

     

       84
       84
       +
                   .json()

     

       85
       85
       +
                   .await

     

       86
       86
       +
                   .map_err(|_| VerifyError::ResolutionFailed("failed to parse json to minidoc"))?;

     

       31
       87
        
       

     

       32
       32
       -
           println!("Claims: {claims:#?}");

     

       33
       33
       -
           println!("did: {did:#?}");

     

       88
       88
       +
               // sanity check before we go ahead with this signing key

     

       89
       89
       +
               if doc.did != *untrusted_did {

     

       90
       90
       +
                   return Err(VerifyError::VerificationFailed(

     

       91
       91
       +
                       "wtf, resolveMiniDoc returned a doc for a different DID, slingshot bug",

     

       92
       92
       +
                   ));

     

       93
       93
       +
               }

     

       34
       94
        
       

     

       35
       35
       -
           let endpoint = "https://slingshot.microcosm.blue/xrpc/com.bad-example.identity.resolveMiniDoc";

     

       36
       36
       -
           let doc: MiniDoc = reqwest::get(format!("{endpoint}?identifier={did}"))

     

       37
       37
       -
               .await

     

       38
       38
       -
               .unwrap()

     

       39
       39
       -
               .error_for_status()

     

       40
       40
       -
               .unwrap()

     

       41
       41
       -
               .json()

     

       42
       42
       -
               .await

     

       43
       43
       -
               .unwrap();

     

       95
       95
       +
               let Ok((alg, public_key)) = parse_multikey(&doc.signing_key) else {

     

       96
       96
       +
                   return Err(VerifyError::VerificationFailed(

     

       97
       97
       +
                       "could not parse signing key form minidoc",

     

       98
       98
       +
                   ));

     

       99
       99
       +
               };

     

       44
       100
        
       

     

       45
       45
       -
           log::info!("got minidoc response: {doc:?}");

     

       101
       101
       +
               // i _guess_ we've successfully bootstrapped the verification of the jwt unless this fails

     

       102
       102
       +
               if let Err(e) = Verifier::default().verify(

     

       103
       103
       +
                   alg,

     

       104
       104
       +
                   &public_key,

     

       105
       105
       +
                   &untrusted.signed_data,

     

       106
       106
       +
                   untrusted.signature_bytes(),

     

       107
       107
       +
               ) {

     

       108
       108
       +
                   log::warn!("jwt verification failed: {e}");

     

       109
       109
       +
                   return Err(VerifyError::VerificationFailed(

     

       110
       110
       +
                       "jwt signature verification failed",

     

       111
       111
       +
                   ));

     

       112
       112
       +
               }

     

       46
       113
        
       

     

       47
       47
       -
           let (alg, public_key) = parse_multikey(&doc.signing_key).unwrap();

     

       48
       48
       -
           log::info!("parsed key: {public_key:?}");

     

       114
       114
       +
               // past this point we're should have established trust. crossing ts and dotting is.

     

       115
       115
       +
               let did = &untrusted_did;

     

       116
       116
       +
               let claims = &untrusted_claims;

     

       49
       117
        
       

     

       50
       50
       -
           Verifier::default().verify(

     

       51
       51
       -
               alg,

     

       52
       52
       -
               &public_key,

     

       53
       53
       -
               &untrusted.signed_data,

     

       54
       54
       -
               untrusted.signature_bytes(),

     

       55
       55
       -
           ).unwrap();

     

       56
       56
       -
           // if this passes, then our claims were trustworthy after all(??)

     

       118
       118
       +
               let Some(aud) = claims.custom.get("aud") else {

     

       119
       119
       +
                   return Err(VerifyError::VerificationFailed("missing aud"));

     

       120
       120
       +
               };

     

       121
       121
       +
               if *aud != format!("did:web:{}#bsky_appview", self.domain) {

     

       122
       122
       +
                   return Err(VerifyError::VerificationFailed("wrong aud"));

     

       123
       123
       +
               }

     

       124
       124
       +
               let Some(lxm) = claims.custom.get("lxm") else {

     

       125
       125
       +
                   return Err(VerifyError::VerificationFailed("missing lxm"));

     

       126
       126
       +
               };

     

       127
       127
       +
               if lxm != expected_lxm {

     

       128
       128
       +
                   return Err(VerifyError::VerificationFailed("wrong lxm"));

     

       129
       129
       +
               }

     

       57
       130
        
       

     

       58
       58
       -
           let Some(aud) = claims.custom.get("aud") else {

     

       59
       59
       -
               return Err("missing aud");

     

       60
       60
       -
           };

     

       61
       61
       -
           if aud != expected_aud {

     

       62
       62
       -
               return Err("wrong aud");

     

       63
       63
       -
           }

     

       64
       64
       -
           let Some(lxm) = claims.custom.get("lxm") else {

     

       65
       65
       -
               return Err("missing lxm");

     

       66
       66
       -
           };

     

       67
       67
       -
           if lxm != expected_lxm {

     

       68
       68
       -
               return Err("wrong lxm");

     

       131
       131
       +
               Ok(did.to_string())

     

       69
       132
        
           }

     

       70
       70
       -
       

     

       71
       71
       -
           Ok(did.to_string())

     

       72
       133
        
       }

+67

pocket/static/index.html

···

       1
       1
       +
       <!doctype html>

     

       2
       2
       +
       <html lang="en">

     

       3
       3
       +
         <head>

     

       4
       4
       +
           <meta charset="utf-8" />

     

       5
       5
       +
           <title>Pocket: atproto user preference storage</title>

     

       6
       6
       +
           <meta name="viewport" content="width=device-width, initial-scale=1" />

     

       7
       7
       +
           <meta name="description" content="API Documentation for Pocket, a simple user-preference storage system for atproto" />

     

       8
       8
       +
           <style>

     

       9
       9
       +
             :root {

     

       10
       10
       +
               --scalar-small: 13px;

     

       11
       11
       +
             }

     

       12
       12
       +
             .scalar-app .markdown .markdown-alert {

     

       13
       13
       +
               font-size: var(--scalar-small);

     

       14
       14
       +
             }

     

       15
       15
       +
             .sidebar-heading-link-title {

     

       16
       16
       +
               line-height: 1.2;

     

       17
       17
       +
             }

     

       18
       18
       +
             .custom-header {

     

       19
       19
       +
               height: 42px;

     

       20
       20
       +
               background-color: #221828;

     

       21
       21
       +
               box-shadow: inset 0 -1px 0 var(--scalar-border-color);

     

       22
       22
       +
               color: var(--scalar-color-1);

     

       23
       23
       +
               font-size: var(--scalar-font-size-3);

     

       24
       24
       +
               font-family: 'Iowan Old Style', 'Palatino Linotype', 'URW Palladio L', P052, serif;

     

       25
       25
       +
               padding: 0 18px;

     

       26
       26
       +
               justify-content: space-between;

     

       27
       27
       +
             }

     

       28
       28
       +
             .custom-header,

     

       29
       29
       +
             .custom-header nav {

     

       30
       30
       +
               display: flex;

     

       31
       31
       +
               align-items: center;

     

       32
       32
       +
               gap: 18px;

     

       33
       33
       +
             }

     

       34
       34
       +
             .custom-header a:hover {

     

       35
       35
       +
               color: var(--scalar-color-2);

     

       36
       36
       +
             }

     

       37
       37
       +
       

     

       38
       38
       +
             .light-mode .custom-header {

     

       39
       39
       +
               background-color: thistle;

     

       40
       40
       +
             }

     

       41
       41
       +
           </style>

     

       42
       42
       +
         </head>

     

       43
       43
       +
         <body>

     

       44
       44
       +
           <header class="custom-header scalar-app">

     

       45
       45
       +
             <p>

     

       46
       46
       +
               TODO: thing

     

       47
       47
       +
             </p>

     

       48
       48
       +
             <nav>

     

       49
       49
       +
               <b>a <a href="https://microcosm.blue">microcosm</a> project</b>

     

       50
       50
       +
               <a href="https://bsky.app/profile/microcosm.blue">@microcosm.blue</a>

     

       51
       51
       +
               <a href="https://github.com/at-microcosm">github</a>

     

       52
       52
       +
             </nav>

     

       53
       53
       +
           </header>

     

       54
       54
       +
       

     

       55
       55
       +
           <script id="api-reference" type="application/json" data-url="/openapi"></script>

     

       56
       56
       +
       

     

       57
       57
       +
           <script>

     

       58
       58
       +
             var configuration = {

     

       59
       59
       +
               theme: 'purple',

     

       60
       60
       +
               hideModels: true,

     

       61
       61
       +
             }

     

       62
       62
       +
             document.getElementById('api-reference').dataset.configuration = JSON.stringify(configuration)

     

       63
       63
       +
           </script>

     

       64
       64
       +
       

     

       65
       65
       +
           <script src="https://cdn.jsdelivr.net/npm/@scalar/api-reference"></script>

     

       66
       66
       +
         </body>

     

       67
       67
       +
       </html>

quasar/src/lib.rs

···

       1
       1
        
       mod storage;

     

       2
       2
       +
       

     

       3
       3
       +
       pub use storage::Storage;

+1 -1

quasar/src/storage.rs

···

       1
       1
        
       

     

       2
       2
       -
       trait Storage {

     

       2
       2
       +
       pub trait Storage {

     

       3
       3
        
           

     

       4
       4
        
       }