Change path to nix-support/private

flake.nix

@@ -84,8 +84,8 @@
         packages = {
           inherit nix-serve-ng lix-serve-ng;
           private = pkgs.runCommand "private" { } ''
-            mkdir -p $out/nix-support
+            mkdir $out
-            touch $out/nix-support/private
+            touch $out/.private
           '';
           default = nix-serve-ng;
         };

src/Main.hs

@@ -60,8 +60,8 @@ validHashPartBytes =
 
 type HostAddressTuple = (Word8, Word8, Word8, Word8)
 
-isInWhitelist :: Socket.HostAddress -> Bool
+isAllowed :: Socket.HostAddress -> Bool
-isInWhitelist host = any (uncurry (inRange $ Socket.hostAddressToTuple host)) allowedIPs
+isAllowed host = any (uncurry (ipMatches $ Socket.hostAddressToTuple host)) allowedIPs
     where
         allowedIPs :: [(HostAddressTuple, HostAddressTuple)]
         allowedIPs = [
@@ -70,7 +70,7 @@ isInWhitelist host = any (uncurry (inRange $ Socket.hostAddressToTuple host)) al
                 ((192,168,72,1), (192,168,79,254))
             ]
 
-        inRange ip a b = ip >= a && ip <= b
+        ipMatches ip a b = ip >= a && ip <= b
 
 validHashPart :: ByteString -> Bool
 validHashPart hash = ByteString.all (`ByteSet.member` validHashPartBytes) hash
@@ -271,14 +271,14 @@ makeApplication ApplicationOptions{..} request respond = do
                 let privateFilePath = ByteString.Char8.unpack storePath ++ "/nix-support/private"
                 isPrivate <- liftIO $ Directory.doesPathExist privateFilePath
 
-                let isLocal = case Wai.remoteHost request of
+                let isLocalNet = case Wai.remoteHost request of
-                                 SockAddrInet _ host -> isInWhitelist host
+                                    SockAddrInet _ host -> isAllowed host
-                                 _ -> False
+                                    _ -> False
 
-                traceM $ show (Wai.remoteHost request, isLocal)
+                traceM $ show (Wai.remoteHost request, isLocalNet)
                 traceM $ show (privateFilePath, isPrivate)
 
-                Monad.when (isPrivate && not isLocal) do
+                Monad.when (isPrivate && not isLocalNet) do
                     let headers = [ ("Content-Type", "text/plain") ]
 
                     let builder = "Forbidden.\n"