Skip to content

Commit 8d4b8bc

Browse files
habarthierry-huehabarthierry-hue
committed
Ticket #456 : Manage certificate authorities
1 parent 37996af commit 8d4b8bc

34 files changed

+1328
-31
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>3.0.1</VersionPrefix>
3+
<VersionPrefix>3.0.2</VersionPrefix>
44
<Authors>SimpleIdServer</Authors>
55
<Owners>SimpleIdServer</Owners>
66
</PropertyGroup>

‎certificates/client.crt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIC2zCCAcOgAwIBAgIEAQIDBDANBgkqhkiG9w0BAQsFADAQMQ4wDAYDVQQDEwVz
3+
aWRDQTAeFw0yMzAzMTYyMjI2NDdaFw0yMzA2MTUyMjI2NDdaMBQxEjAQBgNVBAMT
4+
CXNpZENsaWVudDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALdcWiyn
5+
L8ATAgeCnLsXETnbzRwCX2OLS5imdQm6QHvhFoXbVDx6sA0P5LyZhDVzyHpoalgv
6+
gh/giFlLwRfMFJ7lFQPhuCX0Bu+V9ISLh3mH6oJJe5Goau5dTmTiVmqgqsXQpgXN
7+
rkf88v3kTluZzXBWdh2bzbhYM1mnfdDIJaiufeSe5tRZZ/k9TpgZABDymfH5RX2+
8+
+XrtNOHF+vqdfYx1/NEkW7dCNADDBgUxF6NUVditHKZzIGeu6tqLiS03YwM1cOL0
9+
46S2YFE7JQq0ik4+FAXtn1PC5eWu3wjER/PGdP/E3eUcEvu5pRVxaY8TogR1ggsx
10+
DZLoIpXH/9GJwzUCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwHQYD
11+
VR0OBBYEFHCUg7RW294MLnM9MM6DfE+d0BFxMA0GCSqGSIb3DQEBCwUAA4IBAQB6
12+
ONOYJknypGInxt6PE8Tma9muDxnNa/sDPligoDRsc7c5STNoxPnrjyNYwwHWzv/n
13+
xLuZCU4H0sp99e6eB0sUedlpC3ax188bVC6bH+0kE6I3Uy8/kwptTTjyDNkZvh27
14+
uEHJAGSQyUZpVk7bB04U+6Jji8yPDHmh8gWTbsHYsgGr7W1Q0T9AjxnwNCYfR9o9
15+
6pMTiH511VRVqC3VrPO2CkFfQcKVoOeZ5M11tpcl+C3R0fZxJrIF1fd3pnUvdmoU
16+
NeXCia4OI4J7qcrVsLOpChrZ+ujpSvS5ujCvwt4PyX1CYc3P54WfaDiTpx7DEi1K
17+
9GumJipsk7j/LpeTF3Bq
18+
-----END CERTIFICATE-----

