Making client keys handling case insensitivity. Resolves #26

Author: tpeczek

src/Lib.Net.Http.WebPush/PushServiceClient.cs

@@ -291,10 +291,18 @@ private static HttpRequestMessage SetContent(HttpRequestMessage pushMessageDeliv
             }
             else
             {
+                string p256dhKey = subscription.GetKey(PushEncryptionKeyName.P256DH);
+                string authKey = subscription.GetKey(PushEncryptionKeyName.Auth);
+
+                if (String.IsNullOrWhiteSpace(p256dhKey) || String.IsNullOrWhiteSpace(authKey))
+                {
+                    throw new InvalidOperationException("The client P-256 public key or authentication secret is not available");
+                }
+
                 ECDHAgreement keyAgreement = ECDHAgreementCalculator.CalculateAgreement
                 (
-                    UrlBase64Converter.FromUrlBase64String(subscription.GetKey(PushEncryptionKeyName.P256DH)),
-                    UrlBase64Converter.FromUrlBase64String(subscription.GetKey(PushEncryptionKeyName.Auth))
+                    UrlBase64Converter.FromUrlBase64String(p256dhKey),
+                    UrlBase64Converter.FromUrlBase64String(authKey)
                 );
 
                 pushMessageDeliveryRequest.Content = new Aes128GcmEncodedContent(

src/Lib.Net.Http.WebPush/PushSubscription.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Linq;
+using System.Collections.Generic;
 
 namespace Lib.Net.Http.WebPush
 {
@@ -37,6 +39,10 @@ public string GetKey(PushEncryptionKeyName keyName)
                 {
                     key = Keys[keyNameStringified];
                 }
+                else
+                {
+                    key = Keys.SingleOrDefault(x => String.Equals(x.Key, keyNameStringified, StringComparison.OrdinalIgnoreCase)).Value;
+                }
             }
 
             return key;

test/Test.Lib.Net.Http.WebPush/Functional/PushMessageDeliveryTests.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using System.Threading.Tasks;
 using System.Collections.Generic;
 using Xunit;
@@ -19,12 +18,15 @@ public class PushMessageDeliveryTests : IClassFixture<FakePushServiceApplication
 
 		private const string WALRUS_CONTENT = "I am the walrus";
 
+		private const string PUSH_SUBSCRIPTION_AUTH_KEY = "n5mG_PyMSKALsjsU542E6g";
+		private const string PUSH_SUBSCRIPTION_P256DH_KEY = "BDS52l6tfaf6ZEqhyDa0cScvCi4WXNYPIwmfas-7nKLIQex-DVKXB9gUxDExaZEOiwovl6LbWXZBZ9AT-GWT6eQ";
+
 		private readonly PushSubscription _pushSubscription = new PushSubscription
 		{
 			Keys = new Dictionary<string, string>
 				{
-					{ "auth", "n5mG_PyMSKALsjsU542E6g" },
-					{ "p256dh", "BDS52l6tfaf6ZEqhyDa0cScvCi4WXNYPIwmfas-7nKLIQex-DVKXB9gUxDExaZEOiwovl6LbWXZBZ9AT-GWT6eQ" }
+					{ "auth", PUSH_SUBSCRIPTION_AUTH_KEY },
+					{ "p256dh", PUSH_SUBSCRIPTION_P256DH_KEY }
 				}
 		};
 
@@ -204,6 +206,81 @@ public async Task PushService_OtherClientError_PushServiceClientExceptionContain
 
 			Assert.Equal(_pushSubscription, pushMessageDeliveryException.PushSubscription);
 		}
+
+		[Fact]
+		public async Task PushService_PushEncryptionKeysNamesLowercase_DeliversPushMessage()
+		{
+			PushSubscription pushSubscription = new PushSubscription
+			{
+				Keys = new Dictionary<string, string>
+				{
+					{ "auth", PUSH_SUBSCRIPTION_AUTH_KEY },
+					{ "p256dh", PUSH_SUBSCRIPTION_P256DH_KEY }
+				},
+				Endpoint = CREATED_ENDPOINT
+			};
+
+			PushMessage pushMessage = new PushMessage(WALRUS_CONTENT);
+
+			PushServiceClient pushClient = PreparePushServiceClient();
+
+			Exception pushMessageDeliveryException = await Record.ExceptionAsync(async () =>
+			{
+				await pushClient.RequestPushMessageDeliveryAsync(pushSubscription, pushMessage);
+			});
+
+			Assert.Null(pushMessageDeliveryException);
+		}
+
+		[Fact]
+		public async Task PushService_PushEncryptionKeysNamesUppercase_DeliversPushMessage()
+		{
+			PushSubscription pushSubscription = new PushSubscription
+			{
+				Keys = new Dictionary<string, string>
+				{
+					{ "AUTH", PUSH_SUBSCRIPTION_AUTH_KEY },
+					{ "P256DH", PUSH_SUBSCRIPTION_P256DH_KEY }
+				},
+				Endpoint = CREATED_ENDPOINT
+			};
+
+			PushMessage pushMessage = new PushMessage(WALRUS_CONTENT);
+
+			PushServiceClient pushClient = PreparePushServiceClient();
+
+			Exception pushMessageDeliveryException = await Record.ExceptionAsync(async () =>
+			{
+				await pushClient.RequestPushMessageDeliveryAsync(pushSubscription, pushMessage);
+			});
+
+			Assert.Null(pushMessageDeliveryException);
+		}
+
+		[Fact]
+		public async Task PushService_PushEncryptionKeysNamesMixedCase_DeliversPushMessage()
+		{
+			PushSubscription pushSubscription = new PushSubscription
+			{
+				Keys = new Dictionary<string, string>
+				{
+					{ "AuTh", PUSH_SUBSCRIPTION_AUTH_KEY },
+					{ "P256dH", PUSH_SUBSCRIPTION_P256DH_KEY }
+				},
+				Endpoint = CREATED_ENDPOINT
+			};
+
+			PushMessage pushMessage = new PushMessage(WALRUS_CONTENT);
+
+			PushServiceClient pushClient = PreparePushServiceClient();
+
+			Exception pushMessageDeliveryException = await Record.ExceptionAsync(async () =>
+			{
+				await pushClient.RequestPushMessageDeliveryAsync(pushSubscription, pushMessage);
+			});
+
+			Assert.Null(pushMessageDeliveryException);
+		}
 		#endregion
 	}
 }

