Skip to content

Use HTTPS Security Service #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 17, 2021
Merged

Use HTTPS Security Service #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions TransactionProcessor.IntegrationTests/Common/DockerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,10 +307,21 @@ await Retry.For(async () =>

// Setup the base address resolvers
String EstateManagementBaseAddressResolver(String api) => $"http://127.0.0.1:{this.EstateManagementApiPort}";
String SecurityServiceBaseAddressResolver(String api) => $"http://127.0.0.1:{this.SecurityServicePort}";
String SecurityServiceBaseAddressResolver(String api) => $"https://127.0.0.1:{this.SecurityServicePort}";
String TransactionProcessorBaseAddressResolver(String api) => $"http://127.0.0.1:{this.TransactionProcessorPort}";

HttpClient httpClient = new HttpClient();
HttpClientHandler clientHandler = new HttpClientHandler
{
ServerCertificateCustomValidationCallback = (message,
certificate2,
arg3,
arg4) =>
{
return true;
}

};
HttpClient httpClient = new HttpClient(clientHandler);
this.EstateClient = new EstateClient(EstateManagementBaseAddressResolver, httpClient);
this.SecurityServiceClient = new SecurityServiceClient(SecurityServiceBaseAddressResolver, httpClient);
this.TransactionProcessorClient = new TransactionProcessorClient(TransactionProcessorBaseAddressResolver, httpClient);
Expand Down
4 changes: 2 additions & 2 deletions TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="1.0.5" />
<PackageReference Include="Ductus.FluentDocker" Version="2.7.3" />
<PackageReference Include="Ductus.FluentDocker" Version="2.10.7" />
<PackageReference Include="EstateManagement.Client" Version="1.0.10.2" />
<PackageReference Include="EstateReporting.Database" Version="1.0.13.1" />
<PackageReference Include="EventStore.Client.Grpc.PersistentSubscriptions" Version="20.10.0" />
Expand All @@ -17,7 +17,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="SecurityService.Client" Version="1.0.6.2" />
<PackageReference Include="Shared.IntegrationTesting" Version="1.0.5" />
<PackageReference Include="Shared.IntegrationTesting" Version="1.0.7" />
<PackageReference Include="Shouldly" Version="4.0.3" />
<PackageReference Include="SpecFlow" Version="3.5.14" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.5.14" />
Expand Down
5 changes: 5 additions & 0 deletions TransactionProcessor/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ COPY . .
WORKDIR "/src/TransactionProcessor"
RUN dotnet build "TransactionProcessor.csproj" -c Release -o /app/build

# Sort out certificate stuff here
RUN openssl x509 -inform DER -in /src/TransactionProcessor/aspnetapp-root-cert.cer -out /src/TransactionProcessor/aspnetapp-root-cert.crt
RUN cp /src/TransactionProcessor/aspnetapp-root-cert.crt /usr/local/share/ca-certificates/
RUN update-ca-certificates

FROM build AS publish
RUN dotnet publish "TransactionProcessor.csproj" -c Release -o /app/publish

Expand Down
9 changes: 6 additions & 3 deletions TransactionProcessor/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,13 +331,16 @@ private void ConfigureMiddlewareServices(IServiceCollection services)
})
.AddJwtBearer(options =>
{
//options.SaveToken = true;
options.BackchannelHttpHandler = new HttpClientHandler
{
ServerCertificateCustomValidationCallback =
(message, certificate, chain, sslPolicyErrors) => true
};
options.Authority = ConfigurationReader.GetValue("SecurityConfiguration", "Authority");
options.Audience = ConfigurationReader.GetValue("SecurityConfiguration", "ApiName");
options.RequireHttpsMetadata = false;

options.TokenValidationParameters = new Microsoft.IdentityModel.Tokens.TokenValidationParameters()
{
ValidateIssuer = true,
ValidateAudience = false,
ValidAudience = ConfigurationReader.GetValue("SecurityConfiguration", "ApiName"),
ValidIssuer = ConfigurationReader.GetValue("SecurityConfiguration", "Authority"),
Expand Down
4 changes: 2 additions & 2 deletions TransactionProcessor/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"HandlerEventTypesToSilentlyHandle": {
},
"UseConnectionStringConfig": false,
"SecurityService": "http://192.168.1.133:5001",
"SecurityService": "https://192.168.1.133:5001",
"EstateManagementApi": "http://192.168.1.133:5000",
"MessagingServiceApi": "http://192.168.1.133:5006",
"VoucherManagementApi": "http://192.168.1.133:5007",
Expand All @@ -41,7 +41,7 @@
},
"SecurityConfiguration": {
"ApiName": "transactionProcessor",
"Authority": "http://192.168.1.133:5001"
"Authority": "https://192.168.1.133:5001"
},
"AllowedHosts": "*",
"OperatorConfiguration": {
Expand Down
Binary file added TransactionProcessor/aspnetapp-root-cert.cer
View file
Open in desktop
Binary file not shown.