Skip to content

Commit 8f5094d

Browse files
yusukemaegawayusukemaegawa
authored
Merge pull request #121 from OpenTouryoProject/develop
Release work ( ~ October 1, 2019)
2 parents 352c43b + 8fbdb34 commit 8f5094d

151 files changed

Lines changed: 8894 additions & 4513 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Windows batch files want to use CRLF by default.
2+
*.bat text eol=crlf
3+
4+
# Visual Studio files want to use CRLF by default.

‎mpas_dev.bat‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@
99
@rem 当該フォルダに本バッチファイルをコピーして実行することを想定している。
1010

1111
xcopy /E /Y /I "OpenTouryo\root\programs\CS\Frameworks\Infrastructure\Build_net47" "MultiPurposeAuthSite\root\programs\OpenTouryoAssemblies\Build_net47\"
12+
xcopy /E /Y /I "OpenTouryo\root\programs\CS\Frameworks\Infrastructure\Build_net48" "MultiPurposeAuthSite\root\programs\OpenTouryoAssemblies\Build_net48\"
1213
xcopy /E /Y /I "OpenTouryo\root\programs\CS\Frameworks\Infrastructure\Build_netcore20" "MultiPurposeAuthSite\root\programs\OpenTouryoAssemblies\Build_netcore20\"
1314
xcopy /E /Y /I "OpenTouryo\root\programs\CS\Frameworks\Infrastructure\Build_netcore30" "MultiPurposeAuthSite\root\programs\OpenTouryoAssemblies\Build_netcore30\"

‎root/files/resource/MultiPurposeAuthSite/Sql/oracle/Create_UserStore.sql‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ CREATE TABLE "CustomizedConfirmation"(
9090
CONSTRAINT "PK.CustomizedConfirmation" PRIMARY KEY ("UserId")
9191
);
9292

