abonerib/nix-serve-ng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: abonerib:1f23e97cac7a541d9ec07a22720dd4cf86565db8
Branches Tags
abonerib:main
..
compare: abonerib:1d21f73a2d563ffbb924a4244c29b35e898caefe
Branches Tags
abonerib:main

No commits in common. "1f23e97cac7a541d9ec07a22720dd4cf86565db8" and "1d21f73a2d563ffbb924a4244c29b35e898caefe" have entirely different histories.
1f23e97cac ... 1d21f73a2d

2 changed files with 0 additions and 27 deletions
Show Stats Expand all files Collapse all files

1
nix-serve-ng.cabal
View File

@ -48,7 +48,6 @@ executable nix-serve
, base32 , base32
, bytestring , bytestring
, charset , charset
, directory
, http-types , http-types
, managed , managed
, megaparsec , megaparsec

26
src/Main.hs
View File

@ -6,8 +6,6 @@
module Main where module Main where
import Debug.Trace
import Control.Monad.IO.Class (liftIO) import Control.Monad.IO.Class (liftIO)
import Data.ByteString (ByteString) import Data.ByteString (ByteString)
import Data.CharSet.ByteSet (ByteSet(..)) import Data.CharSet.ByteSet (ByteSet(..))
@ -37,7 +35,6 @@ import qualified Network.Wai.Middleware.RequestLogger as RequestLogger
import qualified Nix import qualified Nix
import qualified Options import qualified Options
import qualified Options.Applicative as Options import qualified Options.Applicative as Options
import qualified System.Directory as Directory
import qualified System.Environment as Environment import qualified System.Environment as Environment
data ApplicationOptions = ApplicationOptions data ApplicationOptions = ApplicationOptions
@ -253,29 +250,6 @@ makeApplication ApplicationOptions{..} request respond = do
done response done response
isPrivate <- not <$> liftIO (Directory.doesPathExist (ByteString.Char8.unpack storePath ++ "/.private"))
let sockAddr = Wai.remoteHost request
hostAddr <- case sockAddr of
SockAddrInet _ host -> return host
_ -> return $ Socket.tupleToHostAddress (255, 255, 255, 255)
let isInternalClient = hostAddr >= Socket.tupleToHostAddress (10, 0, 0, 0) && hostAddr < Socket.tupleToHostAddress (11, 0, 0, 0)
traceM $ show ("private", isPrivate, "host", hostAddr, "isInternalClient", isInternalClient)
Monad.unless (isInternalClient || not isPrivate) do
let headers = [ ("Content-Type", "text/plain") ]
let builder = "Forbbiden.\n"
let response =
Wai.responseBuilder
Types.status403
headers
builder
done response
let streamingBody write flush = do let streamingBody write flush = do
result <- Nix.dumpPath hashPart callback result <- Nix.dumpPath hashPart callback