nik/chorus
1
0
Fork 0
mirror of https://github.com/mikedilger/chorus.git synced 2026-05-03 06:51:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

blossom related clippy fixes

Browse Source
This commit is contained in:
Mike Dilger 2024-11-18 08:48:31 +13:00
parent 48cc0032a4
commit 93a2495e32
No known key found for this signature in database
GPG Key ID: 47581A78D4329BA4
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/web/blossom/auth.rs
View File

@ -32,8 +32,8 @@ pub fn verify_auth(request: &Request<Incoming>) -> Result<AuthData, Error> {
match verify_auth_inner(request) { match verify_auth_inner(request) {
Ok(ad) => Ok(ad), Ok(ad) => Ok(ad),
Err(e) => match e.inner { Err(e) => match e.inner {
ChorusError::BlossomAuthFailure(_) => return Err(e), ChorusError::BlossomAuthFailure(_) => Err(e),
_ => return Err(ChorusError::BlossomAuthFailure(format!("{e}")).into()), _ => Err(ChorusError::BlossomAuthFailure(format!("{e}")).into()),
}, },
} }
} }

25
src/web/blossom/mod.rs
View File

@ -29,6 +29,7 @@ pub async fn handle(request: Request<Incoming>) -> Result<Response<BoxBody<Bytes
pub async fn route(request: Request<Incoming>) -> Result<Response<BoxBody<Bytes, Error>>, Error> { pub async fn route(request: Request<Incoming>) -> Result<Response<BoxBody<Bytes, Error>>, Error> {
let p = request.uri().path(); let p = request.uri().path();
#[allow(clippy::int_plus_one)]
if p.starts_with("/") if p.starts_with("/")
&& p.len() >= 1 + 64 && p.len() >= 1 + 64
&& p.chars().skip(1).take(64).all(|c| c.is_ascii_hexdigit()) && p.chars().skip(1).take(64).all(|c| c.is_ascii_hexdigit())
@ -118,13 +119,13 @@ pub async fn handle_hash(
let metadata = GLOBALS.filestore.get().unwrap().metadata(hash).await?; let metadata = GLOBALS.filestore.get().unwrap().metadata(hash).await?;
match request.method() { match *request.method() {
&Method::HEAD => Ok(Response::builder() Method::HEAD => Ok(Response::builder()
.header(ACCESS_CONTROL_ALLOW_ORIGIN, "*") .header(ACCESS_CONTROL_ALLOW_ORIGIN, "*")
.header(CONTENT_LENGTH, format!("{}", metadata.len())) .header(CONTENT_LENGTH, format!("{}", metadata.len()))
.status(StatusCode::OK) .status(StatusCode::OK)
.body(Empty::new().map_err(|e| e.into()).boxed())?), .body(Empty::new().map_err(|e| e.into()).boxed())?),
&Method::GET => { Method::GET => {
let body = GLOBALS.filestore.get().unwrap().retrieve(hash).await?; let body = GLOBALS.filestore.get().unwrap().retrieve(hash).await?;
Ok(Response::builder() Ok(Response::builder()
.header(ACCESS_CONTROL_ALLOW_ORIGIN, "*") .header(ACCESS_CONTROL_ALLOW_ORIGIN, "*")
@ -132,7 +133,7 @@ pub async fn handle_hash(
.status(StatusCode::OK) .status(StatusCode::OK)
.body(body)?) .body(body)?)
} }
&Method::DELETE => { Method::DELETE => {
let auth_data = verify_auth(&request)?; let auth_data = verify_auth(&request)?;
if auth_data.verb != Some(AuthVerb::Delete) { if auth_data.verb != Some(AuthVerb::Delete) {
return Err(ChorusError::BlossomAuthFailure( return Err(ChorusError::BlossomAuthFailure(
@ -170,14 +171,14 @@ pub async fn handle_upload(
); );
} }
match request.method() { match *request.method() {
&Method::HEAD => Ok(Response::builder() Method::HEAD => Ok(Response::builder()
.header(ACCESS_CONTROL_ALLOW_ORIGIN, "*") .header(ACCESS_CONTROL_ALLOW_ORIGIN, "*")
.header(CONTENT_LENGTH, "0") .header(CONTENT_LENGTH, "0")
.status(StatusCode::NOT_IMPLEMENTED) .status(StatusCode::NOT_IMPLEMENTED)
.body(Empty::new().map_err(|e| e.into()).boxed())?), .body(Empty::new().map_err(|e| e.into()).boxed())?),
&Method::PUT => { Method::PUT => {
let expected_hash = auth_data.hash.map(|bytes| HashOutput::from_bytes(bytes)); let expected_hash = auth_data.hash.map(HashOutput::from_bytes);
if expected_hash.is_none() { if expected_hash.is_none() {
return Err(ChorusError::BlossomAuthFailure( return Err(ChorusError::BlossomAuthFailure(
"Put requires an expected hash value x tag in the authorization event" "Put requires an expected hash value x tag in the authorization event"
@ -248,8 +249,8 @@ pub async fn handle_list(
return Err(ChorusError::BlossomAuthFailure("List was not authorized".to_string()).into()); return Err(ChorusError::BlossomAuthFailure("List was not authorized".to_string()).into());
} }
match request.method() { match *request.method() {
&Method::GET => Ok(Response::builder() Method::GET => Ok(Response::builder()
.header(ACCESS_CONTROL_ALLOW_ORIGIN, "*") .header(ACCESS_CONTROL_ALLOW_ORIGIN, "*")
.header(CONTENT_LENGTH, "0") .header(CONTENT_LENGTH, "0")
.status(StatusCode::NOT_IMPLEMENTED) .status(StatusCode::NOT_IMPLEMENTED)
@ -276,8 +277,8 @@ pub async fn handle_mirror(
); );
} }
match request.method() { match *request.method() {
&Method::PUT => Ok(Response::builder() Method::PUT => Ok(Response::builder()
.header(ACCESS_CONTROL_ALLOW_ORIGIN, "*") .header(ACCESS_CONTROL_ALLOW_ORIGIN, "*")
.header(CONTENT_LENGTH, "0") .header(CONTENT_LENGTH, "0")
.status(StatusCode::NOT_IMPLEMENTED) .status(StatusCode::NOT_IMPLEMENTED)