konevsa/proxmox.newest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

http: add extra_headers to post

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2022-08-05 09:26:03 +02:00
parent ec77785578
commit 891dcfda2f
4 changed files with 55 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
proxmox-http/src/client/simple.rs
View File

@ -87,6 +87,7 @@ impl Client {
uri: &str,
body: Option<R>,
content_type: Option<&str>,
extra_headers: Option<&HashMap<String, String>>,
) -> Result<Response<Body>, Error>
where
R: Read,
@ -100,11 +101,18 @@ impl Client {
};
let content_type = content_type.unwrap_or("application/json");
let request = Request::builder()
let mut request = Request::builder()
.method("POST")
.uri(uri)
.header(hyper::header::CONTENT_TYPE, content_type)
.body(body)?;
.header(hyper::header::CONTENT_TYPE, content_type);
if let Some(extra_headers) = extra_headers {
for (header, value) in extra_headers {
request = request.header(header, value);
}
}
let request = request.body(body)?;
self.request(request).await
}
@ -191,11 +199,12 @@ impl crate::HttpClient<Body> for Client {
uri: &str,
body: Option<R>,
content_type: Option<&str>,
extra_headers: Option<&HashMap<String, String>>,
) -> Result<Response<Body>, Error>
where
R: Read,
{
proxmox_async::runtime::block_on(self.post(uri, body, content_type))
proxmox_async::runtime::block_on(self.post(uri, body, content_type, extra_headers))
}
fn request(&self, request: Request<Body>) -> Result<Response<Body>, Error> {
@ -232,12 +241,14 @@ impl crate::HttpClient<String> for Client {
uri: &str,
body: Option<R>,
content_type: Option<&str>,
extra_headers: Option<&HashMap<String, String>>,
) -> Result<Response<String>, Error>
where
R: Read,
{
proxmox_async::runtime::block_on(async move {
Self::convert_body_to_string(self.post(uri, body, content_type).await).await
Self::convert_body_to_string(self.post(uri, body, content_type, extra_headers).await)
.await
})
}

70
proxmox-http/src/client/sync.rs
View File

@ -67,6 +67,24 @@ impl Client {
Ok(builder)
}
fn add_headers(
mut req: ureq::Request,
content_type: Option<&str>,
extra_headers: Option<&HashMap<String, String>>,
) -> ureq::Request {
if let Some(content_type) = content_type {
req = req.set("Content-Type", content_type);
}
if let Some(extra_headers) = extra_headers {
for (header, value) in extra_headers {
req = req.set(header, value);
}
}
req
}
fn convert_response_to_string(res: ureq::Response) -> Result<Response<String>, Error> {
let builder = Self::convert_response(&res)?;
let body = res.into_string()?;
@ -94,13 +112,8 @@ impl HttpClient<String> for Client {
uri: &str,
extra_headers: Option<&HashMap<String, String>>,
) -> Result<Response<String>, Error> {
let mut req = self.agent()?.get(uri);
if let Some(extra_headers) = extra_headers {
for (header, value) in extra_headers {
req = req.set(header, value);
}
}
let req = self.agent()?.get(uri);
let req = Self::add_headers(req, None, extra_headers);
self.call(req).and_then(Self::convert_response_to_string)
}
@ -110,14 +123,13 @@ impl HttpClient<String> for Client {
uri: &str,
body: Option<R>,
content_type: Option<&str>,
extra_headers: Option<&HashMap<String, String>>,
) -> Result<Response<String>, Error>
where
R: Read,
{
let mut req = self.agent()?.post(uri);
if let Some(content_type) = content_type {
req = req.set("Content-Type", content_type);
}
let req = self.agent()?.post(uri);
let req = Self::add_headers(req, content_type, extra_headers);
match body {
Some(body) => self.send(req, body),
@ -130,6 +142,8 @@ impl HttpClient<String> for Client {
let mut req = self
.agent()?
.request(request.method().as_str(), &request.uri().to_string());
req = self.add_user_agent(req);
let orig_headers = request.headers();
for header in orig_headers.keys() {
@ -149,13 +163,8 @@ impl HttpClient<Vec<u8>> for Client {
uri: &str,
extra_headers: Option<&HashMap<String, String>>,
) -> Result<Response<Vec<u8>>, Error> {
let mut req = self.agent()?.get(uri);
if let Some(extra_headers) = extra_headers {
for (header, value) in extra_headers {
req = req.set(header, value);
}
}
let req = self.agent()?.get(uri);
let req = Self::add_headers(req, None, extra_headers);
self.call(req).and_then(Self::convert_response_to_vec)
}
@ -165,14 +174,13 @@ impl HttpClient<Vec<u8>> for Client {
uri: &str,
body: Option<R>,
content_type: Option<&str>,
extra_headers: Option<&HashMap<String, String>>,
) -> Result<Response<Vec<u8>>, Error>
where
R: Read,
{
let mut req = self.agent()?.post(uri);
if let Some(content_type) = content_type {
req = req.set("Content-Type", content_type);
}
let req = self.agent()?.post(uri);
let req = Self::add_headers(req, content_type, extra_headers);
match body {
Some(body) => self.send(req, body),
@ -185,6 +193,8 @@ impl HttpClient<Vec<u8>> for Client {
let mut req = self
.agent()?
.request(request.method().as_str(), &request.uri().to_string());
req = self.add_user_agent(req);
let orig_headers = request.headers();
for header in orig_headers.keys() {
@ -204,13 +214,8 @@ impl HttpClient<Box<dyn Read>> for Client {
uri: &str,
extra_headers: Option<&HashMap<String, String>>,
) -> Result<Response<Box<dyn Read>>, Error> {
let mut req = self.agent()?.get(uri);
if let Some(extra_headers) = extra_headers {
for (header, value) in extra_headers {
req = req.set(header, value);
}
}
let req = self.agent()?.get(uri);
let req = Self::add_headers(req, None, extra_headers);
self.call(req).and_then(Self::convert_response_to_reader)
}
@ -220,14 +225,13 @@ impl HttpClient<Box<dyn Read>> for Client {
uri: &str,
body: Option<R>,
content_type: Option<&str>,
extra_headers: Option<&HashMap<String, String>>,
) -> Result<Response<Box<dyn Read>>, Error>
where
R: Read,
{
let mut req = self.agent()?.post(uri);
if let Some(content_type) = content_type {
req = req.set("Content-Type", content_type);
}
let req = self.agent()?.post(uri);
let req = Self::add_headers(req, content_type, extra_headers);
match body {
Some(body) => self.send(req, body),

1
proxmox-http/src/client_trait.rs
View File

@ -15,6 +15,7 @@ pub trait HttpClient<T> {
uri: &str,
body: Option<R>,
content_type: Option<&str>,
extra_headers: Option<&HashMap<String, String>>,
) -> Result<Response<T>, Error>
where
R: Read;

1
proxmox-subscription/src/check.rs
View File

@ -41,6 +41,7 @@ fn register_subscription<C: HttpClient<String>>(
SHOP_URI,
Some(&mut query.as_bytes()),
Some("application/x-www-form-urlencoded"),
None,
)?;
let body = response.into_body();