Fix #27

Author: InedoJohn

upack/Command.cs

@@ -9,6 +9,7 @@
 using System.Linq;
 using System.Net;
 using System.Reflection;
+using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -440,5 +441,15 @@ internal static UniversalFeedClient CreateClient(string source, NetworkCredentia
                 throw new UpackException("Invalid UPack feed URL: " + ex.Message, ex);
             }
         }
+
+        internal static HexString GetSHA1(string filePath)
+        {
+            using (var file = File.OpenRead(filePath))
+            using (var hash = HashAlgorithm.Create("SHA1"))
+            {
+                var bytes = hash.ComputeHash(file);
+                return new HexString(bytes);
+            }
+        }
     }
 }

upack/CommandDispatcher.cs

@@ -10,7 +10,7 @@ namespace Inedo.ProGet.UPack
 {
     public sealed class CommandDispatcher
     {
-        public static CommandDispatcher Default => new CommandDispatcher(typeof(Pack), typeof(Push), typeof(Unpack), typeof(Install), typeof(List), typeof(Repack));
+        public static CommandDispatcher Default => new CommandDispatcher(typeof(Pack), typeof(Push), typeof(Unpack), typeof(Install), typeof(List), typeof(Repack), typeof(Verify), typeof(Hash));
 
         private readonly IEnumerable<Type> commands;
 

upack/Hash.cs

@@ -0,0 +1,47 @@
+using System;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+using Inedo.UPack;
+using Inedo.UPack.Packaging;
+
+namespace Inedo.ProGet.UPack
+{
+    [DisplayName("hash")]
+    [Description("Calculates the SHA1 hash of a local package and writes it to standard output.")]
+    public sealed class Hash : Command
+    {
+        [DisplayName("package")]
+        [Description("Path of a valid .upack file.")]
+        [PositionalArgument(0)]
+        [ExpandPath]
+        public string PackagePath { get; set; }
+
+        public override Task<int> RunAsync(CancellationToken cancellationToken)
+        {
+            var metadata = GetPackageMetadata();
+            var packageId = new UniversalPackageId(metadata.Group, metadata.Name);
+
+            var sha1 = GetSHA1(this.PackagePath);
+
+            Console.WriteLine(sha1);
+
+            return Task.FromResult(0);
+        }
+
+        private UniversalPackageMetadata GetPackageMetadata()
+        {
+            try
+            {
+                using (var package = new UniversalPackage(this.PackagePath))
+                {
+                    return package.GetFullMetadata().Clone();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new UpackException($"The source package file '{this.PackagePath}' does not exist or could not be opened.", ex);
+            }
+        }
+    }
+}

upack/Pack.cs

@@ -16,6 +16,7 @@ public sealed class Pack : Command
         [AlternateName("metadata")]
         [Description("Path of a valid upack.json metadata file.")]
         [ExtraArgument]
+        [ExpandPath]
         public string Manifest { get; set; }
 
         [DisplayName("source")]

upack/Repack.cs

@@ -1,11 +1,11 @@
-using Inedo.UPack;
-using Inedo.UPack.Packaging;
-using System;
+using System;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Inedo.UPack;
+using Inedo.UPack.Packaging;
 
 namespace Inedo.ProGet.UPack
 {
@@ -17,6 +17,7 @@ public sealed class Repack : Command
         [AlternateName("metadata")]
         [Description("Path of upack.json file to merge.")]
         [ExtraArgument]
+        [ExpandPath]
         public string Manifest { get; set; }
 
         [DisplayName("source")]
@@ -101,6 +102,8 @@ public override async Task<int> RunAsync(CancellationToken cancellationToken)
 
                 foreach (var entry in entries)
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
+
                     if (entry.IsDirectory)
                     {
                         builder.AddEmptyDirectoryRaw(entry.RawPath);

upack/Verify.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using Inedo.UPack;
+using Inedo.UPack.Packaging;
+
+namespace Inedo.ProGet.UPack
+{
+    [DisplayName("verify")]
+    [Description("Verifies that a specified package hash matches the hash stored in a ProGet Universal feed.")]
+    public sealed class Verify : Command
+    {
+        [DisplayName("package")]
+        [Description("Path of a valid .upack file.")]
+        [PositionalArgument(0)]
+        [ExpandPath]
+        public string PackagePath { get; set; }
+
+        [DisplayName("source")]
+        [Description("URL of a upack API endpoint.")]
+        [PositionalArgument(1)]
+        public string SourceEndpoint { get; set; }
+
+        [DisplayName("user")]
+        [Description("User name and password to use for servers that require authentication. Example: username:password")]
+        [ExtraArgument]
+        public NetworkCredential Authentication { get; set; }
+
+        public override async Task<int> RunAsync(CancellationToken cancellationToken)
+        {
+            var metadata = GetPackageMetadata();
+            var packageId = new UniversalPackageId(metadata.Group, metadata.Name);
+            var client = CreateClient(this.SourceEndpoint, this.Authentication);
+            var remoteVersion = await client.GetPackageVersionAsync(packageId, metadata.Version, false, cancellationToken);
+
+            if (remoteVersion == null)
+                throw new UpackException($"Package {packageId} was not found in feed.");
+
+            var sha1 = GetSHA1(this.PackagePath);
+
+            if (sha1 != remoteVersion.SHA1)
+                throw new UpackException($"Package SHA1 value {sha1} did not match remote SHA1 value {remoteVersion.SHA1}");
+
+            Console.WriteLine("Hashes for local and remote package match: " + sha1);
+
+            return 0;
+        }
+
+        private UniversalPackageMetadata GetPackageMetadata()
+        {
+            try
+            {
+                using (var package = new UniversalPackage(this.PackagePath))
+                {
+                    return package.GetFullMetadata().Clone();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new UpackException($"The source package file '{this.PackagePath}' does not exist or could not be opened.", ex);
+            }
+        }
+    }
+}

upack/upack.csproj

@@ -66,6 +66,8 @@
     <Compile Include="Command.cs" />
     <Compile Include="CommandDispatcher.cs" />
     <Compile Include="Install.cs" />
+    <Compile Include="Hash.cs" />
+    <Compile Include="Verify.cs" />
     <Compile Include="List.cs" />
     <Compile Include="Repack.cs" />
     <Compile Include="Pack.cs" />