Merge pull request #149 from OpenTouryoProject/develop

Release work ( ~ June 1, 2021)
OpenTouryoProject · Mar 29, 2021 · 8898134 · 8898134
2 parents a1e32fe + 4889d9e
commit 8898134
Show file tree

Hide file tree

Showing 64 changed files with 3,415 additions and 853 deletions.
diff --git a/license/STATUS.txt b/license/STATUS.txt
@@ -3,20 +3,26 @@ Open Touryo Project Status
 
 Project Status
 ==============
-Open Touryo was created as an in-house tool of Hitachi Solutions, Ltd.
+Open Touryo was an in-house tool of Hitachi Solutions, Ltd. 
 Open Touryo was released as open source in April 2014.
 And it was forked by the Open Touryo project.
 
 Project Details
 ===============
 
 Web site: 
-Issue Tracking: 
+ - https://opentouryo.osscons.jp/
+ - https://github.com/OpenTouryoProject/OpenTouryo/wiki
+
+Issue Tracking:
+ - https://github.com/OpenTouryoProject/MultiPurposeAuthSite/issues
+
 Source Code: 
-Mailing Lists:
-  User: 
-  Dev:  
+ - https://github.com/OpenTouryoProject/MultiPurposeAuthSite
 
+Mailing Lists:
+  User: ws-dotNetDevInfra-contact@osscons.jp
+  Dev:  ws-dotNetDevInfra-contact@osscons.jp
 
 Active Committers
 =================

diff --git a/root/files/resource/MultiPurposeAuthSite/Sql/pstgrs/Create_UserStore.sql b/root/files/resource/MultiPurposeAuthSite/Sql/pstgrs/Create_UserStore.sql
@@ -106,6 +106,28 @@ CREATE TABLE FIDO2Data(
     CONSTRAINT PK_FIDO2Data PRIMARY KEY (PublicKeyId)
 );
 
+CREATE TABLE DeviceAuthZData(
+    Id serial NOT NULL,                               -- PK (キー長に問題があるためId intを使用)
+    DeviceCode varchar(38) NOT NULL,                  -- device_code(guid)
+    UserCode varchar(10) NOT NULL,                    -- user_code(10文字以下)
+    AuthReqExp bigint NOT NULL,                       -- UNIX時刻(long)
+    TempData varchar(256) NOT NULL,                   -- TempData
+    AuthZCode varchar(64) NULL,                       -- AuthZCode
+    Result boolean NULL,                              -- Result of Verify
+    CONSTRAINT PK_DeviceAuthZData PRIMARY KEY (Id)
+);
+
+CREATE TABLE CibaData(
+    Id serial NOT NULL,                               -- PK (キー長に問題があるためId intを使用)
+    ClientNotificationToken varchar(800) NOT NULL,    -- 乱数(800)
+    AuthReqId varchar(800) NOT NULL,                  -- 乱数(800)
+    AuthReqExp bigint NOT NULL,                       -- UNIX時刻(long)
+    AuthZCode varchar(64) NOT NULL,                   -- AuthZCode
+    UnstructuredData varchar(2000) NULL,              -- binding_message, user_code, etc.
+    Result boolean NULL,                              -- Result of CIBA
+    CONSTRAINT PK_CibaData PRIMARY KEY (Id)
+);
+
 CREATE TABLE OAuth2Revocation(
     Jti varchar(38) NOT NULL,                -- PK, guid
     CreatedDate timestamp NOT NULL,
@@ -137,6 +159,12 @@ CREATE UNIQUE INDEX ClientIDIndex ON Users (ClientID);
 ---- Roles
 CREATE UNIQUE INDEX RoleNameIndex ON Roles (Name);
 CREATE UNIQUE INDEX NormalizedNameIndex ON Roles (NormalizedName);
+---- DeviceAuthZData
+CREATE UNIQUE INDEX DeviceAuthZDeviceCodeIndex ON CibaData (DeviceAuthZData);
+CREATE UNIQUE INDEX DeviceAuthZUserCodeIndex ON CibaData (DeviceAuthZData);
+---- CibaData
+CREATE UNIQUE INDEX CibaClientNotificationTokenIndex ON CibaData (ClientNotificationToken);
+CREATE UNIQUE INDEX CibaAuthReqIdIndex ON CibaData (AuthReqId);
 ---- UserRoles
 CREATE INDEX IX_UserRoles_UserId ON UserRoles (UserId);
 CREATE INDEX IX_UserRoles_RoleId ON UserRoles (RoleId);

diff --git a/root/files/resource/MultiPurposeAuthSite/Sql/sqlserver/Create_UserStore.sql b/root/files/resource/MultiPurposeAuthSite/Sql/sqlserver/Create_UserStore.sql
@@ -132,10 +132,22 @@ CREATE TABLE [FIDO2Data](
         WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 ) ON [PRIMARY]
 
+CREATE TABLE [DeviceAuthZData](
+    [Id] [int] IDENTITY(1,1) NOT NULL,                   -- PK (キー長に問題があるため[Id] [int]を使用)
+    [DeviceCode] [nvarchar](38) NOT NULL,                -- device_code(guid)
+    [UserCode] [nvarchar](10) NOT NULL,                  -- user_code(10文字以下)
+    [AuthReqExp] [bigint] NOT NULL,                      -- UNIX時刻(long)
+    [TempData] [nvarchar](256) NULL,                     -- TempData
+    [AuthZCode] [nvarchar](64) NULL,                     -- AuthZCode
+    [Result] [bit] NULL,                                 -- Result of Verify
+    CONSTRAINT [PK.DeviceAuthZData] PRIMARY KEY NONCLUSTERED ([Id] ASC)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
 CREATE TABLE [CibaData](
     [Id] [int] IDENTITY(1,1) NOT NULL,                   -- PK (キー長に問題があるため[Id] [int]を使用)
-    [ClientNotificationToken] [nvarchar](800) NOT NULL, -- 乱数(800)
-    [AuthReqId] [nvarchar](800) NOT NULL,               -- 乱数(800)
+    [ClientNotificationToken] [nvarchar](800) NOT NULL,  -- 乱数(800)
+    [AuthReqId] [nvarchar](800) NOT NULL,                -- 乱数(800)
     [AuthReqExp] [bigint] NOT NULL,                      -- UNIX時刻(long)
     [AuthZCode] [nvarchar](64) NOT NULL,                 -- AuthZCode
     [UnstructuredData] [nvarchar](max) NULL,             -- binding_message, user_code, etc.
@@ -178,6 +190,9 @@ CREATE UNIQUE NONCLUSTERED INDEX [ClientIDIndex] ON [Users] ([ClientID] ASC) WIT
 ---- Roles
 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]
 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]
+---- DeviceAuthZData
+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]
+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]
 ---- CibaData
 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]
 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]

