Merge pull request #507 from Crypter-File-Transfer/stable

Merge 'stable' to 'main'
Crypter-File-Transfer · Apr 25, 2023 · 1698a0f · 1698a0f
2 parents 35bf8a1 + 178d7fc
commit 1698a0f
Show file tree

Hide file tree

Showing 38 changed files with 1,064 additions and 265 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -0,0 +1,94 @@
+name: Unit test
+
+on:
+  pull_request:
+    branches: [ main, stable ]
+
+jobs:
+  build-and-test:
+
+    runs-on: ubuntu-latest
+
+    services:
+      database:
+        image: postgres
+        env:
+          POSTGRES_INITDB_ARGS: --auth-host=scram-sha-256 --auth-local=scram-sha-256
+          POSTGRES_HOST_AUTH_METHOD: scram-sha-256
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: DEFAULT_PASSWORD
+          POSTGRES_DB: crypter
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+
+    - name: Install wasm-tools
+      run: dotnet workload install wasm-tools
+
+    - name: Restore dependencies
+      run: dotnet restore
+
+    - name: Build
+      run: dotnet build --configuration Release --no-restore
+
+    - name: Create Hangfire databases
+      run: |
+         sudo apt-get install --yes --no-install-recommends postgresql-client
+         export PGPASSWORD=DEFAULT_PASSWORD
+         psql -h 127.0.0.1 -U postgres <<-EOSQL
+            CREATE DATABASE crypter_hangfire;
+         EOSQL
+
+    - name: Create crypter_user database user
+      run: |
+         export PGPASSWORD=DEFAULT_PASSWORD
+         psql -h 127.0.0.1 -U postgres --dbname "crypter" <<-EOSQL
+            CREATE USER crypter_user WITH PASSWORD 'DEFAULT_PASSWORD';
+
+            REVOKE ALL PRIVILEGES ON DATABASE crypter_hangfire FROM crypter_user;
+
+            GRANT CONNECT ON DATABASE crypter TO crypter_user;
+            CREATE SCHEMA IF NOT EXISTS crypter AUTHORIZATION crypter_user;
+            GRANT CREATE ON DATABASE crypter TO crypter_user;
+            GRANT CREATE ON SCHEMA public TO crypter_user;
+            GRANT CREATE ON SCHEMA crypter TO crypter_user;
+            GRANT USAGE ON SCHEMA public TO crypter_user;
+            GRANT USAGE ON SCHEMA crypter TO crypter_user;
+         EOSQL
+
+    - name: Create crypter_hangfire_user database user
+      run: |
+         export PGPASSWORD=DEFAULT_PASSWORD
+         psql -h 127.0.0.1 -U postgres --dbname "crypter_hangfire" <<-EOSQL
+            CREATE USER crypter_hangfire_user WITH PASSWORD 'DEFAULT_PASSWORD';
+
+            REVOKE ALL PRIVILEGES ON DATABASE crypter FROM crypter_hangfire_user;
+
+            GRANT CONNECT ON DATABASE crypter_hangfire TO crypter_hangfire_user;
+            CREATE SCHEMA IF NOT EXISTS hangfire AUTHORIZATION crypter_hangfire_user;
+            GRANT CREATE ON DATABASE crypter_hangfire TO crypter_hangfire_user;
+            GRANT CREATE ON SCHEMA public TO crypter_hangfire_user;
+            GRANT CREATE ON SCHEMA hangfire TO crypter_hangfire_user;
+            GRANT USAGE ON SCHEMA public TO crypter_hangfire_user;
+            GRANT USAGE ON SCHEMA hangfire TO crypter_hangfire_user;
+         EOSQL
+
+    - name: Migrate Crypter database
+      run: |
+         dotnet tool install --global dotnet-ef
+         dotnet tool restore
+         dotnet ef database update -c DataContext -p Crypter.Core -s Crypter.API --connection "host=127.0.0.1:5432;database=crypter;user id=crypter_user;pwd=DEFAULT_PASSWORD;"
+
+    - name: Test
+      run: dotnet test --configuration Release --no-build --verbosity normal
diff --git a/Containers/PostgreSQL/.env b/Containers/PostgreSQL/.env
@@ -1,3 +1,3 @@
-POSTGRES_SUPERUSER_PASSWORD=CHANGE_ME
+POSTGRES_SUPERUSER_PASSWORD=DEFAULT_PASSWORD
 POSTGRES_DATA_DIR=./postgres-data
 CONTAINER_LISTEN_IP=192.168.1.141
diff --git a/Containers/PostgreSQL/postgres-init-files/init.sh b/Containers/PostgreSQL/postgres-init-files/init.sh
@@ -1,31 +1,37 @@
 #!/bin/bash
 set -e
 
-psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
-   CREATE DATABASE crypter;
+# Create hangfire database
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL
    CREATE DATABASE crypter_hangfire;
 EOSQL
 
+# Create crypter_user
 psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
-   CREATE USER crypter_user WITH PASSWORD 'CHANGE_ME';
-   REVOKE ALL PRIVILEGES ON DATABASE postgres FROM crypter_user;
-   REVOKE ALL PRIVILEGES ON SCHEMA public FROM crypter_user;
-   REVOKE CREATE ON SCHEMA public FROM PUBLIC;
-EOSQL
+   CREATE USER crypter_user WITH PASSWORD 'DEFAULT_PASSWORD';
+
+   REVOKE ALL PRIVILEGES ON DATABASE crypter_hangfire FROM crypter_user;
 
-psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "crypter" <<-EOSQL
-   REVOKE ALL PRIVILEGES ON DATABASE crypter FROM crypter_user;
-   REVOKE ALL PRIVILEGES ON SCHEMA public FROM crypter_user;
-   REVOKE CREATE ON SCHEMA public FROM PUBLIC;
    GRANT CONNECT ON DATABASE crypter TO crypter_user;
-   ALTER DEFAULT PRIVILEGES FOR USER postgres IN SCHEMA public GRANT SELECT, INSERT, UPDATE, DELETE ON TABLES TO crypter_user;
+   CREATE SCHEMA IF NOT EXISTS crypter AUTHORIZATION crypter_user;
+   GRANT CREATE ON DATABASE crypter TO crypter_user;
+   GRANT CREATE ON SCHEMA public TO crypter_user;
+   GRANT CREATE ON SCHEMA crypter TO crypter_user;
+   GRANT USAGE ON SCHEMA public TO crypter_user;
+   GRANT USAGE ON SCHEMA crypter TO crypter_user;
 EOSQL
 
+# Create crypter_hangfire_user
 psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "crypter_hangfire" <<-EOSQL
-   CREATE USER crypter_hangfire_user WITH PASSWORD 'CHANGE_ME';
+   CREATE USER crypter_hangfire_user WITH PASSWORD 'DEFAULT_PASSWORD';
+
    REVOKE ALL PRIVILEGES ON DATABASE crypter FROM crypter_hangfire_user;
-   REVOKE ALL PRIVILEGES ON SCHEMA public FROM crypter_hangfire_user;
 
-   CREATE SCHEMA IF NOT EXISTS Hangfire AUTHORIZATION crypter_hangfire_user;
-   GRANT CREATE ON schema Hangfire TO crypter_hangfire_user;
+   GRANT CONNECT ON DATABASE crypter_hangfire TO crypter_hangfire_user;
+   CREATE SCHEMA IF NOT EXISTS hangfire AUTHORIZATION crypter_hangfire_user;
+   GRANT CREATE ON DATABASE crypter_hangfire TO crypter_hangfire_user;
+   GRANT CREATE ON SCHEMA public TO crypter_hangfire_user;
+   GRANT CREATE ON SCHEMA hangfire TO crypter_hangfire_user;
+   GRANT USAGE ON SCHEMA public TO crypter_hangfire_user;
+   GRANT USAGE ON SCHEMA hangfire TO crypter_hangfire_user;
 EOSQL
diff --git a/Containers/PostgreSQL_Test/.dockerignore b/Containers/PostgreSQL_Test/.dockerignore
diff --git a/Containers/PostgreSQL_Test/.env b/Containers/PostgreSQL_Test/.env
diff --git a/Containers/PostgreSQL_Test/docker-compose.yml b/Containers/PostgreSQL_Test/docker-compose.yml
diff --git a/Containers/PostgreSQL_Test/postgres-init-files/init.sh b/Containers/PostgreSQL_Test/postgres-init-files/init.sh
diff --git a/Crypter.API/.config/dotnet-tools.json b/Crypter.API/.config/dotnet-tools.json
diff --git a/Crypter.API/Crypter.API.csproj b/Crypter.API/Crypter.API.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
    <PropertyGroup>
-      <TargetFramework>net6.0</TargetFramework>
+      <TargetFramework>net7.0</TargetFramework>
       <Nullable>disable</Nullable>
       <ImplicitUsings>disable</ImplicitUsings>
    </PropertyGroup>
@@ -16,15 +16,15 @@
       <ProjectReference Include="..\Crypter.Core\Crypter.Core.csproj" />
    </ItemGroup>
    <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.4">
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
       <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-      <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.15" />
+      <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.5" />
    </ItemGroup>
 </Project>
diff --git a/Crypter.API/Program.cs b/Crypter.API/Program.cs
@@ -31,7 +31,6 @@
 using Crypter.Core.Identity;
 using Crypter.Core.Models;
 using Crypter.Core.Settings;
-using Hangfire;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -139,11 +138,7 @@
 app.UseRouting();
 app.UseAuthentication();
 app.UseAuthorization();
-app.UseMiddleware<ExceptionHandlerMiddleware>();
-app.UseEndpoints(endpoints =>
-{
-   endpoints.MapControllers();
-   endpoints.MapHangfireDashboard();
-});
+app.UseMiddleware<ExceptionHandlerMiddleware>();
+app.MapControllers();
 
 app.Run();
diff --git a/Crypter.API/Properties/PublishProfiles/FolderProfile.pubxml b/Crypter.API/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,10 +10,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>bin\Release\net6.0\publish\</PublishUrl>
+    <PublishUrl>bin\Release\net7.0\publish\</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <SiteUrlToLaunchAfterPublish />
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ProjectGuid>f9208a53-1847-4b7e-a867-c5d17f52410c</ProjectGuid>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>

diff --git a/Crypter.API/appsettings.json b/Crypter.API/appsettings.json
@@ -1,8 +1,8 @@
 {
    "AllowedHosts": "*",
    "ConnectionStrings": {
-      "DefaultConnection": "host=127.0.0.1;database=crypter;user id=postgres;pwd=CHANGE_ME;",
-      "HangfireConnection": "host=127.0.0.1;database=crypter_hangfire;user id=crypter_hangfire_user;pwd=CHANGE_ME;"
+      "DefaultConnection": "host=127.0.0.1;database=crypter;user id=crypter_user;pwd=DEFAULT_PASSWORD;",
+      "HangfireConnection": "host=127.0.0.1;database=crypter_hangfire;user id=crypter_hangfire_user;pwd=DEFAULT_PASSWORD;"
    },
    "EmailSettings": {
       "Enabled": false,