Add CORS config to bucket and implement {Put,Get,Delete}BucketCors
This commit is contained in:
parent
17446e3b46
commit
a8d077cdec
|
@ -19,6 +19,7 @@ use crate::signature::check_signature;
|
||||||
use crate::helpers::*;
|
use crate::helpers::*;
|
||||||
use crate::s3_bucket::*;
|
use crate::s3_bucket::*;
|
||||||
use crate::s3_copy::*;
|
use crate::s3_copy::*;
|
||||||
|
use crate::s3_cors::*;
|
||||||
use crate::s3_delete::*;
|
use crate::s3_delete::*;
|
||||||
use crate::s3_get::*;
|
use crate::s3_get::*;
|
||||||
use crate::s3_list::*;
|
use crate::s3_list::*;
|
||||||
|
@ -274,6 +275,11 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
|
||||||
handle_put_website(garage, bucket_id, req, content_sha256).await
|
handle_put_website(garage, bucket_id, req, content_sha256).await
|
||||||
}
|
}
|
||||||
Endpoint::DeleteBucketWebsite { .. } => handle_delete_website(garage, bucket_id).await,
|
Endpoint::DeleteBucketWebsite { .. } => handle_delete_website(garage, bucket_id).await,
|
||||||
|
Endpoint::GetBucketCors { .. } => handle_get_cors(garage, bucket_id).await,
|
||||||
|
Endpoint::PutBucketCors { .. } => {
|
||||||
|
handle_put_cors(garage, bucket_id, req, content_sha256).await
|
||||||
|
}
|
||||||
|
Endpoint::DeleteBucketCors { .. } => handle_delete_cors(garage, bucket_id).await,
|
||||||
endpoint => Err(Error::NotImplemented(endpoint.name().to_owned())),
|
endpoint => Err(Error::NotImplemented(endpoint.name().to_owned())),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,6 +15,7 @@ mod signature;
|
||||||
pub mod helpers;
|
pub mod helpers;
|
||||||
mod s3_bucket;
|
mod s3_bucket;
|
||||||
mod s3_copy;
|
mod s3_copy;
|
||||||
|
mod s3_cors;
|
||||||
mod s3_delete;
|
mod s3_delete;
|
||||||
pub mod s3_get;
|
pub mod s3_get;
|
||||||
mod s3_list;
|
mod s3_list;
|
||||||
|
|
279
src/api/s3_cors.rs
Normal file
279
src/api/s3_cors.rs
Normal file
|
@ -0,0 +1,279 @@
|
||||||
|
use quick_xml::de::from_reader;
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
use hyper::{header::HeaderName, Body, Method, Request, Response, StatusCode};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::error::*;
|
||||||
|
use crate::s3_xml::{to_xml_with_header, xmlns_tag, IntValue, Value};
|
||||||
|
use crate::signature::verify_signed_content;
|
||||||
|
|
||||||
|
use garage_model::bucket_table::CorsRule as GarageCorsRule;
|
||||||
|
use garage_model::garage::Garage;
|
||||||
|
use garage_table::*;
|
||||||
|
use garage_util::data::*;
|
||||||
|
|
||||||
|
pub async fn handle_get_cors(
|
||||||
|
garage: Arc<Garage>,
|
||||||
|
bucket_id: Uuid,
|
||||||
|
) -> Result<Response<Body>, Error> {
|
||||||
|
let bucket = garage
|
||||||
|
.bucket_table
|
||||||
|
.get(&EmptyKey, &bucket_id)
|
||||||
|
.await?
|
||||||
|
.ok_or(Error::NoSuchBucket)?;
|
||||||
|
|
||||||
|
let param = bucket
|
||||||
|
.params()
|
||||||
|
.ok_or_internal_error("Bucket should not be deleted at this point")?;
|
||||||
|
|
||||||
|
if let Some(cors) = param.cors_config.get() {
|
||||||
|
let wc = CorsConfiguration {
|
||||||
|
xmlns: (),
|
||||||
|
cors_rules: cors
|
||||||
|
.iter()
|
||||||
|
.map(CorsRule::from_garage_cors_rule)
|
||||||
|
.collect::<Vec<_>>(),
|
||||||
|
};
|
||||||
|
let xml = to_xml_with_header(&wc)?;
|
||||||
|
Ok(Response::builder()
|
||||||
|
.status(StatusCode::OK)
|
||||||
|
.header(http::header::CONTENT_TYPE, "application/xml")
|
||||||
|
.body(Body::from(xml))?)
|
||||||
|
} else {
|
||||||
|
Ok(Response::builder()
|
||||||
|
.status(StatusCode::NO_CONTENT)
|
||||||
|
.body(Body::empty())?)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn handle_delete_cors(
|
||||||
|
garage: Arc<Garage>,
|
||||||
|
bucket_id: Uuid,
|
||||||
|
) -> Result<Response<Body>, Error> {
|
||||||
|
let mut bucket = garage
|
||||||
|
.bucket_table
|
||||||
|
.get(&EmptyKey, &bucket_id)
|
||||||
|
.await?
|
||||||
|
.ok_or(Error::NoSuchBucket)?;
|
||||||
|
|
||||||
|
let param = bucket
|
||||||
|
.params_mut()
|
||||||
|
.ok_or_internal_error("Bucket should not be deleted at this point")?;
|
||||||
|
|
||||||
|
param.cors_config.update(None);
|
||||||
|
garage.bucket_table.insert(&bucket).await?;
|
||||||
|
|
||||||
|
Ok(Response::builder()
|
||||||
|
.status(StatusCode::NO_CONTENT)
|
||||||
|
.body(Body::empty())?)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn handle_put_cors(
|
||||||
|
garage: Arc<Garage>,
|
||||||
|
bucket_id: Uuid,
|
||||||
|
req: Request<Body>,
|
||||||
|
content_sha256: Option<Hash>,
|
||||||
|
) -> Result<Response<Body>, Error> {
|
||||||
|
let body = hyper::body::to_bytes(req.into_body()).await?;
|
||||||
|
verify_signed_content(content_sha256, &body[..])?;
|
||||||
|
|
||||||
|
let mut bucket = garage
|
||||||
|
.bucket_table
|
||||||
|
.get(&EmptyKey, &bucket_id)
|
||||||
|
.await?
|
||||||
|
.ok_or(Error::NoSuchBucket)?;
|
||||||
|
|
||||||
|
let param = bucket
|
||||||
|
.params_mut()
|
||||||
|
.ok_or_internal_error("Bucket should not be deleted at this point")?;
|
||||||
|
|
||||||
|
let conf: CorsConfiguration = from_reader(&body as &[u8])?;
|
||||||
|
conf.validate()?;
|
||||||
|
|
||||||
|
param
|
||||||
|
.cors_config
|
||||||
|
.update(Some(conf.into_garage_cors_config()?));
|
||||||
|
garage.bucket_table.insert(&bucket).await?;
|
||||||
|
|
||||||
|
Ok(Response::builder()
|
||||||
|
.status(StatusCode::OK)
|
||||||
|
.body(Body::empty())?)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
|
||||||
|
#[serde(rename = "CORSConfiguration")]
|
||||||
|
pub struct CorsConfiguration {
|
||||||
|
#[serde(serialize_with = "xmlns_tag", skip_deserializing)]
|
||||||
|
pub xmlns: (),
|
||||||
|
#[serde(rename = "CORSRule")]
|
||||||
|
pub cors_rules: Vec<CorsRule>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
|
||||||
|
pub struct CorsRule {
|
||||||
|
#[serde(rename = "ID")]
|
||||||
|
pub id: Option<Value>,
|
||||||
|
#[serde(rename = "MaxAgeSeconds")]
|
||||||
|
pub max_age_seconds: Option<IntValue>,
|
||||||
|
#[serde(rename = "AllowedOrigin")]
|
||||||
|
pub allowed_origins: Vec<Value>,
|
||||||
|
#[serde(rename = "AllowedMethod")]
|
||||||
|
pub allowed_methods: Vec<Value>,
|
||||||
|
#[serde(rename = "AllowedHeader", default)]
|
||||||
|
pub allowed_headers: Vec<Value>,
|
||||||
|
#[serde(rename = "ExposeHeader", default)]
|
||||||
|
pub expose_headers: Vec<Value>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
|
||||||
|
pub struct AllowedMethod {
|
||||||
|
#[serde(rename = "AllowedMethod")]
|
||||||
|
pub allowed_method: Value,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
|
||||||
|
pub struct AllowedHeader {
|
||||||
|
#[serde(rename = "AllowedHeader")]
|
||||||
|
pub allowed_header: Value,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
|
||||||
|
pub struct ExposeHeader {
|
||||||
|
#[serde(rename = "ExposeHeader")]
|
||||||
|
pub expose_header: Value,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl CorsConfiguration {
|
||||||
|
pub fn validate(&self) -> Result<(), Error> {
|
||||||
|
for r in self.cors_rules.iter() {
|
||||||
|
r.validate()?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn into_garage_cors_config(self) -> Result<Vec<GarageCorsRule>, Error> {
|
||||||
|
Ok(self
|
||||||
|
.cors_rules
|
||||||
|
.iter()
|
||||||
|
.map(CorsRule::to_garage_cors_rule)
|
||||||
|
.collect())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl CorsRule {
|
||||||
|
pub fn validate(&self) -> Result<(), Error> {
|
||||||
|
for method in self.allowed_methods.iter() {
|
||||||
|
method
|
||||||
|
.0
|
||||||
|
.parse::<Method>()
|
||||||
|
.ok_or_bad_request("Invalid CORSRule method")?;
|
||||||
|
}
|
||||||
|
for header in self
|
||||||
|
.allowed_headers
|
||||||
|
.iter()
|
||||||
|
.chain(self.expose_headers.iter())
|
||||||
|
{
|
||||||
|
header
|
||||||
|
.0
|
||||||
|
.parse::<HeaderName>()
|
||||||
|
.ok_or_bad_request("Invalid HTTP header name")?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn to_garage_cors_rule(&self) -> GarageCorsRule {
|
||||||
|
let convert_vec =
|
||||||
|
|vval: &[Value]| vval.iter().map(|x| x.0.to_owned()).collect::<Vec<String>>();
|
||||||
|
GarageCorsRule {
|
||||||
|
id: self.id.as_ref().map(|x| x.0.to_owned()),
|
||||||
|
max_age_seconds: self.max_age_seconds.as_ref().map(|x| x.0 as u64),
|
||||||
|
allowed_origins: convert_vec(&self.allowed_methods),
|
||||||
|
allowed_methods: convert_vec(&self.allowed_methods),
|
||||||
|
allowed_headers: convert_vec(&self.allowed_headers),
|
||||||
|
expose_headers: convert_vec(&self.expose_headers),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn from_garage_cors_rule(rule: &GarageCorsRule) -> Self {
|
||||||
|
unimplemented!()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
use quick_xml::de::from_str;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_deserialize() -> Result<(), Error> {
|
||||||
|
let message = r#"<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<CORSConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
|
||||||
|
<CORSRule>
|
||||||
|
<AllowedOrigin>http://www.example.com</AllowedOrigin>
|
||||||
|
|
||||||
|
<AllowedMethod>PUT</AllowedMethod>
|
||||||
|
<AllowedMethod>POST</AllowedMethod>
|
||||||
|
<AllowedMethod>DELETE</AllowedMethod>
|
||||||
|
|
||||||
|
<AllowedHeader>*</AllowedHeader>
|
||||||
|
</CORSRule>
|
||||||
|
<CORSRule>
|
||||||
|
<AllowedOrigin>*</AllowedOrigin>
|
||||||
|
<AllowedMethod>GET</AllowedMethod>
|
||||||
|
</CORSRule>
|
||||||
|
<CORSRule>
|
||||||
|
<ID>qsdfjklm</ID>
|
||||||
|
<MaxAgeSeconds>12345</MaxAgeSeconds>
|
||||||
|
<AllowedOrigin>https://perdu.com</AllowedOrigin>
|
||||||
|
|
||||||
|
<AllowedMethod>GET</AllowedMethod>
|
||||||
|
<AllowedMethod>DELETE</AllowedMethod>
|
||||||
|
<AllowedHeader>*</AllowedHeader>
|
||||||
|
<ExposeHeader>*</ExposeHeader>
|
||||||
|
</CORSRule>
|
||||||
|
</CORSConfiguration>"#;
|
||||||
|
let conf: CorsConfiguration = from_str(message).unwrap();
|
||||||
|
let ref_value = CorsConfiguration {
|
||||||
|
xmlns: (),
|
||||||
|
cors_rules: vec![
|
||||||
|
CorsRule {
|
||||||
|
id: None,
|
||||||
|
max_age_seconds: None,
|
||||||
|
allowed_origins: vec!["http://www.example.com".into()],
|
||||||
|
allowed_methods: vec!["PUT".into(), "POST".into(), "DELETE".into()],
|
||||||
|
allowed_headers: vec!["*".into()],
|
||||||
|
expose_headers: vec![],
|
||||||
|
},
|
||||||
|
CorsRule {
|
||||||
|
id: None,
|
||||||
|
max_age_seconds: None,
|
||||||
|
allowed_origins: vec!["*".into()],
|
||||||
|
allowed_methods: vec!["GET".into()],
|
||||||
|
allowed_headers: vec![],
|
||||||
|
expose_headers: vec![],
|
||||||
|
},
|
||||||
|
CorsRule {
|
||||||
|
id: Some("qsdfjklm".into()),
|
||||||
|
max_age_seconds: Some(IntValue(12345)),
|
||||||
|
allowed_origins: vec!["https://perdu.com".into()],
|
||||||
|
allowed_methods: vec!["GET".into(), "DELETE".into()],
|
||||||
|
allowed_headers: vec!["*".into()],
|
||||||
|
expose_headers: vec!["*".into()],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
assert_eq! {
|
||||||
|
ref_value,
|
||||||
|
conf
|
||||||
|
};
|
||||||
|
|
||||||
|
let message2 = to_xml_with_header(&ref_value)?;
|
||||||
|
|
||||||
|
let cleanup = |c: &str| c.replace(char::is_whitespace, "");
|
||||||
|
assert_eq!(cleanup(message), cleanup(&message2));
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
|
@ -773,7 +773,6 @@ impl Endpoint {
|
||||||
GetBucketAccelerateConfiguration,
|
GetBucketAccelerateConfiguration,
|
||||||
GetBucketAcl,
|
GetBucketAcl,
|
||||||
GetBucketAnalyticsConfiguration,
|
GetBucketAnalyticsConfiguration,
|
||||||
GetBucketCors,
|
|
||||||
GetBucketEncryption,
|
GetBucketEncryption,
|
||||||
GetBucketIntelligentTieringConfiguration,
|
GetBucketIntelligentTieringConfiguration,
|
||||||
GetBucketInventoryConfiguration,
|
GetBucketInventoryConfiguration,
|
||||||
|
@ -821,6 +820,9 @@ impl Endpoint {
|
||||||
GetBucketWebsite,
|
GetBucketWebsite,
|
||||||
PutBucketWebsite,
|
PutBucketWebsite,
|
||||||
DeleteBucketWebsite,
|
DeleteBucketWebsite,
|
||||||
|
GetBucketCors,
|
||||||
|
PutBucketCors,
|
||||||
|
DeleteBucketCors,
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
.is_some();
|
.is_some();
|
||||||
|
@ -1134,7 +1136,7 @@ mod tests {
|
||||||
OWNER_DELETE "/" => DeleteBucket
|
OWNER_DELETE "/" => DeleteBucket
|
||||||
DELETE "/?analytics&id=list1" => DeleteBucketAnalyticsConfiguration
|
DELETE "/?analytics&id=list1" => DeleteBucketAnalyticsConfiguration
|
||||||
DELETE "/?analytics&id=Id" => DeleteBucketAnalyticsConfiguration
|
DELETE "/?analytics&id=Id" => DeleteBucketAnalyticsConfiguration
|
||||||
DELETE "/?cors" => DeleteBucketCors
|
OWNER_DELETE "/?cors" => DeleteBucketCors
|
||||||
DELETE "/?encryption" => DeleteBucketEncryption
|
DELETE "/?encryption" => DeleteBucketEncryption
|
||||||
DELETE "/?intelligent-tiering&id=Id" => DeleteBucketIntelligentTieringConfiguration
|
DELETE "/?intelligent-tiering&id=Id" => DeleteBucketIntelligentTieringConfiguration
|
||||||
DELETE "/?inventory&id=list1" => DeleteBucketInventoryConfiguration
|
DELETE "/?inventory&id=list1" => DeleteBucketInventoryConfiguration
|
||||||
|
@ -1157,7 +1159,7 @@ mod tests {
|
||||||
GET "/?accelerate" => GetBucketAccelerateConfiguration
|
GET "/?accelerate" => GetBucketAccelerateConfiguration
|
||||||
GET "/?acl" => GetBucketAcl
|
GET "/?acl" => GetBucketAcl
|
||||||
GET "/?analytics&id=Id" => GetBucketAnalyticsConfiguration
|
GET "/?analytics&id=Id" => GetBucketAnalyticsConfiguration
|
||||||
GET "/?cors" => GetBucketCors
|
OWNER_GET "/?cors" => GetBucketCors
|
||||||
GET "/?encryption" => GetBucketEncryption
|
GET "/?encryption" => GetBucketEncryption
|
||||||
GET "/?intelligent-tiering&id=Id" => GetBucketIntelligentTieringConfiguration
|
GET "/?intelligent-tiering&id=Id" => GetBucketIntelligentTieringConfiguration
|
||||||
GET "/?inventory&id=list1" => GetBucketInventoryConfiguration
|
GET "/?inventory&id=list1" => GetBucketInventoryConfiguration
|
||||||
|
@ -1233,7 +1235,7 @@ mod tests {
|
||||||
PUT "/?acl" => PutBucketAcl
|
PUT "/?acl" => PutBucketAcl
|
||||||
PUT "/?analytics&id=report1" => PutBucketAnalyticsConfiguration
|
PUT "/?analytics&id=report1" => PutBucketAnalyticsConfiguration
|
||||||
PUT "/?analytics&id=Id" => PutBucketAnalyticsConfiguration
|
PUT "/?analytics&id=Id" => PutBucketAnalyticsConfiguration
|
||||||
PUT "/?cors" => PutBucketCors
|
OWNER_PUT "/?cors" => PutBucketCors
|
||||||
PUT "/?encryption" => PutBucketEncryption
|
PUT "/?encryption" => PutBucketEncryption
|
||||||
PUT "/?intelligent-tiering&id=Id" => PutBucketIntelligentTieringConfiguration
|
PUT "/?intelligent-tiering&id=Id" => PutBucketIntelligentTieringConfiguration
|
||||||
PUT "/?inventory&id=report1" => PutBucketInventoryConfiguration
|
PUT "/?inventory&id=report1" => PutBucketInventoryConfiguration
|
||||||
|
|
|
@ -5,7 +5,7 @@ use hyper::{Body, Request, Response, StatusCode};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use crate::error::*;
|
use crate::error::*;
|
||||||
use crate::s3_xml::{xmlns_tag, IntValue, Value};
|
use crate::s3_xml::{to_xml_with_header, xmlns_tag, IntValue, Value};
|
||||||
use crate::signature::verify_signed_content;
|
use crate::signature::verify_signed_content;
|
||||||
|
|
||||||
use garage_model::bucket_table::*;
|
use garage_model::bucket_table::*;
|
||||||
|
@ -39,7 +39,7 @@ pub async fn handle_get_website(
|
||||||
redirect_all_requests_to: None,
|
redirect_all_requests_to: None,
|
||||||
routing_rules: None,
|
routing_rules: None,
|
||||||
};
|
};
|
||||||
let xml = quick_xml::se::to_string(&wc)?;
|
let xml = to_xml_with_header(&wc)?;
|
||||||
Ok(Response::builder()
|
Ok(Response::builder()
|
||||||
.status(StatusCode::OK)
|
.status(StatusCode::OK)
|
||||||
.header(http::header::CONTENT_TYPE, "application/xml")
|
.header(http::header::CONTENT_TYPE, "application/xml")
|
||||||
|
@ -303,7 +303,7 @@ mod tests {
|
||||||
use quick_xml::de::from_str;
|
use quick_xml::de::from_str;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_deserialize() {
|
fn test_deserialize() -> Result<(), Error> {
|
||||||
let message = r#"<?xml version="1.0" encoding="UTF-8"?>
|
let message = r#"<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<WebsiteConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
|
<WebsiteConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
|
||||||
<ErrorDocument>
|
<ErrorDocument>
|
||||||
|
@ -365,7 +365,12 @@ mod tests {
|
||||||
ref_value,
|
ref_value,
|
||||||
conf
|
conf
|
||||||
}
|
}
|
||||||
// TODO verify result is ok
|
|
||||||
// TODO cycle back and verify if ok
|
let message2 = to_xml_with_header(&ref_value)?;
|
||||||
|
|
||||||
|
let cleanup = |c: &str| c.replace(char::is_whitespace, "");
|
||||||
|
assert_eq!(cleanup(message), cleanup(&message2));
|
||||||
|
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,6 +16,12 @@ pub fn xmlns_tag<S: Serializer>(_v: &(), s: S) -> Result<S::Ok, S::Error> {
|
||||||
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
|
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
|
||||||
pub struct Value(#[serde(rename = "$value")] pub String);
|
pub struct Value(#[serde(rename = "$value")] pub String);
|
||||||
|
|
||||||
|
impl From<&str> for Value {
|
||||||
|
fn from(s: &str) -> Value {
|
||||||
|
Value(s.to_string())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
|
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
|
||||||
pub struct IntValue(#[serde(rename = "$value")] pub i64);
|
pub struct IntValue(#[serde(rename = "$value")] pub i64);
|
||||||
|
|
||||||
|
|
|
@ -27,10 +27,7 @@ pub struct BucketParams {
|
||||||
pub creation_date: u64,
|
pub creation_date: u64,
|
||||||
/// Map of key with access to the bucket, and what kind of access they give
|
/// Map of key with access to the bucket, and what kind of access they give
|
||||||
pub authorized_keys: crdt::Map<String, BucketKeyPerm>,
|
pub authorized_keys: crdt::Map<String, BucketKeyPerm>,
|
||||||
/// 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<WebsiteConfig>>,
|
|
||||||
/// Map of aliases that are or have been given to this bucket
|
/// Map of aliases that are or have been given to this bucket
|
||||||
/// in the global namespace
|
/// in the global namespace
|
||||||
/// (not authoritative: this is just used as an indication to
|
/// (not authoritative: this is just used as an indication to
|
||||||
|
@ -40,6 +37,14 @@ pub struct BucketParams {
|
||||||
/// in namespaces local to keys
|
/// in namespaces local to keys
|
||||||
/// key = (access key id, alias name)
|
/// key = (access key id, alias name)
|
||||||
pub local_aliases: crdt::LwwMap<(String, String), bool>,
|
pub local_aliases: crdt::LwwMap<(String, String), bool>,
|
||||||
|
|
||||||
|
/// 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<WebsiteConfig>>,
|
||||||
|
/// CORS rules
|
||||||
|
#[serde(default)]
|
||||||
|
pub cors_config: crdt::Lww<Option<Vec<CorsRule>>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
|
#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
|
||||||
|
@ -48,15 +53,26 @@ pub struct WebsiteConfig {
|
||||||
pub error_document: Option<String>,
|
pub error_document: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
|
||||||
|
pub struct CorsRule {
|
||||||
|
pub id: Option<String>,
|
||||||
|
pub max_age_seconds: Option<u64>,
|
||||||
|
pub allowed_origins: Vec<String>,
|
||||||
|
pub allowed_methods: Vec<String>,
|
||||||
|
pub allowed_headers: Vec<String>,
|
||||||
|
pub expose_headers: Vec<String>,
|
||||||
|
}
|
||||||
|
|
||||||
impl BucketParams {
|
impl BucketParams {
|
||||||
/// Create an empty BucketParams with no authorized keys and no website accesss
|
/// Create an empty BucketParams with no authorized keys and no website accesss
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
BucketParams {
|
BucketParams {
|
||||||
creation_date: now_msec(),
|
creation_date: now_msec(),
|
||||||
authorized_keys: crdt::Map::new(),
|
authorized_keys: crdt::Map::new(),
|
||||||
website_config: crdt::Lww::new(None),
|
|
||||||
aliases: crdt::LwwMap::new(),
|
aliases: crdt::LwwMap::new(),
|
||||||
local_aliases: crdt::LwwMap::new(),
|
local_aliases: crdt::LwwMap::new(),
|
||||||
|
website_config: crdt::Lww::new(None),
|
||||||
|
cors_config: crdt::Lww::new(None),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,9 +69,10 @@ impl Migrate {
|
||||||
state: Deletable::Present(BucketParams {
|
state: Deletable::Present(BucketParams {
|
||||||
creation_date: now_msec(),
|
creation_date: now_msec(),
|
||||||
authorized_keys: Map::new(),
|
authorized_keys: Map::new(),
|
||||||
website_config: Lww::new(website),
|
|
||||||
aliases: LwwMap::new(),
|
aliases: LwwMap::new(),
|
||||||
local_aliases: LwwMap::new(),
|
local_aliases: LwwMap::new(),
|
||||||
|
website_config: Lww::new(website),
|
||||||
|
cors_config: Lww::new(None),
|
||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
.await?;
|
.await?;
|
||||||
|
|
|
@ -125,3 +125,15 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<T> Default for Lww<T>
|
||||||
|
where
|
||||||
|
T: Default,
|
||||||
|
{
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
ts: 0,
|
||||||
|
v: T::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue