Improve security

fix some frontend issues
fix scroll to top in article view
2026-06-12 19:22:07 +02:00 · 2026-06-12 10:57:48 +02:00 · 2026-06-12 09:19:15 +02:00 · 2026-06-10 19:22:24 +02:00 · 2026-06-10 18:51:55 +02:00 · 2026-06-10 06:08:17 +02:00
43 changed files with 2331 additions and 355 deletions
@@ -1,3 +1,5 @@
 /target
 .env
 .claude
 CLAUDE.md
 LEARNINGS.md
@@ -34,6 +34,18 @@ dependencies = [
 "smallvec",
 ]
 [[package]]
 name = "actix-governor"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a7ffa43d3e1e92518355ffbc82c146b5f0fe24fba87f19f405270da7a7b3c1e"
 dependencies = [
 "actix-http",
 "actix-web",
 "futures",
 "governor",
 ]
 [[package]]
 name = "actix-http"
 version = "3.12.1"
@@ -52,7 +64,7 @@ dependencies = [
 "derive_more",
 "encoding_rs",
 "flate2",
- "foldhash",
+ "foldhash 0.1.5",
 "futures-core",
 "h2 0.3.27",
 "http 0.2.12",
@@ -167,7 +179,7 @@ dependencies = [
 "cookie",
 "derive_more",
 "encoding_rs",
- "foldhash",
+ "foldhash 0.1.5",
 "futures-core",
 "futures-util",
 "impl-more",
@@ -231,6 +243,25 @@ dependencies = [
 "alloc-no-stdlib",
 ]
 [[package]]
 name = "allocator-api2"
 version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 [[package]]
 name = "ammonia"
 version = "4.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17e913097e1a2124b46746c980134e8c954bc17a6a59bb3fde96f088d126dde6"
 dependencies = [
 "cssparser 0.35.0",
 "html5ever 0.35.0",
 "maplit",
 "tendril 0.4.3",
 "url",
 ]
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -612,6 +643,12 @@ dependencies = [
 "cfg-if",
 ]
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 [[package]]
 name = "crypto-common"
 version = "0.1.7"
@@ -631,19 +668,42 @@ dependencies = [
 "hybrid-array",
 ]
 [[package]]
 name = "cssparser"
 version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e901edd733a1472f944a45116df3f846f54d37e67e68640ac8bb69689aca2aa"
 dependencies = [
 "cssparser-macros 0.6.1",
 "dtoa-short",
 "itoa",
 "phf 0.11.3",
 "smallvec",
 ]
 [[package]]
 name = "cssparser"
 version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c9cdaae01d5ed7882b04d795e7f752f46ff52d2fa3b50a20d28c464510bba98"
 dependencies = [
- "cssparser-macros",
+ "cssparser-macros 0.7.0",
 "dtoa-short",
 "itoa",
- "phf",
+ "phf 0.13.1",
 "smallvec",
 ]
 [[package]]
 name = "cssparser-macros"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
 "quote",
 "syn",
 ]
 [[package]]
 name = "cssparser-macros"
 version = "0.7.0"
@@ -724,6 +784,20 @@ dependencies = [
 "syn",
 ]
 [[package]]
 name = "dashmap"
 version = "6.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6361d5c062261c78a176addb82d4c821ae42bed6089de0e12603cd25de2059c"
 dependencies = [
 "cfg-if",
 "crossbeam-utils",
 "hashbrown 0.14.5",
 "lock_api",
 "once_cell",
 "parking_lot_core",
 ]
 [[package]]
 name = "dateparser"
 version = "0.3.1"
@@ -1029,6 +1103,12 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 [[package]]
 name = "foldhash"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 [[package]]
 name = "form_urlencoded"
 version = "1.2.2"
@@ -1044,6 +1124,16 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
 [[package]]
 name = "futf"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843"
 dependencies = [
 "mac",
 "new_debug_unreachable",
 ]
 [[package]]
 name = "futures"
 version = "0.3.32"
@@ -1115,6 +1205,12 @@ version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
 [[package]]
 name = "futures-timer"
 version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af43fadb8a98512d547e37b4e92e0ced13e205c061b87b4623eff01d918d6968"
 [[package]]
 name = "futures-util"
 version = "0.3.32"
@@ -1192,6 +1288,29 @@ dependencies = [
 "wasip3",
 ]
 [[package]]
 name = "governor"
 version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9efcab3c1958580ff1f25a2a41be1668f7603d849bb63af523b208a3cc1223b8"
 dependencies = [
 "cfg-if",
 "dashmap",
 "futures-sink",
 "futures-timer",
 "futures-util",
 "getrandom 0.3.4",
 "hashbrown 0.16.1",
 "nonzero_ext",
 "parking_lot",
 "portable-atomic",
 "quanta",
 "rand 0.9.4",
 "smallvec",
 "spinning_top",
 "web-time",
 ]
 [[package]]
 name = "h2"
 version = "0.3.27"
@@ -1230,13 +1349,30 @@ dependencies = [
 "tracing",
 ]
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 [[package]]
 name = "hashbrown"
 version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 dependencies = [
- "foldhash",
+ "foldhash 0.1.5",
 ]
 [[package]]
 name = "hashbrown"
 version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 dependencies = [
 "allocator-api2",
 "equivalent",
 "foldhash 0.2.0",
 ]
 [[package]]
@@ -1260,6 +1396,17 @@ dependencies = [
 "digest 0.10.7",
 ]
 [[package]]
 name = "html5ever"
 version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55d958c2f74b664487a2035fe1dadb032c48718a03b63f3ab0b8537db8549ed4"
 dependencies = [
 "log",
 "markup5ever 0.35.0",
 "match_token",
 ]
 [[package]]
 name = "html5ever"
 version = "0.39.0"
@@ -1267,7 +1414,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46a1761807faccc9a19e86944bbf40610014066306f96edcdedc2fb714bcb7b8"
 dependencies = [
 "log",
- "markup5ever",
+ "markup5ever 0.39.0",
 ]
 [[package]]
@@ -1752,6 +1899,29 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
 [[package]]
 name = "mac"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
 [[package]]
 name = "maplit"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 [[package]]
 name = "markup5ever"
 version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "311fe69c934650f8f19652b3946075f0fc41ad8757dbb68f1ca14e7900ecc1c3"
 dependencies = [
 "log",
 "tendril 0.4.3",
 "web_atoms 0.1.3",
 ]
 [[package]]
 name = "markup5ever"
 version = "0.39.0"
@@ -1759,8 +1929,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7122d987ec5f704ee56f6e5b41a7d93722e9aae27ae07cafa4036c4d3f9757de"
 dependencies = [
 "log",
- "tendril",
+ "tendril 0.5.0",
- "web_atoms",
+ "web_atoms 0.2.4",
 ]
 [[package]]
 name = "match_token"
 version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac84fd3f360fcc43dc5f5d186f02a94192761a080e8bc58621ad4d12296a58cf"
 dependencies = [
 "proc-macro2",
 "quote",
 "syn",
 ]
 [[package]]
@@ -1824,6 +2005,12 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 [[package]]
 name = "nonzero_ext"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
 [[package]]
 name = "num-conv"
 version = "0.2.2"
@@ -1886,25 +2073,55 @@ version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 [[package]]
 name = "phf"
 version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
 dependencies = [
 "phf_macros 0.11.3",
 "phf_shared 0.11.3",
 ]
 [[package]]
 name = "phf"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
 dependencies = [
- "phf_macros",
+ "phf_macros 0.13.1",
- "phf_shared",
+ "phf_shared 0.13.1",
 "serde",
 ]
 [[package]]
 name = "phf_codegen"
 version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
 dependencies = [
 "phf_generator 0.11.3",
 "phf_shared 0.11.3",
 ]
 [[package]]
 name = "phf_codegen"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1"
 dependencies = [
- "phf_generator",
+ "phf_generator 0.13.1",
- "phf_shared",
+ "phf_shared 0.13.1",
 ]
 [[package]]
 name = "phf_generator"
 version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
 "phf_shared 0.11.3",
 "rand 0.8.6",
 ]
 [[package]]
@@ -1914,7 +2131,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
 dependencies = [
 "fastrand",
- "phf_shared",
+ "phf_shared 0.13.1",
 ]
 [[package]]
 name = "phf_macros"
 version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
 dependencies = [
 "phf_generator 0.11.3",
 "phf_shared 0.11.3",
 "proc-macro2",
 "quote",
 "syn",
 ]
 [[package]]
@@ -1923,13 +2153,22 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
 dependencies = [
- "phf_generator",
+ "phf_generator 0.13.1",
- "phf_shared",
+ "phf_shared 0.13.1",
 "proc-macro2",
 "quote",
 "syn",
 ]
 [[package]]
 name = "phf_shared"
 version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
 dependencies = [
 "siphasher",
 ]
 [[package]]
 name = "phf_shared"
 version = "0.13.1"
@@ -2026,6 +2265,21 @@ dependencies = [
 "unicode-ident",
 ]
 [[package]]
 name = "quanta"
 version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7"
 dependencies = [
 "crossbeam-utils",
 "libc",
 "once_cell",
 "raw-cpuid",
 "wasi",
 "web-sys",
 "winapi",
 ]
 [[package]]
 name = "quick-xml"
 version = "0.39.4"
@@ -2113,6 +2367,15 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 [[package]]
 name = "rand"
 version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
 dependencies = [
 "rand_core 0.6.4",
 ]
 [[package]]
 name = "rand"
 version = "0.9.4"
@@ -2144,6 +2407,12 @@ dependencies = [
 "rand_core 0.9.5",
 ]
 [[package]]
 name = "rand_core"
 version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 [[package]]
 name = "rand_core"
 version = "0.9.5"
@@ -2159,6 +2428,15 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
 [[package]]
 name = "raw-cpuid"
 version = "11.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186"
 dependencies = [
 "bitflags",
 ]
 [[package]]
 name = "redox_syscall"
 version = "0.5.18"
