Added some argument handling.

This commit is contained in:
Micheal Smith
2025-10-20 08:19:29 -05:00
parent cb4c8b3838
commit 06339ca8ab
4 changed files with 179 additions and 143 deletions

207
Cargo.lock generated
View File

@@ -91,12 +91,6 @@ dependencies = [
"windows-sys 0.60.2", "windows-sys 0.60.2",
] ]
[[package]]
name = "arraydeque"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236"
[[package]] [[package]]
name = "async-compression" name = "async-compression"
version = "0.4.32" version = "0.4.32"
@@ -376,18 +370,6 @@ version = "0.4.29"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e47641d3deaf41fb1538ac1f54735925e275eaf3bf4d55c81b137fba797e5cbb" checksum = "e47641d3deaf41fb1538ac1f54735925e275eaf3bf4d55c81b137fba797e5cbb"
[[package]]
name = "config"
version = "0.15.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "180e549344080374f9b32ed41bf3b6b57885ff6a289367b3dbc10eea8acc1918"
dependencies = [
"pathdiff",
"serde_core",
"winnow",
"yaml-rust2",
]
[[package]] [[package]]
name = "crc32fast" name = "crc32fast"
version = "1.5.0" version = "1.5.0"
@@ -444,12 +426,6 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "foldhash"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
[[package]] [[package]]
name = "form_urlencoded" name = "form_urlencoded"
version = "1.2.2" version = "1.2.2"
@@ -459,21 +435,6 @@ dependencies = [
"percent-encoding", "percent-encoding",
] ]
[[package]]
name = "futures"
version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
dependencies = [
"futures-channel",
"futures-core",
"futures-executor",
"futures-io",
"futures-sink",
"futures-task",
"futures-util",
]
[[package]] [[package]]
name = "futures-channel" name = "futures-channel"
version = "0.3.31" version = "0.3.31"
@@ -481,7 +442,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
dependencies = [ dependencies = [
"futures-core", "futures-core",
"futures-sink",
] ]
[[package]] [[package]]
@@ -490,34 +450,6 @@ version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]]
name = "futures-executor"
version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
dependencies = [
"futures-core",
"futures-task",
"futures-util",
]
[[package]]
name = "futures-io"
version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
[[package]]
name = "futures-macro"
version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]] [[package]]
name = "futures-sink" name = "futures-sink"
version = "0.3.31" version = "0.3.31"
@@ -536,16 +468,21 @@ version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
dependencies = [ dependencies = [
"futures-channel",
"futures-core", "futures-core",
"futures-io",
"futures-macro",
"futures-sink",
"futures-task", "futures-task",
"memchr",
"pin-project-lite", "pin-project-lite",
"pin-utils", "pin-utils",
"slab", ]
[[package]]
name = "getrandom"
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
dependencies = [
"cfg-if",
"libc",
"wasi",
] ]
[[package]] [[package]]
@@ -577,37 +514,20 @@ name = "gumbucket"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"axum", "axum",
"bytes",
"clap", "clap",
"color-eyre", "color-eyre",
"config", "nanoid",
"futures",
"rocksdb", "rocksdb",
"tokio", "tokio",
"tokio-macros", "tokio-macros",
"tower", "tower",
"tower-http", "tower-http",
"tracing", "tracing",
"tracing-error",
"tracing-subscriber", "tracing-subscriber",
] ]
[[package]]
name = "hashbrown"
version = "0.15.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
dependencies = [
"foldhash",
]
[[package]]
name = "hashlink"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
dependencies = [
"hashbrown",
]
[[package]] [[package]]
name = "heck" name = "heck"
version = "0.5.0" version = "0.5.0"
@@ -741,7 +661,7 @@ version = "0.1.34"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
dependencies = [ dependencies = [
"getrandom", "getrandom 0.3.4",
"libc", "libc",
] ]
@@ -809,6 +729,15 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "matchers"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
dependencies = [
"regex-automata",
]
[[package]] [[package]]
name = "matchit" name = "matchit"
version = "0.8.4" version = "0.8.4"
@@ -870,6 +799,15 @@ dependencies = [
"version_check", "version_check",
] ]
[[package]]
name = "nanoid"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
dependencies = [
"rand",
]
[[package]] [[package]]
name = "nom" name = "nom"
version = "7.1.3" version = "7.1.3"
@@ -916,12 +854,6 @@ version = "4.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52" checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52"
[[package]]
name = "pathdiff"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
[[package]] [[package]]
name = "percent-encoding" name = "percent-encoding"
version = "2.3.2" version = "2.3.2"
@@ -946,6 +878,15 @@ version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
[[package]]
name = "ppv-lite86"
version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
dependencies = [
"zerocopy",
]
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.101" version = "1.0.101"
@@ -970,6 +911,36 @@ version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
[[package]]
name = "rand"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
"rand_chacha",
"rand_core",
]
[[package]]
name = "rand_chacha"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
"rand_core",
]
[[package]]
name = "rand_core"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
"getrandom 0.2.16",
]
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.12.2" version = "1.12.2"
@@ -1319,10 +1290,14 @@ version = "0.3.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
dependencies = [ dependencies = [
"matchers",
"nu-ansi-term", "nu-ansi-term",
"once_cell",
"regex-automata",
"sharded-slab", "sharded-slab",
"smallvec", "smallvec",
"thread_local", "thread_local",
"tracing",
"tracing-core", "tracing-core",
"tracing-log", "tracing-log",
] ]
@@ -1525,15 +1500,6 @@ version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
[[package]]
name = "winnow"
version = "0.7.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
dependencies = [
"memchr",
]
[[package]] [[package]]
name = "wit-bindgen" name = "wit-bindgen"
version = "0.46.0" version = "0.46.0"
@@ -1541,14 +1507,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
[[package]] [[package]]
name = "yaml-rust2" name = "zerocopy"
version = "0.10.4" version = "0.8.27"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2462ea039c445496d8793d052e13787f2b90e750b833afee748e601c17621ed9" checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
dependencies = [ dependencies = [
"arraydeque", "zerocopy-derive",
"encoding_rs", ]
"hashlink",
[[package]]
name = "zerocopy-derive"
version = "0.8.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
dependencies = [
"proc-macro2",
"quote",
"syn",
] ]
[[package]] [[package]]

