neri
/
datatrash
1
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

shorter id generation, shorten file url

This commit is contained in:
neri 2021-03-09 22:19:06 +01:00
parent 9e38960f00
commit 3a3174619d
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main.rs
View File

@ -19,6 +19,7 @@ use async_std::{
}; };
use file_kind::FileKind; use file_kind::FileKind;
use futures::TryStreamExt; use futures::TryStreamExt;
use rand::prelude::SliceRandom;
use sqlx::{ use sqlx::{
postgres::{PgPool, PgPoolOptions, PgRow}, postgres::{PgPool, PgPoolOptions, PgRow},
Row, Row,
@ -29,6 +30,11 @@ const INDEX_HTML: &str = include_str!("../template/index.html");
const UPLOAD_HTML: &str = include_str!("../template/upload.html"); const UPLOAD_HTML: &str = include_str!("../template/upload.html");
const VIEW_HTML: &str = include_str!("../template/view.html"); const VIEW_HTML: &str = include_str!("../template/view.html");
const ID_CHARS: &[char] = &[
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'j', 'k', 'm', 'n', 'p', 'q', 'r', 's', 't', 'u', 'v',
'w', 'x', 'y', 'z', '1', '2', '3', '4', '5', '6', '7', '8', '9',
];
async fn index(req: web::HttpRequest) -> Result<HttpResponse, Error> { async fn index(req: web::HttpRequest) -> Result<HttpResponse, Error> {
let upload_url = format!("{}/upload", get_host_url(&req)); let upload_url = format!("{}/upload", get_host_url(&req));
let index_html = INDEX_HTML.replace("{upload_url}", upload_url.as_str()); let index_html = INDEX_HTML.replace("{upload_url}", upload_url.as_str());
@ -47,7 +53,7 @@ async fn upload(
expiry_watch_sender: web::Data<Sender<()>>, expiry_watch_sender: web::Data<Sender<()>>,
config: web::Data<Config>, config: web::Data<Config>,
) -> Result<HttpResponse, Error> { ) -> Result<HttpResponse, Error> {
let file_id = format!("{:x?}", rand::random::<u32>()); let file_id = gen_file_id();
let mut filename = config.files_dir.clone(); let mut filename = config.files_dir.clone();
filename.push(&file_id); filename.push(&file_id);
@ -108,6 +114,15 @@ async fn upload(
.body(format!("{}\n", url))) .body(format!("{}\n", url)))
} }
fn gen_file_id() -> String {
let mut rng = rand::thread_rng();
let mut id = String::with_capacity(5);
for _ in 0..5 {
id.push(*ID_CHARS.choose(&mut rng).expect("ID_CHARS is not empty"));
}
id
}
fn get_host_url(req: &web::HttpRequest) -> String { fn get_host_url(req: &web::HttpRequest) -> String {
let conn = req.connection_info(); let conn = req.connection_info();
format!("{}://{}", conn.scheme(), conn.host()) format!("{}://{}", conn.scheme(), conn.host())
@ -116,9 +131,9 @@ fn get_host_url(req: &web::HttpRequest) -> String {
fn get_file_url(req: &web::HttpRequest, id: &str, name: Option<&str>) -> String { fn get_file_url(req: &web::HttpRequest, id: &str, name: Option<&str>) -> String {
if let Some(name) = name { if let Some(name) = name {
let encoded_name = urlencoding::encode(name); let encoded_name = urlencoding::encode(name);
format!("{}/file/{}/{}", get_host_url(req), id, encoded_name) format!("{}/{}/{}", get_host_url(req), id, encoded_name)
} else { } else {
format!("{}/file/{}", get_host_url(req), id) format!("{}/{}", get_host_url(req), id)
} }
} }
@ -273,11 +288,11 @@ async fn main() -> std::io::Result<()> {
web::resource(["/upload/{id}", "/upload/{id}/{name}"]) web::resource(["/upload/{id}", "/upload/{id}/{name}"])
.route(web::get().to(uploaded)), .route(web::get().to(uploaded)),
) )
.service(Files::new("/static", "static").disable_content_disposition())
.service( .service(
web::resource(["/file/{id}", "/file/{id}/{name}"]) web::resource(["/{id:[a-z0-9]{5}}", "/{id:[a-z0-9]{5}}/{name}"])
.route(web::get().to(download)), .route(web::get().to(download)),
) )
.service(Files::new("/static", "static").disable_content_disposition())
.default_service(web::route().to(not_found)) .default_service(web::route().to(not_found))
} }
}) })