@@ -2275,9 +2553,12 @@ name = "rss-reader"
 version = "0.1.0"
 dependencies = [
 "actix-cors",
 "actix-governor",
 "actix-rt",
 "actix-service",
 "actix-web",
 "ammonia",
 "anyhow",
 "bcrypt",
 "chrono",
 "dateparser",
@@ -2432,13 +2713,13 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bdd0be4d296f048bfb06dd01bbc80ef789ddd2e55583e8d2e6b804942abfabc2"
 dependencies = [
- "cssparser",
+ "cssparser 0.37.0",
 "ego-tree",
 "getopts",
- "html5ever",
+ "html5ever 0.39.0",
 "precomputed-hash",
 "selectors",
- "tendril",
+ "tendril 0.5.0",
 ]
 [[package]]
@@ -2471,12 +2752,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8adfa1c298912827b8a28b223b3b874357397ae706e6190acd9bf28cee99114d"
 dependencies = [
 "bitflags",
- "cssparser",
+ "cssparser 0.37.0",
 "derive_more",
 "log",
 "new_debug_unreachable",
- "phf",
+ "phf 0.13.1",
- "phf_codegen",
+ "phf_codegen 0.13.1",
 "precomputed-hash",
 "rustc-hash",
 "servo_arc",
@@ -2660,12 +2941,34 @@ dependencies = [
 "windows-sys 0.61.2",
 ]
 [[package]]
 name = "spinning_top"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300"
 dependencies = [
 "lock_api",
 ]
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 [[package]]
 name = "string_cache"
 version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f"
 dependencies = [
 "new_debug_unreachable",
 "parking_lot",
 "phf_shared 0.11.3",
 "precomputed-hash",
 "serde",
 ]
 [[package]]
 name = "string_cache"
 version = "0.9.0"
@@ -2674,18 +2977,30 @@ checksum = "a18596f8c785a729f2819c0f6a7eae6ebeebdfffbfe4214ae6b087f690e31901"
 dependencies = [
 "new_debug_unreachable",
 "parking_lot",
- "phf_shared",
+ "phf_shared 0.13.1",
 "precomputed-hash",
 ]
 [[package]]
 name = "string_cache_codegen"
 version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0"
 dependencies = [
 "phf_generator 0.11.3",
 "phf_shared 0.11.3",
 "proc-macro2",
 "quote",
 ]
 [[package]]
 name = "string_cache_codegen"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "585635e46db231059f76c5849798146164652513eb9e8ab2685939dd90f29b69"
 dependencies = [
- "phf_generator",
+ "phf_generator 0.13.1",
- "phf_shared",
+ "phf_shared 0.13.1",
 "proc-macro2",
 "quote",
 ]
@@ -2754,6 +3069,17 @@ dependencies = [
 "libc",
 ]
 [[package]]
 name = "tendril"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0"
 dependencies = [
 "futf",
 "mac",
 "utf-8",
 ]
 [[package]]
 name = "tendril"
 version = "0.5.0"
@@ -3247,16 +3573,28 @@ dependencies = [
 "wasm-bindgen",
 ]
 [[package]]
 name = "web_atoms"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57ffde1dc01240bdf9992e3205668b235e59421fd085e8a317ed98da0178d414"
 dependencies = [
 "phf 0.11.3",
 "phf_codegen 0.11.3",
 "string_cache 0.8.9",
 "string_cache_codegen 0.5.4",
 ]
 [[package]]
 name = "web_atoms"
 version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7cff6eef815df1834fd250e3a2ff436044d82a9f1bc1980ca1dbdf07effc538"
 dependencies = [
- "phf",
+ "phf 0.13.1",
- "phf_codegen",
+ "phf_codegen 0.13.1",
- "string_cache",
+ "string_cache 0.9.0",
- "string_cache_codegen",
+ "string_cache_codegen 0.6.1",
 ]
 [[package]]
@@ -3268,6 +3606,22 @@ dependencies = [
 "rustls-pki-types",
 ]
 [[package]]
 name = "winapi"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
 "winapi-i686-pc-windows-gnu",
 "winapi-x86_64-pc-windows-gnu",
 ]
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 [[package]]
 name = "winapi-util"
 version = "0.1.11"
@@ -3277,6 +3631,12 @@ dependencies = [
 "windows-sys 0.61.2",
 ]
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 [[package]]
 name = "windows-core"
 version = "0.62.2"
@@ -6,6 +6,7 @@ edition = "2024"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
 anyhow = "1"
 reqwest = { version = "0.13", features = ["json", "blocking"] }
 tokio = { version = "1", features = ["full"] }
 rss = { version = "2.0.13" }
@@ -29,6 +30,8 @@ scraper = "0.27"
 actix-cors = "0.7"
 chrono = { version = "0.4.45", features = ["serde"] }
 dateparser = "0.3"
 ammonia = "4.1.2"
 actix-governor = "0.10.0"
 [dependencies.serde_json]
 version = "1.0.150"
@@ -82,10 +82,12 @@ Create a user, then log in through the UI at `http://localhost:5173`:
 ```sh
 curl -X POST -H "Content-Type: application/json" \
-  -d '{"name": "mace", "email": "you@example.com", "password": "secret"}' \
+  -d '{"name": "mace", "email": "you@example.com", "password": "secret1"}' \
  http://localhost:8001/api/v1/user/create
 ```
 Passwords must be at least 6 characters.
 ### Useful commands during development
 ```sh
@@ -110,6 +112,30 @@ docker exec -it rss-postgres psql -d rss -U admin
 ---
 ## Security notes
 - **Sessions**: login returns a JWT (`token` header) valid for 24 hours. Logging out
  (`POST /api/v1/auth/logout`, requires the current token) bumps the user's
  `token_version`, which immediately invalidates *all* outstanding tokens for that
  account — there's no per-session revocation, so logging out on one device logs out
  every device.
 - **Login rate limiting**: `POST /api/v1/auth/login` is limited to a burst of 5 requests
  per IP, replenishing one every 2 seconds (`actix-governor`).
 - **Outbound fetches**: feed syncs and the article-reader endpoint only fetch
  `http`/`https` URLs that resolve to public IP addresses (no loopback/private/
  link-local, e.g. `127.0.0.1` or the `169.254.169.254` cloud metadata address).
  Redirects are followed (up to 5 hops), but each redirect target is checked against the
  same rules before being fetched, so a redirect can't be used to reach an internal
  address.
 - **Stored feed content**: `<img>` tags from synced feed content are sanitized
  (`ammonia`) down to `src`/`alt`/`title` before being stored, since they're later
  rendered with `v-html` in the frontend.
 - **If `JWT_SECRET` or `POSTGRES_PASSWORD` are ever leaked** (e.g. committed to git),
  rotate them in `.env` and restart the backend — rotating `JWT_SECRET` invalidates every
  outstanding token as a side effect.
 ---
 ## Production setup (Docker)
 The whole stack — Postgres, backend, and frontend — runs via Docker Compose. The frontend is built as a static Vue bundle and served by nginx, which also reverse-proxies `/api/` to the backend container.
@@ -0,0 +1,3 @@
 -- This file should undo anything in `up.sql`
 ALTER TABLE users
 DROP COLUMN token_version;
@@ -0,0 +1,3 @@
 -- Your SQL goes here
 ALTER TABLE users
 ADD COLUMN token_version INTEGER NOT NULL DEFAULT 0;
@@ -0,0 +1,23 @@
 use std::future::{ready, Ready};
 use actix_web::dev::Payload;
 use actix_web::{error::ErrorUnauthorized, Error, FromRequest, HttpMessage, HttpRequest};
 /// The user id of the caller, as established by the auth middleware after
 /// verifying the `user-token` header. Extracting this (instead of trusting a
 /// client-supplied `user_id` in the path/body) is the source of truth for
 /// "who is making this request".
 #[derive(Clone, Copy)]
 pub struct AuthUser(pub i32);
 impl FromRequest for AuthUser {
    type Error = Error;
    type Future = Ready<Result<Self, Self::Error>>;
    fn from_request(req: &HttpRequest, _payload: &mut Payload) -> Self::Future {
        match req.extensions().get::<AuthUser>() {
            Some(auth_user) => ready(Ok(*auth_user)),
            None => ready(Err(ErrorUnauthorized("missing authenticated user"))),
        }
    }
 }
@@ -2,17 +2,32 @@ extern crate hmac;
 extern crate jwt;
 extern crate sha2;
 use std::collections::BTreeMap;
 use std::env;
 use actix_web::HttpRequest;
 use chrono::{Duration, Utc};
 use dotenv::dotenv;
 use hmac::{Hmac, Mac};
 use jwt::{Header, SignWithKey, Token, VerifyWithKey};
 use serde::{Deserialize, Serialize};
 use sha2::Sha256;
 /// How long a freshly issued token remains valid for.
 const TOKEN_LIFETIME_HOURS: i64 = 24;
 pub struct JwtToken {
    pub user_id: i32,
    pub token_version: i32,
 }
 #[derive(Serialize, Deserialize)]
 struct Claims {
    user_id: i32,
    /// Must match `users.token_version` for the token to be accepted; bumping
    /// the column (e.g. on logout) revokes every token issued before that point.
    tv: i32,
    /// Unix timestamp after which the token is rejected, independent of signature validity.
    exp: i64,
 }
 type HmacSha256 = Hmac<Sha256>;
@@ -20,29 +35,39 @@ type HmacSha256 = Hmac<Sha256>;
 fn signing_key() -> HmacSha256 {
    dotenv().ok();
    let secret = env::var("JWT_SECRET").expect("JWT_SECRET must be set");
-    HmacSha256::new_from_slice(secret.as_bytes()).unwrap()
+    // HMAC-SHA256 accepts a key of any length, so this cannot fail.
    HmacSha256::new_from_slice(secret.as_bytes()).expect("HMAC accepts a key of any length")
 }
 impl JwtToken {
-    pub fn encode(user_id: i32) -> String {
+    pub fn encode(user_id: i32, token_version: i32) -> String {
        let key: HmacSha256 = signing_key();
-        let mut claims = BTreeMap::new();
+        let claims = Claims {
-        claims.insert("user_id", user_id);
+            user_id,
-        claims.sign_with_key(&key).unwrap()
+            tv: token_version,
            exp: (Utc::now() + Duration::hours(TOKEN_LIFETIME_HOURS)).timestamp(),
        };
        // Signing claims with a valid HMAC key cannot fail.
        claims
            .sign_with_key(&key)
            .expect("signing claims with a valid HMAC key cannot fail")
    }
    pub fn decode(encoded_token: String) -> Result<JwtToken, &'static str> {
        let key: HmacSha256 = signing_key();
        let token_str: &str = encoded_token.as_str();
-        let token: Result<Token<Header, BTreeMap<String, i32>, jwt::Verified>, jwt::Error> =
+        let token: Result<Token<Header, Claims, jwt::Verified>, jwt::Error> =
            VerifyWithKey::verify_with_key(token_str, &key);
        match token {
            Ok(token) => {
                let _header = token.header();
                let claims = token.claims();
                if claims.exp < Utc::now().timestamp() {
                    return Err("token has expired");
                }
                Ok(JwtToken {
-                    user_id: claims["user_id"],
+                    user_id: claims.user_id,
                    token_version: claims.tv,
                })
            }
            Err(_err) => Err("could not decode token"),
@@ -52,7 +77,10 @@ impl JwtToken {
    #[allow(dead_code)]
    pub fn decode_from_request(request: HttpRequest) -> Result<JwtToken, &'static str> {
        match request.headers().get("user-token") {
-            Some(token) => JwtToken::decode(String::from(token.to_str().unwrap())),
+            Some(token) => match token.to_str() {
                Ok(token_str) => JwtToken::decode(String::from(token_str)),
                Err(_) => Err("token header is not valid text"),
            },
            None => Err("There is no token"),
        }
    }
@@ -61,14 +89,19 @@ impl JwtToken {
 #[cfg(test)]
 mod jwt_test {
    use actix_web::{http::header, test};
    use chrono::{Duration, Utc};
    use hmac::Hmac;
    use jwt::SignWithKey;
    use sha2::Sha256;
-    use super::JwtToken;
+    use super::{Claims, JwtToken};
    #[test]
    async fn encode_decode() {
-        let encoded_token: String = JwtToken::encode(32);
+        let encoded_token: String = JwtToken::encode(32, 0);
        let decoded_token: JwtToken = JwtToken::decode(encoded_token).unwrap();
        assert_eq!(32, decoded_token.user_id);
        assert_eq!(0, decoded_token.token_version);
    }
    #[test]
@@ -81,9 +114,25 @@ mod jwt_test {
        }
    }
    #[test]
    async fn decode_expired_token() {
        let key: Hmac<Sha256> = super::signing_key();
        let claims = Claims {
            user_id: 32,
            tv: 0,
            exp: (Utc::now() - Duration::hours(1)).timestamp(),
        };
        let expired_token: String = claims.sign_with_key(&key).unwrap();
        match JwtToken::decode(expired_token) {
            Err(message) => assert_eq!(message, "token has expired"),
            _ => panic!("Expired token should not be accepted."),
        }
    }
    #[actix_web::test]
    async fn decode_from_request_with_correct_token() {
-        let encoded_token: String = JwtToken::encode(32);
+        let encoded_token: String = JwtToken::encode(32, 0);
        let request = test::TestRequest::default()
            .insert_header(header::ContentType::json())
            .insert_header(("user-token", encoded_token))
@@ -1,12 +1,13 @@
 use actix_web::dev::ServiceRequest;
 pub mod extractor;
 pub mod jwt;
 pub mod processes;
-use crate::auth::processes::check_password;
+use crate::auth::processes::check_token;
 use crate::auth::processes::extract_header_token;
 pub fn process_token(request: &ServiceRequest) -> Result<i32, &'static str> {
    match extract_header_token(request) {
-        Ok(token) => check_password(token),
+        Ok(token) => check_token(token),
        Err(message) => Err(message),
    }
 }
@@ -16,19 +17,24 @@ mod mod_test {
    use actix_web::test::TestRequest;
-    use super::{jwt::JwtToken, process_token};
+    use super::process_token;
    use crate::auth::jwt::JwtToken;
    use crate::database::establish_connection;
    use crate::test_helpers::{delete_user, insert_user};
    #[test]
    fn process_token_test() {
-        let token = JwtToken::encode(32);
+        let mut connection = establish_connection();
        let user = insert_user(&mut connection, "secret");
        let token = JwtToken::encode(user.id, user.token_version);
        let request = TestRequest::delete()
            .insert_header(("user-token", token))
            .to_srv_request();
-        match process_token(&request) {
+        assert_eq!(Ok(user.id), process_token(&request));
-            Ok(user_id) => assert_eq!(32, user_id),
+
-            Err(_) => panic!("process token failed"),
+        delete_user(&mut connection, user.id);
        }
    }
    #[actix_web::test]
@@ -1,22 +1,33 @@
 use super::jwt;
 use crate::database::establish_connection;
 use crate::models::user::rss_user::User;
 use crate::schema::users;
 use actix_web::dev::ServiceRequest;
 use diesel::prelude::*;
-pub fn check_password(password: String) -> Result<i32, &'static str> {
+/// Decodes the token and confirms it hasn't been revoked, i.e. its `token_version`
-    match jwt::JwtToken::decode(password) {
+/// still matches the one stored on the user (bumped on logout / password change).
-        Ok(token) => Ok(token.user_id),
+pub fn check_token(token: String) -> Result<i32, &'static str> {
-        Err(message) => Err(message),
+    let decoded = jwt::JwtToken::decode(token)?;
    let mut connection = establish_connection();
    let user: User = users::table
        .find(decoded.user_id)
        .first(&mut connection)
        .map_err(|_| "could not decode token")?;
    if user.token_version != decoded.token_version {
        return Err("token has been revoked");
    }
    Ok(decoded.user_id)
 }
 pub fn extract_header_token(request: &ServiceRequest) -> Result<String, &'static str> {
    log::info!("Request: {:?}", request);
    match request.headers().get("user-token") {
        Some(token) => match token.to_str() {
-            Ok(processed_password) => {
+            Ok(processed_token) => Ok(String::from(processed_token)),
-                log::info!("Token provided: {}", processed_password);
+            Err(_) => Err("there was an error processing token"),
                Ok(String::from(processed_password))
            }
            Err(_processed_password) => Err("there was an error processing token"),
        },
        None => Err("there is no token"),
    }
@@ -25,31 +36,51 @@ pub fn extract_header_token(request: &ServiceRequest) -> Result<String, &'static
 #[cfg(test)]
 mod processes_test {
    use actix_web::test::TestRequest;
    use diesel::prelude::*;
    use crate::auth::jwt::JwtToken;
    use crate::database::establish_connection;
    use crate::test_helpers::{delete_user, insert_user};
-    use super::check_password;
+    use super::check_token;
    #[test]
-    fn check_correct_password() {
+    fn check_correct_token() {
-        let password_string: String = JwtToken::encode(32);
+        let mut connection = establish_connection();
        let user = insert_user(&mut connection, "secret");
-        let result = check_password(password_string);
+        let token: String = JwtToken::encode(user.id, user.token_version);
-        match result {
+        let result = check_token(token);
-            Ok(user_id) => assert_eq!(32, user_id),
+
-            _ => panic!("Check correct password failed."),
+        assert_eq!(Ok(user.id), result);
-        }
+
        delete_user(&mut connection, user.id);
    }
    #[test]
-    fn incorrect_check_password() {
+    fn revoked_token_is_rejected() {
-        let password: String = String::from("test");
+        let mut connection = establish_connection();
        let user = insert_user(&mut connection, "secret");
-        match check_password(password) {
+        // Token signed with the user's current version, then the version is bumped
-            Err(message) => assert_eq!("could not decode token", message),
+        // (as logout would do), which must invalidate the previously issued token.
-            _ => panic!("check password should not be able to be decoded"),
+        let token: String = JwtToken::encode(user.id, user.token_version);
        diesel::update(crate::schema::users::table.find(user.id))
            .set(crate::schema::users::token_version.eq(user.token_version + 1))
            .execute(&mut connection)
            .unwrap();
        assert_eq!(Err("token has been revoked"), check_token(token));
        delete_user(&mut connection, user.id);
    }
    #[test]
    fn incorrect_check_token() {
        let token: String = String::from("test");
        assert_eq!(Err("could not decode token"), check_token(token));
    }
    #[test]
@@ -0,0 +1,34 @@
 use actix_web::{HttpResponse, ResponseError};
 use std::fmt;
 /// Wraps any error so it can be returned with `?` from request handlers.
 /// Always surfaces as a 500 to the client; the real error is logged.
 pub struct AppError(anyhow::Error);
 impl fmt::Debug for AppError {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        fmt::Debug::fmt(&self.0, f)
    }
 }
 impl fmt::Display for AppError {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        fmt::Display::fmt(&self.0, f)
    }
 }
 impl ResponseError for AppError {
    fn error_response(&self) -> HttpResponse {
        log::error!("Unhandled error: {:?}", self.0);
        HttpResponse::InternalServerError().finish()
    }
 }
 impl<E> From<E> for AppError
 where
    E: Into<anyhow::Error>,
 {
    fn from(err: E) -> Self {
        AppError(err.into())
    }
 }
@@ -13,7 +13,12 @@ impl Responder for Articles {
    type Body = String;
    fn respond_to(self, _req: &actix_web::HttpRequest) -> actix_web::HttpResponse<Self::Body> {
-        let body = serde_json::to_string(&self).unwrap();
+        match serde_json::to_string(&self) {
-        HttpResponse::with_body(StatusCode::OK, body)
+            Ok(body) => HttpResponse::with_body(StatusCode::OK, body),
            Err(err) => {
                log::error!("Failed to serialize response: {}", err);
                HttpResponse::with_body(StatusCode::INTERNAL_SERVER_ERROR, String::new())
            }
        }
    }
 }
@@ -0,0 +1,29 @@
 use actix_web::http::StatusCode;
 use actix_web::{HttpResponse, Responder};
 use serde::Serialize;
 #[derive(Serialize)]
 pub struct FeedInfo {
    pub id: i32,
    pub title: String,
    pub url: String,
 }
 #[derive(Serialize)]
 pub struct FeedInfoList {
    pub feeds: Vec<FeedInfo>,
 }
 impl Responder for FeedInfoList {
    type Body = String;
    fn respond_to(self, _req: &actix_web::HttpRequest) -> actix_web::HttpResponse<Self::Body> {
        match serde_json::to_string(&self) {
            Ok(body) => HttpResponse::with_body(StatusCode::OK, body),
            Err(err) => {
                log::error!("Failed to serialize response: {}", err);
                HttpResponse::with_body(StatusCode::INTERNAL_SERVER_ERROR, String::new())
            }
        }
    }
 }
@@ -1,4 +1,5 @@
 pub mod articles;
 pub mod feed_info;
 pub mod login;
 pub mod new_feed;
 pub mod new_user;
@@ -11,7 +11,12 @@ impl Responder for Readable {
    type Body = String;
    fn respond_to(self, _req: &actix_web::HttpRequest) -> actix_web::HttpResponse<Self::Body> {
-        let body = serde_json::to_string(&self).unwrap();
+        match serde_json::to_string(&self) {
-        HttpResponse::with_body(StatusCode::OK, body)
+            Ok(body) => HttpResponse::with_body(StatusCode::OK, body),
            Err(err) => {
                log::error!("Failed to serialize response: {}", err);
                HttpResponse::with_body(StatusCode::INTERNAL_SERVER_ERROR, String::new())
            }
        }
    }
 }
@@ -3,12 +3,13 @@ extern crate dotenv;
 use actix_cors::Cors;
 use actix_service::Service;
-use actix_web::{App, HttpResponse, HttpServer};
+use actix_web::{App, HttpMessage, HttpResponse, HttpServer};
 use dotenv::dotenv;
 use futures::future::{ok, Either};
 use std::env;
 mod auth;
 mod database;
 mod error;
 mod json_serialization;
 mod models;
 mod reader;
@@ -36,28 +37,32 @@ async fn main() -> std::io::Result<()> {
        App::new()
            .wrap_fn(|req, srv| {
                let mut passed: bool;
                let request_url: String = String::from(req.uri().path());
                log::info!("Request Url: {}", request_url);
-                if req.path().contains("/article/") {
+
                // Only these endpoints are reachable without a valid token. Everything
                // else (in particular all `/article/*` endpoints) requires one.
                let is_public = matches!(
                    request_url.as_str(),
                    "/api/v1/auth/login" | "/api/v1/user/create"
                );
                let passed = if is_public {
                    true
                } else {
                    match auth::process_token(&req) {
                        Ok(user_id) => {
                            log::info!("Authenticated user {} for {}", user_id, request_url);
-                            passed = true;
+                            req.extensions_mut().insert(auth::extractor::AuthUser(user_id));
                            true
                        }
-                        Err(_message) => passed = false,
+                        Err(message) => {
                            log::warn!("Rejected request to {}: {}", request_url, message);
                            false
                        }
                } else {
                    log::warn!("No auth check done.");
                    passed = true;
                    }
-
+                };
                if req.path().contains("user/create") {
                    passed = true;
                }
                log::info!("passed: {:?}", passed);
                let end_result = match passed {
                    true => Either::Left(srv.call(req)),
@@ -6,6 +6,19 @@ use uuid::Uuid;
 use crate::schema::users;
 pub const MIN_PASSWORD_LENGTH: usize = 6;
 /// Rejects empty/trivial passwords. Kept as a standalone function so callers
 /// (e.g. the user-creation handler) can return a `400` for this case
 /// specifically, rather than the `500` that `NewUser::new`'s `anyhow::Result`
 /// would otherwise map to.
 pub fn validate_password(password: &str) -> Result<(), &'static str> {
    if password.trim().len() < MIN_PASSWORD_LENGTH {
        return Err("password must be at least 6 characters long");
    }
    Ok(())
 }
 #[derive(Insertable, Clone)]
 #[diesel(table_name=users)]
 pub struct NewUser {
@@ -16,14 +29,15 @@ pub struct NewUser {
 }
 impl NewUser {
-    pub fn new(username: String, email: String, password: String) -> NewUser {
+    pub fn new(username: String, email: String, password: String) -> anyhow::Result<NewUser> {
-        let hashed_password: String = hash(password.as_str(), DEFAULT_COST).unwrap();
+        validate_password(&password).map_err(anyhow::Error::msg)?;
        let hashed_password: String = hash(password.as_str(), DEFAULT_COST)?;
        let uuid = Uuid::new_v4();
-        NewUser {
+        Ok(NewUser {
            username,
            email,
            password: hashed_password,
            unique_id: uuid.to_string(),
-        }
+        })
    }
 }
@@ -14,10 +14,11 @@ pub struct User {
    pub email: String,
    pub password: String,
    pub unique_id: String,
    pub token_version: i32,
 }
 impl User {
-    pub fn verify(self, password: String) -> bool {
+    pub fn verify(self, password: String) -> anyhow::Result<bool> {
-        verify(password.as_str(), &self.password).unwrap()
+        Ok(verify(password.as_str(), &self.password)?)
    }
 }
@@ -2,13 +2,17 @@ use actix_web::{web, HttpResponse};
 use diesel::RunQueryDsl;
 use crate::{
-    database::establish_connection, json_serialization::new_feed::NewFeedSchema,
+    auth::extractor::AuthUser, database::establish_connection,
-    models::feed::new_feed::NewFeed, schema::feed,
+    json_serialization::new_feed::NewFeedSchema, models::feed::new_feed::NewFeed, schema::feed,
 };
 use super::feeds;
-pub async fn add(new_feed: web::Json<NewFeedSchema>) -> HttpResponse {
+pub async fn add(new_feed: web::Json<NewFeedSchema>, auth_user: AuthUser) -> HttpResponse {
    if auth_user.0 != new_feed.user_id {
        return HttpResponse::Forbidden().finish();
    }
    let mut connection = establish_connection();
    let title: String = new_feed.title.clone();
    let url: String = new_feed.url.clone();
@@ -19,12 +23,12 @@ pub async fn add(new_feed: web::Json<NewFeedSchema>) -> HttpResponse {
        Ok(channel) => {
            log::info!("valid channel");
            if channel.items.is_empty() {
-                return HttpResponse::ServiceUnavailable().await.unwrap();
+                return HttpResponse::ServiceUnavailable().finish();
            }
        }
        Err(e) => {
            log::error!("{:?}", e);
-            return HttpResponse::NotFound().await.unwrap();
+            return HttpResponse::NotFound().finish();
        }
    }
@@ -35,25 +39,35 @@ pub async fn add(new_feed: web::Json<NewFeedSchema>) -> HttpResponse {
        .execute(&mut connection);
    match insert_result {
-        Ok(_) => HttpResponse::Created().await.unwrap(),
+        Ok(_) => HttpResponse::Created().finish(),
        Err(e) => {
            log::error!("{e}");
-            HttpResponse::Conflict().await.unwrap()
+            HttpResponse::Conflict().finish()
        }
    }
 }
 #[cfg(test)]
 mod tests {
    use actix_service::Service;
    use actix_web::http::StatusCode;
-    use actix_web::{test, web, App};
+    use actix_web::{test, web, App, HttpMessage};
    use super::add;
    use crate::auth::extractor::AuthUser;
    use crate::test_helpers::unique_suffix;
    #[actix_web::test]
    async fn add_fails_for_unfetchable_feed_url() {
-        let app = test::init_service(App::new().route("/add", web::post().to(add))).await;
+        let app = test::init_service(
            App::new()
                .wrap_fn(move |req, srv| {
                    req.extensions_mut().insert(AuthUser(1));
                    srv.call(req)
                })
                .route("/add", web::post().to(add)),
        )
        .await;
        let req = test::TestRequest::post()
            .uri("/add")
            .set_json(serde_json::json!({
@@ -66,4 +80,28 @@ mod tests {
        assert_eq!(StatusCode::NOT_FOUND, resp.status());
    }
    #[actix_web::test]
    async fn add_rejects_feed_for_another_user() {
        let app = test::init_service(
            App::new()
                .wrap_fn(move |req, srv| {
                    req.extensions_mut().insert(AuthUser(1));
                    srv.call(req)
                })
                .route("/add", web::post().to(add)),
        )
        .await;
        let req = test::TestRequest::post()
            .uri("/add")
            .set_json(serde_json::json!({
                "title": "Someone else's feed",
                "url": format!("https://example.test/feed/{}", unique_suffix()),
                "user_id": 2
            }))
            .to_request();
        let resp = test::call_service(&app, req).await;
        assert_eq!(StatusCode::FORBIDDEN, resp.status());
    }
 }
@@ -0,0 +1,183 @@
 use actix_web::{web, HttpResponse};
 use diesel::prelude::*;
 use crate::{
    auth::extractor::AuthUser,
    database::establish_connection,
    schema::{feed, feed_item},
 };
 pub async fn delete_feed(path: web::Path<i32>, auth_user: AuthUser) -> HttpResponse {
    let feed_id = path.into_inner();
    let mut connection = establish_connection();
    let owner: Option<i32> = feed::table
        .find(feed_id)
        .select(feed::user_id)
        .first(&mut connection)
        .optional()
        .unwrap_or(None);
    // Treat "doesn't exist" and "not yours" the same, so callers can't probe
    // for other users' feed ids.
    if owner != Some(auth_user.0) {
        return HttpResponse::NotFound().finish();
    }
    diesel::delete(feed_item::table.filter(feed_item::feed_id.eq(feed_id)))
        .execute(&mut connection)
        .ok();
    diesel::delete(feed::table.filter(feed::id.eq(feed_id)))
        .execute(&mut connection)
        .ok();
    HttpResponse::NoContent().finish()
 }
 #[cfg(test)]
 mod tests {
    use actix_service::Service;
    use actix_web::http::StatusCode;
    use actix_web::{test, web, App, HttpMessage};
    use diesel::prelude::*;
    use super::delete_feed;
    use crate::auth::extractor::AuthUser;
    use crate::database::establish_connection;
    use crate::schema::{feed, feed_item};
    use crate::test_helpers::{
        delete_feed as cleanup_feed, delete_user, insert_feed, insert_feed_item, insert_user,
    };
    #[actix_web::test]
    async fn delete_feed_removes_feed_and_items() {
        let mut connection = establish_connection();
        let user = insert_user(&mut connection, "secret");
        let f = insert_feed(&mut connection, user.id);
        let item = insert_feed_item(&mut connection, f.id, false);
        let user_id = user.id;
        let app = test::init_service(
            App::new()
                .wrap_fn(move |req, srv| {
                    req.extensions_mut().insert(AuthUser(user_id));
                    srv.call(req)
                })
                .route("/feed/{feed_id}", web::delete().to(delete_feed)),
        )
        .await;
        let req = test::TestRequest::delete()
            .uri(&format!("/feed/{}", f.id))
            .to_request();
        let resp = test::call_service(&app, req).await;
        assert_eq!(StatusCode::NO_CONTENT, resp.status());
        let feed_exists: i64 = feed::table
            .filter(feed::id.eq(f.id))
            .count()
            .get_result(&mut connection)
            .unwrap();
        assert_eq!(0, feed_exists);
        let item_exists: i64 = feed_item::table
            .filter(feed_item::id.eq(item.id))
            .count()
            .get_result(&mut connection)
            .unwrap();
        assert_eq!(0, item_exists);
        delete_user(&mut connection, user.id);
    }
    #[actix_web::test]
    async fn delete_feed_returns_404_for_nonexistent_feed() {
        let app = test::init_service(
            App::new()
                .wrap_fn(move |req, srv| {
                    req.extensions_mut().insert(AuthUser(1));
                    srv.call(req)
                })
                .route("/feed/{feed_id}", web::delete().to(delete_feed)),
        )
        .await;
        let req = test::TestRequest::delete()
            .uri("/feed/999999999")
            .to_request();
        let resp = test::call_service(&app, req).await;
        assert_eq!(StatusCode::NOT_FOUND, resp.status());
    }
    #[actix_web::test]
    async fn delete_feed_does_not_affect_other_feeds() {
        let mut connection = establish_connection();
        let user = insert_user(&mut connection, "secret");
        let feed_a = insert_feed(&mut connection, user.id);
        let feed_b = insert_feed(&mut connection, user.id);
        let user_id = user.id;
        let app = test::init_service(
            App::new()
                .wrap_fn(move |req, srv| {
                    req.extensions_mut().insert(AuthUser(user_id));
                    srv.call(req)
                })
                .route("/feed/{feed_id}", web::delete().to(delete_feed)),
        )
        .await;
        let req = test::TestRequest::delete()
            .uri(&format!("/feed/{}", feed_a.id))
            .to_request();
        let resp = test::call_service(&app, req).await;
        assert_eq!(StatusCode::NO_CONTENT, resp.status());
        let feed_b_exists: i64 = feed::table
            .filter(feed::id.eq(feed_b.id))
            .count()
            .get_result(&mut connection)
            .unwrap();
        assert_eq!(1, feed_b_exists);
        cleanup_feed(&mut connection, feed_b.id);
        delete_user(&mut connection, user.id);
    }
    #[actix_web::test]
    async fn delete_feed_rejects_other_users_feed() {
        let mut connection = establish_connection();
        let user_a = insert_user(&mut connection, "secret");
        let user_b = insert_user(&mut connection, "secret");
        let feed_b = insert_feed(&mut connection, user_b.id);
        let user_a_id = user_a.id;
        let app = test::init_service(
            App::new()
                .wrap_fn(move |req, srv| {
                    req.extensions_mut().insert(AuthUser(user_a_id));
                    srv.call(req)
                })
                .route("/feed/{feed_id}", web::delete().to(delete_feed)),
        )
        .await;
        let req = test::TestRequest::delete()
            .uri(&format!("/feed/{}", feed_b.id))
            .to_request();
        let resp = test::call_service(&app, req).await;
        assert_eq!(StatusCode::NOT_FOUND, resp.status());
        let feed_b_exists: i64 = feed::table
            .filter(feed::id.eq(feed_b.id))
            .count()
            .get_result(&mut connection)
            .unwrap();
        assert_eq!(1, feed_b_exists);
        cleanup_feed(&mut connection, feed_b.id);
        delete_user(&mut connection, user_a.id);
        delete_user(&mut connection, user_b.id);
    }
 }
@@ -1,9 +1,10 @@
 use std::error::Error;
 use rss::Channel;
-pub async fn get_feed(feed: &str) -> Result<Channel, Box<dyn Error>> {
+use super::net::safe_fetch;
-    let content = reqwest::get(feed).await?.bytes().await?;
+use crate::error::AppError;
 pub async fn get_feed(feed: &str) -> Result<Channel, AppError> {
    let content = safe_fetch(feed).await?.bytes().await?;
    let channel = Channel::read_from(&content[..])?;
    log::debug!("{:?}", channel);
    Ok(channel)
@@ -1,3 +1,5 @@
 use crate::auth::extractor::AuthUser;
 use crate::error::AppError;
 use crate::json_serialization::user::JsonUser;
 use crate::models::feed::rss_feed::Feed;
 use crate::models::feed_item::rss_feed_item::FeedItem;
@@ -9,22 +11,29 @@ use crate::{
    schema::feed::{self, user_id},
    schema::feed_item,
 };
-use actix_web::{web, HttpRequest, Responder};
+use actix_web::{web, HttpRequest, HttpResponse, Responder};
 use chrono::Local;
 use diesel::prelude::*;
 use super::structs::article::Article;
-pub async fn get(path: web::Path<JsonUser>, req: HttpRequest) -> impl Responder {
+pub async fn get(
    path: web::Path<JsonUser>,
    req: HttpRequest,
    auth_user: AuthUser,
 ) -> Result<HttpResponse, AppError> {
    let request = req.clone();
    let req_user_id = path.user_id;
    log::info!("Received user_id: {}", req_user_id);
    if auth_user.0 != req_user_id {
        return Ok(HttpResponse::Forbidden().finish());
    }
    let mut connection: diesel::PgConnection = establish_connection();
    let feeds: Vec<Feed> = feed::table
        .filter(user_id.eq(req_user_id))
-        .load::<Feed>(&mut connection)
+        .load::<Feed>(&mut connection)?;
        .unwrap();
    let mut feed_aggregates: Vec<FeedAggregate> = Vec::new();
    for feed in feeds {
@@ -32,8 +41,7 @@ pub async fn get(path: web::Path<JsonUser>, req: HttpRequest) -> impl Responder
            .filter(feed_id.eq(feed.id))
            .filter(read.eq(false))
            .order(id.asc())
-            .load(&mut connection)
+            .load(&mut connection)?;
            .unwrap();
        log::info!(
            "Load {} feed items for feed: {}",
@@ -70,15 +78,17 @@ pub async fn get(path: web::Path<JsonUser>, req: HttpRequest) -> impl Responder
        feeds: feed_aggregates,
    };
-    articles.respond_to(&request)
+    Ok(articles.respond_to(&request).map_into_boxed_body())
 }
 #[cfg(test)]
 mod tests {
    use actix_service::Service;
    use actix_web::http::StatusCode;
-    use actix_web::{test, web, App};
+    use actix_web::{test, web, App, HttpMessage};
    use super::get;
    use crate::auth::extractor::AuthUser;
    use crate::database::establish_connection;
    use crate::test_helpers::{
        delete_feed, delete_feed_item, delete_user, insert_feed, insert_feed_item, insert_user,
@@ -92,8 +102,16 @@ mod tests {
        let unread = insert_feed_item(&mut connection, feed.id, false);
        let read = insert_feed_item(&mut connection, feed.id, true);
-        let app =
+        let user_id = user.id;
-            test::init_service(App::new().route("/get/{user_id}", web::get().to(get))).await;
+        let app = test::init_service(
            App::new()
                .wrap_fn(move |req, srv| {
                    req.extensions_mut().insert(AuthUser(user_id));
                    srv.call(req)
                })
                .route("/get/{user_id}", web::get().to(get)),
        )
        .await;
        let req = test::TestRequest::get()
            .uri(&format!("/get/{}", user.id))
            .to_request();
@@ -112,4 +130,30 @@ mod tests {
        delete_feed(&mut connection, feed.id);
        delete_user(&mut connection, user.id);
    }
    #[actix_web::test]
    async fn get_rejects_requests_for_another_user() {
        let mut connection = establish_connection();
        let user_a = insert_user(&mut connection, "secret");
        let user_b = insert_user(&mut connection, "secret");
        let app = test::init_service(
            App::new()
                .wrap_fn(move |req, srv| {
                    req.extensions_mut().insert(AuthUser(user_a.id));
                    srv.call(req)
                })
                .route("/get/{user_id}", web::get().to(get)),
        )
        .await;
        let req = test::TestRequest::get()
            .uri(&format!("/get/{}", user_b.id))
            .to_request();
        let resp = test::call_service(&app, req).await;
        assert_eq!(StatusCode::FORBIDDEN, resp.status());
        delete_user(&mut connection, user_a.id);
        delete_user(&mut connection, user_b.id);
    }
 }
@@ -0,0 +1,139 @@
 use actix_web::{web, HttpRequest, HttpResponse, Responder};
 use diesel::prelude::*;
 use crate::{
    auth::extractor::AuthUser,
    database::establish_connection,
    error::AppError,
    json_serialization::feed_info::{FeedInfo, FeedInfoList},
    json_serialization::user::JsonUser,
    schema::feed::{self, user_id},
 };
 pub async fn list_feeds(
    path: web::Path<JsonUser>,
    req: HttpRequest,
    auth_user: AuthUser,
 ) -> Result<HttpResponse, AppError> {
    let request = req.clone();
    let req_user_id = path.user_id;
    if auth_user.0 != req_user_id {
        return Ok(HttpResponse::Forbidden().finish());
    }
    let mut connection = establish_connection();
    let feeds = feed::table
        .filter(user_id.eq(req_user_id))
        .select((feed::id, feed::title, feed::url))
        .load::<(i32, String, String)>(&mut connection)?;
    let feed_list: Vec<FeedInfo> = feeds
        .into_iter()
        .map(|(id, title, url)| FeedInfo { id, title, url })
        .collect();
    Ok(FeedInfoList { feeds: feed_list }
        .respond_to(&request)
        .map_into_boxed_body())
 }
 #[cfg(test)]
 mod tests {
    use actix_service::Service;
    use actix_web::http::StatusCode;
    use actix_web::{test, web, App, HttpMessage};
    use super::list_feeds;
    use crate::auth::extractor::AuthUser;
    use crate::database::establish_connection;
    use crate::test_helpers::{delete_feed, delete_user, insert_feed, insert_user};
    #[actix_web::test]
    async fn list_feeds_returns_feeds_for_user() {
        let mut connection = establish_connection();
        let user = insert_user(&mut connection, "secret");
        let feed = insert_feed(&mut connection, user.id);
        let user_id = user.id;
        let app = test::init_service(
            App::new()
                .wrap_fn(move |req, srv| {
                    req.extensions_mut().insert(AuthUser(user_id));
                    srv.call(req)
                })
                .route("/feeds/{user_id}", web::get().to(list_feeds)),
        )
        .await;
        let req = test::TestRequest::get()
            .uri(&format!("/feeds/{}", user.id))
            .to_request();
        let resp = test::call_service(&app, req).await;
        assert_eq!(StatusCode::OK, resp.status());
        let body = test::read_body(resp).await;
        let body_str = String::from_utf8(body.to_vec()).unwrap();
        assert!(body_str.contains(&feed.title));
        assert!(body_str.contains(&feed.url));
        delete_feed(&mut connection, feed.id);
        delete_user(&mut connection, user.id);
    }
    #[actix_web::test]
    async fn list_feeds_returns_empty_list_for_user_with_no_feeds() {
        let mut connection = establish_connection();
        let user = insert_user(&mut connection, "secret");
        let user_id = user.id;
        let app = test::init_service(
            App::new()
                .wrap_fn(move |req, srv| {
                    req.extensions_mut().insert(AuthUser(user_id));
                    srv.call(req)
                })
                .route("/feeds/{user_id}", web::get().to(list_feeds)),
        )
        .await;
        let req = test::TestRequest::get()
            .uri(&format!("/feeds/{}", user.id))
            .to_request();
        let resp = test::call_service(&app, req).await;
        assert_eq!(StatusCode::OK, resp.status());
        let body = test::read_body(resp).await;
        let body_str = String::from_utf8(body.to_vec()).unwrap();
        assert!(body_str.contains("\"feeds\":[]"));
        delete_user(&mut connection, user.id);
    }
    #[actix_web::test]
    async fn list_feeds_rejects_requests_for_another_user() {
        let mut connection = establish_connection();
        let user_a = insert_user(&mut connection, "secret");
        let user_b = insert_user(&mut connection, "secret");
        let feed_b = insert_feed(&mut connection, user_b.id);
        let user_a_id = user_a.id;
        let app = test::init_service(
            App::new()
                .wrap_fn(move |req, srv| {
                    req.extensions_mut().insert(AuthUser(user_a_id));
                    srv.call(req)
                })
                .route("/feeds/{user_id}", web::get().to(list_feeds)),
        )
        .await;
        let req = test::TestRequest::get()
            .uri(&format!("/feeds/{}", user_b.id))
            .to_request();
        let resp = test::call_service(&app, req).await;
        assert_eq!(StatusCode::FORBIDDEN, resp.status());
        delete_feed(&mut connection, feed_b.id);
        delete_user(&mut connection, user_a.id);
        delete_user(&mut connection, user_b.id);
    }
 }
@@ -1,42 +1,56 @@
 use crate::auth::extractor::AuthUser;
 use crate::error::AppError;
 use crate::schema::feed_item::{id, read};
 use crate::{
-    database::establish_connection, json_serialization::read_feed_item::ReadItem,
+    database::establish_connection,
-    models::feed_item::rss_feed_item::FeedItem, schema::feed_item,
+    json_serialization::read_feed_item::ReadItem,
    models::feed_item::rss_feed_item::FeedItem,
    schema::{feed, feed_item},
 };
 use actix_web::{web, HttpRequest, HttpResponse, Responder};
 use diesel::RunQueryDsl;
-use diesel::{ExpressionMethods, QueryDsl};
+use diesel::{ExpressionMethods, OptionalExtension, QueryDsl};
-pub async fn mark_read(_req: HttpRequest, path: web::Path<ReadItem>) -> impl Responder {
+pub async fn mark_read(
    _req: HttpRequest,
    path: web::Path<ReadItem>,
    auth_user: AuthUser,
 ) -> Result<impl Responder, AppError> {
    let mut connection = establish_connection();
    log::info!("Id: {}", path.id);
-    let feed_items: Vec<FeedItem> = feed_item::table
+
    // Join through to `feed` so we can confirm the item belongs to the caller
    // before mutating it. "Doesn't exist" and "not yours" both return 404.
    let owned_item: Option<(FeedItem, i32)> = feed_item::table
        .inner_join(feed::table)
        .filter(id.eq(path.id))
-        .load::<FeedItem>(&mut connection)
+        .select((feed_item::all_columns, feed::user_id))
-        .unwrap();
+        .first(&mut connection)
        .optional()?;
-    if feed_items.len() != 1 {
+    let feed_item = match owned_item {
-        return HttpResponse::NotFound();
+        Some((feed_item, owner_id)) if owner_id == auth_user.0 => feed_item,
-    }
+        _ => return Ok(HttpResponse::NotFound().finish()),
    };
-    let feed_item: &FeedItem = feed_items.first().unwrap();
+    let result = diesel::update(&feed_item)
    let result: Result<usize, diesel::result::Error> = diesel::update(feed_item)
        .set(read.eq(true))
-        .execute(&mut connection);
+        .execute(&mut connection)?;
    log::info!("Mark as read: {:?}", result);
-    HttpResponse::Ok()
+    Ok(HttpResponse::Ok().finish())
 }
 #[cfg(test)]
 mod tests {
    use actix_service::Service;
    use actix_web::http::StatusCode;
-    use actix_web::{test, web, App};
+    use actix_web::{test, web, App, HttpMessage};
    use diesel::prelude::*;
    use super::mark_read;
    use crate::auth::extractor::AuthUser;
    use crate::database::establish_connection;
    use crate::models::feed_item::rss_feed_item::FeedItem;
    use crate::schema::feed_item;
@@ -51,8 +65,16 @@ mod tests {
        let feed = insert_feed(&mut connection, user.id);
        let item = insert_feed_item(&mut connection, feed.id, false);
-        let app =
+        let user_id = user.id;
-            test::init_service(App::new().route("/read/{id}", web::put().to(mark_read))).await;
+        let app = test::init_service(
            App::new()
                .wrap_fn(move |req, srv| {
                    req.extensions_mut().insert(AuthUser(user_id));
                    srv.call(req)
                })
                .route("/read/{id}", web::put().to(mark_read)),
        )
        .await;
        let req = test::TestRequest::put()
            .uri(&format!("/read/{}", item.id))
            .to_request();
@@ -73,11 +95,55 @@ mod tests {
    #[actix_web::test]
    async fn mark_read_returns_not_found_for_unknown_id() {
-        let app =
+        let app = test::init_service(
-            test::init_service(App::new().route("/read/{id}", web::put().to(mark_read))).await;
+            App::new()
                .wrap_fn(move |req, srv| {
                    req.extensions_mut().insert(AuthUser(1));
                    srv.call(req)
                })
                .route("/read/{id}", web::put().to(mark_read)),
        )
        .await;
        let req = test::TestRequest::put().uri("/read/999999999").to_request();
        let resp = test::call_service(&app, req).await;
        assert_eq!(StatusCode::NOT_FOUND, resp.status());
    }
    #[actix_web::test]
    async fn mark_read_rejects_other_users_item() {
        let mut connection = establish_connection();
        let user_a = insert_user(&mut connection, "secret");
        let user_b = insert_user(&mut connection, "secret");
        let feed_b = insert_feed(&mut connection, user_b.id);
        let item_b = insert_feed_item(&mut connection, feed_b.id, false);
        let user_a_id = user_a.id;
        let app = test::init_service(
            App::new()
                .wrap_fn(move |req, srv| {
                    req.extensions_mut().insert(AuthUser(user_a_id));
                    srv.call(req)
                })
                .route("/read/{id}", web::put().to(mark_read)),
        )
        .await;
        let req = test::TestRequest::put()
            .uri(&format!("/read/{}", item_b.id))
            .to_request();
        let resp = test::call_service(&app, req).await;
        assert_eq!(StatusCode::NOT_FOUND, resp.status());
        let updated: FeedItem = feed_item::table
            .find(item_b.id)
            .first(&mut connection)
            .unwrap();
        assert!(!updated.read);
        delete_feed_item(&mut connection, item_b.id);
        delete_feed(&mut connection, feed_b.id);
        delete_user(&mut connection, user_a.id);
        delete_user(&mut connection, user_b.id);
    }
 }
@@ -2,9 +2,12 @@ use actix_web::web;
 use crate::views::path::Path;
 mod add;
 mod delete_feed;
 pub mod feeds;
 mod get;
 mod list_feeds;
 mod mark_read;
 pub mod net;
 mod read;
 mod scraper;
 pub mod structs;
@@ -19,6 +22,14 @@ pub fn feed_factory(app: &mut web::ServiceConfig) {
        &base_path.define(String::from("/get/{user_id}")),
        web::get().to(get::get),
    );
    app.route(
        &base_path.define(String::from("/feeds/{user_id}")),
        web::get().to(list_feeds::list_feeds),
    );
    app.route(
        &base_path.define(String::from("/feed/{feed_id}")),
        web::delete().to(delete_feed::delete_feed),
    );
    app.route(
        &base_path.define(String::from("/add")),
        web::post().to(add::add),
@@ -0,0 +1,145 @@
 use std::net::IpAddr;
 use anyhow::bail;
 use reqwest::{redirect::Policy, Client, Response, Url};
 use tokio::net::lookup_host;
 use crate::error::AppError;
 // Outbound requests for feed/article URLs are driven by user input (feed URLs,
 // "read" links). Without these checks a user could point the server at
 // internal services or cloud metadata endpoints (e.g. http://169.254.169.254/)
 // and have it fetch them on their behalf (SSRF).
 pub async fn safe_fetch(url: &str) -> Result<Response, AppError> {
    safe_fetch_inner(url).await.map_err(AppError::from)
 }
 // Redirects are validated and followed manually (rather than via
 // `redirect::Policy::default()`) so each hop's resolved address is checked
 // against `is_globally_routable` before it's fetched — otherwise an allowed
 // host could redirect to an internal address and bypass the checks below.
 const MAX_REDIRECTS: u8 = 5;
 async fn safe_fetch_inner(url: &str) -> anyhow::Result<Response> {
    let client = Client::builder().redirect(Policy::none()).build()?;
    let mut current = Url::parse(url)?;
    for _ in 0..=MAX_REDIRECTS {
        check_url_is_safe(&current).await?;
        let response = client.get(current.clone()).send().await?;
        if response.status().is_redirection() {
            let location = response
                .headers()
                .get(reqwest::header::LOCATION)
                .ok_or_else(|| {
                    anyhow::anyhow!("redirect response from {} has no Location header", current)
                })?
                .to_str()?;
            current = current.join(location)?;
            continue;
        }
        return Ok(response);
    }
    bail!("refusing to fetch {}: too many redirects", url);
 }
 async fn check_url_is_safe(url: &Url) -> anyhow::Result<()> {
    if url.scheme() != "http" && url.scheme() != "https" {
        bail!("refusing to fetch {}: unsupported URL scheme", url);
    }
    let host = url
        .host_str()
        .ok_or_else(|| anyhow::anyhow!("refusing to fetch {}: URL has no host", url))?;
    let port = url.port_or_known_default().unwrap_or(80);
    let mut resolved_any = false;
    for addr in lookup_host((host, port)).await? {
        resolved_any = true;
        if !is_globally_routable(addr.ip()) {
            bail!(
                "refusing to fetch {}: resolves to non-public address {}",
                url,
                addr.ip()
            );
        }
    }
    if !resolved_any {
        bail!("refusing to fetch {}: host did not resolve to any address", url);
    }
    Ok(())
 }
 fn is_globally_routable(ip: IpAddr) -> bool {
    match ip {
        IpAddr::V4(v4) => {
            !(v4.is_private()
                || v4.is_loopback()
                || v4.is_link_local()
                || v4.is_unspecified()
                || v4.is_broadcast()
                || v4.is_multicast())
        }
        IpAddr::V6(v6) => {
            if let Some(v4) = v6.to_ipv4_mapped() {
                return is_globally_routable(IpAddr::V4(v4));
            }
            let segments = v6.segments();
            let is_unique_local = (segments[0] & 0xfe00) == 0xfc00; // fc00::/7
            let is_unicast_link_local = (segments[0] & 0xffc0) == 0xfe80; // fe80::/10
            !(v6.is_loopback()
                || v6.is_unspecified()
                || v6.is_multicast()
                || is_unique_local
                || is_unicast_link_local)
        }
    }
 }
 #[cfg(test)]
 mod tests {
    use super::*;
    #[test]
    fn rejects_loopback_and_private_addresses() {
        assert!(!is_globally_routable("127.0.0.1".parse().unwrap()));
        assert!(!is_globally_routable("10.0.0.5".parse().unwrap()));
        assert!(!is_globally_routable("192.168.1.1".parse().unwrap()));
        assert!(!is_globally_routable("169.254.169.254".parse().unwrap()));
        assert!(!is_globally_routable("::1".parse().unwrap()));
        assert!(!is_globally_routable("fc00::1".parse().unwrap()));
        assert!(!is_globally_routable("fe80::1".parse().unwrap()));
        assert!(!is_globally_routable("::ffff:127.0.0.1".parse().unwrap()));
    }
    #[test]
    fn allows_public_addresses() {
        assert!(is_globally_routable("93.184.216.34".parse().unwrap()));
        assert!(is_globally_routable("2606:2800:220:1:248:1893:25c8:1946".parse().unwrap()));
    }
    #[actix_web::test]
    async fn rejects_unsupported_schemes() {
        let result = safe_fetch("ftp://example.test/file").await;
        assert!(result.is_err());
    }
    #[actix_web::test]
    async fn rejects_loopback_urls() {
        let result = safe_fetch("http://127.0.0.1:8001/").await;
        assert!(result.is_err());
    }
    #[actix_web::test]
    async fn rejects_link_local_metadata_url() {
        let result = safe_fetch("http://169.254.169.254/latest/meta-data/").await;
        assert!(result.is_err());
    }
 }
@@ -1,8 +1,9 @@
-use reqwest::Error;
+use super::super::net::safe_fetch;
 use crate::error::AppError;
 // Do a request for the given URL, with a minimum time between requests
 // to avoid overloading the server.
-pub async fn do_throttled_request(url: &str) -> Result<String, Error> {
+pub async fn do_throttled_request(url: &str) -> Result<String, AppError> {
-    let response = reqwest::get(url).await?;
+    let response = safe_fetch(url).await?;
-    response.text().await
+    Ok(response.text().await?)
 }
@@ -1,4 +1,6 @@
 use super::feeds;
 use crate::auth::extractor::AuthUser;
 use crate::error::AppError;
 use crate::json_serialization::user::JsonUser;
 use crate::models::feed::rss_feed::Feed;
 use crate::models::feed_item::new_feed_item::NewFeedItem;
@@ -11,12 +13,13 @@ use crate::{
        feed_item,
    },
 };
-use actix_web::{web, HttpRequest, HttpResponse, Responder};
+use actix_web::{web, HttpRequest, HttpResponse};
-use chrono::{DateTime, Duration, Local, NaiveDateTime};
+use chrono::{DateTime, Local, NaiveDateTime};
 use dateparser::parse;
 use diesel::prelude::*;
 use rss::Item;
 use scraper::{Html, Selector};
 use std::collections::{HashMap, HashSet};
 fn get_date(date_str: &str) -> Result<NaiveDateTime, chrono::ParseError> {
    if let Ok(result) = parse(date_str) {
@@ -46,6 +49,20 @@ fn escape_html_attr(value: &str) -> String {
        .replace('>', "&gt;")
 }
 // Feed-supplied `<img>` markup is rendered as-is (via `v-html`) in the frontend,
 // so strip everything except a harmless image tag before it's stored — in
 // particular event handlers like `onerror`/`onload` that a malicious feed
 // could use for XSS.
 fn sanitize_img_html(html: &str) -> String {
    let allowed_attributes = HashSet::from(["src", "alt", "title"]);
    ammonia::Builder::default()
        .tags(HashSet::from(["img"]))
        .tag_attributes(HashMap::from([("img", allowed_attributes)]))
        .clean(html)
        .to_string()
 }
 // Some feeds (e.g. Deutsche Welle) don't embed an <img> in the item content at
 // all — they carry the article image as an RSS <enclosure> instead. Build an
 // <img> tag from it so those feeds get a preview image too.
@@ -60,14 +77,22 @@ fn enclosure_image_html(item: &Item) -> Option<String> {
    ))
 }
-fn create_feed_item(item: Item, feed: &Feed, connection: &mut PgConnection) {
+fn create_feed_item(item: Item, feed: &Feed, connection: &mut PgConnection) -> anyhow::Result<()> {
-    let item_title = item.title.clone().unwrap();
+    // Items without a title or link are malformed/unusable — skip them rather
    // than failing the whole sync over one bad entry from an external feed.
    let Some(item_title) = item.title.clone() else {
        log::warn!("Skipping feed item without a title.");
        return Ok(());
    };
    if item.link.is_none() {
        log::warn!("Skipping feed item without a link: {}", item_title);
        return Ok(());
    }
    log::info!("Create feed item: {}", item_title);
-    // Resolve the publication date before any HTML parsing or DB work so we can
+    // Items without a pub_date are treated as current (inserted unconditionally)
-    // bail out early for old articles. Items without a pub_date are treated as
+    // — feeds that don't publish dates are typically small/curated enough that
-    // current (inserted unconditionally) — feeds that don't publish dates are
+    // this is fine.
    // typically small/curated enough that this is fine.
    let mut time: NaiveDateTime = Local::now().naive_local();
    if let Some(pub_date) = item.pub_date() {
        time = match get_date(pub_date) {
@@ -79,32 +104,40 @@ fn create_feed_item(item: Item, feed: &Feed, connection: &mut PgConnection) {
        };
    }
    let cutoff = Local::now().naive_local() - Duration::days(14);
    if time < cutoff {
        log::info!("Skipping item {} (older than 2 weeks).", item_title);
        return;
    }
    let base_content: &str = item.content().or(item.description()).unwrap_or_default();
    let frag = Html::parse_fragment(base_content);
    let mut content = "".to_string();
-    let selector_img = Selector::parse("img").unwrap();
+    // Some feeds (e.g. Stuttgarter Nachrichten) embed a social-sharing widget
    // (WhatsApp/Email/Facebook/... links plus a "Link kopiert" tooltip) in the
    // article content. It's not part of the article and isn't present in the
    // scraped/readable edition either, so skip its text when flattening below.
    let selector_social_bar =
        Selector::parse("#article-social-bar").expect("\"#article-social-bar\" is a valid CSS selector");
    let excluded_node_ids: std::collections::HashSet<_> = frag
        .select(&selector_social_bar)
        .flat_map(|el| el.descendants().map(|node| node.id()))
        .collect();
    let selector_img = Selector::parse("img").expect("\"img\" is a valid CSS selector");
    match frag.select(&selector_img).find(image_src_is_resolvable) {
        Some(image) => {
-            content.push_str(&image.html());
+            content.push_str(&sanitize_img_html(&image.html()));
            content.push_str("<br>");
        }
        None => {
            if let Some(image_html) = enclosure_image_html(&item) {
-                content.push_str(&image_html);
+                content.push_str(&sanitize_img_html(&image_html));
                content.push_str("<br>");
            }
        }
    }
    for node in frag.tree.nodes() {
        if excluded_node_ids.contains(&node.id()) {
            continue;
        }
        if let scraper::node::Node::Text(text) = node.value() {
            content.push_str(&text.text);
        }
@@ -113,15 +146,14 @@ fn create_feed_item(item: Item, feed: &Feed, connection: &mut PgConnection) {
    let existing_item: Vec<FeedItem> = feed_item::table
        .filter(feed_id.eq(feed.id))
        .filter(title.eq(&item_title))
-        .load(connection)
+        .load(connection)?;
        .unwrap();
    if existing_item.is_empty() {
        let new_feed_item = NewFeedItem::new(
            feed.id,
            content.clone(),
            item_title.clone(),
-            item.link.unwrap(),
+            item.link.expect("checked above"),
            Some(time),
        );
        let insert_result = diesel::insert_into(feed_item::table)
@@ -132,30 +164,26 @@ fn create_feed_item(item: Item, feed: &Feed, connection: &mut PgConnection) {
    } else {
        log::info!("Item {} already exists.", item_title);
    }
    Ok(())
 }
-// Items without a `created_ts` (e.g. ones inserted before this column existed,
+pub async fn sync(
-// or whose feed didn't provide a publish date) are left alone — `lt` never
+    _req: HttpRequest,
-// matches NULL, so there's nothing to special-case here.
+    data: web::Json<JsonUser>,
-fn delete_old_feed_items(connection: &mut PgConnection) {
+    auth_user: AuthUser,
-    let cutoff = Local::now().naive_local() - Duration::days(14);
+) -> Result<HttpResponse, AppError> {
    let result = diesel::delete(feed_item::table.filter(feed_item::created_ts.lt(cutoff)))
        .execute(connection);
    log::info!("Deleted old feed items (older than 2 weeks): {:?}", result);
 }
 pub async fn sync(_req: HttpRequest, data: web::Json<JsonUser>) -> impl Responder {
    let mut connection: diesel::PgConnection = establish_connection();
    delete_old_feed_items(&mut connection);
    let req_user_id: i32 = data.user_id;
    if auth_user.0 != req_user_id {
        return Ok(HttpResponse::Forbidden().finish());
    }
    let mut connection: diesel::PgConnection = establish_connection();
    let feeds: Vec<Feed> = feed::table
        .filter(user_id.eq(req_user_id))
-        .load::<Feed>(&mut connection)
+        .load::<Feed>(&mut connection)?;
        .unwrap();
    log::info!("Found {} feeds to sync.", feeds.len());
@@ -167,14 +195,16 @@ pub async fn sync(_req: HttpRequest, data: web::Json<JsonUser>) -> impl Responde
            Ok(channel) => {
                for item in channel.into_items() {
                    log::info!("{:?}", item);
-                    create_feed_item(item, &feed, &mut connection);
+                    if let Err(e) = create_feed_item(item, &feed, &mut connection) {
                        log::error!("Could not create feed item for {}: {:?}", feed.url, e);
                    }
                }
            }
            Err(e) => log::error!("Could not get channel {}. Error: {}", feed.url, e),
        }
    }
-    HttpResponse::Ok()
+    Ok(HttpResponse::Ok().finish())
 }
 #[cfg(test)]
@@ -184,6 +214,7 @@ mod tests {
    use crate::models::user::rss_user::User;
    use crate::schema::users;
    use crate::test_helpers::unique_suffix;
    use chrono::Duration;
    use super::*;
@@ -271,93 +302,46 @@ mod tests {
        );
    }
-    #[actix_web::test]
+    #[test]
-    async fn delete_old_feed_items_removes_items_older_than_two_weeks_but_keeps_recent_ones() {
+    fn sanitize_img_html_strips_event_handlers() {
-        let mut connection = establish_connection();
+        let sanitized = sanitize_img_html(r#"<img src="x" onerror="alert(1)">"#);
        let suffix = unique_suffix();
-        let new_user = NewUser::new(
+        assert!(!sanitized.contains("onerror"));
-            format!("cleanup_test_{suffix}"),
+        assert!(!sanitized.contains("alert"));
-            format!("cleanup_{suffix}@example.test"),
+        assert!(sanitized.contains(r#"src="x""#));
-            "secret".to_string(),
+    }
    #[test]
    fn sanitize_img_html_keeps_only_allowed_attributes() {
        let sanitized = sanitize_img_html(
            r#"<img src="https://example.test/img.jpg" alt="desc" title="t" style="display:none" class="evil">"#,
        );
        let user: User = diesel::insert_into(users::table)
            .values(&new_user)
            .get_result(&mut connection)
            .unwrap();
-        let new_feed = NewFeed::new(
+        assert!(sanitized.contains(r#"src="https://example.test/img.jpg""#));
-            format!("Cleanup test feed {suffix}"),
+        assert!(sanitized.contains(r#"alt="desc""#));
-            format!("https://example.test/feed/{suffix}"),
+        assert!(sanitized.contains(r#"title="t""#));
-            user.id,
+        assert!(!sanitized.contains("style"));
-        );
+        assert!(!sanitized.contains("class"));
        let feed: Feed = diesel::insert_into(feed::table)
            .values(&new_feed)
            .get_result(&mut connection)
            .unwrap();
        let now = Local::now().naive_local();
        let old_item = NewFeedItem::new(
            feed.id,
            "old content".to_string(),
            format!("Old article {suffix}"),
            format!("https://example.test/article/old-{suffix}"),
            Some(now - Duration::days(20)),
        );
        let recent_item = NewFeedItem::new(
            feed.id,
            "recent content".to_string(),
            format!("Recent article {suffix}"),
            format!("https://example.test/article/recent-{suffix}"),
            Some(now - Duration::days(1)),
        );
        diesel::insert_into(feed_item::table)
            .values(&old_item)
            .execute(&mut connection)
            .unwrap();
        let recent: FeedItem = diesel::insert_into(feed_item::table)
            .values(&recent_item)
            .get_result(&mut connection)
            .unwrap();
        delete_old_feed_items(&mut connection);
        let remaining: Vec<FeedItem> = feed_item::table
            .filter(feed_id.eq(feed.id))
            .load(&mut connection)
            .unwrap();
        assert_eq!(1, remaining.len(), "only the recent item should survive cleanup");
        assert_eq!(recent.id, remaining[0].id);
        diesel::delete(feed_item::table.filter(feed_id.eq(feed.id)))
            .execute(&mut connection)
            .ok();
        diesel::delete(feed::table.filter(feed::id.eq(feed.id)))
            .execute(&mut connection)
            .ok();
        diesel::delete(users::table.filter(users::id.eq(user.id)))
            .execute(&mut connection)
            .ok();
    }
    #[actix_web::test]
-    async fn create_feed_item_skips_articles_older_than_two_weeks() {
+    async fn create_feed_item_inserts_articles_older_than_two_weeks() {
        let mut connection = establish_connection();
        let suffix = unique_suffix();
        let new_user = NewUser::new(
-            format!("age_skip_test_{suffix}"),
+            format!("age_test_{suffix}"),
-            format!("age_skip_{suffix}@example.test"),
+            format!("age_{suffix}@example.test"),
            "secret".to_string(),
-        );
+        )
        .unwrap();
        let user: User = diesel::insert_into(users::table)
            .values(&new_user)
            .get_result(&mut connection)
            .unwrap();
        let new_feed = NewFeed::new(
-            format!("Age skip test feed {suffix}"),
+            format!("Age test feed {suffix}"),
            format!("https://example.test/feed/{suffix}"),
            user.id,
        );
@@ -366,7 +350,9 @@ mod tests {
            .get_result(&mut connection)
            .unwrap();
-        // Item with a pub_date 20 days ago — should be ignored by create_feed_item.
+        // Item with a pub_date 20 days ago — should still be inserted, since
        // infrequently-updated feeds (or infrequent syncs) must not lose
        // articles the user hasn't seen yet.
        let old_date = (Local::now() - Duration::days(20))
            .format("%a, %d %b %Y %H:%M:%S %z")
            .to_string();
@@ -382,19 +368,15 @@ mod tests {
        fresh_item.set_link(Some(format!("https://example.test/fresh/{suffix}")));
        fresh_item.set_content(Some("<p>fresh</p>".to_string()));
-        create_feed_item(old_item, &feed, &mut connection);
+        create_feed_item(old_item, &feed, &mut connection).unwrap();
-        create_feed_item(fresh_item, &feed, &mut connection);
+        create_feed_item(fresh_item, &feed, &mut connection).unwrap();
        let items: Vec<FeedItem> = feed_item::table
            .filter(feed_id.eq(feed.id))
            .load(&mut connection)
            .unwrap();
-        assert_eq!(1, items.len(), "old item should have been skipped");
+        assert_eq!(2, items.len(), "both old and fresh items should be inserted");
        assert!(
            items[0].title.contains("Fresh article"),
            "only the fresh item should be present"
        );
        diesel::delete(feed_item::table.filter(feed_id.eq(feed.id)))
            .execute(&mut connection)
@@ -416,7 +398,8 @@ mod tests {
            format!("sync_test_{suffix}"),
            format!("sync_{suffix}@example.test"),
            "secret".to_string(),
-        );
+        )
        .unwrap();
        let user: User = diesel::insert_into(users::table)
            .values(&new_user)
            .get_result(&mut connection)
@@ -437,8 +420,8 @@ mod tests {
        item.set_link(Some(format!("https://example.test/article/{suffix}")));
        item.set_content(Some("<p>Hello world</p>".to_string()));
-        create_feed_item(item.clone(), &feed, &mut connection);
+        create_feed_item(item.clone(), &feed, &mut connection).unwrap();
-        create_feed_item(item, &feed, &mut connection);
+        create_feed_item(item, &feed, &mut connection).unwrap();
        let items: Vec<FeedItem> = feed_item::table
            .filter(feed_id.eq(feed.id))
@@ -456,4 +439,123 @@ mod tests {
            .execute(&mut connection)
            .ok();
    }
    #[actix_web::test]
    async fn create_feed_item_strips_onerror_from_feed_image() {
        let mut connection = establish_connection();
        let suffix = unique_suffix();
        let new_user = NewUser::new(
            format!("xss_test_{suffix}"),
            format!("xss_{suffix}@example.test"),
            "secret".to_string(),
        )
        .unwrap();
        let user: User = diesel::insert_into(users::table)
            .values(&new_user)
            .get_result(&mut connection)
            .unwrap();
        let new_feed = NewFeed::new(
            format!("XSS test feed {suffix}"),
            format!("https://example.test/feed/{suffix}"),
            user.id,
        );
        let feed: Feed = diesel::insert_into(feed::table)
            .values(&new_feed)
            .get_result(&mut connection)
            .unwrap();
        let mut item = Item::default();
        item.set_title(Some(format!("XSS article {suffix}")));
        item.set_link(Some(format!("https://example.test/xss/{suffix}")));
        item.set_content(Some(
            r#"<img src="https://example.test/real.jpg" onerror="alert(1)"><p>text</p>"#
                .to_string(),
        ));
        create_feed_item(item, &feed, &mut connection).unwrap();
        let stored: FeedItem = feed_item::table
            .filter(feed_id.eq(feed.id))
            .first(&mut connection)
            .unwrap();
        assert!(!stored.content.contains("onerror"));
        assert!(!stored.content.contains("alert"));
        assert!(stored.content.contains(r#"src="https://example.test/real.jpg""#));
        diesel::delete(feed_item::table.filter(feed_id.eq(feed.id)))
            .execute(&mut connection)
            .ok();
        diesel::delete(feed::table.filter(feed::id.eq(feed.id)))
            .execute(&mut connection)
            .ok();
        diesel::delete(users::table.filter(users::id.eq(user.id)))
            .execute(&mut connection)
            .ok();
    }
    #[actix_web::test]
    async fn create_feed_item_strips_social_sharing_widget() {
        let mut connection = establish_connection();
        let suffix = unique_suffix();
        let new_user = NewUser::new(
            format!("social_bar_test_{suffix}"),
            format!("social_bar_{suffix}@example.test"),
            "secret".to_string(),
        )
        .unwrap();
        let user: User = diesel::insert_into(users::table)
            .values(&new_user)
            .get_result(&mut connection)
            .unwrap();
        let new_feed = NewFeed::new(
            format!("Social bar test feed {suffix}"),
            format!("https://example.test/feed/{suffix}"),
            user.id,
        );
        let feed: Feed = diesel::insert_into(feed::table)
            .values(&new_feed)
            .get_result(&mut connection)
            .unwrap();
        let mut item = Item::default();
        item.set_title(Some(format!("Social bar article {suffix}")));
        item.set_link(Some(format!("https://example.test/article/{suffix}")));
        item.set_content(Some(
            r#"<p>Article text</p>
            <div id="article-social-bar" data-noprint="true">
              <ul>
                <li><a id="whatsapp" href="whatsapp://send?text=foo">&nbsp;</a></li>
                <li><a id="link_copy" onclick="copyToClipboard()">&nbsp;</a>
                  <p>Link kopiert</p>
                </li>
              </ul>
            </div>"#
                .to_string(),
        ));
        create_feed_item(item, &feed, &mut connection).unwrap();
        let items: Vec<FeedItem> = feed_item::table
            .filter(feed_id.eq(feed.id))
            .load(&mut connection)
            .unwrap();
        assert_eq!(1, items.len());
        assert!(items[0].content.contains("Article text"));
        assert!(!items[0].content.contains("Link kopiert"));
        diesel::delete(feed_item::table.filter(feed_id.eq(feed.id)))
            .execute(&mut connection)
            .ok();
        diesel::delete(feed::table.filter(feed::id.eq(feed.id)))
            .execute(&mut connection)
            .ok();
        diesel::delete(users::table.filter(users::id.eq(user.id)))
            .execute(&mut connection)
            .ok();
    }
 }
@@ -28,6 +28,7 @@ diesel::table! {
        email -> Varchar,
        password -> Varchar,
        unique_id -> Varchar,
        token_version -> Int4,
    }
 }
@@ -28,7 +28,8 @@ pub fn insert_user(connection: &mut PgConnection, password: &str) -> User {
        format!("test_user_{suffix}"),
        format!("test_{suffix}@example.test"),
        password.to_string(),
-    );
+    )
    .expect("failed to hash test user password");
    diesel::insert_into(users::table)
        .values(&new_user)
        .get_result(connection)
@@ -1,5 +1,6 @@
 use crate::database::establish_connection;
 use crate::diesel;
 use crate::error::AppError;
 use crate::json_serialization::login::Login;
 use crate::models::user::rss_user::User;
 use crate::schema::users;
@@ -7,7 +8,7 @@ use crate::{auth::jwt::JwtToken, schema::users::username};
 use actix_web::{web, HttpResponse};
 use diesel::prelude::*;
-pub async fn login(credentials: web::Json<Login>) -> HttpResponse {
+pub async fn login(credentials: web::Json<Login>) -> Result<HttpResponse, AppError> {
    let username_cred: String = credentials.username.clone();
    let password: String = credentials.password.clone();
@@ -15,32 +16,30 @@ pub async fn login(credentials: web::Json<Login>) -> HttpResponse {
    let users: Vec<User> = users::table
        .filter(username.eq(username_cred.as_str()))
-        .load::<User>(&mut connection)
+        .load::<User>(&mut connection)?;
        .unwrap();
    if users.is_empty() {
-        return HttpResponse::NotFound().await.unwrap();
+        return Ok(HttpResponse::NotFound().finish());
    } else if users.len() > 1 {
        log::error!(
            "multiple user have the usernam: {}",
            credentials.username.clone()
        );
-        return HttpResponse::Conflict().await.unwrap();
+        return Ok(HttpResponse::Conflict().finish());
    }
    let user: &User = &users[0];
-    match user.clone().verify(password) {
+    match user.clone().verify(password)? {
        true => {
            log::info!("verified password successfully for user {}", user.id);
-            let token: String = JwtToken::encode(user.clone().id);
+            let token: String = JwtToken::encode(user.id, user.token_version);
-            HttpResponse::Ok()
+            Ok(HttpResponse::Ok()
                .insert_header(("token", token))
                .insert_header(("user_id", user.id))
-                .await
+                .finish())
                .unwrap()
        }
-        false => HttpResponse::Unauthorized().await.unwrap(),
+        false => Ok(HttpResponse::Unauthorized().finish()),
    }
 }
@@ -1,25 +1,62 @@
 use actix_web::HttpResponse;
 use diesel::prelude::*;
-// JWT auth is stateless and there is no token blacklist, so logging out is
+use crate::auth::extractor::AuthUser;
-// purely a client-side action (discarding the stored token). This endpoint
+use crate::database::establish_connection;
-// exists so the frontend has something to call and gets a clean response.
+use crate::error::AppError;
-pub async fn logout() -> HttpResponse {
+use crate::schema::users;
-    HttpResponse::Ok().finish()
+
 /// Invalidates every token previously issued for this user by bumping
 /// `token_version` — the auth middleware rejects tokens whose `tv` claim no
 /// longer matches the stored value.
 pub async fn logout(auth_user: AuthUser) -> Result<HttpResponse, AppError> {
    let mut connection = establish_connection();
    diesel::update(users::table.find(auth_user.0))
        .set(users::token_version.eq(users::token_version + 1))
        .execute(&mut connection)?;
    Ok(HttpResponse::Ok().finish())
 }
 #[cfg(test)]
 mod tests {
    use actix_service::Service;
    use actix_web::http::StatusCode;
-    use actix_web::{test, web, App};
+    use actix_web::{test, web, App, HttpMessage};
    use diesel::prelude::*;
    use super::logout;
    use crate::auth::extractor::AuthUser;
    use crate::database::establish_connection;
    use crate::models::user::rss_user::User;
    use crate::schema::users;
    use crate::test_helpers::{delete_user, insert_user};
    #[actix_web::test]
-    async fn logout_returns_ok() {
+    async fn logout_bumps_token_version() {
-        let app = test::init_service(App::new().route("/logout", web::post().to(logout))).await;
+        let mut connection = establish_connection();
        let user = insert_user(&mut connection, "secret");
        let user_id = user.id;
        let initial_version = user.token_version;
        let app = test::init_service(
            App::new()
                .wrap_fn(move |req, srv| {
                    req.extensions_mut().insert(AuthUser(user_id));
                    srv.call(req)
                })
                .route("/logout", web::post().to(logout)),
        )
        .await;
        let req = test::TestRequest::post().uri("/logout").to_request();
        let resp = test::call_service(&app, req).await;
        assert_eq!(StatusCode::OK, resp.status());
        let updated: User = users::table.find(user_id).first(&mut connection).unwrap();
        assert_eq!(initial_version + 1, updated.token_version);
        delete_user(&mut connection, user_id);
    }
 }
@@ -1,3 +1,4 @@
 use actix_governor::{Governor, GovernorConfigBuilder};
 use actix_web::web;
 use actix_web::web::ServiceConfig;
@@ -12,9 +13,19 @@ pub fn auth_factory(app: &mut ServiceConfig) {
        backend: true,
    };
-    app.route(
+    // Login is the only unauthenticated endpoint that checks a password, so
-        &base_path.define(String::from("/login")),
+    // it's the only one worth rate-limiting against brute-force/credential
-        web::post().to(login::login),
+    // stuffing. One request every 2s with a burst of 5 per IP.
    let login_rate_limit = GovernorConfigBuilder::default()
        .seconds_per_request(2)
        .burst_size(5)
        .finish()
        .expect("valid governor rate-limit config");
    app.service(
        web::resource(base_path.define(String::from("/login")))
            .wrap(Governor::new(&login_rate_limit))
            .route(web::post().to(login::login)),
    );
    app.route(
        &base_path.define(String::from("/logout")),
@@ -1,27 +1,32 @@
 use crate::database::establish_connection;
 use crate::diesel;
 use crate::error::AppError;
 use crate::json_serialization::new_user::NewUserSchema;
-use crate::models::user::new_user::NewUser;
+use crate::models::user::new_user::{validate_password, NewUser};
 use crate::schema::users;
 use actix_web::{web, HttpResponse};
 use diesel::prelude::*;
-pub async fn create(new_user: web::Json<NewUserSchema>) -> HttpResponse {
+pub async fn create(new_user: web::Json<NewUserSchema>) -> Result<HttpResponse, AppError> {
    let mut connection = establish_connection();
    let name: String = new_user.name.clone();
    let email: String = new_user.email.clone();
    let new_password: String = new_user.password.clone();
-    let new_user = NewUser::new(name, email, new_password);
+    if let Err(message) = validate_password(&new_password) {
        return Ok(HttpResponse::BadRequest().body(message));
    }
    let new_user = NewUser::new(name, email, new_password)?;
    let insert_result = diesel::insert_into(users::table)
        .values(&new_user)
        .execute(&mut connection);
-    match insert_result {
+    Ok(match insert_result {
-        Ok(_) => HttpResponse::Created().await.unwrap(),
+        Ok(_) => HttpResponse::Created().finish(),
-        Err(_) => HttpResponse::Conflict().await.unwrap(),
+        Err(_) => HttpResponse::Conflict().finish(),
-    }
+    })
 }
 #[cfg(test)]
@@ -60,6 +65,24 @@ mod tests {
            .ok();
    }
    #[actix_web::test]
    async fn create_fails_for_short_password() {
        let suffix = unique_suffix();
        let app = test::init_service(App::new().route("/create", web::post().to(create))).await;
        let req = test::TestRequest::post()
            .uri("/create")
            .set_json(serde_json::json!({
                "name": format!("short_pw_{suffix}"),
                "email": format!("short_{suffix}@example.test"),
                "password": "abc"
            }))
            .to_request();
        let resp = test::call_service(&app, req).await;
        assert_eq!(StatusCode::BAD_REQUEST, resp.status());
    }
    #[actix_web::test]
    async fn create_fails_for_duplicate_user() {
        let mut connection = establish_connection();
@@ -70,6 +70,10 @@
 body {
  min-height: 100vh;
  /* Full-bleed article images use a `100vw`-based breakout, which can be
     wider than the visible content area (scrollbar) and would otherwise
     introduce a horizontal scrollbar. */
  overflow-x: hidden;
  color: var(--color-text);
  background: var(--color-background);
  transition: color 0.5s, background-color 0.5s;
@@ -0,0 +1,133 @@
 <script setup>
 import { ref, onMounted } from 'vue'
 import axios from 'axios'
 const feeds = ref([])
 const error = ref('')
 function authHeaders() {
  return {
    headers: {
      'Content-Type': 'application/json',
      'user-token': localStorage.getItem('user-token'),
    },
  }
 }
 async function loadFeeds() {
  const userId = localStorage.getItem('user-id')
  try {
    const response = await axios.get(`/api/v1/article/feeds/${userId}`, authHeaders())
    feeds.value = response.data.feeds
  } catch (e) {
    error.value = 'Failed to load feeds.'
  }
 }
 async function deleteFeed(feedId) {
  if (!window.confirm('Delete this feed and all its articles?')) return
  try {
    await axios.delete(`/api/v1/article/feed/${feedId}`, authHeaders())
    feeds.value = feeds.value.filter(f => f.id !== feedId)
  } catch (e) {
    error.value = 'Failed to delete feed.'
  }
 }
 onMounted(loadFeeds)
 </script>
 <template>
  <div class="admin">
    <h1 class="admin__heading">Admin</h1>
    <p v-if="error" class="admin__error">{{ error }}</p>
    <p v-else-if="feeds.length === 0" class="admin__empty">No feeds added yet.</p>
    <ul v-else class="admin__list">
      <li v-for="feed in feeds" :key="feed.id" class="admin__item">
        <div class="admin__item-info">
          <span class="admin__item-title">{{ feed.title }}</span>
          <a :href="feed.url" class="admin__item-url" target="_blank" rel="noopener">{{ feed.url }}</a>
        </div>
        <button class="admin__delete" type="button" @click="deleteFeed(feed.id)">Delete</button>
      </li>
    </ul>
  </div>
 </template>
 <style scoped>
 .admin {
  padding: 1.5rem 1rem;
  max-width: 720px;
  margin: 0 auto;
 }
 .admin__heading {
  font-size: 1.25rem;
  font-weight: bold;
  margin-bottom: 1.25rem;
 }
 .admin__error,
 .admin__empty {
  opacity: 0.6;
 }
 .admin__list {
  list-style: none;
  padding: 0;
  margin: 0;
  display: flex;
  flex-direction: column;
  gap: 0.75rem;
 }
 .admin__item {
  display: flex;
  align-items: center;
  justify-content: space-between;
  gap: 1rem;
  padding: 0.75rem 1rem;
  border: 1px solid var(--color-border);
  border-radius: 6px;
  background: var(--color-background-soft);
 }
 .admin__item-info {
  display: flex;
  flex-direction: column;
  gap: 0.2rem;
  min-width: 0;
 }
 .admin__item-title {
  font-weight: 600;
  white-space: nowrap;
  overflow: hidden;
  text-overflow: ellipsis;
 }
 .admin__item-url {
  font-size: 0.8rem;
  opacity: 0.6;
  white-space: nowrap;
  overflow: hidden;
  text-overflow: ellipsis;
  color: inherit;
 }
 .admin__delete {
  flex-shrink: 0;
  min-height: 36px;
  padding: 0.3rem 0.9rem;
  border: 1px solid var(--color-border);
  border-radius: 4px;
  background: transparent;
  color: var(--color-text);
  font: inherit;
  cursor: pointer;
 }
 .admin__delete:hover {
  border-color: var(--color-border-hover);
 }
 </style>
@@ -1,10 +1,28 @@
 <script setup>
-import { ref, computed } from 'vue'
+import { ref, computed, onMounted, onUnmounted } from 'vue'
-import { RouterLink, useRouter } from 'vue-router'
+import { RouterLink, useRouter, useRoute } from 'vue-router'
-import { useFeeds } from '@/composables/useFeeds'
+import { useFeeds, logout as logoutSession } from '@/composables/useFeeds'
 import Modal from './modal/AddUrl.vue'
 const router = useRouter()
-const { sync, showModal, viewMode, toggleViewMode, layout, toggleLayout, markAllRead, feeds } = useFeeds()
+const route = useRoute()
 const { sync, showModal, viewMode, toggleViewMode, layout, toggleLayout, markAllRead, feeds, navTitleVisible } = useFeeds()
 const titleRef = ref(null)
 let titleObserver
 onMounted(() => {
  titleObserver = new IntersectionObserver(([entry]) => {
    navTitleVisible.value = entry.isIntersecting
  })
  titleObserver.observe(titleRef.value)
 })
 onUnmounted(() => {
  titleObserver?.disconnect()
 })
 const onFeedsPage = computed(() => route.path === '/feeds')
 const unreadCount = computed(() => feeds.value.filter(f => !f.read).length)
@@ -18,9 +36,8 @@ function closeMenu() {
  menuOpen.value = false
 }
-function logout() {
+async function logout() {
-  localStorage.removeItem('user-token')
+  await logoutSession()
  localStorage.removeItem('user-id')
  closeMenu()
  router.push({ name: 'login' })
 }
@@ -54,7 +71,7 @@ function handleToggleLayout() {
 <template>
  <header class="app-nav">
    <div class="app-nav__wrapper">
-      <span class="app-nav__title">RSS Reader<span v-if="unreadCount" class="app-nav__unread"> ({{ unreadCount }})</span></span>
+      <span ref="titleRef" class="app-nav__title">RSS Reader<span v-if="unreadCount" class="app-nav__unread"> ({{ unreadCount }})</span></span>
      <button
        class="app-nav__hamburger"
        type="button"
@@ -78,19 +95,30 @@ function handleToggleLayout() {
      >
        <div class="app-nav__menu-panel">
          <RouterLink to="/feeds" class="app-nav__menu-item" @click="closeMenu">Feeds</RouterLink>
          <template v-if="onFeedsPage">
            <button class="app-nav__menu-item" type="button" @click="handleToggleViewMode">
              {{ viewMode === 'list' ? 'Article view' : 'List view' }}
            </button>
            <button v-if="viewMode === 'list'" class="app-nav__menu-item" type="button" @click="handleToggleLayout">
              {{ layout === 'list' ? 'Card layout' : 'List layout' }}
            </button>
          <button class="app-nav__menu-item" type="button" @click="handleSync">Sync</button>
            <button class="app-nav__menu-item" type="button" @click="handleMarkAllRead">Mark all as read</button>
          </template>
          <button class="app-nav__menu-item" type="button" @click="handleSync">Sync</button>
          <button class="app-nav__menu-item" type="button" @click="openAddModal">Add RSS</button>
          <RouterLink to="/admin" class="app-nav__menu-item" @click="closeMenu">Admin</RouterLink>
          <button class="app-nav__menu-item app-nav__logout" type="button" @click="logout">Logout</button>
        </div>
      </nav>
    </Transition>
    <Teleport to="body">
      <Modal :show="showModal" @close="showModal = false">
        <template #header>
          <h3>Add RSS Feed</h3>
        </template>
      </Modal>
    </Teleport>
  </header>
 </template>
@@ -1,13 +1,11 @@
 <script setup>
-import { onMounted } from 'vue';
+import { onMounted, computed, nextTick, watch } from 'vue';
 import Modal from './modal/AddUrl.vue';
 import { useFeeds } from '@/composables/useFeeds';
 const {
  feeds,
  showMessage,
  message,
  showModal,
  viewMode,
  currentIndex,
  leaveArticleView,
@@ -18,10 +16,50 @@ const {
  getReadable,
  setInitialLoad,
  showMessageForXSeconds,
  navTitleVisible,
 } = useFeeds()
 const unreadCount = computed(() => feeds.value.filter(f => !f.read).length)
 const shareLabel = navigator.share ? 'Share' : 'Copy link'
 function scrollToNextArticle() {
  const articles = document.querySelectorAll('#article .observe')
  const threshold = window.scrollY + 1
  for (const el of articles) {
    if (el.offsetTop > threshold) {
      el.scrollIntoView({ behavior: 'smooth', block: 'start' })
      return
    }
  }
 }
 // Small images (icons, logos, ...) look bad stretched to the full-bleed
 // width used for readable article images — leave them at their natural size
 // instead. Intrinsic size is only known once the image has loaded, so check
 // on load (or immediately if it's already cached/complete).
 const SMALL_IMAGE_THRESHOLD = 200
 function markSmallImages() {
  document.querySelectorAll('.article-feature__content--readable img').forEach(img => {
    const checkSize = () => {
      if (img.naturalWidth && img.naturalWidth <= SMALL_IMAGE_THRESHOLD) {
        img.classList.add('article-feature__image--small')
      }
    }
    if (img.complete) {
      checkSize()
    } else {
      img.addEventListener('load', checkSize, { once: true })
    }
  })
 }
 watch(() => feeds.value[currentIndex.value]?.content, async () => {
  await nextTick()
  markSmallImages()
 })
 async function shareUrl(url) {
  if (navigator.share) {
    await navigator.share({ url })
@@ -42,17 +80,14 @@ onMounted(async () => {
 </script>
 <template>
  <Teleport to="body">
    <modal :show="showModal" @close="showModal = false">
      <template #header>
        <h3>Add RSS Feed</h3>
      </template>
    </modal>
  </Teleport>
  <div>
    <div v-if="showMessage" class="message">{{ message }}</div>
    <div v-if="viewMode === 'list'" id='article' class='article' :class="{ 'article--cards': layout === 'cards' }">
      <div v-if="feeds.length" class="list-topbar">
        <span v-if="!navTitleVisible" class="list-topbar__title">RSS Reader<span v-if="unreadCount" class="list-topbar__unread"> ({{ unreadCount }})</span></span>
        <button type="button" class="list-topbar__next" @click="scrollToNextArticle">Skip to next article &darr;</button>
      </div>
      <div v-if="feeds.length == 0" class="empty-state">
        <svg class="empty-state__icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
          <circle cx="12" cy="12" r="10"/>
@@ -77,7 +112,12 @@ onMounted(async () => {
    </div>
    <div v-else class="article-single">
      <div class="article-single__topbar">
        <div class="article-single__topbar-inner">
          <button type="button" class="article-single__back" @click="leaveArticleView">&larr; Back to list</button>
          <span v-if="feeds.length" class="article-single__progress">{{ currentIndex + 1 }} / {{ feeds.length }}</span>
        </div>
      </div>
      <div v-if="feeds.length == 0" class="empty-state">
        <svg class="empty-state__icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
          <circle cx="12" cy="12" r="10"/>
@@ -86,14 +126,16 @@ onMounted(async () => {
        <p class="empty-state__label">All caught up</p>
      </div>
      <template v-else>
-        <p class="feed-source">{{ feeds[currentIndex].feedTitle }}</p>
+        <article class="article-feature">
-        <h2 @click="getReadable(feeds[currentIndex], currentIndex)" class="feed-title">{{ feeds[currentIndex].title }}</h2>
+          <p class="article-feature__source">{{ feeds[currentIndex].feedTitle }}</p>
-        <h3>{{ feeds[currentIndex].timestamp }}</h3>
+          <h2 @click="getReadable(feeds[currentIndex], currentIndex)" class="article-feature__title">{{ feeds[currentIndex].title }}</h2>
          <h3 class="article-feature__meta">{{ feeds[currentIndex].timestamp }}</h3>
          <p v-if="!feeds[currentIndex].readable" class="feed-original-link">
            <a :href="feeds[currentIndex].url" target="_blank" rel="noopener noreferrer">Read original article &#8599;</a>
            <button type="button" class="feed-share-btn" :title="shareLabel" @click="shareUrl(feeds[currentIndex].url)">{{ shareLabel }}</button>
          </p>
-        <p class="feed-content" v-html="feeds[currentIndex].content"></p>
+          <p class="article-feature__content" :class="{ 'article-feature__content--readable': feeds[currentIndex].readable }" v-html="feeds[currentIndex].content"></p>
        </article>
      </template>
      <div class="article-nav">
@@ -117,6 +159,50 @@ onMounted(async () => {
 </template>
 <style scoped>
 .list-topbar {
  position: sticky;
  top: 0;
  z-index: 10;
  display: flex;
  align-items: center;
  justify-content: space-between;
  gap: 0.75rem;
  padding: 0.5rem 0;
  margin-bottom: 0.5rem;
  background: var(--color-background);
 }
 .list-topbar__title {
  font-weight: bold;
  font-size: clamp(1.1rem, 4vw, 1.4rem);
 }
 .list-topbar__unread {
  font-weight: normal;
  opacity: 0.6;
 }
 .list-topbar__next {
  display: inline-flex;
  align-items: center;
  min-height: 44px;
  padding: 0.5rem 0.9rem;
  margin-left: auto;
  border: 1px solid var(--color-border);
  border-radius: 4px;
  background: var(--color-background-soft);
  color: var(--color-text);
  cursor: pointer;
 }
 .list-topbar__next:hover {
  border-color: var(--color-border-hover);
 }
 .observe {
  scroll-margin-top: 3.5rem;
 }
 /* Plain vertical stack of bordered "cards" — deliberately not flex/grid, and
   with no truncation/max-height: normal block flow lets each card grow to fit
   its own full content (images included), with no cross-element interaction. */
@@ -211,15 +297,39 @@ onMounted(async () => {
 .article-single {
  position: relative;
  display: flex;
  flex-direction: column;
  align-items: center;
  padding-bottom: 5rem;
 }
 .article-single__topbar {
  position: sticky;
  top: 0;
  z-index: 10;
  align-self: flex-start;
  width: 100vw;
  margin-left: 50%;
  margin-bottom: 1rem;
  transform: translateX(-50%);
  background: var(--color-background);
 }
 .article-single__topbar-inner {
  display: flex;
  align-items: center;
  justify-content: space-between;
  gap: 1rem;
  max-width: 720px;
  margin: 0 auto;
  padding: 0.5rem 1rem;
 }
 .article-single__back {
  display: inline-flex;
  align-items: center;
  min-height: 44px;
  padding: 0.5rem 0.9rem;
  margin-bottom: 1rem;
  border: 1px solid var(--color-border);
  border-radius: 4px;
  background: transparent;
@@ -231,6 +341,139 @@ onMounted(async () => {
  border-color: var(--color-border-hover);
 }
 .article-single__progress {
  font-size: 0.85rem;
  color: var(--color-text);
  opacity: 0.6;
  font-variant-numeric: tabular-nums;
  white-space: nowrap;
 }
 .article-feature {
  width: 100%;
  max-width: 720px;
 }
 .article-feature__source {
  margin: 0 0 0.5em;
  padding: 0 1rem;
  font-size: clamp(0.75rem, 2vw, 0.85rem);
  font-weight: 600;
  letter-spacing: 0.05em;
  text-transform: uppercase;
  color: var(--color-accent);
 }
 .article-feature__title {
  cursor: pointer;
  margin: 0;
  padding: 0 1rem;
  font-family: 'Courier New';
  font-size: clamp(1.75rem, 6vw, 2.75rem);
  font-weight: bold;
  line-height: 1.15;
  color: var(--color-accent-2);
  transition: color 0.2s;
 }
 .article-feature__title:hover {
  color: var(--color-accent-2-hover);
 }
 .article-feature__meta {
  margin: 0.75em 0 1.5em;
  padding: 0 1rem 1.5em;
  font-size: clamp(0.85rem, 2.5vw, 1rem);
  font-weight: normal;
  opacity: 0.55;
  border-bottom: 1px solid var(--color-border);
 }
 .article-feature .feed-original-link {
  margin-bottom: 1.5em;
  padding: 0 1rem;
 }
 .article-feature__content {
  padding: 0 1rem;
  font-family: Georgia, 'Times New Roman', Times, serif;
  font-size: clamp(1rem, 3.5vw, 1.25rem);
  line-height: 1.75;
  overflow-wrap: break-word;
 }
 .article-feature__content :deep(p) {
  padding: 0.5em 0;
 }
 .article-feature__content :deep(h3) {
  padding: 0.5em 0;
  font-size: clamp(1rem, 3vw, 1.3rem);
  font-weight: bold;
 }
 .article-feature__content :deep(img),
 .article-feature__content :deep(video) {
  max-width: 100%;
  height: auto;
 }
 .article-feature__content--readable :deep(img),
 .article-feature__content--readable :deep(video) {
  display: block;
  width: 100vw;
  max-width: 100vw;
  height: auto;
  margin-top: 1.5em;
  margin-bottom: 1.5em;
  margin-left: 50%;
  transform: translateX(-50%);
 }
 /* Small images (icons, logos, ...) keep their natural size instead of being
   stretched to the full-bleed width. */
 .article-feature__content--readable :deep(img.article-feature__image--small) {
  display: block;
  width: auto;
  max-width: 100%;
  margin: 1.5em auto;
  transform: none;
 }
 .article-feature__content :deep(a) {
  color: var(--color-accent);
  text-decoration-color: var(--color-accent-hover);
 }
 .article-feature__content :deep(blockquote) {
  margin: 1.5em 0;
  padding: 1em 0;
  border-top: 1px solid var(--color-border);
  border-bottom: 1px solid var(--color-border);
  font-family: Georgia, 'Times New Roman', Times, serif;
  font-size: 1.25em;
  font-style: italic;
  text-align: center;
 }
 .article-feature__content :deep(pre) {
  overflow-x: auto;
  padding: 1em;
  background: var(--color-background-soft);
 }
 .article-feature__content :deep(code) {
  font-family: 'Courier New', monospace;
  font-size: 0.9em;
 }
 .article-feature__content :deep(figcaption) {
  margin-top: 0.5em;
  font-size: 0.85em;
  text-align: center;
  opacity: 0.65;
 }
 .article-nav {
  position: fixed;
  right: 1rem;
@@ -12,7 +12,7 @@ class FakeIntersectionObserver {
 vi.stubGlobal('IntersectionObserver', FakeIntersectionObserver)
 describe('useFeeds', () => {
-  const { feeds, showMessage, message, showModal, fetchData, sync, getReadable } = useFeeds()
+  const { feeds, showMessage, message, showModal, fetchData, sync, getReadable, setInitialLoad, handleIntersection } = useFeeds()
  beforeEach(() => {
    localStorage.setItem('user-token', 'test-token')
@@ -91,6 +91,81 @@ describe('useFeeds', () => {
    expect(axios.get).toHaveBeenCalledWith('/api/v1/article/get/7', expect.anything())
  })
  it('marks the correct articles read when several scroll out of view in one batch', async () => {
    feeds.value = [
      { id: 101, title: 'First' },
      { id: 102, title: 'Second' },
      { id: 103, title: 'Third' },
    ]
    setInitialLoad(true)
    axios.put.mockResolvedValue({ status: 200 })
    // Both the first and second articles scrolled above the viewport in the
    // same IntersectionObserver callback — their `target.id` reflects their
    // original render-time indices (0 and 1).
    await handleIntersection([
      { isIntersecting: false, boundingClientRect: { y: -10 }, target: { id: '0' } },
      { isIntersecting: false, boundingClientRect: { y: -5 }, target: { id: '1' } },
    ])
    expect(axios.put).toHaveBeenCalledWith('/api/v1/article/read/101', null, expect.anything())
    expect(axios.put).toHaveBeenCalledWith('/api/v1/article/read/102', null, expect.anything())
    expect(axios.put).not.toHaveBeenCalledWith('/api/v1/article/read/103', null, expect.anything())
    expect(feeds.value).toEqual([{ id: 103, title: 'Third' }])
    setInitialLoad(false)
  })
  it('strips leftover embedded-video placeholder headings', async () => {
    feeds.value = [{
      id: 1,
      title: 'Article one',
      url: 'https://www.dw.com/en/article-one/a-1',
      content: '',
    }]
    axios.post.mockResolvedValueOnce({
      data: {
        content: `<html><body><article>
          <h2 aria-label="Eingebettetes Video — Iran-Krieg belastet Wirtschaft und Märkte in Deutschland">
            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><g fill-rule="evenodd"><path d="M14.114 7.599H13.5l.002 4.706h.601l4.582 3.25-.005-11.11zM11.084 4.444l-9.007.002-1.336.797.002 9.514 1.334.793 9.007.006 1.509-.799-.004-9.516z"></path></g></svg>
            Iran-Krieg belastet Wirtschaft und Märkte in Deutschland
          </h2>
          <p>some article text long enough for readability to keep the paragraph as the main content body, padded with extra words to pass the content-length heuristics used by Mozilla Readability when scoring candidate nodes.</p>
        </article></body></html>`,
      },
    })
    await getReadable(feeds.value[0], 0)
    expect(feeds.value[0].content).not.toContain('Eingebettetes Video')
    expect(feeds.value[0].content).not.toContain('<svg')
  })
  it('strips leftover embedded-audio placeholder headings', async () => {
    feeds.value = [{
      id: 1,
      title: 'Article one',
      url: 'https://www.dw.com/en/article-one/a-1',
      content: '',
    }]
    axios.post.mockResolvedValueOnce({
      data: {
        content: `<html><body><article>
          <h2 aria-label="Eingebetteter Audio-Beitrag — Der Gender Pay Gap existiert noch immer">
            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><g fill-rule="evenodd"><path d="M14.114 7.599H13.5l.002 4.706h.601l4.582 3.25-.005-11.11zM11.084 4.444l-9.007.002-1.336.797.002 9.514 1.334.793 9.007.006 1.509-.799-.004-9.516z"></path></g></svg>
            Der Gender Pay Gap existiert noch immer
          </h2>
          <p>some article text long enough for readability to keep the paragraph as the main content body, padded with extra words to pass the content-length heuristics used by Mozilla Readability when scoring candidate nodes.</p>
        </article></body></html>`,
      },
    })
    await getReadable(feeds.value[0], 0)
    expect(feeds.value[0].content).not.toContain('Eingebetteter Audio-Beitrag')
    expect(feeds.value[0].content).not.toContain('<svg')
  })
  it('resolves Deutsche-Welle-style templated image URLs from data-format/data-url', async () => {
    feeds.value = [{
      id: 1,
@@ -112,7 +187,10 @@ describe('useFeeds', () => {
    await getReadable(feeds.value[0], 0)
-    expect(feeds.value[0].content).toContain('src="https://static.dw.com/image/76212061_MASTER_LANDSCAPE.jpg"')
+    // "MASTER_LANDSCAPE" is a symbolic name from DW's CMS, not a valid value
    // for the CDN's numeric `formatId` — it must be mapped to "6" or the
    // resulting URL 400s and the image fails to load.
    expect(feeds.value[0].content).toContain('src="https://static.dw.com/image/76212061_6.jpg"')
    // The rendered `src` is what matters — `data-url` retaining the raw
    // template is harmless since browsers don't load images from data-* attrs.
    expect(feeds.value[0].content).not.toMatch(/src="[^"]*(\$\{|%7[bB])/)
@@ -1,4 +1,4 @@
-import { ref, unref, nextTick } from 'vue';
+import { ref, nextTick } from 'vue';
 import axios from 'axios';
 import { Readability } from '@mozilla/readability';
@@ -11,11 +11,12 @@ const showModal = ref(false)
 const viewMode = ref('list') // 'list' | 'article' — toggled from the hamburger menu
 const currentIndex = ref(0)
 const layout = ref(localStorage.getItem('layout') || 'list') // 'list' | 'cards' — list-view display style, toggled from the hamburger menu
 const navTitleVisible = ref(true) // whether AppNav's "RSS Reader (N)" title is currently in view
 let observer; // Declare observer outside the setup function
 let initialLoad = false
-function authHeaders() {
+export function authHeaders() {
  return {
    headers: {
      'Content-Type': 'application/json',
@@ -24,6 +25,20 @@ function authHeaders() {
  }
 }
 // Tells the server to revoke the current token (bumps token_version, so any
 // other outstanding tokens for this account are invalidated too) before
 // clearing the local session. Best-effort: if the request fails (e.g. the
 // token already expired) the local session is cleared regardless.
 export async function logout() {
  try {
    await axios.post('/api/v1/auth/logout', null, authHeaders())
  } catch (error) {
    console.error('Error logging out', error)
  }
  localStorage.removeItem('user-token')
  localStorage.removeItem('user-id')
 }
 // Some feeds (e.g. Deutsche Welle) ship <img> tags whose `src` and various
 // lazy-load attributes (`data-url`, `data-src`, `srcset`, ...) contain an
 // unresolved `${placeholderName}` template — or its URL-encoded `%7B...%7D`
@@ -35,8 +50,19 @@ function authHeaders() {
 const TEMPLATE_PATTERN = /\$\{[^}]+\}|%7[bB][^%]*%7[dD]/
 const TEMPLATE_PATTERN_GLOBAL = /\$\{[^}]+\}|%7[bB][^%]*%7[dD]/g
 // `data-format` holds a symbolic name from DW's CMS (e.g. "MASTER_LANDSCAPE"),
 // but their image CDN only accepts numeric format ids in the URL — the
 // template's `${formatId}` literally means a number. Substituting the
 // symbolic name verbatim produces a 400 (image fails to load). DW generates
 // the same fixed set of numeric variants for every image, so map the
 // symbolic names we've seen to their numeric equivalent.
 const DW_FORMAT_IDS = {
  MASTER_LANDSCAPE: '6', // 940x529, 16:9 — matches DW's `16/9` aspect ratio
 }
 function resolveTemplatedImage(img) {
-  const format = img.getAttribute('data-format')
+  const rawFormat = img.getAttribute('data-format')
  const format = rawFormat && (DW_FORMAT_IDS[rawFormat] ?? (/^\d+$/.test(rawFormat) ? rawFormat : null))
  const dataUrl = img.getAttribute('data-url')
  if (format) {
@@ -81,6 +107,20 @@ async function getReadable(feed, index) {
    doc.head.prepend(base);
    doc.querySelectorAll('img').forEach(resolveTemplatedImage);
    doc.querySelectorAll('video, audio').forEach(el => el.remove());
    // Some feeds (e.g. Stuttgarter Nachrichten) embed a social-sharing widget
    // (WhatsApp/Email/Facebook/... links plus a "Link kopiert" tooltip) in the
    // article body. It's not part of the article, so strip it before Readability
    // pulls it into the parsed content.
    doc.querySelectorAll('#article-social-bar').forEach(el => el.remove())
    // Some feeds (e.g. Deutsche Welle) leave behind a heading + play-icon SVG
    // for an embedded video/audio player whose actual <video>/<audio>/<iframe>
    // we already stripped — without it, the heading is just a giant orphaned
    // icon that takes up space and links nowhere.
    doc.querySelectorAll('[aria-label]').forEach(el => {
      if (/^(Eingebettete[rs]?|Embedded) (Video|Audio)/i.test(el.getAttribute('aria-label'))) {
        el.remove()
      }
    })
    const article = new Readability(doc).parse();
    feeds.value[index].content = article.content;
    feeds.value[index].readable = true;
@@ -140,9 +180,14 @@ function setupIntersectionObserver() {
    observer.disconnect();
  }
-  observer = new IntersectionObserver(handleIntersection, {
+  // The sticky topbar overlays the top of the viewport, so an article fully
  // hidden behind it should already count as "scrolled past" — shrink the
  // observer's root by that height so it stops intersecting at that point.
  const topbarHeight = document.querySelector('.list-topbar')?.getBoundingClientRect().height ?? 0;
  observer = new IntersectionObserver((entries) => handleIntersection(entries, topbarHeight), {
    root: null, // Use the viewport as the root
-    rootMargin: '0px',
+    rootMargin: `-${topbarHeight}px 0px 0px 0px`,
    // threshold: 0.5, // Fire the callback when at least 50% of the element is visible
  });
@@ -154,22 +199,27 @@ function setupIntersectionObserver() {
  }
 }
-async function handleIntersection(entries) {
+async function handleIntersection(entries, topbarHeight = 0) {
-  // The callback function for when the target element enters or exits the viewport
+  // An article that has scrolled past the (possibly sticky-bar-shrunk) top
-  for (const entry of entries) {
+  // edge of the viewport (not intersecting, bounding box above that edge)
-    // An article that has scrolled above the viewport (not intersecting,
+  // has been read. Resolve all affected feeds up front, before any removal —
-    // bounding box above the top edge) has been read — mark it and remove it.
+  // splicing `feeds` while iterating would shift the array indices that later
-    if (initialLoad === true && !entry.isIntersecting && entry.boundingClientRect.y < 0) {
+  // entries' `target.id` refer to, causing the wrong item to be marked read
-      await markRead(feeds.value[entry.target.id].id)
+  // and removed.
-      removeFeed(entry.target.id)
+  const readFeeds = entries
-      document.getElementById(0)?.scrollIntoView()
+    .filter(entry => initialLoad === true && !entry.isIntersecting && entry.boundingClientRect.y < topbarHeight)
-    }
+    .map(entry => feeds.value[entry.target.id])
-  }
+    .filter(Boolean)
 }
-function removeFeed(index) {
+  if (readFeeds.length === 0) return
-  const array = unref(feeds);
+
-  array.splice(index, 1);
+  for (const feed of readFeeds) {
    await markRead(feed.id)
  }
  const readIds = new Set(readFeeds.map(feed => feed.id))
  feeds.value = feeds.value.filter(feed => !readIds.has(feed.id))
  document.getElementById(0)?.scrollIntoView()
 }
 function setInitialLoad(value) {
@@ -232,6 +282,7 @@ function nextArticle() {
  if (currentIndex.value < feeds.value.length - 1) {
    currentIndex.value += 1
    markCurrentArticleRead()
    window.scrollTo(0, 0)
  }
 }
@@ -239,6 +290,7 @@ function prevArticle() {
  if (currentIndex.value > 0) {
    currentIndex.value -= 1
    markCurrentArticleRead()
    window.scrollTo(0, 0)
  }
 }
@@ -254,6 +306,7 @@ export function useFeeds() {
    leaveArticleView,
    layout,
    toggleLayout,
    navTitleVisible,
    nextArticle,
    prevArticle,
    fetchData,
@@ -263,7 +316,7 @@ export function useFeeds() {
    markAllRead,
    showMessageForXSeconds,
    setupIntersectionObserver,
    removeFeed,
    setInitialLoad,
    handleIntersection,
  }
 }
@@ -1,8 +1,28 @@
 import './assets/main.css'
 import axios from 'axios'
 import { createApp } from 'vue'
 import App from './App.vue'
 import router from './router'
 // A 401 means the server has rejected the token (missing, expired, or
 // revoked via logout/token_version bump elsewhere). Drop the stale session
 // and send the user back to login rather than leaving them on a page where
 // every request silently fails.
 axios.interceptors.response.use(
  (response) => response,
  (error) => {
    if (error.response?.status === 401) {
      localStorage.removeItem('user-token')
      localStorage.removeItem('user-id')
      if (router.currentRoute.value.name !== 'login') {
        router.push({ name: 'login' })
      }
    }
    return Promise.reject(error)
  }
 )
 const app = createApp(App)
 app.use(router)
@@ -16,6 +16,12 @@ const router = createRouter({
      component: () => import('../views/FeedView.vue'),
      meta: { requiresAuth: true },
    },
    {
      path: '/admin',
      name: 'admin',
      component: () => import('../views/AdminView.vue'),
      meta: { requiresAuth: true },
    },
    {
      path: '/login',
      name: 'login',
@@ -0,0 +1,9 @@
 <script setup>
 import AdminFeeds from '../components/AdminFeeds.vue'
 </script>
 <template>
  <main>
    <AdminFeeds />
  </main>
 </template>
Author	SHA1	Message	Date
mathias	b457b8abaa	Improve security	2026-06-12 19:22:07 +02:00
mathias	0820ce6ef7	fix some frontend issues	2026-06-12 10:57:48 +02:00
mathias	ed1241490d	fix scroll to top in article view	2026-06-12 09:19:15 +02:00
mathias	177d975b4d	frontend improvement	2026-06-10 19:22:24 +02:00
mathias	52ea84747a	added anyhow, improve hamburger menu, improve dw articles	2026-06-10 18:51:55 +02:00
mathias	0420cf0dd5	fix sync missing articles	2026-06-10 06:08:17 +02:00
mathias	972e967432	fix sync missing articles	2026-06-10 05:35:46 +02:00
mathias	400648c3d1	added admin area to delete feeds	2026-06-09 21:55:07 +02:00
mathias	6ae6490dec	Merge pull request 'added admin area to delete feeds' (#1 ) from feature/admin-area into master Reviewed-on: #1	2026-06-09 21:48:28 +02:00
mathias	f3af42c3c5	added admin area to delete feeds	2026-06-09 21:45:13 +02:00