From 100f6307a7a7281cd48c61f3bfed2ab6581be70f Mon Sep 17 00:00:00 2001 From: KokaKiwi Date: Fri, 23 Nov 2018 13:18:33 +0100 Subject: [PATCH] Set Content-Type for ActivityPub request to correct value. (#315) --- plume-common/src/activity_pub/mod.rs | 2 ++ plume-common/src/activity_pub/request.rs | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plume-common/src/activity_pub/mod.rs b/plume-common/src/activity_pub/mod.rs index c96b5ad..c6e2fca 100644 --- a/plume-common/src/activity_pub/mod.rs +++ b/plume-common/src/activity_pub/mod.rs @@ -17,6 +17,8 @@ pub mod sign; pub const CONTEXT_URL: &'static str = "https://www.w3.org/ns/activitystreams"; pub const PUBLIC_VISIBILTY: &'static str = "https://www.w3.org/ns/activitystreams#Public"; +pub const AP_CONTENT_TYPE: &'static str = r#"application/ld+json; profile="https://www.w3.org/ns/activitystreams""#; + pub fn ap_accept_header() -> Vec<&'static str> { vec![ "application/ld+json; profile=\"https://w3.org/ns/activitystreams\"", diff --git a/plume-common/src/activity_pub/request.rs b/plume-common/src/activity_pub/request.rs index 0ba2a5e..298541f 100644 --- a/plume-common/src/activity_pub/request.rs +++ b/plume-common/src/activity_pub/request.rs @@ -1,11 +1,11 @@ use base64; use chrono::{DateTime, offset::Utc}; use openssl::hash::{Hasher, MessageDigest}; -use reqwest::header::{ACCEPT, DATE, HeaderMap, HeaderValue, USER_AGENT}; +use reqwest::header::{ACCEPT, CONTENT_TYPE, DATE, HeaderMap, HeaderValue, USER_AGENT}; use std::ops::Deref; use std::time::SystemTime; -use activity_pub::ap_accept_header; +use activity_pub::{AP_CONTENT_TYPE, ap_accept_header}; use activity_pub::sign::Signer; const PLUME_USER_AGENT: &'static str = concat!("Plume/", env!("CARGO_PKG_VERSION")); @@ -62,6 +62,7 @@ pub fn headers() -> HeaderMap { headers.insert(USER_AGENT, HeaderValue::from_static(PLUME_USER_AGENT)); headers.insert(DATE, HeaderValue::from_str(&date).expect("request::headers: date error")); headers.insert(ACCEPT, HeaderValue::from_str(&ap_accept_header().into_iter().collect::>().join(", ")).expect("request::headers: accept error")); + headers.insert(CONTENT_TYPE, HeaderValue::from_static(AP_CONTENT_TYPE)); headers }