From 7bbdd8d89abab9bb5bb5a92080661abb2b156cfd Mon Sep 17 00:00:00 2001 From: Sir-Photch Date: Wed, 3 Jan 2024 19:32:15 +0100 Subject: [PATCH] v0.2.1 --- Cargo.lock | 46 ++++++++++++++++----------------- Cargo.toml | 2 +- contrib/systemd-example.env | 8 ++++++ contrib/systemd-example.service | 2 +- src/main.rs | 3 ++- 5 files changed, 35 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 04afcb3..864061f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -61,9 +61,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.76" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "autocfg" @@ -85,9 +85,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.4.11" +version = "4.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d" dependencies = [ "clap_builder", "clap_derive", @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" dependencies = [ "anstream", "anstyle", @@ -124,7 +124,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.42", + "syn 2.0.46", ] [[package]] @@ -141,9 +141,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -200,13 +200,13 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "notesock" -version = "0.1.3" +version = "0.2.1" dependencies = [ "anyhow", "clap", @@ -337,9 +337,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "2de98502f212cfcea8d0bb305bd0f49d7ebdd75b64ba0a68f937d888f4e0d6db" dependencies = [ "unicode-ident", ] @@ -356,9 +356,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -430,22 +430,22 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.194" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.194" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.42", + "syn 2.0.46", ] [[package]] @@ -522,9 +522,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.42" +version = "2.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7d0a2c048d661a1a59fcd7355baa232f7ed34e0ee4df2eef3c1c1c0d3852d8" +checksum = "89456b690ff72fddcecf231caedbe615c59480c93358a93dfae7fc29e3ebbf0e" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 5d803fe..d4a2ffa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "notesock" -version = "0.1.3" +version = "0.2.1" edition = "2021" [profile.release] diff --git a/contrib/systemd-example.env b/contrib/systemd-example.env index 1230749..d5dea42 100644 --- a/contrib/systemd-example.env +++ b/contrib/systemd-example.env @@ -6,6 +6,14 @@ HOST=https://notesock.example.org EXPIRY_SECONDS=600 # limits size of uploaded paste MAX_PASTE_SIZE_KB=500 +# range of paste IDs returned to the user, in base 36 (0..9,a..z) +# implicitly limits number of pastes that can be present on the filesystem +ID_LOWER=1000 +ID_UPPER=zzzz + # timespan after connection from user times out # default value should be fine TIMEOUT_MS=2000 +# expect reverse proxy to talk proxy_protocol +# uncomment to enable: +## TALK_PROXY=--talk-proxy diff --git a/contrib/systemd-example.service b/contrib/systemd-example.service index 9ccfb7f..59a917f 100644 --- a/contrib/systemd-example.service +++ b/contrib/systemd-example.service @@ -10,7 +10,7 @@ EnvironmentFile=/etc/notesock/notesock.env WorkingDirectory=/var/lib/notesock ReadWritePaths=/var/lib/notesock RuntimeDirectory=notesock -ExecStart=/usr/bin/notesock -s /run/notesock -d /var/lib/notesock -w $N_WORKERS --host $HOST -x $EXPIRY_SECONDS -l $MAX_PASTE_SIZE_KB -t $TIMEOUT_MS +ExecStart=/usr/bin/notesock -s /run/notesock -d /var/lib/notesock -w $N_WORKERS -H $HOST -c $EXPIRY_SECONDS -M $MAX_PASTE_SIZE_KB -t $TIMEOUT_MS -l $ID_LOWER -u $ID_UPPER $TALK_PROXY Restart=on-failure RestartSec=30s diff --git a/src/main.rs b/src/main.rs index e25bca5..a52e878 100644 --- a/src/main.rs +++ b/src/main.rs @@ -275,7 +275,8 @@ fn paste_worker( ); None }) - }.unwrap_or("peer".into()); + } + .unwrap_or("peer".into()); if payload_len > paste_limit { warn!("{} | {} exceeded paste limit", tag, peer);