feat: security upgrades

desenvolvedor-io · Apr 18, 2022 · d6f0c9a · d6f0c9a
1 parent 8af1e89
commit d6f0c9a
Show file tree

Hide file tree

Showing 45 changed files with 65 additions and 25 deletions.
diff --git a/src/api-gateways/DevStore.Bff.Checkout/Controllers/ShoppingCartController.cs b/src/api-gateways/DevStore.Bff.Checkout/Controllers/ShoppingCartController.cs
diff --git a/src/api-gateways/DevStore.Bff.Checkout/Program.cs b/src/api-gateways/DevStore.Bff.Checkout/Program.cs
diff --git a/src/api-gateways/DevStore.Bff.Checkout/Startup.cs b/src/api-gateways/DevStore.Bff.Checkout/Startup.cs
diff --git a/src/api-gateways/DevStore.Bff.Checkout/appsettings.Development.json b/src/api-gateways/DevStore.Bff.Checkout/appsettings.Development.json
@@ -17,6 +17,8 @@
     "MessageBus": "host=localhost:5672;publisherConfirms=true;timeout=10;username=devstore;password=devstore00"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://localhost:5421/jwks"
+    "JwksUri": "https://localhost:5421/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   }
 }
diff --git a/src/api-gateways/DevStore.Bff.Checkout/appsettings.Docker.json b/src/api-gateways/DevStore.Bff.Checkout/appsettings.Docker.json
@@ -17,6 +17,8 @@
     "MessageBus": "host=devstore-rabbit:5672;publisherConfirms=true;timeout=30;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://devstore-api-identity:5101/jwks"
+    "JwksUri": "https://devstore-api-identity:5101/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   }
 }
diff --git a/src/api-gateways/DevStore.Bff.Checkout/appsettings.Production.json b/src/api-gateways/DevStore.Bff.Checkout/appsettings.Production.json
@@ -17,6 +17,8 @@
     "MessageBus": "host=devstore-rabbit:5672;publisherConfirms=true;timeout=30;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://devstore-api-identity:5101/jwks"
+    "JwksUri": "https://devstore-api-identity:5101/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   }
 }
