Skip to content

Commit 8898134

Browse files
daisukenishino2daisukenishino2
authored
Merge pull request #149 from OpenTouryoProject/develop
Release work ( ~ June 1, 2021)
2 parents a1e32fe + 4889d9e commit 8898134

64 files changed

Lines changed: 3415 additions & 853 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.

‎license/STATUS.txt‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,26 @@ Open Touryo Project Status
33

44
Project Status
55
==============
6-
Open Touryo was created as an in-house tool of Hitachi Solutions, Ltd.
6+
Open Touryo was an in-house tool of Hitachi Solutions, Ltd.
77
Open Touryo was released as open source in April 2014.
88
And it was forked by the Open Touryo project.
99

1010
Project Details
1111
===============
1212

1313
Web site:
14-
Issue Tracking:
14+
- https://opentouryo.osscons.jp/
15+
- https://github.com/OpenTouryoProject/OpenTouryo/wiki
16+
17+
Issue Tracking:
18+
- https://github.com/OpenTouryoProject/MultiPurposeAuthSite/issues
19+
1520
Source Code:
16-
Mailing Lists:
17-
User:
18-
Dev:
21+
- https://github.com/OpenTouryoProject/MultiPurposeAuthSite
1922

23+
Mailing Lists:
24+
User: ws-dotNetDevInfra-contact@osscons.jp
25+
Dev: ws-dotNetDevInfra-contact@osscons.jp
2026

2127
Active Committers
2228
=================

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,28 @@ CREATE TABLE FIDO2Data(
106106
CONSTRAINT PK_FIDO2Data PRIMARY KEY (PublicKeyId)
107107
);
108108

