Deuxfleurs/garage
48
55
Fork 72
Code Issues 99 Pull requests 14 Releases 30 Wiki Activity
garage/src/api/s3_put.rs

456 lines
12 KiB
Rust
Raw Normal View History

cargo fmt
2020-07-08 15:34:37 +00:00
use std::collections::{BTreeMap, VecDeque};
Implement multipart uploads
2020-04-26 20:39:32 +00:00
use std::fmt::Write;
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
use std::sync::Arc;
use futures::stream::*;
Implement multipart uploads
2020-04-26 20:39:32 +00:00
use hyper::{Body, Request, Response};
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
Work on API
2020-04-28 10:18:14 +00:00
use garage_table::*;
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
use garage_util::data::*;
use garage_util::error::Error;
Rename garage_core to garage_model
2020-07-07 11:59:22 +00:00
use garage_model::block::INLINE_THRESHOLD;
use garage_model::block_ref_table::*;
use garage_model::garage::Garage;
use garage_model::object_table::*;
use garage_model::version_table::*;
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
Work on API
2020-04-28 10:18:14 +00:00
use crate::encoding::*;
Implement multipart uploads
2020-04-26 20:39:32 +00:00
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
pub async fn handle_put(
garage: Arc<Garage>,
Implement multipart uploads
2020-04-26 20:39:32 +00:00
req: Request<Body>,
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
bucket: &str,
key: &str,
Update to Hyper 0.13.6 that accepts non-Sync streams in wrap_stream. Simplifies code and makes it possible to publish on crates.io
2020-07-07 15:15:53 +00:00
) -> Result<Response<Body>, Error> {
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
let version_uuid = gen_uuid();
cargo fmt
2020-07-08 15:34:37 +00:00
let headers = ObjectVersionHeaders {
content_type: get_mime_type(&req)?,
other: BTreeMap::new(), // TODO
};
Migrate S3 api to use new model
2020-07-08 15:33:24 +00:00
Implement multipart uploads
2020-04-26 20:39:32 +00:00
let body = req.into_body();
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
let mut chunker = BodyChunker::new(body, garage.config.block_size);
let first_block = match chunker.next().await? {
Some(x) => x,
Work on API
2020-04-28 10:18:14 +00:00
None => vec![],
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
};
let mut object_version = ObjectVersion {
uuid: version_uuid,
timestamp: now_msec(),
Migrate S3 api to use new model
2020-07-08 15:33:24 +00:00
state: ObjectVersionState::Uploading(headers.clone()),
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
};
if first_block.len() < INLINE_THRESHOLD {
cargo fmt
2020-07-08 15:34:37 +00:00
object_version.state = ObjectVersionState::Complete(ObjectVersionData::Inline(
ObjectVersionMeta {
headers,
size: first_block.len() as u64,
etag: "".to_string(), // TODO
},
first_block,
));
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
let object = Object::new(bucket.into(), key.into(), vec![object_version]);
garage.object_table.insert(&object).await?;
Implement multipart uploads
2020-04-26 20:39:32 +00:00
return Ok(put_response(version_uuid));
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
}
let version = Version::new(version_uuid, bucket.into(), key.into(), false, vec![]);
let first_block_hash = hash(&first_block[..]);
let object = Object::new(bucket.into(), key.into(), vec![object_version.clone()]);
garage.object_table.insert(&object).await?;
Work on API
2020-04-28 10:18:14 +00:00
let total_size = read_and_put_blocks(
&garage,
version,
1,
first_block,
first_block_hash,
&mut chunker,
)
.await?;
Implement multipart uploads
2020-04-26 20:39:32 +00:00
// TODO: if at any step we have an error, we should undo everything we did
Migrate S3 api to use new model
2020-07-08 15:33:24 +00:00
object_version.state = ObjectVersionState::Complete(ObjectVersionData::FirstBlock(
cargo fmt
2020-07-08 15:34:37 +00:00
ObjectVersionMeta {
headers,
size: total_size,
etag: "".to_string(), // TODO
},
first_block_hash,
));
Implement multipart uploads
2020-04-26 20:39:32 +00:00
let object = Object::new(bucket.into(), key.into(), vec![object_version]);
garage.object_table.insert(&object).await?;
Ok(put_response(version_uuid))
}
async fn read_and_put_blocks(
garage: &Arc<Garage>,
version: Version,
part_number: u64,
first_block: Vec<u8>,
first_block_hash: Hash,
chunker: &mut BodyChunker,
) -> Result<u64, Error> {
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
let mut next_offset = first_block.len();
Work on API
2020-04-28 10:18:14 +00:00
let mut put_curr_version_block = put_block_meta(
garage.clone(),
&version,
part_number,
0,
first_block_hash,
first_block.len() as u64,
);
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
let mut put_curr_block = garage
.block_manager
.rpc_put_block(first_block_hash, first_block);
loop {
let (_, _, next_block) =
futures::try_join!(put_curr_block, put_curr_version_block, chunker.next())?;
if let Some(block) = next_block {
let block_hash = hash(&block[..]);
let block_len = block.len();
Work on API
2020-04-28 10:18:14 +00:00
put_curr_version_block = put_block_meta(
garage.clone(),
&version,
part_number,
next_offset as u64,
block_hash,
block_len as u64,
);
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
put_curr_block = garage.block_manager.rpc_put_block(block_hash, block);
next_offset += block_len;
} else {
break;
}
}
Implement multipart uploads
2020-04-26 20:39:32 +00:00
Ok(next_offset as u64)
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
}
async fn put_block_meta(
garage: Arc<Garage>,
version: &Version,
Prepare for multipart uploads
2020-04-26 18:55:13 +00:00
part_number: u64,
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
offset: u64,
hash: Hash,
Implement multipart uploads
2020-04-26 20:39:32 +00:00
size: u64,
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
) -> Result<(), Error> {
// TODO: don't clone, restart from empty block list ??
let mut version = version.clone();
Prepare for multipart uploads
2020-04-26 18:55:13 +00:00
version
.add_block(VersionBlock {
part_number,
offset,
hash,
Implement multipart uploads
2020-04-26 20:39:32 +00:00
size,
Prepare for multipart uploads
2020-04-26 18:55:13 +00:00
})
.unwrap();
Some basic S3 functionnality
2020-04-24 18:47:11 +00:00
let block_ref = BlockRef {
block: hash,
version: version.uuid,
deleted: false,
};
futures::try_join!(
garage.version_table.insert(&version),
garage.block_ref_table.insert(&block_ref),
)?;
Ok(())
}
struct BodyChunker {
body: Body,
read_all: bool,
block_size: usize,
buf: VecDeque<u8>,
}
impl BodyChunker {
fn new(body: Body, block_size: usize) -> Self {
Self {
body,
read_all: false,
block_size,
buf: VecDeque::new(),
}
}
async fn next(&mut self) -> Result<Option<Vec<u8>>, Error> {
while !self.read_all && self.buf.len() < self.block_size {
if let Some(block) = self.body.next().await {
let bytes = block?;
trace!("Body next: {} bytes", bytes.len());
self.buf.extend(&bytes[..]);
} else {
self.read_all = true;
}
}
if self.buf.len() == 0 {
Ok(None)
} else if self.buf.len() <= self.block_size {
let block = self.buf.drain(..).collect::<Vec<u8>>();
Ok(Some(block))
} else {
let block = self.buf.drain(..self.block_size).collect::<Vec<u8>>();
Ok(Some(block))
}
}
}
Update to Hyper 0.13.6 that accepts non-Sync streams in wrap_stream. Simplifies code and makes it possible to publish on crates.io
2020-07-07 15:15:53 +00:00
pub fn put_response(version_uuid: UUID) -> Response<Body> {
Slightly improved S3 compatibility - ListBucket does not require any of the parameters (delimiter, prefix, max-keys, etc) - URLs are properly percent_decoded - PutObject and DeleteObject calls now answer correctly (empty body, version id in the x-amz-version-id: header)
2020-05-01 14:30:50 +00:00
Response::builder()
.header("x-amz-version-id", hex::encode(version_uuid))
cargo fmt
2020-07-08 15:34:37 +00:00
// TODO ETag
Update to Hyper 0.13.6 that accepts non-Sync streams in wrap_stream. Simplifies code and makes it possible to publish on crates.io
2020-07-07 15:15:53 +00:00
.body(Body::from(vec![]))
Slightly improved S3 compatibility - ListBucket does not require any of the parameters (delimiter, prefix, max-keys, etc) - URLs are properly percent_decoded - PutObject and DeleteObject calls now answer correctly (empty body, version id in the x-amz-version-id: header)
2020-05-01 14:30:50 +00:00
.unwrap()
Implement multipart uploads
2020-04-26 20:39:32 +00:00
}
pub async fn handle_create_multipart_upload(
garage: Arc<Garage>,
req: &Request<Body>,
bucket: &str,
key: &str,
Update to Hyper 0.13.6 that accepts non-Sync streams in wrap_stream. Simplifies code and makes it possible to publish on crates.io
2020-07-07 15:15:53 +00:00
) -> Result<Response<Body>, Error> {
Implement multipart uploads
2020-04-26 20:39:32 +00:00
let version_uuid = gen_uuid();
cargo fmt
2020-07-08 15:34:37 +00:00
let headers = ObjectVersionHeaders {
content_type: get_mime_type(&req)?,
other: BTreeMap::new(), // TODO
};
Implement multipart uploads
2020-04-26 20:39:32 +00:00
let object_version = ObjectVersion {
uuid: version_uuid,
timestamp: now_msec(),
Migrate S3 api to use new model
2020-07-08 15:33:24 +00:00
state: ObjectVersionState::Uploading(headers),
Implement multipart uploads
2020-04-26 20:39:32 +00:00
};
let object = Object::new(bucket.to_string(), key.to_string(), vec![object_version]);
garage.object_table.insert(&object).await?;
let mut xml = String::new();
writeln!(&mut xml, r#"<?xml version="1.0" encoding="UTF-8"?>"#).unwrap();
writeln!(
&mut xml,
r#"<InitiateMultipartUploadResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/">"#
)
.unwrap();
writeln!(&mut xml, "\t<Bucket>{}</Bucket>", bucket).unwrap();
writeln!(&mut xml, "\t<Key>{}</Key>", xml_escape(key)).unwrap();
writeln!(
&mut xml,
"\t<UploadId>{}</UploadId>",
hex::encode(version_uuid)
)
.unwrap();
writeln!(&mut xml, "</InitiateMultipartUploadResult>").unwrap();
Update to Hyper 0.13.6 that accepts non-Sync streams in wrap_stream. Simplifies code and makes it possible to publish on crates.io
2020-07-07 15:15:53 +00:00
Ok(Response::new(Body::from(xml.into_bytes())))
Implement multipart uploads
2020-04-26 20:39:32 +00:00
}
pub async fn handle_put_part(
garage: Arc<Garage>,
req: Request<Body>,
bucket: &str,
key: &str,
part_number_str: &str,
upload_id: &str,
Update to Hyper 0.13.6 that accepts non-Sync streams in wrap_stream. Simplifies code and makes it possible to publish on crates.io
2020-07-07 15:15:53 +00:00
) -> Result<Response<Body>, Error> {
Implement multipart uploads
2020-04-26 20:39:32 +00:00
// Check parameters
let part_number = part_number_str
.parse::<u64>()
.map_err(|e| Error::BadRequest(format!("Invalid part number: {}", e)))?;
Work on API
2020-04-28 10:18:14 +00:00
let version_uuid =
uuid_from_str(upload_id).map_err(|_| Error::BadRequest(format!("Invalid upload ID")))?;
Implement multipart uploads
2020-04-26 20:39:32 +00:00
// Read first chuck, and at the same time try to get object to see if it exists
let mut chunker = BodyChunker::new(req.into_body(), garage.config.block_size);
let bucket = bucket.to_string();
let key = key.to_string();
let get_object_fut = garage.object_table.get(&bucket, &key);
let get_first_block_fut = chunker.next();
let (object, first_block) = futures::try_join!(get_object_fut, get_first_block_fut)?;
// Check object is valid and multipart block can be accepted
let first_block = match first_block {
None => return Err(Error::BadRequest(format!("Empty body"))),
Some(x) => x,
};
let object = match object {
None => return Err(Error::BadRequest(format!("Object not found"))),
Some(x) => x,
};
cargo fmt
2020-07-08 15:34:37 +00:00
if !object
.versions()
.iter()
.any(|v| v.uuid == version_uuid && v.is_uploading())
{
Implement multipart uploads
2020-04-26 20:39:32 +00:00
return Err(Error::BadRequest(format!(
"Multipart upload does not exist or is otherwise invalid"
)));
}
// Copy block to store
let version = Version::new(version_uuid, bucket.into(), key.into(), false, vec![]);
let first_block_hash = hash(&first_block[..]);
Work on API
2020-04-28 10:18:14 +00:00
read_and_put_blocks(
&garage,
version,
part_number,
first_block,
first_block_hash,
&mut chunker,
)
.await?;
Implement multipart uploads
2020-04-26 20:39:32 +00:00
Update to Hyper 0.13.6 that accepts non-Sync streams in wrap_stream. Simplifies code and makes it possible to publish on crates.io
2020-07-07 15:15:53 +00:00
Ok(Response::new(Body::from(vec![])))
Implement multipart uploads
2020-04-26 20:39:32 +00:00
}
pub async fn handle_complete_multipart_upload(
garage: Arc<Garage>,
_req: Request<Body>,
bucket: &str,
key: &str,
upload_id: &str,
Update to Hyper 0.13.6 that accepts non-Sync streams in wrap_stream. Simplifies code and makes it possible to publish on crates.io
2020-07-07 15:15:53 +00:00
) -> Result<Response<Body>, Error> {
Work on API
2020-04-28 10:18:14 +00:00
let version_uuid =
uuid_from_str(upload_id).map_err(|_| Error::BadRequest(format!("Invalid upload ID")))?;
Implement multipart uploads
2020-04-26 20:39:32 +00:00
let bucket = bucket.to_string();
let key = key.to_string();
let (object, version) = futures::try_join!(
garage.object_table.get(&bucket, &key),
garage.version_table.get(&version_uuid, &EmptyKey),
)?;
let object = match object {
None => return Err(Error::BadRequest(format!("Object not found"))),
Some(x) => x,
};
cargo fmt
2020-07-08 15:34:37 +00:00
let object_version = object
.versions()
.iter()
.find(|v| v.uuid == version_uuid && v.is_uploading());
Implement multipart uploads
2020-04-26 20:39:32 +00:00
let mut object_version = match object_version {
Work on API
2020-04-28 10:18:14 +00:00
None => {
return Err(Error::BadRequest(format!(
"Multipart upload does not exist or has already been completed"
)))
}
Implement multipart uploads
2020-04-26 20:39:32 +00:00
Some(x) => x.clone(),
};
let version = match version {
None => return Err(Error::BadRequest(format!("Version not found"))),
Some(x) => x,
};
if version.blocks().len() == 0 {
return Err(Error::BadRequest(format!("No data was uploaded")));
}
cargo fmt
2020-07-08 15:34:37 +00:00
let headers = match object_version.state {
ObjectVersionState::Uploading(headers) => headers.clone(),
_ => unreachable!(),
};
Implement multipart uploads
2020-04-26 20:39:32 +00:00
// TODO: check that all the parts that they pretend they gave us are indeed there
// TODO: check MD5 sum of all uploaded parts? but that would mean we have to store them somewhere...
Work on API
2020-04-28 10:18:14 +00:00
let total_size = version
.blocks()
.iter()
.map(|x| x.size)
.fold(0, |x, y| x + y);
cargo fmt
2020-07-08 15:34:37 +00:00
object_version.state = ObjectVersionState::Complete(ObjectVersionData::FirstBlock(
ObjectVersionMeta {
headers,
size: total_size,
etag: "".to_string(), // TODO
},
version.blocks()[0].hash,
));
Migrate S3 api to use new model
2020-07-08 15:33:24 +00:00
Implement multipart uploads
2020-04-26 20:39:32 +00:00
let final_object = Object::new(bucket.clone(), key.clone(), vec![object_version]);
garage.object_table.insert(&final_object).await?;
let mut xml = String::new();
writeln!(&mut xml, r#"<?xml version="1.0" encoding="UTF-8"?>"#).unwrap();
writeln!(
&mut xml,
r#"<CompleteMultipartUploadResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/">"#
)
.unwrap();
Work on API
2020-04-28 10:18:14 +00:00
writeln!(
&mut xml,
"\t<Location>{}</Location>",
garage.config.s3_api.s3_region
)
.unwrap();
Implement multipart uploads
2020-04-26 20:39:32 +00:00
writeln!(&mut xml, "\t<Bucket>{}</Bucket>", bucket).unwrap();
writeln!(&mut xml, "\t<Key>{}</Key>", xml_escape(&key)).unwrap();
writeln!(&mut xml, "</CompleteMultipartUploadResult>").unwrap();
Update to Hyper 0.13.6 that accepts non-Sync streams in wrap_stream. Simplifies code and makes it possible to publish on crates.io
2020-07-07 15:15:53 +00:00
Ok(Response::new(Body::from(xml.into_bytes())))
Implement multipart uploads
2020-04-26 20:39:32 +00:00
}
Abort multipart upload
2020-04-26 20:46:21 +00:00
pub async fn handle_abort_multipart_upload(
garage: Arc<Garage>,
bucket: &str,
key: &str,
upload_id: &str,
Update to Hyper 0.13.6 that accepts non-Sync streams in wrap_stream. Simplifies code and makes it possible to publish on crates.io
2020-07-07 15:15:53 +00:00
) -> Result<Response<Body>, Error> {
Work on API
2020-04-28 10:18:14 +00:00
let version_uuid =
uuid_from_str(upload_id).map_err(|_| Error::BadRequest(format!("Invalid upload ID")))?;
Abort multipart upload
2020-04-26 20:46:21 +00:00
Work on API
2020-04-28 10:18:14 +00:00
let object = garage
.object_table
.get(&bucket.to_string(), &key.to_string())
.await?;
Abort multipart upload
2020-04-26 20:46:21 +00:00
let object = match object {
None => return Err(Error::BadRequest(format!("Object not found"))),
Some(x) => x,
};
cargo fmt
2020-07-08 15:34:37 +00:00
let object_version = object
.versions()
.iter()
.find(|v| v.uuid == version_uuid && v.is_uploading());
Abort multipart upload
2020-04-26 20:46:21 +00:00
let mut object_version = match object_version {
Work on API
2020-04-28 10:18:14 +00:00
None => {
return Err(Error::BadRequest(format!(
"Multipart upload does not exist or has already been completed"
)))
}
Abort multipart upload
2020-04-26 20:46:21 +00:00
Some(x) => x.clone(),
};
object_version.state = ObjectVersionState::Aborted;
let final_object = Object::new(bucket.to_string(), key.to_string(), vec![object_version]);
garage.object_table.insert(&final_object).await?;
Update to Hyper 0.13.6 that accepts non-Sync streams in wrap_stream. Simplifies code and makes it possible to publish on crates.io
2020-07-07 15:15:53 +00:00
Ok(Response::new(Body::from(vec![])))
Abort multipart upload
2020-04-26 20:46:21 +00:00
}
Implement multipart uploads
2020-04-26 20:39:32 +00:00
fn get_mime_type(req: &Request<Body>) -> Result<String, Error> {
Ok(req
.headers()
.get(hyper::header::CONTENT_TYPE)
.map(|x| x.to_str())
.unwrap_or(Ok("blob"))?
.to_string())
}
fn uuid_from_str(id: &str) -> Result<UUID, ()> {
let id_bin = hex::decode(id).map_err(|_| ())?;
if id_bin.len() != 32 {
return Err(());
}
let mut uuid = [0u8; 32];
uuid.copy_from_slice(&id_bin[..]);
Ok(UUID::from(uuid))
}
Reference in a new issue Copy permalink