Ticket ## : Fix authentication

simpleidserver · May 3, 2021 · 3951f1b · 3951f1b
1 parent 50db72d
commit 3951f1b
Show file tree

Hide file tree

Showing 21 changed files with 201 additions and 61 deletions.
diff --git a/src/CaseManagement.BPMN.Host/Startup.cs b/src/CaseManagement.BPMN.Host/Startup.cs
@@ -46,12 +46,12 @@ public void ConfigureServices(IServiceCollection services)
                     ValidAudiences = new List<string>
                     {
                         "http://localhost:60000",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/openid"
+                        "https://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     },
                     ValidIssuers = new List<string>
                     {
                         "http://localhost:60000",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/openid"
+                        "https://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     }
                 };
             });
@@ -97,11 +97,33 @@ private RsaSecurityKey ExtractKey(string fileName)
             var rsa = RSA.Create();
             var rsaParameters = new RSAParameters
             {
-                Modulus = Convert.FromBase64String(dic["n"].ToString()),
-                Exponent = Convert.FromBase64String(dic["e"].ToString())
+                Modulus = Base64DecodeBytes(dic["n"].ToString()),
+                Exponent = Base64DecodeBytes(dic["e"].ToString())
             };
             rsa.ImportParameters(rsaParameters);
             return new RsaSecurityKey(rsa);
         }
+
+        private static byte[] Base64DecodeBytes(string base64EncodedData)
+        {
+            var s = base64EncodedData
+                .Trim()
+                .Replace(" ", "+")
+                .Replace('-', '+')
+                .Replace('_', '/');
+            switch (s.Length % 4)
+            {
+                case 0:
+                    return Convert.FromBase64String(s);
+                case 2:
+                    s += "==";
+                    goto case 0;
+                case 3:
+                    s += "=";
+                    goto case 0;
+                default:
+                    throw new InvalidOperationException("Illegal base64url string!");
+            }
+        }
     }
 }
diff --git a/src/CaseManagement.BPMN.Host/openid_puk.txt b/src/CaseManagement.BPMN.Host/openid_puk.txt
@@ -1,4 +1,4 @@
 {
-	"n":"3JsFC7E93xAShgnNp9dDWJPOHjJYLGPX464AfKW9gOB5CGD2uIYiP9m6yuZd73Z334RhQw616IMYijAvtpK25Nkk91KoAvrRoUGv2bl6pmX2JwUjwqe+lbmop4Rj9tzC2UBrGPcWSbIMNLaHkUrqR15DwVdFkG19QBwo9X6gOjCgSDvV0OY7vmwq1M3j2YmDwWnyTXh92wnUn2Hg57mVNZCX8RgdhdaWR6tiFP3QtgEYzZEulOGP6PKilqSr7E6Smg7mUNy6JTRkMGm1KZHTAY6HuNG5PPq0DUmsg8YMmsGEQPHMjw7IdaPxO0qy0aC1fiLj8NgWBOJ6bgrck55vfQ==",
-	"e":"AQAB"
+  "n": "7jyP7WVsRx9WRj_nvLODxpfWrqtITHtssFc6DC8-FBjwcUAsJE-BOiwbGFoMN6aFgnug3T-EWb4g6UcBrkLlLMNhLLAnE1MvvO5elsaTmIdRNaRKq5W2N1nYZM_Ad17gV5XoXsr82Zl92tHHSbhRTRYIAWUevXA8IOMEw-Q1TeBtIGGAjweclkliNb2T69PitHC4AD1CjuHkrEO7LbmZgfsj-F_RjnD-_6MJ0E9KSiJPJ0RFxzsC72NR2uquDDOBxWluUEgXRFgqd1s_D_t_FehPEgfc5Iy88xOQkD_k3SN8xqeopaZD8OdMwxdGNMjwyD5cw80jlH0lXRLTYK0aiQ",
+  "e": "AQAB"
 }
diff --git a/src/CaseManagement.BPMN.SqlServer.Host/Startup.cs b/src/CaseManagement.BPMN.SqlServer.Host/Startup.cs
@@ -56,12 +56,12 @@ public void ConfigureServices(IServiceCollection services)
                     ValidAudiences = new List<string>
                     {
                         "http://localhost:60000",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/openid"
+                        "https://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     },
                     ValidIssuers = new List<string>
                     {
                         "http://localhost:60000",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/openid"
+                        "https://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     }
                 };
             });
