Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2025-01-05 11:25:40 +01:00
refactor: replace static with const for global constants
Dieser Commit ist enthalten in:
Ursprung
d7adce97df
Commit
8c1e8ce840
2 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
|
@ -6,7 +6,7 @@ use std::num::NonZeroU32;
|
||||||
use data_encoding::{Encoding, HEXLOWER};
|
use data_encoding::{Encoding, HEXLOWER};
|
||||||
use ring::{digest, hmac, pbkdf2};
|
use ring::{digest, hmac, pbkdf2};
|
||||||
|
|
||||||
static DIGEST_ALG: pbkdf2::Algorithm = pbkdf2::PBKDF2_HMAC_SHA256;
|
const DIGEST_ALG: pbkdf2::Algorithm = pbkdf2::PBKDF2_HMAC_SHA256;
|
||||||
const OUTPUT_LEN: usize = digest::SHA256_OUTPUT_LEN;
|
const OUTPUT_LEN: usize = digest::SHA256_OUTPUT_LEN;
|
||||||
|
|
||||||
pub fn hash_password(secret: &[u8], salt: &[u8], iterations: u32) -> Vec<u8> {
|
pub fn hash_password(secret: &[u8], salt: &[u8], iterations: u32) -> Vec<u8> {
|
||||||
|
|
|
@ -81,7 +81,7 @@ impl UserOrgType {
|
||||||
impl Ord for UserOrgType {
|
impl Ord for UserOrgType {
|
||||||
fn cmp(&self, other: &UserOrgType) -> Ordering {
|
fn cmp(&self, other: &UserOrgType) -> Ordering {
|
||||||
// For easy comparison, map each variant to an access level (where 0 is lowest).
|
// For easy comparison, map each variant to an access level (where 0 is lowest).
|
||||||
static ACCESS_LEVEL: [i32; 4] = [
|
const ACCESS_LEVEL: [i32; 4] = [
|
||||||
3, // Owner
|
3, // Owner
|
||||||
2, // Admin
|
2, // Admin
|
||||||
0, // User
|
0, // User
|
||||||
|
@ -197,7 +197,7 @@ impl Organization {
|
||||||
// The number 128 should be fine, it is well within the range of an i32
|
// The number 128 should be fine, it is well within the range of an i32
|
||||||
// The same goes for the database where we only use INTEGER (the same as an i32)
|
// The same goes for the database where we only use INTEGER (the same as an i32)
|
||||||
// It should also provide enough room for 100+ types, which i doubt will ever happen.
|
// It should also provide enough room for 100+ types, which i doubt will ever happen.
|
||||||
static ACTIVATE_REVOKE_DIFF: i32 = 128;
|
const ACTIVATE_REVOKE_DIFF: i32 = 128;
|
||||||
|
|
||||||
impl UserOrganization {
|
impl UserOrganization {
|
||||||
pub fn new(user_uuid: String, org_uuid: String) -> Self {
|
pub fn new(user_uuid: String, org_uuid: String) -> Self {
|
||||||
|
|
Laden …
In neuem Issue referenzieren