mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-30 04:01:58 +00:00
Feat: HttpReader (#1733)
* The start of implementing http_reader, issue #1644 * structure done * v1 of http_reader * first http_header poc * Add AsyncSeek trait * remove import * move import * fix typo * add error checking for async seek * fix handling of positions * rename variables * Update backend/src/util/http_reader.rs Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> * clean up work * improve error handling, and change if statement. Co-authored-by: Stephen Chavez <stephen@start9labs.com> Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
This commit is contained in:
@@ -67,6 +67,10 @@ pub enum ErrorKind {
|
||||
LanPortConflict = 58,
|
||||
Javascript = 59,
|
||||
Pem = 60,
|
||||
TLSInit = 61,
|
||||
HttpRange = 62,
|
||||
ContentLength = 63,
|
||||
BytesError = 64
|
||||
}
|
||||
impl ErrorKind {
|
||||
pub fn as_str(&self) -> &'static str {
|
||||
@@ -132,6 +136,10 @@ impl ErrorKind {
|
||||
LanPortConflict => "Incompatible LAN Port Configuration",
|
||||
Javascript => "Javascript Engine Error",
|
||||
Pem => "PEM Encoding Error",
|
||||
TLSInit => "TLS Backend Initialize Error",
|
||||
HttpRange => "No Support for Web Server HTTP Ranges",
|
||||
ContentLength => "Request has no content length header",
|
||||
BytesError => "Could not get the bytes for this request"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -236,6 +244,8 @@ impl From<openssl::error::ErrorStack> for Error {
|
||||
fn from(e: openssl::error::ErrorStack) -> Self {
|
||||
Error::new(eyre!("OpenSSL ERROR:\n{}", e), ErrorKind::OpenSsl)
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
impl From<Error> for RpcError {
|
||||
fn from(e: Error) -> Self {
|
||||
|
||||
300
backend/src/util/http_reader.rs
Normal file
300
backend/src/util/http_reader.rs
Normal file
@@ -0,0 +1,300 @@
|
||||
use std::cmp::min;
|
||||
use std::convert::TryFrom;
|
||||
use std::fmt::Display;
|
||||
use std::io::Error as StdIOError;
|
||||
use std::pin::Pin;
|
||||
use std::task::{Context, Poll};
|
||||
|
||||
use color_eyre::eyre::eyre;
|
||||
use futures::future::BoxFuture;
|
||||
use futures::FutureExt;
|
||||
use http::header::{ACCEPT_RANGES, CONTENT_LENGTH, RANGE};
|
||||
use pin_project::pin_project;
|
||||
use reqwest::{Client, Url};
|
||||
use tokio::io::{AsyncRead, AsyncSeek};
|
||||
use tracing::trace;
|
||||
|
||||
use crate::{Error, ResultExt};
|
||||
|
||||
#[pin_project]
|
||||
pub struct HttpReader {
|
||||
http_url: Url,
|
||||
cursor_pos: usize,
|
||||
http_client: Client,
|
||||
total_bytes: usize,
|
||||
range_unit: Option<RangeUnit>,
|
||||
read_in_progress: Option<BoxFuture<'static, Result<Vec<u8>, Error>>>,
|
||||
}
|
||||
|
||||
// If we want to add support for units other than Accept-Ranges: bytes, we can use this enum
|
||||
#[derive(Clone, Copy)]
|
||||
enum RangeUnit {
|
||||
Bytes,
|
||||
}
|
||||
|
||||
impl Display for RangeUnit {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
match self {
|
||||
RangeUnit::Bytes => write!(f, "bytes"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl HttpReader {
|
||||
pub async fn new(http_url: Url) -> Result<Self, Error> {
|
||||
let http_client = Client::builder()
|
||||
.build()
|
||||
.with_kind(crate::ErrorKind::TLSInit)?;
|
||||
|
||||
// Make a head request so that we can get the file size and check for http range support.
|
||||
let head_request = http_client
|
||||
.head(http_url.clone())
|
||||
.send()
|
||||
.await
|
||||
.with_kind(crate::ErrorKind::InvalidRequest)?;
|
||||
|
||||
let accept_ranges = head_request.headers().get(ACCEPT_RANGES);
|
||||
|
||||
let range_unit = match accept_ranges {
|
||||
Some(range_type) => {
|
||||
// as per rfc, header will contain data but not always UTF8 characters.
|
||||
|
||||
let value = range_type
|
||||
.to_str()
|
||||
.map_err(|err| Error::new(err, crate::ErrorKind::Utf8))?;
|
||||
|
||||
match value {
|
||||
"bytes" => Some(RangeUnit::Bytes),
|
||||
_ => {
|
||||
return Err(Error::new(
|
||||
eyre!(
|
||||
"{} HTTP range downloading not supported with this unit {value}",
|
||||
http_url
|
||||
),
|
||||
crate::ErrorKind::HttpRange,
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// None can mean just get entire contents, but we currently error out.
|
||||
None => {
|
||||
return Err(Error::new(
|
||||
eyre!(
|
||||
"{} HTTP range downloading not supported with this url",
|
||||
http_url
|
||||
),
|
||||
crate::ErrorKind::HttpRange,
|
||||
))
|
||||
}
|
||||
};
|
||||
|
||||
let total_bytes_option = head_request.headers().get(CONTENT_LENGTH);
|
||||
|
||||
let total_bytes = match total_bytes_option {
|
||||
Some(bytes) => bytes
|
||||
.to_str()
|
||||
.map_err(|err| Error::new(err, crate::ErrorKind::Utf8))?
|
||||
.parse::<usize>()?,
|
||||
None => {
|
||||
return Err(Error::new(
|
||||
eyre!("No content length headers for {}", http_url),
|
||||
crate::ErrorKind::ContentLength,
|
||||
))
|
||||
}
|
||||
};
|
||||
|
||||
Ok(HttpReader {
|
||||
http_url,
|
||||
cursor_pos: 0,
|
||||
http_client,
|
||||
total_bytes,
|
||||
range_unit,
|
||||
read_in_progress: None,
|
||||
})
|
||||
}
|
||||
|
||||
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Range_requests
|
||||
async fn get_range(
|
||||
range_unit: Option<RangeUnit>,
|
||||
http_client: Client,
|
||||
http_url: Url,
|
||||
start: usize,
|
||||
len: usize,
|
||||
total_bytes: usize,
|
||||
) -> Result<Vec<u8>, Error> {
|
||||
let mut data = Vec::with_capacity(len);
|
||||
|
||||
let end = min(start + len, total_bytes) - 1;
|
||||
|
||||
if start > end {
|
||||
return Ok(data);
|
||||
}
|
||||
|
||||
match range_unit {
|
||||
Some(unit) => {
|
||||
let data_range = format!("{}={}-{} ", unit, start, end);
|
||||
trace!("get range alive? {}", data_range);
|
||||
|
||||
let data_resp = http_client
|
||||
.get(http_url)
|
||||
.header(RANGE, data_range)
|
||||
.send()
|
||||
.await
|
||||
.with_kind(crate::ErrorKind::InvalidRequest)?;
|
||||
|
||||
let status_code = data_resp.status();
|
||||
//let data_res = data_resp.bytes().await;
|
||||
if status_code.is_success() {
|
||||
data = data_resp
|
||||
.bytes()
|
||||
.await
|
||||
.with_kind(crate::ErrorKind::BytesError)?
|
||||
.to_vec();
|
||||
}
|
||||
}
|
||||
|
||||
None => unreachable!(),
|
||||
}
|
||||
|
||||
Ok(data)
|
||||
}
|
||||
}
|
||||
|
||||
impl AsyncRead for HttpReader {
|
||||
fn poll_read(
|
||||
self: Pin<&mut Self>,
|
||||
cx: &mut Context<'_>,
|
||||
buf: &mut tokio::io::ReadBuf<'_>,
|
||||
) -> Poll<std::io::Result<()>> {
|
||||
let this = self.project();
|
||||
|
||||
let mut fut = if let Some(fut) = this.read_in_progress.take() {
|
||||
fut
|
||||
} else {
|
||||
HttpReader::get_range(
|
||||
*this.range_unit,
|
||||
this.http_client.clone(),
|
||||
this.http_url.clone(),
|
||||
*this.cursor_pos,
|
||||
buf.remaining(),
|
||||
*this.total_bytes,
|
||||
)
|
||||
.boxed()
|
||||
};
|
||||
|
||||
let res_poll = fut.as_mut().poll(cx);
|
||||
trace!("Polled with remaining bytes in buf: {}", buf.remaining());
|
||||
|
||||
match res_poll {
|
||||
Poll::Ready(result) => match result {
|
||||
Ok(data_chunk) => {
|
||||
trace!("data chunk: len: {}", data_chunk.len());
|
||||
trace!("buf filled len: {}", buf.filled().len());
|
||||
|
||||
if data_chunk.len() <= buf.remaining() {
|
||||
buf.put_slice(&data_chunk);
|
||||
*this.cursor_pos += data_chunk.len();
|
||||
|
||||
Poll::Ready(Ok(()))
|
||||
} else {
|
||||
buf.put_slice(&data_chunk);
|
||||
|
||||
Poll::Ready(Ok(()))
|
||||
}
|
||||
}
|
||||
Err(err) => Poll::Ready(Err(StdIOError::new(
|
||||
std::io::ErrorKind::Interrupted,
|
||||
Box::<dyn std::error::Error + Send + Sync>::from(err.source),
|
||||
))),
|
||||
},
|
||||
Poll::Pending => {
|
||||
*this.read_in_progress = Some(fut);
|
||||
|
||||
Poll::Pending
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl AsyncSeek for HttpReader {
|
||||
fn start_seek(self: Pin<&mut Self>, position: std::io::SeekFrom) -> std::io::Result<()> {
|
||||
let this = self.project();
|
||||
|
||||
match position {
|
||||
std::io::SeekFrom::Start(offset) => {
|
||||
let pos_res = usize::try_from(offset);
|
||||
|
||||
match pos_res {
|
||||
Ok(pos) => {
|
||||
if pos > *this.total_bytes {
|
||||
StdIOError::new(
|
||||
std::io::ErrorKind::InvalidInput,
|
||||
format!(
|
||||
"The offset: {} cannot be greater than {} bytes",
|
||||
pos, *this.total_bytes
|
||||
),
|
||||
);
|
||||
}
|
||||
*this.cursor_pos = pos;
|
||||
}
|
||||
Err(err) => return Err(StdIOError::new(std::io::ErrorKind::InvalidInput, err)),
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
std::io::SeekFrom::Current(offset) => {
|
||||
// We explicitly check if we read before byte 0.
|
||||
let new_pos = i64::try_from(*this.cursor_pos)
|
||||
.map_err(|err| StdIOError::new(std::io::ErrorKind::InvalidInput, err))?
|
||||
+ offset;
|
||||
|
||||
if new_pos < 0 {
|
||||
return Err(StdIOError::new(
|
||||
std::io::ErrorKind::InvalidInput,
|
||||
"Can't read before byte 0",
|
||||
));
|
||||
}
|
||||
|
||||
*this.cursor_pos = new_pos as usize;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
std::io::SeekFrom::End(offset) => {
|
||||
// We explicitly check if we read before byte 0.
|
||||
let new_pos = i64::try_from(*this.total_bytes)
|
||||
.map_err(|err| StdIOError::new(std::io::ErrorKind::InvalidInput, err))?
|
||||
+ offset;
|
||||
|
||||
if new_pos < 0 {
|
||||
return Err(StdIOError::new(
|
||||
std::io::ErrorKind::InvalidInput,
|
||||
"Can't read before byte 0",
|
||||
));
|
||||
}
|
||||
|
||||
*this.cursor_pos = new_pos as usize;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn poll_complete(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<std::io::Result<u64>> {
|
||||
Poll::Ready(Ok(self.cursor_pos as u64))
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn main_test() {
|
||||
use tokio::io::AsyncReadExt;
|
||||
let http_url = Url::parse("https://start9.com/latest/_static/css/main.css").unwrap();
|
||||
|
||||
println!("Getting this resource: {}", http_url);
|
||||
let mut test_reader = HttpReader::new(http_url).await.unwrap();
|
||||
|
||||
let mut buf = vec![0; test_reader.total_bytes];
|
||||
let bytes_read = test_reader.read(&mut buf).await.unwrap();
|
||||
|
||||
println!("bytes read: {}", bytes_read);
|
||||
|
||||
//println!("{}", String::from_utf8(buf).unwrap());
|
||||
}
|
||||
@@ -25,6 +25,7 @@ use crate::shutdown::Shutdown;
|
||||
use crate::{Error, ErrorKind, ResultExt as _};
|
||||
pub mod config;
|
||||
pub mod io;
|
||||
pub mod http_reader;
|
||||
pub mod logger;
|
||||
pub mod serde;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user