View File

@@ -5,17 +5,19 @@ edition = "2024"
[dependencies] [dependencies]
axum = { version = "0.8.6", features = ["multipart"] } axum = { version = "0.8.6", features = ["multipart"] }
bytes = "1"
clap = { version = "4.5", features = ["derive"] } clap = { version = "4.5", features = ["derive"] }
color-eyre = "0.6" color-eyre = "0.6"
config = { version = "0.15", default-features = false, features = [ "yaml" ] } #config = { version = "0.15", default-features = false, features = ["yaml"] }
futures = "0.3" nanoid = "0.4"
rocksdb = "0.24.0" rocksdb = "0.24.0"
tokio = { version = "1.47.1", features = ["fs", "macros", "rt-multi-thread"] } tokio = { version = "1.47.1", features = ["fs", "macros", "rt-multi-thread"] }
tokio-macros = "2.5" tokio-macros = "2.5"
tower = { version = "0.5", features = ["buffer", "limit", "load-shed", "timeout"] } tower = { version = "0.5", features = ["buffer", "limit", "load-shed", "timeout"] }
tower-http = { version = "0.6", features = ["compression-full", "limit", "trace", "util"] } tower-http = { version = "0.6", features = ["compression-full", "limit", "trace", "util"] }
tracing = "0.1" tracing = "0.1"
tracing-subscriber = "0.3" tracing-error = "0.2.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
[profile.dev.package.backtrace] [profile.dev.package.backtrace]
opt-level = 3 opt-level = 3

View File

