Merge pull request #2 from vijayshinva/vnext

Vnext - v0.0.7
vijayshinva · Dec 5, 2020 · 850bb18 · 850bb18
2 parents a6f2155 + c6a55ce
commit 850bb18
Show file tree

Hide file tree

Showing 28 changed files with 352 additions and 54 deletions.
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -2,7 +2,7 @@ name: .NET Core
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, vnext ]
   pull_request:
     branches: [ main ]
 

diff --git a/Kryptos/Kryptos/Base64Url.cs b/Kryptos/Kryptos/Base64Url.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Text;
 
 namespace Kryptos

diff --git a/Kryptos/Kryptos/ConsoleExtensions.cs b/Kryptos/Kryptos/ConsoleExtensions.cs
@@ -0,0 +1,17 @@
+using System;
+using System.CommandLine.Rendering;
+
+namespace Kryptos
+{
+    public static class ConsoleExtensions
+    {
+        static TextSpanFormatter Formatter { get; } = new TextSpanFormatter();
+
+        public static TextSpan Underline(this string value) => new ContainerSpan(StyleSpan.UnderlinedOn(), new ContentSpan(value), StyleSpan.UnderlinedOff());
+        public static TextSpan Rgb(this string value, byte r, byte g, byte b) => new ContainerSpan(ForegroundColorSpan.Rgb(r, g, b), new ContentSpan(value), ForegroundColorSpan.Reset());
+        public static TextSpan LightGreen(this string value) => new ContainerSpan(ForegroundColorSpan.LightGreen(), new ContentSpan(value), ForegroundColorSpan.Reset());
+        public static TextSpan White(this string value) => new ContainerSpan(ForegroundColorSpan.White(), new ContentSpan(value), ForegroundColorSpan.Reset());
+        public static TextSpan ToTextSpan(this FormattableString formattableString) => Formatter.ParseToSpan(formattableString);
+        public static TextSpan ToTextSpan(this object obj) => Formatter.Format(obj);
+    }
+}
diff --git a/Kryptos/Kryptos/ConsoleViewZipInfo.cs b/Kryptos/Kryptos/ConsoleViewZipInfo.cs
@@ -0,0 +1,24 @@
+using System.CommandLine.Rendering;
+using System.CommandLine.Rendering.Views;
+using System.IO.Compression;
+
+namespace Kryptos
+{
+    class ConsoleViewZipInfo : StackLayoutView
+    {
+        protected TextSpanFormatter Formatter { get; } = new TextSpanFormatter();
+
+        public ConsoleViewZipInfo(ZipArchive zipArchive)
+        {
+            var tableView = new TableView<ZipArchiveEntry>
+            {
+                Items = zipArchive.Entries
+            };
+            tableView.AddColumn(cellValue: e => e.Name, header: new ContentView("Name".Underline()));
+            tableView.AddColumn(cellValue: e => e.Length, header: new ContentView("Length".Underline()));
+            tableView.AddColumn(cellValue: e => e.CompressedLength, header: new ContentView("CompressedLength".Underline()));
+            tableView.AddColumn(cellValue: e => e.Crc32, header: new ContentView("Crc32".Underline()));
+            Add(tableView);
+        }
+    }
+}
diff --git a/Kryptos/Kryptos/Extensions.cs b/Kryptos/Kryptos/Extensions.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Text;
 
 namespace Kryptos
 {

diff --git a/Kryptos/Kryptos/Jwt.cs b/Kryptos/Kryptos/Jwt.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text;
-
-namespace Kryptos
+namespace Kryptos
 {
     public class Jwt
     {

diff --git a/Kryptos/Kryptos/Kryptos.csproj b/Kryptos/Kryptos/Kryptos.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
-    <Version>0.0.6</Version>
+    <Version>0.0.7</Version>
     <Authors>Vijayshinva Karnure</Authors>
     <Description>A .NET core tool for cryptography.</Description>
     <Copyright>2020 Vijayshinva Karnure</Copyright>
@@ -15,7 +15,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20371.2" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20574.7" />
+    <PackageReference Include="System.CommandLine.Rendering" Version="0.3.0-alpha.20574.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Kryptos/Kryptos/Program.cs b/Kryptos/Kryptos/Program.cs
@@ -27,8 +27,11 @@ static async Task<int> Main(string[] args)
                 .WireUpHmacSha256Commands()
                 .WireUpHmacSha384Commands()
                 .WireUpHmacSha512Commands()
-                .WireUpSriCommands().
-                WireUpOidCommands();
+                .WireUpSriCommands()
+                .WireUpOidCommands()
+                .WireUpPfxCommands()
+                .WireUpRngCommands()
+                .WireUpZipCommands();
 
             return await rootCommand.InvokeAsync(args);
         }

diff --git a/Kryptos/Kryptos/WireUpBase64Extensions.cs b/Kryptos/Kryptos/WireUpBase64Extensions.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;
@@ -74,18 +73,10 @@ public static RootCommand WireUpBase64Commands(this RootCommand rootCommand)
             });
             var base64DecCommand = new Command("decode", "Decode");
             base64DecCommand.AddAlias("dec");
