-use std::collections::HashSet;
use std::io::Write;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::sync::{Arc, Mutex};
+use std::task::{Context, Poll};
-use chrono::{DateTime, Utc};
+use chrono::Utc;
use failure::*;
use futures::*;
-use futures::stream::Stream;
use http::Uri;
use http::header::HeaderValue;
use http::{Request, Response};
use hyper::client::{Client, HttpConnector};
use openssl::ssl::{SslConnector, SslMethod};
use serde_json::{json, Value};
-use tokio::io::AsyncReadExt;
-use tokio::sync::{mpsc, oneshot};
-use url::percent_encoding::{percent_encode, DEFAULT_ENCODE_SET};
+use percent_encoding::percent_encode;
use xdg::BaseDirectories;
use proxmox::tools::{
- digest_to_hex,
- fs::{file_get_json, file_set_contents},
+ fs::{file_get_json, replace_file, CreateOptions},
};
-use super::merge_known_chunks::{MergedChunkInfo, MergeKnownChunks};
use super::pipe_to_stream::PipeToSendStream;
-use crate::backup::*;
use crate::tools::async_io::EitherStream;
-use crate::tools::futures::{cancellable, Canceller};
-use crate::tools::{self, tty, BroadcastFuture};
+use crate::tools::{self, tty, BroadcastFuture, DEFAULT_ENCODE_SET};
#[derive(Clone)]
pub struct AuthInfo {
map.remove(username);
}
- file_set_contents(path, data.to_string().as_bytes(), Some(mode))?;
+ replace_file(path, data.to_string().as_bytes(), CreateOptions::new().perm(mode))?;
Ok(())
}
}
}
- file_set_contents(path, new_data.to_string().as_bytes(), Some(mode))?;
+ replace_file(path, new_data.to_string().as_bytes(), CreateOptions::new().perm(mode))?;
Ok(())
}
impl HttpClient {
- pub fn new(server: &str, username: &str) -> Result<Self, Error> {
+ pub fn new(server: &str, username: &str, password: Option<String>) -> Result<Self, Error> {
let client = Self::build_client();
- let password = if let Some((ticket, _token)) = load_ticket_info(server, username) {
+ let password = if let Some(password) = password {
+ password
+ } else if let Some((ticket, _token)) = load_ticket_info(server, username) {
ticket
} else {
Self::get_password(&username)?
self.request(req).await
}
- pub async fn start_backup(
- &self,
- datastore: &str,
- backup_type: &str,
- backup_id: &str,
- backup_time: DateTime<Utc>,
- debug: bool,
- ) -> Result<Arc<BackupClient>, Error> {
-
- let param = json!({
- "backup-type": backup_type,
- "backup-id": backup_id,
- "backup-time": backup_time.timestamp(),
- "store": datastore,
- "debug": debug
- });
-
- let req = Self::request_builder(&self.server, "GET", "/api2/json/backup", Some(param)).unwrap();
-
- let (h2, canceller) = self.start_h2_connection(req, String::from(PROXMOX_BACKUP_PROTOCOL_ID_V1!())).await?;
-
- Ok(BackupClient::new(h2, canceller))
- }
-
- pub async fn start_backup_reader(
- &self,
- datastore: &str,
- backup_type: &str,
- backup_id: &str,
- backup_time: DateTime<Utc>,
- debug: bool,
- ) -> Result<Arc<BackupReader>, Error> {
-
- let param = json!({
- "backup-type": backup_type,
- "backup-id": backup_id,
- "backup-time": backup_time.timestamp(),
- "store": datastore,
- "debug": debug,
- });
- let req = Self::request_builder(&self.server, "GET", "/api2/json/reader", Some(param)).unwrap();
-
- let (h2, canceller) = self.start_h2_connection(req, String::from(PROXMOX_BACKUP_READER_PROTOCOL_ID_V1!())).await?;
-
- Ok(BackupReader::new(h2, canceller))
- }
-
pub async fn start_h2_connection(
&self,
mut req: Request<Body>,
protocol_name: String,
- ) -> Result<(H2Client, Canceller), Error> {
+ ) -> Result<(H2Client, futures::future::AbortHandle), Error> {
let auth = self.login().await?;
let client = self.client.clone();
let status = resp.status();
if status != http::StatusCode::SWITCHING_PROTOCOLS {
- Self::api_response(resp)
- .map(|_| Err(format_err!("unknown error")))
- .await?;
- unreachable!();
+ Self::api_response(resp).await?;
+ bail!("unknown error");
}
let upgraded = resp
let connection = connection
.map_err(|_| panic!("HTTP/2.0 connection failed"));
- let (connection, canceller) = cancellable(connection)?;
+ let (connection, abort) = futures::future::abortable(connection);
// A cancellable future returns an Option which is None when cancelled and
// Some when it finished instead, since we don't care about the return type we
// need to map it away:
let connection = connection.map(|_| ());
// Spawn a new task to drive the connection state
- hyper::rt::spawn(connection);
+ tokio::spawn(connection);
// Wait until the `SendRequest` handle has available capacity.
let c = h2.ready().await?;
- Ok((H2Client::new(c), canceller))
+ Ok((H2Client::new(c), abort))
}
async fn credentials(
async fn api_response(response: Response<Body>) -> Result<Value, Error> {
let status = response.status();
- let data = response
- .into_body()
- .try_concat()
- .await?;
+ let data = hyper::body::to_bytes(response.into_body()).await?;
let text = String::from_utf8(data.to_vec()).unwrap();
if status.is_success() {
- if text.len() > 0 {
+ if text.is_empty() {
+ Ok(Value::Null)
+ } else {
let value: Value = serde_json::from_str(&text)?;
Ok(value)
- } else {
- Ok(Value::Null)
}
} else {
bail!("HTTP Error {}: {}", status, text);
.await
}
+ // Read-only access to server property
+ pub fn server(&self) -> &str {
+ &self.server
+ }
+
pub fn request_builder(server: &str, method: &str, path: &str, data: Option<Value>) -> Result<Request<Body>, Error> {
let path = path.trim_matches('/');
let url: Uri = format!("https://{}:8007/{}", server, path).parse()?;
}
-pub struct BackupReader {
- h2: H2Client,
- canceller: Canceller,
-}
-
-impl Drop for BackupReader {
-
- fn drop(&mut self) {
- self.canceller.cancel();
- }
-}
-
-impl BackupReader {
-
- pub fn new(h2: H2Client, canceller: Canceller) -> Arc<Self> {
- Arc::new(Self { h2, canceller: canceller })
- }
-
- pub async fn get(
- &self,
- path: &str,
- param: Option<Value>,
- ) -> Result<Value, Error> {
- self.h2.get(path, param).await
- }
-
- pub async fn put(
- &self,
- path: &str,
- param: Option<Value>,
- ) -> Result<Value, Error> {
- self.h2.put(path, param).await
- }
-
- pub async fn post(
- &self,
- path: &str,
- param: Option<Value>,
- ) -> Result<Value, Error> {
- self.h2.post(path, param).await
- }
-
- pub async fn download<W: Write + Send>(
- &self,
- file_name: &str,
- output: W,
- ) -> Result<W, Error> {
- let path = "download";
- let param = json!({ "file-name": file_name });
- self.h2.download(path, Some(param), output).await
- }
-
- pub async fn speedtest<W: Write + Send>(
- &self,
- output: W,
- ) -> Result<W, Error> {
- self.h2.download("speedtest", None, output).await
- }
-
- pub async fn download_chunk<W: Write + Send>(
- &self,
- digest: &[u8; 32],
- output: W,
- ) -> Result<W, Error> {
- let path = "chunk";
- let param = json!({ "digest": digest_to_hex(digest) });
- self.h2.download(path, Some(param), output).await
- }
-
- pub fn force_close(self) {
- self.canceller.cancel();
- }
-}
-
-pub struct BackupClient {
- h2: H2Client,
- canceller: Canceller,
-}
-
-impl Drop for BackupClient {
-
- fn drop(&mut self) {
- self.canceller.cancel();
- }
-}
-
-pub struct BackupStats {
- pub size: u64,
- pub csum: [u8; 32],
-}
-
-impl BackupClient {
- pub fn new(h2: H2Client, canceller: Canceller) -> Arc<Self> {
- Arc::new(Self { h2, canceller })
- }
-
- pub async fn get(
- &self,
- path: &str,
- param: Option<Value>,
- ) -> Result<Value, Error> {
- self.h2.get(path, param).await
- }
-
- pub async fn put(
- &self,
- path: &str,
- param: Option<Value>,
- ) -> Result<Value, Error> {
- self.h2.put(path, param).await
- }
-
- pub async fn post(
- &self,
- path: &str,
- param: Option<Value>,
- ) -> Result<Value, Error> {
- self.h2.post(path, param).await
- }
-
- pub async fn finish(self: Arc<Self>) -> Result<(), Error> {
- let h2 = self.h2.clone();
-
- h2.post("finish", None)
- .map_ok(move |_| {
- self.canceller.cancel();
- })
- .await
- }
-
- pub fn force_close(self) {
- self.canceller.cancel();
- }
-
- pub async fn upload_blob<R: std::io::Read>(
- &self,
- mut reader: R,
- file_name: &str,
- ) -> Result<BackupStats, Error> {
- let mut raw_data = Vec::new();
- // fixme: avoid loading into memory
- reader.read_to_end(&mut raw_data)?;
-
- let csum = openssl::sha::sha256(&raw_data);
- let param = json!({"encoded-size": raw_data.len(), "file-name": file_name });
- let size = raw_data.len() as u64; // fixme: should be decoded size instead??
- let _value = self.h2.upload("blob", Some(param), raw_data).await?;
- Ok(BackupStats { size, csum })
- }
-
- pub async fn upload_blob_from_data(
- &self,
- data: Vec<u8>,
- file_name: &str,
- crypt_config: Option<Arc<CryptConfig>>,
- compress: bool,
- sign_only: bool,
- ) -> Result<BackupStats, Error> {
-
- let size = data.len() as u64;
-
- let blob = if let Some(crypt_config) = crypt_config {
- if sign_only {
- DataBlob::create_signed(&data, crypt_config, compress)?
- } else {
- DataBlob::encode(&data, Some(crypt_config.clone()), compress)?
- }
- } else {
- DataBlob::encode(&data, None, compress)?
- };
-
- let raw_data = blob.into_inner();
-
- let csum = openssl::sha::sha256(&raw_data);
- let param = json!({"encoded-size": raw_data.len(), "file-name": file_name });
- let _value = self.h2.upload("blob", Some(param), raw_data).await?;
- Ok(BackupStats { size, csum })
- }
-
- pub async fn upload_blob_from_file<P: AsRef<std::path::Path>>(
- &self,
- src_path: P,
- file_name: &str,
- crypt_config: Option<Arc<CryptConfig>>,
- compress: bool,
- ) -> Result<BackupStats, Error> {
-
- let src_path = src_path.as_ref();
-
- let mut file = tokio::fs::File::open(src_path.clone())
- .await
- .map_err(|err| format_err!("unable to open file {:?} - {}", src_path, err))?;
-
- let mut contents = Vec::new();
-
- file.read_to_end(&mut contents)
- .await
- .map_err(|err| format_err!("unable to read file {:?} - {}", src_path, err))?;
-
- let size: u64 = contents.len() as u64;
- let blob = DataBlob::encode(&contents, crypt_config, compress)?;
- let raw_data = blob.into_inner();
- let csum = openssl::sha::sha256(&raw_data);
- let param = json!({
- "encoded-size": raw_data.len(),
- "file-name": file_name,
- });
- self.h2.upload("blob", Some(param), raw_data).await?;
- Ok(BackupStats { size, csum })
- }
-
- pub async fn upload_stream(
- &self,
- archive_name: &str,
- stream: impl Stream<Item = Result<bytes::BytesMut, Error>>,
- prefix: &str,
- fixed_size: Option<u64>,
- crypt_config: Option<Arc<CryptConfig>>,
- ) -> Result<BackupStats, Error> {
- let known_chunks = Arc::new(Mutex::new(HashSet::new()));
-
- let mut param = json!({ "archive-name": archive_name });
- if let Some(size) = fixed_size {
- param["size"] = size.into();
- }
-
- let index_path = format!("{}_index", prefix);
- let close_path = format!("{}_close", prefix);
-
- Self::download_chunk_list(self.h2.clone(), &index_path, archive_name, known_chunks.clone()).await?;
-
- let wid = self.h2.post(&index_path, Some(param)).await?.as_u64().unwrap();
-
- let (chunk_count, size, _speed, csum) =
- Self::upload_chunk_info_stream(
- self.h2.clone(),
- wid,
- stream,
- &prefix,
- known_chunks.clone(),
- crypt_config,
- )
- .await?;
-
- let param = json!({
- "wid": wid ,
- "chunk-count": chunk_count,
- "size": size,
- });
- let _value = self.h2.post(&close_path, Some(param)).await?;
- Ok(BackupStats {
- size: size as u64,
- csum,
- })
- }
-
- fn response_queue() -> (
- mpsc::Sender<h2::client::ResponseFuture>,
- oneshot::Receiver<Result<(), Error>>
- ) {
- let (verify_queue_tx, verify_queue_rx) = mpsc::channel(100);
- let (verify_result_tx, verify_result_rx) = oneshot::channel();
-
- hyper::rt::spawn(
- verify_queue_rx
- .map(Ok::<_, Error>)
- .try_for_each(|response: h2::client::ResponseFuture| {
- response
- .map_err(Error::from)
- .and_then(H2Client::h2api_response)
- .map_ok(|result| println!("RESPONSE: {:?}", result))
- .map_err(|err| format_err!("pipelined request failed: {}", err))
- })
- .map(|result| {
- let _ignore_closed_channel = verify_result_tx.send(result);
- })
- );
-
- (verify_queue_tx, verify_result_rx)
- }
-
- fn append_chunk_queue(h2: H2Client, wid: u64, path: String) -> (
- mpsc::Sender<(MergedChunkInfo, Option<h2::client::ResponseFuture>)>,
- oneshot::Receiver<Result<(), Error>>
- ) {
- let (verify_queue_tx, verify_queue_rx) = mpsc::channel(64);
- let (verify_result_tx, verify_result_rx) = oneshot::channel();
-
- let h2_2 = h2.clone();
-
- hyper::rt::spawn(
- verify_queue_rx
- .map(Ok::<_, Error>)
- .and_then(move |(merged_chunk_info, response): (MergedChunkInfo, Option<h2::client::ResponseFuture>)| {
- match (response, merged_chunk_info) {
- (Some(response), MergedChunkInfo::Known(list)) => {
- future::Either::Left(
- response
- .map_err(Error::from)
- .and_then(H2Client::h2api_response)
- .and_then(move |_result| {
- future::ok(MergedChunkInfo::Known(list))
- })
- )
- }
- (None, MergedChunkInfo::Known(list)) => {
- future::Either::Right(future::ok(MergedChunkInfo::Known(list)))
- }
- _ => unreachable!(),
- }
- })
- .merge_known_chunks()
- .and_then(move |merged_chunk_info| {
- match merged_chunk_info {
- MergedChunkInfo::Known(chunk_list) => {
- let mut digest_list = vec![];
- let mut offset_list = vec![];
- for (offset, digest) in chunk_list {
- //println!("append chunk {} (offset {})", proxmox::tools::digest_to_hex(&digest), offset);
- digest_list.push(digest_to_hex(&digest));
- offset_list.push(offset);
- }
- println!("append chunks list len ({})", digest_list.len());
- let param = json!({ "wid": wid, "digest-list": digest_list, "offset-list": offset_list });
- let mut request = H2Client::request_builder("localhost", "PUT", &path, None).unwrap();
- request.headers_mut().insert(hyper::header::CONTENT_TYPE, HeaderValue::from_static("application/json"));
- let param_data = bytes::Bytes::from(param.to_string().as_bytes());
- let upload_data = Some(param_data);
- h2_2.send_request(request, upload_data)
- .and_then(move |response| {
- response
- .map_err(Error::from)
- .and_then(H2Client::h2api_response)
- .map_ok(|_| ())
- })
- .map_err(|err| format_err!("pipelined request failed: {}", err))
- }
- _ => unreachable!(),
- }
- })
- .try_for_each(|_| future::ok(()))
- .map(|result| {
- let _ignore_closed_channel = verify_result_tx.send(result);
- })
- );
-
- (verify_queue_tx, verify_result_rx)
- }
-
- async fn download_chunk_list(
- h2: H2Client,
- path: &str,
- archive_name: &str,
- known_chunks: Arc<Mutex<HashSet<[u8;32]>>>,
- ) -> Result<(), Error> {
-
- let param = json!({ "archive-name": archive_name });
- let request = H2Client::request_builder("localhost", "GET", path, Some(param)).unwrap();
-
- let h2request = h2.send_request(request, None).await?;
- let resp = h2request.await?;
-
- let status = resp.status();
-
- if !status.is_success() {
- H2Client::h2api_response(resp).await?; // raise error
- unreachable!();
- }
-
- let mut body = resp.into_body();
- let mut release_capacity = body.release_capacity().clone();
-
- let mut stream = DigestListDecoder::new(body.map_err(Error::from));
-
- while let Some(chunk) = stream.try_next().await? {
- let _ = release_capacity.release_capacity(chunk.len());
- println!("GOT DOWNLOAD {}", digest_to_hex(&chunk));
- known_chunks.lock().unwrap().insert(chunk);
- }
-
- Ok(())
- }
-
- fn upload_chunk_info_stream(
- h2: H2Client,
- wid: u64,
- stream: impl Stream<Item = Result<bytes::BytesMut, Error>>,
- prefix: &str,
- known_chunks: Arc<Mutex<HashSet<[u8;32]>>>,
- crypt_config: Option<Arc<CryptConfig>>,
- ) -> impl Future<Output = Result<(usize, usize, usize, [u8; 32]), Error>> {
-
- let repeat = Arc::new(AtomicUsize::new(0));
- let repeat2 = repeat.clone();
-
- let stream_len = Arc::new(AtomicUsize::new(0));
- let stream_len2 = stream_len.clone();
-
- let append_chunk_path = format!("{}_index", prefix);
- let upload_chunk_path = format!("{}_chunk", prefix);
-
- let (upload_queue, upload_result) =
- Self::append_chunk_queue(h2.clone(), wid, append_chunk_path.to_owned());
-
- let start_time = std::time::Instant::now();
-
- let index_csum = Arc::new(Mutex::new(Some(openssl::sha::Sha256::new())));
- let index_csum_2 = index_csum.clone();
-
- stream
- .and_then(move |data| {
-
- let chunk_len = data.len();
-
- repeat.fetch_add(1, Ordering::SeqCst);
- let offset = stream_len.fetch_add(chunk_len, Ordering::SeqCst) as u64;
-
- let mut chunk_builder = DataChunkBuilder::new(data.as_ref())
- .compress(true);
-
- if let Some(ref crypt_config) = crypt_config {
- chunk_builder = chunk_builder.crypt_config(crypt_config);
- }
-
- let mut known_chunks = known_chunks.lock().unwrap();
- let digest = chunk_builder.digest();
-
- let mut guard = index_csum.lock().unwrap();
- let csum = guard.as_mut().unwrap();
-
- let chunk_end = offset + chunk_len as u64;
-
- csum.update(&chunk_end.to_le_bytes());
- csum.update(digest);
-
- let chunk_is_known = known_chunks.contains(digest);
- if chunk_is_known {
- future::ok(MergedChunkInfo::Known(vec![(offset, *digest)]))
- } else {
- known_chunks.insert(*digest);
- future::ready(chunk_builder
- .build()
- .map(move |chunk| MergedChunkInfo::New(ChunkInfo {
- chunk,
- chunk_len: chunk_len as u64,
- offset,
- }))
- )
- }
- })
- .merge_known_chunks()
- .try_for_each(move |merged_chunk_info| {
-
- if let MergedChunkInfo::New(chunk_info) = merged_chunk_info {
- let offset = chunk_info.offset;
- let digest = *chunk_info.chunk.digest();
- let digest_str = digest_to_hex(&digest);
-
- println!("upload new chunk {} ({} bytes, offset {})", digest_str,
- chunk_info.chunk_len, offset);
-
- let chunk_data = chunk_info.chunk.raw_data();
- let param = json!({
- "wid": wid,
- "digest": digest_str,
- "size": chunk_info.chunk_len,
- "encoded-size": chunk_data.len(),
- });
-
- let request = H2Client::request_builder("localhost", "POST", &upload_chunk_path, Some(param)).unwrap();
- let upload_data = Some(bytes::Bytes::from(chunk_data));
-
- let new_info = MergedChunkInfo::Known(vec![(offset, digest)]);
-
- let mut upload_queue = upload_queue.clone();
- future::Either::Left(h2
- .send_request(request, upload_data)
- .and_then(move |response| async move {
- upload_queue
- .send((new_info, Some(response)))
- .await
- .map_err(Error::from)
- })
- )
- } else {
- let mut upload_queue = upload_queue.clone();
- future::Either::Right(async move {
- upload_queue
- .send((merged_chunk_info, None))
- .await
- .map_err(Error::from)
- })
- }
- })
- .then(move |result| async move {
- upload_result.await?.and(result)
- }.boxed())
- .and_then(move |_| {
- let repeat = repeat2.load(Ordering::SeqCst);
- let stream_len = stream_len2.load(Ordering::SeqCst);
- let speed = ((stream_len*1000000)/(1024*1024))/(start_time.elapsed().as_micros() as usize);
- println!("Uploaded {} chunks in {} seconds ({} MB/s).", repeat, start_time.elapsed().as_secs(), speed);
- if repeat > 0 {
- println!("Average chunk size was {} bytes.", stream_len/repeat);
- println!("Time per request: {} microseconds.", (start_time.elapsed().as_micros())/(repeat as u128));
- }
-
- let mut guard = index_csum_2.lock().unwrap();
- let csum = guard.take().unwrap().finish();
-
- futures::future::ok((repeat, stream_len, speed, csum))
- })
- }
-
- pub async fn upload_speedtest(&self) -> Result<usize, Error> {
-
- let mut data = vec![];
- // generate pseudo random byte sequence
- for i in 0..1024*1024 {
- for j in 0..4 {
- let byte = ((i >> (j<<3))&0xff) as u8;
- data.push(byte);
- }
- }
-
- let item_len = data.len();
-
- let mut repeat = 0;
-
- let (upload_queue, upload_result) = Self::response_queue();
-
- let start_time = std::time::Instant::now();
-
- loop {
- repeat += 1;
- if start_time.elapsed().as_secs() >= 5 {
- break;
- }
-
- let mut upload_queue = upload_queue.clone();
-
- println!("send test data ({} bytes)", data.len());
- let request = H2Client::request_builder("localhost", "POST", "speedtest", None).unwrap();
- let request_future = self.h2.send_request(request, Some(bytes::Bytes::from(data.clone()))).await?;
-
- upload_queue.send(request_future).await?;
- }
-
- drop(upload_queue); // close queue
-
- let _ = upload_result.await?;
-
- println!("Uploaded {} chunks in {} seconds.", repeat, start_time.elapsed().as_secs());
- let speed = ((item_len*1000000*(repeat as usize))/(1024*1024))/(start_time.elapsed().as_micros() as usize);
- println!("Time per request: {} microseconds.", (start_time.elapsed().as_micros())/(repeat as u128));
-
- Ok(speed)
- }
-}
-
#[derive(Clone)]
pub struct H2Client {
h2: h2::client::SendRequest<bytes::Bytes>,
path: &str,
param: Option<Value>
) -> Result<Value, Error> {
- let req = Self::request_builder("localhost", "GET", path, param).unwrap();
+ let req = Self::request_builder("localhost", "GET", path, param, None).unwrap();
self.request(req).await
}
path: &str,
param: Option<Value>
) -> Result<Value, Error> {
- let req = Self::request_builder("localhost", "PUT", path, param).unwrap();
+ let req = Self::request_builder("localhost", "PUT", path, param, None).unwrap();
self.request(req).await
}
path: &str,
param: Option<Value>
) -> Result<Value, Error> {
- let req = Self::request_builder("localhost", "POST", path, param).unwrap();
+ let req = Self::request_builder("localhost", "POST", path, param, None).unwrap();
self.request(req).await
}
param: Option<Value>,
mut output: W,
) -> Result<W, Error> {
- let request = Self::request_builder("localhost", "GET", path, param).unwrap();
+ let request = Self::request_builder("localhost", "GET", path, param, None).unwrap();
let response_future = self.send_request(request, None).await?;
}
let mut body = resp.into_body();
- let mut release_capacity = body.release_capacity().clone();
-
- while let Some(chunk) = body.try_next().await? {
- let _ = release_capacity.release_capacity(chunk.len());
+ while let Some(chunk) = body.data().await {
+ let chunk = chunk?;
+ body.flow_control().release_capacity(chunk.len())?;
output.write_all(&chunk)?;
}
pub async fn upload(
&self,
+ method: &str, // POST or PUT
path: &str,
param: Option<Value>,
+ content_type: &str,
data: Vec<u8>,
) -> Result<Value, Error> {
- let request = Self::request_builder("localhost", "POST", path, param).unwrap();
+ let request = Self::request_builder("localhost", method, path, param, Some(content_type)).unwrap();
let mut send_request = self.h2.clone().ready().await?;
.await
}
- fn send_request(
+ pub fn send_request(
&self,
request: Request<()>,
data: Option<bytes::Bytes>,
})
}
- async fn h2api_response(
+ pub async fn h2api_response(
response: Response<h2::RecvStream>,
) -> Result<Value, Error> {
let status = response.status();
let (_head, mut body) = response.into_parts();
- // The `release_capacity` handle allows the caller to manage
- // flow control.
- //
- // Whenever data is received, the caller is responsible for
- // releasing capacity back to the server once it has freed
- // the data from memory.
- let mut release_capacity = body.release_capacity().clone();
-
let mut data = Vec::new();
- while let Some(chunk) = body.try_next().await? {
+ while let Some(chunk) = body.data().await {
+ let chunk = chunk?;
+ // Whenever data is received, the caller is responsible for
+ // releasing capacity back to the server once it has freed
+ // the data from memory.
// Let the server send more data.
- let _ = release_capacity.release_capacity(chunk.len());
+ body.flow_control().release_capacity(chunk.len())?;
data.extend(chunk);
}
let text = String::from_utf8(data.to_vec()).unwrap();
if status.is_success() {
- if text.len() > 0 {
+ if text.is_empty() {
+ Ok(Value::Null)
+ } else {
let mut value: Value = serde_json::from_str(&text)?;
if let Some(map) = value.as_object_mut() {
if let Some(data) = map.remove("data") {
}
}
bail!("got result without data property");
- } else {
- Ok(Value::Null)
}
} else {
bail!("HTTP Error {}: {}", status, text);
}
// Note: We always encode parameters with the url
- pub fn request_builder(server: &str, method: &str, path: &str, data: Option<Value>) -> Result<Request<()>, Error> {
+ pub fn request_builder(
+ server: &str,
+ method: &str,
+ path: &str,
+ param: Option<Value>,
+ content_type: Option<&str>,
+ ) -> Result<Request<()>, Error> {
let path = path.trim_matches('/');
- if let Some(data) = data {
- let query = tools::json_object_to_query(data)?;
+ let content_type = content_type.unwrap_or("application/x-www-form-urlencoded");
+
+ if let Some(param) = param {
+ let query = tools::json_object_to_query(param)?;
// We detected problem with hyper around 6000 characters - seo we try to keep on the safe side
if query.len() > 4096 { bail!("h2 query data too large ({} bytes) - please encode data inside body", query.len()); }
let url: Uri = format!("https://{}:8007/{}?{}", server, path, query).parse()?;
.method(method)
.uri(url)
.header("User-Agent", "proxmox-backup-client/1.0")
- .header(hyper::header::CONTENT_TYPE, "application/x-www-form-urlencoded")
+ .header(hyper::header::CONTENT_TYPE, content_type)
.body(())?;
- return Ok(request);
+ Ok(request)
} else {
let url: Uri = format!("https://{}:8007/{}", server, path).parse()?;
let request = Request::builder()
.method(method)
.uri(url)
.header("User-Agent", "proxmox-backup-client/1.0")
- .header(hyper::header::CONTENT_TYPE, "application/x-www-form-urlencoded")
+ .header(hyper::header::CONTENT_TYPE, content_type)
.body(())?;
Ok(request)
}
}
+#[derive(Clone)]
pub struct HttpsConnector {
http: HttpConnector,
- ssl_connector: SslConnector,
+ ssl_connector: std::sync::Arc<SslConnector>,
}
impl HttpsConnector {
Self {
http,
- ssl_connector,
+ ssl_connector: std::sync::Arc::new(ssl_connector),
}
}
}
tokio_openssl::SslStream<tokio::net::TcpStream>,
>;
-impl hyper::client::connect::Connect for HttpsConnector {
- type Transport = MaybeTlsStream;
+impl hyper::service::Service<Uri> for HttpsConnector {
+ type Response = MaybeTlsStream;
type Error = Error;
- type Future = Box<dyn Future<Output = Result<(
- Self::Transport,
- hyper::client::connect::Connected,
- ), Error>> + Send + Unpin + 'static>;
-
- fn connect(&self, dst: hyper::client::connect::Destination) -> Self::Future {
- let is_https = dst.scheme() == "https";
- let host = dst.host().to_string();
-
- let config = self.ssl_connector.configure();
- let conn = self.http.connect(dst);
-
- Box::new(Box::pin(async move {
- let (conn, connected) = conn.await?;
+ type Future = std::pin::Pin<Box<
+ dyn Future<Output = Result<Self::Response, Self::Error>> + Send + 'static
+ >>;
+
+ fn poll_ready(&mut self, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+ // This connector is always ready, but others might not be.
+ Poll::Ready(Ok(()))
+ }
+
+ fn call(&mut self, dst: Uri) -> Self::Future {
+ let mut this = self.clone();
+ async move {
+ let is_https = dst
+ .scheme()
+ .ok_or_else(|| format_err!("missing URL scheme"))?
+ == "https";
+ let host = dst
+ .host()
+ .ok_or_else(|| format_err!("missing hostname in destination url?"))?
+ .to_string();
+
+ let config = this.ssl_connector.configure();
+ let conn = this.http.call(dst).await?;
if is_https {
let conn = tokio_openssl::connect(config?, &host, conn).await?;
- Ok((MaybeTlsStream::Right(conn), connected))
+ Ok(MaybeTlsStream::Right(conn))
} else {
- Ok((MaybeTlsStream::Left(conn), connected))
+ Ok(MaybeTlsStream::Left(conn))
}
- }))
+ }.boxed()
}
}
projects / proxmox-backup.git / blobdiff