@@ -120,8 +120,8 @@ private RsaSecurityKey ExtractKey(string fileName)
             var rsa = RSA.Create();
             var rsaParameters = new RSAParameters
             {
-                Modulus = Convert.FromBase64String(dic["n"].ToString()),
-                Exponent = Convert.FromBase64String(dic["e"].ToString())
+                Modulus = Base64DecodeBytes(dic["n"].ToString()),
+                Exponent = Base64DecodeBytes(dic["e"].ToString())
             };
             rsa.ImportParameters(rsaParameters);
             return new RsaSecurityKey(rsa);
@@ -151,5 +151,27 @@ private void InitializeDatabase(IApplicationBuilder app)
                 }
             }
         }
+
+        private static byte[] Base64DecodeBytes(string base64EncodedData)
+        {
+            var s = base64EncodedData
+                .Trim()
+                .Replace(" ", "+")
+                .Replace('-', '+')
+                .Replace('_', '/');
+            switch (s.Length % 4)
+            {
+                case 0:
+                    return Convert.FromBase64String(s);
+                case 2:
+                    s += "==";
+                    goto case 0;
+                case 3:
+                    s += "=";
+                    goto case 0;
+                default:
+                    throw new InvalidOperationException("Illegal base64url string!");
+            }
+        }
     }
 }
diff --git a/src/CaseManagement.BPMN.SqlServer.Host/openid_puk.txt b/src/CaseManagement.BPMN.SqlServer.Host/openid_puk.txt
@@ -1,4 +1,4 @@
 {
-	"n":"3JsFC7E93xAShgnNp9dDWJPOHjJYLGPX464AfKW9gOB5CGD2uIYiP9m6yuZd73Z334RhQw616IMYijAvtpK25Nkk91KoAvrRoUGv2bl6pmX2JwUjwqe+lbmop4Rj9tzC2UBrGPcWSbIMNLaHkUrqR15DwVdFkG19QBwo9X6gOjCgSDvV0OY7vmwq1M3j2YmDwWnyTXh92wnUn2Hg57mVNZCX8RgdhdaWR6tiFP3QtgEYzZEulOGP6PKilqSr7E6Smg7mUNy6JTRkMGm1KZHTAY6HuNG5PPq0DUmsg8YMmsGEQPHMjw7IdaPxO0qy0aC1fiLj8NgWBOJ6bgrck55vfQ==",
-	"e":"AQAB"
+  "n": "7jyP7WVsRx9WRj_nvLODxpfWrqtITHtssFc6DC8-FBjwcUAsJE-BOiwbGFoMN6aFgnug3T-EWb4g6UcBrkLlLMNhLLAnE1MvvO5elsaTmIdRNaRKq5W2N1nYZM_Ad17gV5XoXsr82Zl92tHHSbhRTRYIAWUevXA8IOMEw-Q1TeBtIGGAjweclkliNb2T69PitHC4AD1CjuHkrEO7LbmZgfsj-F_RjnD-_6MJ0E9KSiJPJ0RFxzsC72NR2uquDDOBxWluUEgXRFgqd1s_D_t_FehPEgfc5Iy88xOQkD_k3SN8xqeopaZD8OdMwxdGNMjwyD5cw80jlH0lXRLTYK0aiQ",
+  "e": "AQAB"
 }
diff --git a/src/CaseManagement.CMMN.Host/Startup.cs b/src/CaseManagement.CMMN.Host/Startup.cs
@@ -47,12 +47,12 @@ public void ConfigureServices(IServiceCollection services)
                     ValidAudiences = new List<string>
                     {
                         "http://localhost:60000",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/openid"
+                        "https://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     },
                     ValidIssuers = new List<string>
                     {
                         "http://localhost:60000",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/openid"
+                        "https://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     }
                 };
             })
@@ -68,7 +68,7 @@ public void ConfigureServices(IServiceCollection services)
                     ValidIssuers = new List<string>
                     {
                         "http://localhost:60001",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/oauth"
+                        "https://simpleidserver.northeurope.cloudapp.azure.com/oauth"
                     }
                 };
             });
@@ -173,11 +173,33 @@ private RsaSecurityKey ExtractKey(string fileName)
             var rsa = RSA.Create();
             var rsaParameters = new RSAParameters
             {
-                Modulus = Convert.FromBase64String(dic["n"].ToString()),
-                Exponent = Convert.FromBase64String(dic["e"].ToString())
+                Modulus = Base64DecodeBytes(dic["n"].ToString()),
+                Exponent = Base64DecodeBytes(dic["e"].ToString())
             };
             rsa.ImportParameters(rsaParameters);
             return new RsaSecurityKey(rsa);
         }