109+
CREATE TABLE DeviceAuthZData(
110+
Id serial NOT NULL, -- PK (キー長に問題があるためId intを使用)
111+
DeviceCode varchar(38) NOT NULL, -- device_code(guid)
112+
UserCode varchar(10) NOT NULL, -- user_code(10文字以下)
113+
AuthReqExp bigint NOT NULL, -- UNIX時刻(long)
114+
TempData varchar(256) NOT NULL, -- TempData
115+
AuthZCode varchar(64) NULL, -- AuthZCode
116+
Result boolean NULL, -- Result of Verify
117+
CONSTRAINT PK_DeviceAuthZData PRIMARY KEY (Id)
118+
);
119+
120+
CREATE TABLE CibaData(
121+
Id serial NOT NULL, -- PK (キー長に問題があるためId intを使用)
122+
ClientNotificationToken varchar(800) NOT NULL, -- 乱数(800)
123+
AuthReqId varchar(800) NOT NULL, -- 乱数(800)
124+
AuthReqExp bigint NOT NULL, -- UNIX時刻(long)
125+
AuthZCode varchar(64) NOT NULL, -- AuthZCode
126+
UnstructuredData varchar(2000) NULL, -- binding_message, user_code, etc.
127+
Result boolean NULL, -- Result of CIBA
128+
CONSTRAINT PK_CibaData PRIMARY KEY (Id)
129+
);
130+
109131
CREATE TABLE OAuth2Revocation(
110132
Jti varchar(38) NOT NULL, -- PK, guid
111133
CreatedDate timestamp NOT NULL,
@@ -137,6 +159,12 @@ CREATE UNIQUE INDEX ClientIDIndex ON Users (ClientID);
137159
---- Roles
138160
CREATE UNIQUE INDEX RoleNameIndex ON Roles (Name);
139161
CREATE UNIQUE INDEX NormalizedNameIndex ON Roles (NormalizedName);
162+
---- DeviceAuthZData
163+
CREATE UNIQUE INDEX DeviceAuthZDeviceCodeIndex ON CibaData (DeviceAuthZData);
164+
CREATE UNIQUE INDEX DeviceAuthZUserCodeIndex ON CibaData (DeviceAuthZData);
165+
---- CibaData
166+
CREATE UNIQUE INDEX CibaClientNotificationTokenIndex ON CibaData (ClientNotificationToken);
167+
CREATE UNIQUE INDEX CibaAuthReqIdIndex ON CibaData (AuthReqId);
140168
---- UserRoles
141169
CREATE INDEX IX_UserRoles_UserId ON UserRoles (UserId);
142170
CREATE INDEX IX_UserRoles_RoleId ON UserRoles (RoleId);

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,22 @@ CREATE TABLE [FIDO2Data](
132132
WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
133133
) ON [PRIMARY]
134134

135+
CREATE TABLE [DeviceAuthZData](
136+
[Id] [int] IDENTITY(1,1) NOT NULL, -- PK (キー長に問題があるため[Id] [int]を使用)
137+
[DeviceCode] [nvarchar](38) NOT NULL, -- device_code(guid)
138+
[UserCode] [nvarchar](10) NOT NULL, -- user_code(10文字以下)
139+
[AuthReqExp] [bigint] NOT NULL, -- UNIX時刻(long)
140+
[TempData] [nvarchar](256) NULL, -- TempData
141+
[AuthZCode] [nvarchar](64) NULL, -- AuthZCode
142+
[Result] [bit] NULL, -- Result of Verify
143+
CONSTRAINT [PK.DeviceAuthZData] PRIMARY KEY NONCLUSTERED ([Id] ASC)
144+
WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
145+
) ON [PRIMARY]
146+
135147
CREATE TABLE [CibaData](
136148
[Id] [int] IDENTITY(1,1) NOT NULL, -- PK (キー長に問題があるため[Id] [int]を使用)
137-
[ClientNotificationToken] [nvarchar](800) NOT NULL, -- 乱数(800)
138-
[AuthReqId] [nvarchar](800) NOT NULL, -- 乱数(800)
149+
[ClientNotificationToken] [nvarchar](800) NOT NULL, -- 乱数(800)
150+
[AuthReqId] [nvarchar](800) NOT NULL, -- 乱数(800)
139151
[AuthReqExp] [bigint] NOT NULL, -- UNIX時刻(long)
140152
[AuthZCode] [nvarchar](64) NOT NULL, -- AuthZCode
141153
[UnstructuredData] [nvarchar](max) NULL, -- binding_message, user_code, etc.
@@ -178,6 +190,9 @@ CREATE UNIQUE NONCLUSTERED INDEX [ClientIDIndex] ON [Users] ([ClientID] ASC) WIT
178190
---- Roles
179191
CREATE UNIQUE NONCLUSTERED INDEX [RoleNameIndex] ON [Roles] ([Name] ASC) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
180192
CREATE UNIQUE NONCLUSTERED INDEX [NormalizedNameIndex] ON [Roles] ([NormalizedName] ASC) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
193+
---- DeviceAuthZData
194+
CREATE UNIQUE NONCLUSTERED INDEX [DeviceAuthZDeviceCodeIndex] ON [DeviceAuthZData] ([DeviceCode] ASC) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
195+
CREATE UNIQUE NONCLUSTERED INDEX [DeviceAuthZUserCodeIndex] ON [DeviceAuthZData] ([UserCode] ASC) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
181196
---- CibaData
182197
CREATE UNIQUE NONCLUSTERED INDEX [CibaClientNotificationTokenIndex] ON [CibaData] ([ClientNotificationToken] ASC) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
183198
CREATE UNIQUE NONCLUSTERED INDEX [CibaAuthReqIdIndex] ON [CibaData] ([AuthReqId] ASC) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]

‎root/files/tools/WinMergeFilters/touryo.flt‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎root/files/tools/WinMergeFilters/touryofull.flt‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎root/programs/1_DeleteDir.bat‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,19 @@
11
@echo off
22

3+
set DIRECTORIES=packages, obj, bin, bld, Temp, Build, PrecompiledWeb, .vs
34
@echo --------------------------------------------------
4-
@echo Delete the packages, obj, bin, bld, Temp, Build, PrecompiledWeb, .vs folders.
5+
@echo Delete the %DIRECTORIES% folders.
56
@echo --------------------------------------------------
67

7-
for /D /R %%i in ( packages ) do (
8-
if exist "%%~i" RD /S /Q "%%~i"
9-
)
10-
for /D /R %%i in ( obj ) do (
11-
if exist "%%~i" RD /S /Q "%%~i"
12-
)
13-
for /D /R %%i in ( bin ) do (
14-
if exist "%%~i" RD /S /Q "%%~i"
15-
)
16-
for /D /R %%i in ( bld ) do (
17-
if exist "%%~i" RD /S /Q "%%~i"
18-
)
19-
for /D /R %%i in ( Temp ) do (
20-
if exist "%%~i" RD /S /Q "%%~i"
21-
)
22-
for /D /R %%i in ( Build ) do (
23-
if exist "%%~i" RD /S /Q "%%~i"
24-
)
25-
for /D /R %%i in ( PrecompiledWeb ) do (
26-
if exist "%%~i" RD /S /Q "%%~i"
27-
)
28-
for /D /R %%i in ( .vs ) do (
29-
if exist "%%~i" RD /S /Q "%%~i"
8+
@rem カンマをスペースに変換
9+
set w1=%DIRECTORIES:,= %
10+
11+
@rem 連続したスペースを、スペース１個に変換
12+
set w2=%w1: = %
13+
14+
for %%a in ( %w2% ) do (
15+
for /D /R %%i in ( %%a ) do (
16+
if exist "%%~i" RD /S /Q "%%~i"
17+
)
3018
)
3119
pause

‎root/programs/3_BuildLibsAtOtherRepos.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ setlocal
1010
set zipfilename=Temp.zip
1111

1212
@rem GitHubのZIPパス
13-
set branchName=02-50
13+
set branchName=02-70
1414
set srcUrl=https://github.com/OpenTouryoProject/OpenTouryoTemplates/archive/%branchName%.zip
1515

1616
@rem 解凍ディレクトリ
@@ -35,18 +35,18 @@ if exist %extDir%\%tmpDir% GOTO Build
3535

3636
:Build
3737
@rem ビルドがあるならコピーへ
38-
if exist "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\Frameworks\Infrastructure\Build_netcore30" GOTO Xcopy
38+
if exist "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\Frameworks\Infrastructure\Build_netcore50" GOTO Xcopy
3939

4040
@rem batファイルを使用してビルド
4141
cd "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\"
4242
echo | call 3_Build_Business_net48.bat
43-
echo | call 3_Build_Business_netcore30.bat
43+
echo | call 3_Build_Business_netcore50.bat
4444

4545
:Xcopy
4646
@rem ビルド出力をコピー
4747
cd %extDir%
4848
xcopy /Y /E "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\Frameworks\Infrastructure\Build_net48" "OpenTouryoAssemblies\Build_net48\"
49-
xcopy /Y /E "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\Frameworks\Infrastructure\Build_netcore30" "OpenTouryoAssemblies\Build_netcore30\"
49+
xcopy /Y /E "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\Frameworks\Infrastructure\Build_netcore50" "OpenTouryoAssemblies\Build_netcore50\"
5050

5151
pause
5252

‎root/programs/3_BuildLibsAtOtherReposInTimeOfDev.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,20 @@ if exist %extDir%\%tmpDir% GOTO Build
3434

3535
:Build
3636
@rem ビルドがあるならコピーへ
37-
if exist "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore30" GOTO Xcopy
37+
if exist "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore50" GOTO Xcopy
3838

3939
@rem batファイルを使用してビルド
4040
cd "Temp\OpenTouryo-develop\root\programs\CS\"
4141
echo | call 2_Build_NuGet_net48.bat
4242
echo | call 3_Build_Business_net48.bat
4343
echo | call 2_Build_NuGet_netstd21.bat
44-
echo | call 3_Build_Business_netcore30.bat
44+
echo | call 3_Build_Business_netcore50.bat
4545

4646
:Xcopy
4747
@rem ビルド出力をコピー
4848
cd %extDir%
4949
xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_net48" "OpenTouryoAssemblies\Build_net48\"
50-
xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore30" "OpenTouryoAssemblies\Build_netcore30\"
50+
xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore50" "OpenTouryoAssemblies\Build_netcore50\"
5151

5252
pause
5353

‎root/programs/CommandLineTools/CreateClientsIdentity/netcore/CreateClientsIdentity.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>net5.0</TargetFramework>
66
</PropertyGroup>
77

88
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -26,10 +26,10 @@
2626

2727
<ItemGroup>
2828
<Reference Include="OpenTouryo.Public">
29-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.dll</HintPath>
29+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
3030
</Reference>
3131
<Reference Include="OpenTouryo.Public.Security">
32-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.Security.dll</HintPath>
32+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
3333
</Reference>
3434
</ItemGroup>
3535

‎root/programs/CommandLineTools/CreateJwkSetJson/netcore/CreateJwkSetJson.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>net5.0</TargetFramework>
66
</PropertyGroup>
77

88
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -27,13 +27,13 @@
2727

2828
<ItemGroup>
2929
<Reference Include="OpenTouryo.Framework">
30-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Framework.dll</HintPath>
30+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
3131
</Reference>
3232
<Reference Include="OpenTouryo.Public">
33-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.dll</HintPath>
33+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
3434
</Reference>
3535
<Reference Include="OpenTouryo.Public.Security">
36-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.Security.dll</HintPath>
36+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
3737
</Reference>
3838
</ItemGroup>
3939

0 commit comments

Comments
 (0)