1
0
Fork 0

Merge pull request #1111 from jjlin/token

Generate tokens more simply and uniformly
Dieser Commit ist enthalten in:
Daniel García 2020-08-24 00:25:12 +02:00 committet von GitHub
Commit e5a77a477d
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
3 geänderte Dateien mit 13 neuen und 7 gelöschten Zeilen

1
Cargo.lock generiert
Datei anzeigen

@ -153,6 +153,7 @@ dependencies = [
"once_cell", "once_cell",
"openssl", "openssl",
"percent-encoding 2.1.0", "percent-encoding 2.1.0",
"rand 0.7.3",
"regex", "regex",
"reqwest", "reqwest",
"ring", "ring",

Datei anzeigen

@ -60,7 +60,8 @@ diesel_migrations = "1.4.0"
# Bundled SQLite # Bundled SQLite
libsqlite3-sys = { version = "0.18.0", features = ["bundled"], optional = true } libsqlite3-sys = { version = "0.18.0", features = ["bundled"], optional = true }
# Crypto library # Crypto-related libraries
rand = "0.7.3"
ring = "0.16.15" ring = "0.16.15"
# UUID generation # UUID generation

Datei anzeigen

@ -55,17 +55,21 @@ pub fn get_random(mut array: Vec<u8>) -> Vec<u8> {
} }
pub fn generate_token(token_size: u32) -> Result<String, Error> { pub fn generate_token(token_size: u32) -> Result<String, Error> {
// A u64 can represent all whole numbers up to 19 digits long.
if token_size > 19 { if token_size > 19 {
err!("Generating token failed") err!("Token size is limited to 19 digits")
} }
// 8 bytes to create an u64 for up to 19 token digits let low: u64 = 0;
let bytes = get_random(vec![0; 8]); let high: u64 = 10u64.pow(token_size);
let mut bytes_array = [0u8; 8];
bytes_array.copy_from_slice(&bytes);
let number = u64::from_be_bytes(bytes_array) % 10u64.pow(token_size); // Generate a random number in the range [low, high), then format it as a
// token of fixed width, left-padding with 0 as needed.
use rand::{thread_rng, Rng};
let mut rng = thread_rng();
let number: u64 = rng.gen_range(low, high);
let token = format!("{:0size$}", number, size = token_size as usize); let token = format!("{:0size$}", number, size = token_size as usize);
Ok(token) Ok(token)
} }