+
+        private static byte[] Base64DecodeBytes(string base64EncodedData)
+        {
+            var s = base64EncodedData
+                .Trim()
+                .Replace(" ", "+")
+                .Replace('-', '+')
+                .Replace('_', '/');
+            switch (s.Length % 4)
+            {
+                case 0:
+                    return Convert.FromBase64String(s);
+                case 2:
+                    s += "==";
+                    goto case 0;
+                case 3:
+                    s += "=";
+                    goto case 0;
+                default:
+                    throw new InvalidOperationException("Illegal base64url string!");
+            }
+        }
     }
 }
diff --git a/src/CaseManagement.CMMN.Host/openid_puk.txt b/src/CaseManagement.CMMN.Host/openid_puk.txt
@@ -1,4 +1,4 @@
 {
-	"n":"3JsFC7E93xAShgnNp9dDWJPOHjJYLGPX464AfKW9gOB5CGD2uIYiP9m6yuZd73Z334RhQw616IMYijAvtpK25Nkk91KoAvrRoUGv2bl6pmX2JwUjwqe+lbmop4Rj9tzC2UBrGPcWSbIMNLaHkUrqR15DwVdFkG19QBwo9X6gOjCgSDvV0OY7vmwq1M3j2YmDwWnyTXh92wnUn2Hg57mVNZCX8RgdhdaWR6tiFP3QtgEYzZEulOGP6PKilqSr7E6Smg7mUNy6JTRkMGm1KZHTAY6HuNG5PPq0DUmsg8YMmsGEQPHMjw7IdaPxO0qy0aC1fiLj8NgWBOJ6bgrck55vfQ==",
-	"e":"AQAB"
+  "n": "7jyP7WVsRx9WRj_nvLODxpfWrqtITHtssFc6DC8-FBjwcUAsJE-BOiwbGFoMN6aFgnug3T-EWb4g6UcBrkLlLMNhLLAnE1MvvO5elsaTmIdRNaRKq5W2N1nYZM_Ad17gV5XoXsr82Zl92tHHSbhRTRYIAWUevXA8IOMEw-Q1TeBtIGGAjweclkliNb2T69PitHC4AD1CjuHkrEO7LbmZgfsj-F_RjnD-_6MJ0E9KSiJPJ0RFxzsC72NR2uquDDOBxWluUEgXRFgqd1s_D_t_FehPEgfc5Iy88xOQkD_k3SN8xqeopaZD8OdMwxdGNMjwyD5cw80jlH0lXRLTYK0aiQ",
+  "e": "AQAB"
 }
diff --git a/src/CaseManagement.CMMN.SqlServer.Host/Startup.cs b/src/CaseManagement.CMMN.SqlServer.Host/Startup.cs
@@ -57,12 +57,12 @@ public void ConfigureServices(IServiceCollection services)
                     ValidAudiences = new List<string>
                     {
                         "http://localhost:60000",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/openid"
+                        "https://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     },
                     ValidIssuers = new List<string>
                     {
                         "http://localhost:60000",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/openid"
+                        "https://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     }
                 };
             })
@@ -78,7 +78,7 @@ public void ConfigureServices(IServiceCollection services)
                     ValidIssuers = new List<string>
                     {
                         "http://localhost:60001",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/oauth"
+                        "https://simpleidserver.northeurope.cloudapp.azure.com/oauth"
                     }
                 };
             });
@@ -192,13 +192,35 @@ private RsaSecurityKey ExtractKey(string fileName)
             var rsa = RSA.Create();
             var rsaParameters = new RSAParameters
             {
-                Modulus = Convert.FromBase64String(dic["n"].ToString()),
-                Exponent = Convert.FromBase64String(dic["e"].ToString())
+                Modulus = Base64DecodeBytes(dic["n"].ToString()),
+                Exponent = Base64DecodeBytes(dic["e"].ToString())
             };
             rsa.ImportParameters(rsaParameters);
             return new RsaSecurityKey(rsa);
         }
 
