Merge pull request #8 from VillSource/main

Deploy container to ghcr with GitHub action

Author: VillSource

.dockerignore

@@ -22,4 +22,5 @@
 **/secrets.dev.yaml
 **/values.dev.yaml
 LICENSE
-README.md
+README.md
+Gateway\ocelot.json

.github/workflows/publish.yml

@@ -0,0 +1,24 @@
+name: Publish Image to GHCR
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  publish-image:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build the Docker image
+        run: |
+          docker build -f ./Gateway/Dockerfile . --tag ghcr.io/untitlecms/gateway:v0
+          docker push ghcr.io/untitlecms/gateway:v0

.gitignore

@@ -360,4 +360,6 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+
+ocelot.json

Gateway/.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "8.0.0",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}

Gateway/Dockerfile

@@ -1,7 +1,9 @@
 #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
 FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+LABEL org.opencontainers.image.source = "https://github.com/UntitleCMS/Gateway"
 WORKDIR /app
+RUN mkdir /app/Ocelot
 EXPOSE 80
 EXPOSE 443
 
@@ -19,4 +21,4 @@ RUN dotnet publish "Gateway.csproj" -c Release -o /app/publish /p:UseAppHost=fal
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "Gateway.dll"]
+ENTRYPOINT ["dotnet", "Gateway.dll"]

Gateway/Ocelot/ocelot.authv2.json

@@ -0,0 +1,77 @@
+{
+  "Routes": [
+    {
+      "DownstreamPathTemplate": "/api/auth/v2",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "local.villsource.tk",
+          "Port": 8081
+        }
+      ],
+      "UpstreamPathTemplate": "/api/auth/v2",
+      "UpstreamHeaderTransform": {
+        "X-Forwarded-For": "{RemoteIpAddress}",
+        "X-Forwarded-Host": "localhost:7269",
+        "X-Forwarded-Proto": "https"
+      }
+    },
+
+    {
+      "DownstreamPathTemplate": "/api/auth/v2/.well-known/openid-configuration",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "local.villsource.tk",
+          "Port": 8081
+        }
+      ],
+      "UpstreamPathTemplate": "/api/auth/v2/.well-known/openid-configuration",
+      "UpstreamHeaderTransform": {
+        "X-Forwarded-For": "{RemoteIpAddress}",
+        "X-Forwarded-Host": "localhost:7269",
+        "X-Forwarded-Proto": "https"
+      },
+      "DownstreamHeaderTransform": {
+        "Uncle": "Bob"
+      }
+    },
+
+
+
+    {
+      "DownstreamPathTemplate": "/api/auth/v2{url}",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "local.villsource.tk",
+          "Port": 8081
+        }
+      ],
+      "UpstreamPathTemplate": "/api/auth/v2{url}",
+      "UpstreamHeaderTransform": {
+        "X-Forwarded-For": "{RemoteIpAddress}",
+        "X-Forwarded-Host": "localhost:7269",
+        "X-Forwarded-Proto": "https"
+      }
+    },
+
+    {
+      "DownstreamPathTemplate": "/oauth/cb/{url}",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "local.villsource.tk",
+          "Port": 8081
+        }
+      ],
+      "UpstreamPathTemplate": "/oauth/cb/{url}",
+      "UpstreamHeaderTransform": {
+        "X-Forwarded-For": "{RemoteIpAddress}",
+        "X-Forwarded-Host": "localhost:7269",
+        "X-Forwarded-Proto": "https"
+      }
+    }
+
+  ]
+}

Gateway/Ocelot/ocelot.zPlayground.json

@@ -0,0 +1,20 @@
+{
+  "Routes": [
+    // Get Articles with authorize
+    {
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "google.com",
+          "Port": 443
+        }
+      ],
+      "DownstreamPathTemplate": "/",
+      "UpstreamPathTemplate": "/qwerty",
+      "UpstreamHttpMethod": [ "GET" ],
+      "AuthenticationOptions": {
+        "AuthenticationProviderKey": "OpenIddict.Validation.AspNetCore"
+      }
+    }
+  ]
+}

