Merge pull request #1087 from jjlin/org-creation-users

Add support for restricting org creation to certain users
Merge pull request #1083 from jjlin/global-domains
2025-09-10 10:45:57 +03:00 · 2020-08-08 16:20:15 +02:00 · 2020-08-08 16:19:30 +02:00 · 2020-08-07 20:39:17 +02:00 · 2020-08-07 10:15:15 -07:00 · 2020-08-06 12:13:40 -07:00
15 changed files with 311 additions and 159 deletions
--- a/.env.template
+++ b/.env.template
@@ -44,6 +44,10 @@
 ## Enable extended logging, which shows timestamps and targets in the logs
 # EXTENDED_LOGGING=true

+## Timestamp format used in extended logging.
+## Format specifiers: https://docs.rs/chrono/latest/chrono/format/strftime
+# LOG_TIMESTAMP_FORMAT="%Y-%m-%d %H:%M:%S.%3f"
+
 ## Logging to file
 ## It's recommended to also set 'ROCKET_CLI_COLORS=off'
 # LOG_FILE=/path/to/log
@@ -114,6 +118,14 @@
 ## even if SIGNUPS_ALLOWED is set to false
 # SIGNUPS_DOMAINS_WHITELIST=example.com,example.net,example.org

+## Controls which users can create new orgs.
+## Blank or 'all' means all users can create orgs (this is the default):
+# ORG_CREATION_USERS=
+## 'none' means no users can create orgs:
+# ORG_CREATION_USERS=none
+## A comma-separated list means only those users can create orgs:
+# ORG_CREATION_USERS=admin1@example.com,admin2@example.com
+
 ## Token for the admin interface, preferably use a long random string
 ## One option is to use 'openssl rand -base64 48'
 ## If not set, the admin panel is disabled
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -144,7 +144,7 @@ dependencies = [
 "jsonwebtoken",
 "lettre",
 "libsqlite3-sys",
- "log 0.4.8",
+ "log 0.4.11",
 "multipart",
 "native-tls",
 "num-derive",
@@ -415,9 +415,9 @@ version = "0.3.0"
 source = "git+https://github.com/SergioBenitez/Devise.git?rev=e58b3ac9a#e58b3ac9afc3b6ff10a8aaf02a3e768a8f530089"
 dependencies = [
 "bitflags",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
- "syn 1.0.34",
+ "syn 1.0.35",
 ]

 [[package]]
@@ -443,9 +443,9 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
- "syn 1.0.34",
+ "syn 1.0.35",
 ]

 [[package]]
@@ -534,7 +534,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c9a4820f0ccc8a7afd67c39a0f1a0f4b07ca1725164271a64939d7aeb9af065"
 dependencies = [
- "log 0.4.8",
+ "log 0.4.11",
 "syslog",
 ]

@@ -677,9 +677,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
 dependencies = [
 "proc-macro-hack",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
- "syn 1.0.34",
+ "syn 1.0.35",
 ]

 [[package]]