+        private static byte[] Base64DecodeBytes(string base64EncodedData)
+        {
+            var s = base64EncodedData
+                .Trim()
+                .Replace(" ", "+")
+                .Replace('-', '+')
+                .Replace('_', '/');
+            switch (s.Length % 4)
+            {
+                case 0:
+                    return Convert.FromBase64String(s);
+                case 2:
+                    s += "==";
+                    goto case 0;
+                case 3:
+                    s += "=";
+                    goto case 0;
+                default:
+                    throw new InvalidOperationException("Illegal base64url string!");
+            }
+        }
+
         private void InitializeDatabase(IApplicationBuilder app)
         {
             var pathLst = Directory.EnumerateFiles(Path.Combine(Directory.GetCurrentDirectory(), "Cmmns"), "*.cmmn").ToList();

diff --git a/src/CaseManagement.CMMN.SqlServer.Host/openid_puk.txt b/src/CaseManagement.CMMN.SqlServer.Host/openid_puk.txt
@@ -1,4 +1,4 @@
 {
-	"n":"3JsFC7E93xAShgnNp9dDWJPOHjJYLGPX464AfKW9gOB5CGD2uIYiP9m6yuZd73Z334RhQw616IMYijAvtpK25Nkk91KoAvrRoUGv2bl6pmX2JwUjwqe+lbmop4Rj9tzC2UBrGPcWSbIMNLaHkUrqR15DwVdFkG19QBwo9X6gOjCgSDvV0OY7vmwq1M3j2YmDwWnyTXh92wnUn2Hg57mVNZCX8RgdhdaWR6tiFP3QtgEYzZEulOGP6PKilqSr7E6Smg7mUNy6JTRkMGm1KZHTAY6HuNG5PPq0DUmsg8YMmsGEQPHMjw7IdaPxO0qy0aC1fiLj8NgWBOJ6bgrck55vfQ==",
-	"e":"AQAB"
+  "n": "7jyP7WVsRx9WRj_nvLODxpfWrqtITHtssFc6DC8-FBjwcUAsJE-BOiwbGFoMN6aFgnug3T-EWb4g6UcBrkLlLMNhLLAnE1MvvO5elsaTmIdRNaRKq5W2N1nYZM_Ad17gV5XoXsr82Zl92tHHSbhRTRYIAWUevXA8IOMEw-Q1TeBtIGGAjweclkliNb2T69PitHC4AD1CjuHkrEO7LbmZgfsj-F_RjnD-_6MJ0E9KSiJPJ0RFxzsC72NR2uquDDOBxWluUEgXRFgqd1s_D_t_FehPEgfc5Iy88xOQkD_k3SN8xqeopaZD8OdMwxdGNMjwyD5cw80jlH0lXRLTYK0aiQ",
+  "e": "AQAB"
 }
diff --git a/src/CaseManagement.HumanTask.EF.Startup/Startup.cs b/src/CaseManagement.HumanTask.EF.Startup/Startup.cs
@@ -51,12 +51,12 @@ public void ConfigureServices(IServiceCollection services)
                     ValidAudiences = new List<string>
                     {
                         "http://localhost:60000",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/openid"
+                        "https://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     },
                     ValidIssuers = new List<string>
                     {
                         "http://localhost:60000",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/openid"
+                        "https://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     }
                 };
             })
@@ -73,7 +73,7 @@ public void ConfigureServices(IServiceCollection services)
                     ValidIssuers = new List<string>
                     {
                         "http://localhost:60001",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/oauth"
+                        "https://simpleidserver.northeurope.cloudapp.azure.com/oauth"
                     }
                 };
             }); ;
@@ -118,8 +118,8 @@ private RsaSecurityKey ExtractKey(string fileName)
             var rsa = RSA.Create();
             var rsaParameters = new RSAParameters
             {
-                Modulus = Convert.FromBase64String(dic["n"].ToString()),
-                Exponent = Convert.FromBase64String(dic["e"].ToString())
+                Modulus = Base64DecodeBytes(dic["n"].ToString()),
+                Exponent = Base64DecodeBytes(dic["e"].ToString())
             };
             rsa.ImportParameters(rsaParameters);
             return new RsaSecurityKey(rsa);
@@ -196,5 +196,27 @@ private static List<HumanTaskDefinitionAggregate> GetHumanTaskDefs()
                 updateClaimantContactDetailsForm
             };
         }