‎certificates/client.key‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
-----BEGIN PRIVATE KEY-----
2+
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC3XFospy/AEwIH
3+
gpy7FxE5280cAl9ji0uYpnUJukB74RaF21Q8erAND+S8mYQ1c8h6aGpYL4If4IhZ
4+
S8EXzBSe5RUD4bgl9AbvlfSEi4d5h+qCSXuRqGruXU5k4lZqoKrF0KYFza5H/PL9
5+
5E5bmc1wVnYdm824WDNZp33QyCWorn3knubUWWf5PU6YGQAQ8pnx+UV9vvl67TTh
6+
xfr6nX2MdfzRJFu3QjQAwwYFMRejVFXYrRymcyBnrurai4ktN2MDNXDi9OOktmBR
7+
OyUKtIpOPhQF7Z9TwuXlrt8IxEfzxnT/xN3lHBL7uaUVcWmPE6IEdYILMQ2S6CKV
8+
x//RicM1AgMBAAECggEBAI9BvUYz3Q/BCg3aEx/tFs1QmICwrdw1IXwDWV+fP/BJ
9+
XPJ5+OdDp7ac20Yq3utwKYrRd3ysqYrEP2Mc16EDFn1KV8/vk5M7hAu96guAg/kE
10+
osjmJoAXyGuxRKV3XLL0Elh4+q2AFBE0ZJjOvhW9JZAGTUQ2zVSgvIXoYVk0do/B
11+
abYfCjWGSj5aqZ4OpVRNzIMdeIH3sGFqgGptZ39b5NfrpT01soY38vJtRXUwscPd
12+
w82IAItdeyNL7vJclu0pOJ+CmAuQAuYIH0oA5pGSCIGi8BVTwN7XKUWmTvejwK6w
13+
DWFzfaZQ6G9rbHU6cW21F+0ZZwxuUvlDBru673HF5eUCgYEA4z2OZZAM7s7Xn5Ax
14+
+IbNd1sSNz2jR850Lm8aT0pgxOYU84qC1QWwruCRAsHzh08vVafg0aLIjEX/y9lB
15+
Piq3gR/EXz7fFG88u8XyJkadYTnZtj6G/K7V9aQqAk7Kb/a0nZg/59nOYeORSL0W
16+
XRfbk3myP+JTDBt3QsiWk4lEjAcCgYEAzpEfO4DIXgEFJP7PyfQX3J+9/CY3/ZqP
17+
NGkcrzWbf+3eDuBVD9xrJsT4OMHY6O+Jq+dxe6O/L1auPCWYbAdxig9X0Adt2NFv
18+
mMOe8oEcg8fvL0FcDhHp+60cGvK1gtdiGzueGqhxBVzf1KE8pGaq1j/XKVoXq5qJ
19+
8qGzx4sdX+MCgYAe2Hw7zRH0WJ9sSWZ/Fc1OJk6SsQs49A1RQEOR/8ai85hkdqjL
20+
wbn6AwGsHiewdk82kVMzIaWXZOkUAqmYhrPiEy3Uv/QIEhFsa7Iy/+LdD709v78T
21+
Dah9b4tERO21xQc/XStPjYE2SG2wMfqXKGXl3t8TTOV4/0FxD0lhPYDQgQKBgC+b
22+
Qpd0FrmTgpwEHd9tYhJ2vlJefIj2Fgr+Lp4yvKO/Lm4/RVticU9+Fbb+9f65NgFo
23+
Vb8o/ebrEzzJbVd4X7Jx1ssa6zYNDqsmant5RhkY+wbpCU400rguLUwIo8yD1xhv
24+
pQB/0Yxq2ysl/dPl1XmLPQtKuCnUc/Z3TfevGBYBAoGAAST/c6b0Dd2k4PE/xspo
25+
LVE85M1gyIiq3GY70vkkTujawImuX63QJWCyl/9uexlw3x8/Mod5thDPW8jg9WGC
26+
53Zrdq0AZclM5YnaWI3IOL20b+4VvYRm1qzfDJtFrhdI7bwg/dxUbA4NYEH2w0bc
27+
T0EGWIXiWxrm1Cla6QLVKnk=
28+
-----END PRIVATE KEY-----

‎certificates/sidCA.crt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIC1TCCAb2gAwIBAgIJAKnyyIq5wDoiMA0GCSqGSIb3DQEBCwUAMBAxDjAMBgNV
3+
BAMTBXNpZENBMB4XDTIzMDEzMTIyMjY0MVoXDTI0MDMxNjIyMjY0MVowEDEOMAwG
4+
A1UEAxMFc2lkQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGhjiW
5+
PdH1OsxHMj6phE7Obdtnnen2pl33QK2XYl2xzja3hPB6lgU//dja/F1UQrf7udfy
6+
yoLs3oAlIrlAuutxb36FIxdv6Qqe+MZ4SnM1q7sv11mbuapxnJW1m4LdQw/QoUlz
7+
QGTjv4sr5+jP11fMa8Go3smnCXVwGu4Ewm9f4UEsTHREFRiq95o5oe2PH38N0pnl
8+
q9iPDmBJcCZX2TeE+4OttHD1GPMAesom8TdENh5hwJ4G4Ujv3LLVaCDXoQjTDHRG
9+
Nh4hXG8QURW4r9ATfEIq7rKLovIIZ9876V2255/d9GKSLqImgPJaM7mKoK1Yqd8I
10+
1p3/0NcIyfHLjAShAgMBAAGjMjAwMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
11+
FLMag9KrTrqk4+88wDr7y8ENigyhMA0GCSqGSIb3DQEBCwUAA4IBAQABCN1gOMo6
12+
Ck+QtcHwdfTDOO6DtxoyDP/Cjmh/k0gr8tIMmEnng6Wdn1W6Eagt9pHgegKemCqt
13+
uqkpRQZw0sm5+Lpqi5kdLiAMoB6kwVU3IpMOGp6SUxNXmiV2f3OHq4dpNgRvNkNK
14+
HjVSBd2/F2jhZtAKZCJwPfv9BpdR2XOl9U9MQZ2JShmKxhHflPT60emB0j80OtvT
15+
qoDZaSVDNjgb5iLxf/JW/76yD3vDFDnxY45i1RRDbGPUc+UAKT5xmSvSSn751oay
16+
fzuimlfFNgA8FsYwYyq6awIe+55b0gXWg20t3nZXIZ3c64hmu8koDAUWxM3CYGs9
17+
niJu3S/gzjeG
18+
-----END CERTIFICATE-----