@@ -1,3 +1,6 @@
// TODO: Add general description of the workings.
// TODO: Add ability to run a temporary pastebin
use axum::{ use axum::{
BoxError, Router, BoxError, Router,
error_handling::HandleErrorLayer, error_handling::HandleErrorLayer,
@@ -8,10 +11,12 @@ use axum::{
}; };
use clap::Parser; use clap::Parser;
use color_eyre::eyre::Result; use color_eyre::eyre::Result;
use std::time::Duration; use nanoid::nanoid;
use std::{path::PathBuf, time::Duration};
use tokio::fs; use tokio::fs;
use tower::{ServiceBuilder, buffer::BufferLayer, limit::rate::RateLimitLayer}; use tower::{ServiceBuilder, buffer::BufferLayer, limit::rate::RateLimitLayer};
use tower_http::{compression::CompressionLayer, limit::RequestBodyLimitLayer, trace::TraceLayer}; use tower_http::{compression::CompressionLayer, limit::RequestBodyLimitLayer, trace::TraceLayer};
use tracing::{Level, event};
mod store; mod store;
@@ -19,8 +24,24 @@ mod store;
#[command(version, about)] #[command(version, about)]
struct Args { struct Args {
/// Configuration file locaation. /// Configuration file locaation.
#[arg(short, long)] #[arg(short, long, value_name = "FILE")]
config: String, config: Option<PathBuf>,
/// Address to listen on.
#[arg(short, long, default_value = "localhost")]
listen_address: String,
/// Port to listen on.
#[arg(short, long, default_value_t = 3000)]
port: u16,
/// Largest file size accepted.
#[arg(short, long, default_value_t = 1024, value_name = "SIZE_IN_KB")]
max_request_size: usize,
/// Set the number of requests handled per minute.
#[arg(short, long, default_value_t = 30)]
requests_per_min: u64,
} }
async fn default_handler() -> Response { async fn default_handler() -> Response {
@@ -50,27 +71,47 @@ async fn handle_error(err: BoxError) -> (StatusCode, String) {
} }
} }
async fn upload_handler(mut _multipart: Multipart) -> Response { async fn upload_handler(mut multipart: Multipart) -> Response {
// while let field = multipart.next_field().await { while let Ok(Some(part)) = multipart.next_field().await {
// match field { if let Some(name) = part.name()
// Ok(field) => (StatusCode::OK, "Insert Link Here...".to_string()).into_response(), && name == "file"
{
println!("Got: {}", name);
}
}
// Err(err) => ( (StatusCode::OK, nanoid!()).into_response()
// StatusCode::BAD_REQUEST, }
// format!("Error processing request: {}", err),
// ) // Defaults to info level tracing, but can be adjusted using the
// .into_response(), // RUST_LOG environment variable.
// } fn install_tracing() {
// } use tracing_error::ErrorLayer;
unimplemented!() use tracing_subscriber::prelude::*;
use tracing_subscriber::{EnvFilter, fmt};
let fmt_layer = fmt::layer().with_target(false);
let filter_layer = EnvFilter::try_from_default_env()
.or_else(|_| EnvFilter::try_new("info"))
.unwrap();
tracing_subscriber::registry()
.with(filter_layer)
.with(fmt_layer)
.with(ErrorLayer::default())
.init();
} }
#[tokio::main] #[tokio::main]
async fn main() -> Result<()> { async fn main() -> Result<()> {
color_eyre::install()?; install_tracing();
tracing_subscriber::fmt::init();
let _args = Args::parse(); color_eyre::install()?;
let args = Args::parse();
let request_limit = args.requests_per_min;
let max_size = args.max_request_size;
let listen_address = format!("{}:{}", args.listen_address, args.port);
let app = Router::new() let app = Router::new()
.route("/", get(default_handler)) .route("/", get(default_handler))
@@ -82,15 +123,14 @@ async fn main() -> Result<()> {
// Set to about the expected number of concurrent connections. // Set to about the expected number of concurrent connections.
.layer(BufferLayer::new(64)) .layer(BufferLayer::new(64))
// Limit to 30 per minute // Limit to 30 per minute
.layer(RateLimitLayer::new(30, Duration::from_secs(60))) .layer(RateLimitLayer::new(request_limit, Duration::from_secs(60)))
.layer(RequestBodyLimitLayer::new(1024 * 1024)) .layer(RequestBodyLimitLayer::new(max_size * 1024))
.layer(DefaultBodyLimit::disable()) .layer(DefaultBodyLimit::disable())
.layer(CompressionLayer::new()), .layer(CompressionLayer::new()),
); );
let listener = tokio::net::TcpListener::bind("127.0.0.1:3000") let listener = tokio::net::TcpListener::bind(listen_address.to_owned()).await?;
.await event!(Level::INFO, "Now listening on {}.", listen_address);
.unwrap(); axum::serve(listener, app).await?;
axum::serve(listener, app).await.unwrap();
Ok(()) Ok(())
} }

View File

@@ -1,8 +1,27 @@
// Default rocksdb storage. // Default rocksdb storage.
use bytes::Bytes;
use color_eyre::eyre::Result; use color_eyre::eyre::Result;
use nanoid::nanoid;
use rocksdb::{DB, Options};
use std::path::{Path, PathBuf};
#[allow(dead_code)] #[allow(dead_code)]
pub async fn init(_path: impl AsRef<str>) -> Result<()> { pub async fn init(_path: impl AsRef<str>) -> Result<()> {
Ok(()) Ok(())
} }
pub struct KeyVal {
db_path: PathBuf,
}
impl KeyVal {
pub fn new(database_path: impl AsRef<Path>) -> Result<KeyVal> {
Ok(KeyVal { db_path: database_path.as_ref().into() })
}
// Store value into the database, and return the key that was assigned to it.
pub async fn store(&self, data: impl AsRef<[u8]>) -> Result<String> {
Ok(nanoid!())
}
}