diff --git a/root/files/tools/WinMergeFilters/touryo.flt b/root/files/tools/WinMergeFilters/touryo.flt
diff --git a/root/files/tools/WinMergeFilters/touryofull.flt b/root/files/tools/WinMergeFilters/touryofull.flt
diff --git a/root/programs/1_DeleteDir.bat b/root/programs/1_DeleteDir.bat
@@ -1,31 +1,19 @@
 @echo off
 
+set DIRECTORIES=packages, obj, bin, bld, Temp, Build, PrecompiledWeb, .vs
 @echo --------------------------------------------------
-@echo Delete the packages, obj, bin, bld, Temp, Build, PrecompiledWeb, .vs folders.
+@echo Delete the %DIRECTORIES% folders.
 @echo --------------------------------------------------
 
-for /D /R %%i in ( packages ) do (
-  if exist "%%~i" RD /S /Q "%%~i"
-)
-for /D /R %%i in ( obj ) do (
-  if exist "%%~i" RD /S /Q "%%~i"
-)
-for /D /R %%i in ( bin ) do (
-  if exist "%%~i" RD /S /Q "%%~i"
-)
-for /D /R %%i in ( bld ) do (
-  if exist "%%~i" RD /S /Q "%%~i"
-)
-for /D /R %%i in ( Temp ) do (
-  if exist "%%~i" RD /S /Q "%%~i"
-)
-for /D /R %%i in ( Build ) do (
-  if exist "%%~i" RD /S /Q "%%~i"
-)
-for /D /R %%i in ( PrecompiledWeb ) do (
-  if exist "%%~i" RD /S /Q "%%~i"
-)
-for /D /R %%i in ( .vs ) do (
-  if exist "%%~i" RD /S /Q "%%~i"
+@rem カンマをスペースに変換
+set w1=%DIRECTORIES:,= %
+
+@rem 連続したスペースを、スペース１個に変換
+set w2=%w1:  = %
+
+for %%a in ( %w2% ) do (
+  for /D /R %%i in ( %%a ) do (
+    if exist "%%~i" RD /S /Q "%%~i"
+  )
 )
 pause
diff --git a/root/programs/3_BuildLibsAtOtherRepos.bat b/root/programs/3_BuildLibsAtOtherRepos.bat
@@ -10,7 +10,7 @@ setlocal
 set zipfilename=Temp.zip
 
 @rem GitHubのZIPパス
-set branchName=02-50
+set branchName=02-70
 set srcUrl=https://github.com/OpenTouryoProject/OpenTouryoTemplates/archive/%branchName%.zip
 
 @rem 解凍ディレクトリ
@@ -35,18 +35,18 @@ if exist %extDir%\%tmpDir% GOTO Build
 
 :Build
 @rem ビルドがあるならコピーへ
-if exist "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\Frameworks\Infrastructure\Build_netcore30" GOTO Xcopy
+if exist "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\Frameworks\Infrastructure\Build_netcore50" GOTO Xcopy
 
 @rem batファイルを使用してビルド
 cd "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\"
 echo | call 3_Build_Business_net48.bat
-echo | call 3_Build_Business_netcore30.bat
+echo | call 3_Build_Business_netcore50.bat
 
 :Xcopy
 @rem ビルド出力をコピー
 cd %extDir%
 xcopy /Y /E "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\Frameworks\Infrastructure\Build_net48" "OpenTouryoAssemblies\Build_net48\"
-xcopy /Y /E "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\Frameworks\Infrastructure\Build_netcore30" "OpenTouryoAssemblies\Build_netcore30\"
+xcopy /Y /E "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\Frameworks\Infrastructure\Build_netcore50" "OpenTouryoAssemblies\Build_netcore50\"
 
 pause
 

diff --git a/root/programs/3_BuildLibsAtOtherReposInTimeOfDev.bat b/root/programs/3_BuildLibsAtOtherReposInTimeOfDev.bat
@@ -34,20 +34,20 @@ if exist %extDir%\%tmpDir% GOTO Build
 
 :Build
 @rem ビルドがあるならコピーへ
-if exist "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore30" GOTO Xcopy
+if exist "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore50" GOTO Xcopy
 
 @rem batファイルを使用してビルド
 cd "Temp\OpenTouryo-develop\root\programs\CS\"
 echo | call 2_Build_NuGet_net48.bat
 echo | call 3_Build_Business_net48.bat
 echo | call 2_Build_NuGet_netstd21.bat
-echo | call 3_Build_Business_netcore30.bat
+echo | call 3_Build_Business_netcore50.bat
 
 :Xcopy
 @rem ビルド出力をコピー
 cd %extDir%
 xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_net48" "OpenTouryoAssemblies\Build_net48\"
-xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore30" "OpenTouryoAssemblies\Build_netcore30\"
+xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore50" "OpenTouryoAssemblies\Build_netcore50\"
 
 pause
 

diff --git a/root/programs/CommandLineTools/CreateClientsIdentity/netcore/CreateClientsIdentity.csproj b/root/programs/CommandLineTools/CreateClientsIdentity/netcore/CreateClientsIdentity.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -26,10 +26,10 @@
 
   <ItemGroup>
     <Reference Include="OpenTouryo.Public">
-      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.dll</HintPath>
+      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Public.Security">
-      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.Security.dll</HintPath>
+      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
     </Reference>
   </ItemGroup>
 

diff --git a/root/programs/CommandLineTools/CreateJwkSetJson/netcore/CreateJwkSetJson.csproj b/root/programs/CommandLineTools/CreateJwkSetJson/netcore/CreateJwkSetJson.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -27,13 +27,13 @@
 
   <ItemGroup>
     <Reference Include="OpenTouryo.Framework">
-      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Framework.dll</HintPath>
+      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Public">
-      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.dll</HintPath>
+      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Public.Security">
-      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.Security.dll</HintPath>
+      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
     </Reference>
   </ItemGroup>
 

diff --git a/...eTools/CreateJwtBearerTokenFlowAssertion/netcore/CreateJwtBearerTokenFlowAssertion.csproj b/...eTools/CreateJwtBearerTokenFlowAssertion/netcore/CreateJwtBearerTokenFlowAssertion.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -27,13 +27,13 @@
 
   <ItemGroup>
     <Reference Include="OpenTouryo.Framework">
-      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Framework.dll</HintPath>
+      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Public">
-      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.dll</HintPath>
+      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Public.Security">
-      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.Security.dll</HintPath>
+      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
     </Reference>
   </ItemGroup>