web search done right
custom captcha to reduce the number of bots scraping the search results
Mikkel Denker40a6dde92495
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.tomlindex 91bc7fc7..a6a63085 100644--- a/crates/core/Cargo.toml+++ b/crates/core/Cargo.toml@@ -13,7 +13,6 @@ version = "0.1.0"cors = []default = ["cors"]dev = ["cors"]-prod = ["cors"]return_body = [][[bin]]diff --git a/crates/core/src/webgraph/remote.rs b/crates/core/src/webgraph/remote.rsindex 5d691563..9cbb407e 100644--- a/crates/core/src/webgraph/remote.rs+++ b/crates/core/src/webgraph/remote.rs@@ -98,22 +98,24 @@ impl RemoteWebgraph {pub async fn new(cluster: Arc<Cluster>, granularity: WebgraphGranularity) -> Self {let manager = WebgraphClientManager { granularity };- tracing::info!("waiting for {granularity} webgraph to come online...");-- cluster- .await_member(|member| {- if let Service::Webgraph {- host: _,- shard: _,- granularity: remote_granularity,- } = member.service- {- granularity == remote_granularity- } else {- false- }- })- .await;+ #[cfg(feature = "dev")]+ {+ tracing::info!("waiting for {granularity} webgraph to come online...");+ cluster+ .await_member(|member| {+ if let Service::Webgraph {+ host: _,+ shard: _,+ granularity: remote_granularity,+ } = member.service+ {+ granularity == remote_granularity+ } else {+ false+ }+ })+ .await;+ }Self {client: Arc::new(Mutex::new(diff --git a/frontend/package.json b/frontend/package.jsonindex db2d8123..ddd52fc1 100644--- a/frontend/package.json+++ b/frontend/package.json@@ -59,12 +59,16 @@},"type": "module","dependencies": {+ "@types/uuid": "^10.0.0",+ "async-mutex": "^0.5.0",+ "client-wasm": "file:../crates/client-wasm/pkg","colord": "^2.9.3","file-saver": "^2.0.5","highlight.js": "^11.9.0",+ "jimp": "^0.22.12","tailwind-merge": "^2.1.0","ts-pattern": "^5.0.6",- "client-wasm": "file:../crates/client-wasm/pkg"+ "uuid": "^10.0.0"},"engines": {"node": "^20.10.x"diff --git a/frontend/src/lib/captcha/audio/0.wav b/frontend/src/lib/captcha/audio/0.wavnew file mode 100644index 00000000..48c2fcd5Binary files /dev/null and b/frontend/src/lib/captcha/audio/0.wav differdiff --git a/frontend/src/lib/captcha/audio/1.wav b/frontend/src/lib/captcha/audio/1.wavnew file mode 100644index 00000000..433877afBinary files /dev/null and b/frontend/src/lib/captcha/audio/1.wav differdiff --git a/frontend/src/lib/captcha/audio/2.wav b/frontend/src/lib/captcha/audio/2.wavnew file mode 100644index 00000000..9d1ae6d3Binary files /dev/null and b/frontend/src/lib/captcha/audio/2.wav differdiff --git a/frontend/src/lib/captcha/audio/3.wav b/frontend/src/lib/captcha/audio/3.wavnew file mode 100644index 00000000..7706b6d5Binary files /dev/null and b/frontend/src/lib/captcha/audio/3.wav differdiff --git a/frontend/src/lib/captcha/audio/4.wav b/frontend/src/lib/captcha/audio/4.wavnew file mode 100644index 00000000..53e99ef5Binary files /dev/null and b/frontend/src/lib/captcha/audio/4.wav differdiff --git a/frontend/src/lib/captcha/audio/5.wav b/frontend/src/lib/captcha/audio/5.wavnew file mode 100644index 00000000..af98442eBinary files /dev/null and b/frontend/src/lib/captcha/audio/5.wav differdiff --git a/frontend/src/lib/captcha/audio/6.wav b/frontend/src/lib/captcha/audio/6.wavnew file mode 100644index 00000000..7a0aa53bBinary files /dev/null and b/frontend/src/lib/captcha/audio/6.wav differdiff --git a/frontend/src/lib/captcha/audio/7.wav b/frontend/src/lib/captcha/audio/7.wavnew file mode 100644index 00000000..c4e992e3Binary files /dev/null and b/frontend/src/lib/captcha/audio/7.wav differdiff --git a/frontend/src/lib/captcha/audio/8.wav b/frontend/src/lib/captcha/audio/8.wavnew file mode 100644index 00000000..33a3285dBinary files /dev/null and b/frontend/src/lib/captcha/audio/8.wav differdiff --git a/frontend/src/lib/captcha/audio/9.wav b/frontend/src/lib/captcha/audio/9.wavnew file mode 100644index 00000000..ed517140Binary files /dev/null and b/frontend/src/lib/captcha/audio/9.wav differdiff --git a/frontend/src/lib/captcha/audioMixer.ts b/frontend/src/lib/captcha/audioMixer.tsnew file mode 100644index 00000000..90bf3837--- /dev/null+++ b/frontend/src/lib/captcha/audioMixer.ts@@ -0,0 +1,67 @@+import child_process from 'child_process';+import { v4 as uuidv4 } from 'uuid';+import fs from 'fs';++const exec = (args: string[]) => {+ const process = child_process.spawn('ffmpeg', args);+ process.stderr.setEncoding('utf-8');++ return new Promise((resolve, reject) => {+ process.on('error', () => {+ reject(new Error('FFmpeg is not available.'));+ });++ process.on('close', (code, signal) => {+ if (signal !== null) {+ reject(new Error(`FFmpeg was killed with signal ${signal}`));+ } else if (code !== 0) {+ reject(new Error(`FFmpeg exited with code ${code}`));+ } else {+ resolve(null);+ }+ });+ });+};++const complexArgs = (files: string[]): string => {+ let res = '';++ for (let i = 0; i < files.length; i++) {+ res += '[' + i + ':0]';+ }++ res += `concat=n=${files.length}:v=0:a=1`;++ return res;+};++export class AudioMixer {+ files: string[];++ constructor(files: string[]) {+ this.files = files;+ }++ async toBuffer() {+ const tempPath = `/tmp/${uuidv4()}.wav`;++ const args = ['-hide_banner', '-loglevel', 'error', '-y'];++ for (const file of this.files) {+ args.push('-i');+ args.push(file);+ }++ args.push('-filter_complex');+ args.push(complexArgs(this.files));++ args.push(tempPath);++ await exec(args);++ const res = fs.readFileSync(tempPath);+ fs.unlinkSync(tempPath);++ return res;+ }+}diff --git a/frontend/src/lib/captcha/images/bunny/Dwarf_rabbit_on_a_leash.jpg b/frontend/src/lib/captcha/images/bunny/Dwarf_rabbit_on_a_leash.jpgnew file mode 100644index 00000000..b75bb08fBinary files /dev/null and b/frontend/src/lib/captcha/images/bunny/Dwarf_rabbit_on_a_leash.jpg differdiff --git a/frontend/src/lib/captcha/images/bunny/Oryctolagus_cuniculus_Rcdo.jpg b/frontend/src/lib/captcha/images/bunny/Oryctolagus_cuniculus_Rcdo.jpgnew file mode 100644index 00000000..853ff698Binary files /dev/null and b/frontend/src/lib/captcha/images/bunny/Oryctolagus_cuniculus_Rcdo.jpg differdiff --git a/frontend/src/lib/captcha/images/bunny/Rabbit_bunny.jpg b/frontend/src/lib/captcha/images/bunny/Rabbit_bunny.jpgnew file mode 100644index 00000000..e81cf0b3Binary files /dev/null and b/frontend/src/lib/captcha/images/bunny/Rabbit_bunny.jpg differdiff --git a/frontend/src/lib/captcha/images/bunny/pexels-jriika-2061754.jpg b/frontend/src/lib/captcha/images/bunny/pexels-jriika-2061754.jpgnew file mode 100644index 00000000..e30c2fd9Binary files /dev/null and b/frontend/src/lib/captcha/images/bunny/pexels-jriika-2061754.jpg differdiff --git a/frontend/src/lib/captcha/images/bunny/pexels-mikebirdy-104373.jpg b/frontend/src/lib/captcha/images/bunny/pexels-mikebirdy-104373.jpgnew file mode 100644index 00000000..111ce697Binary files /dev/null and b/frontend/src/lib/captcha/images/bunny/pexels-mikebirdy-104373.jpg differdiff --git a/frontend/src/lib/captcha/images/bunny/pexels-mtyutina-1228439.jpg b/frontend/src/lib/captcha/images/bunny/pexels-mtyutina-1228439.jpgnew file mode 100644index 00000000..46ef9980Binary files /dev/null and b/frontend/src/lib/captcha/images/bunny/pexels-mtyutina-1228439.jpg differdiff --git a/frontend/src/lib/captcha/images/bunny/pexels-pixabay-247373.jpg b/frontend/src/lib/captcha/images/bunny/pexels-pixabay-247373.jpgnew file mode 100644index 00000000..45f14ad7Binary files /dev/null and b/frontend/src/lib/captcha/images/bunny/pexels-pixabay-247373.jpg differdiff --git a/frontend/src/lib/captcha/images/bunny/pexels-pixabay-255387.jpg b/frontend/src/lib/captcha/images/bunny/pexels-pixabay-255387.jpgnew file mode 100644index 00000000..e37086b9Binary files /dev/null and b/frontend/src/lib/captcha/images/bunny/pexels-pixabay-255387.jpg differdiff --git a/frontend/src/lib/captcha/images/bunny/pexels-pixabay-372166.jpg b/frontend/src/lib/captcha/images/bunny/pexels-pixabay-372166.jpgnew file mode 100644index 00000000..f82366eaBinary files /dev/null and b/frontend/src/lib/captcha/images/bunny/pexels-pixabay-372166.jpg differdiff --git a/frontend/src/lib/captcha/images/bunny/pexels-piya-nimityongskul-594956-2883510.jpg b/frontend/src/lib/captcha/images/bunny/pexels-piya-nimityongskul-594956-2883510.jpgnew file mode 100644index 00000000..47250a31Binary files /dev/null and b/frontend/src/lib/captcha/images/bunny/pexels-piya-nimityongskul-594956-2883510.jpg differdiff --git a/frontend/src/lib/captcha/images/bunny/pexels-shvetsa-4588065.jpg b/frontend/src/lib/captcha/images/bunny/pexels-shvetsa-4588065.jpgnew file mode 100644index 00000000..070728e1Binary files /dev/null and b/frontend/src/lib/captcha/images/bunny/pexels-shvetsa-4588065.jpg differdiff --git a/frontend/src/lib/captcha/images/bunny/pexels-smpicturez-4001296.jpg b/frontend/src/lib/captcha/images/bunny/pexels-smpicturez-4001296.jpgnew file mode 100644index 00000000..4586dc1dBinary files /dev/null and b/frontend/src/lib/captcha/images/bunny/pexels-smpicturez-4001296.jpg differdiff --git a/frontend/src/lib/captcha/images/cat/640px-Domestic_cat_2019_G1.jpg b/frontend/src/lib/captcha/images/cat/640px-Domestic_cat_2019_G1.jpgnew file mode 100644index 00000000..e5176215Binary files /dev/null and b/frontend/src/lib/captcha/images/cat/640px-Domestic_cat_2019_G1.jpg differdiff --git a/frontend/src/lib/captcha/images/cat/640px-Domestic_cat_laying_on_back.jpg b/frontend/src/lib/captcha/images/cat/640px-Domestic_cat_laying_on_back.jpgnew file mode 100644index 00000000..69ee0f2dBinary files /dev/null and b/frontend/src/lib/captcha/images/cat/640px-Domestic_cat_laying_on_back.jpg differdiff --git a/frontend/src/lib/captcha/images/cat/Cat_Peeing_in_Plant.jpg b/frontend/src/lib/captcha/images/cat/Cat_Peeing_in_Plant.jpgnew file mode 100644index 00000000..8bcbf1a1Binary files /dev/null and b/frontend/src/lib/captcha/images/cat/Cat_Peeing_in_Plant.jpg differdiff --git a/frontend/src/lib/captcha/images/cat/Jailbreak_--_a_domestic_cat_wants_to_return_home_-a.jpg b/frontend/src/lib/captcha/images/cat/Jailbreak_--_a_domestic_cat_wants_to_return_home_-a.jpgnew file mode 100644index 00000000..4ef95b01Binary files /dev/null and b/frontend/src/lib/captcha/images/cat/Jailbreak_--_a_domestic_cat_wants_to_return_home_-a.jpg differdiff --git a/frontend/src/lib/captcha/images/cat/Tabby_cat_with_blue_eyes-3336579.jpg b/frontend/src/lib/captcha/images/cat/Tabby_cat_with_blue_eyes-3336579.jpgnew file mode 100644index 00000000..7ea6ca10Binary files /dev/null and b/frontend/src/lib/captcha/images/cat/Tabby_cat_with_blue_eyes-3336579.jpg differdiff --git a/frontend/src/lib/captcha/images/cat/cHJpdmF0ZS9sci9pbWFnZXMvd2Vic2l0ZS8yMDIyLTA1L2ZsNDgyNDQxMTEwOS1pbWFnZS1rcHFrNXh0eC5qcGc.png b/frontend/src/lib/captcha/images/cat/cHJpdmF0ZS9sci9pbWFnZXMvd2Vic2l0ZS8yMDIyLTA1L2ZsNDgyNDQxMTEwOS1pbWFnZS1rcHFrNXh0eC5qcGc.pngnew file mode 100644index 00000000..e0d798ebBinary files /dev/null and b/frontend/src/lib/captcha/images/cat/cHJpdmF0ZS9sci9pbWFnZXMvd2Vic2l0ZS8yMDIyLTA1L2ZsNDgyNDQxMTEwOS1pbWFnZS1rcHFrNXh0eC5qcGc.png differdiff --git a/frontend/src/lib/captcha/images/cat/cat-pet-furry-face-162319.jpeg b/frontend/src/lib/captcha/images/cat/cat-pet-furry-face-162319.jpegnew file mode 100644index 00000000..58f19a4aBinary files /dev/null and b/frontend/src/lib/captcha/images/cat/cat-pet-furry-face-162319.jpeg differdiff --git a/frontend/src/lib/captcha/images/cat/cats-cat-animal-animals-e9a6ad-1024.jpg b/frontend/src/lib/captcha/images/cat/cats-cat-animal-animals-e9a6ad-1024.jpgnew file mode 100644index 00000000..4701a2abBinary files /dev/null and b/frontend/src/lib/captcha/images/cat/cats-cat-animal-animals-e9a6ad-1024.jpg differdiff --git a/frontend/src/lib/captcha/images/cat/czNmcy1wcml2YXRlL3Jhd3BpeGVsX2ltYWdlcy93ZWJzaXRlX2NvbnRlbnQvbHIvcHUyMzMxNjM2LWltYWdlLWt3dnk3dzV3LmpwZw.png b/frontend/src/lib/captcha/images/cat/czNmcy1wcml2YXRlL3Jhd3BpeGVsX2ltYWdlcy93ZWJzaXRlX2NvbnRlbnQvbHIvcHUyMzMxNjM2LWltYWdlLWt3dnk3dzV3LmpwZw.pngnew file mode 100644index 00000000..6468f5ceBinary files /dev/null and b/frontend/src/lib/captcha/images/cat/czNmcy1wcml2YXRlL3Jhd3BpeGVsX2ltYWdlcy93ZWJzaXRlX2NvbnRlbnQvbHIvcHUyMzMxNjM2LWltYWdlLWt3dnk3dzV3LmpwZw.png differdiff --git a/frontend/src/lib/captcha/images/cat/kitty-cat-kitten-pet-45201.jpeg b/frontend/src/lib/captcha/images/cat/kitty-cat-kitten-pet-45201.jpegnew file mode 100644index 00000000..9ef17350Binary files /dev/null and b/frontend/src/lib/captcha/images/cat/kitty-cat-kitten-pet-45201.jpeg differdiff --git a/frontend/src/lib/captcha/images/cat/negative-space-cat-chair-kari-shea-thumb-1.jpg b/frontend/src/lib/captcha/images/cat/negative-space-cat-chair-kari-shea-thumb-1.jpgnew file mode 100644index 00000000..3e32ac57Binary files /dev/null and b/frontend/src/lib/captcha/images/cat/negative-space-cat-chair-kari-shea-thumb-1.jpg differdiff --git a/frontend/src/lib/captcha/images/cat/negative-space-kitten-series-caughtinaction.jpg b/frontend/src/lib/captcha/images/cat/negative-space-kitten-series-caughtinaction.jpgnew file mode 100644index 00000000..0cca7829Binary files /dev/null and b/frontend/src/lib/captcha/images/cat/negative-space-kitten-series-caughtinaction.jpg differdiff --git a/frontend/src/lib/captcha/images/cat/pexels-catscoming-1543793.jpg b/frontend/src/lib/captcha/images/cat/pexels-catscoming-1543793.jpgnew file mode 100644index 00000000..102aa637Binary files /dev/null and b/frontend/src/lib/captcha/images/cat/pexels-catscoming-1543793.jpg differdiff --git a/frontend/src/lib/captcha/images/cat/pexels-francesco-ungaro-96938.jpg b/frontend/src/lib/captcha/images/cat/pexels-francesco-ungaro-96938.jpgnew file mode 100644index 00000000..fa796ef7Binary files /dev/null and b/frontend/src/lib/captcha/images/cat/pexels-francesco-ungaro-96938.jpg differdiff --git a/frontend/src/lib/captcha/images/cat/pexels-photo-1170986.jpeg b/frontend/src/lib/captcha/images/cat/pexels-photo-1170986.jpegnew file mode 100644index 00000000..8fda0d10Binary files /dev/null and b/frontend/src/lib/captcha/images/cat/pexels-photo-1170986.jpeg differdiff --git a/frontend/src/lib/captcha/images/cat/pexels-pixabay-257532.jpg b/frontend/src/lib/captcha/images/cat/pexels-pixabay-257532.jpgnew file mode 100644index 00000000..8b57e788Binary files /dev/null and b/frontend/src/lib/captcha/images/cat/pexels-pixabay-257532.jpg differdiff --git a/frontend/src/lib/captcha/images/cat/pexels-pixabay-416160.jpg b/frontend/src/lib/captcha/images/cat/pexels-pixabay-416160.jpgnew file mode 100644index 00000000..3aa10fddBinary files /dev/null and b/frontend/src/lib/captcha/images/cat/pexels-pixabay-416160.jpg differdiff --git a/frontend/src/lib/captcha/images/cat/pexels-tranmautritam-2061057.jpg b/frontend/src/lib/captcha/images/cat/pexels-tranmautritam-2061057.jpgnew file mode 100644index 00000000..18d26f31Binary files /dev/null and b/frontend/src/lib/captcha/images/cat/pexels-tranmautritam-2061057.jpg differdiff --git a/frontend/src/lib/captcha/images/cat/pexels-tranmautritam-2194261.jpg b/frontend/src/lib/captcha/images/cat/pexels-tranmautritam-2194261.jpgnew file mode 100644index 00000000..27d9c552Binary files /dev/null and b/frontend/src/lib/captcha/images/cat/pexels-tranmautritam-2194261.jpg differdiff --git a/frontend/src/lib/captcha/images/cat/pexels-wojciech-kumpicki-1084687-2071873.jpg b/frontend/src/lib/captcha/images/cat/pexels-wojciech-kumpicki-1084687-2071873.jpgnew file mode 100644index 00000000..a1df2d51Binary files /dev/null and b/frontend/src/lib/captcha/images/cat/pexels-wojciech-kumpicki-1084687-2071873.jpg differdiff --git a/frontend/src/lib/captcha/images/cat/pexels-wolpido-1472999.jpg b/frontend/src/lib/captcha/images/cat/pexels-wolpido-1472999.jpgnew file mode 100644index 00000000..cb47d42aBinary files /dev/null and b/frontend/src/lib/captcha/images/cat/pexels-wolpido-1472999.jpg differdiff --git a/frontend/src/lib/captcha/images/dog/2048px-Dogs_playing.jpg b/frontend/src/lib/captcha/images/dog/2048px-Dogs_playing.jpgnew file mode 100644index 00000000..e38ca271Binary files /dev/null and b/frontend/src/lib/captcha/images/dog/2048px-Dogs_playing.jpg differdiff --git a/frontend/src/lib/captcha/images/dog/640px-American_Eskimo_Dog_Peary.jpg b/frontend/src/lib/captcha/images/dog/640px-American_Eskimo_Dog_Peary.jpgnew file mode 100644index 00000000..477fe26eBinary files /dev/null and b/frontend/src/lib/captcha/images/dog/640px-American_Eskimo_Dog_Peary.jpg differdiff --git a/frontend/src/lib/captcha/images/dog/Bavaria_Dog_2011_001.JPG b/frontend/src/lib/captcha/images/dog/Bavaria_Dog_2011_001.JPGnew file mode 100644index 00000000..b21b88b6Binary files /dev/null and b/frontend/src/lib/captcha/images/dog/Bavaria_Dog_2011_001.JPG differdiff --git a/frontend/src/lib/captcha/images/dog/Bavaria_Dog_2011_005.JPG b/frontend/src/lib/captcha/images/dog/Bavaria_Dog_2011_005.JPGnew file mode 100644index 00000000..3f31dfd9Binary files /dev/null and b/frontend/src/lib/captcha/images/dog/Bavaria_Dog_2011_005.JPG differdiff --git a/frontend/src/lib/captcha/images/dog/Beagle-1024x669.jpg b/frontend/src/lib/captcha/images/dog/Beagle-1024x669.jpgnew file mode 100644index 00000000..8510ceb9Binary files /dev/null and b/frontend/src/lib/captcha/images/dog/Beagle-1024x669.jpg differdiff --git a/frontend/src/lib/captcha/images/dog/Canis_lupus_familiaris_-_Flickr_-_aspidoscelis.jpg b/frontend/src/lib/captcha/images/dog/Canis_lupus_familiaris_-_Flickr_-_aspidoscelis.jpgnew file mode 100644index 00000000..9a1db220Binary files /dev/null and b/frontend/src/lib/captcha/images/dog/Canis_lupus_familiaris_-_Flickr_-_aspidoscelis.jpg differdiff --git a/frontend/src/lib/captcha/images/dog/Kintamani_dog_white.jpg b/frontend/src/lib/captcha/images/dog/Kintamani_dog_white.jpgnew file mode 100644index 00000000..8c20a9eeBinary files /dev/null and b/frontend/src/lib/captcha/images/dog/Kintamani_dog_white.jpg differdiff --git a/frontend/src/lib/captcha/images/dog/Picography-dog-looking-out-window-1.jpg b/frontend/src/lib/captcha/images/dog/Picography-dog-looking-out-window-1.jpgnew file mode 100644index 00000000..4cc01a3fBinary files /dev/null and b/frontend/src/lib/captcha/images/dog/Picography-dog-looking-out-window-1.jpg differdiff --git a/frontend/src/lib/captcha/images/dog/Picography-dog-yawning-1.jpg b/frontend/src/lib/captcha/images/dog/Picography-dog-yawning-1.jpgnew file mode 100644index 00000000..98fbb52cBinary files /dev/null and b/frontend/src/lib/captcha/images/dog/Picography-dog-yawning-1.jpg differdiff --git a/frontend/src/lib/captcha/images/dog/cHJpdmF0ZS9sci9pbWFnZXMvd2Vic2l0ZS8yMDIyLTA1L3Vwd2s2MTg1NjcwOC13aWtpbWVkaWEtaW1hZ2Uta293YXNwaHQuanBn.png b/frontend/src/lib/captcha/images/dog/cHJpdmF0ZS9sci9pbWFnZXMvd2Vic2l0ZS8yMDIyLTA1L3Vwd2s2MTg1NjcwOC13aWtpbWVkaWEtaW1hZ2Uta293YXNwaHQuanBn.pngnew file mode 100644index 00000000..a0de684bBinary files /dev/null and b/frontend/src/lib/captcha/images/dog/cHJpdmF0ZS9sci9pbWFnZXMvd2Vic2l0ZS8yMDIyLTA1L3Vwd2s2MTg1NjcwOC13aWtpbWVkaWEtaW1hZ2Uta293YXNwaHQuanBn.png differdiff --git a/frontend/src/lib/captcha/images/dog/pexels-chevanon-1108099.jpg b/frontend/src/lib/captcha/images/dog/pexels-chevanon-1108099.jpgnew file mode 100644index 00000000..bf010f03Binary files /dev/null and b/frontend/src/lib/captcha/images/dog/pexels-chevanon-1108099.jpg differdiff --git a/frontend/src/lib/captcha/images/dog/pexels-gilberto-reyes-259461-825949.jpg b/frontend/src/lib/captcha/images/dog/pexels-gilberto-reyes-259461-825949.jpgnew file mode 100644index 00000000..9215da7aBinary files /dev/null and b/frontend/src/lib/captcha/images/dog/pexels-gilberto-reyes-259461-825949.jpg differdiff --git a/frontend/src/lib/captcha/images/dog/pexels-ilargian-faus-763704-1629781.jpg b/frontend/src/lib/captcha/images/dog/pexels-ilargian-faus-763704-1629781.jpgnew file mode 100644index 00000000..f540073dBinary files /dev/null and b/frontend/src/lib/captcha/images/dog/pexels-ilargian-faus-763704-1629781.jpg differdiff --git a/frontend/src/lib/captcha/images/dog/pexels-katlovessteve-551628.jpg b/frontend/src/lib/captcha/images/dog/pexels-katlovessteve-551628.jpgnew file mode 100644index 00000000..f4f0565dBinary files /dev/null and b/frontend/src/lib/captcha/images/dog/pexels-katlovessteve-551628.jpg differdiff --git a/frontend/src/lib/captcha/images/dog/pexels-simonakidric-2607544.jpg b/frontend/src/lib/captcha/images/dog/pexels-simonakidric-2607544.jpgnew file mode 100644index 00000000..5cce0ebdBinary files /dev/null and b/frontend/src/lib/captcha/images/dog/pexels-simonakidric-2607544.jpg differdiff --git a/frontend/src/lib/captcha/images/dog/pexels-valeriya-1805164.jpg b/frontend/src/lib/captcha/images/dog/pexels-valeriya-1805164.jpgnew file mode 100644index 00000000..d5124838Binary files /dev/null and b/frontend/src/lib/captcha/images/dog/pexels-valeriya-1805164.jpg differdiff --git a/frontend/src/lib/captcha/images/dog/spitz-dog-happy-animals-6f9970-1024.jpg b/frontend/src/lib/captcha/images/dog/spitz-dog-happy-animals-6f9970-1024.jpgnew file mode 100644index 00000000..04c11950Binary files /dev/null and b/frontend/src/lib/captcha/images/dog/spitz-dog-happy-animals-6f9970-1024.jpg differdiff --git a/frontend/src/lib/captcha/images/duck/pexels-magda-ehlers-pexels-1300355.jpg b/frontend/src/lib/captcha/images/duck/pexels-magda-ehlers-pexels-1300355.jpgnew file mode 100644index 00000000..db397743Binary files /dev/null and b/frontend/src/lib/captcha/images/duck/pexels-magda-ehlers-pexels-1300355.jpg differdiff --git a/frontend/src/lib/captcha/images/duck/pexels-neosiam-590750.jpg b/frontend/src/lib/captcha/images/duck/pexels-neosiam-590750.jpgnew file mode 100644index 00000000..049d6f87Binary files /dev/null and b/frontend/src/lib/captcha/images/duck/pexels-neosiam-590750.jpg differdiff --git a/frontend/src/lib/captcha/images/duck/pexels-pixabay-112548.jpg b/frontend/src/lib/captcha/images/duck/pexels-pixabay-112548.jpgnew file mode 100644index 00000000..a95a3b5aBinary files /dev/null and b/frontend/src/lib/captcha/images/duck/pexels-pixabay-112548.jpg differdiff --git a/frontend/src/lib/captcha/images/duck/pexels-pixabay-159864.jpg b/frontend/src/lib/captcha/images/duck/pexels-pixabay-159864.jpgnew file mode 100644index 00000000..5c0191f1Binary files /dev/null and b/frontend/src/lib/captcha/images/duck/pexels-pixabay-159864.jpg differdiff --git a/frontend/src/lib/captcha/images/duck/pexels-pixabay-162059.jpg b/frontend/src/lib/captcha/images/duck/pexels-pixabay-162059.jpgnew file mode 100644index 00000000..063b0d5eBinary files /dev/null and b/frontend/src/lib/captcha/images/duck/pexels-pixabay-162059.jpg differdiff --git a/frontend/src/lib/captcha/images/duck/pexels-pixabay-162137.jpg b/frontend/src/lib/captcha/images/duck/pexels-pixabay-162137.jpgnew file mode 100644index 00000000..7288656cBinary files /dev/null and b/frontend/src/lib/captcha/images/duck/pexels-pixabay-162137.jpg differdiff --git a/frontend/src/lib/captcha/images/duck/pexels-pixabay-162140.jpg b/frontend/src/lib/captcha/images/duck/pexels-pixabay-162140.jpgnew file mode 100644index 00000000..06174b3eBinary files /dev/null and b/frontend/src/lib/captcha/images/duck/pexels-pixabay-162140.jpg differdiff --git a/frontend/src/lib/captcha/images/duck/pexels-pixabay-235915.jpg b/frontend/src/lib/captcha/images/duck/pexels-pixabay-235915.jpgnew file mode 100644index 00000000..2078e53aBinary files /dev/null and b/frontend/src/lib/captcha/images/duck/pexels-pixabay-235915.jpg differdiff --git a/frontend/src/lib/captcha/images/duck/pexels-victor-burnside-42505-157465.jpg b/frontend/src/lib/captcha/images/duck/pexels-victor-burnside-42505-157465.jpgnew file mode 100644index 00000000..f3963765Binary files /dev/null and b/frontend/src/lib/captcha/images/duck/pexels-victor-burnside-42505-157465.jpg differdiff --git a/frontend/src/lib/captcha/images/hamster/Lovely_pet_Hamster_P_(4985402030).jpg b/frontend/src/lib/captcha/images/hamster/Lovely_pet_Hamster_P_(4985402030).jpgnew file mode 100644index 00000000..28a20b54Binary files /dev/null and b/frontend/src/lib/captcha/images/hamster/Lovely_pet_Hamster_P_(4985402030).jpg differdiff --git a/frontend/src/lib/captcha/images/hamster/Pet_Hamster_eating_cucumber.JPG b/frontend/src/lib/captcha/images/hamster/Pet_Hamster_eating_cucumber.JPGnew file mode 100644index 00000000..8ee2add9Binary files /dev/null and b/frontend/src/lib/captcha/images/hamster/Pet_Hamster_eating_cucumber.JPG differdiff --git a/frontend/src/lib/captcha/images/hamster/pexels-ellie-burgin-1661546-3362698.jpg b/frontend/src/lib/captcha/images/hamster/pexels-ellie-burgin-1661546-3362698.jpgnew file mode 100644index 00000000..2b1069bcBinary files /dev/null and b/frontend/src/lib/captcha/images/hamster/pexels-ellie-burgin-1661546-3362698.jpg differdiff --git a/frontend/src/lib/captcha/images/hamster/pexels-ellie-burgin-1661546-3432929.jpg b/frontend/src/lib/captcha/images/hamster/pexels-ellie-burgin-1661546-3432929.jpgnew file mode 100644index 00000000..bb91d422Binary files /dev/null and b/frontend/src/lib/captcha/images/hamster/pexels-ellie-burgin-1661546-3432929.jpg differdiff --git a/frontend/src/lib/captcha/images/hamster/pexels-jakkel-325490.jpg b/frontend/src/lib/captcha/images/hamster/pexels-jakkel-325490.jpgnew file mode 100644index 00000000..daf68f9aBinary files /dev/null and b/frontend/src/lib/captcha/images/hamster/pexels-jakkel-325490.jpg differdiff --git a/frontend/src/lib/captcha/images/hamster/pexels-julytrosh-10310531.jpg b/frontend/src/lib/captcha/images/hamster/pexels-julytrosh-10310531.jpgnew file mode 100644index 00000000..c4cb6aa2Binary files /dev/null and b/frontend/src/lib/captcha/images/hamster/pexels-julytrosh-10310531.jpg differdiff --git a/frontend/src/lib/captcha/images/hamster/pexels-juris-freidenfelds-927897-2013665.jpg b/frontend/src/lib/captcha/images/hamster/pexels-juris-freidenfelds-927897-2013665.jpgnew file mode 100644index 00000000..f7a5a47eBinary files /dev/null and b/frontend/src/lib/captcha/images/hamster/pexels-juris-freidenfelds-927897-2013665.jpg differdiff --git a/frontend/src/lib/captcha/images/hamster/pexels-nikiemmert-15373308.jpg b/frontend/src/lib/captcha/images/hamster/pexels-nikiemmert-15373308.jpgnew file mode 100644index 00000000..93659306Binary files /dev/null and b/frontend/src/lib/captcha/images/hamster/pexels-nikiemmert-15373308.jpg differdiff --git a/frontend/src/lib/captcha/images/hamster/pexels-sharon-snider-2339082-4520484.jpg b/frontend/src/lib/captcha/images/hamster/pexels-sharon-snider-2339082-4520484.jpgnew file mode 100644index 00000000..e58f9adaBinary files /dev/null and b/frontend/src/lib/captcha/images/hamster/pexels-sharon-snider-2339082-4520484.jpg differdiff --git a/frontend/src/lib/captcha/lib.ts b/frontend/src/lib/captcha/lib.tsnew file mode 100644index 00000000..c5efc113--- /dev/null+++ b/frontend/src/lib/captcha/lib.ts@@ -0,0 +1,114 @@+import Jimp from 'jimp';+import { fileURLToPath } from 'url';+import { dirname } from 'path';+import { readdirSync } from 'fs';+import { AudioMixer } from './audioMixer';++/// A collection of custom captchas. They can very easily be broken+/// but hopefully stract is still small enough that very few will actually be+/// bothered to put in the effort.++const NUM_AUDIO_FILES = 5;+const IMG_PATCH_SIZE = 128;+const IMG_ROWS_COLS = 3;++const imgDir = `${dirname(fileURLToPath(import.meta.url))}/images`;+const audioDir = `${dirname(fileURLToPath(import.meta.url))}/audio`;++export type Animal = 'bunny' | 'cat' | 'dog' | 'duck' | 'hamster';+export const ANIMALS = ['bunny', 'cat', 'dog', 'duck', 'hamster'] satisfies Animal[];++export interface ImageCaptcha {+ image: Jimp;+ animal: Animal;+ count: number;+ resultDigestBase64: string;+}++const intoDigest = async (solution: number[]): Promise<string> => {+ const resultDigestBuffer = await crypto.subtle.digest('SHA-256', new Uint16Array(solution));+ return btoa(String.fromCharCode(...new Uint8Array(resultDigestBuffer)));+};++export const verifyDigest = async (digest: string, solution: number[]): Promise<boolean> => {+ const sol = await intoDigest(solution);++ return sol === digest;+};++export const generateImage = async (): Promise<ImageCaptcha> => {+ const image = await Jimp.create(IMG_PATCH_SIZE * IMG_ROWS_COLS, IMG_PATCH_SIZE * IMG_ROWS_COLS);++ let prevImages: Set<string> = new Set();+ const animals: Animal[] = [];+ const animalCounts = new Map();++ for (let i = 0; i < IMG_ROWS_COLS * IMG_ROWS_COLS; i++) {+ const x = Math.floor(i % IMG_ROWS_COLS) * IMG_PATCH_SIZE;+ const y = Math.floor(i / IMG_ROWS_COLS) * IMG_PATCH_SIZE;+ const animal = ANIMALS[Math.floor(Math.random() * ANIMALS.length)];+ animals.push(animal);+ const curCount = animalCounts.get(animal) | 0;+ animalCounts.set(animal, curCount + 1);++ const [animalImg, newPrevImages] = await readAnimalImage(animal, prevImages);+ prevImages = newPrevImages;++ image.composite(animalImg, x, y);+ }++ const maxAnimal = [...animalCounts.entries()].reduce((a, b) => (a[1] > b[1] ? a : b))[0];+ const result: number[] = [];++ for (let i = 0; i < animals.length; i++) {+ if (animals[i] == maxAnimal) {+ result.push(i);+ }+ }++ const resultDigestBase64 = await intoDigest(result);++ return { image, count: animalCounts.get(maxAnimal), animal: maxAnimal, resultDigestBase64 };+};++const readAnimalImage = async (+ animalType: Animal,+ prevImages: Set<string>,+): Promise<[Jimp, Set<string>]> => {+ try {+ const images = readdirSync(`${imgDir}/${animalType}`)+ .filter((img) => img != '.DS_Store')+ .filter((img) => !prevImages.has(`${imgDir}/${animalType}/${img}`));++ const imgName = images[Math.floor(Math.random() * images.length)];+ const imgPath = `${imgDir}/${animalType}/${imgName}`;++ return [await Jimp.read(imgPath), prevImages.add(imgPath)];+ } catch (err) {+ console.error('readAnimalImage', err);+ throw new Error(`Could not find animal image for ${animalType}`);+ }+};++export interface AudioCaptcha {+ audioBase64: string;+ resultDigestBase64: string;+}++export const generateAudio = async (): Promise<AudioCaptcha> => {+ const files = [];+ const solution = [];++ for (let i = 0; i < NUM_AUDIO_FILES; i++) {+ const number = Math.floor(Math.random() * 10);+ files.push(`${audioDir}/${number}.wav`);+ solution.push(number);+ }+ const resultDigestBase64 = await intoDigest(solution);++ const buffer = await new AudioMixer(files).toBuffer();++ const audioBase64 = `data:audio/wav;base64,${buffer.toString('base64')}`;++ return { audioBase64, resultDigestBase64 };+};diff --git a/frontend/src/lib/captcha/rateLimiter.ts b/frontend/src/lib/captcha/rateLimiter.tsnew file mode 100644index 00000000..23b38f12--- /dev/null+++ b/frontend/src/lib/captcha/rateLimiter.ts@@ -0,0 +1,93 @@+import { Mutex } from 'async-mutex';++interface RateLimitEntry {+ timestamps: number[];+ blocked: boolean;+}++class RateLimiter {+ private ipMap: Map<string, RateLimitEntry>;+ private mutex: Mutex;+ private readonly windowSize: number;+ private readonly maxRequests: number;+ private readonly blockDuration: number;++ constructor(windowSize: number = 60, maxRequests: number = 30, blockDuration: number = 600) {+ this.ipMap = new Map();+ this.mutex = new Mutex();+ this.windowSize = windowSize;+ this.maxRequests = maxRequests;+ this.blockDuration = blockDuration;+ }++ async shouldShowCaptcha(ip: string): Promise<boolean> {+ return await this.mutex.runExclusive(async () => {+ const now = Date.now();+ let entry = this.ipMap.get(ip);++ if (!entry) {+ entry = { timestamps: [now], blocked: false };+ this.ipMap.set(ip, entry);+ return false;+ }++ if (entry.blocked) {+ if (now - entry.timestamps[entry.timestamps.length - 1] > this.blockDuration * 1000) {+ entry.blocked = false;+ entry.timestamps = [now];+ return false;+ } else {+ return true;+ }+ }++ entry.timestamps.push(now);++ // Remove timestamps older than the window size+ while (entry.timestamps.length > 0 && entry.timestamps[0] < now - this.windowSize * 1000) {+ entry.timestamps.shift();+ }++ if (entry.timestamps.length > this.maxRequests) {+ entry.blocked = true;+ return true;+ }++ return false;+ });+ }++ async allow(ip: string): Promise<void> {+ await this.mutex.runExclusive(() => {+ this.ipMap.delete(ip);+ });+ }++ async cleanup(): Promise<void> {+ await this.mutex.runExclusive(() => {+ const now = Date.now();+ for (const [ip, entry] of this.ipMap.entries()) {+ if (+ entry.timestamps.length == 0 ||+ now - entry.timestamps[entry.timestamps.length - 1] > this.windowSize * 1000+ ) {+ this.ipMap.delete(ip);+ }+ }+ });+ }+}++const rateLimiter = new RateLimiter();++export const shouldShowCaptcha = async (ip: string) => {+ return await rateLimiter.shouldShowCaptcha(ip);+};++export const allow = async (ip: string) => {+ return await rateLimiter.allow(ip);+};++export const cleanup = async () => {+ return await rateLimiter.cleanup();+};diff --git a/frontend/src/routes/search/+page.server.ts b/frontend/src/routes/search/+page.server.tsindex 8b4d3abc..f71be3c4 100644--- a/frontend/src/routes/search/+page.server.ts+++ b/frontend/src/routes/search/+page.server.ts@@ -1,10 +1,16 @@+import { shouldShowCaptcha } from '$lib/captcha/rateLimiter';import { extractSearchParams, type SearchParams } from '$lib/search';+import { redirect } from '@sveltejs/kit';import type { Actions, PageServerLoadEvent } from './$types';-export const load = async ({ locals, getClientAddress }: PageServerLoadEvent) => {+export const load = async ({ locals, getClientAddress, url }: PageServerLoadEvent) => {const searchParams: SearchParams | undefined =(locals['form'] && extractSearchParams(locals['form'])) || undefined;+ if (await shouldShowCaptcha(getClientAddress())) {+ return redirect(302, `/sorry?redirectTo=${encodeURIComponent(url.toString())}`);+ }+return { form: searchParams, clientAddress: getClientAddress() };};diff --git a/frontend/src/routes/sorry/+page.server.ts b/frontend/src/routes/sorry/+page.server.tsnew file mode 100644index 00000000..867dfeaa--- /dev/null+++ b/frontend/src/routes/sorry/+page.server.ts@@ -0,0 +1,33 @@+import type { PageServerLoadEvent } from './$types';+import { generateImage } from '$lib/captcha/lib';+import type { URLSearchParams } from 'url';+import { checkCaptcha } from './common';++const patchSelections = (searchParams: URLSearchParams): number[] => {+ const res = [];++ for (let i = 0; i < 9; i++) {+ const patch = searchParams.get(`patch[${i}]`);+ if (patch && patch === 'on') {+ res.push(i);+ }+ }++ return res;+};++export const load = async ({ url, getClientAddress }: PageServerLoadEvent) => {+ const challenge = patchSelections(url.searchParams);+ await checkCaptcha(url.searchParams, challenge, getClientAddress);++ const captcha = await generateImage();+ const imgBase64 = await captcha.image.getBase64Async('image/png');++ return {+ imgBase64,+ count: captcha.count,+ animal: captcha.animal,+ resultDigestBase64: captcha.resultDigestBase64,+ redirectTo: url.searchParams.get('redirectTo') || '/',+ };+};diff --git a/frontend/src/routes/sorry/+page.svelte b/frontend/src/routes/sorry/+page.sveltenew file mode 100644index 00000000..119b7a30--- /dev/null+++ b/frontend/src/routes/sorry/+page.svelte@@ -0,0 +1,25 @@+<script lang="ts">+ import Speaker from '~icons/heroicons/speaker-wave-20-solid';+ import Button from '$lib/components/Button.svelte';+ import type { PageData } from './$types';+ import Visual from './Visual.svelte';+ import Captcha from './Captcha.svelte';+ import { page } from '$app/stores';++ export let data: PageData;+</script>++<Captcha resultDigestBase64={data.resultDigestBase64}>+ <Visual imgBase64={data.imgBase64} animal={data.animal} count={data.count} />++ <div class="flex w-full justify-between">+ <a href={`sorry/audio${$page.url.search}`} title="Get an audio challenge"+ ><Speaker class="h-8 w-8" /></a+ >+ <Button title="Verify challenge" type="submit">VERIFY</Button>+ </div>+</Captcha>++<!-- <audio controls="controls">+ <source src={audioBase64} />+</audio> -->diff --git a/frontend/src/routes/sorry/Audio.svelte b/frontend/src/routes/sorry/Audio.sveltenew file mode 100644index 00000000..7ae81003--- /dev/null+++ b/frontend/src/routes/sorry/Audio.svelte@@ -0,0 +1,45 @@+<script lang="ts">+ export let audioBase64: string;++ $: playing = false;++ let audio: HTMLAudioElement | undefined;+ let button: HTMLButtonElement | undefined;++ $: {+ if (button) {+ if (playing) {+ button.innerText = 'PAUSE';+ } else {+ button.innerText = 'PLAY';+ }+ }+ }++ const click = () => {+ if (audio == undefined || button == undefined) {+ return;+ }++ playing = !playing;++ if (playing) {+ audio.play();+ } else {+ audio.pause();+ }+ };+</script>++<div>+ <p class="text-xl">Write the numbers from the audio file below</p>+ <audio bind:this={audio} src={audioBase64} on:ended={() => (playing = false)}>+ <source src={audioBase64} />+ </audio>+ <button+ type="button"+ class="h-16 w-full rounded bg-accent text-xl font-semibold"+ on:click={click}+ bind:this={button}>PLAY</button+ >+</div>diff --git a/frontend/src/routes/sorry/Captcha.svelte b/frontend/src/routes/sorry/Captcha.sveltenew file mode 100644index 00000000..a2bceea1--- /dev/null+++ b/frontend/src/routes/sorry/Captcha.svelte@@ -0,0 +1,29 @@+<script lang="ts">+ import { page } from '$app/stores';++ export let resultDigestBase64: string;+</script>++<div class="flex w-full flex-col items-center pt-10">+ <div class="flex max-w-xl flex-col items-center space-y-10">+ <div class="flex flex-col space-y-2">+ <p class="text-xl">If you're human, we are really sorry that you have to do this.</p>+ <p class="text-sm">+ We have gotten an enormous increase in bots scraping our search results and have needed to+ implement a captcha to ensure we can continue serving search results to humans instead of+ bots. Sorry for the annoyance.+ </p>+ </div>+ <form class="flex flex-col space-y-2" method="get">+ <input type="text" class="hidden" name="digest" value={resultDigestBase64} />+ <input+ type="text"+ class="hidden"+ name="redirectTo"+ value={$page.url.searchParams.get('redirectTo') || '/'}+ />++ <slot />+ </form>+ </div>+</div>diff --git a/frontend/src/routes/sorry/Patch.svelte b/frontend/src/routes/sorry/Patch.sveltenew file mode 100644index 00000000..4e104705--- /dev/null+++ b/frontend/src/routes/sorry/Patch.svelte@@ -0,0 +1,21 @@+<script lang="ts">+ import Check from '~icons/heroicons/check-20-solid';+ export let id: number;+</script>++<div class="relative float-left flex h-1/3 w-1/3">+ <input+ id={'patch_' + id}+ type="checkbox"+ class="peer hidden"+ checked={false}+ name={`patch[${id}]`}+ />+ <label+ for={'patch_' + id}+ class="h-full w-full hover:cursor-pointer hover:bg-white/30 peer-checked:bg-black/75"+ />+ <Check+ class="pointer-events-none invisible absolute left-1/2 top-1/2 m-0 h-10 w-10 translate-x-[-50%] translate-y-[-50%] peer-checked:visible"+ />+</div>diff --git a/frontend/src/routes/sorry/Visual.svelte b/frontend/src/routes/sorry/Visual.sveltenew file mode 100644index 00000000..3fdbc277--- /dev/null+++ b/frontend/src/routes/sorry/Visual.svelte@@ -0,0 +1,28 @@+<script lang="ts">+ import Patch from './Patch.svelte';+ import type { Animal } from '$lib/captcha/lib';++ export let imgBase64: string;+ export let animal: Animal;+ export let count: number;+</script>++<div>+ <p class="text-xl">Select <b>{count}</b> images with a <b>{animal}</b></p>+ <div class="relative w-fit">+ <img src={imgBase64} alt="captcha of animals" />+ <div class="absolute bottom-0 left-0 top-0 h-full w-full">+ {#key imgBase64}+ <Patch id={0} />+ <Patch id={1} />+ <Patch id={2} />+ <Patch id={3} />+ <Patch id={4} />+ <Patch id={5} />+ <Patch id={6} />+ <Patch id={7} />+ <Patch id={8} />+ {/key}+ </div>+ </div>+</div>diff --git a/frontend/src/routes/sorry/audio/+page.server.ts b/frontend/src/routes/sorry/audio/+page.server.tsnew file mode 100644index 00000000..55b22f82--- /dev/null+++ b/frontend/src/routes/sorry/audio/+page.server.ts@@ -0,0 +1,27 @@+import type { PageServerLoadEvent } from './$types';+import { generateAudio } from '$lib/captcha/lib';+import { checkCaptcha } from '../common';++const extractChallenge = (searchParams: URLSearchParams): number[] => {+ const challenge = [];++ const challengeStr = searchParams.get('challenge') || '';+ for (let i = 0; i < challengeStr.length; i++) {+ challenge.push(Number(challengeStr[i]));+ }++ return challenge;+};++export const load = async ({ url, getClientAddress }: PageServerLoadEvent) => {+ const challenge = extractChallenge(url.searchParams);++ await checkCaptcha(url.searchParams, challenge, getClientAddress);++ const captcha = await generateAudio();++ return {+ audioBase64: captcha.audioBase64,+ resultDigestBase64: captcha.resultDigestBase64,+ };+};diff --git a/frontend/src/routes/sorry/audio/+page.svelte b/frontend/src/routes/sorry/audio/+page.sveltenew file mode 100644index 00000000..9b11ae86--- /dev/null+++ b/frontend/src/routes/sorry/audio/+page.svelte@@ -0,0 +1,43 @@+<script lang="ts">+ import Photo from '~icons/heroicons/photo-20-solid';+ import Button from '$lib/components/Button.svelte';+ import type { PageData } from './$types';+ import Captcha from '../Captcha.svelte';+ import Audio from '../Audio.svelte';+ import { page } from '$app/stores';++ export let data: PageData;++ $: console.log(data.audioBase64);+</script>++<Captcha resultDigestBase64={data.resultDigestBase64}>+ <Audio audioBase64={data.audioBase64} />+ <input+ type="number"+ class="appearance-none rounded-lg border bg-transparent"+ placeholder="12345"+ name="challenge"+ title="Type the numbers you hear in the audio file"+ />++ <div class="flex w-full justify-between">+ <a href={`/sorry${$page.url.search}`} title="Get a visual challenge"+ ><Photo class="h-8 w-8" /></a+ >++ <Button title="Verify challenge" type="submit">VERIFY</Button>+ </div>+</Captcha>++<style>+ input::-webkit-outer-spin-button,+ input::-webkit-inner-spin-button {+ appearance: none;+ }++ /* Firefox */+ input[type='number'] {+ appearance: textfield;+ }+</style>diff --git a/frontend/src/routes/sorry/common.ts b/frontend/src/routes/sorry/common.tsnew file mode 100644index 00000000..0b5639a3--- /dev/null+++ b/frontend/src/routes/sorry/common.ts@@ -0,0 +1,26 @@+import { allow } from '$lib/captcha/rateLimiter';+import { redirect } from '@sveltejs/kit';+import { verifyDigest } from '$lib/captcha/lib';++export const checkCaptcha = async (+ searchParams: URLSearchParams,+ challenge: number[],+ getClientAddress: () => string,+) => {+ const digest = searchParams.get('digest');++ if (digest) {+ if (await verifyDigest(digest, challenge)) {+ await allow(getClientAddress());+ let redirectTo = '/';+ try {+ const redirectToUrl = new URL(searchParams.get('redirectTo') || '/');+ redirectTo = `${redirectToUrl.pathname}?${redirectToUrl.searchParams}`;+ } catch (err) {+ console.error('sorry/common', err);+ }++ redirect(302, redirectTo);+ }+ }+};diff --git a/frontend/svelte.config.js b/frontend/svelte.config.jsindex bfcd4db1..4da0037c 100644--- a/frontend/svelte.config.js+++ b/frontend/svelte.config.js@@ -34,6 +34,7 @@ const config = {'connect-src': ['*'],'img-src': ['self', 'data:', 'stract.com', '0.0.0.0:3000', 'localhost:3000'],'style-src': ['self', 'unsafe-inline'],+ 'media-src': ['data:'],},},},