Run checkSecurity on all entries during 'pack'

hasufell · Dec 2, 2023 · a18cae2 · a18cae2
1 parent aeae6e1
commit a18cae2
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/Codec/Archive/Tar/Pack.hs b/Codec/Archive/Tar/Pack.hs
@@ -98,9 +98,18 @@ packPaths secCB baseDir paths =
          case tarpathRes of
            FileNameEmpty -> throwIO $ userError "File name empty"
            FileNameOK tarpath
-             | isSymlink -> (:[]) <$> packSymlinkEntry abspath tarpath
-             | isDir     -> (:[]) <$> packDirectoryEntry abspath tarpath
-             | otherwise -> (:[]) <$> packFileEntry abspath tarpath
+             | isSymlink -> do
+                 e <- packSymlinkEntry abspath tarpath
+                 secCB Nothing Nothing e
+                 pure [e]
+             | isDir     -> do
+                 e <- packDirectoryEntry abspath tarpath
+                 secCB Nothing Nothing e
+                 pure [e]
+             | otherwise -> do
+                 e <- packFileEntry abspath tarpath
+                 secCB Nothing Nothing e
+                 pure [e]
            FileNameTooLong tarpath
              | isSymlink -> do
                  linkTarget <- getSymbolicLinkTarget abspath