diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/datastructures.rs | 5 | ||||
| -rw-r--r-- | src/main.rs | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/datastructures.rs b/src/datastructures.rs index f84b3de..c6db4f6 100644 --- a/src/datastructures.rs +++ b/src/datastructures.rs @@ -17,11 +17,10 @@ use anyhow::Result; use argon2::{ - password_hash::{PasswordHash, PasswordHasher, PasswordVerifier, SaltString}, + password_hash::{PasswordHash, PasswordHasher, PasswordVerifier, SaltString, rand_core::OsRng}, Argon2, }; use rand::Rng; -use rand_core::OsRng; use serde::{Deserialize, Serialize}; use sqlx::ConnectOptions; use std::borrow::{BorrowMut, Cow}; @@ -479,7 +478,7 @@ impl FormData { let argon2_alg = Argon2::default(); Ok(argon2_alg - .hash_password_simple(passwd, salt.as_ref()) + .hash_password(passwd, salt.as_ref()) .unwrap() .to_string()) } diff --git a/src/main.rs b/src/main.rs index 784837b..74d5a21 100644 --- a/src/main.rs +++ b/src/main.rs @@ -135,6 +135,7 @@ async fn cmd_authenticate_cookie(matches: &ArgMatches<'_>, cfg: Config) -> Resul if !repo.is_empty() && !conn.exists(&redis_key).await? { let sql_conn = SqliteConnectOptions::from_str(cfg.get_database_location())? .read_only(true) + .immutable(true) .disable_statement_logging() .connect() .await; @@ -378,6 +379,7 @@ async fn cmd_upgrade_database(cfg: Config) -> Result<()> { let mut origin_conn = SqliteConnectOptions::from_str(v2_path.as_path().to_str().unwrap())? .read_only(true) + .immutable(true) .connect() .await?; @@ -529,6 +531,7 @@ async fn cmd_list_repos_acl(arg_matches: &ArgMatches<'_>, cfg: Config) -> Result let mut conn = SqliteConnectOptions::from_str(cfg.get_database_location())? .read_only(true) + .immutable(true) .connect() .await?; |