diff --git a/src/building-blocks/DevStore.WebAPI.Core/DevStore.WebAPI.Core.csproj b/src/building-blocks/DevStore.WebAPI.Core/DevStore.WebAPI.Core.csproj
diff --git a/src/building-blocks/DevStore.WebAPI.Core/Identity/AppSettings.cs b/src/building-blocks/DevStore.WebAPI.Core/Identity/AppSettings.cs
diff --git a/src/building-blocks/DevStore.WebAPI.Core/Identity/JwtConfig.cs b/src/building-blocks/DevStore.WebAPI.Core/Identity/JwtConfig.cs
diff --git a/src/services/DevStore.Billing.API/DevStore.Billing.API.csproj b/src/services/DevStore.Billing.API/DevStore.Billing.API.csproj
diff --git a/src/services/DevStore.Billing.API/appsettings.Development.json b/src/services/DevStore.Billing.API/appsettings.Development.json
@@ -7,13 +7,15 @@
     }
   },
   "ConnectionStrings": {
-    "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=DSBilling;Trusted_Connection=True;MultipleActiveResultSets=true"    
+    "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=DSBilling;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
   "MessageQueueConnection": {
     "MessageBus": "host=localhost:5672;publisherConfirms=true;timeout=10;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://localhost:5421/jwks"
+    "JwksUri": "https://localhost:5421/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   },
   "BillingConfig": {
     "DefaultApiKey": "ak_ewr4dsWehiwAT",

diff --git a/src/services/DevStore.Billing.API/appsettings.Docker.json b/src/services/DevStore.Billing.API/appsettings.Docker.json
@@ -13,7 +13,9 @@
     "MessageBus": "host=devstore-rabbit:5672;publisherConfirms=true;timeout=30;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://devstore-api-identity:5101/jwks"
+    "JwksUri": "https://devstore-api-identity:5101/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   },
   "BillingConfig": {
     "DefaultApiKey": "ak_ewr4dsWehiwAT",

diff --git a/src/services/DevStore.Billing.API/appsettings.Production.json b/src/services/DevStore.Billing.API/appsettings.Production.json
@@ -13,7 +13,9 @@
     "MessageBus": "host=devstore-rabbit:5672;publisherConfirms=true;timeout=30;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://devstore-api-identity:5101/jwks"
+    "JwksUri": "https://devstore-api-identity:5101/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   },
   "BillingConfig": {
     "DefaultApiKey": "ak_ewr4dsWehiwAT",

diff --git a/src/services/DevStore.Catalog.API/DevStore.Catalog.API.csproj b/src/services/DevStore.Catalog.API/DevStore.Catalog.API.csproj
diff --git a/src/services/DevStore.Catalog.API/appsettings.Development.json b/src/services/DevStore.Catalog.API/appsettings.Development.json
@@ -7,12 +7,14 @@
     }
   },
   "ConnectionStrings": {
-    "DefaultConnection": "Server=localhost;Database=DSCatalog;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
+    "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=DSCatalog;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
   "MessageQueueConnection": {
     "MessageBus": "host=localhost:5672;publisherConfirms=true;timeout=10;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://localhost:5421/jwks"
+    "JwksUri": "https://localhost:5421/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   }
 }
diff --git a/src/services/DevStore.Catalog.API/appsettings.Docker.json b/src/services/DevStore.Catalog.API/appsettings.Docker.json
@@ -13,6 +13,8 @@
     "MessageBus": "host=devstore-rabbit:5672;publisherConfirms=true;timeout=30;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://devstore-api-identity:5101/jwks"
+    "JwksUri": "https://devstore-api-identity:5101/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   }
 }
diff --git a/src/services/DevStore.Catalog.API/appsettings.Production.json b/src/services/DevStore.Catalog.API/appsettings.Production.json
@@ -13,6 +13,8 @@
     "MessageBus": "host=devstore-rabbit:5672;publisherConfirms=true;timeout=30;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://devstore-api-identity:5101/jwks"
+    "JwksUri": "https://devstore-api-identity:5101/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   }
 }
diff --git a/src/services/DevStore.Customers.API/DevStore.Customers.API.csproj b/src/services/DevStore.Customers.API/DevStore.Customers.API.csproj
diff --git a/src/services/DevStore.Customers.API/appsettings.Development.json b/src/services/DevStore.Customers.API/appsettings.Development.json
@@ -13,6 +13,8 @@
     "MessageBus": "host=localhost:5672;publisherConfirms=true;timeout=10;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://localhost:5421/jwks"
+    "JwksUri": "https://localhost:5421/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   }
 }
diff --git a/src/services/DevStore.Customers.API/appsettings.Docker.json b/src/services/DevStore.Customers.API/appsettings.Docker.json
@@ -13,6 +13,8 @@
     "MessageBus": "host=devstore-rabbit:5672;publisherConfirms=true;timeout=30;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://devstore-api-identity:5101/jwks"
+    "JwksUri": "https://devstore-api-identity:5101/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   }
 }
diff --git a/src/services/DevStore.Customers.API/appsettings.Production.json b/src/services/DevStore.Customers.API/appsettings.Production.json
@@ -13,6 +13,8 @@
     "MessageBus": "host=devstore-rabbit:5672;publisherConfirms=true;timeout=30;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://devstore-api-identity:5101/jwks"
+    "JwksUri": "https://devstore-api-identity:5101/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   }
 }
diff --git a/src/services/DevStore.Identity.API/Configuration/ApiConfig.cs b/src/services/DevStore.Identity.API/Configuration/ApiConfig.cs
diff --git a/src/services/DevStore.Identity.API/Configuration/IdentityConfig.cs b/src/services/DevStore.Identity.API/Configuration/IdentityConfig.cs
diff --git a/src/services/DevStore.Identity.API/Configuration/SwaggerConfig.cs b/src/services/DevStore.Identity.API/Configuration/SwaggerConfig.cs
diff --git a/src/services/DevStore.Identity.API/Controllers/AuthController.cs b/src/services/DevStore.Identity.API/Controllers/AuthController.cs
diff --git a/src/services/DevStore.Identity.API/DevStore.Identity.API.csproj b/src/services/DevStore.Identity.API/DevStore.Identity.API.csproj
diff --git a/src/services/DevStore.Identity.API/Extensions/AppTokenSettings.cs b/src/services/DevStore.Identity.API/Extensions/AppTokenSettings.cs
diff --git a/src/services/DevStore.Identity.API/Program.cs b/src/services/DevStore.Identity.API/Program.cs
diff --git a/src/services/DevStore.Identity.API/Services/AuthenticationService.cs b/src/services/DevStore.Identity.API/Services/AuthenticationService.cs
diff --git a/src/services/DevStore.Identity.API/appsettings.json b/src/services/DevStore.Identity.API/appsettings.json
@@ -6,5 +6,9 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "AppJwtSettings": {
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
+  }
 }
