Merge pull request #22 from icarus-consulting/i21-RemovePasswordValidationFromClasses

refactor: remove password validation from classes

Author: MSE1188

src/Yaapii.Zip/ZipExtracted.cs

@@ -33,12 +33,6 @@ public Stream Stream()
         {
             lock (zip)
             {
-                new FailWhen(
-                    () => new HasPassword(this.zip, filePath).Value(),
-                    new InvalidOperationException(
-                        "Can not read content of the zip because the file is password protected"
-                    )
-                ).Go();
                 Stream content;
                 using (var archive = new ZipArchive(this.zip.Stream(), ZipArchiveMode.Read, leaveOpen))
                 {
@@ -64,9 +58,16 @@ private Stream Content(ZipArchiveEntry zipEntry)
             MemoryStream content = new MemoryStream();
             using (Stream zipEntryStream = zipEntry.Open())
             {
-                zipEntryStream.CopyTo(content);
-                zipEntryStream.Close();
-                content.Seek(0, SeekOrigin.Begin);
+                try
+                {
+                    zipEntryStream.CopyTo(content);
+                    zipEntryStream.Close();
+                    content.Seek(0, SeekOrigin.Begin);
+                }
+                catch (InvalidDataException ex)
+                {
+                    throw new InvalidOperationException($"Unable to extract file '{this.filePath}'. Maybe the zip is encrypted", ex);
+                }
             }
             return content;
         }

src/Yaapii.Zip/ZipPasswordExtracted.cs

@@ -28,18 +28,7 @@ public ZipPasswordExtracted(IInput zip, string virtualPath, string password)
 
         public Stream Stream()
         {
-            new FailWhen(
-                () => !new IsZipArchive(this.zip).Value(),
-                new ArgumentException(
-                    "Can not extract zip because no zip was provided."
-                )
-            ).Go();
-            new FailWhen(
-                () => !new HasPassword(this.zip, this.virtualPath).Value(),
-                new InvalidOperationException(
-                    "Can not extract zip because the file is not protected with a password."
-                )
-            ).Go();
+            Validate();
             zip.Stream().Seek(0, SeekOrigin.Begin);
             IInput result;
             using (var stream = new MemoryStream())
@@ -57,5 +46,21 @@ public Stream Stream()
             }
             return result.Stream();
         }
+
+        private void Validate()
+        {
+            new FailWhen(
+                () => !new IsZipArchive(this.zip).Value(),
+                new ArgumentException(
+                    "Can not extract zip because no zip was provided."
+                )
+            ).Go();
+            // 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();
+        }
     }
 }

src/Yaapii.Zip/ZipUpdated.cs

@@ -37,13 +37,6 @@ public ZipUpdated(IScalar<Stream> zip, string pathToUpdate, IInput update, bool
                 var stream = zip.Value();
                 lock (stream)
                 {
-                    new FailWhen(
-                        () => ExistsAndCrypted(new InputOf(stream), pathToUpdate),
-                        new InvalidOperationException(
-                            $"Cannot update '{pathToUpdate}' because the file is password protected"
-                        )
-                    ).Go();
-                    
                     stream.Seek(0, SeekOrigin.Begin);
                     using (var archive = new ZipArchive(stream, ZipArchiveMode.Update, leaveOpen))
                     {
@@ -83,18 +76,5 @@ private string Normalized(string path)
             var file = Path.GetFileName(path).ToLower();
             return Path.Combine(dir, file);
         }
-
-        private bool ExistsAndCrypted(IInput zip, string filepath)
-        {
-            bool result = false;
-            if(new ZipContains(zip, filepath).Value())
-            {
-                if(new HasPassword(zip, filepath).Value())
-                {
-                    result = true;
-                }
-            }
-            return result;
-        }
     }
 }

tests/Test.Yaapii.Zip/ZipPasswordExtractedTests.cs

@@ -62,14 +62,15 @@ public void ExtractsFromDifferentZips(string path)
         }
 
         [Fact]
-        public void FailsOnNoPassword()
+        public void ExtractsUnencryptedZip()
         {
-            Assert.Throws<InvalidOperationException>(() =>
+            Assert.Equal(
+                "unsafe",
                 new TextOf(
                     new ZipPasswordExtracted(
                         new Zipped(
                             "text.txt",
-                            new InputOf("safe")
+                            new InputOf("unsafe")
                         ),
                         "text.txt",
                         "password"

tests/Test.Yaapii.Zip/ZipUpdatedTests.cs

@@ -27,18 +27,35 @@ public void UpdatesFile()
         }
 
         [Fact]
-        public void ThrowsForPasswordFile()
+        public void UpdatesPasswordProtectedZip()
         {
-            Assert.Throws<InvalidOperationException>(() =>
-                new ZipUpdated(
-                    new ZipWithPassword(
-                        "Brave Citizens.txt",
-                        "pwd",
-                        new InputOf("Empty data will not crypted!")
-                    ),
-                    "Brave Citizens.txt",
-                    new InputOf("456")
-                ).Stream()
+            //Assert.Throws<InvalidOperationException>(() =>
+            //    new ZipUpdated(
+            //        new ZipWithPassword(
+            //            "Brave Citizens.txt",
+            //            "pwd",
+            //            new InputOf("Empty data will not crypted!")
+            //        ),
+            //        "Brave Citizens.txt",
+            //        new InputOf("456")
+            //    ).Stream()
+            //);
+            Assert.Equal(
+                "456",
+                new TextOf(
+                    new ZipExtracted(
+                        new ZipUpdated(
+                            new ZipWithPassword(
+                                "Brave Citizens.txt",
+                                "pwd",
+                                new InputOf("Empty data will not crypted!")
+                            ),
+                            "Brave Citizens.txt",
+                            new InputOf("456")
+                        ),
+                        "Brave Citizens.txt"
+                    )
+                ).AsString()
             );
         }
 
@@ -74,7 +91,7 @@ public void UpdatesFileInDifferentZips(string path)
         [InlineData("Datum/winrar_crypt_aes.zip")]
         public void ThrowsForDifferentCrypedZips(string path)
         {
-            Assert.Throws<InvalidOperationException>(() =>
+            Assert.Throws<ArgumentException>(() =>
                 new ZipUpdated(
                     new ResourceOf(path, this.GetType()),
                     "c/Y/test-a-y-2.txt",