Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

please clippy
All checks were successful
continuous-integration/drone/pr Build is passing
Details

Browse source
This commit is contained in:
Trinity Pointard 2021-12-14 19:34:01 +01:00
parent 6fef0f4cad
commit fd341177e9
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/api/s3_website.rs
View file

@ -134,16 +134,15 @@ pub struct Redirect {
impl WebsiteConfiguration { impl WebsiteConfiguration {
pub fn validate(&self) -> Result<(), Error> { pub fn validate(&self) -> Result<(), Error> {
if self.redirect_all_requests_to.is_some() { if self.redirect_all_requests_to.is_some()
if self.error_document.is_some() && (self.error_document.is_some()
|| self.index_document.is_some() || self.index_document.is_some()
|| self.routing_rules.is_some() || self.routing_rules.is_some())
{ {
return Err(Error::BadRequest( return Err(Error::BadRequest(
"Bad XML: can't have RedirectAllRequestsTo and other fields".to_owned(), "Bad XML: can't have RedirectAllRequestsTo and other fields".to_owned(),
)); ));
} }
}
if let Some(ref ed) = self.error_document { if let Some(ref ed) = self.error_document {
ed.validate()?; ed.validate()?;
} }