From 55ffee49a7ee28a00e8b0a5aef0b0258651c255f Mon Sep 17 00:00:00 2001 From: Tom Smeding Date: Fri, 6 Nov 2026 10:19:09 +0000 Subject: Spamcheck: Allow the uptime monitor through --- src/Spamcheck.hs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/Spamcheck.hs') diff --git a/src/Spamcheck.hs b/src/Spamcheck.hs index 1ad0f4e..203b5ea 100644 --- a/src/Spamcheck.hs +++ b/src/Spamcheck.hs @@ -19,6 +19,8 @@ import Data.Text qualified as T import Data.Text.Builder.Linear qualified as TBL import Data.Text.Encoding qualified as TE import System.Clock qualified as Clock +import System.Environment (lookupEnv) +import System.IO.Unsafe (unsafePerformIO) import System.Random.Stateful (uniformByteStringM, globalStdGen, UniformRange (uniformRM)) import Network.HTTP.Server.Mini @@ -69,6 +71,10 @@ genKey = do where alphabet = BS8.pack (['a'..'z'] ++ ['A'..'Z'] ++ ['0'..'9']) +{-# NOINLINE monitorKey #-} +monitorKey :: Maybe ByteString +monitorKey = unsafePerformIO $ fmap BS8.pack <$> lookupEnv "TIRCLOGV_MONITOR_SPAM_KEY" + newSpamcheck :: IO Spamcheck newSpamcheck = do now <- Clock.getTime Clock.Monotonic @@ -99,8 +105,10 @@ wrapSpamcheck spamcheck@(Spamcheck _ cookieref) req handler = do let clientcookie = lookup (BS8.pack "spamkey") (reqCookies req) if not protect then handler else do correctcookie <- readIORef cookieref - if clientcookie == Just correctcookie then handler else do - challengePageResponse (reqURI req) correctcookie False + case clientcookie of + Just ck | ck == correctcookie -> handler + | Just ck == monitorKey -> handler + _ -> challengePageResponse (reqURI req) correctcookie False challengePageResponse :: ByteString -> ByteString -> Bool -> IO Response challengePageResponse prevurl cookie incorrect = do -- cgit v1.3.1