-
-
Notifications
You must be signed in to change notification settings - Fork 2
/
ChangesMade
373 lines (349 loc) · 16.2 KB
/
ChangesMade
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
Below you find "IdentityServer4 patch to e70eac45b8ae8cf5b4e8c75496005c7198387ee3.diff".
If needed, you may apply the patch to newer version of IdentityServer4 by this file.
.../src/ConsolePrivateKeyJwtClient/Program.cs | 65 ++++++++++++--
src/IdentityServer4/host/Program.cs | 23 +++++
.../host/Properties/launchSettings.json | 2 +-
src/IdentityServer4/host/Startup.cs | 2 +-
src/IdentityServer4/src/IdentityServer4.csproj | 1 +
.../src/Services/Default/DefaultTokenService.cs | 5 +-
.../Default/PrivateKeyJwtSecretValidator.cs | 100 ++++++++++++++++++++-
7 files changed, 184 insertions(+), 14 deletions(-)
diff --git a/samples/Clients/src/ConsolePrivateKeyJwtClient/Program.cs b/samples/Clients/src/ConsolePrivateKeyJwtClient/Program.cs
index 4e1a59c2..5f139188 100644
--- a/samples/Clients/src/ConsolePrivateKeyJwtClient/Program.cs
+++ b/samples/Clients/src/ConsolePrivateKeyJwtClient/Program.cs
@@ -10,6 +10,7 @@ using System.Security.Claims;
using System.Security.Cryptography.X509Certificates;
using Newtonsoft.Json.Linq;
using System.Threading.Tasks;
+using Newtonsoft.Json;
namespace ConsolePrivateKeyJwtClient
{
@@ -22,15 +23,21 @@ namespace ConsolePrivateKeyJwtClient
Console.Title = "Console Client Credentials Flow with JWT Assertion";
// X.509 cert
- var certificate = new X509Certificate2("client.p12", "changeit");
- var x509Credential = new X509SigningCredentials(certificate);
+ // var certificate = new X509Certificate2("client.p12", "changeit");
+ var certificate = new X509Certificate2("Andreas_Orzelski_Chain.pfx", "i40");
+ // var x509Credential = new X509SigningCredentials(certificate);
+ X509SigningCredentials x509Credential = null;
var response = await RequestTokenAsync(x509Credential);
response.Show();
+ Console.ForegroundColor = ConsoleColor.Green;
+ Console.WriteLine("\nPress ENTER to access Aasx Server at " + baseAddress + "\n");
+ Console.ResetColor();
Console.ReadLine();
await CallServiceAsync(response.AccessToken);
+ /*
// RSA JsonWebkey
var jwk = new JsonWebKey(rsaKey);
response = await RequestTokenAsync(new SigningCredentials(jwk, "RS256"));
@@ -38,6 +45,7 @@ namespace ConsolePrivateKeyJwtClient
Console.ReadLine();
await CallServiceAsync(response.AccessToken);
+ */
}
static async Task<TokenResponse> RequestTokenAsync(SigningCredentials credential)
@@ -48,6 +56,11 @@ namespace ConsolePrivateKeyJwtClient
if (disco.IsError) throw new Exception(disco.Error);
var clientToken = CreateClientToken(credential,"client.jwt", disco.TokenEndpoint);
+ // oz
+ Console.ForegroundColor = ConsoleColor.Green;
+ Console.WriteLine("\nClientToken with x5c in header: \n");
+ Console.ResetColor();
+ Console.WriteLine(clientToken + "\n");
var response = await client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest
{
@@ -65,9 +78,11 @@ namespace ConsolePrivateKeyJwtClient
return response;
}
+ static string baseAddress = "http://localhost:51310";
+
static async Task CallServiceAsync(string token)
{
- var baseAddress = Constants.SampleApi;
+ // var baseAddress = Constants.SampleApi;
var client = new HttpClient
{
@@ -75,15 +90,41 @@ namespace ConsolePrivateKeyJwtClient
};
client.SetBearerToken(token);
- var response = await client.GetStringAsync("identity");
+ // var response = await client.GetStringAsync("identity");
+ var response = await client.GetStringAsync("/server/listaas");
"\n\nService claims:".ConsoleGreen();
- Console.WriteLine(JArray.Parse(response));
+ // Console.WriteLine(JArray.Parse(response));
+ Console.WriteLine(response);
}
private static string CreateClientToken(SigningCredentials credential, string clientId, string audience)
{
-
+ // oz
+ string x5c = "";
+ string certFileName = "Andreas_Orzelski_Chain.pfx";
+ string password = "i40";
+
+ X509Certificate2Collection xc = new X509Certificate2Collection();
+ xc.Import(certFileName, password, X509KeyStorageFlags.PersistKeySet);
+
+ string[] X509Base64 = new string[xc.Count];
+
+ int j = xc.Count;
+ var xce = xc.GetEnumerator();
+ for (int i = 0; i < xc.Count; i++)
+ {
+ xce.MoveNext();
+ X509Base64[--j] = Convert.ToBase64String(xce.Current.GetRawCertData());
+ }
+
+ x5c = JsonConvert.SerializeObject(X509Base64);
+
+ // Byte[] certFileBytes = Convert.FromBase64String(X509Base64[0]);
+ // credential = new X509SigningCredentials(new X509Certificate2(certFileBytes));
+ credential = new X509SigningCredentials(new X509Certificate2(certFileName, password));
+ // oz end
+
var now = DateTime.UtcNow;
var token = new JwtSecurityToken(
@@ -93,12 +134,18 @@ namespace ConsolePrivateKeyJwtClient
{
new Claim(JwtClaimTypes.JwtId, Guid.NewGuid().ToString()),
new Claim(JwtClaimTypes.Subject, clientId),
- new Claim(JwtClaimTypes.IssuedAt, now.ToEpochTime().ToString(), ClaimValueTypes.Integer64)
+ new Claim(JwtClaimTypes.IssuedAt, now.ToEpochTime().ToString(), ClaimValueTypes.Integer64),
+ // OZ
+ new Claim(JwtClaimTypes.Email, "aorzelski@phoenixcontact.com")
+ // new Claim("x5c", x5c)
},
now,
now.AddMinutes(1),
- credential
- );
+ credential)
+ ;
+
+ token.Header.Add("x5c", x5c);
+ // oz
var tokenHandler = new JwtSecurityTokenHandler();
return tokenHandler.WriteToken(token);
diff --git a/src/IdentityServer4/host/Program.cs b/src/IdentityServer4/host/Program.cs
index 53768a8b..f62e433d 100644
--- a/src/IdentityServer4/host/Program.cs
+++ b/src/IdentityServer4/host/Program.cs
@@ -9,6 +9,9 @@ using Serilog.Events;
using Serilog.Sinks.SystemConsole.Themes;
using System;
using System.Diagnostics;
+using System.Security.Cryptography.X509Certificates;
+using System.Security.Cryptography;
+using System.IO;
namespace IdentityServerHost
{
@@ -17,6 +20,26 @@ namespace IdentityServerHost
public static int Main(string[] args)
{
Console.Title = "IdentityServer4";
+ // OZ
+ Console.WriteLine("Security 1 Startup - Server");
+ Console.WriteLine("Security 1.1 Load X509 Root Certificates into X509 Store Root");
+
+ X509Store root = new X509Store("Root", StoreLocation.CurrentUser);
+ root.Open(OpenFlags.ReadWrite);
+
+ System.IO.DirectoryInfo ParentDirectory = new System.IO.DirectoryInfo(".");
+
+ foreach (System.IO.FileInfo f in ParentDirectory.GetFiles("./root/*.cer"))
+ {
+ X509Certificate2 cert = new X509Certificate2("./root/" + f.Name);
+
+ root.Add(cert);
+ Console.WriteLine("Security 1.1 Add " + f.Name);
+ }
+
+ Directory.CreateDirectory("./temp");
+ // OZ end
+
Activity.DefaultIdFormat = ActivityIdFormat.W3C;
Log.Logger = new LoggerConfiguration()
diff --git a/src/IdentityServer4/host/Properties/launchSettings.json b/src/IdentityServer4/host/Properties/launchSettings.json
index 641abdaa..d74d7199 100644
--- a/src/IdentityServer4/host/Properties/launchSettings.json
+++ b/src/IdentityServer4/host/Properties/launchSettings.json
@@ -6,7 +6,7 @@
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
- "applicationUrl": "https://localhost:5001;http://localhost:5000"
+ "applicationUrl": "https://localhost:50001;http://localhost:50000"
},
"Host (proxy)": {
"commandName": "Project",
diff --git a/src/IdentityServer4/host/Startup.cs b/src/IdentityServer4/host/Startup.cs
index f4390b6e..8983307d 100644
--- a/src/IdentityServer4/host/Startup.cs
+++ b/src/IdentityServer4/host/Startup.cs
@@ -88,7 +88,7 @@ namespace IdentityServerHost
options.AllowedCertificateTypes = CertificateTypes.All;
options.RevocationMode = X509RevocationMode.NoCheck;
});
-
+
services.AddCertificateForwardingForNginx();
services.AddLocalApiAuthentication(principal =>
diff --git a/src/IdentityServer4/src/IdentityServer4.csproj b/src/IdentityServer4/src/IdentityServer4.csproj
index ffc8ce2d..b7de1d88 100644
--- a/src/IdentityServer4/src/IdentityServer4.csproj
+++ b/src/IdentityServer4/src/IdentityServer4.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<PackageId>IdentityServer4</PackageId>
<TargetFramework>netcoreapp3.1</TargetFramework>
+ <LangVersion>8.0</LangVersion>
<Description>OpenID Connect and OAuth 2.0 Framework for ASP.NET Core</Description>
<Authors>Brock Allen;Dominick Baier</Authors>
<AssemblyName>IdentityServer4</AssemblyName>
diff --git a/src/IdentityServer4/src/Services/Default/DefaultTokenService.cs b/src/IdentityServer4/src/Services/Default/DefaultTokenService.cs
index 628f571b..91d8b9f0 100644
--- a/src/IdentityServer4/src/Services/Default/DefaultTokenService.cs
+++ b/src/IdentityServer4/src/Services/Default/DefaultTokenService.cs
@@ -201,7 +201,10 @@ namespace IdentityServer4.Services
{
claims.Add(new Claim(JwtClaimTypes.SessionId, request.ValidatedRequest.SessionId));
}
-
+ // oz
+ claims.Add(new Claim("userName", "aorzelski@phoenixcontact.com"));
+ claims.Add(new Claim("serverName", "identityserver.test.rsa"));
+
// iat claim as required by JWT profile
claims.Add(new Claim(JwtClaimTypes.IssuedAt, Clock.UtcNow.ToUnixTimeSeconds().ToString(),
ClaimValueTypes.Integer64));
diff --git a/src/IdentityServer4/src/Validation/Default/PrivateKeyJwtSecretValidator.cs b/src/IdentityServer4/src/Validation/Default/PrivateKeyJwtSecretValidator.cs
index 3fe0f941..82b7d1a8 100644
--- a/src/IdentityServer4/src/Validation/Default/PrivateKeyJwtSecretValidator.cs
+++ b/src/IdentityServer4/src/Validation/Default/PrivateKeyJwtSecretValidator.cs
@@ -13,6 +13,13 @@ using IdentityServer4.Services;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Tokens;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using Newtonsoft.Json.Linq;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+using System.Security.Cryptography.X509Certificates;
namespace IdentityServer4.Validation
{
@@ -79,6 +86,95 @@ namespace IdentityServer4.Validation
return fail;
}
+ var jwtToken = new JwtSecurityToken(jwtTokenString);
+
+ // OZ
+ // var x5c = jwtToken.Payload.Claims.FirstOrDefault(c => c.Type == "x5c")?.Value;
+ // string x5c = jwtToken.Header.GetValueOrDefault("x5c");
+ Console.WriteLine("Client Token:\n" + jwtTokenString + "\n");
+
+ object o;
+ if (jwtToken.Header.TryGetValue("x5c", out o))
+ {
+ // if (o is string)
+ var s = o.GetType().ToString();
+ if (o is JArray)
+ {
+ // string x5c = o as string;
+ string[] x5c = (o as JArray).ToObject<string[]>();
+
+ // if (x5c != null && x5c != "")
+ if (x5c != null)
+ {
+ // Console.WriteLine("x5c:\n" + x5c);
+ Console.WriteLine("Security 2.1a Server: x5c with certificate chain received");
+
+ // parsed = JObject.Parse(Jose.JWT.Payload(token));
+ // user = parsed.SelectToken("user").Value<string>();
+ // string user = jwtToken.Payload.Claims.FirstOrDefault(c => c.Type == "user")?.Value;
+
+ X509Store storeCA = new X509Store("CA", StoreLocation.CurrentUser);
+ storeCA.Open(OpenFlags.ReadWrite);
+ bool valid = false;
+
+ // string[] x5c64 = JsonConvert.DeserializeObject<string[]>(x5c);
+ string[] x5c64 = x5c;
+
+ X509Certificate2Collection xcc = new X509Certificate2Collection();
+
+ Byte[] certFileBytes = Convert.FromBase64String(x5c64[0]);
+ /*
+ string fileCert = "./temp/" + user + ".cer";
+ File.WriteAllBytes(fileCert, certFileBytes);
+ Console.WriteLine("Security 2.1b Server: " + fileCert + " received");
+ */
+ var x509 = new X509Certificate2(certFileBytes);
+
+ xcc.Add(x509);
+ Console.WriteLine("Security 2.1c Certificate in Chain: " + x509.Subject);
+
+ StringBuilder builder = new StringBuilder();
+ builder.AppendLine("-----BEGIN CERTIFICATE-----");
+ builder.AppendLine(
+ Convert.ToBase64String(x509.RawData, Base64FormattingOptions.InsertLineBreaks));
+ builder.AppendLine("-----END CERTIFICATE-----");
+ Console.WriteLine("Client Certificate: ");
+ Console.WriteLine(builder);
+
+ for (int i = 1; i < x5c64.Length; i++)
+ {
+ var cert = new X509Certificate2(Convert.FromBase64String(x5c64[i]));
+ Console.WriteLine("Security 2.1c Certificate in Chain: " + cert.Subject);
+ if (cert.Subject != cert.Issuer)
+ {
+ xcc.Add(cert);
+ storeCA.Add(cert);
+ }
+ }
+
+ X509Chain c = new X509Chain();
+ c.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;
+
+ valid = c.Build(x509);
+
+ // storeCA.RemoveRange(xcc);
+ Console.WriteLine("Security 2.1d Server: Validate chain with root cert");
+
+ if (!valid)
+ {
+ Console.WriteLine("ERROR: Certificate " + x509.Subject + " not valid!");
+ _logger.LogError("Certificate " + x509.Subject + " not valid!");
+ return fail;
+ }
+
+ var xsk = new X509SecurityKey(x509);
+ trustedKeys = new List<SecurityKey> { xsk };
+ }
+ }
+ }
+ // OZ end
+
+
var validAudiences = new[]
{
// issuer URI (tbd)
@@ -110,13 +206,13 @@ namespace IdentityServer4.Validation
var handler = new JwtSecurityTokenHandler();
handler.ValidateToken(jwtTokenString, tokenValidationParameters, out var token);
- var jwtToken = (JwtSecurityToken)token;
+ jwtToken = (JwtSecurityToken)token;
if (jwtToken.Subject != jwtToken.Issuer)
{
_logger.LogError("Both 'sub' and 'iss' in the client assertion token must have a value of client_id.");
return fail;
}
-
+
var exp = jwtToken.Payload.Exp;
if (!exp.HasValue)
{