93-
CREATE TABLE "OAuth2Data"(
93+
CREATE TABLE "Saml2OAuth2Data"(
9494
"ClientID" NVARCHAR2(256) NOT NULL, -- PK
9595
"UnstructuredData" NVARCHAR2(2000) NULL, -- OAuth2 Unstructured Data
96-
CONSTRAINT "PK.OAuth2Data" PRIMARY KEY ("ClientID")
96+
CONSTRAINT "PK.Saml2OAuth2Data" PRIMARY KEY ("ClientID")
9797
);
9898

9999
CREATE TABLE "FIDO2Data"(
@@ -109,16 +109,32 @@ CREATE TABLE "OAuth2Revocation"(
109109
CONSTRAINT "PK.OAuth2Revocation" PRIMARY KEY ("Jti")
110110
);
111111

112+
CREATE TABLE "IssuedToken"(
113+
"Jti" NVARCHAR2(38) NOT NULL, -- PK, guid
114+
"Value" NVARCHAR2(2000) NOT NULL,
115+
"ClientID" NVARCHAR2(38) NOT NULL,
116+
"Audience" NVARCHAR2(38) NOT NULL,
117+
"CreatedDate" DATE NOT NULL,
118+
CONSTRAINT "PK.IssuedToken" PRIMARY KEY ("Jti")
119+
);
120+
121+
CREATE TABLE "RequestObject"(
122+
"Urn" NVARCHAR2(38) NOT NULL, -- PK, guid
123+
"Value" NVARCHAR2(2000) NOT NULL,
124+
"CreatedDate" DATE NOT NULL,
125+
CONSTRAINT "PK.RequestObject" PRIMARY KEY ("Urn")
126+
);
127+
112128
-- INDEX
113129
--- UNIQUE INDEX
114130
---- Users
115-
CREATE UNIQUE INDEX "UserNameIndex" ON "Users" ("UserName" ASC);
116-
ALTER TABLE "Users" ADD CONSTRAINT "NormalizedUserNameIndex" UNIQUE ("NormalizedUserName" ASC);
117-
ALTER TABLE "Users" ADD CONSTRAINT "NormalizedEmailIndex" UNIQUE ("NormalizedEmail" ASC);
131+
ALTER TABLE "Users" ADD CONSTRAINT "UserNameIndex" UNIQUE ("UserName");
132+
ALTER TABLE "Users" ADD CONSTRAINT "NormalizedUserNameIndex" UNIQUE ("NormalizedUserName");
133+
ALTER TABLE "Users" ADD CONSTRAINT "NormalizedEmailIndex" UNIQUE ("NormalizedEmail");
118134
ALTER TABLE "Users" ADD CONSTRAINT "ClientIDIndex" UNIQUE ("ClientID");
119135
---- Roles
120-
CREATE UNIQUE INDEX "RoleNameIndex" ON "Roles" ("Name" ASC);
121-
ALTER TABLE "Roles" ADD CONSTRAINT "NormalizedNameIndex" UNIQUE ("NormalizedName" ASC);
136+
ALTER TABLE "Roles" ADD CONSTRAINT "RoleNameIndex" UNIQUE ("Name");
137+
ALTER TABLE "Roles" ADD CONSTRAINT "NormalizedNameIndex" UNIQUE ("NormalizedName");
122138

123139
--- INDEX
124140
---- UserRoles
@@ -141,7 +157,7 @@ ALTER TABLE "UserLogins" ADD CONSTRAINT "FK.UserLogins.Users_UserId" FOREIGN KEY
141157
ALTER TABLE "UserClaims" ADD CONSTRAINT "FK.UserClaims.Users_UserId" FOREIGN KEY("UserId") REFERENCES "Users" ("Id") ON DELETE CASCADE;
142158
---- TotpTokens
143159
ALTER TABLE "TotpTokens" ADD CONSTRAINT "FK.TotpTokens.Users_UserId" FOREIGN KEY("UserId") REFERENCES "Users" ("Id") ON DELETE CASCADE;
144-
---- OAuth2Data
145-
ALTER TABLE "OAuth2Data" ADD CONSTRAINT "FK.OAuth2Data.Users_ClientID" FOREIGN KEY("ClientID") REFERENCES "Users" ("ClientID") ON DELETE CASCADE;
160+
---- Saml2OAuth2Data
161+
ALTER TABLE "Saml2OAuth2Data" ADD CONSTRAINT "FK.Saml2OAuth2Data.Users_ClientID" FOREIGN KEY("ClientID") REFERENCES "Users" ("ClientID") ON DELETE CASCADE;
146162
---- FIDO2Data
147-
ALTER TABLE "FIDO2Data" ADD CONSTRAINT "FK.FIDO2Data.Users_UserName" FOREIGN KEY("UserName") REFERENCES "Users" ("UserName") ON DELETE CASCADE;
163+
ALTER TABLE "FIDO2Data" ADD CONSTRAINT "FK.FIDO2Data.Users_UserName" FOREIGN KEY("UserName") REFERENCES "Users" ("UserName") ON DELETE CASCADE;

‎root/files/resource/MultiPurposeAuthSite/Sql/oracle/Select_UserStore.sql‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@ SELECT * FROM "TotpTokens";
77
SELECT * FROM "AuthenticationCodeDictionary";
88
SELECT * FROM "RefreshTokenDictionary";
99
SELECT * FROM "CustomizedConfirmation";
10-
SELECT * FROM "OAuth2Data";
11-
SELECT * FROM "FIDO2Data";
10+
SELECT * FROM "Saml2OAuth2Data";
11+
SELECT * FROM "FIDO2Data";
12+
SELECT * FROM "OAuth2Revocation";
13+
SELECT * FROM "IssuedToken";
14+
SELECT * FROM "RequestObject";

‎root/files/resource/MultiPurposeAuthSite/Sql/pstgrs/Create_UserStore.sql‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ CREATE TABLE CustomizedConfirmation(
9292
CONSTRAINT PK_CustomizedConfirmation PRIMARY KEY (UserId)
9393
);
9494

95-
CREATE TABLE OAuth2Data(
95+
CREATE TABLE Saml2OAuth2Data(
9696
ClientID varchar(256) NOT NULL, -- PK
9797
UnstructuredData varchar(2000) NULL, -- OAuth2 Unstructured Data
98-
CONSTRAINT PK_OAuth2Data PRIMARY KEY (ClientID)
98+
CONSTRAINT PK_Saml2OAuth2Data PRIMARY KEY (ClientID)
9999
);
100100

101101
CREATE TABLE FIDO2Data(
@@ -111,6 +111,22 @@ CREATE TABLE OAuth2Revocation(
111111
CONSTRAINT PK_OAuth2Revocation PRIMARY KEY (Jti)
112112
);
113113

114+
CREATE TABLE IssuedToken(
115+
Jti varchar(38) NOT NULL, -- PK, guid
116+
Value varchar(2000) NOT NULL,
117+
ClientID varchar(38) NOT NULL,
118+
Audience varchar(38) NOT NULL,
119+
CreatedDate timestamp NOT NULL,
120+
CONSTRAINT PK_IssuedToken PRIMARY KEY (Jti)
121+
);
122+
123+
CREATE TABLE RequestObject(
124+
Urn varchar(38) NOT NULL, -- PK, guid
125+
Value varchar(2000) NOT NULL,
126+
CreatedDate timestamp NOT NULL,
127+
CONSTRAINT PK_RequestObject PRIMARY KEY (Urn)
128+
);
129+
114130
-- INDEX
115131
---- Users
116132
CREATE UNIQUE INDEX UserNameIndex ON Users (UserName);
@@ -140,7 +156,7 @@ ALTER TABLE UserLogins ADD CONSTRAINT FK_UserLogins_Users_UserId FOREIGN KEY(Use
140156
ALTER TABLE UserClaims ADD CONSTRAINT FK_UserClaims_Users_UserId FOREIGN KEY(UserId) REFERENCES Users (Id) ON DELETE CASCADE;
141157
---- TotpTokens
142158
ALTER TABLE TotpTokens ADD CONSTRAINT FK_TotpTokens_Users_UserId FOREIGN KEY(UserId) REFERENCES Users (Id) ON DELETE CASCADE;
143-
---- OAuth2Data
144-
ALTER TABLE OAuth2Data ADD CONSTRAINT FK_OAuth2Data_Users_ClientID FOREIGN KEY(ClientID) REFERENCES Users (ClientID) ON DELETE CASCADE;
159+
---- Saml2OAuth2Data
160+
ALTER TABLE Saml2OAuth2Data ADD CONSTRAINT FK_Saml2OAuth2Data_Users_ClientID FOREIGN KEY(ClientID) REFERENCES Users (ClientID) ON DELETE CASCADE;
145161
---- FIDO2Data
146162
ALTER TABLE FIDO2Data ADD CONSTRAINT FK_FIDO2Data_Users_UserName FOREIGN KEY(UserName) REFERENCES Users (UserName) ON DELETE CASCADE;

‎root/files/resource/MultiPurposeAuthSite/Sql/pstgrs/Select_UserStore.sql‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ SELECT * FROM "userlogins"
55
SELECT * FROM "userclaims"
66
SELECT * FROM "totptokens"
77
SELECT * FROM "authenticationcodedictionary"
8-
SELECT * FROM "refreshTokendictionary"
8+
SELECT * FROM "refreshtokendictionary"
99
SELECT * FROM "customizedconfirmation"
10-
SELECT * FROM "oauth2data"
11-
SELECT * FROM "fido2data"
10+
SELECT * FROM "saml2oauth2data"
11+
SELECT * FROM "fido2data"
12+
SELECT * FROM "oauth2revocation"
13+
SELECT * FROM "issuedtoken"
14+
SELECT * FROM "requestobject"

‎root/files/resource/MultiPurposeAuthSite/Sql/sqlserver/Create_UserStore.sql‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ CREATE TABLE [CustomizedConfirmation](
116116
WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
117117
) ON [PRIMARY]
118118

119-
CREATE TABLE [OAuth2Data](
119+
CREATE TABLE [Saml2OAuth2Data](
120120
[ClientID] [nvarchar](256) NOT NULL, -- PK
121121
[UnstructuredData] [nvarchar](max) NULL, -- OAuth2 Unstructured Data
122-
CONSTRAINT [PK.OAuth2Data] PRIMARY KEY NONCLUSTERED ([ClientID] ASC)
122+
CONSTRAINT [PK.Saml2OAuth2Data] PRIMARY KEY NONCLUSTERED ([ClientID] ASC)
123123
WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
124124
) ON [PRIMARY]
125125

@@ -138,6 +138,23 @@ CREATE TABLE [OAuth2Revocation](
138138
WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
139139
) ON [PRIMARY]
140140

141+
CREATE TABLE [IssuedToken](
142+
[Jti] [nvarchar](38) NOT NULL, -- PK, guid
143+
[Value] [nvarchar](max) NULL, -- IssuedToken
144+
[ClientID] [nvarchar](38) NOT NULL,
145+
[Audience] [nvarchar](38) NOT NULL,
146+
[CreatedDate] [smalldatetime] NOT NULL,
147+
CONSTRAINT [PK.IssuedToken] PRIMARY KEY NONCLUSTERED ([Jti] ASC)
148+
WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
149+
) ON [PRIMARY]
150+
151+
CREATE TABLE [RequestObject](
152+
[Urn] [nvarchar](38) NOT NULL, -- PK, guid
153+
[Value] [nvarchar](max) NULL, -- RequestObject
154+
[CreatedDate] [smalldatetime] NOT NULL,
155+
CONSTRAINT [PK.RequestObject] PRIMARY KEY NONCLUSTERED ([Urn] ASC)
156+
WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
157+
) ON [PRIMARY]
141158

142159
-- INDEX
143160
---- Users
@@ -168,7 +185,7 @@ ALTER TABLE [UserLogins] WITH CHECK ADD CONSTRAINT [FK.UserLogins.Users_UserId]
168185
ALTER TABLE [UserClaims] WITH CHECK ADD CONSTRAINT [FK.UserClaims.Users_UserId] FOREIGN KEY([UserId]) REFERENCES [Users] ([Id]) ON DELETE CASCADE
169186
---- TotpTokens
170187
ALTER TABLE [TotpTokens] WITH CHECK ADD CONSTRAINT [FK.TotpTokens.Users_UserId] FOREIGN KEY([UserId]) REFERENCES [Users] ([Id]) ON DELETE CASCADE
171-
---- OAuth2Data
172-
ALTER TABLE [OAuth2Data] WITH CHECK ADD CONSTRAINT [FK.OAuth2Data.Users_ClientID] FOREIGN KEY([ClientID]) REFERENCES [Users] ([ClientID]) ON DELETE CASCADE
188+
---- Saml2OAuth2Data
189+
ALTER TABLE [Saml2OAuth2Data] WITH CHECK ADD CONSTRAINT [FK.Saml2OAuth2Data.Users_ClientID] FOREIGN KEY([ClientID]) REFERENCES [Users] ([ClientID]) ON DELETE CASCADE
173190
---- FIDO2Data
174191
ALTER TABLE [FIDO2Data] WITH CHECK ADD CONSTRAINT [FK.FIDO2Data.Users_UserName] FOREIGN KEY([UserName]) REFERENCES [Users] ([UserName]) ON DELETE CASCADE

‎root/files/resource/MultiPurposeAuthSite/Sql/sqlserver/Select_UserStore.sql‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,8 @@ SELECT * FROM [TotpTokens]
1010
SELECT * FROM [AuthenticationCodeDictionary]
1111
SELECT * FROM [RefreshTokenDictionary]
1212
SELECT * FROM [CustomizedConfirmation]
13-
SELECT * FROM [OAuth2Data]
14-
SELECT * FROM [FIDO2Data]
13+
SELECT * FROM [Saml2OAuth2Data]
14+
SELECT * FROM [FIDO2Data]
15+
SELECT * FROM [OAuth2Revocation]
16+
SELECT * FROM [IssuedToken]
17+
SELECT * FROM [RequestObject]

‎root/files/resource/X509/GenECDsaCertByOpenSSL.bat‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
openssl ecparam -list_curves
2+
23
openssl ecparam -out private-key.pem -name prime256v1 -genkey
34
openssl req -new -key private-key.pem > csr.csr
45
openssl x509 -in csr.csr -days 365000 -req -signkey private-key.pem > _SHA256ECDSA.cer
56
openssl pkcs12 -export -inkey private-key.pem -in _SHA256ECDSA.cer > _SHA256ECDSA.pfx
7+
8+
openssl ecparam -out private-key.pem -name secp384r1 -genkey
9+
openssl req -new -key private-key.pem > csr.csr
10+
openssl x509 -in csr.csr -days 365000 -req -signkey private-key.pem > _SHA384ECDSA.cer
11+
openssl pkcs12 -export -inkey private-key.pem -in _SHA384ECDSA.cer > _SHA384ECDSA.pfx
12+
13+
openssl ecparam -out private-key.pem -name secp521r1 -genkey
14+
openssl req -new -key private-key.pem > csr.csr
15+
openssl x509 -in csr.csr -days 365000 -req -signkey private-key.pem > _SHA521ECDSA.cer
16+
openssl pkcs12 -export -inkey private-key.pem -in _SHA521ECDSA.cer > _SHA521ECDSA.pfx

‎root/files/resource/X509/SHA384ECDSA.cer‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIB0DCCAVcCCQC2AfLlMlV+KzAKBggqhkjOPQQDAjBRMQswCQYDVQQGEwJBVTET
3+
MBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQ
4+
dHkgTHRkMQowCAYDVQQDDAF4MCAXDTE5MDYyNTA3NDY0MVoYDzMwMTgxMDI2MDc0
5+
NjQxWjBRMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UE
6+
CgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQowCAYDVQQDDAF4MHYwEAYHKoZI
7+
zj0CAQYFK4EEACIDYgAEqeyd2iMw8DZT7Yy3KO0mOuok1JBBdMwEuJTa81Upg06f
8+
bVbotK8yuhDSVkzSFsw3thH6faasSDmEO4zeVNdc5LbZJprQmL7JN3NZzYUJmF1G
9+
hQEl6QaZh+6f1QhDH0StMAoGCCqGSM49BAMCA2cAMGQCMAS6rWxZuGZ7QECfqpWI
10+
aZnK+F5fnLumQ1LbOwXhq68yUi/3pHj/2Eb2OMLodenTBgIwPBbkMBfUx4FIekl6
11+
DvPrt76SjQHfrZmulNG6xUAznYB9VOQk4qulTzb67A8nNPpu
12+
-----END CERTIFICATE-----

0 commit comments

Comments
 (0)