diff --git a/Cargo.lock b/Cargo.lock
index e73e5a9..90d0ca3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -69,7 +69,7 @@ dependencies = [
"dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonwebtoken 4.0.0",
"lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "multipart 0.13.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "multipart 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
"oath 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
"r2d2 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"r2d2-diesel 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -88,11 +88,11 @@ dependencies = [
[[package]]
name = "buf_redux"
-version = "0.6.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "safemem 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -134,7 +134,7 @@ name = "chrono"
version = "0.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "num 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -143,7 +143,7 @@ name = "chrono"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "num 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -161,6 +161,14 @@ dependencies = [
"scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
+[[package]]
+name = "conduit-mime-types"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
[[package]]
name = "constant_time_eq"
version = "0.1.3"
@@ -278,7 +286,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"derive-error-chain 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
"error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -348,6 +356,15 @@ name = "encoding_index_tests"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
+[[package]]
+name = "error"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
[[package]]
name = "error-chain"
version = "0.10.0"
@@ -418,6 +435,11 @@ dependencies = [
"typenum 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
+[[package]]
+name = "groupable"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
[[package]]
name = "hmac"
version = "0.1.1"
@@ -520,12 +542,14 @@ dependencies = [
[[package]]
name = "iron"
-version = "0.6.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
+ "conduit-mime-types 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime_guess 1.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
"modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -637,14 +661,6 @@ name = "matches"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-[[package]]
-name = "memchr"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
[[package]]
name = "memchr"
version = "1.0.2"
@@ -695,17 +711,6 @@ dependencies = [
"unicase 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
-[[package]]
-name = "mime_guess"
-version = "1.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
[[package]]
name = "mime_guess"
version = "2.0.0-alpha.3"
@@ -753,16 +758,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "multipart"
-version = "0.13.6"
+version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "buf_redux 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "buf_redux 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"httparse 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "iron 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime_guess 1.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 2.0.0-alpha.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nickel 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
"safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tempdir 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -770,6 +777,15 @@ dependencies = [
"twoway 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
+[[package]]
+name = "mustache"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
[[package]]
name = "native-tls"
version = "0.1.5"
@@ -777,7 +793,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.9.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
"schannel 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
"security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -796,6 +812,25 @@ dependencies = [
"ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
+[[package]]
+name = "nickel"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "groupable 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mustache 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
[[package]]
name = "nodrop"
version = "0.1.12"
@@ -803,12 +838,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "num"
-version = "0.1.41"
+version = "0.1.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
"num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -863,19 +898,19 @@ dependencies = [
[[package]]
name = "openssl"
-version = "0.9.23"
+version = "0.9.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "openssl-sys"
-version = "0.9.24"
+version = "0.9.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -956,6 +991,11 @@ dependencies = [
"typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
+[[package]]
+name = "quick-error"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
[[package]]
name = "quote"
version = "0.3.15"
@@ -1035,7 +1075,7 @@ dependencies = [
[[package]]
name = "regex"
-version = "0.2.5"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1173,11 +1213,6 @@ dependencies = [
"webpki 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
-[[package]]
-name = "safemem"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
[[package]]
name = "safemem"
version = "0.2.0"
@@ -1693,7 +1728,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "229d032f1a99302697f10b27167ae6d03d49d032e6a8e2550e8d3fc13356d2b4"
"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
"checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf"
-"checksum buf_redux 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5f659482025b65320c1746e6e7941918269681ada7adde3b92f9bbc510e68130"
+"checksum buf_redux 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b9279646319ff816b05fb5897883ece50d7d854d12b59992683d4f8a71b0f949"
"checksum build_const 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e90dc84f5e62d2ebe7676b83c22d33b6db8bd27340fb6ffbff0a364efa0cb9c9"
"checksum byte-tools 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0919189ba800c7ffe8778278116b7e0de3905ab81c72abb69c85cbfef7991279"
"checksum byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "652805b7e73fada9d85e9a6682a4abd490cb52d96aeecc12e33a0de34dfd0d23"
@@ -1704,6 +1739,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c20ebe0b2b08b0aeddba49c609fe7957ba2e33449882cb186a180bc60682fa9"
"checksum chunked_transfer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87"
"checksum coco 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c06169f5beb7e31c7c67ebf5540b8b472d23e3eade3b2ec7d1f5b504a85f91bd"
+"checksum conduit-mime-types 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "95ca30253581af809925ef68c2641cc140d6183f43e12e0af4992d53768bd7b8"
"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
"checksum cookie 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "477eb650753e319be2ae77ec368a58c638f9f0c4d941c39bad95e950fb1d1d0d"
"checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67"
@@ -1727,6 +1763,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
+"checksum error 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "a6e606f14042bb87cc02ef6a14db6c90ab92ed6f62d87e69377bc759fd7987cc"
"checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
"checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
@@ -1738,6 +1775,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
"checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb"
"checksum generic-array 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe043cf9b85297937897087de81f590361686e1ac2d4d471b45435de5dfb6a6"
+"checksum groupable 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "32619942b8be646939eaf3db0602b39f5229b74575b67efc897811ded1db4e57"
"checksum hmac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bdb5aa9647ba4711e9d6968dc1c810cd23989ed435443ca962e1bf6d8b8b83ff"
"checksum httparse 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2f407128745b78abc95c0ffbe4e5d37427fdc0d45470710cfef8c44522a2e37"
"checksum hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)" = "368cb56b2740ebf4230520e2b90ebb0461e69034d85d1945febd9b3971426db2"
@@ -1746,7 +1784,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c81fa95203e2a6087242c38691a0210f23e9f3f8f944350bd676522132e2985"
"checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d"
"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
-"checksum iron 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d8e17268922834707e1c29e8badbf9c712c9c43378e1b6a3388946baff10be2"
+"checksum iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2440ae846e7a8c7f9b401db8f6e31b4ea5e7d3688b91761337da7e054520c75b"
"checksum isatty 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f2a233726c7bb76995cec749d59582e5664823b7245d4970354408f1d79a7a2"
"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
@@ -1760,31 +1798,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
"checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2"
"checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376"
-"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
"checksum memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a"
"checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d"
"checksum migrations_internals 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd916de6df9ac7e811e7e1ac28e0abfebe5205f3b29a7bda9ec8a41ee980a4eb"
"checksum migrations_macros 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a550cfd76f6cfdf15a7b541893d7c79b68277b0b309f12179211a373a56e617"
"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
"checksum mime 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e2e00e17be181010a91dbfefb01660b17311059dc8c7f48b9017677721e732bd"
-"checksum mime_guess 1.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "dc7e82a15629bb4ecd9e72365bf33d1382be91e030f820edb8e2a21c02430da8"
"checksum mime_guess 2.0.0-alpha.3 (registry+https://github.com/rust-lang/crates.io-index)" = "013572795763289e14710c7b279461295f2673b2b338200c235082cd7ca9e495"
"checksum mio 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "7da01a5e23070d92d99b1ecd1cd0af36447c6fd44b0fe283c2db199fa136724f"
"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
"checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58"
-"checksum multipart 0.13.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92f54eb45230c3aa20864ccf0c277eeaeadcf5e437e91731db498dbf7fbe0ec6"
+"checksum multipart 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a2e11577acf0aa0185f804d5542c168d8c140de45a499ee59bea532cf7f83eba"
+"checksum mustache 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ddb004e419334fc9172d0a5ff91c0770bdd6239091b0b343eb5926101f0a7d13"
"checksum native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f74dbadc8b43df7864539cedb7bc91345e532fdd913cfdc23ad94f4d2d40fbc0"
"checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09"
+"checksum nickel 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "22b40e35b9f46a076dcbd8193125cea0e4130b1c015f68655038010f3e826e04"
"checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2"
-"checksum num 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "cc4083e14b542ea3eb9b5f33ff48bd373a92d78687e74f4cc0a30caeb754f0ca"
+"checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
"checksum num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f8d26da319fb45674985c78f1d1caf99aa4941f785d384a2ae36d0740bc3e2fe"
"checksum num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "4b226df12c5a59b63569dd57fafb926d91b385dfce33d8074a412411b689d593"
"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
"checksum num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e7de20f146db9d920c45ee8ed8f71681fd9ade71909b48c3acbd766aa504cf10"
"checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30"
"checksum oath 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ec6405dc6afe8219020d535f9ad888a12b191bbc8ce1c55f7ee663bde5be80ca"
-"checksum openssl 0.9.23 (registry+https://github.com/rust-lang/crates.io-index)" = "169a4b9160baf9b9b1ab975418c673686638995ba921683a7f1e01470dcb8854"
-"checksum openssl-sys 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "14ba54ac7d5a4eabd1d5f2c1fdeb7e7c14debfa669d94b983d01b465e767ba9e"
+"checksum openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "a3605c298474a3aa69de92d21139fb5e2a81688d308262359d85cdd0d12a7985"
+"checksum openssl-sys 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)" = "93b3cbfaccf11969aea8c2041bfafc43c81666c1ce673476e19395c92cc77bf4"
"checksum ordermap 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b81cf3b8cb96aa0e73bbedfcdc9708d09fec2854ba8d474be4e6f666d7379e8b"
"checksum pear 0.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "b5c2dabd6c1650d9bfac8e46be7b518b31c3885ab4412de1aca330938616c5bd"
"checksum pear_codegen 0.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "df863bb78b3ee6b049278324eea8df6b2553a8db9a3504c0e32cfcc17bc8d18c"
@@ -1795,6 +1833,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "07e24b0ca9643bdecd0632f2b3da6b1b89bbb0030e0b992afc1113b23a7bc2f2"
"checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903"
"checksum plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0"
+"checksum quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eda5fe9b71976e62bc81b781206aaa076401769b2143379d3eb2118388babac4"
"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
"checksum r2d2 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f9078ca6a8a5568ed142083bb2f7dc9295b69d16f867ddcc9849e51b17d8db46"
"checksum r2d2-diesel 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9c29bad92da76d02bc2c020452ebc3a3fe6fa74cfab91e711c43116e4fb1a3"
@@ -1804,7 +1843,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum rayon-core 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e64b609139d83da75902f88fd6c01820046840a18471e4dfcd5ac7c0f46bea53"
"checksum redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd"
"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
-"checksum regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "744554e01ccbd98fff8c457c3b092cd67af62a555a43bfe97ae8a0451f7799fa"
+"checksum regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "5be5347bde0c48cfd8c3fdc0766cdfe9d8a755ef84d620d6794c778c91de8b2b"
"checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e"
"checksum relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a"
"checksum remove_dir_all 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b5d2f806b0fcdabd98acd380dc8daef485e22bcb7cddc811d1337967f2528cf5"
@@ -1816,7 +1855,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0ceb8ce7a5e520de349e1fa172baeba4a9e8d5ef06c47471863530bc4972ee1e"
"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
"checksum rustls 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17727f4b991294da2c84d75a43c003151ff58072212768800f66c56ee46dca43"
-"checksum safemem 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "725b3bf47ae40b4abcd27b5f0a9540369426a29f7b905649b3e1468e13e22009"
"checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
"checksum schannel 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "acece75e0f987c48863a6c792ec8b7d6c4177d4a027f8ccc72f849794f437016"
"checksum scheduled-thread-pool 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a2ff3fc5223829be817806c6441279c676e454cc7da608faf03b0ccc09d3889"
diff --git a/Cargo.toml b/Cargo.toml
index de307ae..7f616ef 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ rocket_contrib = "0.3.6"
reqwest = "0.8.4"
# multipart/form-data support
-multipart = "0.13.6"
+multipart = "0.14.1"
# A generic serialization/deserialization framework
serde = "1.0.27"
@@ -26,15 +26,15 @@ serde_json = "1.0.9"
# A safe, extensible ORM and Query builder
# If tables need more than 16 columns, add feature "large-tables"
-diesel = { version = "1.1.1", features = ["sqlite", "chrono"] }
-diesel_migrations = {version = "1.1.0", features = ["sqlite"] }
+diesel = { version = "1.1.1", features = ["sqlite", "chrono", "large-tables"] }
+diesel_migrations = { version = "1.1.0", features = ["sqlite"] }
# A generic connection pool
r2d2 = "0.8.2"
r2d2-diesel = "1.0.0"
# Crypto library
-ring = { version = "0.11.0", features = ["rsa_signing"]}
+ring = { version = "0.11.0", features = ["rsa_signing"] }
# UUID generation
uuid = { version = "0.5.1", features = ["v4"] }
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..f288702
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ Copyright (C)
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+.
diff --git a/migrations/2018-01-14-171611_create_tables/down.sql b/migrations/2018-01-14-171611_create_tables/down.sql
index 3d258d2..1025a2c 100644
--- a/migrations/2018-01-14-171611_create_tables/down.sql
+++ b/migrations/2018-01-14-171611_create_tables/down.sql
@@ -4,4 +4,6 @@ DROP TABLE devices;
DROP TABLE ciphers;
+DROP TABLE attachments;
+
DROP TABLE folders;
\ No newline at end of file
diff --git a/migrations/2018-01-14-171611_create_tables/up.sql b/migrations/2018-01-14-171611_create_tables/up.sql
index 6f4d31f..c14ff67 100644
--- a/migrations/2018-01-14-171611_create_tables/up.sql
+++ b/migrations/2018-01-14-171611_create_tables/up.sql
@@ -1,30 +1,32 @@
CREATE TABLE users (
- uuid TEXT NOT NULL PRIMARY KEY,
- created_at DATETIME NOT NULL,
- updated_at DATETIME NOT NULL,
- email TEXT UNIQUE NOT NULL,
- name TEXT NOT NULL,
- password_hash BLOB NOT NULL,
- salt BLOB NOT NULL,
- password_iterations INTEGER NOT NULL,
+ uuid TEXT NOT NULL PRIMARY KEY,
+ created_at DATETIME NOT NULL,
+ updated_at DATETIME NOT NULL,
+ email TEXT NOT NULL UNIQUE,
+ name TEXT NOT NULL,
+ password_hash BLOB NOT NULL,
+ salt BLOB NOT NULL,
+ password_iterations INTEGER NOT NULL,
password_hint TEXT,
- key TEXT NOT NULL,
+ key TEXT NOT NULL,
private_key TEXT,
public_key TEXT,
totp_secret TEXT,
totp_recover TEXT,
- security_stamp TEXT NOT NULL
+ security_stamp TEXT NOT NULL,
+ equivalent_domains TEXT NOT NULL,
+ excluded_globals TEXT NOT NULL
);
CREATE TABLE devices (
- uuid TEXT NOT NULL PRIMARY KEY,
- created_at DATETIME NOT NULL,
- updated_at DATETIME NOT NULL,
- user_uuid TEXT NOT NULL REFERENCES users (uuid),
- name TEXT NOT NULL,
- type INTEGER NOT NULL,
- push_token TEXT UNIQUE,
- refresh_token TEXT UNIQUE NOT NULL
+ uuid TEXT NOT NULL PRIMARY KEY,
+ created_at DATETIME NOT NULL,
+ updated_at DATETIME NOT NULL,
+ user_uuid TEXT NOT NULL REFERENCES users (uuid),
+ name TEXT NOT NULL,
+ type INTEGER NOT NULL,
+ push_token TEXT,
+ refresh_token TEXT NOT NULL
);
CREATE TABLE ciphers (
@@ -36,8 +38,15 @@ CREATE TABLE ciphers (
organization_uuid TEXT,
type INTEGER NOT NULL,
data TEXT NOT NULL,
- favorite BOOLEAN NOT NULL,
- attachments BLOB
+ favorite BOOLEAN NOT NULL
+);
+
+CREATE TABLE attachments (
+ id TEXT NOT NULL PRIMARY KEY,
+ cipher_uuid TEXT NOT NULL REFERENCES ciphers (uuid),
+ file_name TEXT NOT NULL,
+ file_size INTEGER NOT NULL
+
);
CREATE TABLE folders (
diff --git a/src/api/core/accounts.rs b/src/api/core/accounts.rs
index 9a0bd47..7b3f7d6 100644
--- a/src/api/core/accounts.rs
+++ b/src/api/core/accounts.rs
@@ -31,7 +31,7 @@ struct KeysData {
#[post("/accounts/register", data = "")]
fn register(data: Json, conn: DbConn) -> Result<(), BadRequest> {
- if CONFIG.signups_allowed {
+ if !CONFIG.signups_allowed {
err!(format!("Signups not allowed"))
}
println!("DEBUG - {:#?}", data);
@@ -81,7 +81,7 @@ fn post_keys(data: Json, headers: Headers, conn: DbConn) -> Result, headers: Headers, conn: DbConn) -> Result> {
+fn post_password(data: Json, headers: Headers, conn: DbConn) -> Result<(), BadRequest> {
let key = data["key"].as_str().unwrap();
let password_hash = data["masterPasswordHash"].as_str().unwrap();
let new_password_hash = data["newMasterPasswordHash"].as_str().unwrap();
@@ -94,14 +94,13 @@ fn post_password(data: Json, headers: Headers, conn: DbConn) -> Result, headers: Headers, conn: DbConn) -> Result> {
+fn post_sstamp(data: Json, headers: Headers, conn: DbConn) -> Result<(), BadRequest> {
let password_hash = data["masterPasswordHash"].as_str().unwrap();
let mut user = headers.user;
@@ -111,14 +110,15 @@ fn post_sstamp(data: Json, headers: Headers, conn: DbConn) -> Result, headers: Headers, conn: DbConn) -> Result> {
- println!("{:#?}", data);
+fn post_email(data: Json, headers: Headers, conn: DbConn) -> Result<(), BadRequest> {
let password_hash = data["masterPasswordHash"].as_str().unwrap();
+ let new_email = data["newEmail"].as_str().unwrap();
let mut user = headers.user;
@@ -126,11 +126,18 @@ fn post_email(data: Json, headers: Headers, conn: DbConn) -> Result, headers: Headers, conn: DbConn) -> Result> {
+fn delete_account(data: Json, headers: Headers, conn: DbConn) -> Result<(), BadRequest> {
let password_hash = data["masterPasswordHash"].as_str().unwrap();
let mut user = headers.user;
@@ -139,6 +146,10 @@ fn delete_account(data: Json, headers: Headers, conn: DbConn) -> Result Result> {
let user = headers.user;
@@ -22,7 +30,7 @@ fn sync(headers: Headers, conn: DbConn) -> Result> {
let folders_json: Vec = folders.iter().map(|c| c.to_json()).collect();
let ciphers = Cipher::find_by_user(&user.uuid, &conn);
- let ciphers_json: Vec = ciphers.iter().map(|c| c.to_json()).collect();
+ let ciphers_json: Vec = ciphers.iter().map(|c| c.to_json(&conn)).collect();
Ok(Json(json!({
"Profile": user.to_json(),
@@ -42,7 +50,7 @@ fn sync(headers: Headers, conn: DbConn) -> Result> {
fn get_ciphers(headers: Headers, conn: DbConn) -> Result> {
let ciphers = Cipher::find_by_user(&headers.user.uuid, &conn);
- let ciphers_json: Vec = ciphers.iter().map(|c| c.to_json()).collect();
+ let ciphers_json: Vec = ciphers.iter().map(|c| c.to_json(&conn)).collect();
Ok(Json(json!({
"Data": ciphers_json,
@@ -58,10 +66,10 @@ fn get_cipher(uuid: String, headers: Headers, conn: DbConn) -> Result, headers: Headers, conn: DbConn) -> Resul
data.favorite.unwrap_or(false));
if let Some(ref folder_id) = data.folderId {
- // TODO: Validate folder is owned by user
+ match Folder::find_by_uuid(folder_id, &conn) {
+ Some(folder) => {
+ if folder.user_uuid != headers.user.uuid {
+ err!("Folder is not owned by user")
+ }
+ }
+ None => err!("Folder doesn't exist")
+ }
+
cipher.folder_uuid = Some(folder_id.clone());
}
@@ -107,7 +123,7 @@ fn post_ciphers(data: Json, headers: Headers, conn: DbConn) -> Resul
cipher.save(&conn);
- Ok(Json(cipher.to_json()))
+ Ok(Json(cipher.to_json(&conn)))
}
fn value_from_data(data: &CipherData) -> Result {
@@ -180,48 +196,77 @@ fn post_ciphers_import(data: Json, headers: Headers, conn: DbConn) -> Res
#[post("/ciphers//attachment", format = "multipart/form-data", data = "")]
fn post_attachment(uuid: String, data: Data, content_type: &ContentType, headers: Headers, conn: DbConn) -> Result> {
- // TODO: Check if cipher exists
+ let cipher = match Cipher::find_by_uuid(&uuid, &conn) {
+ Some(cipher) => cipher,
+ None => err!("Cipher doesn't exist")
+ };
- let mut params = content_type.params();
- let boundary_pair = params.next().expect("No boundary provided"); // ("boundary", "----WebKitFormBoundary...")
- let boundary = boundary_pair.1;
-
- use data_encoding::BASE64URL;
- use crypto;
- use CONFIG;
-
- // TODO: Maybe use the same format as the official server?
- let attachment_id = BASE64URL.encode(&crypto::get_random_64());
- let path = format!("{}/{}/{}", CONFIG.attachments_folder,
- headers.user.uuid, attachment_id);
- println!("Path {:#?}", path);
-
- let mut mp = Multipart::with_body(data.open(), boundary);
- match mp.save().with_dir(path).into_entries() {
- Some(entries) => {
- println!("Entries {:#?}", entries);
-
- let saved_file = &entries.files["data"][0]; // Only one file at a time
- let file_name = &saved_file.filename; // This is provided by the client, don't trust it
- let file_size = &saved_file.size;
- }
- None => err!("No data entries")
+ if cipher.user_uuid != headers.user.uuid {
+ err!("Cipher is not owned by user")
}
- err!("Not implemented")
+ let mut params = content_type.params();
+ let boundary_pair = params.next().expect("No boundary provided");
+ let boundary = boundary_pair.1;
+
+ let base_path = Path::new(&CONFIG.attachments_folder).join(&cipher.uuid);
+
+ Multipart::with_body(data.open(), boundary).foreach_entry(|mut field| {
+ let name = field.headers.filename.unwrap(); // This is provided by the client, don't trust it
+
+ let file_name = HEXLOWER.encode(&crypto::get_random(vec![0; 10]));
+ let path = base_path.join(&file_name);
+
+ let size = match field.data.save()
+ .memory_threshold(0)
+ .size_limit(None)
+ .with_path(path) {
+ SaveResult::Full(SavedData::File(path, size)) => size as i32,
+ _ => return
+ };
+
+ let attachment = Attachment::new(file_name, cipher.uuid.clone(), name, size);
+ println!("Attachment: {:#?}", attachment);
+ attachment.save(&conn);
+ });
+
+ Ok(Json(cipher.to_json(&conn)))
+}
+
+#[post("/ciphers//attachment//delete", data = "")]
+fn delete_attachment_post(uuid: String, attachment_id: String, data: Json, headers: Headers, conn: DbConn) -> Result<(), BadRequest> {
+ // Data contains a json object with the id, but we don't need it
+ delete_attachment(uuid, attachment_id, headers, conn)
}
#[delete("/ciphers//attachment/")]
-fn delete_attachment(uuid: String, attachment_id: String, headers: Headers, conn: DbConn) -> Result> {
- if uuid != headers.user.uuid {
- err!("Permission denied")
+fn delete_attachment(uuid: String, attachment_id: String, headers: Headers, conn: DbConn) -> Result<(), BadRequest> {
+ let attachment = match Attachment::find_by_id(&attachment_id, &conn) {
+ Some(attachment) => attachment,
+ None => err!("Attachment doesn't exist")
+ };
+
+ if attachment.cipher_uuid != uuid {
+ err!("Attachment from other cipher")
+ }
+
+ let cipher = match Cipher::find_by_uuid(&uuid, &conn) {
+ Some(cipher) => cipher,
+ None => err!("Cipher doesn't exist")
+ };
+
+ if cipher.user_uuid != headers.user.uuid {
+ err!("Cipher is not owned by user")
}
// Delete file
+ let file = attachment.get_file_path();
+ util::delete_file(&file);
// Delete entry in cipher
+ attachment.delete(&conn);
- err!("Not implemented")
+ Ok(())
}
#[post("/ciphers/")]
diff --git a/src/api/core/mod.rs b/src/api/core/mod.rs
index 9a09b25..b0609dd 100644
--- a/src/api/core/mod.rs
+++ b/src/api/core/mod.rs
@@ -26,6 +26,7 @@ pub fn routes() -> Vec {
post_ciphers,
post_ciphers_import,
post_attachment,
+ delete_attachment_post,
delete_attachment,
post_cipher,
put_cipher,
@@ -89,12 +90,27 @@ fn clear_device_token(uuid: String) -> Result> { err!("No
fn put_device_token(uuid: String) -> Result> { err!("Not implemented") }
+#[derive(Deserialize, Debug)]
+#[allow(non_snake_case)]
+struct EquivDomainData {
+ ExcludedGlobalEquivalentDomains: Vec,
+ EquivalentDomains: Vec>,
+}
+
#[get("/settings/domains")]
fn get_eq_domains() -> Result> {
err!("Not implemented")
}
-#[post("/settings/domains")]
-fn post_eq_domains() -> Result> {
+#[post("/settings/domains", data = "")]
+fn post_eq_domains(data: Json, headers: Headers, conn: DbConn) -> Result> {
+ let excluded_globals = &data.ExcludedGlobalEquivalentDomains;
+ let equivalent_domains = &data.EquivalentDomains;
+
+ let mut user = headers.user;
+
+
+ //BODY. "{\"ExcludedGlobalEquivalentDomains\":[2],\"EquivalentDomains\":[[\"uoc.edu\",\"uoc.es\"]]}"
+
err!("Not implemented")
}
diff --git a/src/api/core/two_factor.rs b/src/api/core/two_factor.rs
index 14f2ae2..641d2c7 100644
--- a/src/api/core/two_factor.rs
+++ b/src/api/core/two_factor.rs
@@ -20,10 +20,10 @@ fn get_twofactor(headers: Headers) -> Result> {
Value::Null
} else {
json!([{
- "Enabled": true,
- "Type": 0,
- "Object": "twoFactorProvider"
- }])
+ "Enabled": true,
+ "Type": 0,
+ "Object": "twoFactorProvider"
+ }])
};
Ok(Json(json!({
diff --git a/src/api/web.rs b/src/api/web.rs
index b869067..f200774 100644
--- a/src/api/web.rs
+++ b/src/api/web.rs
@@ -16,21 +16,26 @@ pub fn routes() -> Vec {
// TODO: Might want to use in memory cache: https://github.com/hgzimmerman/rocket-file-cache
#[get("/")]
fn index() -> io::Result {
- NamedFile::open(Path::new(&CONFIG.web_vault_folder).join("index.html"))
+ NamedFile::open(
+ Path::new(&CONFIG.web_vault_folder)
+ .join("index.html"))
}
-#[get("/")] // Only match this if the other routes don't match
+#[get("/", rank = 1)] // Only match this if the other routes don't match
fn files(p: PathBuf) -> io::Result {
- NamedFile::open(Path::new(&CONFIG.web_vault_folder).join(p))
+ NamedFile::open(
+ Path::new(&CONFIG.web_vault_folder)
+ .join(p))
}
+
#[get("/attachments//")]
-fn attachments(uuid: String, file: PathBuf, headers: Headers) -> io::Result {
- if uuid != headers.user.uuid {
- return Err(io::Error::new(io::ErrorKind::PermissionDenied, "Permission denied"));
- }
-
- NamedFile::open(Path::new(&CONFIG.attachments_folder).join(file))
+fn attachments(uuid: String, file: PathBuf) -> io::Result {
+ NamedFile::open(
+ Path::new(&CONFIG.attachments_folder)
+ .join(uuid)
+ .join(file)
+ )
}
diff --git a/src/auth.rs b/src/auth.rs
index 7e780c3..5a8172c 100644
--- a/src/auth.rs
+++ b/src/auth.rs
@@ -96,7 +96,7 @@ use db::DbConn;
use db::models::{User, Device};
pub struct Headers {
- pub device_type: i32,
+ pub device_type: Option,
pub device: Device,
pub user: User,
}
@@ -110,8 +110,8 @@ impl<'a, 'r> FromRequest<'a, 'r> for Headers {
/// Get device type
let device_type = match headers.get_one("Device-Type")
.map(|s| s.parse::()) {
- Some(Ok(dt)) => dt,
- _ => return err_handler!("Device-Type is invalid or missing")
+ Some(Ok(dt)) => Some(dt),// dt,
+ _ => None // return err_handler!("Device-Type is invalid or missing")
};
/// Get access_token
diff --git a/src/bin/proxy.rs b/src/bin/proxy.rs
index 1c03fa6..572a5f1 100644
--- a/src/bin/proxy.rs
+++ b/src/bin/proxy.rs
@@ -21,7 +21,6 @@ use reqwest::header::{self, Headers};
** These routes are here to avoid showing errors in the console,
** redirect the body data to the fairing and show the web vault.
**/
-
#[get("/")]
fn index() -> io::Result {
NamedFile::open(Path::new("web-vault").join("index.html"))
diff --git a/src/db/models/attachment.rs b/src/db/models/attachment.rs
new file mode 100644
index 0000000..2591d80
--- /dev/null
+++ b/src/db/models/attachment.rs
@@ -0,0 +1,93 @@
+use serde_json::Value as JsonValue;
+
+use super::Cipher;
+use CONFIG;
+
+#[derive(Debug, Identifiable, Queryable, Insertable, Associations)]
+#[table_name = "attachments"]
+#[belongs_to(Cipher, foreign_key = "cipher_uuid")]
+#[primary_key(id)]
+pub struct Attachment {
+ pub id: String,
+ pub cipher_uuid: String,
+ pub file_name: String,
+ pub file_size: i32,
+}
+
+/// Local methods
+impl Attachment {
+ pub fn new(id: String, cipher_uuid: String, file_name: String, file_size: i32) -> Self {
+ Self {
+ id,
+ cipher_uuid,
+ file_name,
+ file_size,
+ }
+ }
+
+ pub fn get_file_path(&self) -> String {
+ format!("{}/{}/{}", CONFIG.attachments_folder, self.cipher_uuid, self.id)
+ }
+
+ pub fn to_json(&self) -> JsonValue {
+ use util::get_display_size;
+ use CONFIG;
+
+ // TODO: Change all references to localhost (maybe put it in .env?)
+ let host = "http://localhost:8000";
+
+ let web_path = format!("{}/attachments/{}/{}", host, self.cipher_uuid, self.id);
+
+ let file_path = self.get_file_path();
+ let display_size = get_display_size(self.file_size);
+
+ json!({
+ "Id": self.id,
+ "Url": web_path,
+ "FileName": self.file_name,
+ "Size": self.file_size.to_string(),
+ "SizeName": display_size,
+ "Object": "attachment"
+ })
+ }
+}
+
+use diesel;
+use diesel::prelude::*;
+use db::DbConn;
+use db::schema::attachments;
+
+/// Database methods
+impl Attachment {
+ pub fn save(&self, conn: &DbConn) -> bool {
+ // TODO: Update modified date
+
+ match diesel::replace_into(attachments::table)
+ .values(self)
+ .execute(&**conn) {
+ Ok(1) => true, // One row inserted
+ _ => false,
+ }
+ }
+
+ pub fn delete(self, conn: &DbConn) -> bool {
+ match diesel::delete(attachments::table.filter(
+ attachments::id.eq(self.id)))
+ .execute(&**conn) {
+ Ok(1) => true, // One row deleted
+ _ => false,
+ }
+ }
+
+ pub fn find_by_id(id: &str, conn: &DbConn) -> Option {
+ attachments::table
+ .filter(attachments::id.eq(id))
+ .first::(&**conn).ok()
+ }
+
+ pub fn find_by_cipher(cipher_uuid: &str, conn: &DbConn) -> Vec {
+ attachments::table
+ .filter(attachments::cipher_uuid.eq(cipher_uuid))
+ .load::(&**conn).expect("Error loading attachments")
+ }
+}
diff --git a/src/db/models/cipher.rs b/src/db/models/cipher.rs
index a747ec6..0fcb24f 100644
--- a/src/db/models/cipher.rs
+++ b/src/db/models/cipher.rs
@@ -4,8 +4,11 @@ use serde_json::Value as JsonValue;
use uuid::Uuid;
-#[derive(Queryable, Insertable, Identifiable)]
+use super::User;
+
+#[derive(Debug, Identifiable, Queryable, Insertable, Associations)]
#[table_name = "ciphers"]
+#[belongs_to(User, foreign_key = "user_uuid")]
#[primary_key(uuid)]
pub struct Cipher {
pub uuid: String,
@@ -24,15 +27,14 @@ pub struct Cipher {
pub data: String,
pub favorite: bool,
- pub attachments: Option>,
}
/// Local methods
impl Cipher {
- pub fn new(user_uuid: String, type_: i32, favorite: bool) -> Cipher {
+ pub fn new(user_uuid: String, type_: i32, favorite: bool) -> Self {
let now = Utc::now().naive_utc();
- Cipher {
+ Self {
uuid: Uuid::new_v4().to_string(),
created_at: now,
updated_at: now,
@@ -45,30 +47,8 @@ impl Cipher {
favorite,
data: String::new(),
- attachments: None,
}
}
-
- pub fn to_json(&self) -> JsonValue {
- use serde_json;
- use util::format_date;
-
- let data: JsonValue = serde_json::from_str(&self.data).unwrap();
-
- json!({
- "Id": self.uuid,
- "Type": self.type_,
- "RevisionDate": format_date(&self.updated_at),
- "FolderId": self.folder_uuid,
- "Favorite": self.favorite,
- "OrganizationId": "",
- "Attachments": self.attachments,
- "OrganizationUseTotp": false,
- "Data": data,
- "Object": "cipher",
- "Edit": true,
- })
- }
}
use diesel;
@@ -78,6 +58,31 @@ use db::schema::ciphers;
/// Database methods
impl Cipher {
+ pub fn to_json(&self, conn: &DbConn) -> JsonValue {
+ use serde_json;
+ use util::format_date;
+ use super::Attachment;
+
+ let data_json: JsonValue = serde_json::from_str(&self.data).unwrap();
+
+ let attachments = Attachment::find_by_cipher(&self.uuid, conn);
+ let attachments_json: Vec = attachments.iter().map(|c| c.to_json()).collect();
+
+ json!({
+ "Id": self.uuid,
+ "Type": self.type_,
+ "RevisionDate": format_date(&self.updated_at),
+ "FolderId": self.folder_uuid,
+ "Favorite": self.favorite,
+ "OrganizationId": "",
+ "Attachments": attachments_json,
+ "OrganizationUseTotp": false,
+ "Data": data_json,
+ "Object": "cipher",
+ "Edit": true,
+ })
+ }
+
pub fn save(&self, conn: &DbConn) -> bool {
// TODO: Update modified date
@@ -98,15 +103,15 @@ impl Cipher {
}
}
- pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option {
+ pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option {
ciphers::table
.filter(ciphers::uuid.eq(uuid))
- .first::(&**conn).ok()
+ .first::(&**conn).ok()
}
- pub fn find_by_user(user_uuid: &str, conn: &DbConn) -> Vec {
+ pub fn find_by_user(user_uuid: &str, conn: &DbConn) -> Vec {
ciphers::table
.filter(ciphers::user_uuid.eq(user_uuid))
- .load::(&**conn).expect("Error loading ciphers")
+ .load::(&**conn).expect("Error loading ciphers")
}
}
diff --git a/src/db/models/device.rs b/src/db/models/device.rs
index 59d9ca0..6bb4d7a 100644
--- a/src/db/models/device.rs
+++ b/src/db/models/device.rs
@@ -4,8 +4,11 @@ use serde_json::Value as JsonValue;
use uuid::Uuid;
-#[derive(Queryable, Insertable, Identifiable)]
+use super::User;
+
+#[derive(Debug, Identifiable, Queryable, Insertable, Associations)]
#[table_name = "devices"]
+#[belongs_to(User, foreign_key = "user_uuid")]
#[primary_key(uuid)]
pub struct Device {
pub uuid: String,
@@ -24,10 +27,10 @@ pub struct Device {
/// Local methods
impl Device {
- pub fn new(uuid: String, user_uuid: String, name: String, type_: i32) -> Device {
+ pub fn new(uuid: String, user_uuid: String, name: String, type_: i32) -> Self {
let now = Utc::now().naive_utc();
- Device {
+ Self {
uuid,
created_at: now,
updated_at: now,
@@ -103,15 +106,15 @@ impl Device {
}
}
- pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option {
+ pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option {
devices::table
.filter(devices::uuid.eq(uuid))
- .first::(&**conn).ok()
+ .first::(&**conn).ok()
}
- pub fn find_by_refresh_token(refresh_token: &str, conn: &DbConn) -> Option {
+ pub fn find_by_refresh_token(refresh_token: &str, conn: &DbConn) -> Option {
devices::table
.filter(devices::refresh_token.eq(refresh_token))
- .first::(&**conn).ok()
+ .first::(&**conn).ok()
}
}
diff --git a/src/db/models/folder.rs b/src/db/models/folder.rs
index a6dff75..da4d0bb 100644
--- a/src/db/models/folder.rs
+++ b/src/db/models/folder.rs
@@ -4,8 +4,11 @@ use serde_json::Value as JsonValue;
use uuid::Uuid;
-#[derive(Queryable, Insertable, Identifiable)]
+use super::User;
+
+#[derive(Debug, Identifiable, Queryable, Insertable, Associations)]
#[table_name = "folders"]
+#[belongs_to(User, foreign_key = "user_uuid")]
#[primary_key(uuid)]
pub struct Folder {
pub uuid: String,
@@ -17,10 +20,10 @@ pub struct Folder {
/// Local methods
impl Folder {
- pub fn new(user_uuid: String, name: String) -> Folder {
+ pub fn new(user_uuid: String, name: String) -> Self {
let now = Utc::now().naive_utc();
- Folder {
+ Self {
uuid: Uuid::new_v4().to_string(),
created_at: now,
updated_at: now,
@@ -69,15 +72,15 @@ impl Folder {
}
}
- pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option {
+ pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option {
folders::table
.filter(folders::uuid.eq(uuid))
- .first::(&**conn).ok()
+ .first::(&**conn).ok()
}
- pub fn find_by_user(user_uuid: &str, conn: &DbConn) -> Vec {
+ pub fn find_by_user(user_uuid: &str, conn: &DbConn) -> Vec {
folders::table
.filter(folders::user_uuid.eq(user_uuid))
- .load::(&**conn).expect("Error loading folders")
+ .load::(&**conn).expect("Error loading folders")
}
}
diff --git a/src/db/models/mod.rs b/src/db/models/mod.rs
index 77fbcef..ed586ad 100644
--- a/src/db/models/mod.rs
+++ b/src/db/models/mod.rs
@@ -1,8 +1,10 @@
+mod attachment;
mod cipher;
mod device;
mod folder;
mod user;
+pub use self::attachment::Attachment;
pub use self::cipher::Cipher;
pub use self::device::Device;
pub use self::folder::Folder;
diff --git a/src/db/models/user.rs b/src/db/models/user.rs
index a75c65c..77e0f42 100644
--- a/src/db/models/user.rs
+++ b/src/db/models/user.rs
@@ -6,7 +6,7 @@ use uuid::Uuid;
use CONFIG;
-#[derive(Queryable, Insertable, Identifiable)]
+#[derive(Debug, Identifiable, Queryable, Insertable)]
#[table_name = "users"]
#[primary_key(uuid)]
pub struct User {
@@ -28,11 +28,14 @@ pub struct User {
pub totp_secret: Option,
pub totp_recover: Option,
pub security_stamp: String,
+
+ pub equivalent_domains: String,
+ pub excluded_globals: String,
}
/// Local methods
impl User {
- pub fn new(mail: String, key: String, password: String) -> User {
+ pub fn new(mail: String, key: String, password: String) -> Self {
let now = Utc::now().naive_utc();
let email = mail.to_lowercase();
@@ -42,7 +45,7 @@ impl User {
let salt = crypto::get_random_64();
let password_hash = crypto::hash_password(password.as_bytes(), &salt, iterations as u32);
- User {
+ Self {
uuid: Uuid::new_v4().to_string(),
created_at: now,
updated_at: now,
@@ -61,6 +64,9 @@ impl User {
public_key: None,
totp_secret: None,
totp_recover: None,
+
+ equivalent_domains: "[]".to_string(),
+ excluded_globals: "[]".to_string(),
}
}
@@ -144,16 +150,16 @@ impl User {
}
}
- pub fn find_by_mail(mail: &str, conn: &DbConn) -> Option {
+ pub fn find_by_mail(mail: &str, conn: &DbConn) -> Option {
let lower_mail = mail.to_lowercase();
users::table
.filter(users::email.eq(lower_mail))
- .first::(&**conn).ok()
+ .first::(&**conn).ok()
}
- pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option {
+ pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option {
users::table
.filter(users::uuid.eq(uuid))
- .first::(&**conn).ok()
+ .first::(&**conn).ok()
}
}
diff --git a/src/db/schema.rs b/src/db/schema.rs
index 82028cd..9f0ca0f 100644
--- a/src/db/schema.rs
+++ b/src/db/schema.rs
@@ -1,3 +1,12 @@
+table! {
+ attachments (id) {
+ id -> Text,
+ cipher_uuid -> Text,
+ file_name -> Text,
+ file_size -> Integer,
+ }
+}
+
table! {
ciphers (uuid) {
uuid -> Text,
@@ -10,7 +19,6 @@ table! {
type_ -> Integer,
data -> Text,
favorite -> Bool,
- attachments -> Nullable,
}
}
@@ -55,15 +63,19 @@ table! {
totp_secret -> Nullable,
totp_recover -> Nullable,
security_stamp -> Text,
+ equivalent_domains -> Text,
+ excluded_globals -> Text,
}
}
+joinable!(attachments -> ciphers (cipher_uuid));
joinable!(ciphers -> folders (folder_uuid));
joinable!(ciphers -> users (user_uuid));
joinable!(devices -> users (user_uuid));
joinable!(folders -> users (user_uuid));
allow_tables_to_appear_in_same_query!(
+ attachments,
ciphers,
devices,
folders,
diff --git a/src/util.rs b/src/util.rs
index e9f61ac..66b036c 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -30,7 +30,7 @@ macro_rules! err_handler {
use std::path::Path;
use std::io::Read;
-use std::fs::File;
+use std::fs::{self, File};
pub fn file_exists(path: &str) -> bool {
Path::new(path).exists()
@@ -48,6 +48,31 @@ pub fn read_file(path: &str) -> Result, String> {
Ok(contents)
}
+pub fn delete_file(path: &str) -> bool {
+ fs::remove_file(path).is_ok()
+}
+
+
+const UNITS: [&'static str; 6] = ["bytes", "KB", "MB", "GB", "TB", "PB"];
+
+pub fn get_display_size(size: i32) -> String {
+ let mut size = size as f64;
+ let mut unit_counter = 0;
+
+ loop {
+ if size > 1024. {
+ size /= 1024.;
+ unit_counter += 1;
+ } else {
+ break;
+ }
+ };
+
+ // Round to two decimals
+ size = (size * 100.).round() / 100.;
+ format!("{} {}", size, UNITS[unit_counter])
+}
+
///
/// String util methods