Version 0.5.1 for publication to crates.io

2026-08-15 00:23:11 +00:00 · 2021-12-16 13:21:52 +01:00
77 changed files with 1617 additions and 7300 deletions
@@ -382,17 +382,17 @@ dependencies = [

 [[package]]
 name = "garage"
-version = "0.6.0"
+version = "0.5.1"
 dependencies = [
 "async-trait",
 "bytes 1.1.0",
 "futures",
 "futures-util",
 "garage_api",
- "garage_model 0.6.0",
- "garage_rpc 0.6.0",
- "garage_table 0.6.0",
- "garage_util 0.6.0",
+ "garage_model",
+ "garage_rpc",
+ "garage_table",
+ "garage_util",
 "garage_web",
 "git-version",
 "hex",
@@ -403,7 +403,6 @@ dependencies = [
 "rand",
 "rmp-serde 0.15.5",
 "serde",
- "serde_bytes",
 "sled",
 "structopt",
 "tokio",
@@ -412,7 +411,7 @@ dependencies = [

 [[package]]
 name = "garage_api"
-version = "0.6.0"
+version = "0.5.1"
 dependencies = [
 "base64",
 "bytes 1.1.0",
@@ -421,9 +420,9 @@ dependencies = [
 "err-derive 0.3.0",
 "futures",
 "futures-util",
- "garage_model 0.6.0",
- "garage_table 0.6.0",
- "garage_util 0.6.0",
+ "garage_model",
+ "garage_table",
+ "garage_util",
 "hex",
 "hmac",
 "http",
@@ -433,13 +432,10 @@ dependencies = [
 "idna",
 "log",
 "md-5",
- "nom",
 "percent-encoding",
- "pin-project",
 "quick-xml",
 "roxmltree",
 "serde",
- "serde_bytes",
 "sha2",
 "tokio",
 "url",
@@ -448,41 +444,14 @@ dependencies = [
 [[package]]
 name = "garage_model"
 version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "584619e8999713d73761775591ad6f01ff8c9d724f3b20984f5932f1fc7f9988"
 dependencies = [
 "arc-swap",
 "async-trait",
 "futures",
 "futures-util",
- "garage_rpc 0.5.1",
- "garage_table 0.5.1",
- "garage_util 0.5.1",
- "hex",
- "log",
- "netapp",
- "rand",
- "rmp-serde 0.15.5",
- "serde",
- "serde_bytes",
- "sled",
- "tokio",
- "zstd",
-]
-
-[[package]]
-name = "garage_model"
-version = "0.6.0"
-dependencies = [
- "arc-swap",
- "async-trait",
- "err-derive 0.3.0",
- "futures",
- "futures-util",
- "garage_model 0.5.1",
- "garage_rpc 0.6.0",
- "garage_table 0.6.0",
- "garage_util 0.6.0",
+ "garage_rpc",
+ "garage_table",
+ "garage_util",
 "hex",
 "log",
 "netapp",
@@ -498,40 +467,13 @@ dependencies = [
 [[package]]
 name = "garage_rpc"
 version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81e693aa4582cfe7a7ce70c07880e3662544b5d0cd68bc4b59c53febfbb8d1ec"
 dependencies = [
 "arc-swap",
 "async-trait",
 "bytes 1.1.0",
 "futures",
 "futures-util",
- "garage_util 0.5.1",
- "gethostname",
- "hex",
- "hyper",
- "kuska-sodiumoxide",
- "log",
- "netapp",
- "rand",
- "rmp-serde 0.15.5",
- "serde",
- "serde_bytes",
- "serde_json",
- "tokio",
- "tokio-stream",
-]
-
-[[package]]
-name = "garage_rpc"
-version = "0.6.0"
-dependencies = [
- "arc-swap",
- "async-trait",
- "bytes 1.1.0",
- "futures",
- "futures-util",
- "garage_util 0.6.0",
+ "garage_util",
 "gethostname",
 "hex",
 "hyper",
@@ -550,35 +492,13 @@ dependencies = [
 [[package]]
 name = "garage_table"
 version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c3557f3757e2acd29eaee86804d4e6c38d2abda81b4b349d8a0d2277044265c"
 dependencies = [
 "async-trait",
 "bytes 1.1.0",
 "futures",
 "futures-util",
- "garage_rpc 0.5.1",
- "garage_util 0.5.1",
- "hexdump",
- "log",
- "rand",
- "rmp-serde 0.15.5",
- "serde",
- "serde_bytes",
- "sled",
- "tokio",
-]
-
-[[package]]
-name = "garage_table"
-version = "0.6.0"
-dependencies = [
- "async-trait",
- "bytes 1.1.0",
- "futures",
- "futures-util",
- "garage_rpc 0.6.0",
- "garage_util 0.6.0",
+ "garage_rpc",
+ "garage_util",
 "hexdump",
 "log",
 "rand",
@@ -592,32 +512,6 @@ dependencies = [
 [[package]]
 name = "garage_util"
 version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e096994382447431e2f3c70e3685eb8b24c00eceff8667bb22a2a27ff17832f"
-dependencies = [
- "blake2",
- "chrono",
- "err-derive 0.3.0",
- "futures",
- "hex",
- "http",
- "hyper",
- "log",
- "netapp",
- "rand",
- "rmp-serde 0.15.5",
- "serde",
- "serde_json",
- "sha2",
- "sled",
- "tokio",
- "toml",
- "xxhash-rust",
-]
-
-[[package]]
-name = "garage_util"
-version = "0.6.0"
 dependencies = [
 "blake2",
 "chrono",
@@ -641,14 +535,14 @@ dependencies = [

 [[package]]
 name = "garage_web"
-version = "0.6.0"
+version = "0.5.1"
 dependencies = [
 "err-derive 0.3.0",
 "futures",
 "garage_api",
- "garage_model 0.6.0",
- "garage_table 0.6.0",
- "garage_util 0.6.0",
+ "garage_model",
+ "garage_table",
+ "garage_util",
 "http",
 "hyper",
 "log",
@@ -969,12 +863,6 @@ dependencies = [
 "autocfg",
 ]

-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
 [[package]]
 name = "mio"
 version = "0.7.13"
@@ -1019,17 +907,6 @@ dependencies = [
 "tokio-util",
 ]

-[[package]]
-name = "nom"
-version = "7.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109"
-dependencies = [
- "memchr",
- "minimal-lexical",
- "version_check",
-]
-
 [[package]]
 name = "ntapi"
 version = "0.3.6"
@@ -1111,26 +988,6 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"

-[[package]]
-name = "pin-project"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.7"
@@ -40,13 +40,13 @@ in
 {
  cargo2nixVersion = "0.9.0";
  workspace = {
-    garage_util = rustPackages.unknown.garage_util."0.6.0";
-    garage_rpc = rustPackages.unknown.garage_rpc."0.6.0";
-    garage_table = rustPackages.unknown.garage_table."0.6.0";
-    garage_model = rustPackages.unknown.garage_model."0.6.0";
-    garage_api = rustPackages.unknown.garage_api."0.6.0";
-    garage_web = rustPackages.unknown.garage_web."0.6.0";
-    garage = rustPackages.unknown.garage."0.6.0";
+    garage_util = rustPackages.unknown.garage_util."0.5.1";
+    garage_rpc = rustPackages.unknown.garage_rpc."0.5.1";
+    garage_table = rustPackages.unknown.garage_table."0.5.1";
+    garage_model = rustPackages.unknown.garage_model."0.5.1";
+    garage_api = rustPackages.unknown.garage_api."0.5.1";
+    garage_web = rustPackages.unknown.garage_web."0.5.1";
+    garage = rustPackages.unknown.garage."0.5.1";
  };
  "registry+https://github.com/rust-lang/crates.io-index".aho-corasick."0.7.18" = overridableMkRustCrate (profileName: rec {
    name = "aho-corasick";
@@ -253,7 +253,7 @@ in
    registry = "registry+https://github.com/rust-lang/crates.io-index";
    src = fetchCratesIo { inherit name version; sha256 = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"; };
    dependencies = {
-      ${ if hostPlatform.parsed.cpu.name == "aarch64" && hostPlatform.parsed.kernel.name == "linux" || hostPlatform.config == "aarch64-apple-darwin" then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.103" { inherit profileName; };
+      ${ if hostPlatform.config == "aarch64-apple-darwin" || hostPlatform.parsed.cpu.name == "aarch64" && hostPlatform.parsed.kernel.name == "linux" then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.103" { inherit profileName; };
    };
  });
  
@@ -613,9 +613,9 @@ in
    };
  });
  
-  "unknown".garage."0.6.0" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage."0.5.1" = overridableMkRustCrate (profileName: rec {
    name = "garage";
-    version = "0.6.0";
+    version = "0.5.1";
    registry = "unknown";
    src = fetchCrateLocal (workspaceSrc + "/src/garage");
    dependencies = {
@@ -623,12 +623,12 @@ in
      bytes = rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytes."1.1.0" { inherit profileName; };
      futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; };
      futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.17" { inherit profileName; };
-      garage_api = rustPackages."unknown".garage_api."0.6.0" { inherit profileName; };
-      garage_model = rustPackages."unknown".garage_model."0.6.0" { inherit profileName; };
-      garage_rpc = rustPackages."unknown".garage_rpc."0.6.0" { inherit profileName; };
-      garage_table = rustPackages."unknown".garage_table."0.6.0" { inherit profileName; };
-      garage_util = rustPackages."unknown".garage_util."0.6.0" { inherit profileName; };
-      garage_web = rustPackages."unknown".garage_web."0.6.0" { inherit profileName; };
+      garage_api = rustPackages."unknown".garage_api."0.5.1" { inherit profileName; };
+      garage_model = rustPackages."unknown".garage_model."0.5.1" { inherit profileName; };
+      garage_rpc = rustPackages."unknown".garage_rpc."0.5.1" { inherit profileName; };
+      garage_table = rustPackages."unknown".garage_table."0.5.1" { inherit profileName; };
+      garage_util = rustPackages."unknown".garage_util."0.5.1" { inherit profileName; };
+      garage_web = rustPackages."unknown".garage_web."0.5.1" { inherit profileName; };
      git_version = rustPackages."registry+https://github.com/rust-lang/crates.io-index".git-version."0.3.5" { inherit profileName; };
      hex = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; };
      sodiumoxide = rustPackages."registry+https://github.com/rust-lang/crates.io-index".kuska-sodiumoxide."0.2.5-0" { inherit profileName; };
@@ -638,7 +638,6 @@ in
      rand = rustPackages."registry+https://github.com/rust-lang/crates.io-index".rand."0.8.4" { inherit profileName; };
      rmp_serde = rustPackages."registry+https://github.com/rust-lang/crates.io-index".rmp-serde."0.15.5" { inherit profileName; };
      serde = rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde."1.0.130" { inherit profileName; };
-      serde_bytes = rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde_bytes."0.11.5" { inherit profileName; };
      sled = rustPackages."registry+https://github.com/rust-lang/crates.io-index".sled."0.34.7" { inherit profileName; };
      structopt = rustPackages."registry+https://github.com/rust-lang/crates.io-index".structopt."0.3.23" { inherit profileName; };
      tokio = rustPackages."registry+https://github.com/rust-lang/crates.io-index".tokio."1.12.0" { inherit profileName; };
@@ -646,9 +645,9 @@ in
    };
  });
  
-  "unknown".garage_api."0.6.0" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_api."0.5.1" = overridableMkRustCrate (profileName: rec {
    name = "garage_api";
-    version = "0.6.0";
+    version = "0.5.1";
    registry = "unknown";
    src = fetchCrateLocal (workspaceSrc + "/src/api");
    dependencies = {
@@ -659,9 +658,9 @@ in
      err_derive = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.0" { profileName = "__noProfile"; };
      futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; };
      futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.17" { inherit profileName; };
-      garage_model = rustPackages."unknown".garage_model."0.6.0" { inherit profileName; };
-      garage_table = rustPackages."unknown".garage_table."0.6.0" { inherit profileName; };
-      garage_util = rustPackages."unknown".garage_util."0.6.0" { inherit profileName; };
+      garage_model = rustPackages."unknown".garage_model."0.5.1" { inherit profileName; };
+      garage_table = rustPackages."unknown".garage_table."0.5.1" { inherit profileName; };
+      garage_util = rustPackages."unknown".garage_util."0.5.1" { inherit profileName; };
      hex = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; };
      hmac = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hmac."0.10.1" { inherit profileName; };
      http = rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."0.2.5" { inherit profileName; };
@@ -671,60 +670,29 @@ in
      idna = rustPackages."registry+https://github.com/rust-lang/crates.io-index".idna."0.2.3" { inherit profileName; };
      log = rustPackages."registry+https://github.com/rust-lang/crates.io-index".log."0.4.14" { inherit profileName; };
      md5 = rustPackages."registry+https://github.com/rust-lang/crates.io-index".md-5."0.9.1" { inherit profileName; };
-      nom = rustPackages."registry+https://github.com/rust-lang/crates.io-index".nom."7.1.0" { inherit profileName; };
      percent_encoding = rustPackages."registry+https://github.com/rust-lang/crates.io-index".percent-encoding."2.1.0" { inherit profileName; };
-      pin_project = rustPackages."registry+https://github.com/rust-lang/crates.io-index".pin-project."1.0.8" { inherit profileName; };
      quick_xml = rustPackages."registry+https://github.com/rust-lang/crates.io-index".quick-xml."0.21.0" { inherit profileName; };
      roxmltree = rustPackages."registry+https://github.com/rust-lang/crates.io-index".roxmltree."0.14.1" { inherit profileName; };
      serde = rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde."1.0.130" { inherit profileName; };
-      serde_bytes = rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde_bytes."0.11.5" { inherit profileName; };
      sha2 = rustPackages."registry+https://github.com/rust-lang/crates.io-index".sha2."0.9.8" { inherit profileName; };
      tokio = rustPackages."registry+https://github.com/rust-lang/crates.io-index".tokio."1.12.0" { inherit profileName; };
      url = rustPackages."registry+https://github.com/rust-lang/crates.io-index".url."2.2.2" { inherit profileName; };
    };
  });
  
-  "registry+https://github.com/rust-lang/crates.io-index".garage_model."0.5.1" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_model."0.5.1" = overridableMkRustCrate (profileName: rec {
    name = "garage_model";
    version = "0.5.1";
-    registry = "registry+https://github.com/rust-lang/crates.io-index";
-    src = fetchCratesIo { inherit name version; sha256 = "584619e8999713d73761775591ad6f01ff8c9d724f3b20984f5932f1fc7f9988"; };
-    dependencies = {
-      arc_swap = rustPackages."registry+https://github.com/rust-lang/crates.io-index".arc-swap."1.4.0" { inherit profileName; };
-      async_trait = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".async-trait."0.1.51" { profileName = "__noProfile"; };
-      futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; };
-      futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.17" { inherit profileName; };
-      garage_rpc = rustPackages."registry+https://github.com/rust-lang/crates.io-index".garage_rpc."0.5.1" { inherit profileName; };
-      garage_table = rustPackages."registry+https://github.com/rust-lang/crates.io-index".garage_table."0.5.1" { inherit profileName; };
-      garage_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".garage_util."0.5.1" { inherit profileName; };
-      hex = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; };
-      log = rustPackages."registry+https://github.com/rust-lang/crates.io-index".log."0.4.14" { inherit profileName; };
-      netapp = rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.3.0" { inherit profileName; };
-      rand = rustPackages."registry+https://github.com/rust-lang/crates.io-index".rand."0.8.4" { inherit profileName; };
-      rmp_serde = rustPackages."registry+https://github.com/rust-lang/crates.io-index".rmp-serde."0.15.5" { inherit profileName; };
-      serde = rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde."1.0.130" { inherit profileName; };
-      serde_bytes = rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde_bytes."0.11.5" { inherit profileName; };
-      sled = rustPackages."registry+https://github.com/rust-lang/crates.io-index".sled."0.34.7" { inherit profileName; };
-      tokio = rustPackages."registry+https://github.com/rust-lang/crates.io-index".tokio."1.12.0" { inherit profileName; };
-      zstd = rustPackages."registry+https://github.com/rust-lang/crates.io-index".zstd."0.9.0+zstd.1.5.0" { inherit profileName; };
-    };
-  });
-  
-  "unknown".garage_model."0.6.0" = overridableMkRustCrate (profileName: rec {
-    name = "garage_model";
-    version = "0.6.0";
    registry = "unknown";
    src = fetchCrateLocal (workspaceSrc + "/src/model");
    dependencies = {
      arc_swap = rustPackages."registry+https://github.com/rust-lang/crates.io-index".arc-swap."1.4.0" { inherit profileName; };
      async_trait = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".async-trait."0.1.51" { profileName = "__noProfile"; };
-      err_derive = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.0" { profileName = "__noProfile"; };
      futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; };
      futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.17" { inherit profileName; };
-      garage_model_050 = rustPackages."registry+https://github.com/rust-lang/crates.io-index".garage_model."0.5.1" { inherit profileName; };
-      garage_rpc = rustPackages."unknown".garage_rpc."0.6.0" { inherit profileName; };
-      garage_table = rustPackages."unknown".garage_table."0.6.0" { inherit profileName; };
-      garage_util = rustPackages."unknown".garage_util."0.6.0" { inherit profileName; };
+      garage_rpc = rustPackages."unknown".garage_rpc."0.5.1" { inherit profileName; };
+      garage_table = rustPackages."unknown".garage_table."0.5.1" { inherit profileName; };
+      garage_util = rustPackages."unknown".garage_util."0.5.1" { inherit profileName; };
      hex = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; };
      log = rustPackages."registry+https://github.com/rust-lang/crates.io-index".log."0.4.14" { inherit profileName; };
      netapp = rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.3.0" { inherit profileName; };
@@ -738,37 +706,9 @@ in
    };
  });
  
-  "registry+https://github.com/rust-lang/crates.io-index".garage_rpc."0.5.1" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_rpc."0.5.1" = overridableMkRustCrate (profileName: rec {
    name = "garage_rpc";
    version = "0.5.1";
-    registry = "registry+https://github.com/rust-lang/crates.io-index";
-    src = fetchCratesIo { inherit name version; sha256 = "81e693aa4582cfe7a7ce70c07880e3662544b5d0cd68bc4b59c53febfbb8d1ec"; };
-    dependencies = {
-      arc_swap = rustPackages."registry+https://github.com/rust-lang/crates.io-index".arc-swap."1.4.0" { inherit profileName; };
-      async_trait = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".async-trait."0.1.51" { profileName = "__noProfile"; };
-      bytes = rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytes."1.1.0" { inherit profileName; };
-      futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; };
-      futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.17" { inherit profileName; };
-      garage_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".garage_util."0.5.1" { inherit profileName; };
-      gethostname = rustPackages."registry+https://github.com/rust-lang/crates.io-index".gethostname."0.2.1" { inherit profileName; };
-      hex = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; };
-      hyper = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hyper."0.14.13" { inherit profileName; };
-      sodiumoxide = rustPackages."registry+https://github.com/rust-lang/crates.io-index".kuska-sodiumoxide."0.2.5-0" { inherit profileName; };
-      log = rustPackages."registry+https://github.com/rust-lang/crates.io-index".log."0.4.14" { inherit profileName; };
-      netapp = rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.3.0" { inherit profileName; };
-      rand = rustPackages."registry+https://github.com/rust-lang/crates.io-index".rand."0.8.4" { inherit profileName; };
-      rmp_serde = rustPackages."registry+https://github.com/rust-lang/crates.io-index".rmp-serde."0.15.5" { inherit profileName; };
-      serde = rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde."1.0.130" { inherit profileName; };
-      serde_bytes = rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde_bytes."0.11.5" { inherit profileName; };
-      serde_json = rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde_json."1.0.68" { inherit profileName; };
-      tokio = rustPackages."registry+https://github.com/rust-lang/crates.io-index".tokio."1.12.0" { inherit profileName; };
-      tokio_stream = rustPackages."registry+https://github.com/rust-lang/crates.io-index".tokio-stream."0.1.7" { inherit profileName; };
-    };
-  });
-  
-  "unknown".garage_rpc."0.6.0" = overridableMkRustCrate (profileName: rec {
-    name = "garage_rpc";
-    version = "0.6.0";
    registry = "unknown";
    src = fetchCrateLocal (workspaceSrc + "/src/rpc");
    dependencies = {
@@ -777,7 +717,7 @@ in
      bytes = rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytes."1.1.0" { inherit profileName; };
      futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; };
      futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.17" { inherit profileName; };
-      garage_util = rustPackages."unknown".garage_util."0.6.0" { inherit profileName; };
+      garage_util = rustPackages."unknown".garage_util."0.5.1" { inherit profileName; };
      gethostname = rustPackages."registry+https://github.com/rust-lang/crates.io-index".gethostname."0.2.1" { inherit profileName; };
      hex = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; };
      hyper = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hyper."0.14.13" { inherit profileName; };
@@ -794,32 +734,9 @@ in
    };
  });
  
-  "registry+https://github.com/rust-lang/crates.io-index".garage_table."0.5.1" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_table."0.5.1" = overridableMkRustCrate (profileName: rec {
    name = "garage_table";
    version = "0.5.1";
-    registry = "registry+https://github.com/rust-lang/crates.io-index";
-    src = fetchCratesIo { inherit name version; sha256 = "5c3557f3757e2acd29eaee86804d4e6c38d2abda81b4b349d8a0d2277044265c"; };
-    dependencies = {
-      async_trait = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".async-trait."0.1.51" { profileName = "__noProfile"; };
-      bytes = rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytes."1.1.0" { inherit profileName; };
-      futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; };
-      futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.17" { inherit profileName; };
-      garage_rpc = rustPackages."registry+https://github.com/rust-lang/crates.io-index".garage_rpc."0.5.1" { inherit profileName; };
-      garage_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".garage_util."0.5.1" { inherit profileName; };
-      hexdump = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hexdump."0.1.1" { inherit profileName; };
-      log = rustPackages."registry+https://github.com/rust-lang/crates.io-index".log."0.4.14" { inherit profileName; };
-      rand = rustPackages."registry+https://github.com/rust-lang/crates.io-index".rand."0.8.4" { inherit profileName; };
-      rmp_serde = rustPackages."registry+https://github.com/rust-lang/crates.io-index".rmp-serde."0.15.5" { inherit profileName; };
-      serde = rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde."1.0.130" { inherit profileName; };
-      serde_bytes = rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde_bytes."0.11.5" { inherit profileName; };
-      sled = rustPackages."registry+https://github.com/rust-lang/crates.io-index".sled."0.34.7" { inherit profileName; };
-      tokio = rustPackages."registry+https://github.com/rust-lang/crates.io-index".tokio."1.12.0" { inherit profileName; };
-    };
-  });
-  
-  "unknown".garage_table."0.6.0" = overridableMkRustCrate (profileName: rec {
-    name = "garage_table";
-    version = "0.6.0";
    registry = "unknown";
    src = fetchCrateLocal (workspaceSrc + "/src/table");
    dependencies = {
@@ -827,8 +744,8 @@ in
      bytes = rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytes."1.1.0" { inherit profileName; };
      futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; };
      futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.17" { inherit profileName; };
-      garage_rpc = rustPackages."unknown".garage_rpc."0.6.0" { inherit profileName; };
-      garage_util = rustPackages."unknown".garage_util."0.6.0" { inherit profileName; };
+      garage_rpc = rustPackages."unknown".garage_rpc."0.5.1" { inherit profileName; };
+      garage_util = rustPackages."unknown".garage_util."0.5.1" { inherit profileName; };
      hexdump = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hexdump."0.1.1" { inherit profileName; };
      log = rustPackages."registry+https://github.com/rust-lang/crates.io-index".log."0.4.14" { inherit profileName; };
      rand = rustPackages."registry+https://github.com/rust-lang/crates.io-index".rand."0.8.4" { inherit profileName; };
@@ -840,36 +757,9 @@ in
    };
  });
  
-  "registry+https://github.com/rust-lang/crates.io-index".garage_util."0.5.1" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_util."0.5.1" = overridableMkRustCrate (profileName: rec {
    name = "garage_util";
    version = "0.5.1";
-    registry = "registry+https://github.com/rust-lang/crates.io-index";
-    src = fetchCratesIo { inherit name version; sha256 = "1e096994382447431e2f3c70e3685eb8b24c00eceff8667bb22a2a27ff17832f"; };
-    dependencies = {
-      blake2 = rustPackages."registry+https://github.com/rust-lang/crates.io-index".blake2."0.9.2" { inherit profileName; };
-      chrono = rustPackages."registry+https://github.com/rust-lang/crates.io-index".chrono."0.4.19" { inherit profileName; };
-      err_derive = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.0" { profileName = "__noProfile"; };
-      futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; };
-      hex = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; };
-      http = rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."0.2.5" { inherit profileName; };
-      hyper = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hyper."0.14.13" { inherit profileName; };
-      log = rustPackages."registry+https://github.com/rust-lang/crates.io-index".log."0.4.14" { inherit profileName; };
-      netapp = rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.3.0" { inherit profileName; };
-      rand = rustPackages."registry+https://github.com/rust-lang/crates.io-index".rand."0.8.4" { inherit profileName; };
-      rmp_serde = rustPackages."registry+https://github.com/rust-lang/crates.io-index".rmp-serde."0.15.5" { inherit profileName; };
-      serde = rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde."1.0.130" { inherit profileName; };
-      serde_json = rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde_json."1.0.68" { inherit profileName; };
-      sha2 = rustPackages."registry+https://github.com/rust-lang/crates.io-index".sha2."0.9.8" { inherit profileName; };
-      sled = rustPackages."registry+https://github.com/rust-lang/crates.io-index".sled."0.34.7" { inherit profileName; };
-      tokio = rustPackages."registry+https://github.com/rust-lang/crates.io-index".tokio."1.12.0" { inherit profileName; };
-      toml = rustPackages."registry+https://github.com/rust-lang/crates.io-index".toml."0.5.8" { inherit profileName; };
-      xxhash_rust = rustPackages."registry+https://github.com/rust-lang/crates.io-index".xxhash-rust."0.8.2" { inherit profileName; };
-    };
-  });
-  
-  "unknown".garage_util."0.6.0" = overridableMkRustCrate (profileName: rec {
-    name = "garage_util";
-    version = "0.6.0";
    registry = "unknown";
    src = fetchCrateLocal (workspaceSrc + "/src/util");
    dependencies = {
@@ -894,18 +784,18 @@ in
    };
  });
  
-  "unknown".garage_web."0.6.0" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_web."0.5.1" = overridableMkRustCrate (profileName: rec {
    name = "garage_web";
-    version = "0.6.0";
+    version = "0.5.1";
    registry = "unknown";
    src = fetchCrateLocal (workspaceSrc + "/src/web");
    dependencies = {
      err_derive = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.0" { profileName = "__noProfile"; };
      futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; };
-      garage_api = rustPackages."unknown".garage_api."0.6.0" { inherit profileName; };
-      garage_model = rustPackages."unknown".garage_model."0.6.0" { inherit profileName; };
-      garage_table = rustPackages."unknown".garage_table."0.6.0" { inherit profileName; };
-      garage_util = rustPackages."unknown".garage_util."0.6.0" { inherit profileName; };
+      garage_api = rustPackages."unknown".garage_api."0.5.1" { inherit profileName; };
+      garage_model = rustPackages."unknown".garage_model."0.5.1" { inherit profileName; };
+      garage_table = rustPackages."unknown".garage_table."0.5.1" { inherit profileName; };
+      garage_util = rustPackages."unknown".garage_util."0.5.1" { inherit profileName; };
      http = rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."0.2.5" { inherit profileName; };
      hyper = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hyper."0.14.13" { inherit profileName; };
      log = rustPackages."registry+https://github.com/rust-lang/crates.io-index".log."0.4.14" { inherit profileName; };
@@ -1323,16 +1213,6 @@ in
    };
  });
  
-  "registry+https://github.com/rust-lang/crates.io-index".minimal-lexical."0.2.1" = overridableMkRustCrate (profileName: rec {
-    name = "minimal-lexical";
-    version = "0.2.1";
-    registry = "registry+https://github.com/rust-lang/crates.io-index";
-    src = fetchCratesIo { inherit name version; sha256 = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"; };
-    features = builtins.concatLists [
-      [ "std" ]
-    ];
-  });
-  
  "registry+https://github.com/rust-lang/crates.io-index".mio."0.7.13" = overridableMkRustCrate (profileName: rec {
    name = "mio";
    version = "0.7.13";
@@ -1393,25 +1273,6 @@ in
    };
  });
  
-  "registry+https://github.com/rust-lang/crates.io-index".nom."7.1.0" = overridableMkRustCrate (profileName: rec {
-    name = "nom";
-    version = "7.1.0";
-    registry = "registry+https://github.com/rust-lang/crates.io-index";
-    src = fetchCratesIo { inherit name version; sha256 = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109"; };
-    features = builtins.concatLists [
-      [ "alloc" ]
-      [ "default" ]
-      [ "std" ]
-    ];
-    dependencies = {
-      memchr = rustPackages."registry+https://github.com/rust-lang/crates.io-index".memchr."2.4.1" { inherit profileName; };
-      minimal_lexical = rustPackages."registry+https://github.com/rust-lang/crates.io-index".minimal-lexical."0.2.1" { inherit profileName; };
-    };
-    buildDependencies = {
-      version_check = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".version_check."0.9.3" { profileName = "__noProfile"; };
-    };
-  });
-  
  "registry+https://github.com/rust-lang/crates.io-index".ntapi."0.3.6" = overridableMkRustCrate (profileName: rec {
    name = "ntapi";
    version = "0.3.6";
@@ -1521,28 +1382,6 @@ in
    src = fetchCratesIo { inherit name version; sha256 = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"; };
  });
  
-  "registry+https://github.com/rust-lang/crates.io-index".pin-project."1.0.8" = overridableMkRustCrate (profileName: rec {
-    name = "pin-project";
-    version = "1.0.8";
-    registry = "registry+https://github.com/rust-lang/crates.io-index";
-    src = fetchCratesIo { inherit name version; sha256 = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08"; };
-    dependencies = {
-      pin_project_internal = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".pin-project-internal."1.0.8" { profileName = "__noProfile"; };
-    };
-  });
-  
-  "registry+https://github.com/rust-lang/crates.io-index".pin-project-internal."1.0.8" = overridableMkRustCrate (profileName: rec {
-    name = "pin-project-internal";
-    version = "1.0.8";
-    registry = "registry+https://github.com/rust-lang/crates.io-index";
-    src = fetchCratesIo { inherit name version; sha256 = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389"; };
-    dependencies = {
-      proc_macro2 = rustPackages."registry+https://github.com/rust-lang/crates.io-index".proc-macro2."1.0.30" { inherit profileName; };
-      quote = rustPackages."registry+https://github.com/rust-lang/crates.io-index".quote."1.0.10" { inherit profileName; };
-      syn = rustPackages."registry+https://github.com/rust-lang/crates.io-index".syn."1.0.80" { inherit profileName; };
-    };
-  });
-  
  "registry+https://github.com/rust-lang/crates.io-index".pin-project-lite."0.2.7" = overridableMkRustCrate (profileName: rec {
    name = "pin-project-lite";
    version = "0.2.7";
@@ -24,11 +24,6 @@ in let
  rustChannel = pkgs.rustPlatform.rust;

  overrides = pkgs.buildPackages.rustBuilder.overrides.all ++ [
-    /*
-     We want to inject the git version while keeping the build deterministic.
-     As we do not want to consider the .git folder as part of the input source,
-     we ask the user (the CI often) to pass the value to Nix.
-    */
    (pkgs.rustBuilder.rustLib.makeOverride {
      name = "garage";
      overrideAttrs = drv: if git_version != null then {
@@ -38,21 +33,6 @@ in let
        '';
      } else {};
    })
-
-    /*
-     On a sandbox pure NixOS environment, /usr/bin/file is not available.
-     This is a known problem: https://github.com/NixOS/nixpkgs/issues/98440
-     We simply patch the file as suggested
-    */
-    /*(pkgs.rustBuilder.rustLib.makeOverride {
-      name = "libsodium-sys";
-      overrideAttrs = drv: {
-        preConfigure = ''
-          ${drv.preConfigure or ""}
-          sed -i 's,/usr/bin/file,${file}/bin/file,g' ./configure
-        '';
-      }
-    })*/
  ];

  packageFun = import ./Cargo.nix;
@@ -76,7 +56,7 @@ in let
       */
       ''^(src|tests)''          # fixed default
       ''.*\.(rs|toml)$''        # fixed default
-       ''^(crdt|replication|cli|helper|signature)''   # our crate submodules
+       ''^(crdt|replication|cli)''   # our crate submodules
    ];
  };

@@ -44,6 +44,5 @@
 - [Working Documents](./working_documents/index.md)
  - [S3 compatibility target](./working_documents/compatibility_target.md)
  - [Load balancing data](./working_documents/load_balancing.md)
-  - [Migrating from 0.5 to 0.6](./working_documents/migration_06.md)
  - [Migrating from 0.3 to 0.4](./working_documents/migration_04.md)
  - [Design draft](./working_documents/design_draft.md)
@@ -9,8 +9,7 @@ Implemented:
 - putting and getting objects in buckets
 - multipart uploads
 - listing objects
- access control on a per-access-key-per-bucket basis
- CORS headers on web endpoint
+- access control on a per-key-per-bucket basis

 Not implemented:

@@ -22,43 +21,43 @@ Not implemented:

 ## Endpoint implementation

-All APIs that are not mentionned are not implemented and will return a 501 Not Implemented.
+All APIs that are not mentionned are not implemented and will return a 400 bad request.

 | Endpoint                     | Status                           |
 |------------------------------|----------------------------------|
 | AbortMultipartUpload         | Implemented                      |
 | CompleteMultipartUpload      | Implemented                      |
 | CopyObject                   | Implemented                      |
-| CreateBucket                 | Implemented                      |
+| CreateBucket                 | Unsupported, stub (see below)    |
 | CreateMultipartUpload        | Implemented                      |
-| DeleteBucket                 | Implemented                      |
-| DeleteBucketCors             | Implemented                      |
+| DeleteBucket                 | Unsupported (see below)          |
 | DeleteBucketWebsite          | Implemented                      |
 | DeleteObject                 | Implemented                      |
 | DeleteObjects                | Implemented                      |
-| GetBucketCors                | Implemented                      |
 | GetBucketLocation            | Implemented                      |
 | GetBucketVersioning          | Stub (see below)                 |
-| GetBucketWebsite             | Implemented                      |
+| GetBucketWebsite             | Unsupported                      |
 | GetObject                    | Implemented                      |
 | HeadBucket                   | Implemented                      |
 | HeadObject                   | Implemented                      |
 | ListBuckets                  | Implemented                      |
 | ListObjects                  | Implemented, bugs? (see below)   |
 | ListObjectsV2                | Implemented                      |
-| ListMultipartUpload          | Implemented                      |
-| ListParts                    | Implemented                      |
 | PutObject                    | Implemented                      |
-| PutBucketCors                | Implemented                      |
 | PutBucketWebsite             | Partially implemented (see below)|
 | UploadPart                   | Implemented                      |
-| UploadPartCopy               | Implemented                      |


+
+- **CreateBucket:** Garage does not yet accept creating buckets or giving access using API calls, it has to be done using the CLI tools. CreateBucket will return a 200 if the bucket exists and user has write access, and a 403 Forbidden in all other cases.
+
+- **DeleteBucket:** Garage does not yet accept deleting buckets using API calls, it has to be done using the CLI tools. This request will return a 403 Forbidden.
+
 - **GetBucketVersioning:** Stub implementation (Garage does not yet support versionning so this always returns
 "versionning not enabled").

 - **ListObjects:** Implemented, but there isn't a very good specification of what `encoding-type=url` covers so there might be some encoding bugs. In our implementation the url-encoded fields are in the same in ListObjects as they are in ListObjectsV2.

- **PutBucketWebsite:** Implemented, but only stores the index document suffix and the error document path. Redirects are not supported.
+- **PutBucketWebsite:** Implemented, but only store if website is enabled, not more complexe informations.

+- **GetBucketWebsite:** Not implemented yet, will be when PubBucketWebsite store more informations.
@@ -9,8 +9,8 @@ your motivations for doing so in the PR message.
 | **S-tier** (high priority) | |
 | 							 | HeadBucket |
 | 							 | GetBucketLocation |
-| 							 | CreateBucket |
-| 							 | DeleteBucket |
+| 							 | [*CreateBucket*](https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/97) |
+| 							 | [*DeleteBucket*](https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/97) |
 | 							 | ListBuckets |
 | 							 | ListObjects |
 | 							 | ListObjectsV2 |
@@ -26,13 +26,13 @@ your motivations for doing so in the PR message.
 | 							 | UploadPart |
 | 							 | [*ListMultipartUploads*](https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/103) |
 | 							 | [*ListParts*](https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/103) |
-| **A-tier**                 | |
-| 							 | GetBucketCors |
-| 							 | PutBucketCors |
-| 							 | DeleteBucketCors |
-| 							 | UploadPartCopy |
-| 							 | GetBucketWebsite |
-| 							 | PutBucketWebsite |
+| **A-tier** (will implement)     | |
+| 							 | [*GetBucketCors*](https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/138) |
+| 							 | [*PutBucketCors*](https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/138) |
+| 							 | [*DeleteBucketCors*](https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/138) |
+| 							 | [*UploadPartCopy*](https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/160) |
+| 							 | [*GetBucketWebsite*](https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/77) |
+| 							 | [*PutBucketWebsite*](https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/77) |
 | 							 | DeleteBucketWebsite |
 | ~~~~~~~~~~~~~~~~~~~~~~~~~~ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
 | **B-tier** | |
@@ -1,46 +0,0 @@
-# Migrating from 0.5 to 0.6
-
-**This guide explains how to migrate to 0.6 if you have an existing 0.5 cluster.
-We don't recommend trying to migrate directly from 0.4 or older to 0.6.**
-
-**We make no guarantee that this migration will work perfectly:
-back up all your data before attempting it!**
-
-Garage v0.6 (not yet released) introduces a new data model for buckets,
-that allows buckets to have many names (aliases).
-Buckets can also have "private" aliases (called local aliases),
-which are only visible when using a certain access key.
-
-This new data model means that the metadata tables have changed quite a bit in structure,
-and a manual migration step is required.
-
-The migration steps are as follows:
-
-1. Disable api and web access for some time (Garage does not support disabling
-   these endpoints but you can change the port number or stop your reverse
-   proxy for instance).
-
-2. Do `garage repair -a --yes tables` and `garage repair -a --yes blocks`,
-   check the logs and check that all data seems to be synced correctly between
-   nodes.
-
-4. Turn off Garage 0.5
-
-5. **Backup your metadata folders!!**
-
-6. Turn on Garage 0.6
-
-7. At this point, `garage bucket list` should indicate that no buckets are present
-   in the cluster. `garage key list` should show all of the previously existing
-   access key, however these keys should not have any permissions to access buckets.
-
-8. Run `garage migrate buckets050`: this will populate the new bucket table with
-   the buckets that existed previously. This will also give access to API keys
-   as it was before.
-
-9. Check that all your buckets indeed appear in `garage bucket list`, and that
-   keys have the proper access flags set. If that is not the case, revert
-   everything and file a bug!
-
-10. Your upgraded cluster should be in a working state. Re-enable API and Web
-    access and check that everything went well.
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 set -ex

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 set -ex

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 set -e

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 set -ex

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 export AWS_ACCESS_KEY_ID=`cat /tmp/garage.s3 |cut -d' ' -f1`
 export AWS_SECRET_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2`
 export AWS_DEFAULT_REGION='garage'
@@ -8,7 +8,7 @@ cat > /tmp/garage.mc/config.json <<EOF
  "version": "10",
  "aliases": {
    "garage": {
-      "url": "http://127.0.0.1:3911",
+      "url": "https://localhost:4443",
      "accessKey": "$ACCESS_KEY",
      "secretKey": "$SECRET_KEY",
      "api": "S3v4",
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 set -ex

@@ -10,7 +10,6 @@ GARAGE_DEBUG="${REPO_FOLDER}/target/debug/"
 GARAGE_RELEASE="${REPO_FOLDER}/target/release/"
 NIX_RELEASE="${REPO_FOLDER}/result/bin/"
 PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:${NIX_RELEASE}:$PATH"
-CMDOUT=/tmp/garage.cmd.tmp

 # @FIXME Duck is not ready for testing, we have a bug
 SKIP_DUCK=1
@@ -116,247 +115,21 @@ if [ -z "$SKIP_DUCK" ]; then
  done
 fi

-# Advanced testing via S3API
-if [ -z "$SKIP_AWS" ]; then
-  echo "🔌 Test S3API"
-
-  echo "Test Objects"
-  aws s3api put-object --bucket eprouvette --key a
-  aws s3api put-object --bucket eprouvette --key a/a
-  aws s3api put-object --bucket eprouvette --key a/b
-  aws s3api put-object --bucket eprouvette --key a/c
-  aws s3api put-object --bucket eprouvette --key a/d/a
-  aws s3api put-object --bucket eprouvette --key a/é
-  aws s3api put-object --bucket eprouvette --key b
-  aws s3api put-object --bucket eprouvette --key c
-
-
-  aws s3api list-objects-v2 --bucket eprouvette >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 8 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 0 ]
-  aws s3api list-objects-v2 --bucket eprouvette --page-size 0 >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 8 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 0 ]
-  aws s3api list-objects-v2 --bucket eprouvette --page-size 999999999 >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 8 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 0 ]
-  aws s3api list-objects-v2 --bucket eprouvette --page-size 1 >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 8 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 0 ]
-  aws s3api list-objects-v2 --bucket eprouvette --delimiter '/' >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 3 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 1 ]
-  aws s3api list-objects-v2 --bucket eprouvette --delimiter '/' --page-size 1 >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 3 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 1 ]
-  aws s3api list-objects-v2 --bucket eprouvette --prefix 'a/' >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 5 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 0 ]
-  aws s3api list-objects-v2 --bucket eprouvette --prefix 'a/' --delimiter '/' >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 4 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 1 ]
-  aws s3api list-objects-v2 --bucket eprouvette --prefix 'a/' --page-size 1 >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 5 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 0 ]
-  aws s3api list-objects-v2 --bucket eprouvette --prefix 'a/' --delimiter '/' --page-size 1 >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 4 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 1 ]
-  aws s3api list-objects-v2 --bucket eprouvette --start-after 'Z' >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 8 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 0 ]
-  aws s3api list-objects-v2 --bucket eprouvette --start-after 'c' >$CMDOUT
-  ! [ -s $CMDOUT ]
-
-
-  aws s3api list-objects --bucket eprouvette >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 8 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 0 ]
-  aws s3api list-objects --bucket eprouvette --page-size 1 >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 8 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 0 ]
-  aws s3api list-objects --bucket eprouvette --delimiter '/' >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 3 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 1 ]
-  # @FIXME it does not work as expected but might be a limitation of aws s3api
-  # The problem is the conjunction of a delimiter + pagination + v1 of listobjects
-  #aws s3api list-objects --bucket eprouvette --delimiter '/' --page-size 1 >$CMDOUT
-  #[ $(jq '.Contents | length' $CMDOUT) == 3 ]
-  #[ $(jq '.CommonPrefixes | length' $CMDOUT) == 1 ]
-  aws s3api list-objects --bucket eprouvette --prefix 'a/' >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 5 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 0 ]
-  aws s3api list-objects --bucket eprouvette --prefix 'a/' --delimiter '/' >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 4 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 1 ]
-  aws s3api list-objects --bucket eprouvette --prefix 'a/' --page-size 1 >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 5 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 0 ]
-  # @FIXME idem
-  #aws s3api list-objects --bucket eprouvette --prefix 'a/' --delimiter '/' --page-size 1 >$CMDOUT
-  #[ $(jq '.Contents | length' $CMDOUT) == 4 ]
-  #[ $(jq '.CommonPrefixes | length' $CMDOUT) == 1 ]
-  aws s3api list-objects --bucket eprouvette --starting-token 'Z' >$CMDOUT
-  [ $(jq '.Contents | length' $CMDOUT) == 8 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 0 ]
-  aws s3api list-objects --bucket eprouvette --starting-token 'c' >$CMDOUT
-  ! [ -s $CMDOUT ]
-
-  aws s3api list-objects-v2 --bucket eprouvette | \
-    jq -c '. | {Objects: [.Contents[] | {Key: .Key}], Quiet: true}' | \
-    aws s3api delete-objects --bucket eprouvette --delete file:///dev/stdin
-
-
-  echo "Test Multipart Upload"
-  aws s3api create-multipart-upload --bucket eprouvette --key a
-  aws s3api create-multipart-upload --bucket eprouvette --key a
-  aws s3api create-multipart-upload --bucket eprouvette --key c
-  aws s3api create-multipart-upload --bucket eprouvette --key c/a
-  aws s3api create-multipart-upload --bucket eprouvette --key c/b
-
-  aws s3api list-multipart-uploads --bucket eprouvette >$CMDOUT
-  [ $(jq '.Uploads | length' $CMDOUT) == 5 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 0 ]
-  aws s3api list-multipart-uploads --bucket eprouvette --page-size 1 >$CMDOUT
-  [ $(jq '.Uploads | length' $CMDOUT) == 5 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 0 ]
-  aws s3api list-multipart-uploads --bucket eprouvette --delimiter '/' >$CMDOUT
-  [ $(jq '.Uploads | length' $CMDOUT) == 3 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 1 ]
-  aws s3api list-multipart-uploads --bucket eprouvette --delimiter '/' --page-size 1 >$CMDOUT
-  [ $(jq '.Uploads | length' $CMDOUT) == 3 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 1 ]
-  aws s3api list-multipart-uploads --bucket eprouvette --prefix 'c' >$CMDOUT
-  [ $(jq '.Uploads | length' $CMDOUT) == 3 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 0 ]
-  aws s3api list-multipart-uploads --bucket eprouvette --prefix 'c' --page-size 1 >$CMDOUT
-  [ $(jq '.Uploads | length' $CMDOUT) == 3 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 0 ]
-  aws s3api list-multipart-uploads --bucket eprouvette --prefix 'c' --delimiter '/' >$CMDOUT
-  [ $(jq '.Uploads | length' $CMDOUT) == 1 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 1 ]
-  aws s3api list-multipart-uploads --bucket eprouvette --prefix 'c' --delimiter '/' --page-size 1 >$CMDOUT
-  [ $(jq '.Uploads | length' $CMDOUT) == 1 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 1 ]
-  aws s3api list-multipart-uploads --bucket eprouvette --starting-token 'ZZZZZ' >$CMDOUT
-  [ $(jq '.Uploads | length' $CMDOUT) == 5 ]
-  [ $(jq '.CommonPrefixes | length' $CMDOUT) == 0 ]
-  aws s3api list-multipart-uploads --bucket eprouvette --starting-token 'd' >$CMDOUT
-  ! [ -s $CMDOUT ]
-
-  aws s3api list-multipart-uploads --bucket eprouvette | \
-    jq -r '.Uploads[] | "\(.Key) \(.UploadId)"' | \
-    while read r; do 
-      key=$(echo $r|cut -d' ' -f 1); 
-      uid=$(echo $r|cut -d' ' -f 2); 
-      aws s3api abort-multipart-upload --bucket eprouvette --key $key --upload-id $uid;
-      echo "Deleted ${key}:${uid}"
-    done
-
-  echo "Test for ListParts"
-  UPLOAD_ID=$(aws s3api create-multipart-upload --bucket eprouvette --key list-parts | jq -r .UploadId)
-  aws s3api list-parts --bucket eprouvette --key list-parts --upload-id $UPLOAD_ID >$CMDOUT
-  [ $(jq '.Parts | length' $CMDOUT) == 0 ]
-  [ $(jq -r '.StorageClass' $CMDOUT) == 'STANDARD' ] # check that the result is not empty
-  ETAG1=$(aws s3api upload-part --bucket eprouvette --key list-parts --upload-id $UPLOAD_ID --part-number 1 --body /tmp/garage.2.rnd | jq .ETag)
-  aws s3api list-parts --bucket eprouvette --key list-parts --upload-id $UPLOAD_ID >$CMDOUT
-  [ $(jq '.Parts | length' $CMDOUT) == 1 ]
-  [ $(jq '.Parts[0].PartNumber' $CMDOUT) == 1 ]
-  [ $(jq '.Parts[0].Size' $CMDOUT) == 5242880 ]
-  [ $(jq '.Parts[0].ETag' $CMDOUT) == $ETAG1 ]
-
-  ETAG2=$(aws s3api upload-part --bucket eprouvette --key list-parts --upload-id $UPLOAD_ID --part-number 3 --body /tmp/garage.3.rnd | jq .ETag)
-  ETAG3=$(aws s3api upload-part --bucket eprouvette --key list-parts --upload-id $UPLOAD_ID --part-number 2 --body /tmp/garage.2.rnd | jq .ETag)
-  aws s3api list-parts --bucket eprouvette --key list-parts --upload-id $UPLOAD_ID >$CMDOUT
-  [ $(jq '.Parts | length' $CMDOUT) == 3 ]
-  [ $(jq '.Parts[1].ETag' $CMDOUT) == $ETAG3 ]
-
-  aws s3api list-parts --bucket eprouvette --key list-parts --upload-id $UPLOAD_ID --page-size 1 >$CMDOUT
-  [ $(jq '.Parts | length' $CMDOUT) == 3 ]
-  [ $(jq '.Parts[1].ETag' $CMDOUT) == $ETAG3 ]
-
-  cat >/tmp/garage.multipart_struct <<EOF
-{
-  "Parts": [
-    {
-      "ETag": $ETAG1,
-      "PartNumber": 1
-    },
-    {
-      "ETag": $ETAG3,
-      "PartNumber": 2
-    },
-    {
-      "ETag": $ETAG2,
-      "PartNumber": 3
-    }
-  ]
-}
-EOF
-  aws s3api complete-multipart-upload \
-    --bucket eprouvette --key list-parts --upload-id $UPLOAD_ID \
-    --multipart-upload file:///tmp/garage.multipart_struct
-
-  ! aws s3api list-parts --bucket eprouvette --key list-parts --upload-id $UPLOAD_ID >$CMDOUT
-  aws s3 rm "s3://eprouvette/list-parts"
-
-
-  # @FIXME We do not write tests with --starting-token due to a bug with awscli
-  # See here: https://github.com/aws/aws-cli/issues/6666
-
-  echo "Test for UploadPartCopy"
-  aws s3 cp "/tmp/garage.3.rnd" "s3://eprouvette/copy_part_source"
-  UPLOAD_ID=$(aws s3api create-multipart-upload --bucket eprouvette --key test_multipart | jq -r .UploadId)
-  PART1=$(aws s3api upload-part \
-    --bucket eprouvette --key test_multipart \
-    --upload-id $UPLOAD_ID --part-number 1 \
-    --body /tmp/garage.2.rnd | jq .ETag)
-  PART2=$(aws s3api upload-part-copy \
-    --bucket eprouvette --key test_multipart \
-    --upload-id $UPLOAD_ID --part-number 2 \
-    --copy-source "/eprouvette/copy_part_source" \
-    --copy-source-range "bytes=500-5000500" \
-    | jq .CopyPartResult.ETag)
-  PART3=$(aws s3api upload-part \
-    --bucket eprouvette --key test_multipart \
-    --upload-id $UPLOAD_ID --part-number 3 \
-    --body /tmp/garage.3.rnd | jq .ETag)
-  cat >/tmp/garage.multipart_struct <<EOF
-{
-  "Parts": [
-    {
-      "ETag": $PART1,
-      "PartNumber": 1
-    },
-    {
-      "ETag": $PART2,
-      "PartNumber": 2
-    },
-    {
-      "ETag": $PART3,
-      "PartNumber": 3
-    }
-  ]
-}
-EOF
-  aws s3api complete-multipart-upload \
-    --bucket eprouvette --key test_multipart --upload-id $UPLOAD_ID \
-    --multipart-upload file:///tmp/garage.multipart_struct
-
-  aws s3 cp "s3://eprouvette/test_multipart" /tmp/garage.test_multipart
-  cat /tmp/garage.2.rnd <(tail -c +501 /tmp/garage.3.rnd | head -c 5000001) /tmp/garage.3.rnd > /tmp/garage.test_multipart_reference
-  diff /tmp/garage.test_multipart /tmp/garage.test_multipart_reference >/tmp/garage.test_multipart_diff 2>&1
-
-  aws s3 rm "s3://eprouvette/copy_part_source"
-  aws s3 rm "s3://eprouvette/test_multipart"
-
-  rm /tmp/garage.multipart_struct
-  rm /tmp/garage.test_multipart
-  rm /tmp/garage.test_multipart_reference
-  rm /tmp/garage.test_multipart_diff
-fi
-
 rm /tmp/garage.{1..3}.{rnd,b64}

+if [ -z "$SKIP_AWS" ]; then
+  echo "🧪 Website Testing"
+  echo "<h1>hello world</h1>" > /tmp/garage-index.html
+  aws s3 cp /tmp/garage-index.html s3://eprouvette/index.html
+  [ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3921/ ` == 404 ]
+  garage -c /tmp/config.1.toml bucket website --allow eprouvette
+  [ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3921/ ` == 200 ]
+  garage -c /tmp/config.1.toml bucket website --deny eprouvette
+  [ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3921/ ` == 404 ]
+  aws s3 rm s3://eprouvette/index.html
+  rm /tmp/garage-index.html
+fi
+
 if [ -z "$SKIP_AWS" ]; then
  echo "🪣 Test bucket logic "
  AWS_ACCESS_KEY_ID=`cat /tmp/garage.s3 |cut -d' ' -f1`
@@ -372,25 +145,11 @@ if [ -z "$SKIP_AWS" ]; then
  [ $(aws s3 ls | wc -l) == 1 ]
 fi

-if [ -z "$SKIP_AWS" ]; then
-  echo "🧪 Website Testing"
-  echo "<h1>hello world</h1>" > /tmp/garage-index.html
-  aws s3 cp /tmp/garage-index.html s3://eprouvette/index.html
-  [ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3921/ ` == 404 ]
-  garage -c /tmp/config.1.toml bucket website --allow eprouvette
-  [ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3921/ ` == 200 ]
-  garage -c /tmp/config.1.toml bucket website --deny eprouvette
-  [ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3921/ ` == 404 ]
-  aws s3 rm s3://eprouvette/index.html
-  rm /tmp/garage-index.html
-fi
-
 echo "🏁 Teardown"
 AWS_ACCESS_KEY_ID=`cat /tmp/garage.s3 |cut -d' ' -f1`
 AWS_SECRET_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2`
 garage -c /tmp/config.1.toml bucket deny --read --write eprouvette --key $AWS_ACCESS_KEY_ID
 garage -c /tmp/config.1.toml bucket delete --yes eprouvette
 garage -c /tmp/config.1.toml key delete --yes $AWS_ACCESS_KEY_ID
-exec 3>&-

 echo "✅ Success"
@@ -83,7 +83,6 @@ function refresh_toolchain {
     pkgs.which
     pkgs.openssl
     pkgs.curl
-     pkgs.jq
    ] else [])
   ++
   (if release then [ 
@@ -1,6 +1,6 @@
 [package]
 name = "garage_api"
-version = "0.6.0"
+version = "0.5.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -14,9 +14,9 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-garage_model = { version = "0.6.0", path = "../model" }
-garage_table = { version = "0.6.0", path = "../table" }
-garage_util = { version = "0.6.0", path = "../util" }
+garage_model = { version = "0.5.1", path = "../model" }
+garage_table = { version = "0.5.1", path = "../table" }
+garage_util = { version = "0.5.1", path = "../util" }

 base64 = "0.13"
 bytes = "1.0"
@@ -28,12 +28,10 @@ hmac = "0.10"
 idna = "0.2"
 log = "0.4"
 md-5 = "0.9"
-nom = "7.1"
 sha2 = "0.9"

 futures = "0.3"
 futures-util = "0.3"
-pin-project = "1.0"
 tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi-thread", "io-util", "net", "time", "macros", "sync", "signal", "fs"] }

 http = "0.2"
@@ -43,6 +41,5 @@ hyper = { version = "0.14", features = ["server", "http1", "runtime", "tcp", "st
 percent-encoding = "2.1.0"
 roxmltree = "0.14"
 serde = { version = "1.0", features = ["derive"] }
-serde_bytes = "0.11"
 quick-xml = { version = "0.21", features = [ "serialize" ] }
 url = "2.1"
@@ -5,23 +5,18 @@ use futures::future::Future;
 use hyper::header;
 use hyper::server::conn::AddrStream;
 use hyper::service::{make_service_fn, service_fn};
-use hyper::{Body, Method, Request, Response, Server};
+use hyper::{Body, Request, Response, Server};

-use garage_util::data::*;
 use garage_util::error::Error as GarageError;

 use garage_model::garage::Garage;
-use garage_model::key_table::Key;
-
-use garage_table::util::*;

 use crate::error::*;
-use crate::signature::payload::check_payload_signature;
+use crate::signature::check_signature;

 use crate::helpers::*;
 use crate::s3_bucket::*;
 use crate::s3_copy::*;
-use crate::s3_cors::*;
 use crate::s3_delete::*;
 use crate::s3_get::*;
 use crate::s3_list::*;
@@ -92,10 +87,7 @@ async fn handler(
 }

 async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Response<Body>, Error> {
-	let (api_key, content_sha256) = check_payload_signature(&garage, &req).await?;
-	let api_key = api_key.ok_or_else(|| {
-		Error::Forbidden("Garage does not support anonymous access yet".to_string())
-	})?;
+	let (api_key, content_sha256) = check_signature(&garage, &req).await?;

 	let authority = req
 		.headers()
@@ -105,39 +97,18 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon

 	let host = authority_to_host(authority)?;

-	let bucket_name = garage
+	let bucket = garage
 		.config
 		.s3_api
 		.root_domain
 		.as_ref()
 		.and_then(|root_domain| host_to_bucket(&host, root_domain));

-	let (endpoint, bucket_name) = Endpoint::from_request(&req, bucket_name.map(ToOwned::to_owned))?;
-	debug!("Endpoint: {:?}", endpoint);
-
-	let bucket_name = match bucket_name {
-		None => return handle_request_without_bucket(garage, req, api_key, endpoint).await,
-		Some(bucket) => bucket.to_string(),
-	};
-
-	// Special code path for CreateBucket API endpoint
-	if let Endpoint::CreateBucket {} = endpoint {
-		return handle_create_bucket(&garage, req, content_sha256, api_key, bucket_name).await;
-	}
-
-	let bucket_id = resolve_bucket(&garage, &bucket_name, &api_key).await?;
-	let bucket = garage
-		.bucket_table
-		.get(&EmptyKey, &bucket_id)
-		.await?
-		.filter(|b| !b.state.is_deleted())
-		.ok_or(Error::NoSuchBucket)?;
-
+	let endpoint = Endpoint::from_request(&req, bucket.map(ToOwned::to_owned))?;
 	let allowed = match endpoint.authorization_type() {
-		Authorization::Read => api_key.allow_read(&bucket_id),
-		Authorization::Write => api_key.allow_write(&bucket_id),
-		Authorization::Owner => api_key.allow_owner(&bucket_id),
-		_ => unreachable!(),
+		Authorization::None => true,
+		Authorization::Read(bucket) => api_key.allow_read(bucket),
+		Authorization::Write(bucket) => api_key.allow_write(bucket),
 	};

 	if !allowed {
@@ -146,24 +117,12 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
 		));
 	}

-	// Look up what CORS rule might apply to response.
-	// Requests for methods different than GET, HEAD or POST
-	// are always preflighted, i.e. the browser should make
-	// an OPTIONS call before to check it is allowed
-	let matching_cors_rule = match *req.method() {
-		Method::GET | Method::HEAD | Method::POST => find_matching_cors_rule(&bucket, &req)?,
-		_ => None,
-	};
-
-	let resp = match endpoint {
-		Endpoint::Options => handle_options(&req, &bucket).await,
-		Endpoint::HeadObject {
-			key, part_number, ..
-		} => handle_head(garage, &req, bucket_id, &key, part_number).await,
-		Endpoint::GetObject {
-			key, part_number, ..
-		} => handle_get(garage, &req, bucket_id, &key, part_number).await,
+	match endpoint {
+		Endpoint::ListBuckets => handle_list_buckets(&api_key),
+		Endpoint::HeadObject { bucket, key, .. } => handle_head(garage, &req, &bucket, &key).await,
+		Endpoint::GetObject { bucket, key, .. } => handle_get(garage, &req, &bucket, &key).await,
 		Endpoint::UploadPart {
+			bucket,
 			key,
 			part_number,
 			upload_id,
@@ -171,7 +130,7 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
 			handle_put_part(
 				garage,
 				req,
-				bucket_id,
+				&bucket,
 				&key,
 				part_number,
 				&upload_id,
@@ -179,57 +138,64 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
 			)
 			.await
 		}
-		Endpoint::CopyObject { key } => handle_copy(garage, &api_key, &req, bucket_id, &key).await,
-		Endpoint::UploadPartCopy {
+		Endpoint::CopyObject { bucket, key } => {
+			let copy_source = req.headers().get("x-amz-copy-source").unwrap().to_str()?;
+			let copy_source = percent_encoding::percent_decode_str(copy_source).decode_utf8()?;
+			let (source_bucket, source_key) = parse_bucket_key(&copy_source, None)?;
+			if !api_key.allow_read(source_bucket) {
+				return Err(Error::Forbidden(format!(
+					"Reading from bucket {} not allowed for this key",
+					source_bucket
+				)));
+			}
+			let source_key = source_key.ok_or_bad_request("No source key specified")?;
+			handle_copy(garage, &req, &bucket, &key, source_bucket, source_key).await
+		}
+		Endpoint::PutObject { bucket, key } => {
+			handle_put(garage, req, &bucket, &key, content_sha256).await
+		}
+		Endpoint::AbortMultipartUpload {
+			bucket,
+			key,
+			upload_id,
+		} => handle_abort_multipart_upload(garage, &bucket, &key, &upload_id).await,
+		Endpoint::DeleteObject { bucket, key, .. } => handle_delete(garage, &bucket, &key).await,
+		Endpoint::CreateMultipartUpload { bucket, key } => {
+			handle_create_multipart_upload(garage, &req, &bucket, &key).await
+		}
+		Endpoint::CompleteMultipartUpload {
+			bucket,
 			key,
-			part_number,
 			upload_id,
 		} => {
-			handle_upload_part_copy(
-				garage,
-				&api_key,
-				&req,
-				bucket_id,
-				&key,
-				part_number,
-				&upload_id,
-			)
-			.await
+			handle_complete_multipart_upload(garage, req, &bucket, &key, &upload_id, content_sha256)
+				.await
 		}
-		Endpoint::PutObject { key } => {
-			handle_put(garage, req, bucket_id, &key, &api_key, content_sha256).await
+		Endpoint::CreateBucket { bucket } => {
+			debug!(
+				"Body: {}",
+				std::str::from_utf8(&hyper::body::to_bytes(req.into_body()).await?)
+					.unwrap_or("<invalid utf8>")
+			);
+			let empty_body: Body = Body::from(vec![]);
+			let response = Response::builder()
+				.header("Location", format!("/{}", bucket))
+				.body(empty_body)
+				.unwrap();
+			Ok(response)
 		}
-		Endpoint::AbortMultipartUpload { key, upload_id } => {
-			handle_abort_multipart_upload(garage, bucket_id, &key, &upload_id).await
-		}
-		Endpoint::DeleteObject { key, .. } => handle_delete(garage, bucket_id, &key).await,
-		Endpoint::CreateMultipartUpload { key } => {
-			handle_create_multipart_upload(garage, &req, &bucket_name, bucket_id, &key).await
-		}
-		Endpoint::CompleteMultipartUpload { key, upload_id } => {
-			handle_complete_multipart_upload(
-				garage,
-				req,
-				&bucket_name,
-				bucket_id,
-				&key,
-				&upload_id,
-				content_sha256,
-			)
-			.await
-		}
-		Endpoint::CreateBucket {} => unreachable!(),
-		Endpoint::HeadBucket {} => {
+		Endpoint::HeadBucket { .. } => {
 			let empty_body: Body = Body::from(vec![]);
 			let response = Response::builder().body(empty_body).unwrap();
 			Ok(response)
 		}
-		Endpoint::DeleteBucket {} => {
-			handle_delete_bucket(&garage, bucket_id, bucket_name, api_key).await
-		}
-		Endpoint::GetBucketLocation {} => handle_get_bucket_location(garage),
-		Endpoint::GetBucketVersioning {} => handle_get_bucket_versioning(),
+		Endpoint::DeleteBucket { .. } => Err(Error::Forbidden(
+			"Cannot delete buckets using S3 api, please talk to Garage directly".into(),
+		)),
+		Endpoint::GetBucketLocation { .. } => handle_get_bucket_location(garage),
+		Endpoint::GetBucketVersioning { .. } => handle_get_bucket_versioning(),
 		Endpoint::ListObjects {
+			bucket,
 			delimiter,
 			encoding_type,
 			marker,
@@ -239,23 +205,21 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
 			handle_list(
 				garage,
 				&ListObjectsQuery {
-					common: ListQueryCommon {
-						bucket_name,
-						bucket_id,
-						delimiter: delimiter.map(|d| d.to_string()),
-						page_size: max_keys.map(|p| p.clamp(1, 1000)).unwrap_or(1000),
-						prefix: prefix.unwrap_or_default(),
-						urlencode_resp: encoding_type.map(|e| e == "url").unwrap_or(false),
-					},
 					is_v2: false,
+					bucket,
+					delimiter: delimiter.map(|d| d.to_string()),
+					max_keys: max_keys.unwrap_or(1000),
+					prefix: prefix.unwrap_or_default(),
 					marker,
 					continuation_token: None,
 					start_after: None,
+					urlencode_resp: encoding_type.map(|e| e == "url").unwrap_or(false),
 				},
 			)
 			.await
 		}
 		Endpoint::ListObjectsV2 {
+			bucket,
 			delimiter,
 			encoding_type,
 			max_keys,
@@ -269,18 +233,15 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
 				handle_list(
 					garage,
 					&ListObjectsQuery {
-						common: ListQueryCommon {
-							bucket_name,
-							bucket_id,
-							delimiter: delimiter.map(|d| d.to_string()),
-							page_size: max_keys.map(|p| p.clamp(1, 1000)).unwrap_or(1000),
-							urlencode_resp: encoding_type.map(|e| e == "url").unwrap_or(false),
-							prefix: prefix.unwrap_or_default(),
-						},
 						is_v2: true,
+						bucket,
+						delimiter: delimiter.map(|d| d.to_string()),
+						max_keys: max_keys.unwrap_or(1000),
+						prefix: prefix.unwrap_or_default(),
 						marker: None,
 						continuation_token,
 						start_after,
+						urlencode_resp: encoding_type.map(|e| e == "url").unwrap_or(false),
 					},
 				)
 				.await
@@ -291,106 +252,14 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
 				)))
 			}
 		}
-		Endpoint::ListMultipartUploads {
-			delimiter,
-			encoding_type,
-			key_marker,
-			max_uploads,
-			prefix,
-			upload_id_marker,
-		} => {
-			handle_list_multipart_upload(
-				garage,
-				&ListMultipartUploadsQuery {
-					common: ListQueryCommon {
-						bucket_name,
-						bucket_id,
-						delimiter: delimiter.map(|d| d.to_string()),
-						page_size: max_uploads.map(|p| p.clamp(1, 1000)).unwrap_or(1000),
-						prefix: prefix.unwrap_or_default(),
-						urlencode_resp: encoding_type.map(|e| e == "url").unwrap_or(false),
-					},
-					key_marker,
-					upload_id_marker,
-				},
-			)
-			.await
+		Endpoint::DeleteObjects { bucket } => {
+			handle_delete_objects(garage, &bucket, req, content_sha256).await
 		}
-		Endpoint::ListParts {
-			key,
-			max_parts,
-			part_number_marker,
-			upload_id,
-		} => {
-			handle_list_parts(
-				garage,
-				&ListPartsQuery {
-					bucket_name,
-					bucket_id,
-					key,
-					upload_id,
-					part_number_marker: part_number_marker.map(|p| p.clamp(1, 10000)),
-					max_parts: max_parts.map(|p| p.clamp(1, 1000)).unwrap_or(1000),
-				},
-			)
-			.await
+		Endpoint::PutBucketWebsite { bucket } => {
+			handle_put_website(garage, bucket, req, content_sha256).await
 		}
-		Endpoint::DeleteObjects {} => {
-			handle_delete_objects(garage, bucket_id, req, content_sha256).await
-		}
-		Endpoint::GetBucketWebsite {} => handle_get_website(&bucket).await,
-		Endpoint::PutBucketWebsite {} => {
-			handle_put_website(garage, bucket_id, req, content_sha256).await
-		}
-		Endpoint::DeleteBucketWebsite {} => handle_delete_website(garage, bucket_id).await,
-		Endpoint::GetBucketCors {} => handle_get_cors(&bucket).await,
-		Endpoint::PutBucketCors {} => handle_put_cors(garage, bucket_id, req, content_sha256).await,
-		Endpoint::DeleteBucketCors {} => handle_delete_cors(garage, bucket_id).await,
+		Endpoint::DeleteBucketWebsite { bucket } => handle_delete_website(garage, bucket).await,
 		endpoint => Err(Error::NotImplemented(endpoint.name().to_owned())),
-	};
-
-	// If request was a success and we have a CORS rule that applies to it,
-	// add the corresponding CORS headers to the response
-	let mut resp_ok = resp?;
-	if let Some(rule) = matching_cors_rule {
-		add_cors_headers(&mut resp_ok, rule)
-			.ok_or_internal_error("Invalid bucket CORS configuration")?;
-	}
-
-	Ok(resp_ok)
-}
-
-async fn handle_request_without_bucket(
-	garage: Arc<Garage>,
-	_req: Request<Body>,
-	api_key: Key,
-	endpoint: Endpoint,
-) -> Result<Response<Body>, Error> {
-	match endpoint {
-		Endpoint::ListBuckets => handle_list_buckets(&garage, &api_key).await,
-		endpoint => Err(Error::NotImplemented(endpoint.name().to_owned())),
-	}
-}
-
-#[allow(clippy::ptr_arg)]
-pub async fn resolve_bucket(
-	garage: &Garage,
-	bucket_name: &String,
-	api_key: &Key,
-) -> Result<Uuid, Error> {
-	let api_key_params = api_key
-		.state
-		.as_option()
-		.ok_or_internal_error("Key should not be deleted at this point")?;
-
-	if let Some(Some(bucket_id)) = api_key_params.local_aliases.get(bucket_name) {
-		Ok(*bucket_id)
-	} else {
-		Ok(garage
-			.bucket_helper()
-			.resolve_global_bucket_name(bucket_name)
-			.await?
-			.ok_or(Error::NoSuchBucket)?)
 	}
 }

@@ -399,7 +268,7 @@ pub async fn resolve_bucket(
 ///
 /// S3 internally manages only buckets and keys. This function splits
 /// an HTTP path to get the corresponding bucket name and key.
-pub fn parse_bucket_key<'a>(
+fn parse_bucket_key<'a>(
 	path: &'a str,
 	host_bucket: Option<&'a str>,
 ) -> Result<(&'a str, Option<&'a str>), Error> {
@@ -4,7 +4,6 @@ use err_derive::Error;
 use hyper::header::HeaderValue;
 use hyper::{HeaderMap, StatusCode};

-use garage_model::helper::error::Error as HelperError;
 use garage_util::error::Error as GarageError;

 use crate::s3_xml;
@@ -35,41 +34,8 @@ pub enum Error {
 	AuthorizationHeaderMalformed(String),

 	/// The object requested don't exists
-	#[error(display = "Key not found")]
-	NoSuchKey,
-
-	/// The bucket requested don't exists
-	#[error(display = "Bucket not found")]
-	NoSuchBucket,
-
-	/// The multipart upload requested don't exists
-	#[error(display = "Upload not found")]
-	NoSuchUpload,
-
-	/// Tried to create a bucket that already exist
-	#[error(display = "Bucket already exists")]
-	BucketAlreadyExists,
-
-	/// Tried to delete a non-empty bucket
-	#[error(display = "Tried to delete a non-empty bucket")]
-	BucketNotEmpty,
-
-	/// Precondition failed (e.g. x-amz-copy-source-if-match)
-	#[error(display = "At least one of the preconditions you specified did not hold")]
-	PreconditionFailed,
-
-	/// Parts specified in CMU request do not match parts actually uploaded
-	#[error(display = "Parts given to CompleteMultipartUpload do not match uploaded parts")]
-	InvalidPart,
-
-	/// Parts given to CompleteMultipartUpload were not in ascending order
-	#[error(display = "Parts given to CompleteMultipartUpload were not in ascending order")]
-	InvalidPartOrder,
-
-	/// In CompleteMultipartUpload: not enough data
-	/// (here we are more lenient than AWS S3)
-	#[error(display = "Proposed upload is smaller than the minimum allowed object size")]
-	EntityTooSmall,
+	#[error(display = "Not found")]
+	NotFound,

 	// Category: bad request
 	/// The request contained an invalid UTF-8 sequence in its path or in other parameters
@@ -117,22 +83,11 @@ impl From<quick_xml::de::DeError> for Error {
 	}
 }

-impl From<HelperError> for Error {
-	fn from(err: HelperError) -> Self {
-		match err {
-			HelperError::Internal(i) => Self::InternalError(i),
-			HelperError::BadRequest(b) => Self::BadRequest(b),
-		}
-	}
-}
-
 impl Error {
 	/// Get the HTTP status code that best represents the meaning of the error for the client
 	pub fn http_status_code(&self) -> StatusCode {
 		match self {
-			Error::NoSuchKey | Error::NoSuchBucket | Error::NoSuchUpload => StatusCode::NOT_FOUND,
-			Error::BucketNotEmpty | Error::BucketAlreadyExists => StatusCode::CONFLICT,
-			Error::PreconditionFailed => StatusCode::PRECONDITION_FAILED,
+			Error::NotFound => StatusCode::NOT_FOUND,
 			Error::Forbidden(_) => StatusCode::FORBIDDEN,
 			Error::InternalError(
 				GarageError::Timeout
@@ -150,18 +105,9 @@ impl Error {

 	pub fn aws_code(&self) -> &'static str {
 		match self {
-			Error::NoSuchKey => "NoSuchKey",
-			Error::NoSuchBucket => "NoSuchBucket",
-			Error::NoSuchUpload => "NoSuchUpload",
-			Error::BucketAlreadyExists => "BucketAlreadyExists",
-			Error::BucketNotEmpty => "BucketNotEmpty",
-			Error::PreconditionFailed => "PreconditionFailed",
-			Error::InvalidPart => "InvalidPart",
-			Error::InvalidPartOrder => "InvalidPartOrder",
-			Error::EntityTooSmall => "EntityTooSmall",
+			Error::NotFound => "NoSuchKey",
 			Error::Forbidden(_) => "AccessDenied",
 			Error::AuthorizationHeaderMalformed(_) => "AuthorizationHeaderMalformed",
-			Error::NotImplemented(_) => "NotImplemented",
 			Error::InternalError(
 				GarageError::Timeout
 				| GarageError::RemoteError(_)
@@ -210,63 +156,62 @@ impl Error {

 /// Trait to map error to the Bad Request error code
 pub trait OkOrBadRequest {
-	type S;
-	fn ok_or_bad_request<M: AsRef<str>>(self, reason: M) -> Result<Self::S, Error>;
+	type S2;
+	fn ok_or_bad_request(self, reason: &'static str) -> Self::S2;
 }

 impl<T, E> OkOrBadRequest for Result<T, E>
 where
 	E: std::fmt::Display,
 {
-	type S = T;
-	fn ok_or_bad_request<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
+	type S2 = Result<T, Error>;
+	fn ok_or_bad_request(self, reason: &'static str) -> Result<T, Error> {
 		match self {
 			Ok(x) => Ok(x),
-			Err(e) => Err(Error::BadRequest(format!("{}: {}", reason.as_ref(), e))),
+			Err(e) => Err(Error::BadRequest(format!("{}: {}", reason, e))),
 		}
 	}
 }

 impl<T> OkOrBadRequest for Option<T> {
-	type S = T;
-	fn ok_or_bad_request<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
+	type S2 = Result<T, Error>;
+	fn ok_or_bad_request(self, reason: &'static str) -> Result<T, Error> {
 		match self {
 			Some(x) => Ok(x),
-			None => Err(Error::BadRequest(reason.as_ref().to_string())),
+			None => Err(Error::BadRequest(reason.to_string())),
 		}
 	}
 }

 /// Trait to map an error to an Internal Error code
 pub trait OkOrInternalError {
-	type S;
-	fn ok_or_internal_error<M: AsRef<str>>(self, reason: M) -> Result<Self::S, Error>;
+	type S2;
+	fn ok_or_internal_error(self, reason: &'static str) -> Self::S2;
 }

 impl<T, E> OkOrInternalError for Result<T, E>
 where
 	E: std::fmt::Display,
 {
-	type S = T;
-	fn ok_or_internal_error<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
+	type S2 = Result<T, Error>;
+	fn ok_or_internal_error(self, reason: &'static str) -> Result<T, Error> {
 		match self {
 			Ok(x) => Ok(x),
 			Err(e) => Err(Error::InternalError(GarageError::Message(format!(
 				"{}: {}",
-				reason.as_ref(),
-				e
+				reason, e
 			)))),
 		}
 	}
 }

 impl<T> OkOrInternalError for Option<T> {
-	type S = T;
-	fn ok_or_internal_error<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
+	type S2 = Result<T, Error>;
+	fn ok_or_internal_error(self, reason: &'static str) -> Result<T, Error> {
 		match self {
 			Some(x) => Ok(x),
 			None => Err(Error::InternalError(GarageError::Message(
-				reason.as_ref().to_string(),
+				reason.to_string(),
 			))),
 		}
 	}
@@ -2,7 +2,7 @@
 #[macro_use]
 extern crate log;

-pub mod error;
+mod error;
 pub use error::Error;

 mod encoding;
@@ -15,7 +15,6 @@ mod signature;
 pub mod helpers;
 mod s3_bucket;
 mod s3_copy;
-pub mod s3_cors;
 mod s3_delete;
 pub mod s3_get;
 mod s3_list;
@@ -1,22 +1,13 @@
-use std::collections::HashMap;
 use std::sync::Arc;

-use hyper::{Body, Request, Response, StatusCode};
+use hyper::{Body, Response};

-use garage_model::bucket_alias_table::*;
-use garage_model::bucket_table::Bucket;
 use garage_model::garage::Garage;
 use garage_model::key_table::Key;
-use garage_model::object_table::ObjectFilter;
-use garage_model::permission::BucketKeyPerm;
-use garage_table::util::*;
-use garage_util::crdt::*;
-use garage_util::data::*;
 use garage_util::time::*;

 use crate::error::*;
 use crate::s3_xml;
-use crate::signature::verify_signed_content;

 pub fn handle_get_bucket_location(garage: Arc<Garage>) -> Result<Response<Body>, Error> {
 	let loc = s3_xml::LocationConstraint {
@@ -43,61 +34,20 @@ pub fn handle_get_bucket_versioning() -> Result<Response<Body>, Error> {
 		.body(Body::from(xml.into_bytes()))?)
 }

-pub async fn handle_list_buckets(garage: &Garage, api_key: &Key) -> Result<Response<Body>, Error> {
-	let key_p = api_key.params().ok_or_internal_error(
-		"Key should not be in deleted state at this point (in handle_list_buckets)",
-	)?;
-
-	// Collect buckets user has access to
-	let ids = api_key
-		.state
-		.as_option()
-		.unwrap()
-		.authorized_buckets
-		.items()
-		.iter()
-		.filter(|(_, perms)| perms.is_any())
-		.map(|(id, _)| *id)
-		.collect::<Vec<_>>();
-
-	let mut buckets_by_id = HashMap::new();
-	let mut aliases = HashMap::new();
-
-	for bucket_id in ids.iter() {
-		let bucket = garage.bucket_table.get(&EmptyKey, bucket_id).await?;
-		if let Some(bucket) = bucket {
-			for (alias, _, _active) in bucket.aliases().iter().filter(|(_, _, active)| *active) {
-				let alias_opt = garage.bucket_alias_table.get(&EmptyKey, alias).await?;
-				if let Some(alias_ent) = alias_opt {
-					if *alias_ent.state.get() == Some(*bucket_id) {
-						aliases.insert(alias_ent.name().to_string(), *bucket_id);
-					}
-				}
-			}
-			if let Deletable::Present(param) = bucket.state {
-				buckets_by_id.insert(bucket_id, param);
-			}
-		}
-	}
-
-	for (alias, _, id_opt) in key_p.local_aliases.items() {
-		if let Some(id) = id_opt {
-			aliases.insert(alias.clone(), *id);
-		}
-	}
-
-	// Generate response
+pub fn handle_list_buckets(api_key: &Key) -> Result<Response<Body>, Error> {
 	let list_buckets = s3_xml::ListAllMyBucketsResult {
 		owner: s3_xml::Owner {
-			display_name: s3_xml::Value(key_p.name.get().to_string()),
+			display_name: s3_xml::Value(api_key.name.get().to_string()),
 			id: s3_xml::Value(api_key.key_id.to_string()),
 		},
 		buckets: s3_xml::BucketList {
-			entries: aliases
+			entries: api_key
+				.authorized_buckets
+				.items()
 				.iter()
-				.filter_map(|(name, id)| buckets_by_id.get(id).map(|p| (name, id, p)))
-				.map(|(name, _id, param)| s3_xml::Bucket {
-					creation_date: s3_xml::Value(msec_to_rfc3339(param.creation_date)),
+				.filter(|(_, _, perms)| perms.allow_read || perms.allow_write)
+				.map(|(name, ts, _)| s3_xml::Bucket {
+					creation_date: s3_xml::Value(msec_to_rfc3339(*ts)),
 					name: s3_xml::Value(name.to_string()),
 				})
 				.collect(),
@@ -111,242 +61,3 @@ pub async fn handle_list_buckets(garage: &Garage, api_key: &Key) -> Result<Respo
 		.header("Content-Type", "application/xml")
 		.body(Body::from(xml))?)
 }
-
-pub async fn handle_create_bucket(
-	garage: &Garage,
-	req: Request<Body>,
-	content_sha256: Option<Hash>,
-	api_key: Key,
-	bucket_name: String,
-) -> Result<Response<Body>, Error> {
-	let body = hyper::body::to_bytes(req.into_body()).await?;
-
-	if let Some(content_sha256) = content_sha256 {
-		verify_signed_content(content_sha256, &body[..])?;
-	}
-
-	let cmd =
-		parse_create_bucket_xml(&body[..]).ok_or_bad_request("Invalid create bucket XML query")?;
-
-	if let Some(location_constraint) = cmd {
-		if location_constraint != garage.config.s3_api.s3_region {
-			return Err(Error::BadRequest(format!(
-				"Cannot satisfy location constraint `{}`: buckets can only be created in region `{}`",
-				location_constraint,
-				garage.config.s3_api.s3_region
-			)));
-		}
-	}
-
-	let key_params = api_key
-		.params()
-		.ok_or_internal_error("Key should not be deleted at this point")?;
-
-	let existing_bucket = if let Some(Some(bucket_id)) = key_params.local_aliases.get(&bucket_name)
-	{
-		Some(*bucket_id)
-	} else {
-		garage
-			.bucket_helper()
-			.resolve_global_bucket_name(&bucket_name)
-			.await?
-	};
-
-	if let Some(bucket_id) = existing_bucket {
-		// Check we have write or owner permission on the bucket,
-		// in that case it's fine, return 200 OK, bucket exists;
-		// otherwise return a forbidden error.
-		let kp = api_key.bucket_permissions(&bucket_id);
-		if !(kp.allow_write || kp.allow_owner) {
-			return Err(Error::BucketAlreadyExists);
-		}
-	} else {
-		// Create the bucket!
-		if !is_valid_bucket_name(&bucket_name) {
-			return Err(Error::BadRequest(format!(
-				"{}: {}",
-				bucket_name, INVALID_BUCKET_NAME_MESSAGE
-			)));
-		}
-
-		let bucket = Bucket::new();
-		garage.bucket_table.insert(&bucket).await?;
-
-		garage
-			.bucket_helper()
-			.set_bucket_key_permissions(bucket.id, &api_key.key_id, BucketKeyPerm::ALL_PERMISSIONS)
-			.await?;
-
-		garage
-			.bucket_helper()
-			.set_local_bucket_alias(bucket.id, &api_key.key_id, &bucket_name)
-			.await?;
-	}
-
-	Ok(Response::builder()
-		.header("Location", format!("/{}", bucket_name))
-		.body(Body::empty())
-		.unwrap())
-}
-
-pub async fn handle_delete_bucket(
-	garage: &Garage,
-	bucket_id: Uuid,
-	bucket_name: String,
-	api_key: Key,
-) -> Result<Response<Body>, Error> {
-	let key_params = api_key
-		.params()
-		.ok_or_internal_error("Key should not be deleted at this point")?;
-
-	let is_local_alias = matches!(key_params.local_aliases.get(&bucket_name), Some(Some(_)));
-
-	let mut bucket = garage
-		.bucket_helper()
-		.get_existing_bucket(bucket_id)
-		.await?;
-	let bucket_state = bucket.state.as_option().unwrap();
-
-	// If the bucket has no other aliases, this is a true deletion.
-	// Otherwise, it is just an alias removal.
-
-	let has_other_global_aliases = bucket_state
-		.aliases
-		.items()
-		.iter()
-		.filter(|(_, _, active)| *active)
-		.any(|(n, _, _)| is_local_alias || (*n != bucket_name));
-
-	let has_other_local_aliases = bucket_state
-		.local_aliases
-		.items()
-		.iter()
-		.filter(|(_, _, active)| *active)
-		.any(|((k, n), _, _)| !is_local_alias || *n != bucket_name || *k != api_key.key_id);
-
-	if !has_other_global_aliases && !has_other_local_aliases {
-		// Delete bucket
-
-		// Check bucket is empty
-		let objects = garage
-			.object_table
-			.get_range(&bucket_id, None, Some(ObjectFilter::IsData), 10)
-			.await?;
-		if !objects.is_empty() {
-			return Err(Error::BucketNotEmpty);
-		}
-
-		// --- done checking, now commit ---
-		// 1. delete bucket alias
-		if is_local_alias {
-			garage
-				.bucket_helper()
-				.unset_local_bucket_alias(bucket_id, &api_key.key_id, &bucket_name)
-				.await?;
-		} else {
-			garage
-				.bucket_helper()
-				.unset_global_bucket_alias(bucket_id, &bucket_name)
-				.await?;
-		}
-
-		// 2. delete authorization from keys that had access
-		for (key_id, _) in bucket.authorized_keys() {
-			garage
-				.bucket_helper()
-				.set_bucket_key_permissions(bucket.id, key_id, BucketKeyPerm::NO_PERMISSIONS)
-				.await?;
-		}
-
-		// 3. delete bucket
-		bucket.state = Deletable::delete();
-		garage.bucket_table.insert(&bucket).await?;
-	} else if is_local_alias {
-		// Just unalias
-		garage
-			.bucket_helper()
-			.unset_local_bucket_alias(bucket_id, &api_key.key_id, &bucket_name)
-			.await?;
-	} else {
-		// Just unalias (but from global namespace)
-		garage
-			.bucket_helper()
-			.unset_global_bucket_alias(bucket_id, &bucket_name)
-			.await?;
-	}
-
-	Ok(Response::builder()
-		.status(StatusCode::NO_CONTENT)
-		.body(Body::empty())?)
-}
-
-fn parse_create_bucket_xml(xml_bytes: &[u8]) -> Option<Option<String>> {
-	// Returns None if invalid data
-	// Returns Some(None) if no location constraint is given
-	// Returns Some(Some("xxxx")) where xxxx is the given location constraint
-
-	let xml_str = std::str::from_utf8(xml_bytes).ok()?;
-	if xml_str.trim_matches(char::is_whitespace).is_empty() {
-		return Some(None);
-	}
-
-	let xml = roxmltree::Document::parse(xml_str).ok()?;
-
-	let cbc = xml.root().first_child()?;
-	if !cbc.has_tag_name("CreateBucketConfiguration") {
-		return None;
-	}
-
-	let mut ret = None;
-	for item in cbc.children() {
-		println!("{:?}", item);
-		if item.has_tag_name("LocationConstraint") {
-			if ret != None {
-				return None;
-			}
-			ret = Some(item.text()?.to_string());
-		} else if !item.is_text() {
-			return None;
-		}
-	}
-
-	Some(ret)
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-
-	#[test]
-	fn create_bucket() {
-		assert_eq!(parse_create_bucket_xml(br#""#), Some(None));
-		assert_eq!(
-			parse_create_bucket_xml(
-				br#"
-            <CreateBucketConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
-            </CreateBucketConfiguration >
-		"#
-			),
-			Some(None)
-		);
-		assert_eq!(
-			parse_create_bucket_xml(
-				br#"
-            <CreateBucketConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
-             <LocationConstraint>Europe</LocationConstraint>
-            </CreateBucketConfiguration >
-		"#
-			),
-			Some(Some("Europe".into()))
-		);
-		assert_eq!(
-			parse_create_bucket_xml(
-				br#"
-            <CreateBucketConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
-            </Crea >
-		"#
-			),
-			None
-		);
-	}
-}
@@ -1,11 +1,6 @@
 use std::sync::Arc;
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
-
-use futures::TryFutureExt;
-use md5::{Digest as Md5Digest, Md5};

 use hyper::{Body, Request, Response};
-use serde::Serialize;

 use garage_table::*;
 use garage_util::data::*;
@@ -13,50 +8,63 @@ use garage_util::time::*;

 use garage_model::block_ref_table::*;
 use garage_model::garage::Garage;
-use garage_model::key_table::Key;
 use garage_model::object_table::*;
 use garage_model::version_table::*;

-use crate::api_server::{parse_bucket_key, resolve_bucket};
 use crate::error::*;
-use crate::s3_put::{decode_upload_id, get_headers};
-use crate::s3_xml::{self, xmlns_tag};
+use crate::s3_put::get_headers;
+use crate::s3_xml;

 pub async fn handle_copy(
 	garage: Arc<Garage>,
-	api_key: &Key,
 	req: &Request<Body>,
-	dest_bucket_id: Uuid,
+	dest_bucket: &str,
 	dest_key: &str,
+	source_bucket: &str,
+	source_key: &str,
 ) -> Result<Response<Body>, Error> {
-	let copy_precondition = CopyPreconditionHeaders::parse(req)?;
+	let source_object = garage
+		.object_table
+		.get(&source_bucket.to_string(), &source_key.to_string())
+		.await?
+		.ok_or(Error::NotFound)?;

-	let source_object = get_copy_source(&garage, api_key, req).await?;
+	let source_last_v = source_object
+		.versions()
+		.iter()
+		.rev()
+		.find(|v| v.is_complete())
+		.ok_or(Error::NotFound)?;

-	let (source_version, source_version_data, source_version_meta) =
-		extract_source_info(&source_object)?;
+	let source_last_state = match &source_last_v.state {
+		ObjectVersionState::Complete(x) => x,
+		_ => unreachable!(),
+	};

-	// Check precondition, e.g. x-amz-copy-source-if-match
-	copy_precondition.check(source_version, &source_version_meta.etag)?;
-
-	// Generate parameters for copied object
 	let new_uuid = gen_uuid();
 	let new_timestamp = now_msec();

 	// Implement x-amz-metadata-directive: REPLACE
+	let old_meta = match source_last_state {
+		ObjectVersionData::DeleteMarker => {
+			return Err(Error::NotFound);
+		}
+		ObjectVersionData::Inline(meta, _bytes) => meta,
+		ObjectVersionData::FirstBlock(meta, _fbh) => meta,
+	};
 	let new_meta = match req.headers().get("x-amz-metadata-directive") {
 		Some(v) if v == hyper::header::HeaderValue::from_static("REPLACE") => ObjectVersionMeta {
 			headers: get_headers(req)?,
-			size: source_version_meta.size,
-			etag: source_version_meta.etag.clone(),
+			size: old_meta.size,
+			etag: old_meta.etag.clone(),
 		},
-		_ => source_version_meta.clone(),
+		_ => old_meta.clone(),
 	};

 	let etag = new_meta.etag.to_string();

 	// Save object copy
-	match source_version_data {
+	match source_last_state {
 		ObjectVersionData::DeleteMarker => unreachable!(),
 		ObjectVersionData::Inline(_meta, bytes) => {
 			let dest_object_version = ObjectVersion {
@@ -68,7 +76,7 @@ pub async fn handle_copy(
 				)),
 			};
 			let dest_object = Object::new(
-				dest_bucket_id,
+				dest_bucket.to_string(),
 				dest_key.to_string(),
 				vec![dest_object_version],
 			);
@@ -78,9 +86,9 @@ pub async fn handle_copy(
 			// Get block list from source version
 			let source_version = garage
 				.version_table
-				.get(&source_version.uuid, &EmptyKey)
+				.get(&source_last_v.uuid, &EmptyKey)
 				.await?;
-			let source_version = source_version.ok_or(Error::NoSuchKey)?;
+			let source_version = source_version.ok_or(Error::NotFound)?;

 			// Write an "uploading" marker in Object table
 			// This holds a reference to the object in the Version table
@@ -91,7 +99,7 @@ pub async fn handle_copy(
 				state: ObjectVersionState::Uploading(new_meta.headers.clone()),
 			};
 			let tmp_dest_object = Object::new(
-				dest_bucket_id,
+				dest_bucket.to_string(),
 				dest_key.to_string(),
 				vec![tmp_dest_object_version],
 			);
@@ -101,8 +109,12 @@ pub async fn handle_copy(
 			// this means that the BlockRef entries linked to this version cannot be
 			// marked as deleted (they are marked as deleted only if the Version
 			// doesn't exist or is marked as deleted).
-			let mut dest_version =
-				Version::new(new_uuid, dest_bucket_id, dest_key.to_string(), false);
+			let mut dest_version = Version::new(
+				new_uuid,
+				dest_bucket.to_string(),
+				dest_key.to_string(),
+				false,
+			);
 			garage.version_table.insert(&dest_version).await?;

 			// Fill in block list for version and insert block refs
@@ -139,7 +151,7 @@ pub async fn handle_copy(
 				)),
 			};
 			let dest_object = Object::new(
-				dest_bucket_id,
+				dest_bucket.to_string(),
 				dest_key.to_string(),
 				vec![dest_object_version],
 			);
@@ -148,468 +160,13 @@ pub async fn handle_copy(
 	}

 	let last_modified = msec_to_rfc3339(new_timestamp);
-	let result = CopyObjectResult {
+	let result = s3_xml::CopyObjectResult {
 		last_modified: s3_xml::Value(last_modified),
-		etag: s3_xml::Value(format!("\"{}\"", etag)),
+		etag: s3_xml::Value(etag),
 	};
 	let xml = s3_xml::to_xml_with_header(&result)?;

 	Ok(Response::builder()
 		.header("Content-Type", "application/xml")
-		.header("x-amz-version-id", hex::encode(new_uuid))
-		.header(
-			"x-amz-copy-source-version-id",
-			hex::encode(source_version.uuid),
-		)
 		.body(Body::from(xml))?)
 }
-
-pub async fn handle_upload_part_copy(
-	garage: Arc<Garage>,
-	api_key: &Key,
-	req: &Request<Body>,
-	dest_bucket_id: Uuid,
-	dest_key: &str,
-	part_number: u64,
-	upload_id: &str,
-) -> Result<Response<Body>, Error> {
-	let copy_precondition = CopyPreconditionHeaders::parse(req)?;
-
-	let dest_version_uuid = decode_upload_id(upload_id)?;
-
-	let dest_key = dest_key.to_string();
-	let (source_object, dest_object) = futures::try_join!(
-		get_copy_source(&garage, api_key, req),
-		garage
-			.object_table
-			.get(&dest_bucket_id, &dest_key)
-			.map_err(Error::from),
-	)?;
-	let dest_object = dest_object.ok_or(Error::NoSuchKey)?;
-
-	let (source_object_version, source_version_data, source_version_meta) =
-		extract_source_info(&source_object)?;
-
-	// Check precondition on source, e.g. x-amz-copy-source-if-match
-	copy_precondition.check(source_object_version, &source_version_meta.etag)?;
-
-	// Check source range is valid
-	let source_range = match req.headers().get("x-amz-copy-source-range") {
-		Some(range) => {
-			let range_str = range.to_str()?;
-			let mut ranges = http_range::HttpRange::parse(range_str, source_version_meta.size)
-				.map_err(|e| (e, source_version_meta.size))?;
-			if ranges.len() != 1 {
-				return Err(Error::BadRequest(
-					"Invalid x-amz-copy-source-range header: exactly 1 range must be given".into(),
-				));
-			} else {
-				ranges.pop().unwrap()
-			}
-		}
-		None => http_range::HttpRange {
-			start: 0,
-			length: source_version_meta.size,
-		},
-	};
-
-	// Check destination version is indeed in uploading state
-	if !dest_object
-		.versions()
-		.iter()
-		.any(|v| v.uuid == dest_version_uuid && v.is_uploading())
-	{
-		return Err(Error::NoSuchUpload);
-	}
-
-	// Check source version is not inlined
-	match source_version_data {
-		ObjectVersionData::DeleteMarker => unreachable!(),
-		ObjectVersionData::Inline(_meta, _bytes) => {
-			// This is only for small files, we don't bother handling this.
-			// (in AWS UploadPartCopy works for parts at least 5MB which
-			// is never the case of an inline object)
-			return Err(Error::BadRequest(
-				"Source object is too small (minimum part size is 5Mb)".into(),
-			));
-		}
-		ObjectVersionData::FirstBlock(_meta, _first_block_hash) => (),
-	};
-
-	// Fetch source versin with its block list,
-	// and destination version to check part hasn't yet been uploaded
-	let (source_version, dest_version) = futures::try_join!(
-		garage
-			.version_table
-			.get(&source_object_version.uuid, &EmptyKey),
-		garage.version_table.get(&dest_version_uuid, &EmptyKey),
-	)?;
-	let source_version = source_version.ok_or(Error::NoSuchKey)?;
-
-	// Check this part number hasn't yet been uploaded
-	if let Some(dv) = dest_version {
-		if dv.has_part_number(part_number) {
-			return Err(Error::BadRequest(format!(
-				"Part number {} has already been uploaded",
-				part_number
-			)));
-		}
-	}
-
-	// We want to reuse blocks from the source version as much as possible.
-	// However, we still need to get the data from these blocks
-	// because we need to know it to calculate the MD5sum of the part
-	// which is used as its ETag.
-
-	// First, calculate what blocks we want to keep,
-	// and the subrange of the block to take, if the bounds of the
-	// requested range are in the middle.
-	let (range_begin, range_end) = (source_range.start, source_range.start + source_range.length);
-
-	let mut blocks_to_copy = vec![];
-	let mut current_offset = 0;
-	let mut size_to_copy = 0;
-	for (_bk, block) in source_version.blocks.items().iter() {
-		let (block_begin, block_end) = (current_offset, current_offset + block.size);
-
-		if block_begin < range_end && block_end > range_begin {
-			let subrange_begin = if block_begin < range_begin {
-				Some(range_begin - block_begin)
-			} else {
-				None
-			};
-			let subrange_end = if block_end > range_end {
-				Some(range_end - block_begin)
-			} else {
-				None
-			};
-			let range_to_copy = match (subrange_begin, subrange_end) {
-				(Some(b), Some(e)) => Some(b as usize..e as usize),
-				(None, Some(e)) => Some(0..e as usize),
-				(Some(b), None) => Some(b as usize..block.size as usize),
-				(None, None) => None,
-			};
-			size_to_copy += range_to_copy
-				.as_ref()
-				.map(|x| x.len() as u64)
-				.unwrap_or(block.size);
-
-			blocks_to_copy.push((block.hash, range_to_copy));
-		}
-
-		current_offset = block_end;
-	}
-
-	if size_to_copy < 1024 * 1024 {
-		return Err(Error::BadRequest(format!(
-			"Not enough data to copy: {} bytes (minimum: 1MB)",
-			size_to_copy
-		)));
-	}
-
-	// Now, actually copy the blocks
-	let mut md5hasher = Md5::new();
-
-	let mut block = Some(
-		garage
-			.block_manager
-			.rpc_get_block(&blocks_to_copy[0].0)
-			.await?,
-	);
-
-	let mut current_offset = 0;
-	for (i, (block_hash, range_to_copy)) in blocks_to_copy.iter().enumerate() {
-		let (current_block, subrange_hash) = match range_to_copy.clone() {
-			Some(r) => {
-				let subrange = block.take().unwrap()[r].to_vec();
-				let hash = blake2sum(&subrange);
-				(subrange, hash)
-			}
-			None => (block.take().unwrap(), *block_hash),
-		};
-		md5hasher.update(&current_block[..]);
-
-		let mut version = Version::new(dest_version_uuid, dest_bucket_id, dest_key.clone(), false);
-		version.blocks.put(
-			VersionBlockKey {
-				part_number,
-				offset: current_offset,
-			},
-			VersionBlock {
-				hash: subrange_hash,
-				size: current_block.len() as u64,
-			},
-		);
-		current_offset += current_block.len() as u64;
-
-		let block_ref = BlockRef {
-			block: subrange_hash,
-			version: dest_version_uuid,
-			deleted: false.into(),
-		};
-
-		let next_block_hash = blocks_to_copy.get(i + 1).map(|(h, _)| *h);
-
-		let garage2 = garage.clone();
-		let garage3 = garage.clone();
-		let is_subrange = range_to_copy.is_some();
-
-		let (_, _, _, next_block) = futures::try_join!(
-			// Thing 1: if we are taking a subrange of the source block,
-			// we need to insert that subrange as a new block.
-			async move {
-				if is_subrange {
-					garage2
-						.block_manager
-						.rpc_put_block(subrange_hash, current_block)
-						.await
-				} else {
-					Ok(())
-				}
-			},
-			// Thing 2: we need to insert the block in the version
-			garage.version_table.insert(&version),
-			// Thing 3: we need to add a block reference
-			garage.block_ref_table.insert(&block_ref),
-			// Thing 4: we need to prefetch the next block
-			async move {
-				match next_block_hash {
-					Some(h) => Ok(Some(garage3.block_manager.rpc_get_block(&h).await?)),
-					None => Ok(None),
-				}
-			},
-		)?;
-
-		block = next_block;
-	}
-
-	let data_md5sum = md5hasher.finalize();
-	let etag = hex::encode(data_md5sum);
-
-	// Put the part's ETag in the Versiontable
-	let mut version = Version::new(dest_version_uuid, dest_bucket_id, dest_key.clone(), false);
-	version.parts_etags.put(part_number, etag.clone());
-	garage.version_table.insert(&version).await?;
-
-	// LGTM
-	let resp_xml = s3_xml::to_xml_with_header(&CopyPartResult {
-		xmlns: (),
-		etag: s3_xml::Value(format!("\"{}\"", etag)),
-		last_modified: s3_xml::Value(msec_to_rfc3339(source_object_version.timestamp)),
-	})?;
-
-	Ok(Response::builder()
-		.header("Content-Type", "application/xml")
-		.header(
-			"x-amz-copy-source-version-id",
-			hex::encode(source_object_version.uuid),
-		)
-		.body(Body::from(resp_xml))?)
-}
-
-async fn get_copy_source(
-	garage: &Garage,
-	api_key: &Key,
-	req: &Request<Body>,
-) -> Result<Object, Error> {
-	let copy_source = req.headers().get("x-amz-copy-source").unwrap().to_str()?;
-	let copy_source = percent_encoding::percent_decode_str(copy_source).decode_utf8()?;
-
-	let (source_bucket, source_key) = parse_bucket_key(&copy_source, None)?;
-	let source_bucket_id = resolve_bucket(garage, &source_bucket.to_string(), api_key).await?;
-
-	if !api_key.allow_read(&source_bucket_id) {
-		return Err(Error::Forbidden(format!(
-			"Reading from bucket {} not allowed for this key",
-			source_bucket
-		)));
-	}
-
-	let source_key = source_key.ok_or_bad_request("No source key specified")?;
-
-	let source_object = garage
-		.object_table
-		.get(&source_bucket_id, &source_key.to_string())
-		.await?
-		.ok_or(Error::NoSuchKey)?;
-
-	Ok(source_object)
-}
-
-fn extract_source_info(
-	source_object: &Object,
-) -> Result<(&ObjectVersion, &ObjectVersionData, &ObjectVersionMeta), Error> {
-	let source_version = source_object
-		.versions()
-		.iter()
-		.rev()
-		.find(|v| v.is_complete())
-		.ok_or(Error::NoSuchKey)?;
-
-	let source_version_data = match &source_version.state {
-		ObjectVersionState::Complete(x) => x,
-		_ => unreachable!(),
-	};
-
-	let source_version_meta = match source_version_data {
-		ObjectVersionData::DeleteMarker => {
-			return Err(Error::NoSuchKey);
-		}
-		ObjectVersionData::Inline(meta, _bytes) => meta,
-		ObjectVersionData::FirstBlock(meta, _fbh) => meta,
-	};
-
-	Ok((source_version, source_version_data, source_version_meta))
-}
-
-struct CopyPreconditionHeaders {
-	copy_source_if_match: Option<Vec<String>>,
-	copy_source_if_modified_since: Option<SystemTime>,
-	copy_source_if_none_match: Option<Vec<String>>,
-	copy_source_if_unmodified_since: Option<SystemTime>,
-}
-
-impl CopyPreconditionHeaders {
-	fn parse(req: &Request<Body>) -> Result<Self, Error> {
-		Ok(Self {
-			copy_source_if_match: req
-				.headers()
-				.get("x-amz-copy-source-if-match")
-				.map(|x| x.to_str())
-				.transpose()?
-				.map(|x| {
-					x.split(',')
-						.map(|m| m.trim().trim_matches('"').to_string())
-						.collect::<Vec<_>>()
-				}),
-			copy_source_if_modified_since: req
-				.headers()
-				.get("x-amz-copy-source-if-modified-since")
-				.map(|x| x.to_str())
-				.transpose()?
-				.map(httpdate::parse_http_date)
-				.transpose()
-				.ok_or_bad_request("Invalid date in x-amz-copy-source-if-modified-since")?,
-			copy_source_if_none_match: req
-				.headers()
-				.get("x-amz-copy-source-if-none-match")
-				.map(|x| x.to_str())
-				.transpose()?
-				.map(|x| {
-					x.split(',')
-						.map(|m| m.trim().trim_matches('"').to_string())
-						.collect::<Vec<_>>()
-				}),
-			copy_source_if_unmodified_since: req
-				.headers()
-				.get("x-amz-copy-source-if-unmodified-since")
-				.map(|x| x.to_str())
-				.transpose()?
-				.map(httpdate::parse_http_date)
-				.transpose()
-				.ok_or_bad_request("Invalid date in x-amz-copy-source-if-unmodified-since")?,
-		})
-	}
-
-	fn check(&self, v: &ObjectVersion, etag: &str) -> Result<(), Error> {
-		let v_date = UNIX_EPOCH + Duration::from_millis(v.timestamp);
-
-		let ok = match (
-			&self.copy_source_if_match,
-			&self.copy_source_if_unmodified_since,
-			&self.copy_source_if_none_match,
-			&self.copy_source_if_modified_since,
-		) {
-			// TODO I'm not sure all of the conditions are evaluated correctly here
-
-			// If we have both if-match and if-unmodified-since,
-			// basically we don't care about if-unmodified-since,
-			// because in the spec it says that if if-match evaluates to
-			// true but if-unmodified-since evaluates to false,
-			// the copy is still done.
-			(Some(im), _, None, None) => im.iter().any(|x| x == etag || x == "*"),
-			(None, Some(ius), None, None) => v_date <= *ius,
-
-			// If we have both if-none-match and if-modified-since,
-			// then both of the two conditions must evaluate to true
-			(None, None, Some(inm), Some(ims)) => {
-				!inm.iter().any(|x| x == etag || x == "*") && v_date > *ims
-			}
-			(None, None, Some(inm), None) => !inm.iter().any(|x| x == etag || x == "*"),
-			(None, None, None, Some(ims)) => v_date > *ims,
-			(None, None, None, None) => true,
-			_ => {
-				return Err(Error::BadRequest(
-					"Invalid combination of x-amz-copy-source-if-xxxxx headers".into(),
-				))
-			}
-		};
-
-		if ok {
-			Ok(())
-		} else {
-			Err(Error::PreconditionFailed)
-		}
-	}
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct CopyObjectResult {
-	#[serde(rename = "LastModified")]
-	pub last_modified: s3_xml::Value,
-	#[serde(rename = "ETag")]
-	pub etag: s3_xml::Value,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct CopyPartResult {
-	#[serde(serialize_with = "xmlns_tag")]
-	pub xmlns: (),
-	#[serde(rename = "LastModified")]
-	pub last_modified: s3_xml::Value,
-	#[serde(rename = "ETag")]
-	pub etag: s3_xml::Value,
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::s3_xml::to_xml_with_header;
-
-	#[test]
-	fn copy_object_result() -> Result<(), Error> {
-		let copy_result = CopyObjectResult {
-			last_modified: s3_xml::Value(msec_to_rfc3339(0)),
-			etag: s3_xml::Value("\"9b2cf535f27731c974343645a3985328\"".to_string()),
-		};
-		assert_eq!(
-			to_xml_with_header(&copy_result)?,
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
-<CopyObjectResult>\
-    <LastModified>1970-01-01T00:00:00.000Z</LastModified>\
-    <ETag>&quot;9b2cf535f27731c974343645a3985328&quot;</ETag>\
-</CopyObjectResult>\
-			"
-		);
-		Ok(())
-	}
-
-	#[test]
-	fn serialize_copy_part_result() -> Result<(), Error> {
-		let expected_retval = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
-<CopyPartResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">\
-	<LastModified>2011-04-11T20:34:56.000Z</LastModified>\
-	<ETag>&quot;9b2cf535f27731c974343645a3985328&quot;</ETag>\
-</CopyPartResult>";
-		let v = CopyPartResult {
-			xmlns: (),
-			last_modified: s3_xml::Value("2011-04-11T20:34:56.000Z".into()),
-			etag: s3_xml::Value("\"9b2cf535f27731c974343645a3985328\"".into()),
-		};
-		println!("{}", to_xml_with_header(&v)?);
-
-		assert_eq!(to_xml_with_header(&v)?, expected_retval);
-
-		Ok(())
-	}
-}
@@ -1,391 +0,0 @@
-use quick_xml::de::from_reader;
-use std::sync::Arc;
-
-use http::header::{
-	ACCESS_CONTROL_ALLOW_HEADERS, ACCESS_CONTROL_ALLOW_METHODS, ACCESS_CONTROL_ALLOW_ORIGIN,
-	ACCESS_CONTROL_EXPOSE_HEADERS, ACCESS_CONTROL_REQUEST_HEADERS, ACCESS_CONTROL_REQUEST_METHOD,
-};
-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::{Bucket, CorsRule as GarageCorsRule};
-use garage_model::garage::Garage;
-use garage_table::*;
-use garage_util::data::*;
-
-pub async fn handle_get_cors(bucket: &Bucket) -> Result<Response<Body>, Error> {
-	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?;
-
-	if let Some(content_sha256) = content_sha256 {
-		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())?)
-}
-
-pub async fn handle_options(req: &Request<Body>, bucket: &Bucket) -> Result<Response<Body>, Error> {
-	let origin = req
-		.headers()
-		.get("Origin")
-		.ok_or_bad_request("Missing Origin header")?
-		.to_str()?;
-	let request_method = req
-		.headers()
-		.get(ACCESS_CONTROL_REQUEST_METHOD)
-		.ok_or_bad_request("Missing Access-Control-Request-Method header")?
-		.to_str()?;
-	let request_headers = match req.headers().get(ACCESS_CONTROL_REQUEST_HEADERS) {
-		Some(h) => h.to_str()?.split(',').map(|h| h.trim()).collect::<Vec<_>>(),
-		None => vec![],
-	};
-
-	if let Some(cors_config) = bucket.params().unwrap().cors_config.get() {
-		let matching_rule = cors_config
-			.iter()
-			.find(|rule| cors_rule_matches(rule, origin, request_method, request_headers.iter()));
-		if let Some(rule) = matching_rule {
-			let mut resp = Response::builder()
-				.status(StatusCode::OK)
-				.body(Body::empty())?;
-			add_cors_headers(&mut resp, rule).ok_or_internal_error("Invalid CORS configuration")?;
-			return Ok(resp);
-		}
-	}
-
-	Err(Error::Forbidden("This CORS request is not allowed.".into()))
-}
-
-pub fn find_matching_cors_rule<'a>(
-	bucket: &'a Bucket,
-	req: &Request<Body>,
-) -> Result<Option<&'a GarageCorsRule>, Error> {
-	if let Some(cors_config) = bucket.params().unwrap().cors_config.get() {
-		if let Some(origin) = req.headers().get("Origin") {
-			let origin = origin.to_str()?;
-			let request_headers = match req.headers().get(ACCESS_CONTROL_REQUEST_HEADERS) {
-				Some(h) => h.to_str()?.split(',').map(|h| h.trim()).collect::<Vec<_>>(),
-				None => vec![],
-			};
-			return Ok(cors_config.iter().find(|rule| {
-				cors_rule_matches(
-					rule,
-					origin,
-					&req.method().to_string(),
-					request_headers.iter(),
-				)
-			}));
-		}
-	}
-	Ok(None)
-}
-
-fn cors_rule_matches<'a, HI, S>(
-	rule: &GarageCorsRule,
-	origin: &'a str,
-	method: &'a str,
-	mut request_headers: HI,
-) -> bool
-where
-	HI: Iterator<Item = S>,
-	S: AsRef<str>,
-{
-	rule.allow_origins.iter().any(|x| x == "*" || x == origin)
-		&& rule.allow_methods.iter().any(|x| x == "*" || x == method)
-		&& request_headers.all(|h| {
-			rule.allow_headers
-				.iter()
-				.any(|x| x == "*" || x == h.as_ref())
-		})
-}
-
-pub fn add_cors_headers(
-	resp: &mut Response<Body>,
-	rule: &GarageCorsRule,
-) -> Result<(), http::header::InvalidHeaderValue> {
-	let h = resp.headers_mut();
-	h.insert(
-		ACCESS_CONTROL_ALLOW_ORIGIN,
-		rule.allow_origins.join(", ").parse()?,
-	);
-	h.insert(
-		ACCESS_CONTROL_ALLOW_METHODS,
-		rule.allow_methods.join(", ").parse()?,
-	);
-	h.insert(
-		ACCESS_CONTROL_ALLOW_HEADERS,
-		rule.allow_headers.join(", ").parse()?,
-	);
-	h.insert(
-		ACCESS_CONTROL_EXPOSE_HEADERS,
-		rule.expose_headers.join(", ").parse()?,
-	);
-	Ok(())
-}
-
-// ---- SERIALIZATION AND DESERIALIZATION TO/FROM S3 XML ----
-
-#[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),
-			allow_origins: convert_vec(&self.allowed_origins),
-			allow_methods: convert_vec(&self.allowed_methods),
-			allow_headers: convert_vec(&self.allowed_headers),
-			expose_headers: convert_vec(&self.expose_headers),
-		}
-	}
-
-	pub fn from_garage_cors_rule(rule: &GarageCorsRule) -> Self {
-		let convert_vec = |vval: &[String]| {
-			vval.iter()
-				.map(|x| Value(x.clone()))
-				.collect::<Vec<Value>>()
-		};
-		Self {
-			id: rule.id.as_ref().map(|x| Value(x.clone())),
-			max_age_seconds: rule.max_age_seconds.map(|x| IntValue(x as i64)),
-			allowed_origins: convert_vec(&rule.allow_origins),
-			allowed_methods: convert_vec(&rule.allow_methods),
-			allowed_headers: convert_vec(&rule.allow_headers),
-			expose_headers: convert_vec(&rule.expose_headers),
-		}
-	}
-}
-
-#[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(())
-	}
-}
@@ -14,14 +14,14 @@ use crate::signature::verify_signed_content;

 async fn handle_delete_internal(
 	garage: &Garage,
-	bucket_id: Uuid,
+	bucket: &str,
 	key: &str,
 ) -> Result<(Uuid, Uuid), Error> {
 	let object = garage
 		.object_table
-		.get(&bucket_id, &key.to_string())
+		.get(&bucket.to_string(), &key.to_string())
 		.await?
-		.ok_or(Error::NoSuchKey)?; // No need to delete
+		.ok_or(Error::NotFound)?; // No need to delete

 	let interesting_versions = object.versions().iter().filter(|v| {
 		!matches!(
@@ -40,12 +40,12 @@ async fn handle_delete_internal(
 		timestamp = std::cmp::max(timestamp, v.timestamp + 1);
 	}

-	let deleted_version = version_to_delete.ok_or(Error::NoSuchKey)?;
+	let deleted_version = version_to_delete.ok_or(Error::NotFound)?;

 	let version_uuid = gen_uuid();

 	let object = Object::new(
-		bucket_id,
+		bucket.into(),
 		key.into(),
 		vec![ObjectVersion {
 			uuid: version_uuid,
@@ -61,11 +61,11 @@ async fn handle_delete_internal(

 pub async fn handle_delete(
 	garage: Arc<Garage>,
-	bucket_id: Uuid,
+	bucket: &str,
 	key: &str,
 ) -> Result<Response<Body>, Error> {
 	let (_deleted_version, delete_marker_version) =
-		handle_delete_internal(&garage, bucket_id, key).await?;
+		handle_delete_internal(&garage, bucket, key).await?;

 	Ok(Response::builder()
 		.header("x-amz-version-id", hex::encode(delete_marker_version))
@@ -76,15 +76,12 @@ pub async fn handle_delete(

 pub async fn handle_delete_objects(
 	garage: Arc<Garage>,
-	bucket_id: Uuid,
+	bucket: &str,
 	req: Request<Body>,
 	content_sha256: Option<Hash>,
 ) -> Result<Response<Body>, Error> {
 	let body = hyper::body::to_bytes(req.into_body()).await?;
-
-	if let Some(content_sha256) = content_sha256 {
-		verify_signed_content(content_sha256, &body[..])?;
-	}
+	verify_signed_content(content_sha256, &body[..])?;

 	let cmd_xml = roxmltree::Document::parse(std::str::from_utf8(&body)?)?;
 	let cmd = parse_delete_objects_xml(&cmd_xml).ok_or_bad_request("Invalid delete XML query")?;
@@ -93,7 +90,7 @@ pub async fn handle_delete_objects(
 	let mut ret_errors = Vec::new();

 	for obj in cmd.objects.iter() {
-		match handle_delete_internal(&garage, bucket_id, &obj.key).await {
+		match handle_delete_internal(&garage, bucket, &obj.key).await {
 			Ok((deleted_version, delete_marker_version)) => {
 				if cmd.quiet {
 					continue;
@@ -3,24 +3,16 @@ use std::sync::Arc;
 use std::time::{Duration, UNIX_EPOCH};

 use futures::stream::*;
-use http::header::{
-	ACCEPT_RANGES, CONTENT_LENGTH, CONTENT_RANGE, CONTENT_TYPE, ETAG, IF_MODIFIED_SINCE,
-	IF_NONE_MATCH, LAST_MODIFIED, RANGE,
-};
 use hyper::body::Bytes;
 use hyper::{Body, Request, Response, StatusCode};

 use garage_table::EmptyKey;
-use garage_util::data::*;

 use garage_model::garage::Garage;
 use garage_model::object_table::*;
-use garage_model::version_table::*;

 use crate::error::*;

-const X_AMZ_MP_PARTS_COUNT: &str = "x-amz-mp-parts-count";
-
 fn object_headers(
 	version: &ObjectVersion,
 	version_meta: &ObjectVersionMeta,
@@ -31,12 +23,15 @@ fn object_headers(
 	let date_str = httpdate::fmt_http_date(date);

 	let mut resp = Response::builder()
-		.header(CONTENT_TYPE, version_meta.headers.content_type.to_string())
-		.header(LAST_MODIFIED, date_str)
-		.header(ACCEPT_RANGES, "bytes".to_string());
+		.header(
+			"Content-Type",
+			version_meta.headers.content_type.to_string(),
+		)
+		.header("Last-Modified", date_str)
+		.header("Accept-Ranges", "bytes".to_string());

 	if !version_meta.etag.is_empty() {
-		resp = resp.header(ETAG, format!("\"{}\"", version_meta.etag));
+		resp = resp.header("ETag", format!("\"{}\"", version_meta.etag));
 	}

 	for (k, v) in version_meta.headers.other.iter() {
@@ -56,7 +51,7 @@ fn try_answer_cached(
 	// precedence and If-Modified-Since is ignored (as per 6.Precedence from rfc7232). The rational
 	// being that etag based matching is more accurate, it has no issue with sub-second precision
 	// for instance (in case of very fast updates)
-	let cached = if let Some(none_match) = req.headers().get(IF_NONE_MATCH) {
+	let cached = if let Some(none_match) = req.headers().get(http::header::IF_NONE_MATCH) {
 		let none_match = none_match.to_str().ok()?;
 		let expected = format!("\"{}\"", version_meta.etag);
 		let found = none_match
@@ -64,7 +59,7 @@ fn try_answer_cached(
 			.map(str::trim)
 			.any(|etag| etag == expected || etag == "\"*\"");
 		found
-	} else if let Some(modified_since) = req.headers().get(IF_MODIFIED_SINCE) {
+	} else if let Some(modified_since) = req.headers().get(http::header::IF_MODIFIED_SINCE) {
 		let modified_since = modified_since.to_str().ok()?;
 		let client_date = httpdate::parse_http_date(modified_since).ok()?;
 		let server_date = UNIX_EPOCH + Duration::from_millis(version.timestamp);
@@ -89,117 +84,67 @@ fn try_answer_cached(
 pub async fn handle_head(
 	garage: Arc<Garage>,
 	req: &Request<Body>,
-	bucket_id: Uuid,
+	bucket: &str,
 	key: &str,
-	part_number: Option<u64>,
 ) -> Result<Response<Body>, Error> {
 	let object = garage
 		.object_table
-		.get(&bucket_id, &key.to_string())
+		.get(&bucket.to_string(), &key.to_string())
 		.await?
-		.ok_or(Error::NoSuchKey)?;
+		.ok_or(Error::NotFound)?;

-	let object_version = object
+	let version = object
 		.versions()
 		.iter()
 		.rev()
 		.find(|v| v.is_data())
-		.ok_or(Error::NoSuchKey)?;
+		.ok_or(Error::NotFound)?;

-	let version_data = match &object_version.state {
-		ObjectVersionState::Complete(c) => c,
+	let version_meta = match &version.state {
+		ObjectVersionState::Complete(ObjectVersionData::Inline(meta, _)) => meta,
+		ObjectVersionState::Complete(ObjectVersionData::FirstBlock(meta, _)) => meta,
 		_ => unreachable!(),
 	};

-	let version_meta = match version_data {
-		ObjectVersionData::Inline(meta, _) => meta,
-		ObjectVersionData::FirstBlock(meta, _) => meta,
-		_ => unreachable!(),
-	};
-
-	if let Some(cached) = try_answer_cached(object_version, version_meta, req) {
+	if let Some(cached) = try_answer_cached(version, version_meta, req) {
 		return Ok(cached);
 	}

-	if let Some(pn) = part_number {
-		match version_data {
-			ObjectVersionData::Inline(_, bytes) => {
-				if pn != 1 {
-					return Err(Error::InvalidPart);
-				}
-				Ok(object_headers(object_version, version_meta)
-					.header(CONTENT_LENGTH, format!("{}", bytes.len()))
-					.header(
-						CONTENT_RANGE,
-						format!("bytes 0-{}/{}", bytes.len() - 1, bytes.len()),
-					)
-					.header(X_AMZ_MP_PARTS_COUNT, "1")
-					.status(StatusCode::PARTIAL_CONTENT)
-					.body(Body::empty())?)
-			}
-			ObjectVersionData::FirstBlock(_, _) => {
-				let version = garage
-					.version_table
-					.get(&object_version.uuid, &EmptyKey)
-					.await?
-					.ok_or(Error::NoSuchKey)?;
-
-				let (part_offset, part_end) =
-					calculate_part_bounds(&version, pn).ok_or(Error::InvalidPart)?;
-				let n_parts = version.parts_etags.items().len();
-
-				Ok(object_headers(object_version, version_meta)
-					.header(CONTENT_LENGTH, format!("{}", part_end - part_offset))
-					.header(
-						CONTENT_RANGE,
-						format!(
-							"bytes {}-{}/{}",
-							part_offset,
-							part_end - 1,
-							version_meta.size
-						),
-					)
-					.header(X_AMZ_MP_PARTS_COUNT, format!("{}", n_parts))
-					.status(StatusCode::PARTIAL_CONTENT)
-					.body(Body::empty())?)
-			}
-			_ => unreachable!(),
-		}
-	} else {
-		Ok(object_headers(object_version, version_meta)
-			.header(CONTENT_LENGTH, format!("{}", version_meta.size))
-			.status(StatusCode::OK)
-			.body(Body::empty())?)
-	}
+	let body: Body = Body::empty();
+	let response = object_headers(version, version_meta)
+		.header("Content-Length", format!("{}", version_meta.size))
+		.status(StatusCode::OK)
+		.body(body)
+		.unwrap();
+	Ok(response)
 }

 /// Handle GET request
 pub async fn handle_get(
 	garage: Arc<Garage>,
 	req: &Request<Body>,
-	bucket_id: Uuid,
+	bucket: &str,
 	key: &str,
-	part_number: Option<u64>,
 ) -> Result<Response<Body>, Error> {
 	let object = garage
 		.object_table
-		.get(&bucket_id, &key.to_string())
+		.get(&bucket.to_string(), &key.to_string())
 		.await?
-		.ok_or(Error::NoSuchKey)?;
+		.ok_or(Error::NotFound)?;

 	let last_v = object
 		.versions()
 		.iter()
 		.rev()
 		.find(|v| v.is_complete())
-		.ok_or(Error::NoSuchKey)?;
+		.ok_or(Error::NotFound)?;

 	let last_v_data = match &last_v.state {
 		ObjectVersionState::Complete(x) => x,
 		_ => unreachable!(),
 	};
 	let last_v_meta = match last_v_data {
-		ObjectVersionData::DeleteMarker => return Err(Error::NoSuchKey),
+		ObjectVersionData::DeleteMarker => return Err(Error::NotFound),
 		ObjectVersionData::Inline(meta, _) => meta,
 		ObjectVersionData::FirstBlock(meta, _) => meta,
 	};
@@ -208,31 +153,35 @@ pub async fn handle_get(
 		return Ok(cached);
 	}

-	match (part_number, parse_range_header(req, last_v_meta.size)?) {
-		(Some(_), Some(_)) => {
-			return Err(Error::BadRequest(
-				"Cannot specify both partNumber and Range header".into(),
-			));
+	let range = match req.headers().get("range") {
+		Some(range) => {
+			let range_str = range.to_str()?;
+			let mut ranges = http_range::HttpRange::parse(range_str, last_v_meta.size)
+				.map_err(|e| (e, last_v_meta.size))?;
+			if ranges.len() > 1 {
+				// garage does not support multi-range requests yet, so we respond with the entire
+				// object when multiple ranges are requested
+				None
+			} else {
+				ranges.pop()
+			}
 		}
-		(Some(pn), None) => {
-			return handle_get_part(garage, last_v, last_v_data, last_v_meta, pn).await;
-		}
-		(None, Some(range)) => {
-			return handle_get_range(
-				garage,
-				last_v,
-				last_v_data,
-				last_v_meta,
-				range.start,
-				range.start + range.length,
-			)
-			.await;
-		}
-		(None, None) => (),
+		None => None,
+	};
+	if let Some(range) = range {
+		return handle_get_range(
+			garage,
+			last_v,
+			last_v_data,
+			last_v_meta,
+			range.start,
+			range.start + range.length,
+		)
+		.await;
 	}

 	let resp_builder = object_headers(last_v, last_v_meta)
-		.header(CONTENT_LENGTH, format!("{}", last_v_meta.size))
+		.header("Content-Length", format!("{}", last_v_meta.size))
 		.status(StatusCode::OK);

 	match &last_v_data {
@@ -246,7 +195,7 @@ pub async fn handle_get(
 			let get_next_blocks = garage.version_table.get(&last_v.uuid, &EmptyKey);

 			let (first_block, version) = futures::try_join!(read_first_block, get_next_blocks)?;
-			let version = version.ok_or(Error::NoSuchKey)?;
+			let version = version.ok_or(Error::NotFound)?;

 			let mut blocks = version
 				.blocks
@@ -288,9 +237,9 @@ async fn handle_get_range(
 	end: u64,
 ) -> Result<Response<Body>, Error> {
 	let resp_builder = object_headers(version, version_meta)
-		.header(CONTENT_LENGTH, format!("{}", end - begin))
+		.header("Content-Length", format!("{}", end - begin))
 		.header(
-			CONTENT_RANGE,
+			"Content-Range",
 			format!("bytes {}-{}/{}", begin, end - 1, version_meta.size),
 		)
 		.status(StatusCode::PARTIAL_CONTENT);
@@ -308,154 +257,58 @@ async fn handle_get_range(
 			}
 		}
 		ObjectVersionData::FirstBlock(_meta, _first_block_hash) => {
-			let version = garage
-				.version_table
-				.get(&version.uuid, &EmptyKey)
-				.await?
-				.ok_or(Error::NoSuchKey)?;
+			let version = garage.version_table.get(&version.uuid, &EmptyKey).await?;
+			let version = match version {
+				Some(v) => v,
+				None => return Err(Error::NotFound),
+			};

-			let body = body_from_blocks_range(garage, version.blocks.items(), begin, end);
+			// We will store here the list of blocks that have an intersection with the requested
+			// range, as well as their "true offset", which is their actual offset in the complete
+			// file (whereas block.offset designates the offset of the block WITHIN THE PART
+			// block.part_number, which is not the same in the case of a multipart upload)
+			let mut blocks = Vec::with_capacity(std::cmp::min(
+				version.blocks.len(),
+				4 + ((end - begin) / std::cmp::max(version.blocks.items()[0].1.size as u64, 1024))
+					as usize,
+			));
+			let mut true_offset = 0;
+			for (_, b) in version.blocks.items().iter() {
+				if true_offset >= end {
+					break;
+				}
+				// Keep only blocks that have an intersection with the requested range
+				if true_offset < end && true_offset + b.size > begin {
+					blocks.push((*b, true_offset));
+				}
+				true_offset += b.size;
+			}
+
+			let body_stream = futures::stream::iter(blocks)
+				.map(move |(block, true_offset)| {
+					let garage = garage.clone();
+					async move {
+						let data = garage.block_manager.rpc_get_block(&block.hash).await?;
+						let data = Bytes::from(data);
+						let start_in_block = if true_offset > begin {
+							0
+						} else {
+							begin - true_offset
+						};
+						let end_in_block = if true_offset + block.size < end {
+							block.size
+						} else {
+							end - true_offset
+						};
+						Result::<Bytes, Error>::Ok(
+							data.slice(start_in_block as usize..end_in_block as usize),
+						)
+					}
+				})
+				.buffered(2);
+
+			let body = hyper::body::Body::wrap_stream(body_stream);
 			Ok(resp_builder.body(body)?)
 		}
 	}
 }
-
-async fn handle_get_part(
-	garage: Arc<Garage>,
-	object_version: &ObjectVersion,
-	version_data: &ObjectVersionData,
-	version_meta: &ObjectVersionMeta,
-	part_number: u64,
-) -> Result<Response<Body>, Error> {
-	let resp_builder =
-		object_headers(object_version, version_meta).status(StatusCode::PARTIAL_CONTENT);
-
-	match version_data {
-		ObjectVersionData::Inline(_, bytes) => {
-			if part_number != 1 {
-				return Err(Error::InvalidPart);
-			}
-			Ok(resp_builder
-				.header(CONTENT_LENGTH, format!("{}", bytes.len()))
-				.header(
-					CONTENT_RANGE,
-					format!("bytes {}-{}/{}", 0, bytes.len() - 1, bytes.len()),
-				)
-				.header(X_AMZ_MP_PARTS_COUNT, "1")
-				.body(Body::from(bytes.to_vec()))?)
-		}
-		ObjectVersionData::FirstBlock(_, _) => {
-			let version = garage
-				.version_table
-				.get(&object_version.uuid, &EmptyKey)
-				.await?
-				.ok_or(Error::NoSuchKey)?;
-
-			let (begin, end) =
-				calculate_part_bounds(&version, part_number).ok_or(Error::InvalidPart)?;
-			let n_parts = version.parts_etags.items().len();
-
-			let body = body_from_blocks_range(garage, version.blocks.items(), begin, end);
-
-			Ok(resp_builder
-				.header(CONTENT_LENGTH, format!("{}", end - begin))
-				.header(
-					CONTENT_RANGE,
-					format!("bytes {}-{}/{}", begin, end - 1, version_meta.size),
-				)
-				.header(X_AMZ_MP_PARTS_COUNT, format!("{}", n_parts))
-				.body(body)?)
-		}
-		_ => unreachable!(),
-	}
-}
-
-fn parse_range_header(
-	req: &Request<Body>,
-	total_size: u64,
-) -> Result<Option<http_range::HttpRange>, Error> {
-	let range = match req.headers().get(RANGE) {
-		Some(range) => {
-			let range_str = range.to_str()?;
-			let mut ranges =
-				http_range::HttpRange::parse(range_str, total_size).map_err(|e| (e, total_size))?;
-			if ranges.len() > 1 {
-				// garage does not support multi-range requests yet, so we respond with the entire
-				// object when multiple ranges are requested
-				None
-			} else {
-				ranges.pop()
-			}
-		}
-		None => None,
-	};
-	Ok(range)
-}
-
-fn calculate_part_bounds(v: &Version, part_number: u64) -> Option<(u64, u64)> {
-	let mut offset = 0;
-	for (i, (bk, bv)) in v.blocks.items().iter().enumerate() {
-		if bk.part_number == part_number {
-			let size: u64 = v.blocks.items()[i..]
-				.iter()
-				.take_while(|(k, _)| k.part_number == part_number)
-				.map(|(_, v)| v.size)
-				.sum();
-			return Some((offset, offset + size));
-		}
-		offset += bv.size;
-	}
-	None
-}
-
-fn body_from_blocks_range(
-	garage: Arc<Garage>,
-	all_blocks: &[(VersionBlockKey, VersionBlock)],
-	begin: u64,
-	end: u64,
-) -> Body {
-	// We will store here the list of blocks that have an intersection with the requested
-	// range, as well as their "true offset", which is their actual offset in the complete
-	// file (whereas block.offset designates the offset of the block WITHIN THE PART
-	// block.part_number, which is not the same in the case of a multipart upload)
-	let mut blocks: Vec<(VersionBlock, u64)> = Vec::with_capacity(std::cmp::min(
-		all_blocks.len(),
-		4 + ((end - begin) / std::cmp::max(all_blocks[0].1.size as u64, 1024)) as usize,
-	));
-	let mut true_offset = 0;
-	for (_, b) in all_blocks.iter() {
-		if true_offset >= end {
-			break;
-		}
-		// Keep only blocks that have an intersection with the requested range
-		if true_offset < end && true_offset + b.size > begin {
-			blocks.push((*b, true_offset));
-		}
-		true_offset += b.size;
-	}
-
-	let body_stream = futures::stream::iter(blocks)
-		.map(move |(block, true_offset)| {
-			let garage = garage.clone();
-			async move {
-				let data = garage.block_manager.rpc_get_block(&block.hash).await?;
-				let data = Bytes::from(data);
-				let start_in_block = if true_offset > begin {
-					0
-				} else {
-					begin - true_offset
-				};
-				let end_in_block = if true_offset + block.size < end {
-					block.size
-				} else {
-					end - true_offset
-				};
-				Result::<Bytes, Error>::Ok(
-					data.slice(start_in_block as usize..end_in_block as usize),
-				)
-			}
-		})
-		.buffered(2);
-
-	hyper::body::Body::wrap_stream(body_stream)
-}
@@ -1,10 +1,8 @@
-use std::collections::{BTreeMap, BTreeSet, VecDeque};
+use std::collections::{BTreeMap, VecDeque};
 use std::sync::Arc;

-use chrono::{DateTime, NaiveDateTime, Utc};
-use futures::{prelude::*, TryFutureExt};
-use hyper::body::{Body, Bytes};
-use hyper::{Request, Response};
+use futures::stream::*;
+use hyper::{Body, Request, Response};
 use md5::{digest::generic_array::*, Digest as Md5Digest, Md5};
 use sha2::Sha256;

@@ -16,23 +14,19 @@ use garage_util::time::*;
 use garage_model::block::INLINE_THRESHOLD;
 use garage_model::block_ref_table::*;
 use garage_model::garage::Garage;
-use garage_model::key_table::Key;
 use garage_model::object_table::*;
 use garage_model::version_table::*;

 use crate::error::*;
 use crate::s3_xml;
-use crate::signature::streaming::SignedPayloadStream;
-use crate::signature::LONG_DATETIME;
-use crate::signature::{compute_scope, verify_signed_content};
+use crate::signature::verify_signed_content;

 pub async fn handle_put(
 	garage: Arc<Garage>,
 	req: Request<Body>,
-	bucket_id: Uuid,
+	bucket: &str,
 	key: &str,
-	api_key: &Key,
-	mut content_sha256: Option<Hash>,
+	content_sha256: Option<Hash>,
 ) -> Result<Response<Body>, Error> {
 	// Generate identity of new version
 	let version_uuid = gen_uuid();
@@ -46,53 +40,11 @@ pub async fn handle_put(
 		Some(x) => Some(x.to_str()?.to_string()),
 		None => None,
 	};
-	let payload_seed_signature = match req.headers().get("x-amz-content-sha256") {
-		Some(header) if header == "STREAMING-AWS4-HMAC-SHA256-PAYLOAD" => {
-			let content_sha256 = content_sha256
-				.take()
-				.ok_or_bad_request("No signature provided")?;
-			Some(content_sha256)
-		}
-		_ => None,
-	};

 	// Parse body of uploaded file
-	let (head, body) = req.into_parts();
-	let body = body.map_err(Error::from);
+	let body = req.into_body();

-	let body = if let Some(signature) = payload_seed_signature {
-		let secret_key = &api_key
-			.state
-			.as_option()
-			.ok_or_internal_error("Deleted key state")?
-			.secret_key;
-
-		let date = head
-			.headers
-			.get("x-amz-date")
-			.ok_or_bad_request("Missing X-Amz-Date field")?
-			.to_str()?;
-		let date: NaiveDateTime =
-			NaiveDateTime::parse_from_str(date, LONG_DATETIME).ok_or_bad_request("Invalid date")?;
-		let date: DateTime<Utc> = DateTime::from_utc(date, Utc);
-
-		let scope = compute_scope(&date, &garage.config.s3_api.s3_region);
-		let signing_hmac = crate::signature::signing_hmac(
-			&date,
-			secret_key,
-			&garage.config.s3_api.s3_region,
-			"s3",
-		)
-		.ok_or_internal_error("Unable to build signing HMAC")?;
-
-		SignedPayloadStream::new(body, signing_hmac, date, &scope, signature)?
-			.map_err(Error::from)
-			.boxed()
-	} else {
-		body.boxed()
-	};
-
-	let mut chunker = StreamChunker::new(body, garage.config.block_size);
+	let mut chunker = BodyChunker::new(body, garage.config.block_size);
 	let first_block = chunker.next().await?.unwrap_or_default();

 	// If body is small enough, store it directly in the object table
@@ -125,7 +77,7 @@ pub async fn handle_put(
 			)),
 		};

-		let object = Object::new(bucket_id, key.into(), vec![object_version]);
+		let object = Object::new(bucket.into(), key.into(), vec![object_version]);
 		garage.object_table.insert(&object).await?;

 		return Ok(put_response(version_uuid, data_md5sum_hex));
@@ -138,14 +90,14 @@ pub async fn handle_put(
 		timestamp: version_timestamp,
 		state: ObjectVersionState::Uploading(headers.clone()),
 	};
-	let object = Object::new(bucket_id, key.into(), vec![object_version.clone()]);
+	let object = Object::new(bucket.into(), key.into(), vec![object_version.clone()]);
 	garage.object_table.insert(&object).await?;

 	// Initialize corresponding entry in version table
 	// Write this entry now, even with empty block list,
 	// to prevent block_ref entries from being deleted (they can be deleted
 	// if the reference a version that isn't found in the version table)
-	let version = Version::new(version_uuid, bucket_id, key.into(), false);
+	let version = Version::new(version_uuid, bucket.into(), key.into(), false);
 	garage.version_table.insert(&version).await?;

 	// Transfer data and verify checksum
@@ -175,7 +127,7 @@ pub async fn handle_put(
 		Err(e) => {
 			// Mark object as aborted, this will free the blocks further down
 			object_version.state = ObjectVersionState::Aborted;
-			let object = Object::new(bucket_id, key.into(), vec![object_version.clone()]);
+			let object = Object::new(bucket.into(), key.into(), vec![object_version.clone()]);
 			garage.object_table.insert(&object).await?;
 			return Err(e);
 		}
@@ -191,7 +143,7 @@ pub async fn handle_put(
 		},
 		first_block_hash,
 	));
-	let object = Object::new(bucket_id, key.into(), vec![object_version]);
+	let object = Object::new(bucket.into(), key.into(), vec![object_version]);
 	garage.object_table.insert(&object).await?;

 	Ok(put_response(version_uuid, md5sum_hex))
@@ -226,13 +178,13 @@ fn ensure_checksum_matches(
 	Ok(())
 }

-async fn read_and_put_blocks<S: Stream<Item = Result<Bytes, Error>> + Unpin>(
+async fn read_and_put_blocks(
 	garage: &Garage,
 	version: &Version,
 	part_number: u64,
 	first_block: Vec<u8>,
 	first_block_hash: Hash,
-	chunker: &mut StreamChunker<S>,
+	chunker: &mut BodyChunker,
 ) -> Result<(u64, GenericArray<u8, typenum::U16>, Hash), Error> {
 	let mut md5hasher = Md5::new();
 	let mut sha256hasher = Sha256::new();
@@ -253,11 +205,8 @@ async fn read_and_put_blocks<S: Stream<Item = Result<Bytes, Error>> + Unpin>(
 		.rpc_put_block(first_block_hash, first_block);

 	loop {
-		let (_, _, next_block) = futures::try_join!(
-			put_curr_block.map_err(Error::from),
-			put_curr_version_block.map_err(Error::from),
-			chunker.next(),
-		)?;
+		let (_, _, next_block) =
+			futures::try_join!(put_curr_block, put_curr_version_block, chunker.next())?;
 		if let Some(block) = next_block {
 			md5hasher.update(&block[..]);
 			sha256hasher.update(&block[..]);
@@ -317,34 +266,32 @@ async fn put_block_meta(
 	Ok(())
 }

-struct StreamChunker<S: Stream<Item = Result<Bytes, Error>>> {
-	stream: S,
+struct BodyChunker {
+	body: Body,
 	read_all: bool,
 	block_size: usize,
 	buf: VecDeque<u8>,
 }

-impl<S: Stream<Item = Result<Bytes, Error>> + Unpin> StreamChunker<S> {
-	fn new(stream: S, block_size: usize) -> Self {
+impl BodyChunker {
+	fn new(body: Body, block_size: usize) -> Self {
 		Self {
-			stream,
+			body,
 			read_all: false,
 			block_size,
 			buf: VecDeque::with_capacity(2 * block_size),
 		}
 	}
-
-	async fn next(&mut self) -> Result<Option<Vec<u8>>, Error> {
+	async fn next(&mut self) -> Result<Option<Vec<u8>>, GarageError> {
 		while !self.read_all && self.buf.len() < self.block_size {
-			if let Some(block) = self.stream.next().await {
+			if let Some(block) = self.body.next().await {
 				let bytes = block?;
 				trace!("Body next: {} bytes", bytes.len());
-				self.buf.extend(bytes);
+				self.buf.extend(&bytes[..]);
 			} else {
 				self.read_all = true;
 			}
 		}
-
 		if self.buf.is_empty() {
 			Ok(None)
 		} else if self.buf.len() <= self.block_size {
@@ -368,8 +315,7 @@ pub fn put_response(version_uuid: Uuid, md5sum_hex: String) -> Response<Body> {
 pub async fn handle_create_multipart_upload(
 	garage: Arc<Garage>,
 	req: &Request<Body>,
-	bucket_name: &str,
-	bucket_id: Uuid,
+	bucket: &str,
 	key: &str,
 ) -> Result<Response<Body>, Error> {
 	let version_uuid = gen_uuid();
@@ -381,20 +327,20 @@ pub async fn handle_create_multipart_upload(
 		timestamp: now_msec(),
 		state: ObjectVersionState::Uploading(headers),
 	};
-	let object = Object::new(bucket_id, key.to_string(), vec![object_version]);
+	let object = Object::new(bucket.to_string(), key.to_string(), vec![object_version]);
 	garage.object_table.insert(&object).await?;

 	// Insert empty version so that block_ref entries refer to something
 	// (they are inserted concurrently with blocks in the version table, so
 	// there is the possibility that they are inserted before the version table
 	// is created, in which case it is allowed to delete them, e.g. in repair_*)
-	let version = Version::new(version_uuid, bucket_id, key.into(), false);
+	let version = Version::new(version_uuid, bucket.into(), key.into(), false);
 	garage.version_table.insert(&version).await?;

 	// Send success response
 	let result = s3_xml::InitiateMultipartUploadResult {
 		xmlns: (),
-		bucket: s3_xml::Value(bucket_name.to_string()),
+		bucket: s3_xml::Value(bucket.to_string()),
 		key: s3_xml::Value(key.to_string()),
 		upload_id: s3_xml::Value(hex::encode(version_uuid)),
 	};
@@ -406,7 +352,7 @@ pub async fn handle_create_multipart_upload(
 pub async fn handle_put_part(
 	garage: Arc<Garage>,
 	req: Request<Body>,
-	bucket_id: Uuid,
+	bucket: &str,
 	key: &str,
 	part_number: u64,
 	upload_id: &str,
@@ -420,47 +366,27 @@ pub async fn handle_put_part(
 	};

 	// Read first chuck, and at the same time try to get object to see if it exists
+	let bucket = bucket.to_string();
 	let key = key.to_string();
+	let mut chunker = BodyChunker::new(req.into_body(), garage.config.block_size);

-	let body = req.into_body().map_err(Error::from);
-	let mut chunker = StreamChunker::new(body, garage.config.block_size);
-
-	let (object, version, first_block) = futures::try_join!(
-		garage
-			.object_table
-			.get(&bucket_id, &key)
-			.map_err(Error::from),
-		garage
-			.version_table
-			.get(&version_uuid, &EmptyKey)
-			.map_err(Error::from),
-		chunker.next(),
-	)?;
+	let (object, first_block) =
+		futures::try_join!(garage.object_table.get(&bucket, &key), chunker.next(),)?;

 	// Check object is valid and multipart block can be accepted
-	let first_block = first_block.ok_or_bad_request("Empty body")?;
-	let object = object.ok_or_bad_request("Object not found")?;
+	let first_block = first_block.ok_or_else(|| Error::BadRequest("Empty body".to_string()))?;
+	let object = object.ok_or_else(|| Error::BadRequest("Object not found".to_string()))?;

 	if !object
 		.versions()
 		.iter()
 		.any(|v| v.uuid == version_uuid && v.is_uploading())
 	{
-		return Err(Error::NoSuchUpload);
-	}
-
-	// Check part hasn't already been uploaded
-	if let Some(v) = version {
-		if v.has_part_number(part_number) {
-			return Err(Error::BadRequest(format!(
-				"Part number {} has already been uploaded",
-				part_number
-			)));
-		}
+		return Err(Error::NotFound);
 	}

 	// Copy block to store
-	let version = Version::new(version_uuid, bucket_id, key, false);
+	let version = Version::new(version_uuid, bucket, key, false);
 	let first_block_hash = blake2sum(&first_block[..]);
 	let (_, data_md5sum, data_sha256sum) = read_and_put_blocks(
 		&garage,
@@ -498,20 +424,16 @@ pub async fn handle_put_part(
 pub async fn handle_complete_multipart_upload(
 	garage: Arc<Garage>,
 	req: Request<Body>,
-	bucket_name: &str,
-	bucket_id: Uuid,
+	bucket: &str,
 	key: &str,
 	upload_id: &str,
 	content_sha256: Option<Hash>,
 ) -> Result<Response<Body>, Error> {
 	let body = hyper::body::to_bytes(req.into_body()).await?;
-
-	if let Some(content_sha256) = content_sha256 {
-		verify_signed_content(content_sha256, &body[..])?;
-	}
+	verify_signed_content(content_sha256, &body[..])?;

 	let body_xml = roxmltree::Document::parse(std::str::from_utf8(&body)?)?;
-	let body_list_of_parts = parse_complete_multipart_upload_body(&body_xml)
+	let body_list_of_parts = parse_complete_multpart_upload_body(&body_xml)
 		.ok_or_bad_request("Invalid CompleteMultipartUpload XML")?;
 	debug!(
 		"CompleteMultipartUpload list of parts: {:?}",
@@ -520,22 +442,22 @@ pub async fn handle_complete_multipart_upload(

 	let version_uuid = decode_upload_id(upload_id)?;

-	// Get object and version
+	let bucket = bucket.to_string();
 	let key = key.to_string();
 	let (object, version) = futures::try_join!(
-		garage.object_table.get(&bucket_id, &key),
+		garage.object_table.get(&bucket, &key),
 		garage.version_table.get(&version_uuid, &EmptyKey),
 	)?;

-	let object = object.ok_or(Error::NoSuchKey)?;
+	let object = object.ok_or_else(|| Error::BadRequest("Object not found".to_string()))?;
 	let mut object_version = object
 		.versions()
 		.iter()
 		.find(|v| v.uuid == version_uuid && v.is_uploading())
 		.cloned()
-		.ok_or(Error::NoSuchUpload)?;
+		.ok_or_else(|| Error::BadRequest("Version not found".to_string()))?;

-	let version = version.ok_or(Error::NoSuchKey)?;
+	let version = version.ok_or_else(|| Error::BadRequest("Version not found".to_string()))?;
 	if version.blocks.is_empty() {
 		return Err(Error::BadRequest("No data was uploaded".to_string()));
 	}
@@ -545,31 +467,6 @@ pub async fn handle_complete_multipart_upload(
 		_ => unreachable!(),
 	};

-	// Check that part numbers are an increasing sequence.
-	// (it doesn't need to start at 1 nor to be a continuous sequence,
-	// see discussion in #192)
-	if body_list_of_parts.is_empty() {
-		return Err(Error::EntityTooSmall);
-	}
-	if !body_list_of_parts
-		.iter()
-		.zip(body_list_of_parts.iter().skip(1))
-		.all(|(p1, p2)| p1.part_number < p2.part_number)
-	{
-		return Err(Error::InvalidPartOrder);
-	}
-
-	// Garage-specific restriction, see #204: part numbers must be
-	// consecutive starting at 1
-	if body_list_of_parts[0].part_number != 1
-		|| !body_list_of_parts
-			.iter()
-			.zip(body_list_of_parts.iter().skip(1))
-			.all(|(p1, p2)| p1.part_number + 1 == p2.part_number)
-	{
-		return Err(Error::NotImplemented("Garage does not support completing a Multipart upload with non-consecutive part numbers. This is a restriction of Garage's data model, which might be fixed in a future release. See issue #204 for more information on this topic.".into()));
-	}
-
 	// Check that the list of parts they gave us corresponds to the parts we have here
 	debug!("Expected parts from request: {:?}", body_list_of_parts);
 	debug!("Parts stored in version: {:?}", version.parts_etags.items());
@@ -582,31 +479,18 @@ pub async fn handle_complete_multipart_upload(
 		.iter()
 		.map(|x| (&x.part_number, &x.etag))
 		.eq(parts);
-	if !same_parts {
-		return Err(Error::InvalidPart);
-	}
-
-	// Check that all blocks belong to one of the parts
-	let block_parts = version
-		.blocks
-		.items()
-		.iter()
-		.map(|(bk, _)| bk.part_number)
-		.collect::<BTreeSet<_>>();
-	let same_parts = body_list_of_parts
-		.iter()
-		.map(|x| x.part_number)
-		.eq(block_parts.into_iter());
 	if !same_parts {
 		return Err(Error::BadRequest(
-			"Part numbers in block list and part list do not match. This can happen if a part was partially uploaded. Please abort the multipart upload and try again.".into(),
+			"We don't have the same parts".to_string(),
 		));
 	}

 	// Calculate etag of final object
 	// To understand how etags are calculated, read more here:
 	// https://teppen.io/2018/06/23/aws_s3_etags/
-	let num_parts = body_list_of_parts.len();
+	let num_parts = version.blocks.items().last().unwrap().0.part_number
+		- version.blocks.items().first().unwrap().0.part_number
+		+ 1;
 	let mut etag_md5_hasher = Md5::new();
 	for (_, etag) in version.parts_etags.items().iter() {
 		etag_md5_hasher.update(etag.as_bytes());
@@ -626,16 +510,16 @@ pub async fn handle_complete_multipart_upload(
 		version.blocks.items()[0].1.hash,
 	));

-	let final_object = Object::new(bucket_id, key.clone(), vec![object_version]);
+	let final_object = Object::new(bucket.clone(), key.clone(), vec![object_version]);
 	garage.object_table.insert(&final_object).await?;

 	// Send response saying ok we're done
 	let result = s3_xml::CompleteMultipartUploadResult {
 		xmlns: (),
 		location: None,
-		bucket: s3_xml::Value(bucket_name.to_string()),
+		bucket: s3_xml::Value(bucket),
 		key: s3_xml::Value(key),
-		etag: s3_xml::Value(format!("\"{}\"", etag)),
+		etag: s3_xml::Value(etag),
 	};
 	let xml = s3_xml::to_xml_with_header(&result)?;

@@ -644,7 +528,7 @@ pub async fn handle_complete_multipart_upload(

 pub async fn handle_abort_multipart_upload(
 	garage: Arc<Garage>,
-	bucket_id: Uuid,
+	bucket: &str,
 	key: &str,
 	upload_id: &str,
 ) -> Result<Response<Body>, Error> {
@@ -652,21 +536,21 @@ pub async fn handle_abort_multipart_upload(

 	let object = garage
 		.object_table
-		.get(&bucket_id, &key.to_string())
+		.get(&bucket.to_string(), &key.to_string())
 		.await?;
-	let object = object.ok_or(Error::NoSuchKey)?;
+	let object = object.ok_or_else(|| Error::BadRequest("Object not found".to_string()))?;

 	let object_version = object
 		.versions()
 		.iter()
 		.find(|v| v.uuid == version_uuid && v.is_uploading());
 	let mut object_version = match object_version {
-		None => return Err(Error::NoSuchUpload),
+		None => return Err(Error::NotFound),
 		Some(x) => x.clone(),
 	};

 	object_version.state = ObjectVersionState::Aborted;
-	let final_object = Object::new(bucket_id, key.to_string(), vec![object_version]);
+	let final_object = Object::new(bucket.to_string(), key.to_string(), vec![object_version]);
 	garage.object_table.insert(&final_object).await?;

 	Ok(Response::new(Body::from(vec![])))
@@ -726,10 +610,10 @@ pub(crate) fn get_headers(req: &Request<Body>) -> Result<ObjectVersionHeaders, E
 	})
 }

-pub fn decode_upload_id(id: &str) -> Result<Uuid, Error> {
-	let id_bin = hex::decode(id).map_err(|_| Error::NoSuchUpload)?;
+fn decode_upload_id(id: &str) -> Result<Uuid, Error> {
+	let id_bin = hex::decode(id).ok_or_bad_request("Invalid upload ID")?;
 	if id_bin.len() != 32 {
-		return Err(Error::NoSuchUpload);
+		return None.ok_or_bad_request("Invalid upload ID");
 	}
 	let mut uuid = [0u8; 32];
 	uuid.copy_from_slice(&id_bin[..]);
@@ -742,7 +626,7 @@ struct CompleteMultipartUploadPart {
 	part_number: u64,
 }

-fn parse_complete_multipart_upload_body(
+fn parse_complete_multpart_upload_body(
 	xml: &roxmltree::Document,
 ) -> Option<Vec<CompleteMultipartUploadPart>> {
 	let mut parts = vec![];
@@ -754,11 +638,6 @@ fn parse_complete_multipart_upload_body(
 	}

 	for item in cmu.children() {
-		// Only parse <Part> nodes
-		if !item.is_element() {
-			continue;
-		}
-
 		if item.has_tag_name("Part") {
 			let etag = item.children().find(|e| e.has_tag_name("ETag"))?.text()?;
 			let part_number = item
@@ -8,17 +8,6 @@ use hyper::{HeaderMap, Method, Request};
 /// This macro is used to generate very repetitive match {} blocks in this module
 /// It is _not_ made to be used anywhere else
 macro_rules! s3_match {
-    (@match $enum:expr , [ $($endpoint:ident,)* ]) => {{
-        // usage: s3_match {@match my_enum, [ VariantWithField1, VariantWithField2 ..] }
-        // returns true if the variant was one of the listed variants, false otherwise.
-        use Endpoint::*;
-        match $enum {
-            $(
-            $endpoint { .. } => true,
-            )*
-            _ => false
-        }
-    }};
    (@extract $enum:expr , $param:ident, [ $($endpoint:ident,)* ]) => {{
        // usage: s3_match {@extract my_enum, field_name, [ VariantWithField1, VariantWithField2 ..] }
        // returns Some(field_value), or None if the variant was not one of the listed variants.
@@ -30,10 +19,10 @@ macro_rules! s3_match {
            _ => None
        }
    }};
-    (@gen_parser ($keyword:expr, $key:expr, $query:expr, $header:expr),
+    (@gen_parser ($keyword:expr, $key:expr, $bucket:expr, $query:expr, $header:expr),
        key: [$($kw_k:ident $(if $required_k:ident)? $(header $header_k:expr)? => $api_k:ident $(($($conv_k:ident :: $param_k:ident),*))?,)*],
        no_key: [$($kw_nk:ident $(if $required_nk:ident)? $(if_header $header_nk:expr)? => $api_nk:ident $(($($conv_nk:ident :: $param_nk:ident),*))?,)*]) => {{
-        // usage: s3_match {@gen_parser (keyword, key, query, header),
+        // usage: s3_match {@gen_parser (keyword, key, bucket, query, header),
        //   key: [
        //      SOME_KEYWORD => VariantWithKey,
        //      ...
@@ -49,6 +38,7 @@ macro_rules! s3_match {
        match ($keyword, !$key.is_empty()){
            $(
            ($kw_k, true) if true $(&& $query.$required_k.is_some())? $(&& $header.contains_key($header_k))? => Ok($api_k {
+                bucket: $bucket,
                key: $key,
                $($(
                    $param_k: s3_match!(@@parse_param $query, $conv_k, $param_k),
@@ -57,6 +47,7 @@ macro_rules! s3_match {
            )*
            $(
            ($kw_nk, false) $(if $query.$required_nk.is_some())? $(if $header.contains($header_nk))? => Ok($api_nk {
+                bucket: $bucket,
                $($(
                    $param_nk: s3_match!(@@parse_param $query, $conv_nk, $param_nk),
                )*)?
@@ -96,6 +87,7 @@ macro_rules! s3_match {
        $(
            $(#[$outer:meta])*
            $variant:ident $({
+                bucket: String,
                $($name:ident: $ty:ty,)*
            })?,
        )*
@@ -105,6 +97,7 @@ macro_rules! s3_match {
            $(
                $(#[$outer])*
                $variant $({
+                    bucket: String,
                    $($name: $ty, )*
                })?,
            )*
@@ -115,6 +108,15 @@ macro_rules! s3_match {
                    $(Endpoint::$variant $({ $($name: _,)* .. })? => stringify!($variant),)*
                }
            }
+
+            /// Get the bucket the request target. Returns None for requests not related to a bucket.
+            pub fn get_bucket(&self) -> Option<&str> {
+                match self {
+                    $(
+                        Endpoint::$variant $({ bucket, $($name: _,)* .. })? => s3_match!{@if ($(bucket $($name)*)?) then (Some(bucket)) else (None)},
+                    )*
+                }
+            }
        }
    };
    (@if ($($cond:tt)+) then ($($then:tt)*) else ($($else:tt)*)) => {
@@ -136,166 +138,224 @@ s3_match! {@func
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Endpoint {
 	AbortMultipartUpload {
+		bucket: String,
 		key: String,
 		upload_id: String,
 	},
 	CompleteMultipartUpload {
+		bucket: String,
 		key: String,
 		upload_id: String,
 	},
 	CopyObject {
+		bucket: String,
 		key: String,
 	},
 	CreateBucket {
+		bucket: String,
 	},
 	CreateMultipartUpload {
+		bucket: String,
 		key: String,
 	},
 	DeleteBucket {
+		bucket: String,
 	},
 	DeleteBucketAnalyticsConfiguration {
+		bucket: String,
 		id: String,
 	},
 	DeleteBucketCors {
+		bucket: String,
 	},
 	DeleteBucketEncryption {
+		bucket: String,
 	},
 	DeleteBucketIntelligentTieringConfiguration {
+		bucket: String,
 		id: String,
 	},
 	DeleteBucketInventoryConfiguration {
+		bucket: String,
 		id: String,
 	},
 	DeleteBucketLifecycle {
+		bucket: String,
 	},
 	DeleteBucketMetricsConfiguration {
+		bucket: String,
 		id: String,
 	},
 	DeleteBucketOwnershipControls {
+		bucket: String,
 	},
 	DeleteBucketPolicy {
+		bucket: String,
 	},
 	DeleteBucketReplication {
+		bucket: String,
 	},
 	DeleteBucketTagging {
+		bucket: String,
 	},
 	DeleteBucketWebsite {
+		bucket: String,
 	},
 	DeleteObject {
+		bucket: String,
 		key: String,
 		version_id: Option<String>,
 	},
 	DeleteObjects {
+		bucket: String,
 	},
 	DeleteObjectTagging {
+		bucket: String,
 		key: String,
 		version_id: Option<String>,
 	},
 	DeletePublicAccessBlock {
+		bucket: String,
 	},
 	GetBucketAccelerateConfiguration {
+		bucket: String,
 	},
 	GetBucketAcl {
+		bucket: String,
 	},
 	GetBucketAnalyticsConfiguration {
+		bucket: String,
 		id: String,
 	},
 	GetBucketCors {
+		bucket: String,
 	},
 	GetBucketEncryption {
+		bucket: String,
 	},
 	GetBucketIntelligentTieringConfiguration {
+		bucket: String,
 		id: String,
 	},
 	GetBucketInventoryConfiguration {
+		bucket: String,
 		id: String,
 	},
 	GetBucketLifecycleConfiguration {
+		bucket: String,
 	},
 	GetBucketLocation {
+		bucket: String,
 	},
 	GetBucketLogging {
+		bucket: String,
 	},
 	GetBucketMetricsConfiguration {
+		bucket: String,
 		id: String,
 	},
 	GetBucketNotificationConfiguration {
+		bucket: String,
 	},
 	GetBucketOwnershipControls {
+		bucket: String,
 	},
 	GetBucketPolicy {
+		bucket: String,
 	},
 	GetBucketPolicyStatus {
+		bucket: String,
 	},
 	GetBucketReplication {
+		bucket: String,
 	},
 	GetBucketRequestPayment {
+		bucket: String,
 	},
 	GetBucketTagging {
+		bucket: String,
 	},
 	GetBucketVersioning {
+		bucket: String,
 	},
 	GetBucketWebsite {
+		bucket: String,
 	},
 	/// There are actually many more query parameters, used to add headers to the answer. They were
 	/// not added here as they are best handled in a dedicated route.
 	GetObject {
+		bucket: String,
 		key: String,
 		part_number: Option<u64>,
 		version_id: Option<String>,
 	},
 	GetObjectAcl {
+		bucket: String,
 		key: String,
 		version_id: Option<String>,
 	},
 	GetObjectLegalHold {
+		bucket: String,
 		key: String,
 		version_id: Option<String>,
 	},
 	GetObjectLockConfiguration {
+		bucket: String,
 	},
 	GetObjectRetention {
+		bucket: String,
 		key: String,
 		version_id: Option<String>,
 	},
 	GetObjectTagging {
+		bucket: String,
 		key: String,
 		version_id: Option<String>,
 	},
 	GetObjectTorrent {
+		bucket: String,
 		key: String,
 	},
 	GetPublicAccessBlock {
+		bucket: String,
 	},
 	HeadBucket {
+		bucket: String,
 	},
 	HeadObject {
+		bucket: String,
 		key: String,
 		part_number: Option<u64>,
 		version_id: Option<String>,
 	},
 	ListBucketAnalyticsConfigurations {
+		bucket: String,
 		continuation_token: Option<String>,
 	},
 	ListBucketIntelligentTieringConfigurations {
+		bucket: String,
 		continuation_token: Option<String>,
 	},
 	ListBucketInventoryConfigurations {
+		bucket: String,
 		continuation_token: Option<String>,
 	},
 	ListBucketMetricsConfigurations {
+		bucket: String,
 		continuation_token: Option<String>,
 	},
 	ListBuckets,
 	ListMultipartUploads {
+		bucket: String,
 		delimiter: Option<char>,
 		encoding_type: Option<String>,
 		key_marker: Option<String>,
-		max_uploads: Option<usize>,
+		max_uploads: Option<u64>,
 		prefix: Option<String>,
 		upload_id_marker: Option<String>,
 	},
 	ListObjects {
+		bucket: String,
 		delimiter: Option<char>,
 		encoding_type: Option<String>,
 		marker: Option<String>,
@@ -303,6 +363,7 @@ pub enum Endpoint {
 		prefix: Option<String>,
 	},
 	ListObjectsV2 {
+		bucket: String,
 		// This value should always be 2. It is not checked when constructing the struct
 		list_type: String,
 		continuation_token: Option<String>,
@@ -314,6 +375,7 @@ pub enum Endpoint {
 		start_after: Option<String>,
 	},
 	ListObjectVersions {
+		bucket: String,
 		delimiter: Option<char>,
 		encoding_type: Option<String>,
 		key_marker: Option<String>,
@@ -322,90 +384,119 @@ pub enum Endpoint {
 		version_id_marker: Option<String>,
 	},
 	ListParts {
+		bucket: String,
 		key: String,
 		max_parts: Option<u64>,
 		part_number_marker: Option<u64>,
 		upload_id: String,
 	},
-	Options,
 	PutBucketAccelerateConfiguration {
+		bucket: String,
 	},
 	PutBucketAcl {
+		bucket: String,
 	},
 	PutBucketAnalyticsConfiguration {
+		bucket: String,
 		id: String,
 	},
 	PutBucketCors {
+		bucket: String,
 	},
 	PutBucketEncryption {
+		bucket: String,
 	},
 	PutBucketIntelligentTieringConfiguration {
+		bucket: String,
 		id: String,
 	},
 	PutBucketInventoryConfiguration {
+		bucket: String,
 		id: String,
 	},
 	PutBucketLifecycleConfiguration {
+		bucket: String,
 	},
 	PutBucketLogging {
+		bucket: String,
 	},
 	PutBucketMetricsConfiguration {
+		bucket: String,
 		id: String,
 	},
 	PutBucketNotificationConfiguration {
+		bucket: String,
 	},
 	PutBucketOwnershipControls {
+		bucket: String,
 	},
 	PutBucketPolicy {
+		bucket: String,
 	},
 	PutBucketReplication {
+		bucket: String,
 	},
 	PutBucketRequestPayment {
+		bucket: String,
 	},
 	PutBucketTagging {
+		bucket: String,
 	},
 	PutBucketVersioning {
+		bucket: String,
 	},
 	PutBucketWebsite {
+		bucket: String,
 	},
 	PutObject {
+		bucket: String,
 		key: String,
 	},
 	PutObjectAcl {
+		bucket: String,
 		key: String,
 		version_id: Option<String>,
 	},
 	PutObjectLegalHold {
+		bucket: String,
 		key: String,
 		version_id: Option<String>,
 	},
 	PutObjectLockConfiguration {
+		bucket: String,
 	},
 	PutObjectRetention {
+		bucket: String,
 		key: String,
 		version_id: Option<String>,
 	},
 	PutObjectTagging {
+		bucket: String,
 		key: String,
 		version_id: Option<String>,
 	},
 	PutPublicAccessBlock {
+		bucket: String,
 	},
 	RestoreObject {
+		bucket: String,
 		key: String,
 		version_id: Option<String>,
 	},
 	SelectObjectContent {
+		bucket: String,
 		key: String,
 		// This value should always be 2. It is not checked when constructing the struct
 		select_type: String,
 	},
 	UploadPart {
+		bucket: String,
 		key: String,
 		part_number: u64,
 		upload_id: String,
 	},
 	UploadPartCopy {
+		bucket: String,
 		key: String,
 		part_number: u64,
 		upload_id: String,
@@ -415,16 +506,12 @@ pub enum Endpoint {
 impl Endpoint {
 	/// Determine which S3 endpoint a request is for using the request, and a bucket which was
 	/// possibly extracted from the Host header.
-	/// Returns Self plus bucket name, if endpoint is not Endpoint::ListBuckets
-	pub fn from_request<T>(
-		req: &Request<T>,
-		bucket: Option<String>,
-	) -> Result<(Self, Option<String>), Error> {
+	pub fn from_request<T>(req: &Request<T>, bucket: Option<String>) -> Result<Self, Error> {
 		let uri = req.uri();
 		let path = uri.path().trim_start_matches('/');
 		let query = uri.query();
 		if bucket.is_none() && path.is_empty() {
-			return Ok((Self::ListBuckets, None));
+			return Ok(Self::ListBuckets);
 		}

 		let (bucket, key) = if let Some(bucket) = bucket {
@@ -435,10 +522,6 @@ impl Endpoint {
 				.unwrap_or((path.to_owned(), ""))
 		};

-		if *req.method() == Method::OPTIONS {
-			return Ok((Self::Options, Some(bucket)));
-		}
-
 		let key = percent_encoding::percent_decode_str(key)
 			.decode_utf8()?
 			.into_owned();
@@ -446,25 +529,29 @@ impl Endpoint {
 		let mut query = QueryParameters::from_query(query.unwrap_or_default())?;

 		let res = match *req.method() {
-			Method::GET => Self::from_get(key, &mut query)?,
-			Method::HEAD => Self::from_head(key, &mut query)?,
-			Method::POST => Self::from_post(key, &mut query)?,
-			Method::PUT => Self::from_put(key, &mut query, req.headers())?,
-			Method::DELETE => Self::from_delete(key, &mut query)?,
+			Method::GET => Self::from_get(bucket, key, &mut query)?,
+			Method::HEAD => Self::from_head(bucket, key, &mut query)?,
+			Method::POST => Self::from_post(bucket, key, &mut query)?,
+			Method::PUT => Self::from_put(bucket, key, &mut query, req.headers())?,
+			Method::DELETE => Self::from_delete(bucket, key, &mut query)?,
 			_ => return Err(Error::BadRequest("Unknown method".to_owned())),
 		};

 		if let Some(message) = query.nonempty_message() {
 			debug!("Unused query parameter: {}", message)
 		}
-		Ok((res, Some(bucket)))
+		Ok(res)
 	}

 	/// Determine which endpoint a request is for, knowing it is a GET.
-	fn from_get(key: String, query: &mut QueryParameters<'_>) -> Result<Self, Error> {
+	fn from_get(
+		bucket: String,
+		key: String,
+		query: &mut QueryParameters<'_>,
+	) -> Result<Self, Error> {
 		s3_match! {
 			@gen_parser
-			(query.keyword.take().unwrap_or_default().as_ref(), key, query, None),
+			(query.keyword.take().unwrap_or_default().as_ref(), key, bucket, query, None),
 			key: [
 				EMPTY if upload_id => ListParts (query::upload_id, opt_parse::max_parts, opt_parse::part_number_marker),
 				EMPTY => GetObject (query_opt::version_id, opt_parse::part_number),
@@ -518,10 +605,14 @@ impl Endpoint {
 	}

 	/// Determine which endpoint a request is for, knowing it is a HEAD.
-	fn from_head(key: String, query: &mut QueryParameters<'_>) -> Result<Self, Error> {
+	fn from_head(
+		bucket: String,
+		key: String,
+		query: &mut QueryParameters<'_>,
+	) -> Result<Self, Error> {
 		s3_match! {
 			@gen_parser
-			(query.keyword.take().unwrap_or_default().as_ref(), key, query, None),
+			(query.keyword.take().unwrap_or_default().as_ref(), key, bucket, query, None),
 			key: [
 				EMPTY => HeadObject(opt_parse::part_number, query_opt::version_id),
 			],
@@ -532,10 +623,14 @@ impl Endpoint {
 	}

 	/// Determine which endpoint a request is for, knowing it is a POST.
-	fn from_post(key: String, query: &mut QueryParameters<'_>) -> Result<Self, Error> {
+	fn from_post(
+		bucket: String,
+		key: String,
+		query: &mut QueryParameters<'_>,
+	) -> Result<Self, Error> {
 		s3_match! {
 			@gen_parser
-			(query.keyword.take().unwrap_or_default().as_ref(), key, query, None),
+			(query.keyword.take().unwrap_or_default().as_ref(), key, bucket, query, None),
 			key: [
 				EMPTY if upload_id  => CompleteMultipartUpload (query::upload_id),
 				RESTORE => RestoreObject (query_opt::version_id),
@@ -550,13 +645,14 @@ impl Endpoint {

 	/// Determine which endpoint a request is for, knowing it is a PUT.
 	fn from_put(
+		bucket: String,
 		key: String,
 		query: &mut QueryParameters<'_>,
 		headers: &HeaderMap<HeaderValue>,
 	) -> Result<Self, Error> {
 		s3_match! {
 			@gen_parser
-			(query.keyword.take().unwrap_or_default().as_ref(), key, query, headers),
+			(query.keyword.take().unwrap_or_default().as_ref(), key, bucket, query, headers),
 			key: [
 				EMPTY if part_number header "x-amz-copy-source" => UploadPartCopy (parse::part_number, query::upload_id),
 				EMPTY header "x-amz-copy-source" => CopyObject,
@@ -595,10 +691,14 @@ impl Endpoint {
 	}

 	/// Determine which endpoint a request is for, knowing it is a DELETE.
-	fn from_delete(key: String, query: &mut QueryParameters<'_>) -> Result<Self, Error> {
+	fn from_delete(
+		bucket: String,
+		key: String,
+		query: &mut QueryParameters<'_>,
+	) -> Result<Self, Error> {
 		s3_match! {
 			@gen_parser
-			(query.keyword.take().unwrap_or_default().as_ref(), key, query, None),
+			(query.keyword.take().unwrap_or_default().as_ref(), key, bucket, query, None),
 			key: [
 				EMPTY if upload_id => AbortMultipartUpload (query::upload_id),
 				EMPTY => DeleteObject (query_opt::version_id),
@@ -659,17 +759,21 @@ impl Endpoint {
 	}

 	/// Get the kind of authorization which is required to perform the operation.
-	pub fn authorization_type(&self) -> Authorization {
-		if let Endpoint::ListBuckets = self {
+	pub fn authorization_type(&self) -> Authorization<'_> {
+		let bucket = if let Some(bucket) = self.get_bucket() {
+			bucket
+		} else {
 			return Authorization::None;
 		};
 		let readonly = s3_match! {
-			@match
+			@extract
 			self,
+			bucket,
 			[
 				GetBucketAccelerateConfiguration,
 				GetBucketAcl,
 				GetBucketAnalyticsConfiguration,
+				GetBucketCors,
 				GetBucketEncryption,
 				GetBucketIntelligentTieringConfiguration,
 				GetBucketInventoryConfiguration,
@@ -685,6 +789,7 @@ impl Endpoint {
 				GetBucketRequestPayment,
 				GetBucketTagging,
 				GetBucketVersioning,
+				GetBucketWebsite,
 				GetObject,
 				GetObjectAcl,
 				GetObjectLegalHold,
@@ -706,41 +811,25 @@ impl Endpoint {
 				ListParts,
 				SelectObjectContent,
 			]
-		};
-		let owner = s3_match! {
-			@match
-			self,
-			[
-				DeleteBucket,
-				GetBucketWebsite,
-				PutBucketWebsite,
-				DeleteBucketWebsite,
-				GetBucketCors,
-				PutBucketCors,
-				DeleteBucketCors,
-			]
-		};
+		}
+		.is_some();
 		if readonly {
-			Authorization::Read
-		} else if owner {
-			Authorization::Owner
+			Authorization::Read(bucket)
 		} else {
-			Authorization::Write
+			Authorization::Write(bucket)
 		}
 	}
 }

 /// What kind of authorization is required to perform a given action
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub enum Authorization {
+pub enum Authorization<'a> {
 	/// No authorization is required
 	None,
-	/// Having Read permission on bucket
-	Read,
-	/// Having Write permission on bucket
-	Write,
-	/// Having Owner permission on bucket
-	Owner,
+	/// Having Read permission on bucket .0 is required
+	Read(&'a str),
+	/// Having Write permission on bucket .0 is required
+	Write(&'a str),
 }

 /// This macro is used to generate part of the code in this module. It must be called only one, and
@@ -881,7 +970,7 @@ mod tests {
 		uri: &str,
 		bucket: Option<String>,
 		header: Option<(&str, &str)>,
-	) -> (Endpoint, Option<String>) {
+	) -> Endpoint {
 		let mut req = Request::builder().method(method).uri(uri);
 		if let Some((k, v)) = header {
 			req = req.header(k, v)
@@ -896,13 +985,13 @@ mod tests {
            $(
            assert!(
                matches!(
-                    parse(test_cases!{@actual_method $method}, $uri, Some("my_bucket".to_owned()), None).0,
+                    parse(stringify!($method), $uri, Some("my_bucket".to_owned()), None),
                    Endpoint::$variant { .. }
                )
            );
            assert!(
                matches!(
-                    parse(test_cases!{@actual_method $method}, concat!("/my_bucket", $uri), None, None).0,
+                    parse(stringify!($method), concat!("/my_bucket", $uri), None, None),
                    Endpoint::$variant { .. }
                )
            );
@@ -910,93 +999,67 @@ mod tests {
            test_cases!{@auth $method $uri}
            )*
        }};
-
-        (@actual_method HEAD) => {{ "HEAD" }};
-        (@actual_method GET) => {{ "GET" }};
-        (@actual_method OWNER_GET) => {{ "GET" }};
-        (@actual_method PUT) => {{ "PUT" }};
-        (@actual_method OWNER_PUT) => {{ "PUT" }};
-        (@actual_method POST) => {{ "POST" }};
-        (@actual_method DELETE) => {{ "DELETE" }};
-        (@actual_method OWNER_DELETE) => {{ "DELETE" }};
-
        (@auth HEAD $uri:expr) => {{
-            assert_eq!(parse("HEAD", concat!("/my_bucket", $uri), None, None).0.authorization_type(),
-                Authorization::Read)
+            assert_eq!(parse("HEAD", concat!("/my_bucket", $uri), None, None).authorization_type(),
+                Authorization::Read("my_bucket"))
        }};
        (@auth GET $uri:expr) => {{
-            assert_eq!(parse("GET", concat!("/my_bucket", $uri), None, None).0.authorization_type(),
-                Authorization::Read)
-        }};
-        (@auth OWNER_GET $uri:expr) => {{
-            assert_eq!(parse("GET", concat!("/my_bucket", $uri), None, None).0.authorization_type(),
-                Authorization::Owner)
+            assert_eq!(parse("GET", concat!("/my_bucket", $uri), None, None).authorization_type(),
+                Authorization::Read("my_bucket"))
        }};
        (@auth PUT $uri:expr) => {{
-            assert_eq!(parse("PUT", concat!("/my_bucket", $uri), None, None).0.authorization_type(),
-                Authorization::Write)
-        }};
-        (@auth OWNER_PUT $uri:expr) => {{
-            assert_eq!(parse("PUT", concat!("/my_bucket", $uri), None, None).0.authorization_type(),
-                Authorization::Owner)
+            assert_eq!(parse("PUT", concat!("/my_bucket", $uri), None, None).authorization_type(),
+                Authorization::Write("my_bucket"))
        }};
        (@auth POST $uri:expr) => {{
-            assert_eq!(parse("POST", concat!("/my_bucket", $uri), None, None).0.authorization_type(),
-                Authorization::Write)
+            assert_eq!(parse("POST", concat!("/my_bucket", $uri), None, None).authorization_type(),
+                Authorization::Write("my_bucket"))
        }};
        (@auth DELETE $uri:expr) => {{
-            assert_eq!(parse("DELETE", concat!("/my_bucket", $uri), None, None).0.authorization_type(),
-                Authorization::Write)
-        }};
-        (@auth OWNER_DELETE $uri:expr) => {{
-            assert_eq!(parse("DELETE", concat!("/my_bucket", $uri), None, None).0.authorization_type(),
-                Authorization::Owner)
+            assert_eq!(parse("DELETE", concat!("/my_bucket", $uri), None, None).authorization_type(),
+                Authorization::Write("my_bucket"))
        }};
    }

 	#[test]
 	fn test_bucket_extraction() {
 		assert_eq!(
-			parse("GET", "/my/key", Some("my_bucket".to_owned()), None).1,
-			parse("GET", "/my_bucket/my/key", None, None).1
+			parse("GET", "/my/key", Some("my_bucket".to_owned()), None).get_bucket(),
+			parse("GET", "/my_bucket/my/key", None, None).get_bucket()
 		);
 		assert_eq!(
-			parse("GET", "/my_bucket/my/key", None, None).1.unwrap(),
+			parse("GET", "/my_bucket/my/key", None, None)
+				.get_bucket()
+				.unwrap(),
 			"my_bucket"
 		);
-		assert!(parse("GET", "/", None, None).1.is_none());
+		assert!(parse("GET", "/", None, None).get_bucket().is_none());
 	}

 	#[test]
 	fn test_key() {
 		assert_eq!(
-			parse("GET", "/my/key", Some("my_bucket".to_owned()), None)
-				.0
-				.get_key(),
-			parse("GET", "/my_bucket/my/key", None, None).0.get_key()
+			parse("GET", "/my/key", Some("my_bucket".to_owned()), None).get_key(),
+			parse("GET", "/my_bucket/my/key", None, None).get_key()
 		);
 		assert_eq!(
 			parse("GET", "/my_bucket/my/key", None, None)
-				.0
 				.get_key()
 				.unwrap(),
 			"my/key"
 		);
 		assert_eq!(
 			parse("GET", "/my_bucket/my/key?acl", None, None)
-				.0
 				.get_key()
 				.unwrap(),
 			"my/key"
 		);
 		assert!(parse("GET", "/my_bucket/?list-type=2", None, None)
-			.0
 			.get_key()
 			.is_none());

 		assert_eq!(
 			parse("GET", "/my_bucket/%26%2B%3F%25%C3%A9/something", None, None)
-				.0
 				.get_key()
 				.unwrap(),
 			"&+?%é/something"
@@ -1031,10 +1094,10 @@ mod tests {
 			PUT "/" => CreateBucket
 			POST "/example-object?uploads" => CreateMultipartUpload
 			POST "/{Key+}?uploads" => CreateMultipartUpload
-			OWNER_DELETE "/" => DeleteBucket
+			DELETE "/" => DeleteBucket
 			DELETE "/?analytics&id=list1" => DeleteBucketAnalyticsConfiguration
 			DELETE "/?analytics&id=Id" => DeleteBucketAnalyticsConfiguration
-			OWNER_DELETE "/?cors" => DeleteBucketCors
+			DELETE "/?cors" => DeleteBucketCors
 			DELETE "/?encryption" => DeleteBucketEncryption
 			DELETE "/?intelligent-tiering&id=Id" => DeleteBucketIntelligentTieringConfiguration
 			DELETE "/?inventory&id=list1" => DeleteBucketInventoryConfiguration
@@ -1046,7 +1109,7 @@ mod tests {
 			DELETE "/?policy" => DeleteBucketPolicy
 			DELETE "/?replication" => DeleteBucketReplication
 			DELETE "/?tagging" => DeleteBucketTagging
-			OWNER_DELETE "/?website" => DeleteBucketWebsite
+			DELETE "/?website" => DeleteBucketWebsite
 			DELETE "/my-second-image.jpg" => DeleteObject
 			DELETE "/my-third-image.jpg?versionId=UIORUnfndfiufdisojhr398493jfdkjFJjkndnqUifhnw89493jJFJ" => DeleteObject
 			DELETE "/Key+?versionId=VersionId" => DeleteObject
@@ -1057,7 +1120,7 @@ mod tests {
 			GET "/?accelerate" => GetBucketAccelerateConfiguration
 			GET "/?acl" => GetBucketAcl
 			GET "/?analytics&id=Id" => GetBucketAnalyticsConfiguration
-			OWNER_GET "/?cors" => GetBucketCors
+			GET "/?cors" => GetBucketCors
 			GET "/?encryption" => GetBucketEncryption
 			GET "/?intelligent-tiering&id=Id" => GetBucketIntelligentTieringConfiguration
 			GET "/?inventory&id=list1" => GetBucketInventoryConfiguration
@@ -1075,7 +1138,7 @@ mod tests {
 			GET "/?requestPayment" => GetBucketRequestPayment
 			GET "/?tagging" => GetBucketTagging
 			GET "/?versioning" => GetBucketVersioning
-			OWNER_GET "/?website" => GetBucketWebsite
+			GET "/?website" => GetBucketWebsite
 			GET "/my-image.jpg" => GetObject
 			GET "/myObject?versionId=3/L4kqtJlcpXroDTDmpUMLUo" => GetObject
 			GET "/Junk3.txt?response-cache-control=No-cache&response-content-disposition=attachment%3B%20filename%3Dtesting.txt&response-content-encoding=x-gzip&response-content-language=mi%2C%20en&response-expires=Thu%2C%2001%20Dec%201994%2016:00:00%20GMT" => GetObject
@@ -1133,7 +1196,7 @@ mod tests {
 			PUT "/?acl" => PutBucketAcl
 			PUT "/?analytics&id=report1" => PutBucketAnalyticsConfiguration
 			PUT "/?analytics&id=Id" => PutBucketAnalyticsConfiguration
-			OWNER_PUT "/?cors" => PutBucketCors
+			PUT "/?cors" => PutBucketCors
 			PUT "/?encryption" => PutBucketEncryption
 			PUT "/?intelligent-tiering&id=Id" => PutBucketIntelligentTieringConfiguration
 			PUT "/?inventory&id=report1" => PutBucketInventoryConfiguration
@@ -1149,7 +1212,7 @@ mod tests {
 			PUT "/?requestPayment" => PutBucketRequestPayment
 			PUT "/?tagging" => PutBucketTagging
 			PUT "/?versioning" => PutBucketVersioning
-			OWNER_PUT "/?website" => PutBucketWebsite
+			PUT "/?website" => PutBucketWebsite
 			PUT "/my-image.jpg" => PutObject
 			PUT "/Key+" => PutObject
 			PUT "/my-image.jpg?acl" => PutObjectAcl
@@ -1168,11 +1231,11 @@ mod tests {
 		);
 		// no bucket, won't work with the rest of the test suite
 		assert!(matches!(
-			parse("GET", "/", None, None).0,
+			parse("GET", "/", None, None),
 			Endpoint::ListBuckets { .. }
 		));
 		assert!(matches!(
-			parse("GET", "/", None, None).0.authorization_type(),
+			parse("GET", "/", None, None).authorization_type(),
 			Authorization::None
 		));

@@ -1183,8 +1246,16 @@ mod tests {
 				"/Key+",
 				Some("my_bucket".to_owned()),
 				Some(("x-amz-copy-source", "some/key"))
-			)
-			.0,
+			),
+			Endpoint::CopyObject { .. }
+		));
+		assert!(matches!(
+			parse(
+				"PUT",
+				"/my_bucket/Key+",
+				None,
+				Some(("x-amz-copy-source", "some/key"))
+			),
 			Endpoint::CopyObject { .. }
 		));
 		assert!(matches!(
@@ -1194,19 +1265,8 @@ mod tests {
 				None,
 				Some(("x-amz-copy-source", "some/key"))
 			)
-			.0,
-			Endpoint::CopyObject { .. }
-		));
-		assert!(matches!(
-			parse(
-				"PUT",
-				"/my_bucket/Key+",
-				None,
-				Some(("x-amz-copy-source", "some/key"))
-			)
-			.0
 			.authorization_type(),
-			Authorization::Write
+			Authorization::Write("my_bucket")
 		));

 		// require a header
@@ -1216,8 +1276,16 @@ mod tests {
 				"/Key+?partNumber=2&uploadId=UploadId",
 				Some("my_bucket".to_owned()),
 				Some(("x-amz-copy-source", "some/key"))
-			)
-			.0,
+			),
+			Endpoint::UploadPartCopy { .. }
+		));
+		assert!(matches!(
+			parse(
+				"PUT",
+				"/my_bucket/Key+?partNumber=2&uploadId=UploadId",
+				None,
+				Some(("x-amz-copy-source", "some/key"))
+			),
 			Endpoint::UploadPartCopy { .. }
 		));
 		assert!(matches!(
@@ -1227,19 +1295,8 @@ mod tests {
 				None,
 				Some(("x-amz-copy-source", "some/key"))
 			)
-			.0,
-			Endpoint::UploadPartCopy { .. }
-		));
-		assert!(matches!(
-			parse(
-				"PUT",
-				"/my_bucket/Key+?partNumber=2&uploadId=UploadId",
-				None,
-				Some(("x-amz-copy-source", "some/key"))
-			)
-			.0
 			.authorization_type(),
-			Authorization::Write
+			Authorization::Write("my_bucket")
 		));

 		// POST request, but with GET semantic for permissions purpose
@@ -1249,19 +1306,17 @@ mod tests {
 				"/{Key+}?select&select-type=2",
 				Some("my_bucket".to_owned()),
 				None
-			)
-			.0,
+			),
 			Endpoint::SelectObjectContent { .. }
 		));
 		assert!(matches!(
-			parse("POST", "/my_bucket/{Key+}?select&select-type=2", None, None).0,
+			parse("POST", "/my_bucket/{Key+}?select&select-type=2", None, None),
 			Endpoint::SelectObjectContent { .. }
 		));
 		assert!(matches!(
 			parse("POST", "/my_bucket/{Key+}?select&select-type=2", None, None)
-				.0
 				.authorization_type(),
-			Authorization::Read
+			Authorization::Read("my_bucket")
 		));
 	}
 }
@@ -5,98 +5,61 @@ use hyper::{Body, Request, Response, StatusCode};
 use serde::{Deserialize, Serialize};

 use crate::error::*;
-use crate::s3_xml::{to_xml_with_header, xmlns_tag, IntValue, Value};
+use crate::s3_xml::{xmlns_tag, IntValue, Value};
 use crate::signature::verify_signed_content;
-
-use garage_model::bucket_table::*;
+use garage_model::bucket_table::BucketState;
 use garage_model::garage::Garage;
 use garage_table::*;
-use garage_util::data::*;
-
-pub async fn handle_get_website(bucket: &Bucket) -> Result<Response<Body>, Error> {
-	let param = bucket
-		.params()
-		.ok_or_internal_error("Bucket should not be deleted at this point")?;
-
-	if let Some(website) = param.website_config.get() {
-		let wc = WebsiteConfiguration {
-			xmlns: (),
-			error_document: website.error_document.as_ref().map(|v| Key {
-				key: Value(v.to_string()),
-			}),
-			index_document: Some(Suffix {
-				suffix: Value(website.index_document.to_string()),
-			}),
-			redirect_all_requests_to: None,
-			routing_rules: None,
-		};
-		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())?)
-	}
-}
+use garage_util::data::Hash;

 pub async fn handle_delete_website(
 	garage: Arc<Garage>,
-	bucket_id: Uuid,
+	bucket: String,
 ) -> Result<Response<Body>, Error> {
 	let mut bucket = garage
 		.bucket_table
-		.get(&EmptyKey, &bucket_id)
+		.get(&EmptyKey, &bucket)
 		.await?
-		.ok_or(Error::NoSuchBucket)?;
+		.ok_or(Error::NotFound)?;

-	let param = bucket
-		.params_mut()
-		.ok_or_internal_error("Bucket should not be deleted at this point")?;
-
-	param.website_config.update(None);
-	garage.bucket_table.insert(&bucket).await?;
+	if let BucketState::Present(state) = bucket.state.get_mut() {
+		state.website.update(false);
+		garage.bucket_table.insert(&bucket).await?;
+	}

 	Ok(Response::builder()
 		.status(StatusCode::NO_CONTENT)
-		.body(Body::empty())?)
+		.body(Body::from(vec![]))
+		.unwrap())
 }

 pub async fn handle_put_website(
 	garage: Arc<Garage>,
-	bucket_id: Uuid,
+	bucket: String,
 	req: Request<Body>,
 	content_sha256: Option<Hash>,
 ) -> Result<Response<Body>, Error> {
 	let body = hyper::body::to_bytes(req.into_body()).await?;
-
-	if let Some(content_sha256) = content_sha256 {
-		verify_signed_content(content_sha256, &body[..])?;
-	}
+	verify_signed_content(content_sha256, &body[..])?;

 	let mut bucket = garage
 		.bucket_table
-		.get(&EmptyKey, &bucket_id)
+		.get(&EmptyKey, &bucket)
 		.await?
-		.ok_or(Error::NoSuchBucket)?;
-
-	let param = bucket
-		.params_mut()
-		.ok_or_internal_error("Bucket should not be deleted at this point")?;
+		.ok_or(Error::NotFound)?;

 	let conf: WebsiteConfiguration = from_reader(&body as &[u8])?;
 	conf.validate()?;

-	param
-		.website_config
-		.update(Some(conf.into_garage_website_config()?));
-	garage.bucket_table.insert(&bucket).await?;
+	if let BucketState::Present(state) = bucket.state.get_mut() {
+		state.website.update(true);
+		garage.bucket_table.insert(&bucket).await?;
+	}

 	Ok(Response::builder()
 		.status(StatusCode::OK)
-		.body(Body::empty())?)
+		.body(Body::from(vec![]))
+		.unwrap())
 }

 #[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
@@ -197,26 +160,6 @@ impl WebsiteConfiguration {

 		Ok(())
 	}
-
-	pub fn into_garage_website_config(self) -> Result<WebsiteConfig, Error> {
-		if self.redirect_all_requests_to.is_some() {
-			Err(Error::NotImplemented(
-				"S3 website redirects are not currently implemented in Garage.".into(),
-			))
-		} else if self.routing_rules.map(|x| !x.is_empty()).unwrap_or(false) {
-			Err(Error::NotImplemented(
-				"S3 routing rules are not currently implemented in Garage.".into(),
-			))
-		} else {
-			Ok(WebsiteConfig {
-				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 {
@@ -297,7 +240,7 @@ mod tests {
 	use quick_xml::de::from_str;

 	#[test]
-	fn test_deserialize() -> Result<(), Error> {
+	fn test_deserialize() {
 		let message = r#"<?xml version="1.0" encoding="UTF-8"?>
 <WebsiteConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
   <ErrorDocument>
@@ -359,12 +302,7 @@ mod tests {
 			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(())
+		// TODO verify result is ok
+		// TODO cycle back and verify if ok
 	}
 }
@@ -16,12 +16,6 @@ pub fn xmlns_tag<S: Serializer>(_v: &(), s: S) -> Result<S::Ok, S::Error> {
 #[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 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)]
 pub struct IntValue(#[serde(rename = "$value")] pub i64);

@@ -33,6 +27,12 @@ pub struct Bucket {
 	pub name: Value,
 }

+#[derive(Debug, Serialize, PartialEq)]
+pub struct DisplayName(#[serde(rename = "$value")] pub String);
+
+#[derive(Debug, Serialize, PartialEq)]
+pub struct Id(#[serde(rename = "$value")] pub String);
+
 #[derive(Debug, Serialize, PartialEq)]
 pub struct Owner {
 	#[serde(rename = "DisplayName")]
@@ -107,6 +107,14 @@ pub struct DeleteResult {
 	pub errors: Vec<DeleteError>,
 }

+#[derive(Debug, Serialize, PartialEq)]
+pub struct CopyObjectResult {
+	#[serde(rename = "LastModified")]
+	pub last_modified: Value,
+	#[serde(rename = "ETag")]
+	pub etag: Value,
+}
+
 #[derive(Debug, Serialize, PartialEq)]
 pub struct InitiateMultipartUploadResult {
 	#[serde(serialize_with = "xmlns_tag")]
@@ -133,100 +141,6 @@ pub struct CompleteMultipartUploadResult {
 	pub etag: Value,
 }

-#[derive(Debug, Serialize, PartialEq)]
-pub struct Initiator {
-	#[serde(rename = "DisplayName")]
-	pub display_name: Value,
-	#[serde(rename = "ID")]
-	pub id: Value,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct ListMultipartItem {
-	#[serde(rename = "Initiated")]
-	pub initiated: Value,
-	#[serde(rename = "Initiator")]
-	pub initiator: Initiator,
-	#[serde(rename = "Key")]
-	pub key: Value,
-	#[serde(rename = "UploadId")]
-	pub upload_id: Value,
-	#[serde(rename = "Owner")]
-	pub owner: Owner,
-	#[serde(rename = "StorageClass")]
-	pub storage_class: Value,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct ListMultipartUploadsResult {
-	#[serde(serialize_with = "xmlns_tag")]
-	pub xmlns: (),
-	#[serde(rename = "Bucket")]
-	pub bucket: Value,
-	#[serde(rename = "KeyMarker")]
-	pub key_marker: Option<Value>,
-	#[serde(rename = "UploadIdMarker")]
-	pub upload_id_marker: Option<Value>,
-	#[serde(rename = "NextKeyMarker")]
-	pub next_key_marker: Option<Value>,
-	#[serde(rename = "NextUploadIdMarker")]
-	pub next_upload_id_marker: Option<Value>,
-	#[serde(rename = "Prefix")]
-	pub prefix: Value,
-	#[serde(rename = "Delimiter")]
-	pub delimiter: Option<Value>,
-	#[serde(rename = "MaxUploads")]
-	pub max_uploads: IntValue,
-	#[serde(rename = "IsTruncated")]
-	pub is_truncated: Value,
-	#[serde(rename = "Upload")]
-	pub upload: Vec<ListMultipartItem>,
-	#[serde(rename = "CommonPrefixes")]
-	pub common_prefixes: Vec<CommonPrefix>,
-	#[serde(rename = "EncodingType")]
-	pub encoding_type: Option<Value>,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct PartItem {
-	#[serde(rename = "ETag")]
-	pub etag: Value,
-	#[serde(rename = "LastModified")]
-	pub last_modified: Value,
-	#[serde(rename = "PartNumber")]
-	pub part_number: IntValue,
-	#[serde(rename = "Size")]
-	pub size: IntValue,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct ListPartsResult {
-	#[serde(serialize_with = "xmlns_tag")]
-	pub xmlns: (),
-	#[serde(rename = "Bucket")]
-	pub bucket: Value,
-	#[serde(rename = "Key")]
-	pub key: Value,
-	#[serde(rename = "UploadId")]
-	pub upload_id: Value,
-	#[serde(rename = "PartNumberMarker")]
-	pub part_number_marker: Option<IntValue>,
-	#[serde(rename = "NextPartNumberMarker")]
-	pub next_part_number_marker: Option<IntValue>,
-	#[serde(rename = "MaxParts")]
-	pub max_parts: IntValue,
-	#[serde(rename = "IsTruncated")]
-	pub is_truncated: Value,
-	#[serde(rename = "Part", default)]
-	pub parts: Vec<PartItem>,
-	#[serde(rename = "Initiator")]
-	pub initiator: Initiator,
-	#[serde(rename = "Owner")]
-	pub owner: Owner,
-	#[serde(rename = "StorageClass")]
-	pub storage_class: Value,
-}
-
 #[derive(Debug, Serialize, PartialEq)]
 pub struct ListBucketItem {
 	#[serde(rename = "Key")]
@@ -458,6 +372,24 @@ mod tests {
 		Ok(())
 	}

+	#[test]
+	fn copy_object_result() -> Result<(), ApiError> {
+		let copy_result = CopyObjectResult {
+			last_modified: Value(msec_to_rfc3339(0)),
+			etag: Value("9b2cf535f27731c974343645a3985328".to_string()),
+		};
+		assert_eq!(
+			to_xml_with_header(&copy_result)?,
+			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
+<CopyObjectResult>\
+    <LastModified>1970-01-01T00:00:00.000Z</LastModified>\
+    <ETag>9b2cf535f27731c974343645a3985328</ETag>\
+</CopyObjectResult>\
+			"
+		);
+		Ok(())
+	}
+
 	#[test]
 	fn initiate_multipart_upload_result() -> Result<(), ApiError> {
 		let result = InitiateMultipartUploadResult {
@@ -485,7 +417,7 @@ mod tests {
 			location: Some(Value("https://garage.tld/mybucket/a/plop".to_string())),
 			bucket: Value("mybucket".to_string()),
 			key: Value("a/plop".to_string()),
-			etag: Value("\"3858f62230ac3c915f300c664312c11f-9\"".to_string()),
+			etag: Value("3858f62230ac3c915f300c664312c11f-9".to_string()),
 		};
 		assert_eq!(
 			to_xml_with_header(&result)?,
@@ -494,64 +426,12 @@ mod tests {
 	<Location>https://garage.tld/mybucket/a/plop</Location>\
 	<Bucket>mybucket</Bucket>\
 	<Key>a/plop</Key>\
-	<ETag>&quot;3858f62230ac3c915f300c664312c11f-9&quot;</ETag>\
+	<ETag>3858f62230ac3c915f300c664312c11f-9</ETag>\
 </CompleteMultipartUploadResult>"
 		);
 		Ok(())
 	}

-	#[test]
-	fn list_multipart_uploads_result() -> Result<(), ApiError> {
-		let result = ListMultipartUploadsResult {
-			xmlns: (),
-			bucket: Value("example-bucket".to_string()),
-			key_marker: None,
-			next_key_marker: None,
-			upload_id_marker: None,
-			encoding_type: None,
-			next_upload_id_marker: None,
-			upload: vec![],
-			delimiter: Some(Value("/".to_string())),
-			prefix: Value("photos/2006/".to_string()),
-			max_uploads: IntValue(1000),
-			is_truncated: Value("false".to_string()),
-			common_prefixes: vec![
-				CommonPrefix {
-					prefix: Value("photos/2006/February/".to_string()),
-				},
-				CommonPrefix {
-					prefix: Value("photos/2006/January/".to_string()),
-				},
-				CommonPrefix {
-					prefix: Value("photos/2006/March/".to_string()),
-				},
-			],
-		};
-
-		assert_eq!(
-			to_xml_with_header(&result)?,
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
-<ListMultipartUploadsResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">\
-	<Bucket>example-bucket</Bucket>\
-	<Prefix>photos/2006/</Prefix>\
-	<Delimiter>/</Delimiter>\
-	<MaxUploads>1000</MaxUploads>\
-	<IsTruncated>false</IsTruncated>\
-	<CommonPrefixes>\
-		<Prefix>photos/2006/February/</Prefix>\
-	</CommonPrefixes>\
-	<CommonPrefixes>\
-		<Prefix>photos/2006/January/</Prefix>\
-	</CommonPrefixes>\
-	<CommonPrefixes>\
-		<Prefix>photos/2006/March/</Prefix>\
-	</CommonPrefixes>\
-</ListMultipartUploadsResult>"
-		);
-
-		Ok(())
-	}
-
 	#[test]
 	fn list_objects_v1_1() -> Result<(), ApiError> {
 		let result = ListBucketResult {
@@ -571,7 +451,7 @@ mod tests {
 			contents: vec![ListBucketItem {
 				key: Value("sample.jpg".to_string()),
 				last_modified: Value(msec_to_rfc3339(0)),
-				etag: Value("\"bf1d737a4d46a19f3bced6905cc8b902\"".to_string()),
+				etag: Value("bf1d737a4d46a19f3bced6905cc8b902".to_string()),
 				size: IntValue(142863),
 				storage_class: Value("STANDARD".to_string()),
 			}],
@@ -592,7 +472,7 @@ mod tests {
  <Contents>\
    <Key>sample.jpg</Key>\
    <LastModified>1970-01-01T00:00:00.000Z</LastModified>\
-    <ETag>&quot;bf1d737a4d46a19f3bced6905cc8b902&quot;</ETag>\
+    <ETag>bf1d737a4d46a19f3bced6905cc8b902</ETag>\
    <Size>142863</Size>\
    <StorageClass>STANDARD</StorageClass>\
  </Contents>\
@@ -670,7 +550,7 @@ mod tests {
 			contents: vec![ListBucketItem {
 				key: Value("ExampleObject.txt".to_string()),
 				last_modified: Value(msec_to_rfc3339(0)),
-				etag: Value("\"599bab3ed2c697f1d26842727561fd94\"".to_string()),
+				etag: Value("599bab3ed2c697f1d26842727561fd94".to_string()),
 				size: IntValue(857),
 				storage_class: Value("REDUCED_REDUNDANCY".to_string()),
 			}],
@@ -688,7 +568,7 @@ mod tests {
  <Contents>\
    <Key>ExampleObject.txt</Key>\
    <LastModified>1970-01-01T00:00:00.000Z</LastModified>\
-    <ETag>&quot;599bab3ed2c697f1d26842727561fd94&quot;</ETag>\
+    <ETag>599bab3ed2c697f1d26842727561fd94</ETag>\
    <Size>857</Size>\
    <StorageClass>REDUCED_REDUNDANCY</StorageClass>\
  </Contents>\
@@ -718,7 +598,7 @@ mod tests {
 			contents: vec![ListBucketItem {
 				key: Value("happyfacex.jpg".to_string()),
 				last_modified: Value(msec_to_rfc3339(0)),
-				etag: Value("\"70ee1738b6b21e2c8a43f3a5ab0eee71\"".to_string()),
+				etag: Value("70ee1738b6b21e2c8a43f3a5ab0eee71".to_string()),
 				size: IntValue(1111),
 				storage_class: Value("STANDARD".to_string()),
 			}],
@@ -738,7 +618,7 @@ mod tests {
  <Contents>\
    <Key>happyfacex.jpg</Key>\
    <LastModified>1970-01-01T00:00:00.000Z</LastModified>\
-    <ETag>&quot;70ee1738b6b21e2c8a43f3a5ab0eee71&quot;</ETag>\
+    <ETag>70ee1738b6b21e2c8a43f3a5ab0eee71</ETag>\
    <Size>1111</Size>\
    <StorageClass>STANDARD</StorageClass>\
  </Contents>\
@@ -746,85 +626,4 @@ mod tests {
 		);
 		Ok(())
 	}
-
-	#[test]
-	fn list_parts() -> Result<(), ApiError> {
-		let result = ListPartsResult {
-			xmlns: (),
-			bucket: Value("example-bucket".to_string()),
-			key: Value("example-object".to_string()),
-			upload_id: Value(
-				"XXBsb2FkIElEIGZvciBlbHZpbmcncyVcdS1tb3ZpZS5tMnRzEEEwbG9hZA".to_string(),
-			),
-			part_number_marker: Some(IntValue(1)),
-			next_part_number_marker: Some(IntValue(3)),
-			max_parts: IntValue(2),
-			is_truncated: Value("true".to_string()),
-			parts: vec![
-				PartItem {
-					etag: Value("\"7778aef83f66abc1fa1e8477f296d394\"".to_string()),
-					last_modified: Value("2010-11-10T20:48:34.000Z".to_string()),
-					part_number: IntValue(2),
-					size: IntValue(10485760),
-				},
-				PartItem {
-					etag: Value("\"aaaa18db4cc2f85cedef654fccc4a4x8\"".to_string()),
-					last_modified: Value("2010-11-10T20:48:33.000Z".to_string()),
-					part_number: IntValue(3),
-					size: IntValue(10485760),
-				},
-			],
-			initiator: Initiator {
-				display_name: Value("umat-user-11116a31-17b5-4fb7-9df5-b288870f11xx".to_string()),
-				id: Value(
-					"arn:aws:iam::111122223333:user/some-user-11116a31-17b5-4fb7-9df5-b288870f11xx"
-						.to_string(),
-				),
-			},
-			owner: Owner {
-				display_name: Value("someName".to_string()),
-				id: Value(
-					"75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a".to_string(),
-				),
-			},
-			storage_class: Value("STANDARD".to_string()),
-		};
-
-		assert_eq!(
-			to_xml_with_header(&result)?,
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
-<ListPartsResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">\
-  <Bucket>example-bucket</Bucket>\
-  <Key>example-object</Key>\
-  <UploadId>XXBsb2FkIElEIGZvciBlbHZpbmcncyVcdS1tb3ZpZS5tMnRzEEEwbG9hZA</UploadId>\
-  <PartNumberMarker>1</PartNumberMarker>\
-  <NextPartNumberMarker>3</NextPartNumberMarker>\
-  <MaxParts>2</MaxParts>\
-  <IsTruncated>true</IsTruncated>\
-  <Part>\
-    <ETag>&quot;7778aef83f66abc1fa1e8477f296d394&quot;</ETag>\
-    <LastModified>2010-11-10T20:48:34.000Z</LastModified>\
-    <PartNumber>2</PartNumber>\
-    <Size>10485760</Size>\
-  </Part>\
-  <Part>\
-    <ETag>&quot;aaaa18db4cc2f85cedef654fccc4a4x8&quot;</ETag>\
-    <LastModified>2010-11-10T20:48:33.000Z</LastModified>\
-    <PartNumber>3</PartNumber>\
-    <Size>10485760</Size>\
-  </Part>\
-  <Initiator>\
-      <DisplayName>umat-user-11116a31-17b5-4fb7-9df5-b288870f11xx</DisplayName>\
-      <ID>arn:aws:iam::111122223333:user/some-user-11116a31-17b5-4fb7-9df5-b288870f11xx</ID>\
-  </Initiator>\
-  <Owner>\
-    <DisplayName>someName</DisplayName>\
-    <ID>75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a</ID>\
-  </Owner>\
-  <StorageClass>STANDARD</StorageClass>\
-</ListPartsResult>"
-		);
-
-		Ok(())
-	}
 }
@@ -1,26 +1,28 @@
 use std::collections::HashMap;

 use chrono::{DateTime, Duration, NaiveDateTime, Utc};
-use hmac::Mac;
+use hmac::{Hmac, Mac, NewMac};
 use hyper::{Body, Method, Request};
 use sha2::{Digest, Sha256};

 use garage_table::*;
-use garage_util::data::Hash;
+use garage_util::data::{sha256sum, Hash};

 use garage_model::garage::Garage;
 use garage_model::key_table::*;

-use super::signing_hmac;
-use super::{LONG_DATETIME, SHORT_DATE};
-
 use crate::encoding::uri_encode;
 use crate::error::*;

-pub async fn check_payload_signature(
+const SHORT_DATE: &str = "%Y%m%d";
+const LONG_DATETIME: &str = "%Y%m%dT%H%M%SZ";
+
+type HmacSha256 = Hmac<Sha256>;
+
+pub async fn check_signature(
 	garage: &Garage,
 	request: &Request<Body>,
-) -> Result<(Option<Key>, Option<Hash>), Error> {
+) -> Result<(Key, Option<Hash>), Error> {
 	let mut headers = HashMap::new();
 	for (key, val) in request.headers() {
 		headers.insert(key.to_string(), val.to_str()?.to_string());
@@ -34,24 +36,24 @@ pub async fn check_payload_signature(

 	let authorization = if let Some(authorization) = headers.get("authorization") {
 		parse_authorization(authorization, &headers)?
-	} else if let Some(algorithm) = headers.get("x-amz-algorithm") {
-		parse_query_authorization(algorithm, &headers)?
 	} else {
-		let content_sha256 = headers.get("x-amz-content-sha256");
-		if let Some(content_sha256) = content_sha256.filter(|c| "UNSIGNED-PAYLOAD" != c.as_str()) {
-			let sha256 = hex::decode(content_sha256)
-				.ok()
-				.and_then(|bytes| Hash::try_from(&bytes))
-				.ok_or_bad_request("Invalid content sha256 hash")?;
-			return Ok((None, Some(sha256)));
-		} else {
-			return Ok((None, None));
-		}
+		parse_query_authorization(&headers)?
 	};

+	let date = headers
+		.get("x-amz-date")
+		.ok_or_bad_request("Missing X-Amz-Date field")?;
+	let date: NaiveDateTime =
+		NaiveDateTime::parse_from_str(date, LONG_DATETIME).ok_or_bad_request("Invalid date")?;
+	let date: DateTime<Utc> = DateTime::from_utc(date, Utc);
+
+	if Utc::now() - date > Duration::hours(24) {
+		return Err(Error::BadRequest("Date is too old".to_string()));
+	}
+
 	let scope = format!(
 		"{}/{}/s3/aws4_request",
-		authorization.date.format(SHORT_DATE),
+		date.format(SHORT_DATE),
 		garage.config.s3_api.s3_region
 	);
 	if authorization.scope != scope {
@@ -62,9 +64,8 @@ pub async fn check_payload_signature(
 		.key_table
 		.get(&EmptyKey, &authorization.key_id)
 		.await?
-		.filter(|k| !k.state.is_deleted())
+		.filter(|k| !k.deleted.get())
 		.ok_or_else(|| Error::Forbidden(format!("No such key: {}", authorization.key_id)))?;
-	let key_p = key.params().unwrap();

 	let canonical_request = canonical_request(
 		request.method(),
@@ -74,11 +75,11 @@ pub async fn check_payload_signature(
 		&authorization.signed_headers,
 		&authorization.content_sha256,
 	);
-	let string_to_sign = string_to_sign(&authorization.date, &scope, &canonical_request);
+	let string_to_sign = string_to_sign(&date, &scope, &canonical_request);

 	let mut hmac = signing_hmac(
-		&authorization.date,
-		&key_p.secret_key,
+		&date,
+		&key.secret_key,
 		&garage.config.s3_api.s3_region,
 		"s3",
 	)
@@ -95,16 +96,16 @@ pub async fn check_payload_signature(

 	let content_sha256 = if authorization.content_sha256 == "UNSIGNED-PAYLOAD" {
 		None
-	} else if authorization.content_sha256 == "STREAMING-AWS4-HMAC-SHA256-PAYLOAD" {
-		let bytes = hex::decode(authorization.signature).ok_or_bad_request("Invalid signature")?;
-		Some(Hash::try_from(&bytes).ok_or_bad_request("Invalid signature")?)
 	} else {
 		let bytes = hex::decode(authorization.content_sha256)
 			.ok_or_bad_request("Invalid content sha256 hash")?;
-		Some(Hash::try_from(&bytes).ok_or_bad_request("Invalid content sha256 hash")?)
+		Some(
+			Hash::try_from(&bytes[..])
+				.ok_or_else(|| Error::BadRequest("Invalid content sha256 hash".to_string()))?,
+		)
 	};

-	Ok((Some(key), content_sha256))
+	Ok((key, content_sha256))
 }

 struct Authorization {
@@ -113,7 +114,6 @@ struct Authorization {
 	signed_headers: String,
 	signature: String,
 	content_sha256: String,
-	date: DateTime<Utc>,
 }

 fn parse_authorization(
@@ -148,17 +148,6 @@ fn parse_authorization(
 		.get("x-amz-content-sha256")
 		.ok_or_bad_request("Missing X-Amz-Content-Sha256 field")?;

-	let date = headers
-		.get("x-amz-date")
-		.ok_or_bad_request("Missing X-Amz-Date field")?;
-	let date: NaiveDateTime =
-		NaiveDateTime::parse_from_str(date, LONG_DATETIME).ok_or_bad_request("Invalid date")?;
-	let date: DateTime<Utc> = DateTime::from_utc(date, Utc);
-
-	if Utc::now() - date > Duration::hours(24) {
-		return Err(Error::BadRequest("Date is too old".to_string()));
-	}
-
 	let auth = Authorization {
 		key_id,
 		scope,
@@ -171,16 +160,15 @@ fn parse_authorization(
 			.ok_or_bad_request("Could not find Signature in Authorization field")?
 			.to_string(),
 		content_sha256: content_sha256.to_string(),
-		date,
 	};
 	Ok(auth)
 }

-fn parse_query_authorization(
-	algorithm: &str,
-	headers: &HashMap<String, String>,
-) -> Result<Authorization, Error> {
-	if algorithm != "AWS4-HMAC-SHA256" {
+fn parse_query_authorization(headers: &HashMap<String, String>) -> Result<Authorization, Error> {
+	let algo = headers
+		.get("x-amz-algorithm")
+		.ok_or_bad_request("X-Amz-Algorithm not found in query parameters")?;
+	if algo != "AWS4-HMAC-SHA256" {
 		return Err(Error::BadRequest(
 			"Unsupported authorization method".to_string(),
 		));
@@ -201,36 +189,12 @@ fn parse_query_authorization(
 		.map(|x| x.as_str())
 		.unwrap_or("UNSIGNED-PAYLOAD");

-	let duration = headers
-		.get("x-amz-expires")
-		.ok_or_bad_request("X-Amz-Expires not found in query parameters")?
-		.parse()
-		.map_err(|_| Error::BadRequest("X-Amz-Expires is not a number".to_string()))?;
-
-	if duration > 7 * 24 * 3600 {
-		return Err(Error::BadRequest(
-			"X-Amz-Exprires may not exceed a week".to_string(),
-		));
-	}
-
-	let date = headers
-		.get("x-amz-date")
-		.ok_or_bad_request("Missing X-Amz-Date field")?;
-	let date: NaiveDateTime =
-		NaiveDateTime::parse_from_str(date, LONG_DATETIME).ok_or_bad_request("Invalid date")?;
-	let date: DateTime<Utc> = DateTime::from_utc(date, Utc);
-
-	if Utc::now() - date > Duration::seconds(duration) {
-		return Err(Error::BadRequest("Date is too old".to_string()));
-	}
-
 	Ok(Authorization {
 		key_id,
 		scope,
 		signed_headers: signed_headers.to_string(),
 		signature: signature.to_string(),
 		content_sha256: content_sha256.to_string(),
-		date,
 	})
 }

@@ -257,6 +221,25 @@ fn string_to_sign(datetime: &DateTime<Utc>, scope_string: &str, canonical_req: &
 	.join("\n")
 }

+fn signing_hmac(
+	datetime: &DateTime<Utc>,
+	secret_key: &str,
+	region: &str,
+	service: &str,
+) -> Result<HmacSha256, crypto_mac::InvalidKeyLength> {
+	let secret = String::from("AWS4") + secret_key;
+	let mut date_hmac = HmacSha256::new_varkey(secret.as_bytes())?;
+	date_hmac.update(datetime.format(SHORT_DATE).to_string().as_bytes());
+	let mut region_hmac = HmacSha256::new_varkey(&date_hmac.finalize().into_bytes())?;
+	region_hmac.update(region.as_bytes());
+	let mut service_hmac = HmacSha256::new_varkey(&region_hmac.finalize().into_bytes())?;
+	service_hmac.update(service.as_bytes());
+	let mut signing_hmac = HmacSha256::new_varkey(&service_hmac.finalize().into_bytes())?;
+	signing_hmac.update(b"aws4_request");
+	let hmac = HmacSha256::new_varkey(&signing_hmac.finalize().into_bytes())?;
+	Ok(hmac)
+}
+
 fn canonical_request(
 	method: &Method,
 	url_path: &str,
@@ -282,13 +265,10 @@ fn canonical_header_string(headers: &HashMap<String, String>, signed_headers: &s
 	let mut items = headers
 		.iter()
 		.filter(|(key, _)| signed_headers_vec.contains(&key.as_str()))
-		.collect::<Vec<_>>();
-	items.sort_by(|(k1, _), (k2, _)| k1.cmp(k2));
-	items
-		.iter()
 		.map(|(key, value)| key.to_lowercase() + ":" + value.trim())
-		.collect::<Vec<_>>()
-		.join("\n")
+		.collect::<Vec<_>>();
+	items.sort();
+	items.join("\n")
 }

 fn canonical_query_string(uri: &hyper::Uri) -> String {
@@ -304,3 +284,14 @@ fn canonical_query_string(uri: &hyper::Uri) -> String {
 		"".to_string()
 	}
 }
+
+pub fn verify_signed_content(content_sha256: Option<Hash>, body: &[u8]) -> Result<(), Error> {
+	let expected_sha256 =
+		content_sha256.ok_or_bad_request("Request content hash not signed, aborting.")?;
+	if expected_sha256 != sha256sum(body) {
+		return Err(Error::BadRequest(
+			"Request content hash does not match signed hash".to_string(),
+		));
+	}
+	Ok(())
+}
@@ -1,47 +0,0 @@
-use chrono::{DateTime, Utc};
-use hmac::{Hmac, Mac, NewMac};
-use sha2::Sha256;
-
-use garage_util::data::{sha256sum, Hash};
-
-use crate::error::*;
-
-pub mod payload;
-pub mod streaming;
-
-pub const SHORT_DATE: &str = "%Y%m%d";
-pub const LONG_DATETIME: &str = "%Y%m%dT%H%M%SZ";
-
-type HmacSha256 = Hmac<Sha256>;
-
-pub fn verify_signed_content(expected_sha256: Hash, body: &[u8]) -> Result<(), Error> {
-	if expected_sha256 != sha256sum(body) {
-		return Err(Error::BadRequest(
-			"Request content hash does not match signed hash".to_string(),
-		));
-	}
-	Ok(())
-}
-
-pub fn signing_hmac(
-	datetime: &DateTime<Utc>,
-	secret_key: &str,
-	region: &str,
-	service: &str,
-) -> Result<HmacSha256, crypto_mac::InvalidKeyLength> {
-	let secret = String::from("AWS4") + secret_key;
-	let mut date_hmac = HmacSha256::new_varkey(secret.as_bytes())?;
-	date_hmac.update(datetime.format(SHORT_DATE).to_string().as_bytes());
-	let mut region_hmac = HmacSha256::new_varkey(&date_hmac.finalize().into_bytes())?;
-	region_hmac.update(region.as_bytes());
-	let mut service_hmac = HmacSha256::new_varkey(&region_hmac.finalize().into_bytes())?;
-	service_hmac.update(service.as_bytes());
-	let mut signing_hmac = HmacSha256::new_varkey(&service_hmac.finalize().into_bytes())?;
-	signing_hmac.update(b"aws4_request");
-	let hmac = HmacSha256::new_varkey(&signing_hmac.finalize().into_bytes())?;
-	Ok(hmac)
-}
-
-pub fn compute_scope(datetime: &DateTime<Utc>, region: &str) -> String {
-	format!("{}/{}/s3/aws4_request", datetime.format(SHORT_DATE), region,)
-}
@@ -1,319 +0,0 @@
-use std::pin::Pin;
-
-use chrono::{DateTime, Utc};
-use futures::prelude::*;
-use futures::task;
-use hyper::body::Bytes;
-
-use garage_util::data::Hash;
-use hmac::Mac;
-
-use super::sha256sum;
-use super::HmacSha256;
-use super::LONG_DATETIME;
-
-use crate::error::*;
-
-/// Result of `sha256("")`
-const EMPTY_STRING_HEX_DIGEST: &str =
-	"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855";
-
-fn compute_streaming_payload_signature(
-	signing_hmac: &HmacSha256,
-	date: DateTime<Utc>,
-	scope: &str,
-	previous_signature: Hash,
-	content_sha256: Hash,
-) -> Result<Hash, Error> {
-	let string_to_sign = [
-		"AWS4-HMAC-SHA256-PAYLOAD",
-		&date.format(LONG_DATETIME).to_string(),
-		scope,
-		&hex::encode(previous_signature),
-		EMPTY_STRING_HEX_DIGEST,
-		&hex::encode(content_sha256),
-	]
-	.join("\n");
-
-	let mut hmac = signing_hmac.clone();
-	hmac.update(string_to_sign.as_bytes());
-
-	Hash::try_from(&hmac.finalize().into_bytes()).ok_or_internal_error("Invalid signature")
-}
-
-mod payload {
-	use garage_util::data::Hash;
-
-	pub enum Error<I> {
-		Parser(nom::error::Error<I>),
-		BadSignature,
-	}
-
-	impl<I> Error<I> {
-		pub fn description(&self) -> &str {
-			match *self {
-				Error::Parser(ref e) => e.code.description(),
-				Error::BadSignature => "Bad signature",
-			}
-		}
-	}
-
-	#[derive(Debug, Clone)]
-	pub struct Header {
-		pub size: usize,
-		pub signature: Hash,
-	}
-
-	impl Header {
-		pub fn parse(input: &[u8]) -> nom::IResult<&[u8], Self, Error<&[u8]>> {
-			use nom::bytes::streaming::tag;
-			use nom::character::streaming::hex_digit1;
-			use nom::combinator::map_res;
-			use nom::number::streaming::hex_u32;
-
-			macro_rules! try_parse {
-				($expr:expr) => {
-					$expr.map_err(|e| e.map(Error::Parser))?
-				};
-			}
-
-			let (input, size) = try_parse!(hex_u32(input));
-			let (input, _) = try_parse!(tag(";")(input));
-
-			let (input, _) = try_parse!(tag("chunk-signature=")(input));
-			let (input, data) = try_parse!(map_res(hex_digit1, hex::decode)(input));
-			let signature = Hash::try_from(&data).ok_or(nom::Err::Failure(Error::BadSignature))?;
-
-			let (input, _) = try_parse!(tag("\r\n")(input));
-
-			let header = Header {
-				size: size as usize,
-				signature,
-			};
-
-			Ok((input, header))
-		}
-	}
-}
-
-#[derive(Debug)]
-pub enum SignedPayloadStreamError {
-	Stream(Error),
-	InvalidSignature,
-	Message(String),
-}
-
-impl SignedPayloadStreamError {
-	fn message(msg: &str) -> Self {
-		SignedPayloadStreamError::Message(msg.into())
-	}
-}
-
-impl From<SignedPayloadStreamError> for Error {
-	fn from(err: SignedPayloadStreamError) -> Self {
-		match err {
-			SignedPayloadStreamError::Stream(e) => e,
-			SignedPayloadStreamError::InvalidSignature => {
-				Error::BadRequest("Invalid payload signature".into())
-			}
-			SignedPayloadStreamError::Message(e) => {
-				Error::BadRequest(format!("Chunk format error: {}", e))
-			}
-		}
-	}
-}
-
-impl<I> From<payload::Error<I>> for SignedPayloadStreamError {
-	fn from(err: payload::Error<I>) -> Self {
-		Self::message(err.description())
-	}
-}
-
-impl<I> From<nom::error::Error<I>> for SignedPayloadStreamError {
-	fn from(err: nom::error::Error<I>) -> Self {
-		Self::message(err.code.description())
-	}
-}
-
-struct SignedPayload {
-	header: payload::Header,
-	data: Bytes,
-}
-
-#[pin_project::pin_project]
-pub struct SignedPayloadStream<S>
-where
-	S: Stream<Item = Result<Bytes, Error>>,
-{
-	#[pin]
-	stream: S,
-	buf: bytes::BytesMut,
-	datetime: DateTime<Utc>,
-	scope: String,
-	signing_hmac: HmacSha256,
-	previous_signature: Hash,
-}
-
-impl<S> SignedPayloadStream<S>
-where
-	S: Stream<Item = Result<Bytes, Error>>,
-{
-	pub fn new(
-		stream: S,
-		signing_hmac: HmacSha256,
-		datetime: DateTime<Utc>,
-		scope: &str,
-		seed_signature: Hash,
-	) -> Result<Self, Error> {
-		Ok(Self {
-			stream,
-			buf: bytes::BytesMut::new(),
-			datetime,
-			scope: scope.into(),
-			signing_hmac,
-			previous_signature: seed_signature,
-		})
-	}
-
-	fn parse_next(input: &[u8]) -> nom::IResult<&[u8], SignedPayload, SignedPayloadStreamError> {
-		use nom::bytes::streaming::{tag, take};
-
-		macro_rules! try_parse {
-			($expr:expr) => {
-				$expr.map_err(nom::Err::convert)?
-			};
-		}
-
-		let (input, header) = try_parse!(payload::Header::parse(input));
-
-		// 0-sized chunk is the last
-		if header.size == 0 {
-			return Ok((
-				input,
-				SignedPayload {
-					header,
-					data: Bytes::new(),
-				},
-			));
-		}
-
-		let (input, data) = try_parse!(take::<_, _, nom::error::Error<_>>(header.size)(input));
-		let (input, _) = try_parse!(tag::<_, _, nom::error::Error<_>>("\r\n")(input));
-
-		let data = Bytes::from(data.to_vec());
-
-		Ok((input, SignedPayload { header, data }))
-	}
-}
-
-impl<S> Stream for SignedPayloadStream<S>
-where
-	S: Stream<Item = Result<Bytes, Error>> + Unpin,
-{
-	type Item = Result<Bytes, SignedPayloadStreamError>;
-
-	fn poll_next(
-		self: Pin<&mut Self>,
-		cx: &mut task::Context<'_>,
-	) -> task::Poll<Option<Self::Item>> {
-		use std::task::Poll;
-
-		let mut this = self.project();
-
-		loop {
-			let (input, payload) = match Self::parse_next(this.buf) {
-				Ok(res) => res,
-				Err(nom::Err::Incomplete(_)) => {
-					match futures::ready!(this.stream.as_mut().poll_next(cx)) {
-						Some(Ok(bytes)) => {
-							this.buf.extend(bytes);
-							continue;
-						}
-						Some(Err(e)) => {
-							return Poll::Ready(Some(Err(SignedPayloadStreamError::Stream(e))))
-						}
-						None => {
-							return Poll::Ready(Some(Err(SignedPayloadStreamError::message(
-								"Unexpected EOF",
-							))));
-						}
-					}
-				}
-				Err(nom::Err::Error(e)) | Err(nom::Err::Failure(e)) => {
-					return Poll::Ready(Some(Err(e)))
-				}
-			};
-
-			// 0-sized chunk is the last
-			if payload.data.is_empty() {
-				return Poll::Ready(None);
-			}
-
-			let data_sha256sum = sha256sum(&payload.data);
-
-			let expected_signature = compute_streaming_payload_signature(
-				this.signing_hmac,
-				*this.datetime,
-				this.scope,
-				*this.previous_signature,
-				data_sha256sum,
-			)
-			.map_err(|e| {
-				SignedPayloadStreamError::Message(format!("Could not build signature: {}", e))
-			})?;
-
-			if payload.header.signature != expected_signature {
-				return Poll::Ready(Some(Err(SignedPayloadStreamError::InvalidSignature)));
-			}
-
-			*this.buf = input.into();
-			*this.previous_signature = payload.header.signature;
-
-			return Poll::Ready(Some(Ok(payload.data)));
-		}
-	}
-
-	fn size_hint(&self) -> (usize, Option<usize>) {
-		self.stream.size_hint()
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use futures::prelude::*;
-
-	use super::{SignedPayloadStream, SignedPayloadStreamError};
-
-	#[tokio::test]
-	async fn test_interrupted_signed_payload_stream() {
-		use chrono::{DateTime, Utc};
-
-		use garage_util::data::Hash;
-
-		let datetime = DateTime::parse_from_rfc3339("2021-12-13T13:12:42+01:00") // TODO UNIX 0
-			.unwrap()
-			.with_timezone(&Utc);
-		let secret_key = "test";
-		let region = "test";
-		let scope = crate::signature::compute_scope(&datetime, region);
-		let signing_hmac =
-			crate::signature::signing_hmac(&datetime, secret_key, region, "s3").unwrap();
-
-		let data: &[&[u8]] = &[b"1"];
-		let body = futures::stream::iter(data.iter().map(|block| Ok(block.as_ref().into())));
-
-		let seed_signature = Hash::default();
-
-		let mut stream =
-			SignedPayloadStream::new(body, signing_hmac, datetime, &scope, seed_signature).unwrap();
-
-		assert!(stream.try_next().await.is_err());
-		match stream.try_next().await {
-			Err(SignedPayloadStreamError::Message(msg)) if msg == "Unexpected EOF" => {}
-			item => panic!(
-				"Unexpected result, expected early EOF error, got {:?}",
-				item
-			),
-		}
-	}
-}
@@ -1,6 +1,6 @@
 [package]
 name = "garage"
-version = "0.6.0"
+version = "0.5.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -15,12 +15,12 @@ path = "main.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-garage_api = { version = "0.6.0", path = "../api" }
-garage_model = { version = "0.6.0", path = "../model" }
-garage_rpc = { version = "0.6.0", path = "../rpc" }
-garage_table = { version = "0.6.0", path = "../table" }
-garage_util = { version = "0.6.0", path = "../util" }
-garage_web = { version = "0.6.0", path = "../web" }
+garage_api = { version = "0.5.1", path = "../api" }
+garage_model = { version = "0.5.1", path = "../model" }
+garage_rpc = { version = "0.5.1", path = "../rpc" }
+garage_table = { version = "0.5.1", path = "../table" }
+garage_util = { version = "0.5.1", path = "../util" }
+garage_web = { version = "0.5.1", path = "../web" }

 bytes = "1.0"
 git-version = "0.3.4"
@@ -35,7 +35,6 @@ sled = "0.34"

 rmp-serde = "0.15"
 serde = { version = "1.0", default-features = false, features = ["derive", "rc"] }
-serde_bytes = "0.11"
 structopt = { version = "0.3", default-features = false }
 toml = "0.5"

@@ -5,24 +5,17 @@ use std::sync::Arc;
 use async_trait::async_trait;
 use serde::{Deserialize, Serialize};

-use garage_util::crdt::*;
-use garage_util::data::*;
-use garage_util::error::Error as GarageError;
-use garage_util::time::*;
+use garage_util::error::Error;

+use garage_table::crdt::Crdt;
 use garage_table::replication::*;
 use garage_table::*;

 use garage_rpc::*;

-use garage_model::bucket_alias_table::*;
 use garage_model::bucket_table::*;
 use garage_model::garage::Garage;
-use garage_model::helper::error::{Error, OkOrBadRequest};
 use garage_model::key_table::*;
-use garage_model::migrate::Migrate;
-use garage_model::object_table::ObjectFilter;
-use garage_model::permission::*;

 use crate::cli::*;
 use crate::repair::Repair;
@@ -34,15 +27,14 @@ pub enum AdminRpc {
 	BucketOperation(BucketOperation),
 	KeyOperation(KeyOperation),
 	LaunchRepair(RepairOpt),
-	Migrate(MigrateOpt),
 	Stats(StatsOpt),

 	// Replies
 	Ok(String),
-	BucketList(Vec<Bucket>),
-	BucketInfo(Bucket, HashMap<String, Key>),
+	BucketList(Vec<String>),
+	BucketInfo(Bucket),
 	KeyList(Vec<(String, String)>),
-	KeyInfo(Key, HashMap<Uuid, Bucket>),
+	KeyInfo(Key),
 }

 impl Rpc for AdminRpc {
@@ -64,543 +56,280 @@ impl AdminRpcHandler {

 	async fn handle_bucket_cmd(&self, cmd: &BucketOperation) -> Result<AdminRpc, Error> {
 		match cmd {
-			BucketOperation::List => self.handle_list_buckets().await,
-			BucketOperation::Info(query) => self.handle_bucket_info(query).await,
-			BucketOperation::Create(query) => self.handle_create_bucket(&query.name).await,
-			BucketOperation::Delete(query) => self.handle_delete_bucket(query).await,
-			BucketOperation::Alias(query) => self.handle_alias_bucket(query).await,
-			BucketOperation::Unalias(query) => self.handle_unalias_bucket(query).await,
-			BucketOperation::Allow(query) => self.handle_bucket_allow(query).await,
-			BucketOperation::Deny(query) => self.handle_bucket_deny(query).await,
-			BucketOperation::Website(query) => self.handle_bucket_website(query).await,
-		}
-	}
+			BucketOperation::List => {
+				let bucket_names = self
+					.garage
+					.bucket_table
+					.get_range(&EmptyKey, None, Some(DeletedFilter::NotDeleted), 10000)
+					.await?
+					.iter()
+					.map(|b| b.name.to_string())
+					.collect::<Vec<_>>();
+				Ok(AdminRpc::BucketList(bucket_names))
+			}
+			BucketOperation::Info(query) => {
+				let bucket = self.get_existing_bucket(&query.name).await?;
+				Ok(AdminRpc::BucketInfo(bucket))
+			}
+			BucketOperation::Create(query) => {
+				let bucket = match self.garage.bucket_table.get(&EmptyKey, &query.name).await? {
+					Some(mut bucket) => {
+						if !bucket.is_deleted() {
+							return Err(Error::BadRpc(format!(
+								"Bucket {} already exists",
+								query.name
+							)));
+						}
+						bucket
+							.state
+							.update(BucketState::Present(BucketParams::new()));
+						bucket
+					}
+					None => Bucket::new(query.name.clone()),
+				};
+				self.garage.bucket_table.insert(&bucket).await?;
+				Ok(AdminRpc::Ok(format!("Bucket {} was created.", query.name)))
+			}
+			BucketOperation::Delete(query) => {
+				let mut bucket = self.get_existing_bucket(&query.name).await?;
+				let objects = self
+					.garage
+					.object_table
+					.get_range(&query.name, None, Some(DeletedFilter::NotDeleted), 10)
+					.await?;
+				if !objects.is_empty() {
+					return Err(Error::BadRpc(format!("Bucket {} is not empty", query.name)));
+				}
+				if !query.yes {
+					return Err(Error::BadRpc(
+						"Add --yes flag to really perform this operation".to_string(),
+					));
+				}
+				// --- done checking, now commit ---
+				for (key_id, _, _) in bucket.authorized_keys() {
+					if let Some(key) = self.garage.key_table.get(&EmptyKey, key_id).await? {
+						if !key.deleted.get() {
+							self.update_key_bucket(&key, &bucket.name, false, false)
+								.await?;
+						}
+					} else {
+						return Err(Error::Message(format!("Key not found: {}", key_id)));
+					}
+				}
+				bucket.state.update(BucketState::Deleted);
+				self.garage.bucket_table.insert(&bucket).await?;
+				Ok(AdminRpc::Ok(format!("Bucket {} was deleted.", query.name)))
+			}
+			BucketOperation::Allow(query) => {
+				let key = self.get_existing_key(&query.key_pattern).await?;
+				let bucket = self.get_existing_bucket(&query.bucket).await?;
+				let allow_read = query.read || key.allow_read(&query.bucket);
+				let allow_write = query.write || key.allow_write(&query.bucket);
+				self.update_key_bucket(&key, &query.bucket, allow_read, allow_write)
+					.await?;
+				self.update_bucket_key(bucket, &key.key_id, allow_read, allow_write)
+					.await?;
+				Ok(AdminRpc::Ok(format!(
+					"New permissions for {} on {}: read {}, write {}.",
+					&key.key_id, &query.bucket, allow_read, allow_write
+				)))
+			}
+			BucketOperation::Deny(query) => {
+				let key = self.get_existing_key(&query.key_pattern).await?;
+				let bucket = self.get_existing_bucket(&query.bucket).await?;
+				let allow_read = !query.read && key.allow_read(&query.bucket);
+				let allow_write = !query.write && key.allow_write(&query.bucket);
+				self.update_key_bucket(&key, &query.bucket, allow_read, allow_write)
+					.await?;
+				self.update_bucket_key(bucket, &key.key_id, allow_read, allow_write)
+					.await?;
+				Ok(AdminRpc::Ok(format!(
+					"New permissions for {} on {}: read {}, write {}.",
+					&key.key_id, &query.bucket, allow_read, allow_write
+				)))
+			}
+			BucketOperation::Website(query) => {
+				let mut bucket = self.get_existing_bucket(&query.bucket).await?;

-	async fn handle_list_buckets(&self) -> Result<AdminRpc, Error> {
-		let buckets = self
-			.garage
-			.bucket_table
-			.get_range(&EmptyKey, None, Some(DeletedFilter::NotDeleted), 10000)
-			.await?;
-		Ok(AdminRpc::BucketList(buckets))
-	}
+				if !(query.allow ^ query.deny) {
+					return Err(Error::Message(
+						"You must specify exactly one flag, either --allow or --deny".to_string(),
+					));
+				}

-	async fn handle_bucket_info(&self, query: &BucketOpt) -> Result<AdminRpc, Error> {
-		let bucket_id = self
-			.garage
-			.bucket_helper()
-			.resolve_global_bucket_name(&query.name)
-			.await?
-			.ok_or_bad_request("Bucket not found")?;
+				if let BucketState::Present(state) = bucket.state.get_mut() {
+					state.website.update(query.allow);
+					self.garage.bucket_table.insert(&bucket).await?;
+					let msg = if query.allow {
+						format!("Website access allowed for {}", &query.bucket)
+					} else {
+						format!("Website access denied for {}", &query.bucket)
+					};

-		let bucket = self
-			.garage
-			.bucket_helper()
-			.get_existing_bucket(bucket_id)
-			.await?;
-
-		let mut relevant_keys = HashMap::new();
-		for (k, _) in bucket
-			.state
-			.as_option()
-			.unwrap()
-			.authorized_keys
-			.items()
-			.iter()
-		{
-			if let Some(key) = self
-				.garage
-				.key_table
-				.get(&EmptyKey, k)
-				.await?
-				.filter(|k| !k.is_deleted())
-			{
-				relevant_keys.insert(k.clone(), key);
+					Ok(AdminRpc::Ok(msg))
+				} else {
+					unreachable!();
+				}
 			}
 		}
-		for ((k, _), _, _) in bucket
-			.state
-			.as_option()
-			.unwrap()
-			.local_aliases
-			.items()
-			.iter()
-		{
-			if relevant_keys.contains_key(k) {
-				continue;
-			}
-			if let Some(key) = self.garage.key_table.get(&EmptyKey, k).await? {
-				relevant_keys.insert(k.clone(), key);
-			}
-		}
-
-		Ok(AdminRpc::BucketInfo(bucket, relevant_keys))
-	}
-
-	#[allow(clippy::ptr_arg)]
-	async fn handle_create_bucket(&self, name: &String) -> Result<AdminRpc, Error> {
-		if !is_valid_bucket_name(name) {
-			return Err(Error::BadRequest(format!(
-				"{}: {}",
-				name, INVALID_BUCKET_NAME_MESSAGE
-			)));
-		}
-
-		if let Some(alias) = self.garage.bucket_alias_table.get(&EmptyKey, name).await? {
-			if alias.state.get().is_some() {
-				return Err(Error::BadRequest(format!("Bucket {} already exists", name)));
-			}
-		}
-
-		// ---- done checking, now commit ----
-
-		let bucket = Bucket::new();
-		self.garage.bucket_table.insert(&bucket).await?;
-
-		self.garage
-			.bucket_helper()
-			.set_global_bucket_alias(bucket.id, name)
-			.await?;
-
-		Ok(AdminRpc::Ok(format!("Bucket {} was created.", name)))
-	}
-
-	async fn handle_delete_bucket(&self, query: &DeleteBucketOpt) -> Result<AdminRpc, Error> {
-		let helper = self.garage.bucket_helper();
-
-		let bucket_id = helper
-			.resolve_global_bucket_name(&query.name)
-			.await?
-			.ok_or_bad_request("Bucket not found")?;
-
-		// Get the alias, but keep in minde here the bucket name
-		// given in parameter can also be directly the bucket's ID.
-		// In that case bucket_alias will be None, and
-		// we can still delete the bucket if it has zero aliases
-		// (a condition which we try to prevent but that could still happen somehow).
-		// We just won't try to delete an alias entry because there isn't one.
-		let bucket_alias = self
-			.garage
-			.bucket_alias_table
-			.get(&EmptyKey, &query.name)
-			.await?;
-
-		// Check bucket doesn't have other aliases
-		let mut bucket = helper.get_existing_bucket(bucket_id).await?;
-		let bucket_state = bucket.state.as_option().unwrap();
-		if bucket_state
-			.aliases
-			.items()
-			.iter()
-			.filter(|(_, _, active)| *active)
-			.any(|(name, _, _)| name != &query.name)
-		{
-			return Err(Error::BadRequest(format!("Bucket {} still has other global aliases. Use `bucket unalias` to delete them one by one.", query.name)));
-		}
-		if bucket_state
-			.local_aliases
-			.items()
-			.iter()
-			.any(|(_, _, active)| *active)
-		{
-			return Err(Error::BadRequest(format!("Bucket {} still has other local aliases. Use `bucket unalias` to delete them one by one.", query.name)));
-		}
-
-		// Check bucket is empty
-		let objects = self
-			.garage
-			.object_table
-			.get_range(&bucket_id, None, Some(ObjectFilter::IsData), 10)
-			.await?;
-		if !objects.is_empty() {
-			return Err(Error::BadRequest(format!(
-				"Bucket {} is not empty",
-				query.name
-			)));
-		}
-
-		if !query.yes {
-			return Err(Error::BadRequest(
-				"Add --yes flag to really perform this operation".to_string(),
-			));
-		}
-
-		// --- done checking, now commit ---
-		// 1. delete authorization from keys that had access
-		for (key_id, _) in bucket.authorized_keys() {
-			helper
-				.set_bucket_key_permissions(bucket.id, key_id, BucketKeyPerm::NO_PERMISSIONS)
-				.await?;
-		}
-
-		// 2. delete bucket alias
-		if bucket_alias.is_some() {
-			helper
-				.purge_global_bucket_alias(bucket_id, &query.name)
-				.await?;
-		}
-
-		// 3. delete bucket
-		bucket.state = Deletable::delete();
-		self.garage.bucket_table.insert(&bucket).await?;
-
-		Ok(AdminRpc::Ok(format!("Bucket {} was deleted.", query.name)))
-	}
-
-	async fn handle_alias_bucket(&self, query: &AliasBucketOpt) -> Result<AdminRpc, Error> {
-		let helper = self.garage.bucket_helper();
-
-		let bucket_id = helper
-			.resolve_global_bucket_name(&query.existing_bucket)
-			.await?
-			.ok_or_bad_request("Bucket not found")?;
-
-		if let Some(key_pattern) = &query.local {
-			let key = helper.get_existing_matching_key(key_pattern).await?;
-
-			helper
-				.set_local_bucket_alias(bucket_id, &key.key_id, &query.new_name)
-				.await?;
-			Ok(AdminRpc::Ok(format!(
-				"Alias {} now points to bucket {:?} in namespace of key {}",
-				query.new_name, bucket_id, key.key_id
-			)))
-		} else {
-			helper
-				.set_global_bucket_alias(bucket_id, &query.new_name)
-				.await?;
-			Ok(AdminRpc::Ok(format!(
-				"Alias {} now points to bucket {:?}",
-				query.new_name, bucket_id
-			)))
-		}
-	}
-
-	async fn handle_unalias_bucket(&self, query: &UnaliasBucketOpt) -> Result<AdminRpc, Error> {
-		let helper = self.garage.bucket_helper();
-
-		if let Some(key_pattern) = &query.local {
-			let key = helper.get_existing_matching_key(key_pattern).await?;
-
-			let bucket_id = key
-				.state
-				.as_option()
-				.unwrap()
-				.local_aliases
-				.get(&query.name)
-				.cloned()
-				.flatten()
-				.ok_or_bad_request("Bucket not found")?;
-
-			helper
-				.unset_local_bucket_alias(bucket_id, &key.key_id, &query.name)
-				.await?;
-
-			Ok(AdminRpc::Ok(format!(
-				"Alias {} no longer points to bucket {:?} in namespace of key {}",
-				&query.name, bucket_id, key.key_id
-			)))
-		} else {
-			let bucket_id = helper
-				.resolve_global_bucket_name(&query.name)
-				.await?
-				.ok_or_bad_request("Bucket not found")?;
-
-			helper
-				.unset_global_bucket_alias(bucket_id, &query.name)
-				.await?;
-
-			Ok(AdminRpc::Ok(format!(
-				"Alias {} no longer points to bucket {:?}",
-				&query.name, bucket_id
-			)))
-		}
-	}
-
-	async fn handle_bucket_allow(&self, query: &PermBucketOpt) -> Result<AdminRpc, Error> {
-		let helper = self.garage.bucket_helper();
-
-		let bucket_id = helper
-			.resolve_global_bucket_name(&query.bucket)
-			.await?
-			.ok_or_bad_request("Bucket not found")?;
-		let key = helper.get_existing_matching_key(&query.key_pattern).await?;
-
-		let allow_read = query.read || key.allow_read(&bucket_id);
-		let allow_write = query.write || key.allow_write(&bucket_id);
-		let allow_owner = query.owner || key.allow_owner(&bucket_id);
-
-		helper
-			.set_bucket_key_permissions(
-				bucket_id,
-				&key.key_id,
-				BucketKeyPerm {
-					timestamp: now_msec(),
-					allow_read,
-					allow_write,
-					allow_owner,
-				},
-			)
-			.await?;
-
-		Ok(AdminRpc::Ok(format!(
-			"New permissions for {} on {}: read {}, write {}, owner {}.",
-			&key.key_id, &query.bucket, allow_read, allow_write, allow_owner
-		)))
-	}
-
-	async fn handle_bucket_deny(&self, query: &PermBucketOpt) -> Result<AdminRpc, Error> {
-		let helper = self.garage.bucket_helper();
-
-		let bucket_id = helper
-			.resolve_global_bucket_name(&query.bucket)
-			.await?
-			.ok_or_bad_request("Bucket not found")?;
-		let key = helper.get_existing_matching_key(&query.key_pattern).await?;
-
-		let allow_read = !query.read && key.allow_read(&bucket_id);
-		let allow_write = !query.write && key.allow_write(&bucket_id);
-		let allow_owner = !query.owner && key.allow_owner(&bucket_id);
-
-		helper
-			.set_bucket_key_permissions(
-				bucket_id,
-				&key.key_id,
-				BucketKeyPerm {
-					timestamp: now_msec(),
-					allow_read,
-					allow_write,
-					allow_owner,
-				},
-			)
-			.await?;
-
-		Ok(AdminRpc::Ok(format!(
-			"New permissions for {} on {}: read {}, write {}, owner {}.",
-			&key.key_id, &query.bucket, allow_read, allow_write, allow_owner
-		)))
-	}
-
-	async fn handle_bucket_website(&self, query: &WebsiteOpt) -> Result<AdminRpc, Error> {
-		let bucket_id = self
-			.garage
-			.bucket_helper()
-			.resolve_global_bucket_name(&query.bucket)
-			.await?
-			.ok_or_bad_request("Bucket not found")?;
-
-		let mut bucket = self
-			.garage
-			.bucket_helper()
-			.get_existing_bucket(bucket_id)
-			.await?;
-		let bucket_state = bucket.state.as_option_mut().unwrap();
-
-		if !(query.allow ^ query.deny) {
-			return Err(Error::BadRequest(
-				"You must specify exactly one flag, either --allow or --deny".to_string(),
-			));
-		}
-
-		let website = if query.allow {
-			Some(WebsiteConfig {
-				index_document: query.index_document.clone(),
-				error_document: query.error_document.clone(),
-			})
-		} else {
-			None
-		};
-
-		bucket_state.website_config.update(website);
-		self.garage.bucket_table.insert(&bucket).await?;
-
-		let msg = if query.allow {
-			format!("Website access allowed for {}", &query.bucket)
-		} else {
-			format!("Website access denied for {}", &query.bucket)
-		};
-
-		Ok(AdminRpc::Ok(msg))
 	}

 	async fn handle_key_cmd(&self, cmd: &KeyOperation) -> Result<AdminRpc, Error> {
 		match cmd {
-			KeyOperation::List => self.handle_list_keys().await,
-			KeyOperation::Info(query) => self.handle_key_info(query).await,
-			KeyOperation::New(query) => self.handle_create_key(query).await,
-			KeyOperation::Rename(query) => self.handle_rename_key(query).await,
-			KeyOperation::Delete(query) => self.handle_delete_key(query).await,
-			KeyOperation::Allow(query) => self.handle_allow_key(query).await,
-			KeyOperation::Deny(query) => self.handle_deny_key(query).await,
-			KeyOperation::Import(query) => self.handle_import_key(query).await,
+			KeyOperation::List => {
+				let key_ids = self
+					.garage
+					.key_table
+					.get_range(
+						&EmptyKey,
+						None,
+						Some(KeyFilter::Deleted(DeletedFilter::NotDeleted)),
+						10000,
+					)
+					.await?
+					.iter()
+					.map(|k| (k.key_id.to_string(), k.name.get().clone()))
+					.collect::<Vec<_>>();
+				Ok(AdminRpc::KeyList(key_ids))
+			}
+			KeyOperation::Info(query) => {
+				let key = self.get_existing_key(&query.key_pattern).await?;
+				Ok(AdminRpc::KeyInfo(key))
+			}
+			KeyOperation::New(query) => {
+				let key = Key::new(query.name.clone());
+				self.garage.key_table.insert(&key).await?;
+				Ok(AdminRpc::KeyInfo(key))
+			}
+			KeyOperation::Rename(query) => {
+				let mut key = self.get_existing_key(&query.key_pattern).await?;
+				key.name.update(query.new_name.clone());
+				self.garage.key_table.insert(&key).await?;
+				Ok(AdminRpc::KeyInfo(key))
+			}
+			KeyOperation::Delete(query) => {
+				let key = self.get_existing_key(&query.key_pattern).await?;
+				if !query.yes {
+					return Err(Error::BadRpc(
+						"Add --yes flag to really perform this operation".to_string(),
+					));
+				}
+				// --- done checking, now commit ---
+				for (ab_name, _, _) in key.authorized_buckets.items().iter() {
+					if let Some(bucket) = self.garage.bucket_table.get(&EmptyKey, ab_name).await? {
+						if !bucket.is_deleted() {
+							self.update_bucket_key(bucket, &key.key_id, false, false)
+								.await?;
+						}
+					} else {
+						return Err(Error::Message(format!("Bucket not found: {}", ab_name)));
+					}
+				}
+				let del_key = Key::delete(key.key_id.to_string());
+				self.garage.key_table.insert(&del_key).await?;
+				Ok(AdminRpc::Ok(format!(
+					"Key {} was deleted successfully.",
+					key.key_id
+				)))
+			}
+			KeyOperation::Import(query) => {
+				let prev_key = self.garage.key_table.get(&EmptyKey, &query.key_id).await?;
+				if prev_key.is_some() {
+					return Err(Error::Message(format!("Key {} already exists in data store. Even if it is deleted, we can't let you create a new key with the same ID. Sorry.", query.key_id)));
+				}
+				let imported_key = Key::import(&query.key_id, &query.secret_key, &query.name);
+				self.garage.key_table.insert(&imported_key).await?;
+				Ok(AdminRpc::KeyInfo(imported_key))
+			}
 		}
 	}

-	async fn handle_list_keys(&self) -> Result<AdminRpc, Error> {
-		let key_ids = self
+	#[allow(clippy::ptr_arg)]
+	async fn get_existing_bucket(&self, bucket: &String) -> Result<Bucket, Error> {
+		self.garage
+			.bucket_table
+			.get(&EmptyKey, bucket)
+			.await?
+			.filter(|b| !b.is_deleted())
+			.map(Ok)
+			.unwrap_or_else(|| Err(Error::BadRpc(format!("Bucket {} does not exist", bucket))))
+	}
+
+	async fn get_existing_key(&self, pattern: &str) -> Result<Key, Error> {
+		let candidates = self
 			.garage
 			.key_table
 			.get_range(
 				&EmptyKey,
 				None,
-				Some(KeyFilter::Deleted(DeletedFilter::NotDeleted)),
-				10000,
+				Some(KeyFilter::Matches(pattern.to_string())),
+				10,
 			)
 			.await?
-			.iter()
-			.map(|k| (k.key_id.to_string(), k.params().unwrap().name.get().clone()))
+			.into_iter()
+			.filter(|k| !k.deleted.get())
 			.collect::<Vec<_>>();
-		Ok(AdminRpc::KeyList(key_ids))
+		if candidates.len() != 1 {
+			Err(Error::Message(format!(
+				"{} matching keys",
+				candidates.len()
+			)))
+		} else {
+			Ok(candidates.into_iter().next().unwrap())
+		}
 	}

-	async fn handle_key_info(&self, query: &KeyOpt) -> Result<AdminRpc, Error> {
-		let key = self
-			.garage
-			.bucket_helper()
-			.get_existing_matching_key(&query.key_pattern)
-			.await?;
-		self.key_info_result(key).await
-	}
-
-	async fn handle_create_key(&self, query: &KeyNewOpt) -> Result<AdminRpc, Error> {
-		let key = Key::new(&query.name);
-		self.garage.key_table.insert(&key).await?;
-		self.key_info_result(key).await
-	}
-
-	async fn handle_rename_key(&self, query: &KeyRenameOpt) -> Result<AdminRpc, Error> {
-		let mut key = self
-			.garage
-			.bucket_helper()
-			.get_existing_matching_key(&query.key_pattern)
-			.await?;
-		key.params_mut()
-			.unwrap()
-			.name
-			.update(query.new_name.clone());
-		self.garage.key_table.insert(&key).await?;
-		self.key_info_result(key).await
-	}
-
-	async fn handle_delete_key(&self, query: &KeyDeleteOpt) -> Result<AdminRpc, Error> {
-		let helper = self.garage.bucket_helper();
-
-		let mut key = helper.get_existing_matching_key(&query.key_pattern).await?;
-
-		if !query.yes {
-			return Err(Error::BadRequest(
-				"Add --yes flag to really perform this operation".to_string(),
+	/// Update **bucket table** to inform of the new linked key
+	async fn update_bucket_key(
+		&self,
+		mut bucket: Bucket,
+		key_id: &str,
+		allow_read: bool,
+		allow_write: bool,
+	) -> Result<(), Error> {
+		if let BucketState::Present(params) = bucket.state.get_mut() {
+			let ak = &mut params.authorized_keys;
+			let old_ak = ak.take_and_clear();
+			ak.merge(&old_ak.update_mutator(
+				key_id.to_string(),
+				PermissionSet {
+					allow_read,
+					allow_write,
+				},
+			));
+		} else {
+			return Err(Error::Message(
+				"Bucket is deleted in update_bucket_key".to_string(),
 			));
 		}
+		self.garage.bucket_table.insert(&bucket).await?;
+		Ok(())
+	}

-		let state = key.state.as_option_mut().unwrap();
-
-		// --- done checking, now commit ---
-		// (the step at unset_local_bucket_alias will fail if a bucket
-		// does not have another alias, the deletion will be
-		// interrupted in the middle if that happens)
-
-		// 1. Delete local aliases
-		for (alias, _, to) in state.local_aliases.items().iter() {
-			if let Some(bucket_id) = to {
-				helper
-					.unset_local_bucket_alias(*bucket_id, &key.key_id, alias)
-					.await?;
-			}
-		}
-
-		// 2. Remove permissions on all authorized buckets
-		for (ab_id, _auth) in state.authorized_buckets.items().iter() {
-			helper
-				.set_bucket_key_permissions(*ab_id, &key.key_id, BucketKeyPerm::NO_PERMISSIONS)
-				.await?;
-		}
-
-		// 3. Actually delete key
-		key.state = Deletable::delete();
+	/// Update **key table** to inform of the new linked bucket
+	async fn update_key_bucket(
+		&self,
+		key: &Key,
+		bucket: &str,
+		allow_read: bool,
+		allow_write: bool,
+	) -> Result<(), Error> {
+		let mut key = key.clone();
+		let old_map = key.authorized_buckets.take_and_clear();
+		key.authorized_buckets.merge(&old_map.update_mutator(
+			bucket.to_string(),
+			PermissionSet {
+				allow_read,
+				allow_write,
+			},
+		));
 		self.garage.key_table.insert(&key).await?;
-
-		Ok(AdminRpc::Ok(format!(
-			"Key {} was deleted successfully.",
-			key.key_id
-		)))
-	}
-
-	async fn handle_allow_key(&self, query: &KeyPermOpt) -> Result<AdminRpc, Error> {
-		let mut key = self
-			.garage
-			.bucket_helper()
-			.get_existing_matching_key(&query.key_pattern)
-			.await?;
-		if query.create_bucket {
-			key.params_mut().unwrap().allow_create_bucket.update(true);
-		}
-		self.garage.key_table.insert(&key).await?;
-		self.key_info_result(key).await
-	}
-
-	async fn handle_deny_key(&self, query: &KeyPermOpt) -> Result<AdminRpc, Error> {
-		let mut key = self
-			.garage
-			.bucket_helper()
-			.get_existing_matching_key(&query.key_pattern)
-			.await?;
-		if query.create_bucket {
-			key.params_mut().unwrap().allow_create_bucket.update(false);
-		}
-		self.garage.key_table.insert(&key).await?;
-		self.key_info_result(key).await
-	}
-
-	async fn handle_import_key(&self, query: &KeyImportOpt) -> Result<AdminRpc, Error> {
-		let prev_key = self.garage.key_table.get(&EmptyKey, &query.key_id).await?;
-		if prev_key.is_some() {
-			return Err(Error::BadRequest(format!("Key {} already exists in data store. Even if it is deleted, we can't let you create a new key with the same ID. Sorry.", query.key_id)));
-		}
-		let imported_key = Key::import(&query.key_id, &query.secret_key, &query.name);
-		self.garage.key_table.insert(&imported_key).await?;
-
-		self.key_info_result(imported_key).await
-	}
-
-	async fn key_info_result(&self, key: Key) -> Result<AdminRpc, Error> {
-		let mut relevant_buckets = HashMap::new();
-
-		for (id, _) in key
-			.state
-			.as_option()
-			.unwrap()
-			.authorized_buckets
-			.items()
-			.iter()
-		{
-			if let Some(b) = self.garage.bucket_table.get(&EmptyKey, id).await? {
-				relevant_buckets.insert(*id, b);
-			}
-		}
-
-		Ok(AdminRpc::KeyInfo(key, relevant_buckets))
-	}
-
-	async fn handle_migrate(self: &Arc<Self>, opt: MigrateOpt) -> Result<AdminRpc, Error> {
-		if !opt.yes {
-			return Err(Error::BadRequest(
-				"Please provide the --yes flag to initiate migration operation.".to_string(),
-			));
-		}
-
-		let m = Migrate {
-			garage: self.garage.clone(),
-		};
-		match opt.what {
-			MigrateWhat::Buckets050 => m.migrate_buckets050().await,
-		}?;
-		Ok(AdminRpc::Ok("Migration successfull.".into()))
+		Ok(())
 	}

 	async fn handle_launch_repair(self: &Arc<Self>, opt: RepairOpt) -> Result<AdminRpc, Error> {
 		if !opt.yes {
-			return Err(Error::BadRequest(
+			return Err(Error::BadRpc(
 				"Please provide the --yes flag to initiate repair operations.".to_string(),
 			));
 		}
@@ -627,7 +356,7 @@ impl AdminRpcHandler {
 			if failures.is_empty() {
 				Ok(AdminRpc::Ok("Repair launched on all nodes".to_string()))
 			} else {
-				Err(Error::BadRequest(format!(
+				Err(Error::Message(format!(
 					"Could not launch repair on nodes: {:?} (launched successfully on other nodes)",
 					failures
 				)))
@@ -737,7 +466,7 @@ impl AdminRpcHandler {
 		F: TableSchema + 'static,
 		R: TableReplication + 'static,
 	{
-		writeln!(to, "\nTable stats for {}", F::TABLE_NAME).unwrap();
+		writeln!(to, "\nTable stats for {}", t.data.name).unwrap();
 		if opt.detailed {
 			writeln!(to, "  number of items: {}", t.data.store.len()).unwrap();
 			writeln!(
@@ -767,10 +496,9 @@ impl EndpointHandler<AdminRpc> for AdminRpcHandler {
 		match message {
 			AdminRpc::BucketOperation(bo) => self.handle_bucket_cmd(bo).await,
 			AdminRpc::KeyOperation(ko) => self.handle_key_cmd(ko).await,
-			AdminRpc::Migrate(opt) => self.handle_migrate(opt.clone()).await,
 			AdminRpc::LaunchRepair(opt) => self.handle_launch_repair(opt.clone()).await,
 			AdminRpc::Stats(opt) => self.handle_stats(opt.clone()).await,
-			m => Err(GarageError::unexpected_rpc_message(m).into()),
+			_ => Err(Error::BadRpc("Invalid RPC".to_string())),
 		}
 	}
 }
@@ -6,8 +6,6 @@ use garage_rpc::layout::*;
 use garage_rpc::system::*;
 use garage_rpc::*;

-use garage_model::helper::error::Error as HelperError;
-
 use crate::admin::*;
 use crate::cli::*;

@@ -16,14 +14,14 @@ pub async fn cli_command_dispatch(
 	system_rpc_endpoint: &Endpoint<SystemRpc, ()>,
 	admin_rpc_endpoint: &Endpoint<AdminRpc, ()>,
 	rpc_host: NodeID,
-) -> Result<(), HelperError> {
+) -> Result<(), Error> {
 	match cmd {
-		Command::Status => Ok(cmd_status(system_rpc_endpoint, rpc_host).await?),
+		Command::Status => cmd_status(system_rpc_endpoint, rpc_host).await,
 		Command::Node(NodeOperation::Connect(connect_opt)) => {
-			Ok(cmd_connect(system_rpc_endpoint, rpc_host, connect_opt).await?)
+			cmd_connect(system_rpc_endpoint, rpc_host, connect_opt).await
 		}
 		Command::Layout(layout_opt) => {
-			Ok(cli_layout_command_dispatch(layout_opt, system_rpc_endpoint, rpc_host).await?)
+			cli_layout_command_dispatch(layout_opt, system_rpc_endpoint, rpc_host).await
 		}
 		Command::Bucket(bo) => {
 			cmd_admin(admin_rpc_endpoint, rpc_host, AdminRpc::BucketOperation(bo)).await
@@ -31,9 +29,6 @@ pub async fn cli_command_dispatch(
 		Command::Key(ko) => {
 			cmd_admin(admin_rpc_endpoint, rpc_host, AdminRpc::KeyOperation(ko)).await
 		}
-		Command::Migrate(mo) => {
-			cmd_admin(admin_rpc_endpoint, rpc_host, AdminRpc::Migrate(mo)).await
-		}
 		Command::Repair(ro) => {
 			cmd_admin(admin_rpc_endpoint, rpc_host, AdminRpc::LaunchRepair(ro)).await
 		}
@@ -151,7 +146,7 @@ pub async fn cmd_connect(
 			println!("Success.");
 			Ok(())
 		}
-		m => Err(Error::unexpected_rpc_message(m)),
+		r => Err(Error::BadRpc(format!("Unexpected response: {:?}", r))),
 	}
 }

@@ -159,22 +154,28 @@ pub async fn cmd_admin(
 	rpc_cli: &Endpoint<AdminRpc, ()>,
 	rpc_host: NodeID,
 	args: AdminRpc,
-) -> Result<(), HelperError> {
+) -> Result<(), Error> {
 	match rpc_cli.call(&rpc_host, &args, PRIO_NORMAL).await?? {
 		AdminRpc::Ok(msg) => {
 			println!("{}", msg);
 		}
 		AdminRpc::BucketList(bl) => {
-			print_bucket_list(bl);
+			println!("List of buckets:");
+			for bucket in bl {
+				println!("{}", bucket);
+			}
 		}
-		AdminRpc::BucketInfo(bucket, rk) => {
-			print_bucket_info(&bucket, &rk);
+		AdminRpc::BucketInfo(bucket) => {
+			print_bucket_info(&bucket);
 		}
 		AdminRpc::KeyList(kl) => {
-			print_key_list(kl);
+			println!("List of keys:");
+			for key in kl {
+				println!("{}\t{}", key.0, key.1);
+			}
 		}
-		AdminRpc::KeyInfo(key, rb) => {
-			print_key_info(&key, &rb);
+		AdminRpc::KeyInfo(key) => {
+			print_key_info(&key);
 		}
 		r => {
 			error!("Unexpected response: {:?}", r);
@@ -28,11 +28,6 @@ pub enum Command {
 	#[structopt(name = "key")]
 	Key(KeyOperation),

-	/// Run migrations from previous Garage version
-	/// (DO NOT USE WITHOUT READING FULL DOCUMENTATION)
-	#[structopt(name = "migrate")]
-	Migrate(MigrateOpt),
-
 	/// Start repair of node data
 	#[structopt(name = "repair")]
 	Repair(RepairOpt),
@@ -155,14 +150,6 @@ pub enum BucketOperation {
 	#[structopt(name = "delete")]
 	Delete(DeleteBucketOpt),

-	/// Alias bucket under new name
-	#[structopt(name = "alias")]
-	Alias(AliasBucketOpt),
-
-	/// Remove bucket alias
-	#[structopt(name = "unalias")]
-	Unalias(UnaliasBucketOpt),
-
 	/// Allow key to read or write to bucket
 	#[structopt(name = "allow")]
 	Allow(PermBucketOpt),
@@ -188,14 +175,6 @@ pub struct WebsiteOpt {

 	/// Bucket name
 	pub bucket: String,
-
-	/// Index document: the suffix appended to request paths ending by /
-	#[structopt(short = "i", long = "index-document", default_value = "index.html")]
-	pub index_document: String,
-
-	/// Error document: the optionnal document returned when an error occurs
-	#[structopt(short = "e", long = "error-document")]
-	pub error_document: Option<String>,
 }

 #[derive(Serialize, Deserialize, StructOpt, Debug)]
@@ -214,29 +193,6 @@ pub struct DeleteBucketOpt {
 	pub yes: bool,
 }

-#[derive(Serialize, Deserialize, StructOpt, Debug)]
-pub struct AliasBucketOpt {
-	/// Existing bucket name (its alias in global namespace or its full hex uuid)
-	pub existing_bucket: String,
-
-	/// New bucket name
-	pub new_name: String,
-
-	/// Make this alias local to the specified access key
-	#[structopt(long = "local")]
-	pub local: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, StructOpt, Debug)]
-pub struct UnaliasBucketOpt {
-	/// Bucket name
-	pub name: String,
-
-	/// Unalias in bucket namespace local to this access key
-	#[structopt(long = "local")]
-	pub local: Option<String>,
-}
-
 #[derive(Serialize, Deserialize, StructOpt, Debug)]
 pub struct PermBucketOpt {
 	/// Access key name or ID
@@ -251,11 +207,6 @@ pub struct PermBucketOpt {
 	#[structopt(long = "write")]
 	pub write: bool,

-	/// Allow/deny administrative operations operations
-	/// (such as deleting bucket or changing bucket website configuration)
-	#[structopt(long = "owner")]
-	pub owner: bool,
-
 	/// Bucket name
 	pub bucket: String,
 }
@@ -282,14 +233,6 @@ pub enum KeyOperation {
 	#[structopt(name = "delete")]
 	Delete(KeyDeleteOpt),

-	/// Set permission flags for key
-	#[structopt(name = "allow")]
-	Allow(KeyPermOpt),
-
-	/// Unset permission flags for key
-	#[structopt(name = "deny")]
-	Deny(KeyPermOpt),
-
 	/// Import key
 	#[structopt(name = "import")]
 	Import(KeyImportOpt),
@@ -327,16 +270,6 @@ pub struct KeyDeleteOpt {
 	pub yes: bool,
 }

-#[derive(Serialize, Deserialize, StructOpt, Debug)]
-pub struct KeyPermOpt {
-	/// ID or name of the key
-	pub key_pattern: String,
-
-	/// Flag that allows key to create buckets using S3's CreateBucket call
-	#[structopt(long = "create-bucket")]
-	pub create_bucket: bool,
-}
-
 #[derive(Serialize, Deserialize, StructOpt, Debug)]
 pub struct KeyImportOpt {
 	/// Access key ID
@@ -350,23 +283,6 @@ pub struct KeyImportOpt {
 	pub name: String,
 }

-#[derive(Serialize, Deserialize, StructOpt, Debug, Clone)]
-pub struct MigrateOpt {
-	/// Confirm the launch of the migrate operation
-	#[structopt(long = "yes")]
-	pub yes: bool,
-
-	#[structopt(subcommand)]
-	pub what: MigrateWhat,
-}
-
-#[derive(Serialize, Deserialize, StructOpt, Debug, Eq, PartialEq, Clone)]
-pub enum MigrateWhat {
-	/// Migrate buckets and permissions from v0.5.0
-	#[structopt(name = "buckets050")]
-	Buckets050,
-}
-
 #[derive(Serialize, Deserialize, StructOpt, Debug, Clone)]
 pub struct RepairOpt {
 	/// Launch repair operation on all nodes
@@ -1,171 +1,33 @@
-use std::collections::HashMap;
-
-use garage_util::crdt::*;
 use garage_util::data::Uuid;
 use garage_util::error::*;

 use garage_model::bucket_table::*;
 use garage_model::key_table::*;

-pub fn print_bucket_list(bl: Vec<Bucket>) {
-	println!("List of buckets:");
-
-	let mut table = vec![];
-	for bucket in bl {
-		let aliases = bucket
-			.aliases()
-			.iter()
-			.filter(|(_, _, active)| *active)
-			.map(|(name, _, _)| name.to_string())
-			.collect::<Vec<_>>();
-		let local_aliases_n = match &bucket
-			.local_aliases()
-			.iter()
-			.filter(|(_, _, active)| *active)
-			.collect::<Vec<_>>()[..]
-		{
-			[] => "".into(),
-			[((k, n), _, _)] => format!("{}:{}", k, n),
-			s => format!("[{} local aliases]", s.len()),
-		};
-		table.push(format!(
-			"\t{}\t{}\t{}",
-			aliases.join(","),
-			local_aliases_n,
-			hex::encode(bucket.id)
-		));
-	}
-	format_table(table);
-}
-
-pub fn print_key_list(kl: Vec<(String, String)>) {
-	println!("List of keys:");
-	let mut table = vec![];
-	for key in kl {
-		table.push(format!("\t{}\t{}", key.0, key.1));
-	}
-	format_table(table);
-}
-
-pub fn print_key_info(key: &Key, relevant_buckets: &HashMap<Uuid, Bucket>) {
-	let bucket_global_aliases = |b: &Uuid| {
-		if let Some(bucket) = relevant_buckets.get(b) {
-			if let Some(p) = bucket.state.as_option() {
-				return p
-					.aliases
-					.items()
-					.iter()
-					.filter(|(_, _, active)| *active)
-					.map(|(a, _, _)| a.clone())
-					.collect::<Vec<_>>()
-					.join(", ");
-			}
-		}
-
-		"".to_string()
-	};
-
-	match &key.state {
-		Deletable::Present(p) => {
-			println!("Key name: {}", p.name.get());
-			println!("Key ID: {}", key.key_id);
-			println!("Secret key: {}", p.secret_key);
-			println!("Can create buckets: {}", p.allow_create_bucket.get());
-			println!("\nKey-specific bucket aliases:");
-			let mut table = vec![];
-			for (alias_name, _, alias) in p.local_aliases.items().iter() {
-				if let Some(bucket_id) = alias {
-					table.push(format!(
-						"\t{}\t{}\t{}",
-						alias_name,
-						bucket_global_aliases(bucket_id),
-						hex::encode(bucket_id)
-					));
-				}
-			}
-			format_table(table);
-
-			println!("\nAuthorized buckets:");
-			let mut table = vec![];
-			for (bucket_id, perm) in p.authorized_buckets.items().iter() {
-				if !perm.is_any() {
-					continue;
-				}
-				let rflag = if perm.allow_read { "R" } else { " " };
-				let wflag = if perm.allow_write { "W" } else { " " };
-				let oflag = if perm.allow_owner { "O" } else { " " };
-				let local_aliases = p
-					.local_aliases
-					.items()
-					.iter()
-					.filter(|(_, _, a)| *a == Some(*bucket_id))
-					.map(|(a, _, _)| a.clone())
-					.collect::<Vec<_>>()
-					.join(", ");
-				table.push(format!(
-					"\t{}{}{}\t{}\t{}\t{:?}",
-					rflag,
-					wflag,
-					oflag,
-					bucket_global_aliases(bucket_id),
-					local_aliases,
-					bucket_id
-				));
-			}
-			format_table(table);
-		}
-		Deletable::Deleted => {
-			println!("Key {} is deleted.", key.key_id);
+pub fn print_key_info(key: &Key) {
+	println!("Key name: {}", key.name.get());
+	println!("Key ID: {}", key.key_id);
+	println!("Secret key: {}", key.secret_key);
+	if key.deleted.get() {
+		println!("Key is deleted.");
+	} else {
+		println!("Authorized buckets:");
+		for (b, _, perm) in key.authorized_buckets.items().iter() {
+			println!("- {} R:{} W:{}", b, perm.allow_read, perm.allow_write);
 		}
 	}
 }

-pub fn print_bucket_info(bucket: &Bucket, relevant_keys: &HashMap<String, Key>) {
-	let key_name = |k| {
-		relevant_keys
-			.get(k)
-			.map(|k| k.params().unwrap().name.get().as_str())
-			.unwrap_or("<deleted>")
-	};
-
-	println!("Bucket: {}", hex::encode(bucket.id));
-	match &bucket.state {
-		Deletable::Deleted => println!("Bucket is deleted."),
-		Deletable::Present(p) => {
-			println!("Website access: {}", p.website_config.get().is_some());
-
-			println!("\nGlobal aliases:");
-			for (alias, _, active) in p.aliases.items().iter() {
-				if *active {
-					println!("  {}", alias);
-				}
+pub fn print_bucket_info(bucket: &Bucket) {
+	println!("Bucket name: {}", bucket.name);
+	match bucket.state.get() {
+		BucketState::Deleted => println!("Bucket is deleted."),
+		BucketState::Present(p) => {
+			println!("Authorized keys:");
+			for (k, _, perm) in p.authorized_keys.items().iter() {
+				println!("- {} R:{} W:{}", k, perm.allow_read, perm.allow_write);
 			}
-
-			println!("\nKey-specific aliases:");
-			let mut table = vec![];
-			for ((key_id, alias), _, active) in p.local_aliases.items().iter() {
-				if *active {
-					table.push(format!("\t{} ({})\t{}", key_id, key_name(key_id), alias));
-				}
-			}
-			format_table(table);
-
-			println!("\nAuthorized keys:");
-			let mut table = vec![];
-			for (k, perm) in p.authorized_keys.items().iter() {
-				let rflag = if perm.allow_read { "R" } else { " " };
-				let wflag = if perm.allow_write { "W" } else { " " };
-				let oflag = if perm.allow_owner { "O" } else { " " };
-				table.push(format!(
-					"\t{}{}{}\t{}\t{}",
-					rflag,
-					wflag,
-					oflag,
-					k,
-					key_name(k)
-				));
-			}
-			format_table(table);
+			println!("Website access: {}", p.website.get());
 		}
 	};
 }
@@ -22,8 +22,6 @@ use garage_util::error::*;
 use garage_rpc::system::*;
 use garage_rpc::*;

-use garage_model::helper::error::Error as HelperError;
-
 use admin::*;
 use cli::*;

@@ -138,9 +136,5 @@ async fn cli_command(opt: Opt) -> Result<(), Error> {
 	let system_rpc_endpoint = netapp.endpoint::<SystemRpc, ()>(SYSTEM_RPC_PATH.into());
 	let admin_rpc_endpoint = netapp.endpoint::<AdminRpc, ()>(ADMIN_RPC_PATH.into());

-	match cli_command_dispatch(opt.cmd, &system_rpc_endpoint, &admin_rpc_endpoint, id).await {
-		Err(HelperError::Internal(i)) => Err(Error::Message(format!("Internal error: {}", i))),
-		Err(HelperError::BadRequest(b)) => Err(Error::Message(b)),
-		Ok(x) => Ok(x),
-	}
+	cli_command_dispatch(opt.cmd, &system_rpc_endpoint, &admin_rpc_endpoint, id).await
 }
@@ -77,7 +77,7 @@ impl Repair {
 			let object = self
 				.garage
 				.object_table
-				.get(&version.bucket_id, &version.key)
+				.get(&version.bucket, &version.key)
 				.await?;
 			let version_exists = match object {
 				Some(o) => o
@@ -92,7 +92,7 @@ impl Repair {
 					.version_table
 					.insert(&Version::new(
 						version.uuid,
-						version.bucket_id,
+						version.bucket,
 						version.key,
 						true,
 					))
@@ -1,6 +1,6 @@
 [package]
 name = "garage_model"
-version = "0.6.0"
+version = "0.5.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -14,14 +14,12 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-garage_rpc = { version = "0.6.0", path = "../rpc" }
-garage_table = { version = "0.6.0", path = "../table" }
-garage_util = { version = "0.6.0", path = "../util" }
-garage_model_050 = { package = "garage_model", version = "0.5.1" }
+garage_rpc = { version = "0.5.1", path = "../rpc" }
+garage_table = { version = "0.5.1", path = "../table" }
+garage_util = { version = "0.5.1", path = "../util" }

 async-trait = "0.1.7"
 arc-swap = "1.0"
-err-derive = "0.3"
 hex = "0.4"
 log = "0.4"
 rand = "0.8"
@@ -594,8 +594,10 @@ impl BlockManager {
 							need_nodes.push(*node);
 						}
 					}
-					m => {
-						return Err(Error::unexpected_rpc_message(m));
+					_ => {
+						return Err(Error::Message(
+							"Unexpected response to NeedBlockQuery RPC".to_string(),
+						));
 					}
 				}
 			}
@@ -728,7 +730,7 @@ impl EndpointHandler<BlockRpc> for BlockManager {
 			BlockRpc::PutBlock { hash, data } => self.write_block(hash, data).await,
 			BlockRpc::GetBlock(h) => self.read_block(h).await,
 			BlockRpc::NeedBlockQuery(h) => self.need_block(h).await.map(BlockRpc::NeedBlockReply),
-			m => Err(Error::unexpected_rpc_message(m)),
+			_ => Err(Error::BadRpc("Unexpected RPC message".to_string())),
 		}
 	}
 }
@@ -44,8 +44,6 @@ pub struct BlockRefTable {
 }

 impl TableSchema for BlockRefTable {
-	const TABLE_NAME: &'static str = "block_ref";
-
 	type P = Hash;
 	type S = Uuid;
 	type E = BlockRef;
@@ -1,93 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-use garage_util::data::*;
-
-use garage_table::crdt::*;
-use garage_table::*;
-
-/// The bucket alias table holds the names given to buckets
-/// in the global namespace.
-#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
-pub struct BucketAlias {
-	name: String,
-	pub state: crdt::Lww<Option<Uuid>>,
-}
-
-impl BucketAlias {
-	pub fn new(name: String, ts: u64, bucket_id: Option<Uuid>) -> Option<Self> {
-		if !is_valid_bucket_name(&name) {
-			None
-		} else {
-			Some(BucketAlias {
-				name,
-				state: crdt::Lww::raw(ts, bucket_id),
-			})
-		}
-	}
-
-	pub fn is_deleted(&self) -> bool {
-		self.state.get().is_none()
-	}
-	pub fn name(&self) -> &str {
-		&self.name
-	}
-}
-
-impl Crdt for BucketAlias {
-	fn merge(&mut self, o: &Self) {
-		self.state.merge(&o.state);
-	}
-}
-
-impl Entry<EmptyKey, String> for BucketAlias {
-	fn partition_key(&self) -> &EmptyKey {
-		&EmptyKey
-	}
-	fn sort_key(&self) -> &String {
-		&self.name
-	}
-}
-
-pub struct BucketAliasTable;
-
-impl TableSchema for BucketAliasTable {
-	const TABLE_NAME: &'static str = "bucket_alias";
-
-	type P = EmptyKey;
-	type S = String;
-	type E = BucketAlias;
-	type Filter = DeletedFilter;
-
-	fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
-		filter.apply(entry.is_deleted())
-	}
-}
-
-/// Check if a bucket name is valid.
-///
-/// The requirements are listed here:
-///
-/// <https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html>
-///
-/// In the case of Garage, bucket names must not be hex-encoded
-/// 32 byte string, which is excluded thanks to the
-/// maximum length of 63 bytes given in the spec.
-pub fn is_valid_bucket_name(n: &str) -> bool {
-	// Bucket names must be between 3 and 63 characters
-	n.len() >= 3 && n.len() <= 63
-	// Bucket names must be composed of lowercase letters, numbers,
-	// dashes and dots
-	&& n.chars().all(|c| matches!(c, '.' | '-' | 'a'..='z' | '0'..='9'))
-	//  Bucket names must start and end with a letter or a number
-	&& !n.starts_with(&['-', '.'][..])
-	&& !n.ends_with(&['-', '.'][..])
-	// Bucket names must not be formated as an IP address
-	&& n.parse::<std::net::IpAddr>().is_err()
-	// Bucket names must not start wih "xn--"
-	&& !n.starts_with("xn--")
-	// Bucket names must not end with "-s3alias"
-	&& !n.ends_with("-s3alias")
-}
-
-/// Error message to return for invalid bucket names
-pub const INVALID_BUCKET_NAME_MESSAGE: &str = "Invalid bucket name. See AWS documentation for constraints on S3 bucket names:\nhttps://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html";
@@ -2,10 +2,8 @@ use serde::{Deserialize, Serialize};

 use garage_table::crdt::Crdt;
 use garage_table::*;
-use garage_util::data::*;
-use garage_util::time::*;

-use crate::permission::BucketKeyPerm;
+use crate::key_table::PermissionSet;

 /// A bucket is a collection of objects
 ///
@@ -14,84 +12,57 @@ use crate::permission::BucketKeyPerm;
 ///  - A bucket has 2 states, Present or Deleted and parameters make sense only if present.
 #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
 pub struct Bucket {
-	/// ID of the bucket
-	pub id: Uuid,
+	/// Name of the bucket
+	pub name: String,
 	/// State, and configuration if not deleted, of the bucket
-	pub state: crdt::Deletable<BucketParams>,
+	pub state: crdt::Lww<BucketState>,
+}
+
+/// State of a bucket
+#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
+pub enum BucketState {
+	/// The bucket is deleted
+	Deleted,
+	/// The bucket exists
+	Present(BucketParams),
+}
+
+impl Crdt for BucketState {
+	fn merge(&mut self, o: &Self) {
+		match o {
+			BucketState::Deleted => *self = BucketState::Deleted,
+			BucketState::Present(other_params) => {
+				if let BucketState::Present(params) = self {
+					params.merge(other_params);
+				}
+			}
+		}
+	}
 }

 /// Configuration for a bucket
 #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
 pub struct BucketParams {
-	/// Bucket's creation date
-	pub creation_date: u64,
 	/// Map of key with access to the bucket, and what kind of access they give
-	pub authorized_keys: crdt::Map<String, BucketKeyPerm>,
-
-	/// 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
-	/// map back to aliases when doing ListBuckets)
-	pub aliases: crdt::LwwMap<String, bool>,
-	/// Map of aliases that are or have been given to this bucket
-	/// in namespaces local to keys
-	/// key = (access key id, alias name)
-	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
-	pub cors_config: crdt::Lww<Option<Vec<CorsRule>>>,
-}
-
-#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
-pub struct WebsiteConfig {
-	pub index_document: 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 allow_origins: Vec<String>,
-	pub allow_methods: Vec<String>,
-	pub allow_headers: Vec<String>,
-	pub expose_headers: Vec<String>,
+	pub authorized_keys: crdt::LwwMap<String, PermissionSet>,
+	/// Is the bucket served as http
+	pub website: crdt::Lww<bool>,
 }

 impl BucketParams {
 	/// Create an empty BucketParams with no authorized keys and no website accesss
 	pub fn new() -> Self {
 		BucketParams {
-			creation_date: now_msec(),
-			authorized_keys: crdt::Map::new(),
-			aliases: crdt::LwwMap::new(),
-			local_aliases: crdt::LwwMap::new(),
-			website_config: crdt::Lww::new(None),
-			cors_config: crdt::Lww::new(None),
+			authorized_keys: crdt::LwwMap::new(),
+			website: crdt::Lww::new(false),
 		}
 	}
 }

 impl Crdt for BucketParams {
 	fn merge(&mut self, o: &Self) {
-		self.creation_date = std::cmp::min(self.creation_date, o.creation_date);
 		self.authorized_keys.merge(&o.authorized_keys);
-
-		self.aliases.merge(&o.aliases);
-		self.local_aliases.merge(&o.local_aliases);
-
-		self.website_config.merge(&o.website_config);
-		self.cors_config.merge(&o.cors_config);
-	}
-}
-
-impl Default for Bucket {
-	fn default() -> Self {
-		Self::new()
+		self.website.merge(&o.website);
 	}
 }

@@ -103,53 +74,34 @@ impl Default for BucketParams {

 impl Bucket {
 	/// Initializes a new instance of the Bucket struct
-	pub fn new() -> Self {
+	pub fn new(name: String) -> Self {
 		Bucket {
-			id: gen_uuid(),
-			state: crdt::Deletable::present(BucketParams::new()),
+			name,
+			state: crdt::Lww::new(BucketState::Present(BucketParams::new())),
 		}
 	}

 	/// Returns true if this represents a deleted bucket
 	pub fn is_deleted(&self) -> bool {
-		self.state.is_deleted()
-	}
-
-	/// Returns an option representing the parameters (None if in deleted state)
-	pub fn params(&self) -> Option<&BucketParams> {
-		self.state.as_option()
-	}
-
-	/// Mutable version of `.params()`
-	pub fn params_mut(&mut self) -> Option<&mut BucketParams> {
-		self.state.as_option_mut()
+		*self.state.get() == BucketState::Deleted
 	}

 	/// Return the list of authorized keys, when each was updated, and the permission associated to
 	/// the key
-	pub fn authorized_keys(&self) -> &[(String, BucketKeyPerm)] {
-		self.params()
-			.map(|s| s.authorized_keys.items())
-			.unwrap_or(&[])
-	}
-
-	pub fn aliases(&self) -> &[(String, u64, bool)] {
-		self.params().map(|s| s.aliases.items()).unwrap_or(&[])
-	}
-
-	pub fn local_aliases(&self) -> &[((String, String), u64, bool)] {
-		self.params()
-			.map(|s| s.local_aliases.items())
-			.unwrap_or(&[])
+	pub fn authorized_keys(&self) -> &[(String, u64, PermissionSet)] {
+		match self.state.get() {
+			BucketState::Deleted => &[],
+			BucketState::Present(state) => state.authorized_keys.items(),
+		}
 	}
 }

-impl Entry<EmptyKey, Uuid> for Bucket {
+impl Entry<EmptyKey, String> for Bucket {
 	fn partition_key(&self) -> &EmptyKey {
 		&EmptyKey
 	}
-	fn sort_key(&self) -> &Uuid {
-		&self.id
+	fn sort_key(&self) -> &String {
+		&self.name
 	}
 }

@@ -162,10 +114,8 @@ impl Crdt for Bucket {
 pub struct BucketTable;

 impl TableSchema for BucketTable {
-	const TABLE_NAME: &'static str = "bucket_v2";
-
 	type P = EmptyKey;
-	type S = Uuid;
+	type S = String;
 	type E = Bucket;
 	type Filter = DeletedFilter;

@@ -14,9 +14,7 @@ use garage_table::*;

 use crate::block::*;
 use crate::block_ref_table::*;
-use crate::bucket_alias_table::*;
 use crate::bucket_table::*;
-use crate::helper;
 use crate::key_table::*;
 use crate::object_table::*;
 use crate::version_table::*;
@@ -37,8 +35,6 @@ pub struct Garage {

 	/// Table containing informations about buckets
 	pub bucket_table: Arc<Table<BucketTable, TableFullReplication>>,
-	/// Table containing informations about bucket aliases
-	pub bucket_alias_table: Arc<Table<BucketAliasTable, TableFullReplication>>,
 	/// Table containing informations about api keys
 	pub key_table: Arc<Table<KeyTable, TableFullReplication>>,

@@ -97,6 +93,7 @@ impl Garage {
 			meta_rep_param.clone(),
 			system.clone(),
 			&db,
+			"block_ref".to_string(),
 		);

 		info!("Initialize version_table...");
@@ -108,6 +105,7 @@ impl Garage {
 			meta_rep_param.clone(),
 			system.clone(),
 			&db,
+			"version".to_string(),
 		);

 		info!("Initialize object_table...");
@@ -119,21 +117,26 @@ impl Garage {
 			meta_rep_param,
 			system.clone(),
 			&db,
+			"object".to_string(),
 		);

 		info!("Initialize bucket_table...");
-		let bucket_table = Table::new(BucketTable, control_rep_param.clone(), system.clone(), &db);
-
-		info!("Initialize bucket_alias_table...");
-		let bucket_alias_table = Table::new(
-			BucketAliasTable,
+		let bucket_table = Table::new(
+			BucketTable,
 			control_rep_param.clone(),
 			system.clone(),
 			&db,
+			"bucket".to_string(),
 		);

 		info!("Initialize key_table_table...");
-		let key_table = Table::new(KeyTable, control_rep_param, system.clone(), &db);
+		let key_table = Table::new(
+			KeyTable,
+			control_rep_param,
+			system.clone(),
+			&db,
+			"key".to_string(),
+		);

 		info!("Initialize Garage...");
 		let garage = Arc::new(Self {
@@ -143,7 +146,6 @@ impl Garage {
 			system,
 			block_manager,
 			bucket_table,
-			bucket_alias_table,
 			key_table,
 			object_table,
 			version_table,
@@ -161,8 +163,4 @@ impl Garage {
 	pub fn break_reference_cycles(&self) {
 		self.block_manager.garage.swap(None);
 	}
-
-	pub fn bucket_helper(&self) -> helper::bucket::BucketHelper {
-		helper::bucket::BucketHelper(self)
-	}
 }
@@ -1,470 +0,0 @@
-use garage_table::util::EmptyKey;
-use garage_util::crdt::*;
-use garage_util::data::*;
-use garage_util::error::{Error as GarageError, OkOrMessage};
-use garage_util::time::*;
-
-use crate::bucket_alias_table::*;
-use crate::bucket_table::*;
-use crate::garage::Garage;
-use crate::helper::error::*;
-use crate::key_table::{Key, KeyFilter};
-use crate::permission::BucketKeyPerm;
-
-pub struct BucketHelper<'a>(pub(crate) &'a Garage);
-
-#[allow(clippy::ptr_arg)]
-impl<'a> BucketHelper<'a> {
-	pub async fn resolve_global_bucket_name(
-		&self,
-		bucket_name: &String,
-	) -> Result<Option<Uuid>, Error> {
-		// Bucket names in Garage are aliases, true bucket identifiers
-		// are 32-byte UUIDs. This function resolves bucket names into
-		// their full identifier by looking up in the bucket_alias_table.
-		// This function also allows buckets to be identified by their
-		// full UUID (hex-encoded). Here, if the name to be resolved is a
-		// hex string of the correct length, it is directly parsed as a bucket
-		// identifier which is returned. There is no risk of this conflicting
-		// with an actual bucket name: bucket names are max 63 chars long by
-		// the AWS spec, and hex-encoded UUIDs are 64 chars long.
-		let hexbucket = hex::decode(bucket_name.as_str())
-			.ok()
-			.map(|by| Uuid::try_from(&by))
-			.flatten();
-		if let Some(bucket_id) = hexbucket {
-			Ok(self
-				.0
-				.bucket_table
-				.get(&EmptyKey, &bucket_id)
-				.await?
-				.filter(|x| !x.state.is_deleted())
-				.map(|_| bucket_id))
-		} else {
-			Ok(self
-				.0
-				.bucket_alias_table
-				.get(&EmptyKey, bucket_name)
-				.await?
-				.map(|x| *x.state.get())
-				.flatten())
-		}
-	}
-
-	/// Returns a Bucket if it is present in bucket table,
-	/// even if it is in deleted state. Querying a non-existing
-	/// bucket ID returns an internal error.
-	pub async fn get_internal_bucket(&self, bucket_id: Uuid) -> Result<Bucket, Error> {
-		Ok(self
-			.0
-			.bucket_table
-			.get(&EmptyKey, &bucket_id)
-			.await?
-			.ok_or_message(format!("Bucket {:?} does not exist", bucket_id))?)
-	}
-
-	/// Returns a Bucket if it is present in bucket table,
-	/// only if it is in non-deleted state.
-	/// Querying a non-existing bucket ID or a deleted bucket
-	/// returns a bad request error.
-	pub async fn get_existing_bucket(&self, bucket_id: Uuid) -> Result<Bucket, Error> {
-		self.0
-			.bucket_table
-			.get(&EmptyKey, &bucket_id)
-			.await?
-			.filter(|b| !b.is_deleted())
-			.ok_or_bad_request(format!(
-				"Bucket {:?} does not exist or has been deleted",
-				bucket_id
-			))
-	}
-
-	/// Returns a Key if it is present in key table,
-	/// even if it is in deleted state. Querying a non-existing
-	/// key ID returns an internal error.
-	pub async fn get_internal_key(&self, key_id: &String) -> Result<Key, Error> {
-		Ok(self
-			.0
-			.key_table
-			.get(&EmptyKey, key_id)
-			.await?
-			.ok_or_message(format!("Key {} does not exist", key_id))?)
-	}
-
-	/// Returns a Key if it is present in key table,
-	/// only if it is in non-deleted state.
-	/// Querying a non-existing key ID or a deleted key
-	/// returns a bad request error.
-	pub async fn get_existing_key(&self, key_id: &String) -> Result<Key, Error> {
-		self.0
-			.key_table
-			.get(&EmptyKey, key_id)
-			.await?
-			.filter(|b| !b.state.is_deleted())
-			.ok_or_bad_request(format!("Key {} does not exist or has been deleted", key_id))
-	}
-
-	/// Returns a Key if it is present in key table,
-	/// looking it up by key ID or by a match on its name,
-	/// only if it is in non-deleted state.
-	/// Querying a non-existing key ID or a deleted key
-	/// returns a bad request error.
-	pub async fn get_existing_matching_key(&self, pattern: &str) -> Result<Key, Error> {
-		let candidates = self
-			.0
-			.key_table
-			.get_range(
-				&EmptyKey,
-				None,
-				Some(KeyFilter::MatchesAndNotDeleted(pattern.to_string())),
-				10,
-			)
-			.await?
-			.into_iter()
-			.collect::<Vec<_>>();
-		if candidates.len() != 1 {
-			Err(Error::BadRequest(format!(
-				"{} matching keys",
-				candidates.len()
-			)))
-		} else {
-			Ok(candidates.into_iter().next().unwrap())
-		}
-	}
-
-	/// Sets a new alias for a bucket in global namespace.
-	/// This function fails if:
-	/// - alias name is not valid according to S3 spec
-	/// - bucket does not exist or is deleted
-	/// - alias already exists and points to another bucket
-	pub async fn set_global_bucket_alias(
-		&self,
-		bucket_id: Uuid,
-		alias_name: &String,
-	) -> Result<(), Error> {
-		if !is_valid_bucket_name(alias_name) {
-			return Err(Error::BadRequest(format!(
-				"{}: {}",
-				alias_name, INVALID_BUCKET_NAME_MESSAGE
-			)));
-		}
-
-		let mut bucket = self.get_existing_bucket(bucket_id).await?;
-
-		let alias = self.0.bucket_alias_table.get(&EmptyKey, alias_name).await?;
-
-		if let Some(existing_alias) = alias.as_ref() {
-			if let Some(p_bucket) = existing_alias.state.get() {
-				if *p_bucket != bucket_id {
-					return Err(Error::BadRequest(format!(
-						"Alias {} already exists and points to different bucket: {:?}",
-						alias_name, p_bucket
-					)));
-				}
-			}
-		}
-
-		// Checks ok, add alias
-		let mut bucket_p = bucket.state.as_option_mut().unwrap();
-
-		let alias_ts = increment_logical_clock_2(
-			bucket_p.aliases.get_timestamp(alias_name),
-			alias.as_ref().map(|a| a.state.timestamp()).unwrap_or(0),
-		);
-
-		// ---- timestamp-ensured causality barrier ----
-		// writes are now done and all writes use timestamp alias_ts
-
-		let alias = match alias {
-			None => BucketAlias::new(alias_name.clone(), alias_ts, Some(bucket_id))
-				.ok_or_bad_request(format!("{}: {}", alias_name, INVALID_BUCKET_NAME_MESSAGE))?,
-			Some(mut a) => {
-				a.state = Lww::raw(alias_ts, Some(bucket_id));
-				a
-			}
-		};
-		self.0.bucket_alias_table.insert(&alias).await?;
-
-		bucket_p.aliases = LwwMap::raw_item(alias_name.clone(), alias_ts, true);
-		self.0.bucket_table.insert(&bucket).await?;
-
-		Ok(())
-	}
-
-	/// Unsets an alias for a bucket in global namespace.
-	/// This function fails if:
-	/// - bucket does not exist or is deleted
-	/// - alias does not exist or maps to another bucket (-> internal error)
-	/// - bucket has no other aliases (global or local)
-	pub async fn unset_global_bucket_alias(
-		&self,
-		bucket_id: Uuid,
-		alias_name: &String,
-	) -> Result<(), Error> {
-		let mut bucket = self.get_existing_bucket(bucket_id).await?;
-		let mut bucket_state = bucket.state.as_option_mut().unwrap();
-
-		let mut alias = self
-			.0
-			.bucket_alias_table
-			.get(&EmptyKey, alias_name)
-			.await?
-			.filter(|a| a.state.get().map(|x| x == bucket_id).unwrap_or(false))
-			.ok_or_message(format!(
-				"Internal error: alias not found or does not point to bucket {:?}",
-				bucket_id
-			))?;
-
-		let has_other_global_aliases = bucket_state
-			.aliases
-			.items()
-			.iter()
-			.any(|(name, _, active)| name != alias_name && *active);
-		let has_other_local_aliases = bucket_state
-			.local_aliases
-			.items()
-			.iter()
-			.any(|(_, _, active)| *active);
-		if !has_other_global_aliases && !has_other_local_aliases {
-			return Err(Error::BadRequest(format!("Bucket {} doesn't have other aliases, please delete it instead of just unaliasing.", alias_name)));
-		}
-
-		// Checks ok, remove alias
-		let alias_ts = increment_logical_clock_2(
-			alias.state.timestamp(),
-			bucket_state.aliases.get_timestamp(alias_name),
-		);
-
-		// ---- timestamp-ensured causality barrier ----
-		// writes are now done and all writes use timestamp alias_ts
-
-		alias.state = Lww::raw(alias_ts, None);
-		self.0.bucket_alias_table.insert(&alias).await?;
-
-		bucket_state.aliases = LwwMap::raw_item(alias_name.clone(), alias_ts, false);
-		self.0.bucket_table.insert(&bucket).await?;
-
-		Ok(())
-	}
-
-	/// Ensures a bucket does not have a certain global alias.
-	/// Contrarily to unset_global_bucket_alias, this does not
-	/// fail on any condition other than:
-	/// - bucket cannot be found (its fine if it is in deleted state)
-	/// - alias cannot be found (its fine if it points to nothing or
-	///   to another bucket)
-	pub async fn purge_global_bucket_alias(
-		&self,
-		bucket_id: Uuid,
-		alias_name: &String,
-	) -> Result<(), Error> {
-		let mut bucket = self.get_internal_bucket(bucket_id).await?;
-
-		let mut alias = self
-			.0
-			.bucket_alias_table
-			.get(&EmptyKey, alias_name)
-			.await?
-			.ok_or_message(format!("Alias {} not found", alias_name))?;
-
-		// Checks ok, remove alias
-		let alias_ts = match bucket.state.as_option() {
-			Some(bucket_state) => increment_logical_clock_2(
-				alias.state.timestamp(),
-				bucket_state.aliases.get_timestamp(alias_name),
-			),
-			None => increment_logical_clock(alias.state.timestamp()),
-		};
-
-		// ---- timestamp-ensured causality barrier ----
-		// writes are now done and all writes use timestamp alias_ts
-
-		if alias.state.get() == &Some(bucket_id) {
-			alias.state = Lww::raw(alias_ts, None);
-			self.0.bucket_alias_table.insert(&alias).await?;
-		}
-
-		if let Some(mut bucket_state) = bucket.state.as_option_mut() {
-			bucket_state.aliases = LwwMap::raw_item(alias_name.clone(), alias_ts, false);
-			self.0.bucket_table.insert(&bucket).await?;
-		}
-
-		Ok(())
-	}
-
-	/// Sets a new alias for a bucket in the local namespace of a key.
-	/// This function fails if:
-	/// - alias name is not valid according to S3 spec
-	/// - bucket does not exist or is deleted
-	/// - key does not exist or is deleted
-	/// - alias already exists and points to another bucket
-	pub async fn set_local_bucket_alias(
-		&self,
-		bucket_id: Uuid,
-		key_id: &String,
-		alias_name: &String,
-	) -> Result<(), Error> {
-		if !is_valid_bucket_name(alias_name) {
-			return Err(Error::BadRequest(format!(
-				"{}: {}",
-				alias_name, INVALID_BUCKET_NAME_MESSAGE
-			)));
-		}
-
-		let mut bucket = self.get_existing_bucket(bucket_id).await?;
-		let mut key = self.get_existing_key(key_id).await?;
-
-		let mut key_param = key.state.as_option_mut().unwrap();
-
-		if let Some(Some(existing_alias)) = key_param.local_aliases.get(alias_name) {
-			if *existing_alias != bucket_id {
-				return Err(Error::BadRequest(format!("Alias {} already exists in namespace of key {} and points to different bucket: {:?}", alias_name,  key.key_id, existing_alias)));
-			}
-		}
-
-		// Checks ok, add alias
-		let mut bucket_p = bucket.state.as_option_mut().unwrap();
-		let bucket_p_local_alias_key = (key.key_id.clone(), alias_name.clone());
-
-		// Calculate the timestamp to assign to this aliasing in the two local_aliases maps
-		// (the one from key to bucket, and the reverse one stored in the bucket iself)
-		// so that merges on both maps in case of a concurrent operation resolve
-		// to the same alias being set
-		let alias_ts = increment_logical_clock_2(
-			key_param.local_aliases.get_timestamp(alias_name),
-			bucket_p
-				.local_aliases
-				.get_timestamp(&bucket_p_local_alias_key),
-		);
-
-		// ---- timestamp-ensured causality barrier ----
-		// writes are now done and all writes use timestamp alias_ts
-
-		key_param.local_aliases = LwwMap::raw_item(alias_name.clone(), alias_ts, Some(bucket_id));
-		self.0.key_table.insert(&key).await?;
-
-		bucket_p.local_aliases = LwwMap::raw_item(bucket_p_local_alias_key, alias_ts, true);
-		self.0.bucket_table.insert(&bucket).await?;
-
-		Ok(())
-	}
-
-	/// Unsets an alias for a bucket in the local namespace of a key.
-	/// This function fails if:
-	/// - bucket does not exist or is deleted
-	/// - key does not exist or is deleted
-	/// - alias does not exist or maps to another bucket (-> internal error)
-	/// - bucket has no other aliases (global or local)
-	pub async fn unset_local_bucket_alias(
-		&self,
-		bucket_id: Uuid,
-		key_id: &String,
-		alias_name: &String,
-	) -> Result<(), Error> {
-		let mut bucket = self.get_existing_bucket(bucket_id).await?;
-		let mut key = self.get_existing_key(key_id).await?;
-
-		let mut bucket_p = bucket.state.as_option_mut().unwrap();
-
-		if key
-			.state
-			.as_option()
-			.unwrap()
-			.local_aliases
-			.get(alias_name)
-			.cloned()
-			.flatten() != Some(bucket_id)
-		{
-			return Err(GarageError::Message(format!(
-				"Bucket {:?} does not have alias {} in namespace of key {}",
-				bucket_id, alias_name, key_id
-			))
-			.into());
-		}
-
-		let has_other_global_aliases = bucket_p
-			.aliases
-			.items()
-			.iter()
-			.any(|(_, _, active)| *active);
-		let has_other_local_aliases = bucket_p
-			.local_aliases
-			.items()
-			.iter()
-			.any(|((k, n), _, active)| *k == key.key_id && n == alias_name && *active);
-		if !has_other_global_aliases && !has_other_local_aliases {
-			return Err(Error::BadRequest(format!("Bucket {} doesn't have other aliases, please delete it instead of just unaliasing.", alias_name)));
-		}
-
-		// Checks ok, remove alias
-		let mut key_param = key.state.as_option_mut().unwrap();
-		let bucket_p_local_alias_key = (key.key_id.clone(), alias_name.clone());
-
-		let alias_ts = increment_logical_clock_2(
-			key_param.local_aliases.get_timestamp(alias_name),
-			bucket_p
-				.local_aliases
-				.get_timestamp(&bucket_p_local_alias_key),
-		);
-
-		// ---- timestamp-ensured causality barrier ----
-		// writes are now done and all writes use timestamp alias_ts
-
-		key_param.local_aliases = LwwMap::raw_item(alias_name.clone(), alias_ts, None);
-		self.0.key_table.insert(&key).await?;
-
-		bucket_p.local_aliases = LwwMap::raw_item(bucket_p_local_alias_key, alias_ts, false);
-		self.0.bucket_table.insert(&bucket).await?;
-
-		Ok(())
-	}
-
-	/// Sets permissions for a key on a bucket.
-	/// This function fails if:
-	/// - bucket or key cannot be found at all (its ok if they are in deleted state)
-	/// - bucket or key is in deleted state and we are trying to set permissions other than "deny
-	/// all"
-	pub async fn set_bucket_key_permissions(
-		&self,
-		bucket_id: Uuid,
-		key_id: &String,
-		mut perm: BucketKeyPerm,
-	) -> Result<(), Error> {
-		let mut bucket = self.get_internal_bucket(bucket_id).await?;
-		let mut key = self.get_internal_key(key_id).await?;
-
-		if let Some(bstate) = bucket.state.as_option() {
-			if let Some(kp) = bstate.authorized_keys.get(key_id) {
-				perm.timestamp = increment_logical_clock_2(perm.timestamp, kp.timestamp);
-			}
-		} else if perm.is_any() {
-			return Err(Error::BadRequest(
-				"Trying to give permissions on a deleted bucket".into(),
-			));
-		}
-
-		if let Some(kstate) = key.state.as_option() {
-			if let Some(bp) = kstate.authorized_buckets.get(&bucket_id) {
-				perm.timestamp = increment_logical_clock_2(perm.timestamp, bp.timestamp);
-			}
-		} else if perm.is_any() {
-			return Err(Error::BadRequest(
-				"Trying to give permissions to a deleted key".into(),
-			));
-		}
-
-		// ---- timestamp-ensured causality barrier ----
-
-		if let Some(bstate) = bucket.state.as_option_mut() {
-			bstate.authorized_keys = Map::put_mutator(key_id.clone(), perm);
-			self.0.bucket_table.insert(&bucket).await?;
-		}
-
-		if let Some(kstate) = key.state.as_option_mut() {
-			kstate.authorized_buckets = Map::put_mutator(bucket_id, perm);
-			self.0.key_table.insert(&key).await?;
-		}
-
-		Ok(())
-	}
-}
@@ -1,47 +0,0 @@
-use err_derive::Error;
-use serde::{Deserialize, Serialize};
-
-use garage_util::error::Error as GarageError;
-
-#[derive(Debug, Error, Serialize, Deserialize)]
-pub enum Error {
-	#[error(display = "Internal error: {}", _0)]
-	Internal(#[error(source)] GarageError),
-
-	#[error(display = "Bad request: {}", _0)]
-	BadRequest(String),
-}
-
-impl From<netapp::error::Error> for Error {
-	fn from(e: netapp::error::Error) -> Self {
-		Error::Internal(GarageError::Netapp(e))
-	}
-}
-
-pub trait OkOrBadRequest {
-	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 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.as_ref(), e))),
-		}
-	}
-}
-
-impl<T> OkOrBadRequest for Option<T> {
-	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.as_ref().to_string())),
-		}
-	}
-}
@@ -1,2 +0,0 @@
-pub mod bucket;
-pub mod error;
@@ -2,11 +2,6 @@ use serde::{Deserialize, Serialize};

 use garage_table::crdt::*;
 use garage_table::*;
-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)]
@@ -14,61 +9,31 @@ pub struct Key {
 	/// The id of the key (immutable), used as partition key
 	pub key_id: String,

-	/// Internal state of the key
-	pub state: crdt::Deletable<KeyParams>,
-}
-
-/// Configuration for a key
-#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
-pub struct KeyParams {
-	/// The secret_key associated (immutable)
+	/// The secret_key associated
 	pub secret_key: String,

 	/// Name for the key
 	pub name: crdt::Lww<String>,

-	/// Flag to allow users having this key to create buckets
-	pub allow_create_bucket: crdt::Lww<bool>,
+	/// Is the key deleted
+	pub deleted: crdt::Bool,

-	/// If the key is present: it gives some permissions,
-	/// a map of bucket IDs (uuids) to permissions.
-	/// Otherwise no permissions are granted to key
-	pub authorized_buckets: crdt::Map<Uuid, BucketKeyPerm>,
-
-	/// A key can have a local view of buckets names it is
-	/// the only one to see, this is the namespace for these aliases
-	pub local_aliases: crdt::LwwMap<String, Option<Uuid>>,
-}
-
-impl KeyParams {
-	fn new(secret_key: &str, name: &str) -> Self {
-		KeyParams {
-			secret_key: secret_key.to_string(),
-			name: crdt::Lww::new(name.to_string()),
-			allow_create_bucket: crdt::Lww::new(false),
-			authorized_buckets: crdt::Map::new(),
-			local_aliases: crdt::LwwMap::new(),
-		}
-	}
-}
-
-impl Crdt for KeyParams {
-	fn merge(&mut self, o: &Self) {
-		self.name.merge(&o.name);
-		self.allow_create_bucket.merge(&o.allow_create_bucket);
-		self.authorized_buckets.merge(&o.authorized_buckets);
-		self.local_aliases.merge(&o.local_aliases);
-	}
+	/// Buckets in which the key is authorized. Empty if `Key` is deleted
+	// CRDT interaction: deleted implies authorized_buckets is empty
+	pub authorized_buckets: crdt::LwwMap<String, PermissionSet>,
 }

 impl Key {
 	/// Initialize a new Key, generating a random identifier and associated secret key
-	pub fn new(name: &str) -> Self {
+	pub fn new(name: String) -> Self {
 		let key_id = format!("GK{}", hex::encode(&rand::random::<[u8; 12]>()[..]));
 		let secret_key = hex::encode(&rand::random::<[u8; 32]>()[..]);
 		Self {
 			key_id,
-			state: crdt::Deletable::present(KeyParams::new(&secret_key, name)),
+			secret_key,
+			name: crdt::Lww::new(name),
+			deleted: crdt::Bool::new(false),
+			authorized_buckets: crdt::LwwMap::new(),
 		}
 	}

@@ -76,7 +41,10 @@ impl Key {
 	pub fn import(key_id: &str, secret_key: &str, name: &str) -> Self {
 		Self {
 			key_id: key_id.to_string(),
-			state: crdt::Deletable::present(KeyParams::new(secret_key, name)),
+			secret_key: secret_key.to_string(),
+			name: crdt::Lww::new(name.to_string()),
+			deleted: crdt::Bool::new(false),
+			authorized_buckets: crdt::LwwMap::new(),
 		}
 	}

@@ -84,48 +52,41 @@ impl Key {
 	pub fn delete(key_id: String) -> Self {
 		Self {
 			key_id,
-			state: crdt::Deletable::Deleted,
+			secret_key: "".into(),
+			name: crdt::Lww::new("".to_string()),
+			deleted: crdt::Bool::new(true),
+			authorized_buckets: crdt::LwwMap::new(),
 		}
 	}

-	/// Returns true if this represents a deleted bucket
-	pub fn is_deleted(&self) -> bool {
-		self.state.is_deleted()
-	}
-
-	/// Returns an option representing the params (None if in deleted state)
-	pub fn params(&self) -> Option<&KeyParams> {
-		self.state.as_option()
-	}
-
-	/// Mutable version of `.state()`
-	pub fn params_mut(&mut self) -> Option<&mut KeyParams> {
-		self.state.as_option_mut()
-	}
-
-	/// Get permissions for a bucket
-	pub fn bucket_permissions(&self, bucket: &Uuid) -> BucketKeyPerm {
-		self.params()
-			.map(|params| params.authorized_buckets.get(bucket))
-			.flatten()
-			.cloned()
-			.unwrap_or(BucketKeyPerm::NO_PERMISSIONS)
-	}
-
 	/// Check if `Key` is allowed to read in bucket
-	pub fn allow_read(&self, bucket: &Uuid) -> bool {
-		self.bucket_permissions(bucket).allow_read
+	pub fn allow_read(&self, bucket: &str) -> bool {
+		self.authorized_buckets
+			.get(&bucket.to_string())
+			.map(|x| x.allow_read)
+			.unwrap_or(false)
 	}

 	/// Check if `Key` is allowed to write in bucket
-	pub fn allow_write(&self, bucket: &Uuid) -> bool {
-		self.bucket_permissions(bucket).allow_write
+	pub fn allow_write(&self, bucket: &str) -> bool {
+		self.authorized_buckets
+			.get(&bucket.to_string())
+			.map(|x| x.allow_write)
+			.unwrap_or(false)
 	}
+}

-	/// Check if `Key` is owner of bucket
-	pub fn allow_owner(&self, bucket: &Uuid) -> bool {
-		self.bucket_permissions(bucket).allow_owner
-	}
+/// Permission given to a key in a bucket
+#[derive(PartialOrd, Ord, PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
+pub struct PermissionSet {
+	/// The key can be used to read the bucket
+	pub allow_read: bool,
+	/// The key can be used to write in the bucket
+	pub allow_write: bool,
+}
+
+impl AutoCrdt for PermissionSet {
+	const WARN_IF_DIFFERENT: bool = true;
 }

 impl Entry<EmptyKey, String> for Key {
@@ -139,7 +100,14 @@ impl Entry<EmptyKey, String> for Key {

 impl Crdt for Key {
 	fn merge(&mut self, other: &Self) {
-		self.state.merge(&other.state);
+		self.name.merge(&other.name);
+		self.deleted.merge(&other.deleted);
+
+		if self.deleted.get() {
+			self.authorized_buckets.clear();
+		} else {
+			self.authorized_buckets.merge(&other.authorized_buckets);
+		}
 	}
 }

@@ -148,12 +116,10 @@ pub struct KeyTable;
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub enum KeyFilter {
 	Deleted(DeletedFilter),
-	MatchesAndNotDeleted(String),
+	Matches(String),
 }

 impl TableSchema for KeyTable {
-	const TABLE_NAME: &'static str = "key";
-
 	type P = EmptyKey;
 	type S = String;
 	type E = Key;
@@ -161,41 +127,12 @@ impl TableSchema for KeyTable {

 	fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
 		match filter {
-			KeyFilter::Deleted(df) => df.apply(entry.state.is_deleted()),
-			KeyFilter::MatchesAndNotDeleted(pat) => {
+			KeyFilter::Deleted(df) => df.apply(entry.deleted.get()),
+			KeyFilter::Matches(pat) => {
 				let pat = pat.to_lowercase();
-				entry
-					.params()
-					.map(|p| {
-						entry.key_id.to_lowercase().starts_with(&pat)
-							|| p.name.get().to_lowercase() == pat
-					})
-					.unwrap_or(false)
+				entry.key_id.to_lowercase().starts_with(&pat)
+					|| entry.name.get().to_lowercase() == pat
 			}
 		}
 	}
-
-	fn try_migrate(bytes: &[u8]) -> Option<Self::E> {
-		let old_k = rmp_serde::decode::from_read_ref::<_, old::Key>(bytes).ok()?;
-		let name = crdt::Lww::raw(old_k.name.timestamp(), old_k.name.get().clone());
-
-		let state = if old_k.deleted.get() {
-			crdt::Deletable::Deleted
-		} else {
-			// Authorized buckets is ignored here,
-			// migration is performed in specific migration code in
-			// garage/migrate.rs
-			crdt::Deletable::Present(KeyParams {
-				secret_key: old_k.secret_key,
-				name,
-				allow_create_bucket: crdt::Lww::new(false),
-				authorized_buckets: crdt::Map::new(),
-				local_aliases: crdt::LwwMap::new(),
-			})
-		};
-		Some(Key {
-			key_id: old_k.key_id,
-			state,
-		})
-	}
 }
@@ -1,17 +1,10 @@
 #[macro_use]
 extern crate log;

-pub mod permission;
-
+pub mod block;
 pub mod block_ref_table;
-pub mod bucket_alias_table;
 pub mod bucket_table;
+pub mod garage;
 pub mod key_table;
 pub mod object_table;
 pub mod version_table;
-
-pub mod block;
-
-pub mod garage;
-pub mod helper;
-pub mod migrate;
@@ -1,103 +0,0 @@
-use std::sync::Arc;
-
-use garage_util::crdt::*;
-use garage_util::data::*;
-use garage_util::error::Error as GarageError;
-use garage_util::time::*;
-
-use garage_model_050::bucket_table as old_bucket;
-
-use crate::bucket_alias_table::*;
-use crate::bucket_table::*;
-use crate::garage::Garage;
-use crate::helper::error::*;
-use crate::permission::*;
-
-pub struct Migrate {
-	pub garage: Arc<Garage>,
-}
-
-impl Migrate {
-	pub async fn migrate_buckets050(&self) -> Result<(), Error> {
-		let tree = self
-			.garage
-			.db
-			.open_tree("bucket:table")
-			.map_err(GarageError::from)?;
-
-		for res in tree.iter() {
-			let (_k, v) = res.map_err(GarageError::from)?;
-			let bucket = rmp_serde::decode::from_read_ref::<_, old_bucket::Bucket>(&v[..])
-				.map_err(GarageError::from)?;
-
-			if let old_bucket::BucketState::Present(p) = bucket.state.get() {
-				self.migrate_buckets050_do_bucket(&bucket, p).await?;
-			}
-		}
-
-		Ok(())
-	}
-
-	pub async fn migrate_buckets050_do_bucket(
-		&self,
-		old_bucket: &old_bucket::Bucket,
-		old_bucket_p: &old_bucket::BucketParams,
-	) -> Result<(), Error> {
-		let bucket_id = blake2sum(old_bucket.name.as_bytes());
-
-		let new_name = if is_valid_bucket_name(&old_bucket.name) {
-			old_bucket.name.clone()
-		} else {
-			// if old bucket name was not valid, replace it by
-			// a hex-encoded name derived from its identifier
-			hex::encode(&bucket_id.as_slice()[..16])
-		};
-
-		let website = if *old_bucket_p.website.get() {
-			Some(WebsiteConfig {
-				index_document: "index.html".into(),
-				error_document: None,
-			})
-		} else {
-			None
-		};
-
-		self.garage
-			.bucket_table
-			.insert(&Bucket {
-				id: bucket_id,
-				state: Deletable::Present(BucketParams {
-					creation_date: now_msec(),
-					authorized_keys: Map::new(),
-					aliases: LwwMap::new(),
-					local_aliases: LwwMap::new(),
-					website_config: Lww::new(website),
-					cors_config: Lww::new(None),
-				}),
-			})
-			.await?;
-
-		self.garage
-			.bucket_helper()
-			.set_global_bucket_alias(bucket_id, &new_name)
-			.await?;
-
-		for (k, ts, perm) in old_bucket_p.authorized_keys.items().iter() {
-			self.garage
-				.bucket_helper()
-				.set_bucket_key_permissions(
-					bucket_id,
-					k,
-					BucketKeyPerm {
-						timestamp: *ts,
-						allow_read: perm.allow_read,
-						allow_write: perm.allow_write,
-						allow_owner: false,
-					},
-				)
-				.await?;
-		}
-
-		Ok(())
-	}
-}
@@ -11,13 +11,11 @@ use garage_table::*;

 use crate::version_table::*;

-use garage_model_050::object_table as old;
-
 /// An object
 #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
 pub struct Object {
 	/// The bucket in which the object is stored, used as partition key
-	pub bucket_id: Uuid,
+	pub bucket: String,

 	/// The key at which the object is stored in its bucket, used as sorting key
 	pub key: String,
@@ -28,9 +26,9 @@ pub struct Object {

 impl Object {
 	/// Initialize an Object struct from parts
-	pub fn new(bucket_id: Uuid, key: String, versions: Vec<ObjectVersion>) -> Self {
+	pub fn new(bucket: String, key: String, versions: Vec<ObjectVersion>) -> Self {
 		let mut ret = Self {
-			bucket_id,
+			bucket,
 			key,
 			versions: vec![],
 		};
@@ -166,9 +164,9 @@ impl ObjectVersion {
 	}
 }

-impl Entry<Uuid, String> for Object {
-	fn partition_key(&self) -> &Uuid {
-		&self.bucket_id
+impl Entry<String, String> for Object {
+	fn partition_key(&self) -> &String {
+		&self.bucket
 	}
 	fn sort_key(&self) -> &String {
 		&self.key
@@ -218,19 +216,11 @@ pub struct ObjectTable {
 	pub version_table: Arc<Table<VersionTable, TableShardedReplication>>,
 }

-#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
-pub enum ObjectFilter {
-	IsData,
-	IsUploading,
-}
-
 impl TableSchema for ObjectTable {
-	const TABLE_NAME: &'static str = "object";
-
-	type P = Uuid;
+	type P = String;
 	type S = String;
 	type E = Object;
-	type Filter = ObjectFilter;
+	type Filter = DeletedFilter;

 	fn updated(&self, old: Option<Self::E>, new: Option<Self::E>) {
 		let version_table = self.version_table.clone();
@@ -250,7 +240,7 @@ impl TableSchema for ObjectTable {
 					};
 					if newly_deleted {
 						let deleted_version =
-							Version::new(v.uuid, old_v.bucket_id, old_v.key.clone(), true);
+							Version::new(v.uuid, old_v.bucket.clone(), old_v.key.clone(), true);
 						version_table.insert(&deleted_version).await?;
 					}
 				}
@@ -260,75 +250,7 @@ impl TableSchema for ObjectTable {
 	}

 	fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
-		match filter {
-			ObjectFilter::IsData => entry.versions.iter().any(|v| v.is_data()),
-			ObjectFilter::IsUploading => entry.versions.iter().any(|v| v.is_uploading()),
-		}
-	}
-
-	fn try_migrate(bytes: &[u8]) -> Option<Self::E> {
-		let old_obj = rmp_serde::decode::from_read_ref::<_, old::Object>(bytes).ok()?;
-		Some(migrate_object(old_obj))
-	}
-}
-
-// vvvvvvvv migration code, stupid stuff vvvvvvvvvvvv
-// (we just want to change bucket into bucket_id by hashing it)
-
-fn migrate_object(o: old::Object) -> Object {
-	let versions = o
-		.versions()
-		.iter()
-		.cloned()
-		.map(migrate_object_version)
-		.collect();
-	Object {
-		bucket_id: blake2sum(o.bucket.as_bytes()),
-		key: o.key,
-		versions,
-	}
-}
-
-fn migrate_object_version(v: old::ObjectVersion) -> ObjectVersion {
-	ObjectVersion {
-		uuid: Uuid::try_from(v.uuid.as_slice()).unwrap(),
-		timestamp: v.timestamp,
-		state: match v.state {
-			old::ObjectVersionState::Uploading(h) => {
-				ObjectVersionState::Uploading(migrate_object_version_headers(h))
-			}
-			old::ObjectVersionState::Complete(d) => {
-				ObjectVersionState::Complete(migrate_object_version_data(d))
-			}
-			old::ObjectVersionState::Aborted => ObjectVersionState::Aborted,
-		},
-	}
-}
-
-fn migrate_object_version_headers(h: old::ObjectVersionHeaders) -> ObjectVersionHeaders {
-	ObjectVersionHeaders {
-		content_type: h.content_type,
-		other: h.other,
-	}
-}
-
-fn migrate_object_version_data(d: old::ObjectVersionData) -> ObjectVersionData {
-	match d {
-		old::ObjectVersionData::DeleteMarker => ObjectVersionData::DeleteMarker,
-		old::ObjectVersionData::Inline(m, b) => {
-			ObjectVersionData::Inline(migrate_object_version_meta(m), b)
-		}
-		old::ObjectVersionData::FirstBlock(m, h) => ObjectVersionData::FirstBlock(
-			migrate_object_version_meta(m),
-			Hash::try_from(h.as_slice()).unwrap(),
-		),
-	}
-}
-
-fn migrate_object_version_meta(m: old::ObjectVersionMeta) -> ObjectVersionMeta {
-	ObjectVersionMeta {
-		headers: migrate_object_version_headers(m.headers),
-		size: m.size,
-		etag: m.etag,
+		let deleted = !entry.versions.iter().any(|v| v.is_data());
+		filter.apply(deleted)
 	}
 }
@@ -1,64 +0,0 @@
-use std::cmp::Ordering;
-
-use serde::{Deserialize, Serialize};
-
-use garage_util::crdt::*;
-
-/// Permission given to a key in a bucket
-#[derive(PartialOrd, Ord, PartialEq, Eq, Clone, Copy, Debug, Serialize, Deserialize)]
-pub struct BucketKeyPerm {
-	/// Timestamp at which the permission was given
-	pub timestamp: u64,
-
-	/// The key can be used to read the bucket
-	pub allow_read: bool,
-	/// The key can be used to write objects to the bucket
-	pub allow_write: bool,
-	/// The key can be used to control other aspects of the bucket:
-	/// - enable / disable website access
-	/// - delete bucket
-	pub allow_owner: bool,
-}
-
-impl BucketKeyPerm {
-	pub const NO_PERMISSIONS: Self = Self {
-		timestamp: 0,
-		allow_read: false,
-		allow_write: false,
-		allow_owner: false,
-	};
-
-	pub const ALL_PERMISSIONS: Self = Self {
-		timestamp: 0,
-		allow_read: true,
-		allow_write: true,
-		allow_owner: true,
-	};
-
-	pub fn is_any(&self) -> bool {
-		self.allow_read || self.allow_write || self.allow_owner
-	}
-}
-
-impl Crdt for BucketKeyPerm {
-	fn merge(&mut self, other: &Self) {
-		match other.timestamp.cmp(&self.timestamp) {
-			Ordering::Greater => {
-				*self = *other;
-			}
-			Ordering::Equal if other != self => {
-				warn!("Different permission sets with same timestamp: {:?} and {:?}, merging to most restricted permission set.", self, other);
-				if !other.allow_read {
-					self.allow_read = false;
-				}
-				if !other.allow_write {
-					self.allow_write = false;
-				}
-				if !other.allow_owner {
-					self.allow_owner = false;
-				}
-			}
-			_ => (),
-		}
-	}
-}
@@ -10,8 +10,6 @@ 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 {
@@ -31,36 +29,22 @@ pub struct Version {
 	// Back link to bucket+key so that we can figure if
 	// this was deleted later on
 	/// Bucket in which the related object is stored
-	pub bucket_id: Uuid,
+	pub bucket: String,
 	/// Key in which the related object is stored
 	pub key: String,
 }

 impl Version {
-	pub fn new(uuid: Uuid, bucket_id: Uuid, key: String, deleted: bool) -> Self {
+	pub fn new(uuid: Uuid, bucket: String, key: String, deleted: bool) -> Self {
 		Self {
 			uuid,
 			deleted: deleted.into(),
 			blocks: crdt::Map::new(),
 			parts_etags: crdt::Map::new(),
-			bucket_id,
+			bucket,
 			key,
 		}
 	}
-
-	pub fn has_part_number(&self, part_number: u64) -> bool {
-		let case1 = self
-			.parts_etags
-			.items()
-			.binary_search_by(|(k, _)| k.cmp(&part_number))
-			.is_ok();
-		let case2 = self
-			.blocks
-			.items()
-			.binary_search_by(|(k, _)| k.part_number.cmp(&part_number))
-			.is_ok();
-		case1 || case2
-	}
 }

 #[derive(PartialEq, Eq, Clone, Copy, Debug, Serialize, Deserialize)]
@@ -98,8 +82,8 @@ impl AutoCrdt for VersionBlock {
 	const WARN_IF_DIFFERENT: bool = true;
 }

-impl Entry<Uuid, EmptyKey> for Version {
-	fn partition_key(&self) -> &Uuid {
+impl Entry<Hash, EmptyKey> for Version {
+	fn partition_key(&self) -> &Hash {
 		&self.uuid
 	}
 	fn sort_key(&self) -> &EmptyKey {
@@ -130,9 +114,7 @@ pub struct VersionTable {
 }

 impl TableSchema for VersionTable {
-	const TABLE_NAME: &'static str = "version";
-
-	type P = Uuid;
+	type P = Hash;
 	type S = EmptyKey;
 	type E = Version;
 	type Filter = DeletedFilter;
@@ -163,42 +145,4 @@ impl TableSchema for VersionTable {
 	fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
 		filter.apply(entry.deleted.get())
 	}
-
-	fn try_migrate(bytes: &[u8]) -> Option<Self::E> {
-		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,
-			parts_etags,
-			bucket_id: blake2sum(old.bucket.as_bytes()),
-			key: old.key,
-		})
-	}
 }
@@ -1,6 +1,6 @@
 [package]
 name = "garage_rpc"
-version = "0.6.0"
+version = "0.5.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -14,7 +14,7 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-garage_util = { version = "0.6.0", path = "../util" }
+garage_util = { version = "0.5.1", path = "../util" }

 arc-swap = "1.0"
 bytes = "1.0"
@@ -576,7 +576,7 @@ impl EndpointHandler<SystemRpc> for System {
 				self.clone().handle_advertise_cluster_layout(adv).await
 			}
 			SystemRpc::GetKnownNodes => Ok(self.handle_get_known_nodes()),
-			m => Err(Error::unexpected_rpc_message(m)),
+			_ => Err(Error::BadRpc("Unexpected RPC message".to_string())),
 		}
 	}
 }
@@ -1,6 +1,6 @@
 [package]
 name = "garage_table"
-version = "0.6.0"
+version = "0.5.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -14,8 +14,8 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-garage_rpc = { version = "0.6.0", path = "../rpc" }
-garage_util = { version = "0.6.0", path = "../util" }
+garage_rpc = { version = "0.5.1", path = "../rpc" }
+garage_util = { version = "0.5.1", path = "../util" }

 async-trait = "0.1.7"
 bytes = "1.0"
@@ -19,6 +19,7 @@ use crate::schema::*;
 pub struct TableData<F: TableSchema, R: TableReplication> {
 	system: Arc<System>,

+	pub name: String,
 	pub(crate) instance: F,
 	pub(crate) replication: R,

@@ -35,24 +36,31 @@ where
 	F: TableSchema,
 	R: TableReplication,
 {
-	pub fn new(system: Arc<System>, instance: F, replication: R, db: &sled::Db) -> Arc<Self> {
+	pub fn new(
+		system: Arc<System>,
+		name: String,
+		instance: F,
+		replication: R,
+		db: &sled::Db,
+	) -> Arc<Self> {
 		let store = db
-			.open_tree(&format!("{}:table", F::TABLE_NAME))
+			.open_tree(&format!("{}:table", name))
 			.expect("Unable to open DB tree");

 		let merkle_tree = db
-			.open_tree(&format!("{}:merkle_tree", F::TABLE_NAME))
+			.open_tree(&format!("{}:merkle_tree", name))
 			.expect("Unable to open DB Merkle tree tree");
 		let merkle_todo = db
-			.open_tree(&format!("{}:merkle_todo", F::TABLE_NAME))
+			.open_tree(&format!("{}:merkle_todo", name))
 			.expect("Unable to open DB Merkle TODO tree");

 		let gc_todo = db
-			.open_tree(&format!("{}:gc_todo_v2", F::TABLE_NAME))
+			.open_tree(&format!("{}:gc_todo_v2", name))
 			.expect("Unable to open DB tree");

 		Arc::new(Self {
 			system,
+			name,
 			instance,
 			replication,
 			store,
@@ -237,7 +245,7 @@ where
 			Err(e) => match F::try_migrate(bytes) {
 				Some(x) => Ok(x),
 				None => {
-					warn!("Unable to decode entry of {}: {}", F::TABLE_NAME, e);
+					warn!("Unable to decode entry of {}: {}", self.name, e);
 					for line in hexdump::hexdump_iter(bytes) {
 						debug!("{}", line);
 					}
@@ -57,11 +57,11 @@ where
 	pub(crate) fn launch(system: Arc<System>, data: Arc<TableData<F, R>>) -> Arc<Self> {
 		let endpoint = system
 			.netapp
-			.endpoint(format!("garage_table/gc.rs/Rpc:{}", F::TABLE_NAME));
+			.endpoint(format!("garage_table/gc.rs/Rpc:{}", data.name));

 		let gc = Arc::new(Self {
 			system: system.clone(),
-			data,
+			data: data.clone(),
 			endpoint,
 		});

@@ -69,7 +69,7 @@ where

 		let gc1 = gc.clone();
 		system.background.spawn_worker(
-			format!("GC loop for {}", F::TABLE_NAME),
+			format!("GC loop for {}", data.name),
 			move |must_exit: watch::Receiver<bool>| gc1.gc_loop(must_exit),
 		);

@@ -90,7 +90,7 @@ where
 					}
 				}
 				Err(e) => {
-					warn!("({}) Error doing GC: {}", F::TABLE_NAME, e);
+					warn!("({}) Error doing GC: {}", self.data.name, e);
 				}
 			}
 		}
@@ -160,7 +160,7 @@ where
 			return Ok(Some(Duration::from_secs(60)));
 		}

-		debug!("({}) GC: doing {} items", F::TABLE_NAME, entries.len());
+		debug!("({}) GC: doing {} items", self.data.name, entries.len());

 		// Split entries to GC by the set of nodes on which they are stored.
 		// Here we call them partitions but they are not exactly
@@ -262,8 +262,7 @@ where

 		info!(
 			"({}) GC: {} items successfully pushed, will try to delete.",
-			F::TABLE_NAME,
-			n_items
+			self.data.name, n_items
 		);

 		// Step 2: delete tombstones everywhere.
@@ -315,7 +314,7 @@ where
 				}
 				Ok(GcRpc::Ok)
 			}
-			m => Err(Error::unexpected_rpc_message(m)),
+			_ => Err(Error::Message("Unexpected GC RPC".to_string())),
 		}
 	}
 }
@@ -82,7 +82,7 @@ where

 		let ret2 = ret.clone();
 		background.spawn_worker(
-			format!("Merkle tree updater for {}", F::TABLE_NAME),
+			format!("Merkle tree updater for {}", ret.data.name),
 			|must_exit: watch::Receiver<bool>| ret2.updater_loop(must_exit),
 		);

@@ -97,16 +97,14 @@ where
 						if let Err(e) = self.update_item(&key[..], &valhash[..]) {
 							warn!(
 								"({}) Error while updating Merkle tree item: {}",
-								F::TABLE_NAME,
-								e
+								self.data.name, e
 							);
 						}
 					}
 					Err(e) => {
 						warn!(
 							"({}) Error while iterating on Merkle todo tree: {}",
-							F::TABLE_NAME,
-							e
+							self.data.name, e
 						);
 						tokio::time::sleep(Duration::from_secs(10)).await;
 					}
@@ -149,8 +147,7 @@ where
 		if !deleted {
 			debug!(
 				"({}) Item not deleted from Merkle todo because it changed: {:?}",
-				F::TABLE_NAME,
-				k
+				self.data.name, k
 			);
 		}
 		Ok(())
@@ -186,7 +183,7 @@ where
 						// should not happen
 						warn!(
 							"({}) Replacing intermediate node with empty node, should not happen.",
-							F::TABLE_NAME
+							self.data.name
 						);
 						Some(MerkleNode::Empty)
 					} else if children.len() == 1 {
@@ -198,7 +195,7 @@ where
 							MerkleNode::Empty => {
 								warn!(
 									"({}) Single subnode in tree is empty Merkle node",
-									F::TABLE_NAME
+									self.data.name
 								);
 								Some(MerkleNode::Empty)
 							}
@@ -16,10 +16,7 @@ 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 {
+impl PartitionKey for Hash {
 	fn hash(&self) -> Hash {
 		*self
 	}
@@ -37,7 +34,7 @@ impl SortKey for String {
 	}
 }

-impl SortKey for FixedBytes32 {
+impl SortKey for Hash {
 	fn sort_key(&self) -> &[u8] {
 		self.as_slice()
 	}
@@ -60,19 +57,12 @@ pub trait Entry<P: PartitionKey, S: SortKey>:

 /// Trait for the schema used in a table
 pub trait TableSchema: Send + Sync {
-	/// The name of the table in the database
-	const TABLE_NAME: &'static str;
-
 	/// The partition key used in that table
 	type P: PartitionKey + Clone + PartialEq + Serialize + for<'de> Deserialize<'de> + Send + Sync;
 	/// The sort key used int that table
 	type S: SortKey + Clone + Serialize + for<'de> Deserialize<'de> + Send + Sync;
-
 	/// They type for an entry in that table
 	type E: Entry<Self::P, Self::S>;
-
-	/// The type for a filter that can be applied to select entries
-	/// (e.g. filter out deleted entries)
 	type Filter: Clone + Serialize + for<'de> Deserialize<'de> + Send + Sync;

 	// Action to take if not able to decode current version:
@@ -77,13 +77,13 @@ where
 	) -> Arc<Self> {
 		let endpoint = system
 			.netapp
-			.endpoint(format!("garage_table/sync.rs/Rpc:{}", F::TABLE_NAME));
+			.endpoint(format!("garage_table/sync.rs/Rpc:{}", data.name));

 		let todo = SyncTodo { todo: vec![] };

 		let syncer = Arc::new(Self {
 			system: system.clone(),
-			data,
+			data: data.clone(),
 			merkle,
 			todo: Mutex::new(todo),
 			endpoint,
@@ -95,13 +95,13 @@ where

 		let s1 = syncer.clone();
 		system.background.spawn_worker(
-			format!("table sync watcher for {}", F::TABLE_NAME),
+			format!("table sync watcher for {}", data.name),
 			move |must_exit: watch::Receiver<bool>| s1.watcher_task(must_exit, busy_rx),
 		);

 		let s2 = syncer.clone();
 		system.background.spawn_worker(
-			format!("table syncer for {}", F::TABLE_NAME),
+			format!("table syncer for {}", data.name),
 			move |must_exit: watch::Receiver<bool>| s2.syncer_task(must_exit, busy_tx),
 		);

@@ -128,7 +128,7 @@ where
 				_ = ring_recv.changed().fuse() => {
 					let new_ring = ring_recv.borrow();
 					if !Arc::ptr_eq(&new_ring, &prev_ring) {
-						debug!("({}) Ring changed, adding full sync to syncer todo list", F::TABLE_NAME);
+						debug!("({}) Ring changed, adding full sync to syncer todo list", self.data.name);
 						self.add_full_sync();
 						prev_ring = new_ring.clone();
 					}
@@ -146,7 +146,7 @@ where
 				_ = tokio::time::sleep(Duration::from_secs(1)).fuse() => {
 					if nothing_to_do_since.map(|t| Instant::now() - t >= ANTI_ENTROPY_INTERVAL).unwrap_or(false) {
 						nothing_to_do_since = None;
-						debug!("({}) Interval passed, adding full sync to syncer todo list", F::TABLE_NAME);
+						debug!("({}) Interval passed, adding full sync to syncer todo list", self.data.name);
 						self.add_full_sync();
 					}
 				}
@@ -177,9 +177,7 @@ where
 				if let Err(e) = res {
 					warn!(
 						"({}) Error while syncing {:?}: {}",
-						F::TABLE_NAME,
-						partition,
-						e
+						self.data.name, partition, e
 					);
 				}
 			} else {
@@ -207,9 +205,7 @@ where

 			debug!(
 				"({}) Syncing {:?} with {:?}...",
-				F::TABLE_NAME,
-				partition,
-				nodes
+				self.data.name, partition, nodes
 			);
 			let mut sync_futures = nodes
 				.iter()
@@ -223,7 +219,7 @@ where
 			while let Some(r) = sync_futures.next().await {
 				if let Err(e) = r {
 					n_errors += 1;
-					warn!("({}) Sync error: {}", F::TABLE_NAME, e);
+					warn!("({}) Sync error: {}", self.data.name, e);
 				}
 			}
 			if n_errors > self.data.replication.max_write_errors() {
@@ -276,7 +272,7 @@ where
 				if nodes.contains(&self.system.id) {
 					warn!(
 						"({}) Interrupting offload as partitions seem to have changed",
-						F::TABLE_NAME
+						self.data.name
 					);
 					break;
 				}
@@ -290,7 +286,7 @@ where
 				counter += 1;
 				info!(
 					"({}) Offloading {} items from {:?}..{:?} ({})",
-					F::TABLE_NAME,
+					self.data.name,
 					items.len(),
 					begin,
 					end,
@@ -333,7 +329,7 @@ where
 		}

 		if not_removed > 0 {
-			debug!("({}) {} items not removed during offload because they changed in between (trying again...)", F::TABLE_NAME, not_removed);
+			debug!("({}) {} items not removed during offload because they changed in between (trying again...)", self.data.name, not_removed);
 		}

 		Ok(())
@@ -364,9 +360,7 @@ where
 		if root_ck.is_empty() {
 			debug!(
 				"({}) Sync {:?} with {:?}: partition is empty.",
-				F::TABLE_NAME,
-				partition,
-				who
+				self.data.name, partition, who
 			);
 			return Ok(());
 		}
@@ -390,9 +384,7 @@ where
 			SyncRpc::RootCkDifferent(false) => {
 				debug!(
 					"({}) Sync {:?} with {:?}: no difference",
-					F::TABLE_NAME,
-					partition,
-					who
+					self.data.name, partition, who
 				);
 				return Ok(());
 			}
@@ -421,11 +413,11 @@ where
 					// Just send that item directly
 					if let Some(val) = self.data.store.get(&ik[..])? {
 						if blake2sum(&val[..]) != ivhash {
-							warn!("({}) Hashes differ between stored value and Merkle tree, key: {:?} (if your server is very busy, don't worry, this happens when the Merkle tree can't be updated fast enough)", F::TABLE_NAME, ik);
+							warn!("({}) Hashes differ between stored value and Merkle tree, key: {:?} (if your server is very busy, don't worry, this happens when the Merkle tree can't be updated fast enough)", self.data.name, ik);
 						}
 						todo_items.push(val.to_vec());
 					} else {
-						warn!("({}) Item from Merkle tree not found in store: {:?} (if your server is very busy, don't worry, this happens when the Merkle tree can't be updated fast enough)", F::TABLE_NAME, ik);
+						warn!("({}) Item from Merkle tree not found in store: {:?} (if your server is very busy, don't worry, this happens when the Merkle tree can't be updated fast enough)", self.data.name, ik);
 					}
 				}
 				MerkleNode::Intermediate(l) => {
@@ -490,7 +482,7 @@ where
 	async fn send_items(&self, who: Uuid, item_value_list: Vec<Vec<u8>>) -> Result<(), Error> {
 		info!(
 			"({}) Sending {} items to {:?}",
-			F::TABLE_NAME,
+			self.data.name,
 			item_value_list.len(),
 			who
 		);
@@ -514,7 +506,10 @@ where
 		if let SyncRpc::Ok = rpc_resp {
 			Ok(())
 		} else {
-			Err(Error::unexpected_rpc_message(rpc_resp))
+			Err(Error::Message(format!(
+				"Unexpected response to RPC Update: {}",
+				debug_serialize(&rpc_resp)
+			)))
 		}
 	}
 }
@@ -542,7 +537,7 @@ where
 				self.data.update_many(items)?;
 				Ok(SyncRpc::Ok)
 			}
-			m => Err(Error::unexpected_rpc_message(m)),
+			_ => Err(Error::Message("Unexpected sync RPC".to_string())),
 		}
 	}
 }
@@ -55,12 +55,18 @@ where
 {
 	// =============== PUBLIC INTERFACE FUNCTIONS (new, insert, get, etc) ===============

-	pub fn new(instance: F, replication: R, system: Arc<System>, db: &sled::Db) -> Arc<Self> {
+	pub fn new(
+		instance: F,
+		replication: R,
+		system: Arc<System>,
+		db: &sled::Db,
+		name: String,
+	) -> Arc<Self> {
 		let endpoint = system
 			.netapp
-			.endpoint(format!("garage_table/table.rs/Rpc:{}", F::TABLE_NAME));
+			.endpoint(format!("garage_table/table.rs/Rpc:{}", name));

-		let data = TableData::new(system.clone(), instance, replication, db);
+		let data = TableData::new(system.clone(), name, instance, replication, db);

 		let merkle_updater = MerkleUpdater::launch(&system.background, data.clone());

@@ -311,7 +317,7 @@ where
 				self.data.update_many(pairs)?;
 				Ok(TableRpc::Ok)
 			}
-			m => Err(Error::unexpected_rpc_message(m)),
+			_ => Err(Error::BadRpc("Unexpected table RPC".to_string())),
 		}
 	}
 }
@@ -19,7 +19,7 @@ impl PartitionKey for EmptyKey {

 #[derive(Clone, Copy, Debug, Serialize, Deserialize)]
 pub enum DeletedFilter {
-	Any,
+	All,
 	Deleted,
 	NotDeleted,
 }
@@ -27,7 +27,7 @@ pub enum DeletedFilter {
 impl DeletedFilter {
 	pub fn apply(&self, deleted: bool) -> bool {
 		match self {
-			DeletedFilter::Any => true,
+			DeletedFilter::All => true,
 			DeletedFilter::Deleted => deleted,
 			DeletedFilter::NotDeleted => !deleted,
 		}
@@ -1,6 +1,6 @@
 [package]
 name = "garage_util"
-version = "0.6.0"
+version = "0.5.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -87,6 +87,8 @@ pub struct WebConfig {
 	pub bind_addr: SocketAddr,
 	/// Suffix to remove from domain name to find bucket
 	pub root_domain: String,
+	/// Suffix to add when user-agent request path end with "/"
+	pub index: String,
 }

 fn default_sled_cache_capacity() -> u64 {
@@ -1,3 +1,5 @@
+use crate::data::*;
+
 /// Definition of a CRDT - all CRDT Rust types implement this.
 ///
 /// A CRDT is defined as a merge operator that respects a certain set of axioms.
@@ -26,28 +28,6 @@ pub trait Crdt {
 	fn merge(&mut self, other: &Self);
 }

-/// Option<T> implements Crdt for any type T, even if T doesn't implement CRDT itself: when
-/// different values are detected, they are always merged to None.  This can be used for value
-/// types which shoulnd't be merged, instead of trying to merge things when we know we don't want
-/// to merge them (which is what the AutoCrdt trait is used for most of the time). This cases
-/// arises very often, for example with a Lww or a LwwMap: the value type has to be a CRDT so that
-/// we have a rule for what to do when timestamps aren't enough to disambiguate (in a distributed
-/// system, anything can happen!), and with AutoCrdt the rule is to make an arbitrary (but
-/// determinstic) choice between the two.  When using an Option<T> instead with this impl, ambiguity
-/// cases are explicitely stored as None, which allows us to detect the ambiguity and handle it in
-/// the way we want. (this can only work if we are happy with losing the value when an ambiguity
-/// arises)
-impl<T> Crdt for Option<T>
-where
-	T: Eq,
-{
-	fn merge(&mut self, other: &Self) {
-		if self != other {
-			*self = None;
-		}
-	}
-}
-
 /// All types that implement `Ord` (a total order) can also implement a trivial CRDT
 /// defined by the merge rule: `a ⊔ b = max(a, b)`. Implement this trait for your type
 /// to enable this behavior.
@@ -85,3 +65,7 @@ impl AutoCrdt for String {
 impl AutoCrdt for bool {
 	const WARN_IF_DIFFERENT: bool = true;
 }
+
+impl AutoCrdt for FixedBytes32 {
+	const WARN_IF_DIFFERENT: bool = true;
+}
@@ -1,72 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-use crate::crdt::crdt::*;
-
-/// Deletable object (once deleted, cannot go back)
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq)]
-pub enum Deletable<T> {
-	Present(T),
-	Deleted,
-}
-
-impl<T: Crdt> Deletable<T> {
-	/// Create a new deletable object that isn't deleted
-	pub fn present(v: T) -> Self {
-		Self::Present(v)
-	}
-	/// Create a new deletable object that is deleted
-	pub fn delete() -> Self {
-		Self::Deleted
-	}
-	/// As option
-	pub fn as_option(&self) -> Option<&T> {
-		match self {
-			Self::Present(v) => Some(v),
-			Self::Deleted => None,
-		}
-	}
-	/// As option, mutable
-	pub fn as_option_mut(&mut self) -> Option<&mut T> {
-		match self {
-			Self::Present(v) => Some(v),
-			Self::Deleted => None,
-		}
-	}
-	/// Into option
-	pub fn into_option(self) -> Option<T> {
-		match self {
-			Self::Present(v) => Some(v),
-			Self::Deleted => None,
-		}
-	}
-	/// Is object deleted?
-	pub fn is_deleted(&self) -> bool {
-		matches!(self, Self::Deleted)
-	}
-}
-
-impl<T> From<Option<T>> for Deletable<T> {
-	fn from(v: Option<T>) -> Self {
-		v.map(Self::Present).unwrap_or(Self::Deleted)
-	}
-}
-
-impl<T> From<Deletable<T>> for Option<T> {
-	fn from(v: Deletable<T>) -> Option<T> {
-		match v {
-			Deletable::Present(v) => Some(v),
-			Deletable::Deleted => None,
-		}
-	}
-}
-
-impl<T: Crdt> Crdt for Deletable<T> {
-	fn merge(&mut self, other: &Self) {
-		if let Deletable::Present(v) = self {
-			match other {
-				Deletable::Deleted => *self = Deletable::Deleted,
-				Deletable::Present(v2) => v.merge(v2),
-			}
-		}
-	}
-}
@@ -57,8 +57,11 @@ where
 		}
 	}

-	/// Build a new LWW CRDT from its raw pieces: a timestamp and the value
-	pub fn raw(ts: u64, value: T) -> Self {
+	/// 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.
+	pub fn migrate_from_raw(ts: u64, value: T) -> Self {
 		Self { ts, v: value }
 	}

@@ -84,7 +87,7 @@ where
 		&self.v
 	}

-	/// Take the value inside the CRDT (discards the timesamp)
+	/// Take the CRDT value
 	pub fn take(self) -> T {
 		self.v
 	}
@@ -125,15 +128,3 @@ where
 		}
 	}
 }
-
-impl<T> Default for Lww<T>
-where
-	T: Default,
-{
-	fn default() -> Self {
-		Self {
-			ts: 0,
-			v: T::default(),
-		}
-	}
-}
@@ -30,20 +30,18 @@ pub struct LwwMap<K, V> {

 impl<K, V> LwwMap<K, V>
 where
-	K: Clone + Ord,
-	V: Clone + Crdt,
+	K: Ord,
+	V: Crdt,
 {
 	/// Create a new empty map CRDT
 	pub fn new() -> Self {
 		Self { vals: vec![] }
 	}
-
-	/// 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 {
+	/// 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.
+	pub fn migrate_from_raw_item(k: K, ts: u64, v: V) -> Self {
 		Self {
 			vals: vec![(k, ts, v)],
 		}
@@ -64,7 +62,6 @@ where
 	///
 	/// However extracting the mutator on its own and only sending that on the network is very
 	/// interesting as it is much smaller than the whole map.
-	#[must_use = "CRDT mutators are meant to be merged into a CRDT and not ignored."]
 	pub fn update_mutator(&self, k: K, new_v: V) -> Self {
 		let new_vals = match self.vals.binary_search_by(|(k2, _, _)| k2.cmp(&k)) {
 			Ok(i) => {
@@ -76,38 +73,6 @@ where
 		};
 		Self { vals: new_vals }
 	}
-
-	/// Updates a value in place in the map (this generates
-	/// a new timestamp)
-	pub fn update_in_place(&mut self, k: K, new_v: V) {
-		self.merge(&self.update_mutator(k, new_v));
-	}
-
-	/// Updates a value in place in the map, from a
-	/// (key, timestamp, value) triple, only if the given
-	/// timestamp is larger than the timestamp currently
-	/// in the map
-	pub fn merge_raw(&mut self, k: &K, ts2: u64, v2: &V) {
-		match self.vals.binary_search_by(|(k2, _, _)| k2.cmp(k)) {
-			Ok(i) => {
-				let (_, ts1, _v1) = &self.vals[i];
-				match ts2.cmp(ts1) {
-					Ordering::Greater => {
-						self.vals[i].1 = ts2;
-						self.vals[i].2 = v2.clone();
-					}
-					Ordering::Equal => {
-						self.vals[i].2.merge(v2);
-					}
-					Ordering::Less => (),
-				}
-			}
-			Err(i) => {
-				self.vals.insert(i, (k.clone(), ts2, v2.clone()));
-			}
-		}
-	}
-
 	/// Takes all of the values of the map and returns them. The current map is reset to the
 	/// empty map. This is very usefull to produce in-place a new map that contains only a delta
 	/// that modifies a certain value:
@@ -134,12 +99,10 @@ where
 		let vals = std::mem::take(&mut self.vals);
 		Self { vals }
 	}
-
 	/// Removes all values from the map
 	pub fn clear(&mut self) {
 		self.vals.clear();
 	}
-
 	/// Get a reference to the value assigned to a key
 	pub fn get(&self, k: &K) -> Option<&V> {
 		match self.vals.binary_search_by(|(k2, _, _)| k2.cmp(k)) {
@@ -147,16 +110,6 @@ where
 			Err(_) => None,
 		}
 	}
-
-	/// Get the timestamp of the value assigned to a key, or 0 if
-	/// no value is assigned
-	pub fn get_timestamp(&self, k: &K) -> u64 {
-		match self.vals.binary_search_by(|(k2, _, _)| k2.cmp(k)) {
-			Ok(i) => self.vals[i].1,
-			Err(_) => 0,
-		}
-	}
-
 	/// Gets a reference to all of the items, as a slice. Usefull to iterate on all map values.
 	/// In most case you will want to ignore the timestamp (second item of the tuple).
 	pub fn items(&self) -> &[(K, u64, V)] {
@@ -181,15 +134,32 @@ where
 {
 	fn merge(&mut self, other: &Self) {
 		for (k, ts2, v2) in other.vals.iter() {
-			self.merge_raw(k, *ts2, v2);
+			match self.vals.binary_search_by(|(k2, _, _)| k2.cmp(k)) {
+				Ok(i) => {
+					let (_, ts1, _v1) = &self.vals[i];
+					match ts2.cmp(ts1) {
+						Ordering::Greater => {
+							self.vals[i].1 = *ts2;
+							self.vals[i].2 = v2.clone();
+						}
+						Ordering::Equal => {
+							self.vals[i].2.merge(v2);
+						}
+						Ordering::Less => (),
+					}
+				}
+				Err(i) => {
+					self.vals.insert(i, (k.clone(), *ts2, v2.clone()));
+				}
+			}
 		}
 	}
 }

 impl<K, V> Default for LwwMap<K, V>
 where
-	K: Clone + Ord,
-	V: Clone + Crdt,
+	K: Ord,
+	V: Crdt,
 {
 	fn default() -> Self {
 		Self::new()
@@ -1,5 +1,3 @@
-use std::iter::{FromIterator, IntoIterator};
-
 use serde::{Deserialize, Serialize};

 use crate::crdt::crdt::*;
@@ -35,7 +33,6 @@ where
 	/// This can be used to build a delta-mutator:
 	/// when merged with another map, the value will be added or CRDT-merged if a previous
 	/// value already exists.
-	#[must_use = "CRDT mutators are meant to be merged into a CRDT and not ignored."]
 	pub fn put_mutator(k: K, v: V) -> Self {
 		Self { vals: vec![(k, v)] }
 	}
@@ -100,26 +97,3 @@ 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 }
-	}
-}
@@ -7,19 +7,17 @@
 //! counter.  Alice does +1 on her copy, she reads 1.  Bob does +3 on his copy, he reads 3.  Now,
 //! it is easy to merge their counters, order does not count: we always get 4.
 //!
-//! Learn more about CRDTs [on Wikipedia](https://en.wikipedia.org/wiki/Conflict-free_replicated_data_type)
+//! Learn more about CRDT [on Wikipedia](https://en.wikipedia.org/wiki/Conflict-free_replicated_data_type)

 mod bool;
 #[allow(clippy::module_inception)]
 mod crdt;
-mod deletable;
 mod lww;
 mod lww_map;
 mod map;

 pub use self::bool::*;
 pub use crdt::*;
-pub use deletable::*;
 pub use lww::*;
 pub use lww_map::*;
 pub use map::*;
@@ -5,7 +5,7 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::fmt;

 /// An array of 32 bytes
-#[derive(Default, Clone, Hash, PartialEq, Eq, PartialOrd, Ord, Copy)]
+#[derive(Default, PartialOrd, Ord, Clone, Hash, PartialEq, Copy)]
 pub struct FixedBytes32([u8; 32]);

 impl From<[u8; 32]> for FixedBytes32 {
@@ -20,6 +20,8 @@ impl std::convert::AsRef<[u8]> for FixedBytes32 {
 	}
 }

+impl Eq for FixedBytes32 {}
+
 impl fmt::Debug for FixedBytes32 {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		write!(f, "{}…", hex::encode(&self.0[..8]))
@@ -59,8 +59,8 @@ pub enum Error {
 	)]
 	Quorum(usize, usize, usize, Vec<String>),

-	#[error(display = "Unexpected RPC message: {}", _0)]
-	UnexpectedRpcMessage(String),
+	#[error(display = "Bad RPC: {}", _0)]
+	BadRpc(String),

 	#[error(display = "Corrupt data: does not match hash {:?}", _0)]
 	CorruptData(Hash),
@@ -69,12 +69,6 @@ pub enum Error {
 	Message(String),
 }

-impl Error {
-	pub fn unexpected_rpc_message<T: Serialize>(v: T) -> Self {
-		Self::UnexpectedRpcMessage(debug_serialize(&v))
-	}
-}
-
 impl From<sled::transaction::TransactionError<Error>> for Error {
 	fn from(e: sled::transaction::TransactionError<Error>) -> Error {
 		match e {
@@ -125,35 +119,6 @@ where
 	}
 }

-/// Trait to map any error type to Error::Message
-pub trait OkOrMessage {
-	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 S = T;
-	fn ok_or_message<M: Into<String>>(self, message: M) -> Result<T, Error> {
-		match self {
-			Ok(x) => Ok(x),
-			Err(e) => Err(Error::Message(format!("{}: {}", message.into(), e))),
-		}
-	}
-}
-
-impl<T> OkOrMessage for Option<T> {
-	type S = T;
-	fn ok_or_message<M: Into<String>>(self, message: M) -> Result<T, Error> {
-		match self {
-			Some(x) => Ok(x),
-			None => Err(Error::Message(message.into())),
-		}
-	}
-}
-
 // Custom serialization for our error type, for use in RPC.
 // Errors are serialized as a string of their Display representation.
 // Upon deserialization, they all become a RemoteError with the
@@ -10,16 +10,6 @@ pub fn now_msec() -> u64 {
 		.as_millis() as u64
 }

-/// Increment logical clock
-pub fn increment_logical_clock(prev: u64) -> u64 {
-	std::cmp::max(prev + 1, now_msec())
-}
-
-/// Increment two logical clocks
-pub fn increment_logical_clock_2(prev: u64, prev2: u64) -> u64 {
-	std::cmp::max(prev2 + 1, std::cmp::max(prev + 1, now_msec()))
-}
-
 /// Convert a timestamp represented as milliseconds since UNIX Epoch to
 /// its RFC3339 representation, such as "2021-01-01T12:30:00Z"
 pub fn msec_to_rfc3339(msecs: u64) -> String {
@@ -1,6 +1,6 @@
 [package]
 name = "garage_web"
-version = "0.6.0"
+version = "0.5.1"
 authors = ["Alex Auvolat <alex@adnab.me>", "Quentin Dufour <quentin@dufour.io>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -14,10 +14,10 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-garage_api = { version = "0.6.0", path = "../api" }
-garage_model = { version = "0.6.0", path = "../model" }
-garage_util = { version = "0.6.0", path = "../util" }
-garage_table = { version = "0.6.0", path = "../table" }
+garage_api = { version = "0.5.1", path = "../api" }
+garage_model = { version = "0.5.1", path = "../model" }
+garage_util = { version = "0.5.1", path = "../util" }
+garage_table = { version = "0.5.1", path = "../table" }

 err-derive = "0.3"
 log = "0.4"
@@ -3,21 +3,17 @@ use std::{borrow::Cow, convert::Infallible, net::SocketAddr, sync::Arc};
 use futures::future::Future;

 use hyper::{
-	header::{HeaderValue, HOST},
+	header::HOST,
 	server::conn::AddrStream,
 	service::{make_service_fn, service_fn},
 	Body, Method, Request, Response, Server,
 };

 use crate::error::*;
-
-use garage_api::error::{Error as ApiError, OkOrBadRequest, OkOrInternalError};
 use garage_api::helpers::{authority_to_host, host_to_bucket};
-use garage_api::s3_cors::{add_cors_headers, find_matching_cors_rule, handle_options};
 use garage_api::s3_get::{handle_get, handle_head};
-
+use garage_model::bucket_table::*;
 use garage_model::garage::Garage;
-
 use garage_table::*;
 use garage_util::error::Error as GarageError;

@@ -53,161 +49,63 @@ async fn handle_request(
 	addr: SocketAddr,
 ) -> Result<Response<Body>, Infallible> {
 	info!("{} {} {}", addr, req.method(), req.uri());
-	match serve_file(garage, &req).await {
-		Ok(res) => {
-			debug!("{} {} {}", req.method(), req.uri(), res.status());
-			Ok(res)
-		}
-		Err(error) => {
-			info!(
-				"{} {} {} {}",
-				req.method(),
-				req.uri(),
-				error.http_status_code(),
-				error
-			);
-			Ok(error_to_res(error))
-		}
+	let res = serve_file(garage, req).await;
+	match &res {
+		Ok(r) => debug!("{} {:?}", r.status(), r.headers()),
+		Err(e) => warn!("Response: error {}, {}", e.http_status_code(), e),
 	}
+
+	Ok(res.unwrap_or_else(error_to_res))
 }

 fn error_to_res(e: Error) -> Response<Body> {
-	// If we are here, it is either that:
-	// - there was an error before trying to get the requested URL
-	//   from the bucket (e.g. bucket not found)
-	// - there was an error processing the request and (the request
-	//   was a HEAD request or we couldn't get the error document)
-	// We do NOT enter this code path when returning the bucket's
-	// error document (this is handled in serve_file)
-	let body = Body::from(format!("{}\n", e));
+	let body: Body = Body::from(format!("{}\n", e));
 	let mut http_error = Response::new(body);
 	*http_error.status_mut() = e.http_status_code();
 	e.add_headers(http_error.headers_mut());
 	http_error
 }

-async fn serve_file(garage: Arc<Garage>, req: &Request<Body>) -> Result<Response<Body>, Error> {
+async fn serve_file(garage: Arc<Garage>, req: Request<Body>) -> Result<Response<Body>, Error> {
 	// Get http authority string (eg. [::1]:3902 or garage.tld:80)
 	let authority = req
 		.headers()
 		.get(HOST)
-		.ok_or_bad_request("HOST header required")?
+		.ok_or_else(|| Error::BadRequest("HOST header required".to_owned()))?
 		.to_str()?;

 	// Get bucket
 	let host = authority_to_host(authority)?;
 	let root = &garage.config.s3_web.root_domain;
+	let bucket = host_to_bucket(&host, root).unwrap_or(&host);

-	let bucket_name = host_to_bucket(&host, root).unwrap_or(&host);
-	let bucket_id = garage
-		.bucket_alias_table
-		.get(&EmptyKey, &bucket_name.to_string())
-		.await?
-		.map(|x| x.state.take())
-		.flatten()
-		.ok_or(Error::NotFound)?;
-
-	// Check bucket isn't deleted and has website access enabled
-	let bucket = garage
+	// Check bucket is exposed as a website
+	let bucket_desc = garage
 		.bucket_table
-		.get(&EmptyKey, &bucket_id)
+		.get(&EmptyKey, &bucket.to_string())
 		.await?
+		.filter(|b| !b.is_deleted())
 		.ok_or(Error::NotFound)?;

-	let website_config = bucket
-		.params()
-		.ok_or(Error::NotFound)?
-		.website_config
-		.get()
-		.as_ref()
-		.ok_or(Error::NotFound)?;
+	match bucket_desc.state.get() {
+		BucketState::Present(params) if *params.website.get() => Ok(()),
+		_ => Err(Error::NotFound),
+	}?;

 	// Get path
 	let path = req.uri().path().to_string();
-	let index = &website_config.index_document;
+	let index = &garage.config.s3_web.index;
 	let key = path_to_key(&path, index)?;

-	debug!(
-		"Selected bucket: \"{}\" {:?}, selected key: \"{}\"",
-		bucket_name, bucket_id, key
-	);
+	info!("Selected bucket: \"{}\", selected key: \"{}\"", bucket, key);

-	let ret_doc = match *req.method() {
-		Method::OPTIONS => handle_options(req, &bucket).await,
-		Method::HEAD => handle_head(garage.clone(), req, bucket_id, &key, None).await,
-		Method::GET => handle_get(garage.clone(), req, bucket_id, &key, None).await,
-		_ => Err(ApiError::BadRequest("HTTP method not supported".into())),
-	}
-	.map_err(Error::from);
+	let res = match *req.method() {
+		Method::HEAD => handle_head(garage, &req, bucket, &key).await?,
+		Method::GET => handle_get(garage, &req, bucket, &key).await?,
+		_ => return Err(Error::BadRequest("HTTP method not supported".to_string())),
+	};

-	match ret_doc {
-		Err(error) => {
-			// For a HEAD or OPTIONS method, and for non-4xx errors,
-			// we don't return the error document as content,
-			// we return above and just return the error message
-			// by relying on err_to_res that is called when we return an Err.
-			if *req.method() == Method::HEAD
-				|| *req.method() == Method::OPTIONS
-				|| !error.http_status_code().is_client_error()
-			{
-				return Err(error);
-			}
-
-			// If no error document is set: just return the error directly
-			let error_document = match &website_config.error_document {
-				Some(ed) => ed.trim_start_matches('/').to_owned(),
-				None => return Err(error),
-			};
-
-			// We want to return the error document
-			// Create a fake HTTP request with path = the error document
-			let req2 = Request::builder()
-				.uri(format!("http://{}/{}", host, &error_document))
-				.body(Body::empty())
-				.unwrap();
-
-			match handle_get(garage, &req2, bucket_id, &error_document, None).await {
-				Ok(mut error_doc) => {
-					// The error won't be logged back in handle_request,
-					// so log it here
-					info!(
-						"{} {} {} {}",
-						req.method(),
-						req.uri(),
-						error.http_status_code(),
-						error
-					);
-
-					*error_doc.status_mut() = error.http_status_code();
-					error.add_headers(error_doc.headers_mut());
-
-					// Preserve error message in a special header
-					for error_line in error.to_string().split('\n') {
-						if let Ok(v) = HeaderValue::from_bytes(error_line.as_bytes()) {
-							error_doc.headers_mut().append("X-Garage-Error", v);
-						}
-					}
-
-					Ok(error_doc)
-				}
-				Err(error_doc_error) => {
-					warn!(
-						"Couldn't get error document {} for bucket {:?}: {}",
-						error_document, bucket_id, error_doc_error
-					);
-					Err(error)
-				}
-			}
-		}
-		Ok(mut resp) => {
-			// Maybe add CORS headers
-			if let Some(rule) = find_matching_cors_rule(&bucket, req)? {
-				add_cors_headers(&mut resp, rule)
-					.ok_or_internal_error("Invalid bucket CORS configuration")?;
-			}
-			Ok(resp)
-		}
-	}
+	Ok(res)
 }

 /// Path to key