Kieran/route96
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix http error codes

Browse Source
This commit is contained in:
hzrd149 2024-11-14 06:59:20 -06:00
parent ce8528cbc5
commit 103c738e2a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/auth/blossom.rs
View File

@ -24,18 +24,18 @@ impl<'r> FromRequest<'r> for BlossomAuth {
if let Ok(ev) = Event::from_json(j) { if let Ok(ev) = Event::from_json(j) {
ev ev
} else { } else {
return Outcome::Error((Status::new(403), "Invalid nostr event")); return Outcome::Error((Status::new(400), "Invalid nostr event"));
} }
} else { } else {
return Outcome::Error((Status::new(403), "Invalid auth string")); return Outcome::Error((Status::new(400), "Invalid auth string"));
}; };
if event.kind != Kind::Custom(24242) { if event.kind != Kind::Custom(24242) {
return Outcome::Error((Status::new(401), "Wrong event kind")); return Outcome::Error((Status::new(400), "Wrong event kind"));
} }
if event.created_at > Timestamp::now() { if event.created_at > Timestamp::now() {
return Outcome::Error(( return Outcome::Error((
Status::new(401), Status::new(400),
"Created timestamp is in the future", "Created timestamp is in the future",
)); ));
} }
@ -50,14 +50,14 @@ impl<'r> FromRequest<'r> for BlossomAuth {
}) { }) {
let u_exp: Timestamp = expiration.parse().unwrap(); let u_exp: Timestamp = expiration.parse().unwrap();
if u_exp <= Timestamp::now() { if u_exp <= Timestamp::now() {
return Outcome::Error((Status::new(401), "Expiration invalid")); return Outcome::Error((Status::new(400), "Expiration invalid"));
} }
} else { } else {
return Outcome::Error((Status::new(401), "Missing expiration tag")); return Outcome::Error((Status::new(400), "Missing expiration tag"));
} }
if event.verify().is_err() { if event.verify().is_err() {
return Outcome::Error((Status::new(401), "Event signature invalid")); return Outcome::Error((Status::new(400), "Event signature invalid"));
} }
info!("{}", event.as_json()); info!("{}", event.as_json());
@ -93,10 +93,10 @@ impl<'r> FromRequest<'r> for BlossomAuth {
}), }),
}) })
} else { } else {
Outcome::Error((Status::new(403), "Auth scheme must be Nostr")) Outcome::Error((Status::new(400), "Auth scheme must be Nostr"))
} }
} else { } else {
Outcome::Error((Status::new(403), "Auth header not found")) Outcome::Error((Status::new(401), "Auth header not found"))
} }
} }
} }