‎certificates/sidCA.key‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
-----BEGIN RSA PRIVATE KEY-----
2+
MIIEpQIBAAKCAQEAxoY4lj3R9TrMRzI+qYROzm3bZ53p9qZd90Ctl2Jdsc42t4Tw
3+
epYFP/3Y2vxdVEK3+7nX8sqC7N6AJSK5QLrrcW9+hSMXb+kKnvjGeEpzNau7L9dZ
4+
m7mqcZyVtZuC3UMP0KFJc0Bk47+LK+foz9dXzGvBqN7Jpwl1cBruBMJvX+FBLEx0
5+
RBUYqveaOaHtjx9/DdKZ5avYjw5gSXAmV9k3hPuDrbRw9RjzAHrKJvE3RDYeYcCe
6+
BuFI79yy1Wgg16EI0wx0RjYeIVxvEFEVuK/QE3xCKu6yi6LyCGffO+ldtuef3fRi
7+
ki6iJoDyWjO5iqCtWKnfCNad/9DXCMnxy4wEoQIDAQABAoIBAQCF4NYgW6hPnEtO
8+
aA/h+Zu7klI32kKBV0hfCXsHcAqHce1sbXZO9QStVt77Lt0xiZzRYU7EKNWKL7Jz
9+
WKtdf7BvWyUTW8reaWYENviA/pQbSah+ZtfDML5Ex7geNLVXyXXM2DfURUTEYdPU
10+
1BworaxD6xc6bqPGxZYw97gz9XtuSCOoUU2OX7WXp7m9bakbvheqE4eQ06AR85MZ
11+
ov2R1BEDOxdCLy6O3A0pkC92CaaPeXv+7tYsp5B31O+fGUTkVPhZOra7okvsonDl
12+
8vi8fxYad7CwOW3CHCnE6Q6Xp6Mq3yy6IUwRTByv1lUKPanUaNBrK5IYriyYjra7
13+
DUEIHT7RAoGBAMh/XLQa4EAxdJ7vMjLQHw1R2NFasGGWoLmAqA/p/sUPrPs5CnF7
14+
CtXTkKsXXnRsdq05WxyLdD636w87iGm9/mSZUYomVLK3VoMMlGxTVSMhhQTQLaO7
15+
wjryUrCSb21/tb1Co2GXfpBn/fNjQvMcPAPGclqZusD/5hHU8A6bz0NbAoGBAP17
16+
BhkuHGzVL5Axz4s9jurFV0NK/iWuwFZhCiAWCAc72IQpdv9fTWm32rUpy3QVQzu5
17+
+jOK9m28L/feT71qiFEmaYUvPGipxZ4dzaz9gmtdzzsVmqGd49gBAVofuHrNFown
18+
V1zawlasfdL2Xmmx3uZkJ+q52iWqqEE3/6FOv4SzAoGBAJW+Yct2IzRue25UscY3
19+
oGl/TpMVy5QnPsUtLNgt6ITfb092S7FztyT6TRsrafVEKOK5aq4IDXrmPB31Va28
20+
I+qYg8jNVgbgXTGlTJkXKAgD+egdX2jhS3BhGZcc1zIN5vuCcKnrzrAlqwqDgTY3
21+
SS98oF3AYTXSKc/5nI0cm5DvAoGBAK0AHwxmfT4GTl0SsfztebJgF4u1Djo3x8vs
22+
lRWLE9WkEcU5656ls9cYhWup59MFhAqqhspQ6JnCm9aHY1L696izF8evkoI4hMjC
23+
vJJ5v155+yrvNsdhVJUjMoIJLkaZ3O6xFx4nrAWt2n52ab+nh2MlLl00lV+p1wYU
24+
KyMz9OCjAoGAHbPaciCjDLCpdNbMhgjgFx/9SFAg8VpIt5nCoYdEBSLdkYA1N0Ne
25+
L1jfUKrZ0b7lj7sSEJD9LRJl5hdcZPfj++9LskT0JlU7qI3SGveV3nBmBXUcnDwh
26+
WhoIuCKz6v1adMGwVTPKZ4Vuw+rr5FLVeZr/nkg+kCUGM8QUmKIjx0I=
27+
-----END RSA PRIVATE KEY-----

