aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the ApRequest guard for routes that need it + Fix a few issues with its impl

Browse Source 
Also fixes some Rocket warnings!
This commit is contained in:
Bat
2018-07-11 17:30:01 +02:00
parent 8e47219d82
commit b95e384ed7
8 changed files with 177 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plume-common/src/activity_pub/mod.rs
+9 -6
View File
@@ -60,22 +60,25 @@ impl<'r, O: Object> Responder<'r> for ActivityStream<O> {
}
}
#[derive(Clone)]
pub struct ApRequest;
impl<'a, 'r> FromRequest<'a, 'r> for ApRequest {
type Error = ();
fn from_request(request: &'a Request<'r>) -> Outcome<Self, (Status, Self::Error), ()> {
request.headers().get_one("Content-Type").map(|header| header.split(",").map(|ct| match ct {
"application/ld+json; profile=\"w3.org/ns/activitystreams\"" |
"application/ld+json;profile=\"w3.org/ns/activitystreams\"" |
request.headers().get_one("Accept").map(|header| header.split(",").map(|ct| match ct.trim() {
// bool for Forward: true if found a valid Content-Type for Plume first (HTML), false otherwise
"application/ld+json; profile=\"https://w3.org/ns/activitystreams\"" |
"application/ld+json;profile=\"https://w3.org/ns/activitystreams\"" |
"application/activity+json" |
"application/ld+json" => Outcome::Success(ApRequest),
_ => Outcome::Forward(())
}).fold(Outcome::Forward(()), |out, ct| if out.is_success() {
"text/html" => Outcome::Forward(true),
_ => Outcome::Forward(false)
}).fold(Outcome::Forward(false), |out, ct| if out.is_success() || (out.is_forward() && out.clone().forwarded().unwrap()) {
out
} else {
ct
})).unwrap_or(Outcome::Forward(()))
}).map_forward(|_| ())).unwrap_or(Outcome::Forward(()))
}
}