test/Test.Lib.Net.Http.WebPush/Unit/PushSubscriptionTests.cs

@@ -0,0 +1,112 @@
+using System.Collections.Generic;
+using Xunit;
+using Lib.Net.Http.WebPush;
+
+namespace Test.Lib.Net.Http.WebPush.Unit
+{
+    public class PushSubscriptionTests
+    {
+		#region Fields
+		private const string AUTH_KEY = "n5mG_PyMSKALsjsU542E6g";
+		private const string P256DH_KEY = "BDS52l6tfaf6ZEqhyDa0cScvCi4WXNYPIwmfas-7nKLIQex-DVKXB9gUxDExaZEOiwovl6LbWXZBZ9AT-GWT6eQ";
+		#endregion
+
+		#region Tests
+		[Fact]
+		public void GetKey_AuthKeyNameLowercase_ReturnsKey()
+		{
+			PushSubscription pushSubscription = new PushSubscription
+			{
+				Keys = new Dictionary<string, string>
+				{
+					{ "auth", AUTH_KEY }
+				}
+			};
+
+			string authKey = pushSubscription.GetKey(PushEncryptionKeyName.Auth);
+
+			Assert.Equal(AUTH_KEY, authKey);
+		}
+
+		[Fact]
+		public void GetKey_AuthKeyNameUppercase_ReturnsKey()
+		{
+			PushSubscription pushSubscription = new PushSubscription
+			{
+				Keys = new Dictionary<string, string>
+				{
+					{ "AUTH", AUTH_KEY }
+				}
+			};
+
+			string authKey = pushSubscription.GetKey(PushEncryptionKeyName.Auth);
+
+			Assert.Equal(AUTH_KEY, authKey);
+		}
+
+		[Fact]
+		public void GetKey_AuthKeyNameMixedCase_ReturnsKey()
+		{
+			PushSubscription pushSubscription = new PushSubscription
+			{
+				Keys = new Dictionary<string, string>
+				{
+					{ "AuTh", AUTH_KEY }
+				}
+			};
+
+			string authKey = pushSubscription.GetKey(PushEncryptionKeyName.Auth);
+
+			Assert.Equal(AUTH_KEY, authKey);
+		}
+
+		[Fact]
+		public void GetKey_P256DHKeyNameLowercase_ReturnsKey()
+		{
+			PushSubscription pushSubscription = new PushSubscription
+			{
+				Keys = new Dictionary<string, string>
+				{
+					{ "p256dh", P256DH_KEY }
+				}
+			};
+
+			string p256dhKey = pushSubscription.GetKey(PushEncryptionKeyName.P256DH);
+
+			Assert.Equal(P256DH_KEY, p256dhKey);
+		}
+
+		[Fact]
+		public void GetKey_P256DHKeyNameUppercase_ReturnsKey()
+		{
+			PushSubscription pushSubscription = new PushSubscription
+			{
+				Keys = new Dictionary<string, string>
+				{
+					{ "P256DH", P256DH_KEY }
+				}
+			};
+
+			string p256dhKey = pushSubscription.GetKey(PushEncryptionKeyName.P256DH);
+
+			Assert.Equal(P256DH_KEY, p256dhKey);
+		}
+
+		[Fact]
+		public void GetKey_P256DHKeyNameMixedCase_ReturnsKey()
+		{
+			PushSubscription pushSubscription = new PushSubscription
+			{
+				Keys = new Dictionary<string, string>
+				{
+					{ "P256dH", P256DH_KEY }
+				}
+			};
+
+			string p256dhKey = pushSubscription.GetKey(PushEncryptionKeyName.P256DH);
+
+			Assert.Equal(P256DH_KEY, p256dhKey);
+		}
+		#endregion
+	}
+}