Gateway/Program.cs

@@ -2,55 +2,47 @@
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Ocelot.DependencyInjection;
 using Ocelot.Middleware;
-using Ocelot.Values;
-using OpenIddict.Abstractions;
-using OpenIddict.Validation.AspNetCore;
 using OpenIddict.Validation.SystemNetHttp;
 
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Logging.ClearProviders();
 builder.Logging.AddConsole();
 
-// Add services to the container.
-
 builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
+
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
 
-//builder.Configuration.AddJsonFile("ocelot.json", optional: false, reloadOnChange: true);
-builder.Configuration.AddOcelot(Path.Combine(System.IO.Directory.GetCurrentDirectory(),"Ocelot"),builder.Environment);
-
-
+builder.Configuration
+    .AddOcelot(Path.Combine(Directory.GetCurrentDirectory(),"Ocelot"),builder.Environment);
 
 builder.Services.AddOpenIddict()
     .AddValidation(option =>
     {
-        option.SetIssuer("http://authenticationservice/");
+        option.SetIssuer(Environment.GetEnvironmentVariable("AUTH_ISSUER")
+            ?? "https://p.villsource.tk/api/auth/v2"
+            ?? throw new Exception("Authentication Issuer not found."));
         option.UseSystemNetHttp();
         option.UseAspNetCore();
     });
+
 // Allow any certificate ***DANGER FOR PRODUCTION***
 builder.Services.AddHttpClient(typeof(OpenIddictValidationSystemNetHttpOptions).Assembly.GetName().Name!)
     .ConfigurePrimaryHttpMessageHandler(_ => new HttpClientHandler
     {
         ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
     });
-//builder.Services.AddAuthentication(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme);
-//    option =>
-//{
-//    option.DefaultScheme = OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme;
-//    option.DefaultChallengeScheme = OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme;
-//    option.DefaultAuthenticateScheme = OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme;
-//});
-
-// body size
+
+
+// Set max Body size
+_ = int.TryParse(Environment.GetEnvironmentVariable("MAX_REQUEST_BODY_SIZE")
+    ??"50", out int maxBodySizeMegabyte);
 builder.Services.Configure<KestrelServerOptions>(options =>
-    options.Limits.MaxRequestBodySize = 20 * 1_000_000
+    options.Limits.MaxRequestBodySize = maxBodySizeMegabyte * 1_000_000
 );
 builder.Services.Configure<IISServerOptions>(options =>
-    options.MaxRequestBodyBufferSize = 20 * 1_000_000
+    options.MaxRequestBodyBufferSize = maxBodySizeMegabyte * 1_000_000
 );
 
 
@@ -68,13 +60,12 @@
 }
 
 
-//app.UseHttpsRedirection();
+app.UseHttpsRedirection();
 
 app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();
-//app.UseWebSockets();
 app.UseOcelot().Wait();
 
 app.Run();

Gateway/ocelot.json

@@ -12,6 +12,8 @@ services:
     depends_on:
       - blogservice
       - authenticationservice
+    environment:
+        AUTH_ISSUER: https://p.villsource.tk/api/auth/v2
 
   frontend:
     image: villsource/beta-blog
@@ -45,6 +47,9 @@ services:
     depends_on:
       - blog-database
       - mongo1
+    environment:
+      DB_CONNECTION_STRING: mongodb://mongo1:50001/?replicaSet=my-mongo-set
+      MQ_HOST: rabit-mq
 
   commentservice:
     image: villsource/commentservice
@@ -147,6 +152,13 @@ services:
     networks:
       - backend
 
+  rabit-mq:
+    hostname: rabit-mq
+    image: rabbitmq:3-management
+    ports:
+      - 15672:15672
+      - 5672:5672
+
 
   python-slave:
     image: python-slave