@@ -780,11 +780,11 @@ dependencies = [

 [[package]]
 name = "handlebars"
-version = "3.2.1"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8ae96a0e0dacf151557ccba95a7a80889f8e74a784484377739628fcdb3996"
+checksum = "86dbc8a0746b08f363d2e00da48e6c9ceb75c198ac692d2715fcbb5bee74c87d"
 dependencies = [
- "log 0.4.8",
+ "log 0.4.11",
 "pest",
 "pest_derive",
 "quick-error",
@@ -793,6 +793,15 @@ dependencies = [
 "walkdir",
 ]

+[[package]]
+name = "hashbrown"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb"
+dependencies = [
+ "autocfg 1.0.0",
+]
+
 [[package]]
 name = "heck"
 version = "0.3.1"
@@ -849,7 +858,7 @@ version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c213fa6a618dc1da552f54f85cba74b05d8e883c92ec4e89067736938084c26e"
 dependencies = [
- "log 0.4.8",
+ "log 0.4.11",
 "mac",
 "markup5ever",
 "proc-macro2 0.4.30",
@@ -963,7 +972,7 @@ dependencies = [
 "http",
 "httparse",
 "language-tags",
- "log 0.4.8",
+ "log 0.4.11",
 "mime 0.3.16",
 "percent-encoding 2.1.0",
 "time 0.1.43",
@@ -994,11 +1003,12 @@ dependencies = [

 [[package]]
 name = "indexmap"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe"
+checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7"
 dependencies = [
 "autocfg 1.0.0",
+ "hashbrown",
 ]

 [[package]]
@@ -1044,9 +1054,9 @@ checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"

 [[package]]
 name = "js-sys"
-version = "0.3.41"
+version = "0.3.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4b9172132a62451e56142bff9afc91c8e4a4500aa5b847da36815b63bfda916"
+checksum = "52732a3d3ad72c58ad2dc70624f9c17b46ecd0943b9a4f1ee37c4c18c5d983e2"
 dependencies = [
 "wasm-bindgen",
 ]
@@ -1131,15 +1141,15 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.72"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701"
+checksum = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9"

 [[package]]
 name = "libsqlite3-sys"
-version = "0.17.3"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56d90181c2904c287e5390186be820e5ef311a3c62edebb7d6ca3d6a48ce041d"
+checksum = "1e704a02bcaecd4a08b93a23f6be59d0bd79cd161e0963e9499165a0a35df7bd"
 dependencies = [
 "cc",
 "pkg-config",
@@ -1170,14 +1180,14 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 dependencies = [
- "log 0.4.8",
+ "log 0.4.11",
 ]

 [[package]]
 name = "log"
-version = "0.4.8"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
 "cfg-if",
 ]
@@ -1250,9 +1260,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c"
 dependencies = [
 "migrations_internals",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
- "syn 1.0.34",
+ "syn 1.0.35",
 ]

 [[package]]
@@ -1301,7 +1311,7 @@ dependencies = [
 "iovec",
 "kernel32-sys",
 "libc",
- "log 0.4.8",
+ "log 0.4.11",
 "miow",
 "net2",
 "slab",
@@ -1315,7 +1325,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
 dependencies = [
 "lazycell",
- "log 0.4.8",
+ "log 0.4.11",
 "mio",
 "slab",
 ]
@@ -1340,7 +1350,7 @@ checksum = "8209c33c951f07387a8497841122fc6f712165e3f9bda3e6be4645b58188f676"
 dependencies = [
 "buf_redux",
 "httparse",
- "log 0.4.8",
+ "log 0.4.11",
 "mime 0.3.16",
 "mime_guess",
 "quick-error",
@@ -1368,7 +1378,7 @@ checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d"
 dependencies = [
 "lazy_static",
 "libc",
- "log 0.4.8",
+ "log 0.4.11",
 "openssl",
 "openssl-probe",
 "openssl-sys",
@@ -1447,9 +1457,9 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c8b15b261814f992e33760b1fca9fe8b693d8a65299f20c9901688636cfb746"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
- "syn 1.0.34",
+ "syn 1.0.35",
 ]

 [[package]]
@@ -1683,9 +1693,9 @@ checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
 dependencies = [
 "pest",
 "pest_meta",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
- "syn 1.0.34",
+ "syn 1.0.35",
 ]

 [[package]]
@@ -1752,9 +1762,9 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
- "syn 1.0.34",
+ "syn 1.0.35",
 ]

 [[package]]
@@ -1803,9 +1813,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880"
 dependencies = [
 "proc-macro-error-attr",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
- "syn 1.0.34",
+ "syn 1.0.35",
 "version_check 0.9.2",
 ]

@@ -1815,9 +1825,9 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
- "syn 1.0.34",
+ "syn 1.0.35",
 "syn-mid",
 "version_check 0.9.2",
 ]
@@ -1845,9 +1855,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
+checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
 dependencies = [
 "unicode-xid 0.2.1",
 ]
@@ -1873,7 +1883,7 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 ]

 [[package]]
@@ -1888,7 +1898,7 @@ version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f"
 dependencies = [
- "log 0.4.8",
+ "log 0.4.11",
 "parking_lot 0.11.0",
 "scheduled-thread-pool",
 ]
@@ -2112,7 +2122,7 @@ dependencies = [
 "hyper-tls",
 "js-sys",
 "lazy_static",
- "log 0.4.8",
+ "log 0.4.11",
 "mime 0.3.16",
 "mime_guess",
 "native-tls",
@@ -2172,7 +2182,7 @@ source = "git+https://github.com/SergioBenitez/Rocket?rev=1010f6a2a88fac899dec0c
 dependencies = [
 "atty",
 "binascii",
- "log 0.4.8",
+ "log 0.4.11",
 "memchr",
 "num_cpus",
 "pear",
@@ -2204,7 +2214,7 @@ name = "rocket_contrib"
 version = "0.5.0-dev"
 source = "git+https://github.com/SergioBenitez/Rocket?rev=1010f6a2a88fac899dec0cd2f642156908038a53#1010f6a2a88fac899dec0cd2f642156908038a53"
 dependencies = [
- "log 0.4.8",
+ "log 0.4.11",
 "notify",
 "rocket",
 "serde",
@@ -2257,7 +2267,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e"
 dependencies = [
 "base64 0.10.1",
- "log 0.4.8",
+ "log 0.4.11",
 "ring",
 "sct",
 "webpki",
@@ -2372,9 +2382,9 @@ version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
- "syn 1.0.34",
+ "syn 1.0.35",
 ]

 [[package]]
@@ -2446,9 +2456,9 @@ dependencies = [

 [[package]]
 name = "simple_asn1"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b25ecba7165254f0c97d6c22a64b1122a03634b18d20a34daf21e18f892e618"
+checksum = "692ca13de57ce0613a363c8c2f1de925adebc81b04c923ac60c5488bb44abe4b"
 dependencies = [
 "chrono",
 "num-bigint",
@@ -2557,11 +2567,11 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
 "serde",
 "serde_derive",
- "syn 1.0.34",
+ "syn 1.0.35",
 ]

 [[package]]
@@ -2571,13 +2581,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
 dependencies = [
 "base-x",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
 "serde",
 "serde_derive",
 "serde_json",
 "sha1",
- "syn 1.0.34",
+ "syn 1.0.35",
 ]

 [[package]]
@@ -2609,7 +2619,7 @@ checksum = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6"
 dependencies = [
 "phf_generator",
 "phf_shared",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
 "string_cache_shared",
 ]
@@ -2645,9 +2655,9 @@ checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118"
 dependencies = [
 "heck",
 "proc-macro-error",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
- "syn 1.0.34",
+ "syn 1.0.35",
 ]

 [[package]]
@@ -2675,11 +2685,11 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.34"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cae2873c940d92e697597c5eee105fb570cd5689c695806f672883653349b"
+checksum = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
 "unicode-xid 0.2.1",
 ]
@@ -2690,9 +2700,9 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
- "syn 1.0.34",
+ "syn 1.0.35",
 ]

 [[package]]
@@ -2703,7 +2713,7 @@ checksum = "a0641142b4081d3d44beffa4eefd7346a228cdf91ed70186db2ca2cef762d327"
 dependencies = [
 "error-chain",
 "libc",
- "log 0.4.8",
+ "log 0.4.11",
 "time 0.1.43",
 ]

@@ -2814,10 +2824,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa"
 dependencies = [
 "proc-macro-hack",
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
 "standback",
- "syn 1.0.34",
+ "syn 1.0.35",
 ]

 [[package]]
@@ -2828,9 +2838,9 @@ checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"

 [[package]]
 name = "tokio"
-version = "0.2.21"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d099fa27b9702bed751524694adbe393e18b36b204da91eb1cbbbbb4a5ee2d58"
+checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd"
 dependencies = [
 "bytes 0.5.6",
 "fnv",
@@ -2863,7 +2873,7 @@ dependencies = [
 "bytes 0.5.6",
 "futures-core",
 "futures-sink",
- "log 0.4.8",
+ "log 0.4.11",
 "pin-project-lite",
 "tokio",
 ]
@@ -2885,12 +2895,12 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"

 [[package]]
 name = "tracing"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2e2a2de6b0d5cbb13fc21193a2296888eaab62b6044479aafb3c54c01c29fcd"
+checksum = "dbdf4ccd1652592b01286a5dbe1e2a77d78afaa34beadd9872a5f7396f92aaa9"
 dependencies = [
 "cfg-if",
- "log 0.4.8",
+ "log 0.4.11",
 "tracing-core",
 ]

@@ -3103,7 +3113,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
 dependencies = [
- "log 0.4.8",
+ "log 0.4.11",
 "try-lock",
 ]

@@ -3115,9 +3125,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.64"
+version = "0.2.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a634620115e4a229108b71bde263bb4220c483b3f07f5ba514ee8d15064c4c2"
+checksum = "f3edbcc9536ab7eababcc6d2374a0b7bfe13a2b6d562c5e07f370456b1a8f33d"
 dependencies = [
 "cfg-if",
 "serde",
@@ -3127,24 +3137,24 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.64"
+version = "0.2.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e53963b583d18a5aa3aaae4b4c1cb535218246131ba22a71f05b518098571df"
+checksum = "89ed2fb8c84bfad20ea66b26a3743f3e7ba8735a69fe7d95118c33ec8fc1244d"
 dependencies = [
 "bumpalo",
 "lazy_static",
- "log 0.4.8",
- "proc-macro2 1.0.18",
+ "log 0.4.11",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
- "syn 1.0.34",
+ "syn 1.0.35",
 "wasm-bindgen-shared",
 ]

 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dba48d66049d2a6cc8488702e7259ab7afc9043ad0dc5448444f46f2a453b362"
+checksum = "41ad6e4e8b2b7f8c90b6e09a9b590ea15cb0d1dbe28502b5a405cd95d1981671"
 dependencies = [
 "cfg-if",
 "js-sys",
@@ -3154,9 +3164,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.64"
+version = "0.2.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fcfd5ef6eec85623b4c6e844293d4516470d8f19cd72d0d12246017eb9060b8"
+checksum = "eb071268b031a64d92fc6cf691715ca5a40950694d8f683c5bb43db7c730929e"
 dependencies = [
 "quote 1.0.7",
 "wasm-bindgen-macro-support",
@@ -3164,28 +3174,28 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.64"
+version = "0.2.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9adff9ee0e94b926ca81b57f57f86d5545cdcb1d259e21ec9bdd95b901754c75"
+checksum = "cf592c807080719d1ff2f245a687cbadb3ed28b2077ed7084b47aba8b691f2c6"
 dependencies = [
- "proc-macro2 1.0.18",
+ "proc-macro2 1.0.19",
 "quote 1.0.7",
- "syn 1.0.34",
+ "syn 1.0.35",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.64"
+version = "0.2.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7b90ea6c632dd06fd765d44542e234d5e63d9bb917ecd64d79778a13bd79ae"
+checksum = "72b6c0220ded549d63860c78c38f3bcc558d1ca3f4efa74942c536ddbbb55e87"

 [[package]]
 name = "web-sys"
-version = "0.3.41"
+version = "0.3.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "863539788676619aac1a23e2df3655e96b32b0e05eb72ca34ba045ad573c625d"
+checksum = "8be2398f326b7ba09815d0b403095f34dd708579220d099caae89be0b32137b2"
 dependencies = [
 "js-sys",
 "wasm-bindgen",
@@ -3271,7 +3281,7 @@ dependencies = [
 "byteorder",
 "bytes 0.4.12",
 "httparse",
- "log 0.4.8",
+ "log 0.4.11",
 "mio",
 "mio-extras",
 "rand 0.7.3",
@@ -3298,11 +3308,11 @@ checksum = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71"

 [[package]]
 name = "yubico"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "885c02fa029c304d374a6bbfb9c9ce0972ff6e2f2fc7ecdcab857d06eac18ba7"
+checksum = "7902044a71c64724ea618b5b4058fbdba931606a1110508a26a8d09d843cf943"
 dependencies = [
- "base64 0.10.1",
+ "base64 0.12.3",
 "crypto-mac 0.7.0",
 "futures",
 "hmac 0.7.1",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,7 +50,7 @@ serde_derive = "1.0.114"
 serde_json = "1.0.56"

 # Logging
-log = "0.4.8"
+log = "0.4.11"
 fern = { version = "0.6.0", features = ["syslog-4"] }

 # A safe, extensible ORM and Query builder
@@ -58,7 +58,7 @@ diesel = { version = "1.4.5", features = [ "chrono", "r2d2"] }
 diesel_migrations = "1.4.0"

 # Bundled SQLite
-libsqlite3-sys = { version = "0.17.3", features = ["bundled"], optional = true }
+libsqlite3-sys = { version = "0.18.0", features = ["bundled"], optional = true }

 # Crypto library
 ring = "0.16.15"
@@ -84,7 +84,7 @@ jsonwebtoken = "7.2.0"
 u2f = "0.2.0"

 # Yubico Library
-yubico = { version = "0.9.0", features = ["online-tokio"], default-features = false }
+yubico = { version = "0.9.1", features = ["online-tokio"], default-features = false }

 # A `dotenv` implementation for Rust
 dotenv = { version = "0.15.0", default-features = false }
@@ -101,7 +101,7 @@ lettre = { version = "0.10.0-alpha.1", features = ["smtp-transport", "builder",
 native-tls = "0.2.4"

 # Template library
-handlebars = { version = "3.2.1", features = ["dir_source"] }
+handlebars = { version = "3.3.0", features = ["dir_source"] }

 # For favicon extraction from main website
 soup = "0.5.0"
--- a/hooks/push
+++ b/hooks/push
@@ -36,6 +36,21 @@ if [[ "${DOCKER_TAG}" =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then
        manifest_lists+=(${DOCKER_REPO}:alpine)
    else
        manifest_lists+=(${DOCKER_REPO}:latest)
+
+        # Add an extra `latest-arm32v6` tag; Docker can't seem to properly
+        # auto-select that image on Armv6 platforms like Raspberry Pi 1 and Zero
+        # (https://github.com/moby/moby/issues/41017).
+        #
+        # Add this tag only for the SQLite image, as the MySQL and PostgreSQL
+        # builds don't currently work on non-amd64 arches.
+        #
+        # TODO: Also add an `alpine-arm32v6` tag if multi-arch support for
+        # Alpine-based bitwarden_rs images is implemented before this Docker
+        # issue is fixed.
+        if [[ ${DOCKER_REPO} == *server ]]; then
+            docker tag "${DOCKER_REPO}:${DOCKER_TAG}-arm32v6" "${DOCKER_REPO}:latest-arm32v6"
+            docker push "${DOCKER_REPO}:latest-arm32v6"
+        fi
    fi
 fi

@@ -88,6 +103,12 @@ jwt=$(curl -sS -X POST \
 repo="${DOCKER_REPO#*/}"

 for arch in ${arches[@]}; do
+    # Don't delete the `arm32v6` tag; Docker can't seem to properly
+    # auto-select that image on Armv6 platforms like Raspberry Pi 1 and Zero
+    # (https://github.com/moby/moby/issues/41017).
+    if [[ ${arch} == 'arm32v6' ]]; then
+        continue
+    fi
    tag="${DOCKER_TAG}-${arch}"
    echo ">>> Deleting '${repo}:${tag}'..."
    curl -sS -X DELETE \
--- a/src/api/admin.rs
+++ b/src/api/admin.rs
@@ -5,9 +5,9 @@ use std::process::Command;

 use rocket::{
    http::{Cookie, Cookies, SameSite},
-    request::{self, FlashMessage, Form, FromRequest, Request},
+    request::{self, FlashMessage, Form, FromRequest, Request, Outcome},
    response::{content::Html, Flash, Redirect},
-    Outcome, Route,
+    Route,
 };
 use rocket_contrib::json::Json;

--- a/src/api/core/ciphers.rs
+++ b/src/api/core/ciphers.rs
@@ -999,11 +999,12 @@ fn _delete_cipher_by_uuid(uuid: &str, headers: &Headers, conn: &DbConn, soft_del
    if soft_delete {
        cipher.deleted_at = Some(chrono::Utc::now().naive_utc());
        cipher.save(&conn)?;
+        nt.send_cipher_update(UpdateType::CipherUpdate, &cipher, &cipher.update_users_revision(&conn));
    } else {
        cipher.delete(&conn)?;
+        nt.send_cipher_update(UpdateType::CipherDelete, &cipher, &cipher.update_users_revision(&conn));
    }

-    nt.send_cipher_update(UpdateType::CipherDelete, &cipher, &cipher.update_users_revision(&conn));
    Ok(())
 }

--- a/src/api/core/organizations.rs
+++ b/src/api/core/organizations.rs
@@ -76,6 +76,10 @@ struct NewCollectionData {

 #[post("/organizations", data = "<data>")]
 fn create_organization(headers: Headers, data: JsonUpcase<OrgData>, conn: DbConn) -> JsonResult {
+    if !CONFIG.is_org_creation_allowed(&headers.user.email) {
+        err!("User not allowed to create organizations")
+    }
+
    let data: OrgData = data.into_inner().data;

    let org = Organization::new(data.Name, data.BillingEmail);
--- a/src/api/identity.rs
+++ b/src/api/identity.rs
@@ -68,6 +68,11 @@ fn _refresh_login(data: ConnectData, conn: DbConn) -> JsonResult {
        "refresh_token": device.refresh_token,
        "Key": user.akey,
        "PrivateKey": user.private_key,
+
+        "Kdf": user.client_kdf_type,
+        "KdfIterations": user.client_kdf_iter,
+        "ResetMasterPassword": false, // TODO: according to official server seems something like: user.password_hash.is_empty(), but would need testing
+        "scope": "api offline_access"
    })))
 }

@@ -156,6 +161,11 @@ fn _password_login(data: ConnectData, conn: DbConn, ip: &ClientIp) -> JsonResult
        "Key": user.akey,
        "PrivateKey": user.private_key,
        //"TwoFactorToken": "11122233333444555666777888999"
+        
+        "Kdf": user.client_kdf_type,
+        "KdfIterations": user.client_kdf_iter,
+        "ResetMasterPassword": false,// TODO: Same as above
+        "scope": "api offline_access"
    });

    if let Some(token) = twofactor_token {
--- a/src/auth.rs
+++ b/src/auth.rs
@@ -216,8 +216,7 @@ pub fn generate_admin_claims() -> AdminJWTClaims {
 // Bearer token authentication
 //
 use rocket::{
-    request::{self, FromRequest, Request},
-    Outcome,
+    request::{FromRequest, Request, Outcome},
 };

 use crate::db::{
@@ -234,7 +233,7 @@ pub struct Headers {
 impl<'a, 'r> FromRequest<'a, 'r> for Headers {
    type Error = &'static str;

-    fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+    fn from_request(request: &'a Request<'r>) -> Outcome<Self, Self::Error> {
        let headers = request.headers();

        // Get host
@@ -335,7 +334,7 @@ fn get_org_id(request: &Request) -> Option<String> {
 impl<'a, 'r> FromRequest<'a, 'r> for OrgHeaders {
    type Error = &'static str;

-    fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+    fn from_request(request: &'a Request<'r>) -> Outcome<Self, Self::Error> {
        match request.guard::<Headers>() {
            Outcome::Forward(_) => Outcome::Forward(()),
            Outcome::Failure(f) => Outcome::Failure(f),
@@ -390,7 +389,7 @@ pub struct AdminHeaders {
 impl<'a, 'r> FromRequest<'a, 'r> for AdminHeaders {
    type Error = &'static str;

-    fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+    fn from_request(request: &'a Request<'r>) -> Outcome<Self, Self::Error> {
        match request.guard::<OrgHeaders>() {
            Outcome::Forward(_) => Outcome::Forward(()),
            Outcome::Failure(f) => Outcome::Failure(f),
@@ -429,7 +428,7 @@ pub struct OwnerHeaders {
 impl<'a, 'r> FromRequest<'a, 'r> for OwnerHeaders {
    type Error = &'static str;

-    fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+    fn from_request(request: &'a Request<'r>) -> Outcome<Self, Self::Error> {
        match request.guard::<OrgHeaders>() {
            Outcome::Forward(_) => Outcome::Forward(()),
            Outcome::Failure(f) => Outcome::Failure(f),
@@ -460,7 +459,7 @@ pub struct ClientIp {
 impl<'a, 'r> FromRequest<'a, 'r> for ClientIp {
    type Error = ();

-    fn from_request(req: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+    fn from_request(req: &'a Request<'r>) -> Outcome<Self, Self::Error> {
        let ip = if CONFIG._ip_header_enabled() {
            req.headers().get_one(&CONFIG.ip_header()).and_then(|ip| {
                match ip.find(',') {
--- a/src/config.rs
+++ b/src/config.rs
@@ -115,6 +115,7 @@ macro_rules! make_config {
                config.domain_set = _domain_set;

                config.signups_domains_whitelist = config.signups_domains_whitelist.trim().to_lowercase();
+                config.org_creation_users = config.org_creation_users.trim().to_lowercase();

                config
            }
@@ -276,6 +277,9 @@ make_config! {
        signups_verify_resend_limit: u32, true, def,    6;
        /// Email domain whitelist |> Allow signups only from this list of comma-separated domains, even when signups are otherwise disabled
        signups_domains_whitelist: String, true, def,   "".to_string();
+        /// Org creation users |> Allow org creation only by this list of comma-separated user emails.
+        /// Blank or 'all' means all users can create orgs; 'none' means no users can create orgs.
+        org_creation_users:     String, true,   def,    "".to_string();
        /// Allow invitations |> Controls whether users can be invited by organization admins, even when signups are otherwise disabled
        invitations_allowed:    bool,   true,   def,    true;
        /// Password iterations |> Number of server-side passwords hashing iterations.
@@ -329,6 +333,8 @@ make_config! {
        reload_templates:       bool,   true,   def,    false;
        /// Enable extended logging
        extended_logging:       bool,   false,  def,    true;
+        /// Log timestamp format
+        log_timestamp_format:   String, true,   def,    "%Y-%m-%d %H:%M:%S.%3f".to_string();
        /// Enable the log to output to Syslog
        use_syslog:             bool,   false,  def,    false;
        /// Log file path
@@ -440,6 +446,13 @@ fn validate_config(cfg: &ConfigItems) -> Result<(), Error> {
        err!("`SIGNUPS_DOMAINS_WHITELIST` contains empty tokens");
    }

+    let org_creation_users = cfg.org_creation_users.trim().to_lowercase();
+    if !(org_creation_users.is_empty() || org_creation_users == "all" || org_creation_users == "none") {
+        if org_creation_users.split(',').any(|u| !u.contains('@')) {
+            err!("`ORG_CREATION_USERS` contains invalid email addresses");
+        }
+    }
+
    if let Some(ref token) = cfg.admin_token {
        if token.trim().is_empty() && !cfg.disable_admin_token {
            println!("[WARNING] `ADMIN_TOKEN` is enabled but has an empty value, so the admin page will be disabled.");
@@ -590,6 +603,19 @@ impl Config {
        }
    }

+    /// Tests whether the specified user is allowed to create an organization.
+    pub fn is_org_creation_allowed(&self, email: &str) -> bool {
+        let users = self.org_creation_users();
+        if users == "" || users == "all" {
+            true
+        } else if users == "none" {
+            false
+        } else {
+            let email = email.to_lowercase();
+            users.split(',').any(|u| u.trim() == email)
+        }
+    }
+
    pub fn delete_user_config(&self) -> Result<(), Error> {
        crate::util::delete_file(&CONFIG_FILE)?;

--- a/src/db/mod.rs
+++ b/src/db/mod.rs
@@ -4,8 +4,8 @@ use chrono::prelude::*;
 use diesel::{r2d2, r2d2::ConnectionManager, Connection as DieselConnection, ConnectionError};
 use rocket::{
    http::Status,
-    request::{self, FromRequest},
-    Outcome, Request, State,
+    request::{FromRequest, Outcome},
+    Request, State,
 };

 use crate::{error::Error, CONFIG};
@@ -71,7 +71,7 @@ pub fn backup_database() -> Result<(), Error> {
 impl<'a, 'r> FromRequest<'a, 'r> for DbConn {
    type Error = ();

-    fn from_request(request: &'a Request<'r>) -> request::Outcome<DbConn, ()> {
+    fn from_request(request: &'a Request<'r>) -> Outcome<DbConn, ()> {
        // https://github.com/SergioBenitez/Rocket/commit/e3c1a4ad3ab9b840482ec6de4200d30df43e357c
        let pool = try_outcome!(request.guard::<State<Pool>>());
        match pool.get() {
--- a/src/error.rs
+++ b/src/error.rs
@@ -233,10 +233,10 @@ macro_rules! err_json {
 macro_rules! err_handler {
    ($expr:expr) => {{
        error!(target: "auth", "Unauthorized Error: {}", $expr);
-        return rocket::Outcome::Failure((rocket::http::Status::Unauthorized, $expr));
+        return ::rocket::request::Outcome::Failure((rocket::http::Status::Unauthorized, $expr));
    }};
    ($usr_msg:expr, $log_value:expr) => {{
        error!(target: "auth", "Unauthorized Error: {}. {}", $usr_msg, $log_value);
-        return rocket::Outcome::Failure((rocket::http::Status::Unauthorized, $usr_msg));
+        return ::rocket::request::Outcome::Failure((rocket::http::Status::Unauthorized, $usr_msg));
    }};
 }
--- a/src/main.rs
+++ b/src/main.rs
@@ -130,8 +130,8 @@ fn init_logging(level: log::LevelFilter) -> Result<(), fern::InitError> {
    if CONFIG.extended_logging() {
        logger = logger.format(|out, message, record| {
            out.finish(format_args!(
-                "{}[{}][{}] {}",
-                chrono::Local::now().format("[%Y-%m-%d %H:%M:%S]"),
+                "[{}][{}][{}] {}",
+                chrono::Local::now().format(&CONFIG.log_timestamp_format()),
                record.target(),
                record.level(),
                message
--- a/src/static/global_domains.json
+++ b/src/static/global_domains.json
@@ -39,8 +39,7 @@
    "Type": 1,
    "Domains": [
      "apple.com",
-      "icloud.com",
-      "tv.apple.com"
+      "icloud.com"
    ],
    "Excluded": false
  },
@@ -106,6 +105,7 @@
      "passport.net",
      "windows.com",
      "microsoftonline.com",
+      "office.com",
      "office365.com",
      "microsoftstore.com",
      "xbox.com",
@@ -193,7 +193,12 @@
      "amazon.it",
      "amazon.com.au",
      "amazon.co.nz",
-      "amazon.in"
+      "amazon.in",
+      "amazon.com.mx",
+      "amazon.nl",
+      "amazon.sg",
+      "amazon.com.tr",
+      "amazon.ae"
    ],
    "Excluded": false
  },
@@ -386,8 +391,7 @@
      "alibaba.com",
      "aliexpress.com",
      "aliyun.com",
-      "net.cn",
-      "www.net.cn"
+      "net.cn"
    ],
    "Excluded": false
  },
@@ -717,41 +721,27 @@
      "eventbrite.ca",
      "eventbrite.ch",
      "eventbrite.cl",
-      "eventbrite.co.id",
-      "eventbrite.co.in",
-      "eventbrite.co.kr",
+      "eventbrite.co",
      "eventbrite.co.nz",
      "eventbrite.co.uk",
-      "eventbrite.co.ve",
      "eventbrite.com",
+      "eventbrite.com.ar",
      "eventbrite.com.au",
-      "eventbrite.com.bo",
      "eventbrite.com.br",
-      "eventbrite.com.co",
-      "eventbrite.com.hk",
-      "eventbrite.com.hn",
+      "eventbrite.com.mx",
      "eventbrite.com.pe",
-      "eventbrite.com.sg",
-      "eventbrite.com.tr",
-      "eventbrite.com.tw",
-      "eventbrite.cz",
      "eventbrite.de",
      "eventbrite.dk",
+      "eventbrite.es",
      "eventbrite.fi",
      "eventbrite.fr",
-      "eventbrite.gy",
-      "eventbrite.hu",
+      "eventbrite.hk",
      "eventbrite.ie",
-      "eventbrite.is",
      "eventbrite.it",
-      "eventbrite.jp",
-      "eventbrite.mx",
      "eventbrite.nl",
-      "eventbrite.no",
-      "eventbrite.pl",
      "eventbrite.pt",
-      "eventbrite.ru",
-      "eventbrite.se"
+      "eventbrite.se",
+      "eventbrite.sg"
    ],
    "Excluded": false
  },
@@ -769,15 +759,6 @@
  },
  {
    "Type": 75,
-    "Domains": [
-      "netcup.de",
-      "netcup.eu",
-      "customercontrolpanel.de"
-    ],
-    "Excluded": false
-  },
-  {
-    "Type": 76,
    "Domains": [
      "docusign.com",
      "docusign.net"
@@ -785,7 +766,7 @@
    "Excluded": false
  },
  {
-    "Type": 77,
+    "Type": 76,
    "Domains": [
      "envato.com",
      "themeforest.net",
@@ -799,7 +780,7 @@
    "Excluded": false
  },
  {
-    "Type": 78,
+    "Type": 77,
    "Domains": [
      "x10hosting.com",
      "x10premium.com"
@@ -807,7 +788,7 @@
    "Excluded": false
  },
  {
-    "Type": 79,
+    "Type": 78,
    "Domains": [
      "dnsomatic.com",
      "opendns.com",
@@ -816,7 +797,7 @@
    "Excluded": false
  },
  {
-    "Type": 80,
+    "Type": 79,
    "Domains": [
      "cagreatamerica.com",
      "canadaswonderland.com",
@@ -835,11 +816,19 @@
    "Excluded": false
  },
  {
-    "Type": 81,
+    "Type": 80,
    "Domains": [
      "ubnt.com",
      "ui.com"
    ],
    "Excluded": false
+  },
+  {
+    "Type": 81,
+    "Domains": [
+      "discordapp.com",
+      "discord.com"
+    ],
+    "Excluded": false
  }
-]
+]
--- a/tools/global_domains.py
+++ b/tools/global_domains.py
@@ -0,0 +1,80 @@
+#!/usr/bin/env python3
+#
+# This script generates a global equivalent domains JSON file from
+# the upstream Bitwarden source repo.
+#
+import json
+import re
+import sys
+import urllib.request
+
+from collections import OrderedDict
+
+if len(sys.argv) != 2:
+    print("usage: %s <OUTPUT-FILE>" % sys.argv[0])
+    print()
+    print("This script generates a global equivalent domains JSON file from")
+    print("the upstream Bitwarden source repo.")
+    sys.exit(1)
+
+OUTPUT_FILE = sys.argv[1]
+
+BASE_URL = 'https://github.com/bitwarden/server/raw/master'
+ENUMS_URL = '%s/src/Core/Enums/GlobalEquivalentDomainsType.cs' % BASE_URL
+DOMAIN_LISTS_URL = '%s/src/Core/Utilities/StaticStore.cs' % BASE_URL
+
+# Enum lines look like:
+#
+#   EnumName0 = 0,
+#   EnumName1 = 1,
+#
+ENUM_RE = re.compile(
+    r'\s*'             # Leading whitespace (optional).
+    r'([_0-9a-zA-Z]+)' # Enum name (capture group 1).
+    r'\s*=\s*'         # '=' with optional surrounding whitespace.
+    r'([0-9]+)'        # Enum value (capture group 2).
+)
+
+# Global domains lines look like:
+#
+#   GlobalDomains.Add(GlobalEquivalentDomainsType.EnumName, new List<string> { "x.com", "y.com" });
+#
+DOMAIN_LIST_RE = re.compile(
+    r'\s*'             # Leading whitespace (optional).
+    r'GlobalDomains\.Add\(GlobalEquivalentDomainsType\.'
+    r'([_0-9a-zA-Z]+)' # Enum name (capture group 1).
+    r'\s*,\s*new List<string>\s*{'
+    r'([^}]+)'         # Domain list (capture group 2).
+    r'}\);'
+)
+
+enums = dict()
+domain_lists = OrderedDict()
+
+# Read in the enum names and values.
+with urllib.request.urlopen(ENUMS_URL) as response:
+    for ln in response.read().decode('utf-8').split('\n'):
+        m = ENUM_RE.match(ln)
+        if m:
+            enums[m.group(1)] = int(m.group(2))
+
+# Read in the domain lists.
+with urllib.request.urlopen(DOMAIN_LISTS_URL) as response:
+    for ln in response.read().decode('utf-8').split('\n'):
+        m = DOMAIN_LIST_RE.match(ln)
+        if m:
+            # Strip double quotes and extraneous spaces in each domain.
+            domain_lists[m.group(1)] = [d.strip(' "') for d in m.group(2).split(",")]
+
+# Build the global domains data structure.
+global_domains = []
+for name, domain_list in domain_lists.items():
+    entry = OrderedDict()
+    entry["Type"] = enums[name]
+    entry["Domains"] = domain_list
+    entry["Excluded"] = False
+    global_domains.append(entry)
+
+# Write out the global domains JSON file.
+with open(OUTPUT_FILE, 'w') as f:
+    json.dump(global_domains, f, indent=2)
Author	SHA1	Message	Date
Daniel García	a7a479623c	Merge pull request #1087 from jjlin/org-creation-users Add support for restricting org creation to certain users	2020-08-08 16:20:15 +02:00
Daniel García	83dff9ae6e	Merge pull request #1083 from jjlin/global-domains Add a script to auto-generate the global equivalent domains JSON file	2020-08-08 16:19:30 +02:00
Daniel García	6b2cc5a3ee	Merge pull request #1089 from jjlin/master Don't push `latest-arm32v6` tag for MySQL and PostgreSQL images	2020-08-07 20:39:17 +02:00
Jeremy Lin	5247e0d773	Don't push `latest-arm32v6` tag for MySQL and PostgreSQL images	2020-08-07 10:15:15 -07:00
Jeremy Lin	05b308b8b4	Sync global_domains.json with upstream	2020-08-06 12:13:40 -07:00
Jeremy Lin	9621278fca	Add a script to auto-generate the global equivalent domains JSON file The script works by reading the relevant files from the upstream Bitwarden source repo and generating a matching JSON file. It could potentially be integrated into the build/release process, but for now it can be run manually as needed.	2020-08-06 12:12:32 -07:00
Jeremy Lin	570d6c8bf9	Add support for restricting org creation to certain users	2020-08-05 22:35:29 -07:00
Daniel García	ad48e9ed0f	Fix unlock on desktop clients	2020-08-04 15:12:04 +02:00
Daniel García	f724addf9a	Merge pull request #1076 from jjlin/soft-delete Fix soft delete notifications	2020-07-28 17:44:33 +02:00
Daniel García	aa20974703	Merge pull request #1075 from jjlin/master Push an extra `latest-arm32v6` tag	2020-07-28 17:43:59 +02:00
Jeremy Lin	a846f6c610	Fix soft delete notifications A soft-deleted entry should now show up in the trash folder immediately (previously, an extra sync was required).	2020-07-26 16:19:47 -07:00
Jeremy Lin	c218c34812	Push an extra `latest-arm32v6` tag This fixes a gap in PR #1069.	2020-07-26 15:28:14 -07:00
Daniel García	2626e66873	Merge pull request #1069 from jjlin/master Skip cleanup of `arm32v6` arch-specific tags	2020-07-24 23:05:29 +02:00
Jeremy Lin	81e0e1b339	Skip cleanup of `arm32v6` arch-specific tags	2020-07-24 11:32:44 -07:00
Daniel García	fd1354d00e	Merge pull request #1067 from jjlin/log-time-fmt Add config option for log timestamp format	2020-07-24 16:42:10 +02:00
Jeremy Lin	071a3b2a32	Log timestamps with milliseconds by default	2020-07-23 14:19:51 -07:00
Daniel García	32cfaab5ee	Updated dependencies and changed rocket request imports	2020-07-23 21:07:04 +02:00
Jeremy Lin	d348f12a0e	Add config option for log timestamp format	2020-07-22 21:50:49 -07:00