memorable download codes

src/main.rs

@@ -1,7 +1,6 @@
 mod download;
 mod store;
 mod upload;
-mod util;
 mod zip;
 
 use std::{fs::File, path::PathBuf};
@@ -25,7 +24,7 @@ async fn handle_download(
     data: AppData,
 ) -> actix_web::Result<HttpResponse> {
     let file_code = path.into_inner();
-    if !util::is_ascii_alphanumeric(&file_code) {
+    if !store::is_valid_storage_code(&file_code) {
         return Ok(HttpResponse::NotFound().finish());
     }
     let data = data.read().await;

src/store.rs

@@ -1,6 +1,7 @@
 use std::{collections::HashMap, io::ErrorKind, path::PathBuf, str::FromStr};
 
 use log::{debug, error, info, warn};
+use rand::{distributions::{Alphanumeric, DistString}, thread_rng, Rng};
 use serde::{Deserialize, Serialize};
 use time::OffsetDateTime;
 use tokio::{
@@ -15,6 +16,17 @@ const GIGA: u64 = 1024*1024*1024;
 const DEFAULT_MAX_UPLOAD_SIZE: u64 = 16*GIGA;
 const DEFAULT_MAX_STORAGE_SIZE: u64 = 64*GIGA;
 
+pub fn gen_storage_code() -> String {
+    if std::env::var("TRANSBEAM_MNEMONIC_CODES").as_deref() == Ok("false") {
+        Alphanumeric.sample_string(&mut thread_rng(), 8)
+    } else {
+        mnemonic::to_string(thread_rng().gen::<[u8; 4]>())
+    }
+}
+
+pub fn is_valid_storage_code(s: &str) -> bool {
+    s.as_bytes().iter().all(|c| c.is_ascii_alphanumeric() || c == &b'-')
+}
 
 pub(crate) fn storage_dir() -> PathBuf {
     PathBuf::from(std::env::var("TRANSBEAM_STORAGE_DIR").unwrap_or_else(|_| String::from(DEFAULT_STORAGE_DIR)))
@@ -133,7 +145,7 @@ impl FileStore {
                     // Handle this case separately, because we don't
                     // want to try to delete it if it's not the sort
                     // of path we're expecting
-                    if !crate::util::is_ascii_alphanumeric(&key) {
+                    if !is_valid_storage_code(&key) {
                         error!("Invalid key in persistent storage: {}", key);
                         continue;
                     }

src/upload.rs

@@ -5,7 +5,6 @@ use actix_http::ws::{CloseReason, Item};
 use actix_web_actors::ws::{self, CloseCode};
 use bytes::Bytes;
 use log::{debug, error, info, trace};
-use rand::distributions::{Alphanumeric, DistString};
 use serde::{Deserialize, Serialize};
 use time::OffsetDateTime;
 use unicode_normalization::UnicodeNormalization;
@@ -68,7 +67,7 @@ impl Uploader {
     pub(crate) fn new(app_data: super::AppData) -> Self {
         Self {
             writer: None,
-            storage_filename: Alphanumeric.sample_string(&mut rand::thread_rng(), 8),
+            storage_filename: store::gen_storage_code(),
             app_data,
             bytes_remaining: 0,
         }

src/util.rs

@@ -1,3 +0,0 @@
-pub(crate) fn is_ascii_alphanumeric(s: &str) -> bool {
-    s.as_bytes().iter().all(|c| c.is_ascii_alphanumeric())
-}