Deuxfleurs/garage
44
56
Fork 74
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

Support website publishing #7

Merged
lx merged 61 commits from feature/website into master 2021-01-15 16:49:51 +00:00
Conversation 3 Commits 61 Files changed 17 +11 -6
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ab62c59acb - Show all commits

17
src/web/web_server.rs
View file

@ -71,23 +71,28 @@ async fn handler(
fn authority_to_host(authority: &str) -> Result<&str, Error> { fn authority_to_host(authority: &str) -> Result<&str, Error> {
let mut iter = authority.chars().enumerate(); let mut iter = authority.chars().enumerate();
let split = match iter.next() { let split = match iter.next() {
Some((_, '[')) => { Some((_, '[')) => {
let mut niter = iter.skip_while(|(_, c)| c != &']'); let mut niter = iter.skip_while(|(_, c)| c != &']');
niter.next().ok_or(Error::BadRequest(format!("Authority {} has an illegal format", authority)))?; niter.next().ok_or(Error::BadRequest(format!(
"Authority {} has an illegal format",
authority
)))?;
niter.next() niter.next()
}, }
Some((_, _)) => iter.skip_while(|(_, c)| c != &':').next(), Some((_, _)) => iter.skip_while(|(_, c)| c != &':').next(),
None => return Err(Error::BadRequest(format!("Authority is empty"))), None => return Err(Error::BadRequest(format!("Authority is empty"))),
}; };
match split { match split {
Some((i, ':')) => Ok(&authority[..i]), Some((i, ':')) => Ok(&authority[..i]),
None => Ok(authority), None => Ok(authority),
Some((_, _)) => Err(Error::BadRequest(format!("Authority {} has an illegal format", authority))), Some((_, _)) => Err(Error::BadRequest(format!(
"Authority {} has an illegal format",
authority
))),
quentin marked this conversation as resolved
lx commented 2021-01-13 21:14:43 +00:00
Review
Copy link

Rewrite as only two cases:

BucketState::Present(params) if params.website.get() => Ok(()),
_ => Err(Error::NotFound),
Rewrite as only two cases: ``` BucketState::Present(params) if params.website.get() => Ok(()), _ => Err(Error::NotFound), ```
} }
} }
fn host_to_bucket<'a>(host: &'a str, root: &str) -> &'a str { fn host_to_bucket<'a>(host: &'a str, root: &str) -> &'a str {
if root.len() >= host.len() || !host.ends_with(root) { if root.len() >= host.len() || !host.ends_with(root) {
return host; return host;