From e57b47cae362bcdd292021d92f19844516cd42b7 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 1 May 2024 20:40:13 +0000 Subject: [PATCH] backend to fix --- backend/API/API.http | 6 --- backend/API/Program.cs | 35 +++++++++++++-- backend/API/Properties/launchSettings.json | 8 ++-- backend/API/Properties/log.txt | 1 + backend/API/cert.pem | 29 ++++++++++++ backend/API/key.pem | 52 ++++++++++++++++++++++ backend/API/log.txt | 1 + backend/Dockerfile | 5 ++- backend/log.txt | 1 + 9 files changed, 123 insertions(+), 15 deletions(-) delete mode 100644 backend/API/API.http create mode 100644 backend/API/Properties/log.txt create mode 100644 backend/API/cert.pem create mode 100644 backend/API/key.pem create mode 100644 backend/API/log.txt create mode 100644 backend/log.txt diff --git a/backend/API/API.http b/backend/API/API.http deleted file mode 100644 index d09cb58..0000000 --- a/backend/API/API.http +++ /dev/null @@ -1,6 +0,0 @@ -@API_HostAddress = http://localhost:5151 - -GET {{API_HostAddress}}/weatherforecast/ -Accept: application/json - -### diff --git a/backend/API/Program.cs b/backend/API/Program.cs index 40bb71a..d896b36 100644 --- a/backend/API/Program.cs +++ b/backend/API/Program.cs @@ -3,9 +3,38 @@ using Infrastructure; using Infrastructure.Data; using Microsoft.EntityFrameworkCore; using Microsoft.OpenApi.Models; +using System.Security.Cryptography.X509Certificates; +using Microsoft.AspNetCore.Server.Kestrel.Https; var builder = WebApplication.CreateBuilder(args); +// Specify the paths to your certificate and key files +var certPath = Path.Combine(Directory.GetCurrentDirectory(), "cert.pem"); +var keyPath = Path.Combine(Directory.GetCurrentDirectory(), "key.pem"); + +// Load the certificate and key +var certificate = new X509Certificate2(certPath); +var privateKeyText = File.ReadAllText(keyPath); +var rsaPrivateKey = RSA.Create(); +rsaPrivateKey.ImportFromPem(privateKeyText.ToCharArray()); + +// Combine the certificate and private key into one X509Certificate2 object +var certificateWithKey = certificate.CopyWithPrivateKey(rsaPrivateKey); + +builder.WebHost.ConfigureKestrel(serverOptions => +{ + serverOptions.ListenAnyIP(5000); // Set HTTP port + serverOptions.ListenAnyIP(5001, listenOptions => // Set HTTPS port + { + // Apply the certificate with the private key to HTTPS + listenOptions.UseHttps(new HttpsConnectionAdapterOptions + { + ServerCertificate = certificateWithKey, + ClientCertificateMode = ClientCertificateMode.NoCertificate + }); + }); +});; + builder.Services.AddCors(options => { options.AddPolicy("AllowAll", @@ -57,13 +86,13 @@ if (app.Environment.IsDevelopment()) } app.UseCors("AllowAll"); -//app.UseHttpsRedirection(); +app.UseHttpsRedirection(); app.MapControllers(); // Middlewares app.UseMiddleware(); app.UseMiddleware(); -//app.UseMiddleware(); +app.UseMiddleware(); using (var scope = app.Services.CreateScope()) { @@ -78,4 +107,4 @@ static void EnsureDatabaseCreated(HealthcareManagerDatabase dbContext) { // Checking for pending migrations is more efficient than applying migrations unconditionally if (dbContext.Database.GetPendingMigrations().Any()) dbContext.Database.Migrate(); -} \ No newline at end of file +} diff --git a/backend/API/Properties/launchSettings.json b/backend/API/Properties/launchSettings.json index 5681835..83d7e9c 100644 --- a/backend/API/Properties/launchSettings.json +++ b/backend/API/Properties/launchSettings.json @@ -12,19 +12,19 @@ "http": { "commandName": "Project", "dotnetRunMessages": true, - "launchBrowser": true, + "launchBrowser": false, "launchUrl": "swagger", "applicationUrl": "http://localhost:5000;https://localhost:5001", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" + "ASPNETCORE_ENVIRONMENT": "Production" } }, "IIS Express": { "commandName": "IISExpress", - "launchBrowser": true, + "launchBrowser": false, "launchUrl": "swagger", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "development" + "ASPNETCORE_ENVIRONMENT": "Production" } } } diff --git a/backend/API/Properties/log.txt b/backend/API/Properties/log.txt new file mode 100644 index 0000000..8a011ef --- /dev/null +++ b/backend/API/Properties/log.txt @@ -0,0 +1 @@ +2024/05/01 19:55:08 Micro started diff --git a/backend/API/cert.pem b/backend/API/cert.pem new file mode 100644 index 0000000..a793c3d --- /dev/null +++ b/backend/API/cert.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIFCTCCAvGgAwIBAgIUYfQyilxbHIUJmI/c42J8jAIQ0iUwDQYJKoZIhvcNAQEL +BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTI0MDUwMTIwMDkzMVoXDTI1MDUw +MTIwMDkzMVowFDESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEF +AAOCAg8AMIICCgKCAgEAyucTpvvdVi0jXayV0g4U6dSDmtRnHWmV/SMEH4SE395z +BTw/TFfFZjPjY/S1FML2k+OCw13goi4Ok/iLDuKhWoT3Hzix5y6NTXrPulVsPlt1 +3+wCVFAAJSnb+EEmzDb58IixcnAIT94M4aeQtdxbao8nQs6vvOEy99wzIq63jy2A +lv5L2Be+9fXFDhNNtpk2HXrIf4Os0N+UDRC9MqPMnPV/LbOvKXXYlRr/B7H+xOXE +kd1sCOlauXPTn7pSEr04JvY6+DoUdPvu5mbRBDEgyM9mhi3cK8v4I5auNxnb1OWz +D5HjP9Wht6NpmiiYETNtArXeA0fH8538IhqiTqWtafa8zJbrL1h+NS9YkkKtw6w4 +IOwa5ssTVux8d9M5dkm/Ps7pNi59YhPdgWfcm0vAt/YFKazT15IlvdkJzbIhMvrQ +yp3xKMAEykmHcjf6HaZLODKhxMRobHySXkG8TKo8gNyHWLp7roDLavTcDzJkR92i +yq0w72PI+e/qRU1BdrUAdukHTnS42FrOZkVQPKw+lanEOZVFPBbb8q0PA17VVfLA +lYt1hWT/xHRfNhVZSFfdDQ8zcq7r3nMsWfRVa2u24+dBhv8+dOWAXMAN68bD6mwj +No1gRhc8BMWsfCjuA09ojFMFqOcOLvaWPKUJW085IVrBljch9X5q+wW1nX6RUTEC +AwEAAaNTMFEwHQYDVR0OBBYEFFltBlAdjyh//RkxCnnOwGZ92Ar3MB8GA1UdIwQY +MBaAFFltBlAdjyh//RkxCnnOwGZ92Ar3MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI +hvcNAQELBQADggIBADG1S8ZJMaDLbBwUi7BXarLr7i1i0YZP6Mfo0/CgusoHOVfc +4Mh/2vFC5E/hLW4cbrnlYAZm+ohTrwllUPhDGjabbCo3gow0oPmbm9R6eiOc60GN +v5ICXAn+2I88GKF2IYj493JqyMF1LglBwIFh+vJEfveADW9L6GJlTsIr0R10P355 +f3dXzyWJRhcZxp+yx/xnYRQFNMMCGhd8pgFtzgzxDxFH+wGsHlC+HtKwd1+9NiI9 +WOCahNJQZzbNXKZ1aLvYAS9Bw5hkSvac04+GlmxSwYulwVXCCVQ/v1MOIoLnybHz +UcezTqNWynjURNvLjUKnjlXwvEpAX7t7/aNey7OzO1FsLjgSu2bZ1xSAqDlG2Kn5 +5kJS4DKjfsjb/rHoyAqsmGlXHwag1LmUlVPxdVz4plknK43iN51YdK2SklLtJ2XO +t8hpFCzwKq8dNyBS9cG9bxNyKOspNCeOst08CaDfcgP7SzQx9T+Qaz7PKfNwqDA9 +EYj6tWowCUYwgBuDVcUUgfk/WEzv4zrZyY15mpFX2XMSU5PXvT+7SzYZtJgS7Bxh +c/NfvTuEDc1u3h2N5+g1lz+v6/7Kx27RfvVXySJ16/Tjve1Lft8I39HdUzx5JMrF +qtaPtGNHHwVMabpG4T6WB5SgTUsqcWb2YON/DTT1HB55s9rMq6zkSppvrxtz +-----END CERTIFICATE----- diff --git a/backend/API/key.pem b/backend/API/key.pem new file mode 100644 index 0000000..a44b5be --- /dev/null +++ b/backend/API/key.pem @@ -0,0 +1,52 @@ +-----BEGIN PRIVATE KEY----- +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 +OWvzs/Bd/hyc175sbDKXF9/38goTlG2Aag== +-----END PRIVATE KEY----- diff --git a/backend/API/log.txt b/backend/API/log.txt new file mode 100644 index 0000000..cb26275 --- /dev/null +++ b/backend/API/log.txt @@ -0,0 +1 @@ +2024/05/01 20:38:38 Micro started diff --git a/backend/Dockerfile b/backend/Dockerfile index d99bf3d..8ebefd3 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,8 +1,9 @@ # Use the official image as a parent image FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base WORKDIR /app -EXPOSE 80 -EXPOSE 443 +EXPOSE 5000 +EXPOSE 5001 +EXPOSE 8080 # Use SDK image to build the project FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build diff --git a/backend/log.txt b/backend/log.txt new file mode 100644 index 0000000..4b224a8 --- /dev/null +++ b/backend/log.txt @@ -0,0 +1 @@ +2024/05/01 16:10:42 Micro started