diff --git a/src/services/DevStore.Orders.API/appsettings.Development.json b/src/services/DevStore.Orders.API/appsettings.Development.json
@@ -14,6 +14,8 @@
     "MessageBus": "host=localhost:5672;publisherConfirms=true;timeout=10;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://localhost:5421/jwks"
+    "JwksUri": "https://localhost:5421/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   }
 }
diff --git a/src/services/DevStore.Orders.API/appsettings.Docker.json b/src/services/DevStore.Orders.API/appsettings.Docker.json
@@ -14,6 +14,8 @@
     "MessageBus": "host=devstore-rabbit:5672;publisherConfirms=true;timeout=30;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://devstore-api-identity:5101/jwks"
+    "JwksUri": "https://devstore-api-identity:5101/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   }
 }
diff --git a/src/services/DevStore.Orders.API/appsettings.Production.json b/src/services/DevStore.Orders.API/appsettings.Production.json
@@ -14,6 +14,8 @@
     "MessageBus": "host=devstore-rabbit:5672;publisherConfirms=true;timeout=30;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://devstore-api-identity:5101/jwks"
+    "JwksUri": "https://devstore-api-identity:5101/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   }
 }
diff --git a/src/services/DevStore.ShoppingCart.API/DevStore.ShoppingCart.API.csproj b/src/services/DevStore.ShoppingCart.API/DevStore.ShoppingCart.API.csproj
@@ -11,10 +11,10 @@
 	<ItemGroup>
 		<PackageReference Include="Grpc.AspNetCore" Version="2.44.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.3">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

diff --git a/src/services/DevStore.ShoppingCart.API/appsettings.Development.json b/src/services/DevStore.ShoppingCart.API/appsettings.Development.json
@@ -13,6 +13,8 @@
     "MessageBus": "host=localhost:5672;publisherConfirms=true;timeout=10;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://localhost:5421/jwks"
+    "JwksUri": "https://localhost:5421/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   }
 }
diff --git a/src/services/DevStore.ShoppingCart.API/appsettings.Docker.json b/src/services/DevStore.ShoppingCart.API/appsettings.Docker.json
@@ -13,6 +13,8 @@
     "MessageBus": "host=devstore-rabbit:5672;publisherConfirms=true;timeout=30;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://devstore-api-identity:5101/jwks"
+    "JwksUri": "https://devstore-api-identity:5101/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   }
 }
diff --git a/src/services/DevStore.ShoppingCart.API/appsettings.Production.json b/src/services/DevStore.ShoppingCart.API/appsettings.Production.json
@@ -13,6 +13,8 @@
     "MessageBus": "host=devstore-rabbit:5672;publisherConfirms=true;timeout=30;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "AuthenticationJwksUrl": "https://devstore-api-identity:5101/jwks"
+    "JwksUri": "https://devstore-api-identity:5101/jwks",
+    "Issuer": "https://devstore.academy",
+    "Audience": "DevStore"
   }
 }
diff --git a/src/web/DevStore.WebApp.MVC/Configuration/DependencyInjectionConfig.cs b/src/web/DevStore.WebApp.MVC/Configuration/DependencyInjectionConfig.cs
diff --git a/src/web/DevStore.WebApp.MVC/Configuration/IdentityConfig.cs b/src/web/DevStore.WebApp.MVC/Configuration/IdentityConfig.cs
diff --git a/src/web/DevStore.WebApp.MVC/Configuration/WebAppConfig.cs b/src/web/DevStore.WebApp.MVC/Configuration/WebAppConfig.cs
diff --git a/src/web/DevStore.WebApp.MVC/Controllers/HomeController.cs b/src/web/DevStore.WebApp.MVC/Controllers/HomeController.cs
diff --git a/src/web/DevStore.WebApp.MVC/DevStore.WebApp.MVC.csproj b/src/web/DevStore.WebApp.MVC/DevStore.WebApp.MVC.csproj
diff --git a/src/web/DevStore.WebApp.MVC/Extensions/ExceptionMiddleware.cs b/src/web/DevStore.WebApp.MVC/Extensions/ExceptionMiddleware.cs
diff --git a/src/web/DevStore.WebApp.MVC/Program.cs b/src/web/DevStore.WebApp.MVC/Program.cs
diff --git a/src/web/DevStore.WebApp.MVC/Services/AuthService.cs b/src/web/DevStore.WebApp.MVC/Services/AuthService.cs