-            base64DecCommand.AddOption(new Option(new string[] { "--text", "-t" }, "Input Text")
-            {
-                Argument = new Argument<string>("text")
-            });
-            base64DecCommand.AddOption(new Option(new string[] { "--input", "-i" }, "Input file path")
-            {
-                Argument = new Argument<FileInfo>("input")
-            });
-            base64DecCommand.AddOption(new Option(new string[] { "--output", "-o" }, "Output file path")
-            {
-                Argument = new Argument<FileInfo>("output")
-            });
+            base64DecCommand.AddOption(new Option<string>(new string[] { "--text", "-t" }, "Input Text"));
+            base64DecCommand.AddOption(new Option<FileInfo>(new string[] { "--input", "-i" }, "Input file path"));
+            base64DecCommand.AddOption(new Option<FileInfo>(new string[] { "--output", "-o" }, "Output file path"));
+
             base64DecCommand.Handler = CommandHandler.Create<string, FileInfo, FileInfo, IConsole>(async (text, input, output, console) =>
             {
                 Stream outputStream = null;

diff --git a/Kryptos/Kryptos/WireUpBase64UrlExtensions.cs b/Kryptos/Kryptos/WireUpBase64UrlExtensions.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;
 using System.IO;
-using System.Security.Cryptography;
-using System.Text;
 
 namespace Kryptos
 {

diff --git a/Kryptos/Kryptos/WireUpHmacMd5Extensions.cs b/Kryptos/Kryptos/WireUpHmacMd5Extensions.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;

diff --git a/Kryptos/Kryptos/WireUpHmacSha1Extensions.cs b/Kryptos/Kryptos/WireUpHmacSha1Extensions.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;

diff --git a/Kryptos/Kryptos/WireUpHmacSha256Extensions.cs b/Kryptos/Kryptos/WireUpHmacSha256Extensions.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;

diff --git a/Kryptos/Kryptos/WireUpHmacSha384Extensions.cs b/Kryptos/Kryptos/WireUpHmacSha384Extensions.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;

diff --git a/Kryptos/Kryptos/WireUpHmacSha512Extensions.cs b/Kryptos/Kryptos/WireUpHmacSha512Extensions.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;

diff --git a/Kryptos/Kryptos/WireUpJwtExtensions.cs b/Kryptos/Kryptos/WireUpJwtExtensions.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;
 using System.IO;
-using System.Security.Cryptography;
-using System.Text;
 
 namespace Kryptos
 {

diff --git a/Kryptos/Kryptos/WireUpMd5Extensions.cs b/Kryptos/Kryptos/WireUpMd5Extensions.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;

diff --git a/Kryptos/Kryptos/WireUpOidExtensions.cs b/Kryptos/Kryptos/WireUpOidExtensions.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;
-using System.IO;
 using System.Security.Cryptography;
-using System.Text;
 
 namespace Kryptos
 {

diff --git a/Kryptos/Kryptos/WireUpPfxExtensions.cs b/Kryptos/Kryptos/WireUpPfxExtensions.cs
@@ -0,0 +1,174 @@
+using System;
+using System.CommandLine;
+using System.CommandLine.Invocation;
+using System.CommandLine.IO;
+using System.IO;
+using System.Net;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+
+namespace Kryptos
+{
+    public static class WireUpPfxExtensions
+    {
+        public static RootCommand WireUpPfxCommands(this RootCommand rootCommand)
+        {
+            var pfxCommand = new Command("pfx", "PFX, PKCS #12");
+            var pfxEncCommand = new Command("encrypt", "Encrypt");
+            pfxEncCommand.AddAlias("enc");
+            pfxEncCommand.AddOption(new Option<string>(new string[] { "--text", "-t" }, "Input Text"));
+            pfxEncCommand.AddOption(new Option<FileInfo>(new string[] { "--input", "-i" }, "Input file path"));
+            pfxEncCommand.AddOption(new Option<FileInfo>(new string[] { "--output", "-o" }, "Output file path"));
+            pfxEncCommand.AddOption(new Option<FileInfo>(new string[] { "--certinput", "-ci" }, "Certificate file path (.pfx)"));
+            pfxEncCommand.AddOption(new Option<string>(new string[] { "--keytext", "-kt" }, "Key Text"));
+
+            pfxEncCommand.Handler = CommandHandler.Create<string, FileInfo, FileInfo, FileInfo, string, IConsole>(async (text, input, output, certInput, keyText, console) =>
+            {
+                try
+                {
+                    if (input != null)
+                    {
+                        text = await File.ReadAllTextAsync(input.FullName).ConfigureAwait(false);
+                    }
+
+                    using var certificate = new X509Certificate2(certInput.FullName, keyText);
+                    using var rsa = certificate.GetRSAPublicKey();
+                    var encryptedText = rsa.Encrypt(Encoding.UTF8.GetBytes(text), RSAEncryptionPadding.Pkcs1);
+
+                    if (output == null)
+                    {
+                        console.Out.WriteLine(Convert.ToBase64String(encryptedText));
+                    }
+                    else
+                    {
+                        var outputStream = output.OpenWrite();
+                        await outputStream.WriteAsync(encryptedText).ConfigureAwait(false);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    console.Out.WriteLine(ex.Message);
+                    return 22;
+                }
+                return 0;
+            });
+
+            var pfxDecCommand = new Command("decrypt", "Decrypt");
+            pfxDecCommand.AddAlias("dec");
+            pfxDecCommand.AddOption(new Option<string>(new string[] { "--text", "-t" }, "Input Text"));
+            pfxDecCommand.AddOption(new Option<FileInfo>(new string[] { "--input", "-i" }, "Input file path"));
+            pfxDecCommand.AddOption(new Option<FileInfo>(new string[] { "--output", "-o" }, "Output file path"));
+            pfxDecCommand.AddOption(new Option<FileInfo>(new string[] { "--certinput", "-ci" }, "Certificate file path (.pfx)"));
+            pfxDecCommand.AddOption(new Option<string>(new string[] { "--keytext", "-kt" }, "Key Text"));
+
+            pfxDecCommand.Handler = CommandHandler.Create<string, FileInfo, FileInfo, FileInfo, string, IConsole>(async (text, input, output, certInput, keyText, console) =>
+            {
+                try
+                {
+                    using var certificate = new X509Certificate2(certInput.FullName, keyText, X509KeyStorageFlags.EphemeralKeySet);
+                    using var rsa = certificate.GetRSAPrivateKey();
+
+                    var textBytes = Convert.FromBase64String(text);
+                    if (input != null)
+                    {
+                        textBytes = await File.ReadAllBytesAsync(input.FullName).ConfigureAwait(false);
+                    }
+                    var decryptedText = rsa.Decrypt(textBytes, RSAEncryptionPadding.Pkcs1);
+                    if (output == null)
+                    {
+                        console.Out.WriteLine(Encoding.UTF8.GetString(decryptedText));
+                    }
+                    else
+                    {
+                        using var outputStream = output.OpenWrite();
+                        await outputStream.WriteAsync(decryptedText).ConfigureAwait(false);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    console.Out.WriteLine(ex.Message);
+                    return 22;
+                }
+                return 0;
+            });
+
+            var pfxInfoCommand = new Command("info", "Information");
+            pfxInfoCommand.AddAlias("info");
+            pfxInfoCommand.AddOption(new Option<FileInfo>(new string[] { "--certinput", "-ci" }, "Certificate file path (.pfx)"));
+            pfxInfoCommand.AddOption(new Option<string>(new string[] { "--keytext", "-kt" }, "Key Text"));
+
+            pfxInfoCommand.Handler = CommandHandler.Create<FileInfo, string, IConsole>((certInput, keyText, console) =>
+            {
+                try
+                {
+                    using var certificate = new X509Certificate2(certInput.FullName, keyText);
+                    console.Out.WriteLine($"Thumbprint\t: {certificate.Thumbprint}");
+                    console.Out.WriteLine($"Subject\t\t: {certificate.Subject}");
+                    console.Out.WriteLine($"FriendlyName\t: {certificate.FriendlyName}");
+                    console.Out.WriteLine($"Issuer\t\t: {certificate.Issuer}");
+                    console.Out.WriteLine($"NotAfter\t: {certificate.NotAfter:dd-MMM-yyyy}");
+                    console.Out.WriteLine($"NotBefore\t: {certificate.NotBefore:dd-MMM-yyyy}");
+                    console.Out.WriteLine($"HasPrivateKey\t: {certificate.HasPrivateKey}");
+                    console.Out.WriteLine($"PublicKey\t: {certificate.PublicKey.Oid.FriendlyName} ({certificate.PublicKey.Oid.Value})");
+                    console.Out.WriteLine($"Signature\t: {certificate.SignatureAlgorithm.FriendlyName} ({certificate.SignatureAlgorithm.Value})");
+                    console.Out.WriteLine($"SerialNumber\t: {certificate.SerialNumber}");
+                    console.Out.WriteLine($"Version\t\t: V{certificate.Version}");
+                }
+                catch (Exception ex)
+                {
+                    console.Out.WriteLine(ex.Message);
+                    return 22;
+                }
+                return 0;
+            });
+
+            var pfxCreateCommand = new Command("create", "Create Self Signed Certificate");
+            pfxCreateCommand.AddOption(new Option<string>(new string[] { "--subjecttext", "-st" }, "Subject Text"));
+            pfxCreateCommand.AddOption(new Option<string>(new string[] { "--keytext", "-kt" }, "Key Text"));
+            pfxCreateCommand.AddOption(new Option<FileInfo>(new string[] { "--output", "-o" }, "Output file path"));
+
+            pfxCreateCommand.Handler = CommandHandler.Create<string, string, FileInfo, IConsole>((subjectText, keyText, output, console) =>
+            {
+                try
+                {
+                    using var rsa = RSA.Create(3072);
+                    var certificateRequest = new CertificateRequest($"CN={subjectText}", rsa, HashAlgorithmName.SHA512, RSASignaturePadding.Pkcs1);
+                    var subjectAlternativeNameBuilder = new SubjectAlternativeNameBuilder();
+                    subjectAlternativeNameBuilder.AddIpAddress(IPAddress.Loopback);
+                    subjectAlternativeNameBuilder.AddIpAddress(IPAddress.IPv6Loopback);
+                    subjectAlternativeNameBuilder.AddDnsName("localhost");
+                    certificateRequest.CertificateExtensions.Add(subjectAlternativeNameBuilder.Build());
+
+                    var certificate = certificateRequest.CreateSelfSigned(DateTimeOffset.Now, DateTimeOffset.Now.AddYears(3));
+                    certificate.FriendlyName = subjectText;
+
+                    if (output == null)
+                    {
+                        console.Out.WriteLine("-----BEGIN CERTIFICATE-----\r\n");
+                        console.Out.WriteLine(Convert.ToBase64String(certificate.Export(X509ContentType.Cert), Base64FormattingOptions.InsertLineBreaks));
+                        console.Out.WriteLine("\r\n-----END CERTIFICATE-----");
+                    }
+                    else
+                    {
+                        File.WriteAllBytesAsync(output.FullName, certificate.Export(X509ContentType.Pfx, keyText));
+                    }
+                }
+                catch (Exception ex)
+                {
+                    console.Out.WriteLine(ex.Message);
+                    return 22;
+                }
+                return 0;
+            });
+
+            pfxCommand.Add(pfxEncCommand);
+            pfxCommand.Add(pfxDecCommand);
+            pfxCommand.Add(pfxInfoCommand);
+            pfxCommand.Add(pfxCreateCommand);
+            rootCommand.AddCommand(pfxCommand);
+
+            return rootCommand;
+        }
+    }
+}