Include port if URI is not utilizing the default port for the scheme

aseigler · aseigler · commit 83b82143361a · 2021-03-18T19:37:47.000-04:00
diff --git a/Src/Fido2/AuthenticatorResponse.cs b/Src/Fido2/AuthenticatorResponse.cs
@@ -83,7 +83,9 @@ private string FullyQualifiedOrigin(string origin)
         {
             var uri = new Uri(origin);
 
-            return $"{uri.Scheme}://{uri.Host}";
+            var fullyQualifiedOrigin = uri.IsDefaultPort ? $"{uri.Scheme}://{uri.Host}" : $"{uri.Scheme}://{uri.Host}:{uri.Port}";
+
+            return fullyQualifiedOrigin;
         }
     }
 }
diff --git a/Test/AuthenticatorResponse.cs b/Test/AuthenticatorResponse.cs
@@ -26,7 +26,7 @@ public void TestAuthenticatorAttestationRawResponse()
                         {
                             Type = "webauthn.create",
                             Challenge = challenge,
-                            Origin = "fido2.azurewebsites.net",
+                            Origin = "https://www.passwordless.dev",
                         }
                     )
                 );
@@ -156,7 +156,7 @@ public void TestAuthenticatorAttestationObjectMalformed(byte[] value)
         public void TestAuthenticatorAttestationResponseInvalidType()
         {
             var challenge = RandomGenerator.Default.GenerateBytes(128);
-            var rp = "fido2.azurewebsites.net";
+            var rp = "https://www.passwordless.dev";
             var clientDataJson = Encoding.UTF8.GetBytes(
                     JsonConvert.SerializeObject
                     (
@@ -232,7 +232,7 @@ public void TestAuthenticatorAttestationResponseInvalidType()
         public void TestAuthenticatorAttestationResponseInvalidRawId(byte[] value)
         {
             var challenge = RandomGenerator.Default.GenerateBytes(128);
-            var rp = "fido2.azurewebsites.net";
+            var rp = "https://www.passwordless.dev";
             var clientDataJson = Encoding.UTF8.GetBytes(
                     JsonConvert.SerializeObject
                     (
@@ -306,7 +306,7 @@ public void TestAuthenticatorAttestationResponseInvalidRawId(byte[] value)
         public void TestAuthenticatorAttestationResponseInvalidRawType()
         {
             var challenge = RandomGenerator.Default.GenerateBytes(128);
-            var rp = "fido2.azurewebsites.net";
+            var rp = "https://www.passwordless.dev";
             var clientDataJson = Encoding.UTF8.GetBytes(
                     JsonConvert.SerializeObject
                     (
@@ -380,7 +380,7 @@ public void TestAuthenticatorAttestationResponseInvalidRawType()
         public void TestAuthenticatorAttestationResponseRpidMismatch()
         {
             var challenge = RandomGenerator.Default.GenerateBytes(128);
-            var rp = "fido2.azurewebsites.net";
+            var rp = "https://www.passwordless.dev";
             var authData = new AuthenticatorData(
                 SHA256.Create().ComputeHash(Encoding.UTF8.GetBytes("passwordless.dev")),
                 AuthenticatorFlags.UV,
@@ -461,7 +461,7 @@ public void TestAuthenticatorAttestationResponseRpidMismatch()
         public void TestAuthenticatorAttestationResponseNotUserPresent()
         {
             var challenge = RandomGenerator.Default.GenerateBytes(128);
-            var rp = "fido2.azurewebsites.net";
+            var rp = "https://www.passwordless.dev";
             var authData = new AuthenticatorData(
                 SHA256.Create().ComputeHash(Encoding.UTF8.GetBytes(rp)),
                 AuthenticatorFlags.UV,
@@ -542,7 +542,7 @@ public void TestAuthenticatorAttestationResponseNotUserPresent()
         public void TestAuthenticatorAttestationResponseNoAttestedCredentialData()
         {
             var challenge = RandomGenerator.Default.GenerateBytes(128);
-            var rp = "fido2.azurewebsites.net";
+            var rp = "https://www.passwordless.dev";
             var authData = new AuthenticatorData(
                 SHA256.Create().ComputeHash(Encoding.UTF8.GetBytes(rp)),
                 AuthenticatorFlags.UP | AuthenticatorFlags.UV,
@@ -623,7 +623,7 @@ public void TestAuthenticatorAttestationResponseNoAttestedCredentialData()
         public void TestAuthenticatorAttestationResponseUnknownAttestationType()
         {
             var challenge = RandomGenerator.Default.GenerateBytes(128);
-            var rp = "fido2.azurewebsites.net";
+            var rp = "https://www.passwordless.dev";
             var acd = new AttestedCredentialData(("00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-40-FE-6A-32-63-BE-37-D1-01-B1-2E-57-CA-96-6C-00-22-93-E4-19-C8-CD-01-06-23-0B-C6-92-E8-CC-77-12-21-F1-DB-11-5D-41-0F-82-6B-DB-98-AC-64-2E-B1-AE-B5-A8-03-D1-DB-C1-47-EF-37-1C-FD-B1-CE-B0-48-CB-2C-A5-01-02-03-26-20-01-21-58-20-A6-D1-09-38-5A-C7-8E-5B-F0-3D-1C-2E-08-74-BE-6D-BB-A4-0B-4F-2A-5F-2F-11-82-45-65-65-53-4F-67-28-22-58-20-43-E1-08-2A-F3-13-5B-40-60-93-79-AC-47-42-58-AA-B3-97-B8-86-1D-E4-41-B4-4E-83-08-5D-1C-6B-E0-D0").Split('-').Select(c => Convert.ToByte(c, 16)).ToArray());
             var authData = new AuthenticatorData(
                 SHA256.Create().ComputeHash(Encoding.UTF8.GetBytes(rp)),
@@ -705,7 +705,7 @@ public void TestAuthenticatorAttestationResponseUnknownAttestationType()
         public void TestAuthenticatorAttestationResponseNotUniqueCredId()
         {
             var challenge = RandomGenerator.Default.GenerateBytes(128);
-            var rp = "fido2.azurewebsites.net";
+            var rp = "https://www.passwordless.dev";
             var acd = new AttestedCredentialData(("00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-40-FE-6A-32-63-BE-37-D1-01-B1-2E-57-CA-96-6C-00-22-93-E4-19-C8-CD-01-06-23-0B-C6-92-E8-CC-77-12-21-F1-DB-11-5D-41-0F-82-6B-DB-98-AC-64-2E-B1-AE-B5-A8-03-D1-DB-C1-47-EF-37-1C-FD-B1-CE-B0-48-CB-2C-A5-01-02-03-26-20-01-21-58-20-A6-D1-09-38-5A-C7-8E-5B-F0-3D-1C-2E-08-74-BE-6D-BB-A4-0B-4F-2A-5F-2F-11-82-45-65-65-53-4F-67-28-22-58-20-43-E1-08-2A-F3-13-5B-40-60-93-79-AC-47-42-58-AA-B3-97-B8-86-1D-E4-41-B4-4E-83-08-5D-1C-6B-E0-D0").Split('-').Select(c => Convert.ToByte(c, 16)).ToArray());
             var authData = new AuthenticatorData(
                 SHA256.Create().ComputeHash(Encoding.UTF8.GetBytes(rp)),
@@ -794,7 +794,7 @@ public void TestAuthenticatorAssertionRawResponse()
                         {
                             Type = "webauthn.get",
                             Challenge = challenge,
-                            Origin = "fido2.azurewebsites.net",
+                            Origin = "https://www.passwordless.dev",
                         }
                     )
                 );
diff --git a/Test/Fido2Tests.cs b/Test/Fido2Tests.cs

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,9 @@ private string FullyQualifiedOrigin(string origin)`
`83`	`83`	`{`
`84`	`84`	`var uri = new Uri(origin);`
`85`	`85`
`86`		`- return $"{uri.Scheme}://{uri.Host}";`
	`86`	`+ var fullyQualifiedOrigin = uri.IsDefaultPort ? $"{uri.Scheme}://{uri.Host}" : $"{uri.Scheme}://{uri.Host}:{uri.Port}";`
	`87`	`+`
	`88`	`+ return fullyQualifiedOrigin;`
`87`	`89`	`}`
`88`	`90`	`}`
`89`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public void TestAuthenticatorAttestationRawResponse()`
`26`	`26`	`{`
`27`	`27`	`Type = "webauthn.create",`
`28`	`28`	`Challenge = challenge,`
`29`		`- Origin = "fido2.azurewebsites.net",`
	`29`	`+ Origin = "https://www.passwordless.dev",`
`30`	`30`	`}`
`31`	`31`	`)`
`32`	`32`	`);`
`@@ -156,7 +156,7 @@ public void TestAuthenticatorAttestationObjectMalformed(byte[] value)`
`156`	`156`	`public void TestAuthenticatorAttestationResponseInvalidType()`
`157`	`157`	`{`
`158`	`158`	`var challenge = RandomGenerator.Default.GenerateBytes(128);`
`159`		`- var rp = "fido2.azurewebsites.net";`
	`159`	`+ var rp = "https://www.passwordless.dev";`
`160`	`160`	`var clientDataJson = Encoding.UTF8.GetBytes(`
`161`	`161`	`JsonConvert.SerializeObject`
`162`	`162`	`(`
`@@ -232,7 +232,7 @@ public void TestAuthenticatorAttestationResponseInvalidType()`
`232`	`232`	`public void TestAuthenticatorAttestationResponseInvalidRawId(byte[] value)`
`233`	`233`	`{`
`234`	`234`	`var challenge = RandomGenerator.Default.GenerateBytes(128);`
`235`		`- var rp = "fido2.azurewebsites.net";`
	`235`	`+ var rp = "https://www.passwordless.dev";`
`236`	`236`	`var clientDataJson = Encoding.UTF8.GetBytes(`
`237`	`237`	`JsonConvert.SerializeObject`
`238`	`238`	`(`
`@@ -306,7 +306,7 @@ public void TestAuthenticatorAttestationResponseInvalidRawId(byte[] value)`
`306`	`306`	`public void TestAuthenticatorAttestationResponseInvalidRawType()`
`307`	`307`	`{`
`308`	`308`	`var challenge = RandomGenerator.Default.GenerateBytes(128);`
`309`		`- var rp = "fido2.azurewebsites.net";`
	`309`	`+ var rp = "https://www.passwordless.dev";`
`310`	`310`	`var clientDataJson = Encoding.UTF8.GetBytes(`
`311`	`311`	`JsonConvert.SerializeObject`
`312`	`312`	`(`
`@@ -380,7 +380,7 @@ public void TestAuthenticatorAttestationResponseInvalidRawType()`
`380`	`380`	`public void TestAuthenticatorAttestationResponseRpidMismatch()`
`381`	`381`	`{`
`382`	`382`	`var challenge = RandomGenerator.Default.GenerateBytes(128);`
`383`		`- var rp = "fido2.azurewebsites.net";`
	`383`	`+ var rp = "https://www.passwordless.dev";`
`384`	`384`	`var authData = new AuthenticatorData(`
`385`	`385`	`SHA256.Create().ComputeHash(Encoding.UTF8.GetBytes("passwordless.dev")),`
`386`	`386`	`AuthenticatorFlags.UV,`
`@@ -461,7 +461,7 @@ public void TestAuthenticatorAttestationResponseRpidMismatch()`
`461`	`461`	`public void TestAuthenticatorAttestationResponseNotUserPresent()`
`462`	`462`	`{`
`463`	`463`	`var challenge = RandomGenerator.Default.GenerateBytes(128);`
`464`		`- var rp = "fido2.azurewebsites.net";`
	`464`	`+ var rp = "https://www.passwordless.dev";`
`465`	`465`	`var authData = new AuthenticatorData(`
`466`	`466`	`SHA256.Create().ComputeHash(Encoding.UTF8.GetBytes(rp)),`
`467`	`467`	`AuthenticatorFlags.UV,`
`@@ -542,7 +542,7 @@ public void TestAuthenticatorAttestationResponseNotUserPresent()`
`542`	`542`	`public void TestAuthenticatorAttestationResponseNoAttestedCredentialData()`
`543`	`543`	`{`
`544`	`544`	`var challenge = RandomGenerator.Default.GenerateBytes(128);`
`545`		`- var rp = "fido2.azurewebsites.net";`
	`545`	`+ var rp = "https://www.passwordless.dev";`
`546`	`546`	`var authData = new AuthenticatorData(`
`547`	`547`	`SHA256.Create().ComputeHash(Encoding.UTF8.GetBytes(rp)),`
`548`	`548`	`AuthenticatorFlags.UP \| AuthenticatorFlags.UV,`
`@@ -623,7 +623,7 @@ public void TestAuthenticatorAttestationResponseNoAttestedCredentialData()`
`623`	`623`	`public void TestAuthenticatorAttestationResponseUnknownAttestationType()`
`624`	`624`	`{`
`625`	`625`	`var challenge = RandomGenerator.Default.GenerateBytes(128);`
`626`		`- var rp = "fido2.azurewebsites.net";`
	`626`	`+ var rp = "https://www.passwordless.dev";`
`627`	`627`	var acd = new AttestedCredentialData(("00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-40-FE-6A-32-63-BE-37-D1-01-B1-2E-57-CA-96-6C-00-22-93-E4-19-C8-CD-01-06-23-0B-C6-92-E8-CC-77-12-21-F1-DB-11-5D-41-0F-82-6B-DB-98-AC-64-2E-B1-AE-B5-A8-03-D1-DB-C1-47-EF-37-1C-FD-B1-CE-B0-48-CB-2C-A5-01-02-03-26-20-01-21-58-20-A6-D1-09-38-5A-C7-8E-5B-F0-3D-1C-2E-08-74-BE-6D-BB-A4-0B-4F-2A-5F-2F-11-82-45-65-65-53-4F-67-28-22-58-20-43-E1-08-2A-F3-13-5B-40-60-93-79-AC-47-42-58-AA-B3-97-B8-86-1D-E4-41-B4-4E-83-08-5D-1C-6B-E0-D0").Split('-').Select(c => Convert.ToByte(c, 16)).ToArray());
`628`	`628`	`var authData = new AuthenticatorData(`
`629`	`629`	`SHA256.Create().ComputeHash(Encoding.UTF8.GetBytes(rp)),`
`@@ -705,7 +705,7 @@ public void TestAuthenticatorAttestationResponseUnknownAttestationType()`
`705`	`705`	`public void TestAuthenticatorAttestationResponseNotUniqueCredId()`
`706`	`706`	`{`
`707`	`707`	`var challenge = RandomGenerator.Default.GenerateBytes(128);`
`708`		`- var rp = "fido2.azurewebsites.net";`
	`708`	`+ var rp = "https://www.passwordless.dev";`
`709`	`709`	var acd = new AttestedCredentialData(("00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-40-FE-6A-32-63-BE-37-D1-01-B1-2E-57-CA-96-6C-00-22-93-E4-19-C8-CD-01-06-23-0B-C6-92-E8-CC-77-12-21-F1-DB-11-5D-41-0F-82-6B-DB-98-AC-64-2E-B1-AE-B5-A8-03-D1-DB-C1-47-EF-37-1C-FD-B1-CE-B0-48-CB-2C-A5-01-02-03-26-20-01-21-58-20-A6-D1-09-38-5A-C7-8E-5B-F0-3D-1C-2E-08-74-BE-6D-BB-A4-0B-4F-2A-5F-2F-11-82-45-65-65-53-4F-67-28-22-58-20-43-E1-08-2A-F3-13-5B-40-60-93-79-AC-47-42-58-AA-B3-97-B8-86-1D-E4-41-B4-4E-83-08-5D-1C-6B-E0-D0").Split('-').Select(c => Convert.ToByte(c, 16)).ToArray());
`710`	`710`	`var authData = new AuthenticatorData(`
`711`	`711`	`SHA256.Create().ComputeHash(Encoding.UTF8.GetBytes(rp)),`
`@@ -794,7 +794,7 @@ public void TestAuthenticatorAssertionRawResponse()`
`794`	`794`	`{`
`795`	`795`	`Type = "webauthn.get",`
`796`	`796`	`Challenge = challenge,`
`797`		`- Origin = "fido2.azurewebsites.net",`
	`797`	`+ Origin = "https://www.passwordless.dev",`
`798`	`798`	`}`
`799`	`799`	`)`
`800`	`800`	`);`