+
+        private static byte[] Base64DecodeBytes(string base64EncodedData)
+        {
+            var s = base64EncodedData
+                .Trim()
+                .Replace(" ", "+")
+                .Replace('-', '+')
+                .Replace('_', '/');
+            switch (s.Length % 4)
+            {
+                case 0:
+                    return Convert.FromBase64String(s);
+                case 2:
+                    s += "==";
+                    goto case 0;
+                case 3:
+                    s += "=";
+                    goto case 0;
+                default:
+                    throw new InvalidOperationException("Illegal base64url string!");
+            }
+        }
     }
 }
diff --git a/src/CaseManagement.HumanTask.EF.Startup/openid_puk.txt b/src/CaseManagement.HumanTask.EF.Startup/openid_puk.txt
@@ -1,4 +1,4 @@
 {
-	"n":"3JsFC7E93xAShgnNp9dDWJPOHjJYLGPX464AfKW9gOB5CGD2uIYiP9m6yuZd73Z334RhQw616IMYijAvtpK25Nkk91KoAvrRoUGv2bl6pmX2JwUjwqe+lbmop4Rj9tzC2UBrGPcWSbIMNLaHkUrqR15DwVdFkG19QBwo9X6gOjCgSDvV0OY7vmwq1M3j2YmDwWnyTXh92wnUn2Hg57mVNZCX8RgdhdaWR6tiFP3QtgEYzZEulOGP6PKilqSr7E6Smg7mUNy6JTRkMGm1KZHTAY6HuNG5PPq0DUmsg8YMmsGEQPHMjw7IdaPxO0qy0aC1fiLj8NgWBOJ6bgrck55vfQ==",
-	"e":"AQAB"
+  "n": "7jyP7WVsRx9WRj_nvLODxpfWrqtITHtssFc6DC8-FBjwcUAsJE-BOiwbGFoMN6aFgnug3T-EWb4g6UcBrkLlLMNhLLAnE1MvvO5elsaTmIdRNaRKq5W2N1nYZM_Ad17gV5XoXsr82Zl92tHHSbhRTRYIAWUevXA8IOMEw-Q1TeBtIGGAjweclkliNb2T69PitHC4AD1CjuHkrEO7LbmZgfsj-F_RjnD-_6MJ0E9KSiJPJ0RFxzsC72NR2uquDDOBxWluUEgXRFgqd1s_D_t_FehPEgfc5Iy88xOQkD_k3SN8xqeopaZD8OdMwxdGNMjwyD5cw80jlH0lXRLTYK0aiQ",
+  "e": "AQAB"
 }
diff --git a/src/CaseManagement.HumanTask.Host/Startup.cs b/src/CaseManagement.HumanTask.Host/Startup.cs
@@ -86,12 +86,12 @@ public void ConfigureServices(IServiceCollection services)
                     ValidAudiences = new List<string>
                     {
                         "http://localhost:60000",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/openid"
+                        "https://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     },
                     ValidIssuers = new List<string>
                     {
                         "http://localhost:60000",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/openid"
+                        "https://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     }
                 };
             })
@@ -108,7 +108,7 @@ public void ConfigureServices(IServiceCollection services)
                     ValidIssuers = new List<string>
                     {
                         "http://localhost:60001",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/oauth"
+                        "https://simpleidserver.northeurope.cloudapp.azure.com/oauth"
                     }
                 };
             });
@@ -167,11 +167,33 @@ private RsaSecurityKey ExtractKey(string fileName)
             var rsa = RSA.Create();
             var rsaParameters = new RSAParameters
             {
-                Modulus = Convert.FromBase64String(dic["n"].ToString()),
-                Exponent = Convert.FromBase64String(dic["e"].ToString())
+                Modulus = Base64DecodeBytes(dic["n"].ToString()),
+                Exponent = Base64DecodeBytes(dic["e"].ToString())
             };
             rsa.ImportParameters(rsaParameters);
             return new RsaSecurityKey(rsa);
         }
+
+        private static byte[] Base64DecodeBytes(string base64EncodedData)
+        {
+            var s = base64EncodedData
+                .Trim()
+                .Replace(" ", "+")
+                .Replace('-', '+')
+                .Replace('_', '/');
+            switch (s.Length % 4)
+            {
+                case 0:
+                    return Convert.FromBase64String(s);
+                case 2:
+                    s += "==";
+                    goto case 0;
+                case 3:
+                    s += "=";
+                    goto case 0;
+                default:
+                    throw new InvalidOperationException("Illegal base64url string!");
+            }
+        }
     }
 }