Compare commits

...

2 Commits

Author SHA1 Message Date
Tomáš Mládek a30ef465a3 Revert "fix: temporarily (?) disable auth on /raw endpoint"
ci/woodpecker/push/woodpecker Pipeline failed Details
This reverts commit 750bca9ee0.
2024-04-08 21:34:27 +02:00
Tomáš Mládek 069c86855b feat: accept auth key in query param 2024-04-08 21:34:08 +02:00
1 changed files with 23 additions and 13 deletions

View File

@ -138,22 +138,32 @@ fn check_auth(req: &HttpRequest, state: &State) -> Result<Option<String>, actix_
return Ok(None);
}
let key = if let Some(value) = req.headers().get("Authorization") {
let value = value.to_str().map_err(|err| {
ErrorBadRequest(format!("Invalid value in Authorization header: {err:?}"))
})?;
if !value.starts_with("Bearer ") {
return Err(ErrorUnauthorized("Invalid token type."));
}
Some(value.trim_start_matches("Bearer ").to_string())
} else if let Ok(cookies) = req.cookies() {
let header_key = req.headers().get("Authorization").and_then(|value| {
value.to_str().ok().and_then(|value| {
if value.starts_with("Bearer ") {
Some(value.trim_start_matches("Bearer ").to_string())
} else {
None
}
})
});
let cookie_key = req.cookies().ok().and_then(|cookies| {
cookies
.iter()
.find(|c| c.name() == "key")
.map(|cookie| cookie.value().to_string())
} else {
None
};
});
let query_key = req.query_string().split('&').find_map(|pair| {
let parts = pair.split('=').collect::<Vec<&str>>();
match parts[..] {
["auth_key", value] => Some(value.to_string()),
_ => None,
}
});
let key = header_key.or(cookie_key).or(query_key);
if let Some(key) = key {
let token = jsonwebtoken::decode::<JwtClaims>(
@ -201,7 +211,7 @@ pub async fn get_raw(
web::Query(query): web::Query<RawRequest>,
hash: web::Path<String>,
) -> Result<impl Responder, Error> {
// check_auth(&req, &state)?;
check_auth(&req, &state)?;
let address =
Address::decode(&b58_decode(hash.into_inner()).map_err(ErrorInternalServerError)?)