eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-16 10:40:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixup! working just like it was before :)

Browse source
This commit is contained in:
Iris System 2025-08-18 21:57:26 +12:00
parent 21da6f9525
commit be218c89cc
6 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -2616,6 +2616,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"sqlx", "sqlx",
"tracing",
"uuid", "uuid",
] ]

2
Cargo.toml
View file

@ -19,7 +19,7 @@ reqwest = { version = "0.12.7" , default-features = false, features = ["rustls-t
sentry = { version = "0.36.0", default-features = false, features = ["backtrace", "contexts", "panic", "debug-images", "reqwest", "rustls"] } # replace native-tls with rustls sentry = { version = "0.36.0", default-features = false, features = ["backtrace", "contexts", "panic", "debug-images", "reqwest", "rustls"] } # replace native-tls with rustls
serde = { version = "1.0.196", features = ["derive"] } serde = { version = "1.0.196", features = ["derive"] }
serde_json = "1.0.117" serde_json = "1.0.117"
sqlx = { version = "0.8.2", features = ["runtime-tokio", "postgres", "time", "macros", "uuid"] } sqlx = { version = "0.8.2", features = ["runtime-tokio", "postgres", "time", "chrono", "macros", "uuid"] }
tokio = { version = "1.36.0", features = ["full"] } tokio = { version = "1.36.0", features = ["full"] }
tracing = "0.1" tracing = "0.1"
tracing-subscriber = { version = "0.3.16", features = ["env-filter", "json"] } tracing-subscriber = { version = "0.3.16", features = ["env-filter", "json"] }

7
crates/api/src/main.rs
View file

@ -13,6 +13,7 @@ use hyper_util::{
client::legacy::{connect::HttpConnector, Client}, client::legacy::{connect::HttpConnector, Client},
rt::TokioExecutor, rt::TokioExecutor,
}; };
use jsonwebtoken::{DecodingKey, EncodingKey}; use jsonwebtoken::{DecodingKey, EncodingKey};
use tracing::{error, info}; use tracing::{error, info};
use pk_macros::api_endpoint; use pk_macros::api_endpoint;
@ -136,9 +137,9 @@ fn router(ctx: ApiContext) -> Router {
.route("/internal/apikey/user", post(endpoints::internal::create_api_key_user)) .route("/internal/apikey/user", post(endpoints::internal::create_api_key_user))
.route("/v2/systems/:system_id/oembed.json", get(rproxy)) .route("/v2/systems/{system_id}/oembed.json", get(rproxy))
.route("/v2/members/:member_id/oembed.json", get(rproxy)) .route("/v2/members/{member_id}/oembed.json", get(rproxy))
.route("/v2/groups/:group_id/oembed.json", get(rproxy)) .route("/v2/groups/{group_id}/oembed.json", get(rproxy))
.layer(middleware::ratelimit::ratelimiter(ctx.clone(), middleware::ratelimit::do_request_ratelimited)) .layer(middleware::ratelimit::ratelimiter(ctx.clone(), middleware::ratelimit::do_request_ratelimited))

4
crates/api/src/middleware/auth.rs
View file

@ -142,11 +142,9 @@ pub async fn auth(State(ctx): State<ApiContext>, mut req: Request, next: Next) -
.await .await
.expect("failed to query apitoken in postgres") .expect("failed to query apitoken in postgres")
{ {
authed_system_id = Some(token.system);
authed_api_key_id = Some(tid); authed_api_key_id = Some(tid);
access_level = apikey_can_access(&token, req.method().to_string(), endpoint.clone()); access_level = apikey_can_access(&token, req.method().to_string(), endpoint.clone());
if access_level != AccessLevel::None {
authed_system_id = Some(token.system);
}
} }
else if let Some(system_id) = else if let Some(system_id) =
match libpk::db::repository::legacy_token_auth(&ctx.db, system_auth_header).await { match libpk::db::repository::legacy_token_auth(&ctx.db, system_auth_header).await {

5
crates/libpk/src/_config.rs
View file

@ -60,13 +60,8 @@ pub struct ApiConfig {
pub remote_url: String, pub remote_url: String,
#[serde(default)]
pub temp_token2: Option<String>,
pub token_privatekey: String, pub token_privatekey: String,
pub token_publickey: String, pub token_publickey: String,
pub internal_request_secret: String,
} }
#[derive(Deserialize, Clone, Debug)] #[derive(Deserialize, Clone, Debug)]

5
crates/models/Cargo.toml
View file

@ -11,7 +11,6 @@ jsonwebtoken = { workspace = true }
sea-query = "0.32.1" sea-query = "0.32.1"
serde = { workspace = true } serde = { workspace = true }
serde_json = { workspace = true, features = ["preserve_order"] } serde_json = { workspace = true, features = ["preserve_order"] }
# in theory we want to default-features = false for sqlx sqlx = { workspace = true }
# but cargo doesn't seem to support this
sqlx = { workspace = true, features = ["chrono"] }
uuid = { workspace = true } uuid = { workspace = true }
tracing = { workspace = true }