‎src/IdServer/SimpleIdServer.IdServer.Domains/CertificateAuthority.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public class CertificateAuthority
1313
public StoreName? StoreName { get; set; } = null;
1414
public X509FindType? FindType { get; set; } = null;
1515
public string? FindValue { get; set; } = null;
16-
public string? Password { get; set; } = null;
1716
public string? PublicKey { get; set; } = null;
1817
public string? PrivateKey { get; set; } = null;
1918
public DateTime StartDateTime { get; set; }

‎src/IdServer/SimpleIdServer.IdServer.Domains/ClientCertificate.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ namespace SimpleIdServer.IdServer.Domains
55
public class ClientCertificate
66
{
77
public string Id { get; set; } = null!;
8+
public string Name { get; set; } = null!;
9+
public DateTime StartDateTime { get; set; }
10+
public DateTime EndDateTime { get; set; }
11+
public DateTime CreateDateTime { get; set; }
812
public string PublicKey { get; set; } = null!;
913
public string PrivateKey { get; set; } = null!;
1014
public CertificateAuthority CertificateAuthority { get; set; }

src/IdServer/SimpleIdServer.IdServer.Startup/Migrations/20230318213256_Init.Designer.cs renamed to src/IdServer/SimpleIdServer.IdServer.Startup/Migrations/20230320125854_Init.Designer.cs

Lines changed: 14 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/IdServer/SimpleIdServer.IdServer.Startup/Migrations/20230318213256_Init.cs renamed to src/IdServer/SimpleIdServer.IdServer.Startup/Migrations/20230320125854_Init.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ protected override void Up(MigrationBuilder migrationBuilder)
112112
StoreName = table.Column<int>(type: "int", nullable: true),
113113
FindType = table.Column<int>(type: "int", nullable: true),
114114
FindValue = table.Column<string>(type: "nvarchar(max)", nullable: true),
115-
Password = table.Column<string>(type: "nvarchar(max)", nullable: true),
116115
PublicKey = table.Column<string>(type: "nvarchar(max)", nullable: true),
117116
PrivateKey = table.Column<string>(type: "nvarchar(max)", nullable: true),
118117
StartDateTime = table.Column<DateTime>(type: "datetime2", nullable: false),
@@ -423,6 +422,10 @@ protected override void Up(MigrationBuilder migrationBuilder)
423422
columns: table => new
424423
{
425424
Id = table.Column<string>(type: "nvarchar(450)", nullable: false),
425+
Name = table.Column<string>(type: "nvarchar(max)", nullable: false),
426+
StartDateTime = table.Column<DateTime>(type: "datetime2", nullable: false),
427+
EndDateTime = table.Column<DateTime>(type: "datetime2", nullable: false),
428+
CreateDateTime = table.Column<DateTime>(type: "datetime2", nullable: false),
426429
PublicKey = table.Column<string>(type: "nvarchar(max)", nullable: false),
427430
PrivateKey = table.Column<string>(type: "nvarchar(max)", nullable: false),
428431
CertificateAuthorityId = table.Column<string>(type: "nvarchar(450)", nullable: false)

‎src/IdServer/SimpleIdServer.IdServer.Startup/Migrations/StoreDbContextModelSnapshot.cs‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -530,9 +530,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
530530
b.Property<string>("FindValue")
531531
.HasColumnType("nvarchar(max)");
532532

533-
b.Property<string>("Password")
534-
.HasColumnType("nvarchar(max)");
535-
536533
b.Property<string>("PrivateKey")
537534
.HasColumnType("nvarchar(max)");
538535

@@ -849,6 +846,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
849846
.IsRequired()
850847
.HasColumnType("nvarchar(450)");
851848

849+
b.Property<DateTime>("CreateDateTime")
850+
.HasColumnType("datetime2");
851+
852+
b.Property<DateTime>("EndDateTime")
853+
.HasColumnType("datetime2");
854+
855+
b.Property<string>("Name")
856+
.IsRequired()
857+
.HasColumnType("nvarchar(max)");
858+
852859
b.Property<string>("PrivateKey")
853860
.IsRequired()
854861
.HasColumnType("nvarchar(max)");
@@ -857,6 +864,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
857864
.IsRequired()
858865
.HasColumnType("nvarchar(max)");
859866

867+
b.Property<DateTime>("StartDateTime")
868+
.HasColumnType("datetime2");
869+
860870
b.HasKey("Id");
861871

862872
b.HasIndex("CertificateAuthorityId");

0 commit comments

Comments
 (0)