aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/api/error.rs37
-rw-r--r--src/api/s3_website.rs24
-rw-r--r--src/garage/admin.rs6
-rw-r--r--src/model/bucket_alias_table.rs10
-rw-r--r--src/model/bucket_table.rs17
-rw-r--r--src/model/key_table.rs9
-rw-r--r--src/model/lib.rs13
-rw-r--r--src/model/migrate.rs38
-rw-r--r--src/model/object_table.rs7
-rw-r--r--src/model/version_table.rs57
-rw-r--r--src/table/schema.rs3
-rw-r--r--src/util/crdt/lww.rs5
-rw-r--r--src/util/crdt/lww_map.rs9
-rw-r--r--src/util/crdt/map.rs25
-rw-r--r--src/util/error.rs10
15 files changed, 174 insertions, 96 deletions
diff --git a/src/api/error.rs b/src/api/error.rs
index 9bb8f8e2..828a2342 100644
--- a/src/api/error.rs
+++ b/src/api/error.rs
@@ -156,62 +156,67 @@ impl Error {
/// Trait to map error to the Bad Request error code
pub trait OkOrBadRequest {
- type S2;
- fn ok_or_bad_request(self, reason: &'static str) -> Self::S2;
+ type S;
+ fn ok_or_bad_request<M: AsRef<str>>(self, reason: M) -> Result<Self::S, Error>;
}
impl<T, E> OkOrBadRequest for Result<T, E>
where
E: std::fmt::Display,
{
- type S2 = Result<T, Error>;
- fn ok_or_bad_request(self, reason: &'static str) -> Result<T, Error> {
+ type S = T;
+ fn ok_or_bad_request<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
match self {
Ok(x) => Ok(x),
- Err(e) => Err(Error::BadRequest(format!("{}: {}", reason, e))),
+ Err(e) => Err(Error::BadRequest(format!(
+ "{}: {}",
+ reason.as_ref(),
+ e.to_string()
+ ))),
}
}
}
impl<T> OkOrBadRequest for Option<T> {
- type S2 = Result<T, Error>;
- fn ok_or_bad_request(self, reason: &'static str) -> Result<T, Error> {
+ type S = T;
+ fn ok_or_bad_request<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
match self {
Some(x) => Ok(x),
- None => Err(Error::BadRequest(reason.to_string())),
+ None => Err(Error::BadRequest(reason.as_ref().to_string())),
}
}
}
/// Trait to map an error to an Internal Error code
pub trait OkOrInternalError {
- type S2;
- fn ok_or_internal_error(self, reason: &'static str) -> Self::S2;
+ type S;
+ fn ok_or_internal_error<M: AsRef<str>>(self, reason: M) -> Result<Self::S, Error>;
}
impl<T, E> OkOrInternalError for Result<T, E>
where
E: std::fmt::Display,
{
- type S2 = Result<T, Error>;
- fn ok_or_internal_error(self, reason: &'static str) -> Result<T, Error> {
+ type S = T;
+ fn ok_or_internal_error<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
match self {
Ok(x) => Ok(x),
Err(e) => Err(Error::InternalError(GarageError::Message(format!(
"{}: {}",
- reason, e
+ reason.as_ref(),
+ e
)))),
}
}
}
impl<T> OkOrInternalError for Option<T> {
- type S2 = Result<T, Error>;
- fn ok_or_internal_error(self, reason: &'static str) -> Result<T, Error> {
+ type S = T;
+ fn ok_or_internal_error<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
match self {
Some(x) => Ok(x),
None => Err(Error::InternalError(GarageError::Message(
- reason.to_string(),
+ reason.as_ref().to_string(),
))),
}
}
diff --git a/src/api/s3_website.rs b/src/api/s3_website.rs
index e76afbf4..1ea57577 100644
--- a/src/api/s3_website.rs
+++ b/src/api/s3_website.rs
@@ -3,12 +3,12 @@ use std::sync::Arc;
use hyper::{Body, Request, Response, StatusCode};
use serde::{Deserialize, Serialize};
-use serde_bytes::ByteBuf;
use crate::error::*;
use crate::s3_xml::{xmlns_tag, IntValue, Value};
use crate::signature::verify_signed_content;
+use garage_model::bucket_table::*;
use garage_model::garage::Garage;
use garage_table::*;
use garage_util::crdt;
@@ -58,7 +58,7 @@ pub async fn handle_put_website(
if let crdt::Deletable::Present(param) = &mut bucket.state {
param
.website_config
- .update(Some(ByteBuf::from(body.to_vec())));
+ .update(Some(conf.into_garage_website_config()?));
garage.bucket_table.insert(&bucket).await?;
} else {
unreachable!();
@@ -168,6 +168,26 @@ impl WebsiteConfiguration {
Ok(())
}
+
+ pub fn into_garage_website_config(self) -> Result<WebsiteConfig, Error> {
+ if let Some(rart) = self.redirect_all_requests_to {
+ Ok(WebsiteConfig::RedirectAll {
+ hostname: rart.hostname.0,
+ protocol: rart
+ .protocol
+ .map(|x| x.0)
+ .unwrap_or_else(|| "http".to_string()),
+ })
+ } else {
+ Ok(WebsiteConfig::Website {
+ index_document: self
+ .index_document
+ .map(|x| x.suffix.0)
+ .unwrap_or_else(|| "index.html".to_string()),
+ error_document: self.error_document.map(|x| x.key.0),
+ })
+ }
+ }
}
impl Key {
diff --git a/src/garage/admin.rs b/src/garage/admin.rs
index 9ea5c19e..49890189 100644
--- a/src/garage/admin.rs
+++ b/src/garage/admin.rs
@@ -4,7 +4,6 @@ use std::sync::Arc;
use async_trait::async_trait;
use serde::{Deserialize, Serialize};
-use serde_bytes::ByteBuf;
use garage_util::crdt::*;
use garage_util::data::*;
@@ -538,7 +537,10 @@ impl AdminRpcHandler {
}
let website = if query.allow {
- Some(ByteBuf::from(DEFAULT_WEBSITE_CONFIGURATION.to_vec()))
+ Some(WebsiteConfig::Website {
+ index_document: "index.html".into(),
+ error_document: None,
+ })
} else {
None
};
diff --git a/src/model/bucket_alias_table.rs b/src/model/bucket_alias_table.rs
index 904a5255..caae76f1 100644
--- a/src/model/bucket_alias_table.rs
+++ b/src/model/bucket_alias_table.rs
@@ -1,8 +1,10 @@
use serde::{Deserialize, Serialize};
+use garage_util::data::*;
+use garage_util::time::*;
+
use garage_table::crdt::*;
use garage_table::*;
-use garage_util::data::*;
/// The bucket alias table holds the names given to buckets
/// in the global namespace.
@@ -23,15 +25,19 @@ impl AutoCrdt for AliasParams {
impl BucketAlias {
pub fn new(name: String, bucket_id: Uuid) -> Option<Self> {
+ Self::raw(name, now_msec(), bucket_id)
+ }
+ pub fn raw(name: String, ts: u64, bucket_id: Uuid) -> Option<Self> {
if !is_valid_bucket_name(&name) {
None
} else {
Some(BucketAlias {
name,
- state: crdt::Lww::new(crdt::Deletable::present(AliasParams { bucket_id })),
+ state: crdt::Lww::raw(ts, crdt::Deletable::present(AliasParams { bucket_id })),
})
}
}
+
pub fn is_deleted(&self) -> bool {
self.state.get().is_deleted()
}
diff --git a/src/model/bucket_table.rs b/src/model/bucket_table.rs
index 00e03899..8dcf6913 100644
--- a/src/model/bucket_table.rs
+++ b/src/model/bucket_table.rs
@@ -1,5 +1,4 @@
use serde::{Deserialize, Serialize};
-use serde_bytes::ByteBuf;
use garage_table::crdt::Crdt;
use garage_table::*;
@@ -8,8 +7,6 @@ use garage_util::time::*;
use crate::permission::BucketKeyPerm;
-pub const DEFAULT_WEBSITE_CONFIGURATION: &[u8] = b""; // TODO (an XML WebsiteConfiguration document per the AWS spec)
-
/// A bucket is a collection of objects
///
/// Its parameters are not directly accessible as:
@@ -33,7 +30,7 @@ pub struct BucketParams {
/// Whether this bucket is allowed for website access
/// (under all of its global alias names),
/// and if so, the website configuration XML document
- pub website_config: crdt::Lww<Option<ByteBuf>>,
+ pub website_config: crdt::Lww<Option<WebsiteConfig>>,
/// Map of aliases that are or have been given to this bucket
/// in the global namespace
/// (not authoritative: this is just used as an indication to
@@ -45,6 +42,18 @@ pub struct BucketParams {
pub local_aliases: crdt::LwwMap<(String, String), bool>,
}
+#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
+pub enum WebsiteConfig {
+ RedirectAll {
+ hostname: String,
+ protocol: String,
+ },
+ Website {
+ index_document: String,
+ error_document: Option<String>,
+ },
+}
+
impl BucketParams {
/// Create an empty BucketParams with no authorized keys and no website accesss
pub fn new() -> Self {
diff --git a/src/model/key_table.rs b/src/model/key_table.rs
index 3285e355..daea5473 100644
--- a/src/model/key_table.rs
+++ b/src/model/key_table.rs
@@ -6,6 +6,8 @@ use garage_util::data::*;
use crate::permission::BucketKeyPerm;
+use garage_model_050::key_table as old;
+
/// An api key
#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
pub struct Key {
@@ -173,11 +175,8 @@ impl TableSchema for KeyTable {
}
fn try_migrate(bytes: &[u8]) -> Option<Self::E> {
- let old_k =
- match rmp_serde::decode::from_read_ref::<_, garage_model_050::key_table::Key>(bytes) {
- Ok(x) => x,
- Err(_) => return None,
- };
+ let old_k = rmp_serde::decode::from_read_ref::<_, old::Key>(bytes).ok()?;
+
let state = if old_k.deleted.get() {
crdt::Deletable::Deleted
} else {
diff --git a/src/model/lib.rs b/src/model/lib.rs
index 3f6b5cd4..e7d7e98b 100644
--- a/src/model/lib.rs
+++ b/src/model/lib.rs
@@ -1,14 +1,17 @@
#[macro_use]
extern crate log;
-pub mod block;
+pub mod permission;
+
pub mod block_ref_table;
pub mod bucket_alias_table;
-pub mod bucket_helper;
pub mod bucket_table;
-pub mod garage;
pub mod key_table;
-pub mod migrate;
pub mod object_table;
-pub mod permission;
pub mod version_table;
+
+pub mod block;
+
+pub mod bucket_helper;
+pub mod garage;
+pub mod migrate;
diff --git a/src/model/migrate.rs b/src/model/migrate.rs
index e4469e64..6b20a01f 100644
--- a/src/model/migrate.rs
+++ b/src/model/migrate.rs
@@ -1,7 +1,5 @@
use std::sync::Arc;
-use serde_bytes::ByteBuf;
-
use garage_table::util::EmptyKey;
use garage_util::crdt::*;
use garage_util::data::*;
@@ -50,24 +48,32 @@ impl Migrate {
hex::encode(&bucket_id.as_slice()[..16])
};
- let mut new_ak = Map::new();
- for (k, ts, perm) in old_bucket_p.authorized_keys.items().iter() {
- new_ak.put(
- k.to_string(),
- BucketKeyPerm {
- timestamp: *ts,
- allow_read: perm.allow_read,
- allow_write: perm.allow_write,
- allow_owner: false,
- },
- );
- }
+ let new_ak = old_bucket_p
+ .authorized_keys
+ .items()
+ .iter()
+ .map(|(k, ts, perm)| {
+ (
+ k.to_string(),
+ BucketKeyPerm {
+ timestamp: *ts,
+ allow_read: perm.allow_read,
+ allow_write: perm.allow_write,
+ allow_owner: false,
+ },
+ )
+ })
+ .collect::<Map<_, _>>();
let mut aliases = LwwMap::new();
aliases.update_in_place(new_name.clone(), true);
+ let alias_ts = aliases.get_timestamp(&new_name);
let website = if *old_bucket_p.website.get() {
- Some(ByteBuf::from(DEFAULT_WEBSITE_CONFIGURATION.to_vec()))
+ Some(WebsiteConfig::Website {
+ index_document: "index.html".into(),
+ error_document: None,
+ })
} else {
None
};
@@ -84,7 +90,7 @@ impl Migrate {
};
self.garage.bucket_table.insert(&new_bucket).await?;
- let new_alias = BucketAlias::new(new_name.clone(), new_bucket.id).unwrap();
+ let new_alias = BucketAlias::raw(new_name.clone(), alias_ts, new_bucket.id).unwrap();
self.garage.bucket_alias_table.insert(&new_alias).await?;
for (k, perm) in new_ak.items().iter() {
diff --git a/src/model/object_table.rs b/src/model/object_table.rs
index 45f0daf4..0c6c3a6d 100644
--- a/src/model/object_table.rs
+++ b/src/model/object_table.rs
@@ -259,11 +259,8 @@ impl TableSchema for ObjectTable {
}
fn try_migrate(bytes: &[u8]) -> Option<Self::E> {
- let old_v = match rmp_serde::decode::from_read_ref::<_, old::Object>(bytes) {
- Ok(x) => x,
- Err(_) => return None,
- };
- Some(migrate_object(old_v))
+ let old_obj = rmp_serde::decode::from_read_ref::<_, old::Object>(bytes).ok()?;
+ Some(migrate_object(old_obj))
}
}
diff --git a/src/model/version_table.rs b/src/model/version_table.rs
index 05cae831..e0b99770 100644
--- a/src/model/version_table.rs
+++ b/src/model/version_table.rs
@@ -10,6 +10,8 @@ use garage_table::*;
use crate::block_ref_table::*;
+use garage_model_050::version_table as old;
+
/// A version of an object
#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
pub struct Version {
@@ -149,35 +151,38 @@ impl TableSchema for VersionTable {
}
fn try_migrate(bytes: &[u8]) -> Option<Self::E> {
- let old =
- match rmp_serde::decode::from_read_ref::<_, garage_model_050::version_table::Version>(
- bytes,
- ) {
- Ok(x) => x,
- Err(_) => return None,
- };
- let mut new_blocks = crdt::Map::new();
- for (k, v) in old.blocks.items().iter() {
- new_blocks.put(
- VersionBlockKey {
- part_number: k.part_number,
- offset: k.offset,
- },
- VersionBlock {
- hash: Hash::try_from(v.hash.as_slice()).unwrap(),
- size: v.size,
- },
- );
- }
- let mut new_parts_etags = crdt::Map::new();
- for (k, v) in old.parts_etags.items().iter() {
- new_parts_etags.put(*k, v.clone());
- }
+ let old = rmp_serde::decode::from_read_ref::<_, old::Version>(bytes).ok()?;
+
+ let blocks = old
+ .blocks
+ .items()
+ .iter()
+ .map(|(k, v)| {
+ (
+ VersionBlockKey {
+ part_number: k.part_number,
+ offset: k.offset,
+ },
+ VersionBlock {
+ hash: Hash::try_from(v.hash.as_slice()).unwrap(),
+ size: v.size,
+ },
+ )
+ })
+ .collect::<crdt::Map<_, _>>();
+
+ let parts_etags = old
+ .parts_etags
+ .items()
+ .iter()
+ .map(|(k, v)| (*k, v.clone()))
+ .collect::<crdt::Map<_, _>>();
+
Some(Version {
uuid: Hash::try_from(old.uuid.as_slice()).unwrap(),
deleted: crdt::Bool::new(old.deleted.get()),
- blocks: new_blocks,
- parts_etags: new_parts_etags,
+ blocks,
+ parts_etags,
bucket_id: blake2sum(old.bucket.as_bytes()),
key: old.key,
})
diff --git a/src/table/schema.rs b/src/table/schema.rs
index cfe86fba..eba918a2 100644
--- a/src/table/schema.rs
+++ b/src/table/schema.rs
@@ -16,6 +16,9 @@ impl PartitionKey for String {
}
}
+/// Values of type FixedBytes32 are assumed to be random,
+/// either a hash or a random UUID. This means we can use
+/// them directly as an index into the hash table.
impl PartitionKey for FixedBytes32 {
fn hash(&self) -> Hash {
*self
diff --git a/src/util/crdt/lww.rs b/src/util/crdt/lww.rs
index 99bd8e7c..adb07711 100644
--- a/src/util/crdt/lww.rs
+++ b/src/util/crdt/lww.rs
@@ -57,10 +57,7 @@ where
}
}
- /// Build a new CRDT from a previous non-compatible one
- ///
- /// Compared to new, the CRDT's timestamp is not set to now
- /// but must be set to the previous, non-compatible, CRDT's timestamp.
+ /// Build a new LWW CRDT from its raw pieces: a timestamp and the value
pub fn raw(ts: u64, value: T) -> Self {
Self { ts, v: value }
}
diff --git a/src/util/crdt/lww_map.rs b/src/util/crdt/lww_map.rs
index 1746c3cc..c155c3a8 100644
--- a/src/util/crdt/lww_map.rs
+++ b/src/util/crdt/lww_map.rs
@@ -38,10 +38,11 @@ where
Self { vals: vec![] }
}
- /// Used to migrate from a map defined in an incompatible format. This produces
- /// a map that contains a single item with the specified timestamp (copied from
- /// the incompatible format). Do this as many times as you have items to migrate,
- /// and put them all together using the CRDT merge operator.
+ /// This produces a map that contains a single item with the specified timestamp.
+ ///
+ /// Used to migrate from a map defined in an incompatible format. Do this as many
+ /// times as you have items to migrate, and put them all together using the
+ /// CRDT merge operator.
pub fn raw_item(k: K, ts: u64, v: V) -> Self {
Self {
vals: vec![(k, ts, v)],
diff --git a/src/util/crdt/map.rs b/src/util/crdt/map.rs
index ad9a6e55..f9ed19b6 100644
--- a/src/util/crdt/map.rs
+++ b/src/util/crdt/map.rs
@@ -1,3 +1,5 @@
+use std::iter::{FromIterator, IntoIterator};
+
use serde::{Deserialize, Serialize};
use crate::crdt::crdt::*;
@@ -98,3 +100,26 @@ where
Self::new()
}
}
+
+/// A crdt map can be created from an iterator of key-value pairs.
+/// Note that all keys in the iterator must be distinct:
+/// this function will throw a panic if it is not the case.
+impl<K, V> FromIterator<(K, V)> for Map<K, V>
+where
+ K: Clone + Ord,
+ V: Clone + Crdt,
+{
+ fn from_iter<T: IntoIterator<Item = (K, V)>>(iter: T) -> Self {
+ let mut vals: Vec<(K, V)> = iter.into_iter().collect();
+ vals.sort_by_cached_key(|tup| tup.0.clone());
+
+ // sanity check
+ for i in 1..vals.len() {
+ if vals[i - 1].0 == vals[i].0 {
+ panic!("Duplicate key in crdt::Map resulting from .from_iter() or .collect()");
+ }
+ }
+
+ Self { vals }
+ }
+}
diff --git a/src/util/error.rs b/src/util/error.rs
index 08cf1302..ef5a76f2 100644
--- a/src/util/error.rs
+++ b/src/util/error.rs
@@ -119,17 +119,17 @@ where
}
}
-/// Trait to map error to the Bad Request error code
+/// Trait to map any error type to Error::Message
pub trait OkOrMessage {
- type S2;
- fn ok_or_message<M: Into<String>>(self, message: M) -> Self::S2;
+ type S;
+ fn ok_or_message<M: Into<String>>(self, message: M) -> Result<Self::S, Error>;
}
impl<T, E> OkOrMessage for Result<T, E>
where
E: std::fmt::Display,
{
- type S2 = Result<T, Error>;
+ type S = T;
fn ok_or_message<M: Into<String>>(self, message: M) -> Result<T, Error> {
match self {
Ok(x) => Ok(x),
@@ -139,7 +139,7 @@ where
}
impl<T> OkOrMessage for Option<T> {
- type S2 = Result<T, Error>;
+ type S = T;
fn ok_or_message<M: Into<String>>(self, message: M) -> Result<T, Error> {
match self {
Some(x) => Ok(x),
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 21:41:22 +0000