Merge pull request #15 from icarus-consulting/i13-check-unknown-filepath

Add check for missing file entries

Author: koeeenig

build.cake

@@ -2,7 +2,7 @@
 #tool nuget:?package=OpenCover
 #tool nuget:?package=xunit.runner.console
 #tool nuget:?package=Codecov
-#tool nuget:?package=ReportGenerator
+#tool nuget:?package=ReportGenerator&version=4.2.20
 #addin nuget:?package=Cake.Codecov&version=0.5.0
 
 var target = Argument("target", "Default");

src/Yaapii.Zip/HasPassword.cs

@@ -25,19 +25,24 @@ public HasPassword(IInput zip, string virtualPath)
 
         public bool Value()
         {
-            var stream = zip.Stream();
-            stream.Seek(0, SeekOrigin.Begin);
             new FailWhen(
                 () => !new IsZipArchive(this.zip).Value(),
-                new ArgumentException(
-                    "Can not extract zip because no zip was provided."
-                )
+                new ArgumentException("Cannot check for password because no zip was provided.")
             ).Go();
-            stream.Seek(0, SeekOrigin.Begin);
+
+            // ZipFile.ContainsEntry() by Ionic does not work with backslashes,
+            // even if the path is normalized. Misterious
+            new FailWhen(
+                () => !new ZipContains(this.zip, this.virtualPath).Value(),
+                new ArgumentException($"Cannot check for password because file '{this.virtualPath} doesn't exists in zip.")
+            ).Go();
+
             bool result;
-            using (var zip = ZipFile.Read(this.zip.Stream()))
+            var stream = this.zip.Stream();
+            stream.Seek(0, SeekOrigin.Begin);
+            using (var zip = ZipFile.Read(stream))
             {
-                result = zip[virtualPath].UsesEncryption;
+                result = zip[this.virtualPath].UsesEncryption;
             }
             return result;
         }

tests/Test.Yaapii.Zip/HasPasswordTests.cs

@@ -71,5 +71,19 @@ public void ThrowsOnNoZip()
                 new HasPassword(new InputOf("test"), "a path").Value()
             );
         }
+
+        [Fact]
+        public void ThrowsOnMissingEntry()
+        {
+            Assert.Throws<ArgumentException>(() =>
+                new HasPassword(
+                    new Zipped(
+                        "filename.txt",
+                        new InputOf("a input")
+                    ),
+                    "otherfile.txt"
+                ).Value()
+            );
+        }
     }
 }

tests/Test.Yaapii.Zip/ZipExtractedTests.cs

@@ -1,4 +1,5 @@
-using Xunit;
+using System;
+using Xunit;
 using Yaapii.Atoms.IO;
 using Yaapii.Atoms.Text;
 
@@ -39,6 +40,20 @@ public void WorksWithSlashAndBacklashSeparation(string path)
             );
         }
 
+        [Fact]
+        public void FailsOnMissingEntry()
+        {
+            Assert.Throws<ArgumentException>(() =>
+                new ZipExtracted(
+                    new Zipped(
+                        "filename.txt",
+                        new InputOf("a input")
+                    ),
+                    "otherfile.txt"
+                ).Stream()
+            );
+        }
+
         [Theory]
         [InlineData("Datum/windows.zip")]
         [InlineData("Datum/7zip.zip")]

tests/Test.Yaapii.Zip/ZipPasswordExtractedTests.cs

@@ -77,5 +77,21 @@ public void FailsOnNoPassword()
                 ).AsString()
             );
         }
+
+        [Fact]
+        public void FailsOnMissingEntry()
+        {
+            Assert.Throws<ArgumentException>(() =>
+                new ZipPasswordExtracted(
+                    new ZipWithPassword(
+                        "filename.txt",
+                        "pwd",
+                        new InputOf("a input")
+                    ),
+                    "otherfile.txt",
+                    "pwd"
+                ).Stream()
+            );
+        }
     }
 }