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

Correctly parse HTTP Accept headers

Browse Source
This commit is contained in:
Bat
2018-07-18 16:58:28 +02:00
parent 3d436c10b1
commit 2b04b39f5d
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plume-models/src/blogs.rs
+2 -2
View File
@@ -18,7 +18,7 @@ use webfinger::*;
use {BASE_URL, USE_HTTPS};
use plume_common::activity_pub::{
AP_ACCEPT_HEADER, ApSignature, ActivityStream, Id, IntoId, PublicKey,
ap_accept_header, ApSignature, ActivityStream, Id, IntoId, PublicKey,
inbox::WithInbox,
sign
};
@@ -109,7 +109,7 @@ impl Blog {
fn fetch_from_url(conn: &PgConnection, url: String) -> Option<Blog> {
let req = Client::new()
.get(&url[..])
.header(Accept(vec![qitem(AP_ACCEPT_HEADER.parse::<Mime>().unwrap())]))
.header(Accept(ap_accept_header().into_iter().map(|h| qitem(h.parse::<Mime>().expect("Invalid Content-Type"))).collect()))
.send();
match req {
Ok(mut res) => {
plume-models/src/users.rs
+2 -2
View File
@@ -13,7 +13,7 @@ use openssl::{
sign
};
use plume_common::activity_pub::{
AP_ACCEPT_HEADER, ActivityStream, Id, IntoId, ApSignature, PublicKey,
ap_accept_header, ActivityStream, Id, IntoId, ApSignature, PublicKey,
inbox::WithInbox,
sign::{Signer, gen_keypair}
};
@@ -155,7 +155,7 @@ impl User {
fn fetch_from_url(conn: &PgConnection, url: String) -> Option<User> {
let req = Client::new()
.get(&url[..])
.header(Accept(vec![qitem(AP_ACCEPT_HEADER.parse::<Mime>().unwrap())]))
.header(Accept(ap_accept_header().into_iter().map(|h| qitem(h.parse::<Mime>().expect("Invalid Content-Type"))).collect()))
.send();
match req {
Ok(mut res) => {