Updated dependencies and fixed disable_admin_token description

This commit is contained in:
Daniel García
2019-10-08 19:33:27 +02:00
parent b4b62c22a4
commit 662bc27523
4 changed files with 107 additions and 221 deletions

View File

@@ -99,6 +99,9 @@
## One option is to use 'openssl rand -base64 48'
## If not set, the admin panel is disabled
# ADMIN_TOKEN=Vy2VyYTTsKPv8W5aEOWUbB/Bt3DEKePbHmI4m9VcemUMS2rEviDowNAFqYi1xjmp
## Enable this to bypass the admin panel security. This option is only
## meant to be used with the use of a separate auth layer in front
# DISABLE_ADMIN_TOKEN=false
## Invitations org admins to invite users, even when signups are disabled

313
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -26,7 +26,7 @@ rocket = { version = "0.5.0-dev", features = ["tls"], default-features = false }
rocket_contrib = "0.5.0-dev"
# HTTP client
reqwest = "0.9.20"
reqwest = "0.9.21"
# multipart/form-data support
multipart = { version = "0.16.1", features = ["server"], default-features = false }
@@ -43,7 +43,7 @@ chashmap = "2.2.2"
# A generic serialization/deserialization framework
serde = "1.0.101"
serde_derive = "1.0.101"
serde_json = "1.0.40"
serde_json = "1.0.41"
# Logging
log = "0.4.8"
@@ -78,7 +78,7 @@ jsonwebtoken = "6.0.1"
u2f = "0.1.6"
# Yubico Library
yubico = { version = "0.6.1", features = ["online", "online-tokio"], default-features = false }
yubico = { version = "0.7.1", features = ["online-tokio"], default-features = false }
# A `dotenv` implementation for Rust
dotenv = { version = "0.14.1", default-features = false }
@@ -91,7 +91,7 @@ derive_more = "0.15.0"
# Numerical libraries
num-traits = "0.2.8"
num-derive = "0.2.5"
num-derive = "0.3.0"
# Email libraries
lettre = "0.9.2"
@@ -107,7 +107,7 @@ soup = "0.4.1"
regex = "1.3.1"
# Required for SSL support for PostgreSQL
openssl = { version = "0.10.24", optional = true }
openssl = { version = "0.10.25", optional = true }
# URL encoding library
percent-encoding = "2.1.0"

View File

@@ -298,7 +298,7 @@ make_config! {
/// that do not support WAL. Please make sure you read project wiki on the topic before changing this setting.
enable_db_wal: bool, false, def, true;
/// Disable Admin Token (Know the risks!) |> Disables the Admin Token for the admin page so you may use your own auth in-front
/// Bypass admin page security (Know the risks!) |> Disables the Admin Token for the admin page so you may use your own auth in-front
disable_admin_token: bool, true, def, false;
},