Merge pull request #4 from SendSafely/v3.0.4

v3.0.4

Author: SendSafely-GitHub

SendsafelyAPI/Objects/Connection.cs

@@ -9,6 +9,8 @@
 using System.Security.Cryptography;
 using SendSafely.Exceptions;
 using System.Threading;
+using System.Reflection;
+using System.Runtime.Versioning;
 
 namespace SendSafely.Objects
 {
@@ -203,6 +205,7 @@ public Stream CallServer(Endpoint p, Object request)
 
         private void Initialize(String host, String privateKey, String apiKey)
         {
+            this.SetTlsProtocol();
             this.apiKey = apiKey;
             this.privateKey = privateKey;
 
@@ -271,6 +274,32 @@ private void WriteOutput(WebRequest req, String requestString)
             dataStream.Write(reqData, 0, reqData.Length);
         }
 
+        private void SetTlsProtocol()
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            var attributes = assembly.GetCustomAttributes(typeof(TargetFrameworkAttribute), false);
+            var version = (TargetFrameworkAttribute)attributes[0];
+
+            SecurityProtocolType flag;
+
+            try
+            {
+                if (Enum.TryParse("Tls11", out flag))
+                    ServicePointManager.SecurityProtocol |= flag;
+                if (Enum.TryParse("Tls12", out flag))
+                    ServicePointManager.SecurityProtocol |= flag;
+            }
+            catch (Exception e)
+            {
+                throw new Exception("Unable to set TLS protocol for " + version.FrameworkDisplayName + ", enabled protocols " + GetEnabledSecurityProtocols(), e);
+            }
+        }
+
+        private string GetEnabledSecurityProtocols()
+        {
+            return ServicePointManager.SecurityProtocol.ToString();
+        }
+
         #endregion
     }
 }

SendsafelyAPI/Objects/ConnectionStrings.cs

@@ -32,7 +32,7 @@ internal class ConnectionStrings
             {"deleteTempPackage", new Endpoint("/api/v2.0/package/{packageId}/temp/", HTTPMethod.DELETE, "application/json")},
             {"deletePackage", new Endpoint("/api/v2.0/package/{packageId}/", HTTPMethod.DELETE, "application/json")},
             {"packageInformation", new Endpoint("/api/v2.0/package/{packageId}/", HTTPMethod.GET, "application/json")},
-            {"updatePackageDescriptor", new Endpoint("/api/v2.0/package/{packageId}/", HTTPMethod.POST, "application/json")},
+            {"updatePackage", new Endpoint("/api/v2.0/package/{packageId}/", HTTPMethod.POST, "application/json")},
 
             {"directoryInformation", new Endpoint("/api/v2.0/package/{packageId}/directory/{directoryId}", HTTPMethod.GET, "application/json")},
             {"createDirectory", new Endpoint("/api/v2.0/package/{packageId}/directory/{directoryId}/subdirectory/", HTTPMethod.PUT, "application/json")},

SendsafelyAPI/Objects/Enums.cs

@@ -27,6 +27,7 @@ enum APIResponse
         INVALID_RECIPIENT,
         PASSWORD_COMPLEXITY,
         TWO_FA_REQUIRED,
+        TWO_FA_ENFORCED,
         AUTH_FORBIDDEN,
         INVALID_TOKEN,
         PIN_RESEND,

SendsafelyAPI/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("SendSafely Windows Client API")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,7 +32,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.3")]
-[assembly: AssemblyFileVersion("1.1.0.3")]
+[assembly: AssemblyVersion("3.0.4")]
+[assembly: AssemblyFileVersion("3.0.4")]
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("APITests")]

SendsafelyAPI/SendsafelyAPI.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SendSafely</RootNamespace>
     <AssemblyName>SendsafelyAPI</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

SendsafelyAPI/Utilities/CryptUtility.cs

@@ -148,8 +148,8 @@ public String DecryptMessage(String encryptedMessage, char[] passPhrase)
 
         public String EncryptMessage(String unencryptedMessage, char[] passPhrase)
         {
-            // Convert the input to a byte array. Since it's text we will interpret it as Ascii
-            byte[] unencryptedByteArray = System.Text.Encoding.ASCII.GetBytes (unencryptedMessage);
+            // Convert the input to a byte array. We expect the string to be UTF-8 encoded
+            byte[] unencryptedByteArray = System.Text.Encoding.UTF8.GetBytes (unencryptedMessage);
 
 	        PgpLiteralDataGenerator lData = new PgpLiteralDataGenerator();
 
@@ -323,7 +323,7 @@ private Keypair Armor(AsymmetricCipherKeyPair keyPair, String email)
                 privateKey,
                 DateTime.Now,
                 email,
-                SymmetricKeyAlgorithmTag.Aes256,
+                SymmetricKeyAlgorithmTag.Null,
                 null,
                 null,
                 null,

SendsafelyAPI/Utilities/PackageUtility.cs

@@ -221,7 +221,7 @@ public bool UpdatePackageLife(String packageId, int life)
 
         public void UpdatePackageDescriptor(String packageId, String packageDescriptor)
         {
-            Endpoint p = ConnectionStrings.Endpoints["updatePackageDescriptor"].Clone();
+            Endpoint p = ConnectionStrings.Endpoints["updatePackage"].Clone();
             p.Path = p.Path.Replace("{packageId}", packageId);
 
             UpdatePackageDescriptorRequest req = new UpdatePackageDescriptorRequest();

SendsafelyAPI/Utilities/RegistrationUtility.cs

@@ -56,6 +56,10 @@ public void StartPINRegistration(String email)
             {
                 throw new RegistrationNotAllowedException(response.Message);
             }
+            else if (response.Response == APIResponse.TWO_FA_ENFORCED)
+            {
+                throw new TwoFAEnforcedException(response.Message);
+            }
             else if (response.Response != APIResponse.SUCCESS)
             {
                 throw new ActionFailedException(response.Response.ToString(), response.Message);