diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..7847b419884a776bd42109fc8ed55d2a43264ecb
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,21 @@
+include:
+ - project: 'fit-connect/pipeline'
+ ref: main
+ file: 'reuse.gitlab-ci.yml'
+
+stages:
+ - lint
+ - test
+ - build
+
+build:
+ stage: build
+ image: mcr.microsoft.com/dotnet/sdk:6.0
+ script: dotnet build FitConnect
+
+test:
+ stage: test
+ image: mcr.microsoft.com/dotnet/sdk:6.0
+ script:
+ - dotnet test E2ETest
+
diff --git a/.reuse/dep5 b/.reuse/dep5
new file mode 100644
index 0000000000000000000000000000000000000000..f530c5364ffd7b1f6bcc973b1df087f33fc1b8eb
--- /dev/null
+++ b/.reuse/dep5
@@ -0,0 +1,13 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
+Files: FitConnect/* DemoRunner/* BasicUnitTest/* E2ETest/* EncryptionTests/* IntegrationTests/*
+ MockContainer/* FitConnect.sln test.Dockerfile Test.pdf version.sh FitConnect.sln.DotSettings
+ README.md CHANGELOG.md *.md Dockerfile
+Copyright: 2022 FIT-Connect contributors
+License: EUPL-1.2
+
+
+Files: .gitlab-ci.yml .gitignore .idea/*
+ renovate.json checkstyle.xml config.yml
+Copyright: 2022 FIT-Connect contributors
+License: CC0-1.0
\ No newline at end of file
diff --git a/BasicUnitTest/SenderTests.cs b/BasicUnitTest/SenderTests.cs
index e824755cf22491380dab5cd161d3f1e15f6e3436..46a29fb6ef3c506dd96cd5c2e976c498bdbf565d 100644
--- a/BasicUnitTest/SenderTests.cs
+++ b/BasicUnitTest/SenderTests.cs
@@ -41,7 +41,7 @@ public class SenderTests {
.WithDestination(Guid.NewGuid().ToString())
.WithServiceType("", "")
.WithAttachments(Array.Empty<Attachment>())
- .WithData("")
+ .WithJsonData("")
.Submit();
})!.Message.Should().Be("Invalid leika key");
}
@@ -54,7 +54,7 @@ public class SenderTests {
.WithDestination(Guid.NewGuid().ToString())
.WithServiceType("", leikaKey)
.WithAttachments(Array.Empty<Attachment>())
- .WithData("")
+ .WithJsonData("")
.Submit();
}
@@ -69,6 +69,72 @@ public class SenderTests {
.Submit();
}
+ [Test]
+ public void FluentSender_ShouldNotThrowAnError_MockingServicesWithJsonData() {
+ new Sender(FitConnectEnvironment.Testing,
+ clientId, clientSecret,
+ Container.Create())
+ .WithDestination(Guid.NewGuid().ToString())
+ .WithServiceType("", leikaKey)
+ .WithAttachments(Array.Empty<Attachment>())
+ .WithJsonData(@"{
+ ""name"": ""John Doe"",
+ ""age"": 42
+ }")
+ .Submit();
+ }
+
+ [Test]
+ public void FluentSender_ShouldNotThrowsInvalidJsonError_MockingServicesWithJsonData() {
+ Assert.Throws<ArgumentException>(() => {
+ new Sender(FitConnectEnvironment.Testing,
+ clientId, clientSecret,
+ Container.Create())
+ .WithDestination(Guid.NewGuid().ToString())
+ .WithServiceType("", leikaKey)
+ .WithAttachments(Array.Empty<Attachment>())
+ .WithJsonData(@"{
+ ""name"": ""John Doe,
+ ""age"": 42
+ }")
+ .Submit();
+ });
+ }
+
+ [Test]
+ public void FluentSender_ShouldNotThrowAnError_MockingServicesWithXmlData() {
+ new Sender(FitConnectEnvironment.Testing,
+ clientId, clientSecret,
+ Container.Create())
+ .WithDestination(Guid.NewGuid().ToString())
+ .WithServiceType("", leikaKey)
+ .WithAttachments(Array.Empty<Attachment>())
+ .WithXmlData(@"<?xml version=""1.0"" encoding=""UTF-8"" ?>
+ <root>
+ <name>John Doe</name>
+ <age>42</age>
+ </root>")
+ .Submit();
+ }
+
+ [Test]
+ public void FluentSender_ShouldNotThrowInvalidXml_MockingServicesWithXmlData() {
+ Assert.Throws<ArgumentException>(() => {
+ new Sender(FitConnectEnvironment.Testing,
+ clientId, clientSecret,
+ Container.Create())
+ .WithDestination(Guid.NewGuid().ToString())
+ .WithServiceType("", leikaKey)
+ .WithAttachments(Array.Empty<Attachment>())
+ .WithXmlData(@"<?xml version=""1.0"" encoding=""UTF-8"" ?>
+ <root>
+ <name>John Doe</>
+ <age>42</age>
+ </root>")
+ .Submit();
+ });
+ }
+
[Test]
public void VerifyMetaData_ValidData_Fine() {
// Arrange
@@ -85,7 +151,7 @@ public class SenderTests {
}
[Test]
- public void VerifyMetaData_MissingLeikaKey_ThorwsAnError() {
+ public void VerifyMetaData_MissingLeikaKey_ThrowsAnError() {
// Arrange
var submission = new Submission();
diff --git a/DemoRunner/SenderDemo.cs b/DemoRunner/SenderDemo.cs
index 8242b072004d9323bbff923c217fd143eec5fb4a..01e7bb926a7b6209f52ba01b9aba3e97af0308ab 100644
--- a/DemoRunner/SenderDemo.cs
+++ b/DemoRunner/SenderDemo.cs
@@ -1,4 +1,6 @@
+using System.Threading.Channels;
using FitConnect;
+using FitConnect.Encryption;
using FitConnect.Models;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
@@ -19,7 +21,40 @@ public static class SenderDemo {
.WithDestination(destinationId)
.WithServiceType("FIT Connect Demo", leikaKey)
.WithAttachments(new Attachment("Test.pdf", "Test Attachment"))
- .WithData("{\"message\":\"Hello World\"}")
+ .WithJsonData("{\"message\":\"Hello World\"}")
+ .Submit();
+ }
+
+ public static void RunEncrypted(IConfigurationRoot config, ILogger logger) {
+ var clientId = config["FitConnect:Sender:ClientId"];
+ var clientSecret = config["FitConnect:Sender:ClientSecret"];
+ var destinationId = config["FitConnect:Sender:DestinationId"];
+ var leikaKey = config["FitConnect:Sender:LeikaKey"];
+
+
+ FitEncryption encryption;
+ Dictionary<string, string>? encryptedAttachments = null;
+ string? encryptedMetadata = null;
+ string? encryptedData = null;
+
+ var sender = Client
+ .GetSender(FitConnectEnvironment.Testing, clientId, clientSecret, logger)
+ .WithDestination(destinationId,
+ (k) => {
+ logger?.LogInformation("Received public key: {Key}", k);
+ encryption = new FitEncryption(k, logger);
+ encryptedAttachments = new Dictionary<string, string>() { { "", "" } };
+ encryptedMetadata = "";
+ encryptedData = encryption.Encrypt("{\"message\":\"Hello World\"}");
+ });
+
+ // Return the public key to the JavaScript client
+ // Come back later with the encrypted data
+
+ sender.WithServiceType("FIT Connect Demo", leikaKey)
+ .WithEncryptedAttachments(encryptedAttachments!)
+ .WithEncryptedMetaData(encryptedMetadata!)
+ .WithEncryptedData(encryptedData!)
.Submit();
}
}
diff --git a/E2ETest/E2ETest.csproj b/E2ETest/E2ETest.csproj
index 974a92a07342e19b27e979c3c468d7658703bc45..4881ea4ea7b9544e4aa7973b007a2f3141b5bead 100644
--- a/E2ETest/E2ETest.csproj
+++ b/E2ETest/E2ETest.csproj
@@ -9,17 +9,17 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="FluentAssertions" Version="6.7.0"/>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
- <PackageReference Include="NUnit" Version="3.13.3"/>
- <PackageReference Include="NUnit3TestAdapter" Version="4.2.1"/>
- <PackageReference Include="NUnit.Analyzers" Version="3.3.0"/>
- <PackageReference Include="coverlet.collector" Version="3.1.2"/>
+ <PackageReference Include="FluentAssertions" Version="6.7.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+ <PackageReference Include="NUnit" Version="3.13.3" />
+ <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+ <PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
+ <PackageReference Include="coverlet.collector" Version="3.1.2" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\FitConnect\FitConnect.csproj"/>
- <ProjectReference Include="..\MockContainer\MockContainer.csproj"/>
+ <ProjectReference Include="..\FitConnect\FitConnect.csproj" />
+ <ProjectReference Include="..\MockContainer\MockContainer.csproj" />
</ItemGroup>
</Project>
diff --git a/E2ETest/EndToEndTestBase.cs b/E2ETest/EndToEndTestBase.cs
index 4052e4d4985699624cb5be89e707846f677134eb..85bc6975295708efd63b20c45011c519d867edea 100644
--- a/E2ETest/EndToEndTestBase.cs
+++ b/E2ETest/EndToEndTestBase.cs
@@ -22,7 +22,7 @@ public abstract class EndToEndTestBase {
Logger = LoggerFactory.Create(
builder => {
builder.AddConsole();
- builder.SetMinimumLevel(LogLevel.Debug);
+ builder.SetMinimumLevel(LogLevel.Trace);
}).CreateLogger("E2E Test");
diff --git a/E2ETest/RejectSubmissionTest.cs b/E2ETest/RejectSubmissionTest.cs
index 69ea1e2d8f7dd82cb221787df1b56db8731b791f..70c3b5b5f6ccaa54b98d7952019ca3ffe4f7ece9 100644
--- a/E2ETest/RejectSubmissionTest.cs
+++ b/E2ETest/RejectSubmissionTest.cs
@@ -16,7 +16,7 @@ public class RejectSubmissionTest : EndToEndTestBase {
var submission = Sender.WithDestination(Settings.DestinationId)
.WithServiceType("Straight forward test", Settings.LeikaKey)
.WithAttachments(new Attachment("Test.pdf", "A simple PDF"))
- .WithData(@"{""data"":""value""}")
+ .WithJsonData(@"{""data"":""value""}")
.Submit();
_caseId = submission.CaseId!;
diff --git a/E2ETest/StraightForwardTest.cs b/E2ETest/StraightForwardTest.cs
index 19a3000b38c5d3a3d60fa82ef2dfff4c3d6f50e4..272561f0c10f3bb5d07b05fb22dd0cbe74351ade 100644
--- a/E2ETest/StraightForwardTest.cs
+++ b/E2ETest/StraightForwardTest.cs
@@ -4,6 +4,7 @@ using Microsoft.Extensions.Logging;
namespace E2ETest;
+[TestFixture]
public class StraightForwardTest : EndToEndTestBase {
private string _caseId = null!;
private string _submissionId = null!;
@@ -14,7 +15,7 @@ public class StraightForwardTest : EndToEndTestBase {
var submission = Sender.WithDestination(Settings.DestinationId)
.WithServiceType("Straight forward test", Settings.LeikaKey)
.WithAttachments(new Attachment("Test.pdf", "A simple PDF"))
- .WithData(@"{""data"":""value""}")
+ .WithJsonData(@"{""data"":""value""}")
.Submit();
_caseId = submission.CaseId!;
@@ -47,7 +48,7 @@ public class StraightForwardTest : EndToEndTestBase {
status.ForEach(
s => Logger.LogInformation("Status {When} {Event}", s.EventTime, s.EventType));
}
-
+
[Test]
[Order(40)]
public void RequestSubmission() {
diff --git a/E2ETest/StraightPreEncryptedForwardTest.cs b/E2ETest/StraightPreEncryptedForwardTest.cs
new file mode 100644
index 0000000000000000000000000000000000000000..a7c31756b221fadee5cafa2d8f6dab3a5d7eecb9
--- /dev/null
+++ b/E2ETest/StraightPreEncryptedForwardTest.cs
@@ -0,0 +1,88 @@
+using FitConnect.Encryption;
+using FitConnect.Models;
+using FluentAssertions;
+using Microsoft.Extensions.Logging;
+
+namespace E2ETest;
+
+[TestFixture]
+public class StraightPreEncryptedForwardTest : EndToEndTestBase {
+ private string _caseId = null!;
+ private string _submissionId = null!;
+
+ [Order(10)]
+ [Test]
+ public void SendingSubmission() {
+ var submission = Sender.WithDestination(Settings.DestinationId)
+ .WithServiceType("Straight forward test", Settings.LeikaKey)
+ .WithEncryptedAttachments(new Dictionary<string, string>() {
+ {
+ "a2c0667a-8162-443b-a08a-a80936709ba0",
+ "eyJhbGciOiJSU0EtT0FFUC0yNTYiLCJlbmMiOiJBMjU2R0NNIiwia2lkIjoidnI3Y1dLR2wtZzRXYV9DUkdvd05oQVlXX2dRYi1ha01iaWlneE4wRWtESSIsImN0eSI6ImFwcGxpY2F0aW9uL2pzb24iLCJ6aXAiOiJERUYifQ.dIJJGlWOaV5HqJxcLUyHngWwE6fLk66iOvrLfbP8pLfcYcuPU6HFdScVKBWTWAtWCBO62--uEagzW2kmbWnBcj8eZo6Nus4JLLq28Bk03S3ZXyMjHy4wHaHW_oXdSogSi5KJLEr-xR6fj3ztAmReNwa3zRmKb7VncknxtI4AzQuC3WEO4SnwAhUJYCxzNoFf7ewgjkNJcJK5un9ZlJe6Xljbd9RGQ47FnPbKSqQDlBFVeapwK6WjZmjQktpxQN2sROAcjP1xeYxGlEDo5OmLJ-Nd-QbQ3eTn8d5rfT9pyTZiG1Mm7-DsmtQCM-KHBsygQR4Zk7PxD6tuOvwo0YthiC_aCxIa4KtJRdL2Tk-YUv9QMYT9pKrHlXK_v97mgsmNWU8jp6MKSk-7baKTGqlXB9wMgGpOBzTPulGpaYaPn9QcoGg_xSrL6m781RYkYDsiUfW5QBxfbiaWhAKbIsohmA6GLfdAZaTFJM7Ic4Cryh2Rzh8CMI13b5OZxZu0XoHwM8d5G7cYI5S99S0cBy6V4OMMJSvwvKXrAldUkR83nZrJMAT7O78GmeXWWNvmO2zFeXFWv6HEikd12EaZ472qy2pMmotKbW4VdX2Mp3fg67ECdn_9DjmMdIdvcr-9hrvxlDVerpZA71wZ5SX2p37KGTkTWpijJ99qHKZLfvkQumg.byGlrhJG-rwiSjyv.uofMXOJKsnBvY-NUs408UKyKoR2hlWom_CM5aXHS67i5V64WNkt_XcEUHbdGmJA1J-y-AGutVjrO8O6OGC8XWT_lSFMCymo62MCLr7PPr5hP3U7ZZJGg8UD7dwVO9aOL_Fd3IWVI3pW_GgmIiub72XWj0oenbvpJ2eegfo_jgAwZJVxt4eJe0K9YKoWKySp16Y7UQymb0LGtib1udacmJ4er6MQQ6vGVSiYUDQi9GmDhflEPvDRx7lHbRdTLEtLJ7QOMtHY6gdMiq_aZokvSoLkjmkygDg94nkuez3K3S6eMVBGm_w550DN8OI8Gdub0D7QsLcLbqBFAm-vF0lIyhRnBo10edMg6_0LL88jJfBzQSrvQqDZG6b3N-R-HnKw7BnAvZpIkXQkXqyWGNu2cw-SBammi_B1Jox5QfDOwxIVxNZe8Zvqth6tvEH19hean71NdERWuLVgLgwrnlkuy1smbCpG-oLBVytbEaM-ZcZw-y89E7KWcGti7rIV8f8GDOuaX-7ZgkFB3pk9IIg22-SwYGVG6aSSWEPLIrR0fxAs3ABiCmiKjTD7Kkb57LTZAq1NB1RZxOzlRAk3_Ji64BadmonErSanwT1ZT58Nv5WMYxgTtjOyvZOYMoRzDZbvFD-5W-oxXSvSOsewN32LdBkyidF-56b78fAAeB2K3609G5Kvl-vWD9ZsUJ5AaK-gQBRFW3CO3qGmNsgGdT5VNgpHIwUjerClLNf6H2Q8uxQdkOxLarQQMc73jbHXEqtTrt0U3-VFowNVsG6_Zh4MoCZer4iHhToa0Mpl9Ap6AyursYtYYrvATZ3sr82K_T8Un1R9jEuPfAnMTSRzBoNHRcMfGT6vSRoUwUk-KXKfqyUk1k7miBvBtl8_t1Wl8_dX7Y1c6031Pv2MW0b7Sl6GTG4fvPuCdL29GYzKMZwyCOn4NnNWfA16b8l8j6XI5VyD7dxqroIVzkb7IxF5zLDa7h8-riH6x-zaE81s6fmFEuOoDgHoFENSs-1vZg1uP27rBKgfjjptTdLvIlrfUPeTaYv9dJAczymygg2_YeTXStH_B4vkGKfimQCJsV1xi38sVCsa1ZfLFg8l1X_wFbegxWMy43jrI8PuDbAy778MxaOfB2YV7uBnmbdiB5P09FqmD2Kbys2AGBOIK_XysKGZrqNGBpp3FsMK4qrfEhj-yPsnZWsmJ7t_5J9TVV5nxJYdKk5DW9d3m8B9ur49vveYQHabMiwOwbmnTSy6c5lnVPT_XRhpUKqVH--ugF6_GkiLfkQax0bZSGo2Z42JMfWHqURIEC3dSs0AG-yf7Pnqew96-t_PYKv4l4-fOt3VYiedj6qDXwt08Qkmk4MCtvud_uqVJMkHrSyR6EfJQSvRMBhquzW5G6LvAvNe_nsiRcQluLAAqca4GRUREFR_AQDg3gAUuWln2P0P0y0uqiclFjnc-4VUAywjVnId8u1iCqxlLA1YntpL6jMGXjyMFlT_BjpR1Vjj8lSC6qPVDDrW5lPEHa4lTXcBes-AYXLTKBgxSti6Ya723kbv5IfqpIizAmVVTwI3j9DD4FrbbC0FHfxjFE4sJF4hfbiaAUCXqFwflFeKnNbrznIb_k-VU4Cyr79USkEmiVpsVwrWAu7FKyNgljJ7oULtGH6maeFCiU6ugt-XGtL9nAzcpC0VBs_buqM0f3VPYaIj0mZvctuqS83BbsD_f0H2dUjlQ3ko783YMf4jQbcB4AxAhnc_Gg_pNDzY2jTRC6Qk3pesjGrCFbaQEfWJCAK709msIMASmCDwxNo45r0Ru9FywNErWP5_Om8lkhgtPA5T0PgO3_2Ko_eYbw5ZZybU7GUuoH5gXgpMniuYFZaYVI2u6rCHMwSxPbCU3kGV0tNAaiLxim7zpk1DjCh7rkWhP3EQX4rryEeAqR90SShLkEmU4qAJvxq2nuGoGlY7ZaUvMXc-1k6NwRBr9jKgNNM_ryxraglwDx4EWghlQYUK9R4X6X7XjXIi7c1MW7bV9vah5DsozA346aKJacrLha2hC7ZGVYTtUAZNXRTEKddK1rPiBKgLCV5m1EVtbA8-MF1NcPGqj1Q9n7zO70mnB2sXjOc47i4HhlcrJBmoKZbyOl-GsBT3GDSeKhALM-GR-Bx7aX_pbli-FPK-SFBR22FuQLKrSD0oPCeYI-PtrxwMcOA-K7ilyXwRYfMRLQnIH9ftPMmmWAhoGTM4Ze-MT-L0MBkM9kAX3BlWrP1ChfLsu1AL18jYyDhJY0K_56_laf0jxNSEuflLIPoiqTy1-n3unjp40mN7dIS1qw2w43k_wfGd-U-6_db0bUfnKbv0SIew5sAWwcF_P9jmrm1fC5k5YWrQzVlC6CRItIJOd5pARZBjkNCWevNxHEz_1mv_U9gcTFP_8NLTEZTwMmoyIx3yGxsW-tsd5VNQH_l05xEytek8vT3qvCV5-NL9xGUXXMU0pyqKw_SYPTcL8eEptnCST13cWoIIHvdxAsFEeRKx5jQbL4qXKXe6CZPu1QlrZO2RVEh-aYanL7AfyDJlfZc352vv1-oXb9GnUU60Z4UOSMp-p4Awuam6XXgDTUz0B4Mjg7tl5Ayx78LNVvu3lsC_WyKK7OS8po8LBWBYz6ueI-YtVNfLkqx1D_AZo3pJwxMRXQqJdxF8pT_cdoyPF7aQc2OAMkL5l-Nt8brCluz55Ykc_h4-juLd-cAAtyBzybvlc0gFf1AoOAxLWs8kZql2ZXzqSNiFcv-OC_5pC1GpTvzK1b_O6tUZAw53n3UTxYZ7h3hrVOHc9UWqCiLzXCpvtHHu5wNHENZ5MAlGYUtXfmniQc9_pG0xqVWN_I2NisiWOay6AQ802Syr2k73AeIP6wKKxoclygQMKUy_guHntG_rlBJf-bdbqbgkUun81mHLddRvIcz5mAr6vsO11HH3oDQ6kqQXmBOOWENlw0cr9SFev731M0zBi3QsIvEbX33Pl0ZRFXBfC_Uo6xzFTmsxVEaT4IyaCs42RepCMCDkpxqq-vNyiBZC_OlM8mLWpxlodQtqymAAF-lL0sCpdEaPsBbLUtZjRu-4835tAPPs-sLJ0vggvtJioj8YexskI0gQdU2tyXBdI5_1guIJkPJjUI1ZiwBwXPxFRuG_lxHxXUfs9Ho_0PmCQVPqx4hGZf38RTtWYM8o3xbEl8JwTGj6BN8Z9j7roaS4YSeUjSFwgYinqOsqEqCtrjnsgl4ZwCU-KtG-pXNdt414auPO-lnOK51EjGrE0ZI-KrNcgvRJjUwEpx_wWyh7pXNuD1MxkmnOJwLm_FYV4kYx89mBrS9Kn4iBM8ekUUmrH7FVd1JJcoeLyE9Q9Rlg4j2tkWtM6ttujXPBQo6Ot5JpEIFcamwVuoX4Lf0qqOB5yC9O3863SBg-5aAm64y0o2BDfW9yxtI5tVpFC6MzFbUpiLX8DdzYiDPmZLOqcF1xGYYBtzTnGmhG9aILfjyp85lECinyTnT6hlSkgNJnw3qIycB-mHdBn7hQ2lRrqjaM4cZyM1PHAeti8XCleEBcyb31aRWC4V9WYacSpXOmmEd1EcgtstNkpPloMudyYwVvffbSwdKXMjM9bv2MKxaymPgCDdKx8QudU7jxE72ua8qYHlQzyzUgJvKfiaUn9Nw18rpIyRSAi357r2xc_EhDhwuMKG2LIEQ30IAI4ymJL7PcaapASPfc-0HISdmtiLqqhwPrXZv4UnFRKMYYj26gqZeHw4OqoNcdGsVR6LuCEK3MP6_KHe6SE0wPdSS0OyH_xY1ylLVxrAgeL3NnHQDTW14QAXTOH1troCChG45672OLTCZnR2WhyyG1HbJatHzEzoS9-Fem8PA0IayiCYid1CnlILxWDNL_ZYEdatdwbxL1ZKP6hlZxRpYjpDIu6B-Hq2It2g1nC26uhggf1hO3K0N816MBTBI7G72WOJRDZcxFNjnzHJS8F9krWuYrrdwHEWWmXAE7yS7UmMzSzxYUMh6PyCX6U9dOfoyN5SvzabvVVMbbjomxIm8DCRLE8FG4dmwwkqNFdf8LAZWjQd3sra7_NafaJAlyKhNnrrr7dC1gtzloVaEGQutVwXrJYbNYr5FTPeT9Mr1YU6MVt-o8id5ZzaOWgTyBPNXDYJj5SlismA8GavpVf1HmAg_z5vTZkfGWrRFJFTNESLyy9-wrqJXszT478VTigmFBHg79-VNqGXS_YwBbm3XQVyPz1l0HYKOnutBeaeBhoAUCbPmHi4f_i2-ObGOWBVScNiMK3YZ7yhfp4wHZvzdBa1WeQOo12KlOAe__GCFB-IppF2oN5msJO4kLSAPZi6Dzwuih84b9ZcJlqnSWKnUi0EGuNlHa4qTuvV5h22D5Lj0tmQxf6jay9uJpgURyhtR_b2-fvvLqoniXslEUd45Ussh45OMPNAhhNKYIhZnRJKm4SU8FKebi_KOwAs963V_eZyzQxtfRRrXiaFrj6kRzlX7DwhxzRyQYCzA7iHWBqvsDrjJRI-tRQLYtR3A5tuSgBpMt1oM9U-XMBLsKvz1iMF23DAY8jlnpOy9cqiIoAeeJAZzac7fRbqim-qKiA-iJHaO_FBtf6bTVp37m0Um9TRuFWVCHy797dTEMIWsvz8NQjpY4NGQN6q4zWLkT0jnbWeNU6Y0N2fmY3aE5S059g3ccoCWJg2I7bhTEXOm24p1HF_Hvord22nwNMIZWDHmMwjHFW43y-UsdchYsX3zJqRUToxyW7uxV81coFI0GtymAOR600R6nYpkfUOA5amFEw9YQ_DpbBqpf2D7oeXL5mD3aIwVWzwINdmrfo9q7GObeZ5VCK85hts6fTbPnlPQqpts2noX_ZJS8KiFRL6BffBQ18kWQ8sSc2mT5xzeHm3tJCNj7hngbz1iwKwxsJS6MBFND6GY_JAfi5XKVAvQs08fpcwtn_0MK9vC9fZCj8_zSUbIuxB1qEA5LJUKb2R8IShI6y_u6a9QtZZRxglc9WBCgZJYtVK6DjoyQU1gnYbSjzSFNbDsVfaCPNAL6j9ohUBqHKDCesXvxAhNmOsrv9mpVnRGRlFNYNDcFd03GsPpeNMfIgHzHTsrfa2msilSS4dfpaJ2SW4aBaCp-XuOBZEwKf4-UUe0WdmlWKZYFZpbCZIn_jm2FG5YORW11yxEHAGA27XmoNMbQ14kMh40qpuLXdSjqjatL4do__P3PS9Da3s_HygtYotHBGA0tVJxEm3nXoTwqEqS3Ff3bhpRJy7rBO7v9uPO8Fpakj4wX-vJ-uFhamApXaQG2gghTfqtgLRatrl6ruHKKykMnE96fs8Pv5O7jmxBz094yoiuA8lO8n33ymHM_c9rFY1L8RbYEIP4AIJ2r-b3ZgGGPM-kQ5WLMKU26TRHnXcUKnpSMR5MF_eKr2eBnXE2bFW72cIVABSdOA73X7IVoR-mRfBPtE4FPGkjqjgrvHMSULItFMlbKTvjk1XzjD92kgTy0AnwwxgPw346_KY0OSkUP8O77ZZhDVYPuy7SEQ-98lquRV3HCOEblmiJYMCNUgEKjC-m0AnMx-n3cyrnD5GtWTAxirBj2CvE0C9TXkcF6s9V2xTEHi65y3zvwyQqUuGnKat_7K61apmePps4l7yr-r5aoQKaABG_tfj_-T3jlqITxFgxMQAWRJXJSPXUxPEp-rUi6_bmHbNXARGjLvAePLsiy79QhkrWYCQES1E11aP6BxG5vHW9Cti7yT7CcRwucKsUA3GQJWa7u4zavl2_XrF6pBTk4JZD9KjI3UfHDdyS2ueA-lx7qLSE0BFEXqpjEEjtJBmzfZQR4LGFH6k8G0hsBYV7WcgEYelqwPwCIUqomb8lRLkLnokwbeuey0gSbekfec6csMABwwYgJoyR12abmS6qhxsVlTQ198yzF_doJm_jJkjE56p94_XKqsdvgVLE6HLCSAsmJUCc-nWDE1S0EHSKC-7LtUyGjfvGQH058M9ub4xOojugaZvj4RHStw9pE3_uYgDNig_PviRnO85Z_05PFehcVUJZUjPjnSnkcpqTJTWVxsZ0okfLvwieSiGHM_VFteGQkyg9-YKKjRlQtRV4rsXCVlIInVXyXgohsm4kV8AwnXFx2r2N3BP5-tpd-J1v4Vmh36MuCuIZyLxlN-n6YXIoOr9u_jiVR_5kwG35fnx2KZMcx663amZxo1EHYwseYIvxVdVGnLkcmMu1syulCiPthTxcuuMZSsF4ZW7wJ5wf6HIzzqbFy1O-lpLb75tRsl37ArlovWEW5tANSjcVoAm2qQtBkhJxwVeqAfCd7djiRtLf93NPdeu6tzDKqtR9bljGx62Fz9iIIBKlpUXJiky5pq0HE9FlsntWG4Xwb1elQ1O0bvdDtD-0sWKc60eis-bP3ZNsqrtdSDW1py6WOIvStIE589cD9L82qxmDQJ3K1xEl4B_PzuvCbFugSqegDes7DDdYZOi1f2TCdFxERUFmeIYnDnJ1qnut8GSPrccG9Mj4O01akCJxn7cNjnvt9kvZUz0qXYzya-ZsvO2KcZTjDKYxvLsQj-KKYYp59PFiB3ePjqEvDmvG9XNnJM3isCCM9jUikzlGX2yFaveMH9KlYd22PH6k0MW_UV0qoN7mNg8-5OfvAZz09ZgeDJLk7c2sJiBLpMhFs9gCHlUC1g735-P2LaplMxdozYJTRKgaja9EN8BBr6eAz1BRTFiSj2G_eT0vUNc5oCSc_Z3ea7wZZvPZeuFwHU9qcCQ5vOsnioZWk3iAg0eavqGi5_P_HCXSLcvGXX2P0vosjN9rviRW6MX3ou2HjvRoia86w6kHBBuAkJW3uZVq3c6rKbjI7H7fURpJ2-mtOccNGnNwy1xb1VqYvq5-pDdpynQGucNs8FbcLkpFWGjU92E41yKDOCGP-ynSP8UEhfm5VPNmUhSL9SJOqAsjyTu9B0mcXV1j80fJiiyz_rl58J40Fuu9ISMjm6TUpSLjuiKMNWWwRitTlSboOas6uGnOfM5sVwpgJFgVBZHHv-bOG03t4xS3Zbjc9GkoVZITl6zVENu20iTNeWWyzi562mQMazc-PIOtWJbdDaNlUPO88PbQH9eZnmUGrOriV-qMvf-VH8D3oy48McR8CiAdz6pvAcwvc3eP6RvpmVt7RSXsrM3KEP140w1YllOhwYVwR2sQSvLDNSZSfzRarfN0QfE2MXCu6EbJBBB5sdM7OhhasaFUfJy-4z_gve9MsTAyASBNDodWK1ln4JdSJPyqBTziB4tOYjRigz_GLN1LnqJd88SBnf9GN2HrpWwDqlqxd7cgYPB6xAMJ2NZMGvpaIn70-oBNv-qTK3tyMXx1pdc0CDhfxbTt6hRT4oGRdi4LKRheaIIpsZU77m2-n-i_bSzX5qfw60mkRfjrVEYoUSP6yCWmj_OH7fLW8sSgXXKF_pS4yP296FUeX50hg7dOQNHTDUV5A52uQ-VYTEyczdUIrye2jVbcUvoAhJPRSjtBCrBQAHsBc4q4V931wosVW00BHmnL4S1J-r6ar-oQndtmiNqsNGCZfItbwMgG7xSf9H13FgeHnNRLguz86JCjGbeS2izK846rP1iGT1lPQHgJYwWG_imafcqUED35ON0Vh35GhFT8WVci9dhKGNrKli_tatufshWAGMOQhZC6azJMnZ3sya1sM7Grba_pIcdj68K3kh5sXfsAVoCEGbbx2K3HKEqCDzwYfqIA8SuW2kCqW_MS_gbb7nNlftDfXG2DkSyzE6OD2ZjTNN1DpC9iAxL8Lx1zeNcwzKGftPfjuVjaGS0j0xQgbKsRd9iuOvGK7Cw-W3ELYMjweOA7O7rgHwPesB-0j6gNJIbJq70PzL79vAGRSSvwVq04z0TTUhYQCWCNgTpFxp_QD0PKOiemD7-s2dHC2-E7DQYzHq_sgefCatUwkHuPKOvmQZ0AdNhKnAWLW0zyA56wbUvtywUD2y5T_6cUMPYXIQtpgCwa_8HgsBUeU_0lW9pFa7H9yzHlewrodtU_3rDnM2OTgF1QIaA9emwD4g1vx0pQ6V1rGGqqf46RFdREEFk0vfcTW19v-Hshyub6NUWhaOf4V-AvG--4kBaMTasxw8pPdIEriUkP4LdtqhdgYz9s14Xtl2Vz797F1-cDJoS2IOmm1pknHV6HNldVnEi1ZpX2_Bd7xxujTYUvShbVeqLfzNsTvEXmgbFMDciW-ywDzoAKQ3at5kdg4sZgq8l24Uy9kNNyWJr8acf2nw1JhZ-81siqnPWWBLZrxObUtDTslEtgNpV_FyYvAVKE3G0NIIDdfhXjMEMUf65mIHBScZth603GduFPQGHD8KEq2npRKUTRiJt3j_5Quhv-bgdW5-isbUZbZjORaxvUjug560AI7XG5SS2K6dfLqTD6bU3eoHyz8BirVxuwWFlHIk_7sGN_Tefu0_SuOo72m1diwBi4LqPJ9EYq0nGuWDlRDpLKZ1PSbndMOcFDQYxbHNHDaKdVLEVYZAlQVA3BA9Uf75gwAWbZOot3DYZIOdl0hgmIMJhX8EagYFJ7LhgCtztYTHmT2iyOk4to22fpmru5kZ43vt8MPNKgPJNu-x4bidXn24FbvI3MAkOJGNTBoItKb9SC1LRVUcDvFzwJNYXEXkhZef6kURVbCm2eD7SigBSdZw7sr9gmnickR76MYrytZDhAh6i8dZlmzeMhHGVzuxFsFR97XLXhOXWiaULZlq6t52aUztNOCa13Yy3iFqqtncZ-I_4D1B-5aJ3D3DAAjLAqG73BEqguqbNzKYmkg-Aeqne5fmnK621IMPZxHr5-fqthJOZ0Vydm3VT9ODrVvU5IpvgKss4U1AiYbvTtqkGkGICX253Nk_jh48BRxugT00ewwgSn84K9eqQIUCr0wpVvCeXLKGz0Xo-vu2FTzVGtk6deAfka7FiVKzdn_WvDKevEegMJ0G7aMGZB9zynZ8A-efuxDnpaPcd8qwsvKFGQcJmtLaCgGkWr-UGiw4dwWXUbHItaKZ5BQaSontpMKbWWxgPQaNWZq_-1tXTXi17mR64RPkpsKskP_G8L1yr6ccFc095sY4ZnZjOs_qWs3z53TGTkDuva1WPWap2z9nGhkZFj7sGpWs_mJhFZJ4Fs64Uw-plKXNazuzprrDExZXy5dHBoeiF9wYIU9LkFHZIKPy3Wzj8YbNvGzQj5gJaW1T9JXuegpO8DnjSVf1J0bLWD_m3ECuE-6iQ7UZZqkbsvQ0G2tPyPUlwQTNQvEpXSCJ8lYYV4N6OBbZ8G7tLpJTzaIVoqm9hmZDYTN-b2LJFsRv7zDD0uXWDbg6fY3wGY6Luhgi3PWNdK6IuDxwkTaEw6Aam9wsNiXu9_3n6bUySbsAm_wS_Edcnb-RI-eTSY0Q_ghqfj0qsFOV2Qn-iSpQ5jpbKqMPu-SlJGX2XdM3IbUypdPWPQYB4xCKBcSYh5yfxaSHDjxJ6ST-_L0RrKoG_tSVHVe872B0efmyu3GBGDVFS4TEIs3-fbDrOxIA37cw1CD1ORisYIJEfSwkJPwuuYOFbgqTv4IRijt2R8dPYQz59M9vwK8nDxTBV8nY1DuMIEsMSrS-IfpTn4RtzPC6JUudQ7wjubJX5Xa77AeK1b8qy3S5goAbhpl29HTJ3zHmEOWZ6xQzrHKiXicIGiiOe4C195EDs74ieMP6y_9nkK8hCWq3_oFld2lpu_azdPex9CZHboEN_dh9fIRGPP5g42VzyN2HXyuzG4Yib_FE1IPVTFZ8xj62DtxteXbrIryyDoJ0H9ZiRO9d0lJTEF8L9toL3ZrPR7648wb0U0XefBYDkC7l83lZY1NOaE1ma3XMWuqf1LJx9A2Cb45uNEFdWHSzxhrbnt0vd6NW7eImTxnqiKPrxGY5E-1a5O4OYdeaQlJdFQMCqinXA8VATa4dxos894J1ljDfFlSiqtzuYZcIGA9D2EBclR9ZgiJhktalDxafPYGkisqYaPd4w_hhCYkNdrDYCxXLKajghVlybjMH0j1jtk4GvZMq1Y3jXZVaVr2w0JsBrDY9Dafnb4a-uj_t7JacogRieq4BgTpuJncb8pCTjwK-fhV4R1syd18xBofY61NTJGGZsEkhofC0daUYCnKnqivZ8l6X3FGcTBlDNGkk0OqQIOxsXXn6JcK5LC12ey07xLY8fqvQP-D1yyXUjJk2DoxHOjyHKOdCUhB5uibh12MM-gLSDn9kzMu2iewUHAzOV_WumIWO_OZ0WYvMax_Ug9ifFFXR0RPPiSJTJgMnUzlldxoF7-5-AncCNUpwXkXcV8aIYW_6CCqctLQ5f01OeeOmwV4bCstAGrVmyjbE0tRBOlP-6lDTQ0gQNLBT_JR0gr6_p5BbCQjihcncXQMNYBBzmi4SLFJkU4jXbdxXteAJYQmIeLeoY8RGz-WJVYcZ7tIsCFZomC2ErgUH45Qd_qlS2cbPtlaFgvO0tEYHmtiOiTh3MHCwdBYFZvHfHBGHhffT4dnXQg58bLVEg5_01fZ5ioMXzaT5lld-_8A3vQbE1OSlqrGiQv2CUe5xCGctWUuxt6SE2CZ2h2R97jCPJHaWP38NMwEfEHib_iTl9Sviz5zadLUn-Mj4r9rj9gQz99A1rJYkuARRZd9wozIzhUtTXGUcHiveRW7cEvsPnZKB1yptdPJtsyHwrxWTwj-UVQ_tXVbKZnfTFrX35uN_LCS-8ZesBXn8xY7FxhiJB3MUoYekit2zDgEsJOrD5S_dj59HmPtNO6-KbP-3hwyK8z9jpKVrtqOzOZp5FUuPAQwSk__DsDvY4W-WV2pNlcx9Kf6X-7lKNBiLmzDZoFZ6ZFtj6ZjUux_HF84Lxf-D7A1_hQLhAsjFmUm0Ba0TKoEIGqwf7P9HhHFz2qryRUx7w0Zfjx9MyPPN8HmVw2VCER1I_BW8T9u9suEvjl3PILvcy67UG5VN2YEXqVO1kL1Nycu_lcVDWTAsPhX6isFt_tMbonDYDCv2w9-0K9BGNpEbshDp0saqxhbpS2_9F_1HnUdC7PVMVeIfhZX6FEVhWPo58ydn-FrddmTMoJlwcIN4wmzP17gxyzq_uk72GzwX3_SGvxUnTa2NYbfk96ig4zDZA-efi6YmByVSgB7RiFtm1iK7YhVkgAyuZqvCz10-nRDDRvg0rTcicgyFyOkF6zsbpsolIPCLlNm_7UDDJYJlHoYjUNzF5Od8WRjf9W2TTEQnw4anmBOZSNTQFVpxizrpGnmf7en7LPUB_HlIi2ZlZ1G3FwOmu7ysN__ejDJf3s0hiurftNAXk_Hx9FyYDpgrLMiRzfdf4ygdy30OeeLG1X4BNXBzS0RtOSASULh47uPu3C1tWvebu0vye47bMkyvO6KZD72NlF3lzdJV-u7XaFRPE4mhuthx_WB210GCcBB6n2H-u7izEq-BiU4UxMvn8VilZE1wsHsPg8rznXZ8Fh7C2epUzDjkjFgdBUVwVzZwLy_UgZffp2BTOyBJYbzDBi2EG9H4yrweOYZ6vFnRLyDlTk1r4jrnFsPXYBtsA8Oqq_aC5mHeq5Q4fD9fwQqOQA0qO6RCkpdpjgtUjUlIwsjVIywNQpt7qbjatPsakUKvb6YN4oRT5x3XtMur3FYu34oUrPvGXY6-Pt5Hu-pqHHds6pz_AAQ-MTSskYGQuXR8hhsYYzDMTW2HUolnaoMcHA4TbATe02TekQGga3NyAqXooSKNcgT7NBqMYzsZq0esFj2wiz_z2ght8S2hQqNOu2RI2f6NT_E4WgCk4_sRJUTOcAdpMQhLrZmvTcTXGAsRQxLYorCDgDU_bo9qk4HNyiCCD7RZqjlTrbEg001QUNKluuks7svBg5JcCAjs7C7fsYCfYf995HzIo_PDXoynbl8GOpZ9edG9EVfww9phvRAEafhmzz7Lhsypce6E4DB68b5fg1DamVUDhI1rZvFiyj-xZkG4Mdym5VTLm_P2DyOsc-IpNEVxfHsK-BSs3MNOx9vYOgQAj7XHcgmrj4YZAAd4s7WVBg3xhxlYPVsgcx39w_CQzLlYhL3CPKk2fiK44Zn4I4KqM-Z5uwgyskIPicmG504HNCyfllDKcXZbvfasH8PPZhTk_10Y40ch1U7-4MXC1xkv0zFlGAgUr8EFB4A_lmx8Gw4i9wGq1iyEu_us2YCG_wufvX2hL7_C0TN7oWXDtikYEHPZLZWpBPxAxmljKkJKF5w7QIbVnOlTr37ICNOki_HYsIM4hbQqDZXL5H8AgR1OSqKp15HKub9Icem5KNsrogq3q7VnkeXkX_HPtCgwehjUxnJDT_6GR3YC7D2JGqd-qn9ln1V1KvgusnvgPZiUClvExJO13RjXoGCpmuwRC1CtNc1FeGXm_1jHGN8rfkNMv3ZY0Cg-eAsT6h1ijpPxazPmUHaoRKsC8lJny1f0xLqmbouJXPHfAUNGTeJW9F-dQiAoi6wtOvUACIrsROFR4pKnQQprJFlfuHtvofhRqQ8rD3ts4O1UdOatSx05xcPvz2a-t-XhBSHYEZGSBgT_ZWIdPj1MsKMh8iUdgLdUm-u8ZrSSFyd6jSt61re1JT8tokaBOyTb7giW_wbIebBHzYlPqs71Oz7D8leSwyvigYNcSf9pSZzJX1Lc1MQrCJGUGFQkGJJt_EbHKhmZJKaA-SVUQEYeeh4Gqx0ofNiYrb8T3h8fz-mlnXPqAm_JWHbbPH5VqvU48fCws6R1hTBg7QRHDikPDx2V54U2HogwUBl0aS_9iTx6Fz7uPuarZjbFdr0AWOXiIdgGY92ctZJVion2DLf_4czZVfXV64lHEOjzoMsINSAepRYyOp87XxKB75ANMPfMLEg2yKGGGQJ9xk0olhgX73Mtyx87wpC02Ewh11kTp-lEqWEOKzD-_e5zoGsPBMVGqsxLdpxrPtA02gMGQIsnsEObqFUTG7ZG3u8q4WSlzQTPweohXu8ryIdukptcOo5lL71OCBzQQ_1o7XYpl0jdksDcRUYL2LuTEUtKsa3NEhSEmQt4I25c9uEmaK_lapCldwWo4LPW0DMKs7h5JXYXtoro88SoBuCVpxviL2JY9hoY_7QKduHsMGHs_kH_WiVzGNKgjrzgc2IYu7kk3kdp0ok1HSbpeEe5-p76v8Bc3NPFHNdiW7Dn9BahNuzNWxxzKjzvTmH9d5OYOlRxmU-_HnzbX6PubztCvnY7etfGuJHxqfzqyctfUb86Cu3xWaNSd9C3T66yaohcggV3OabsUIwf_dRKZkhx6i78bB61Y9kxFKsALGhypAxOKCEZO3tqzwjxs0k8_rwe4dgPgUrvsZvSrp006vWGTJGA0lZtM8xYQ0piJ8sNipRz18UH1Fv0AOTcaBOA-H8zZTPmfmc80Bgb-g0jsTVnv6Q6K-ryV710gEmcJFqH3nlht8KHNE72T9M56cQ9iQOrlAIZGdyPXvYSGU4C2bGVjy9eVb2remXIK0p1BjBM9U8c5Fi504qKpw4DCHr6_s0a5uOpmeScEoJilBjBhxciBzquqy3R7Lg0z506O5mdE12EkCSr6DCPjoClYXw8uFPIgPys5siPUsinajHNdZzQVbYMR2NrhuPx0AP40Yt_Gk9hagU8ttdjonRIhxR1-2wCWVp_Vf7YpI47Dy4Q4cl5pxH-RE1y4IQ4iC_AZDTRPBjdSznXKzUn1-HpSoNpkd0HbNXrm2kJqxktlO_UAyvh_1y8LND8Zb85fNEB_Nc2tnk5SPJe_eJVbsrDyiBTEnjEm3FB4atSbPk_zCa40udBpPvwg7VlS02eKCU9-0RsxfWHd6Hi7tlJhj5Sr-LnlSUzte5Mclf1rm15h1si3_VFj5n0KRwzrAjy6LvYlZXzZOeikveBYsHy8Ev0Ls0H_FXwvXdbVbW7wRoLRyDEvHQtG1cD08_UkKPKli5UfaHlG69gsU0kqOqdVs9DEKwfSAXwzOvsdxAw0t1n4EP-MPVDXxtcnN-KZwuaL4Ni5IqpH6YoPRKMHGX25qO6Ct9Zfzn5iud5hNCwLgUxrFzRaPk-1Io2pEHPW33UiUYCmFyfeerRuI845mMtR_QqWRHtAC3pFK8ORn8k_bW0z55_kk35RbWRVZTk4h96KdKa9gI_1POXhyxDyKRQcq1BzW2v5bweRQmxOrRPZxHcpJ2wkhrIseUyJrLK4oaNDNpTncJZXEytHLAa-WisGBRxsHMkAv4IeIy9fx83Uc0HNA72O9kw03ghoujuWcIEbCT7uSniXh8f3a2fnJUJZZT7X-bUyUf2Vvb0ynmKGxVe9gvz6SDMa48I-QyehWrdmEtPqURLK3vGTdn8RhBb2bCUoJkZMgdlPQqgw2bJ5ie-ybBu_OPnKYjbPM0WdIK3gYTDs_-DAQZB-nOntfIvYJsTJhVY_sd4ER7AYacKcG7Zq-ghnAtDAa3L3hAPpI7fNXoyl-cdGKEArEzVMdXFcaF9jkUzXIVZHVlNVt2GqgkcsfNue5ZnWn7wyZ-GJ6gRX5Q0z9xot8lvudpCDQDFxCPvr3Hg-hsvrz8Y61H5tIdc4NRauKIX5Z1k2AlRDJCFcIbvegioabewxfxKB_dCnvVXhj04Nx1PJ0f2OD6ksWgSwoAJZSMkdvNrrxANj9t4-trxqosEW4cSAeGHeDIHayT7cfqG78-hMdwnA662U281_Id-sQL8IXXsA854i_-bqitVd0ZNvbwUHH86Y2lkfP1oTjrXeEmsPhspI4Y0_AdRS1M6TLE2q7cha3abVGO9oqyHgp2NEL8bOEklMqW44g_FVNdyKvxW0BAH8Osa4d-jJs7tonxirlnvHEhELarsQ9J920vnqv2Dxm6huAdvtqwWhrtGI26OqTE1slZvYWDu4PmCNdDIXmZ_aMStW-k_pxikVj-kKFtNMpURVZNRqClWP3YL3EeP6DwUEQKxCy7uamrOQL5ZpYPNCXtkDwFugzEEEk3h_G144CLkRPXb3TeH4h0FcIRrnQBfOHMsyidgUMOIQaCV-OyjSYbXBH79pITDp1NiZAE1TlI0pr8EauztJ5RRJHEag7wKgXZ2R1WOD7rSOGpXYr9t4FYIu1MUkiI-vqIolG3J8bH7TrA95PImVGT2Wx__VED6BM3vtUlmLgS1Ga_T8mkZJBcXzvpUJIjZylel4Qo9x_Ttvs4RV3grMgspxDCnKvKmv54IinKYrEGVCC4uTG2gmej8aBG1u8HeZ9XRVaAnrx6Sz2pULx9hjbMrgju4iv7IIdg8IcjSRNq76Ae1ldMjVmZxwoX7EXXLocBcWKkP14etq_lTGXttNjCNumNXnaNF1-vUxsURXTx10S23SNptshnKD9jRRvv6Q4LeAogjmuayzWI69wiELv4Jgi1hHhrlHkw78s42uUUvWPtrayCpFbpa2LIzwXpe7Eup2EyQfZbOp1WIJAGbS5jbm6ao1Ls157NYm2_jdRGyMUqrqHnnNEYUa9a0qZUIa2XPR77QzIrTCwCFotbeiKl1r5Y3fq_9E9irkSAJjxtP_7XNyup3mtu9iWM-khm3L3uF7jdjmZvHj0vjXe7VfPPuf8P-TKsyXXb38x112pOl5jgFJMASonbT9aOQwPzJDUgvJ4QbYd0BoBUOaaDNiOaoUU188ElBVafHyxAT8SkbhephDa5rhL4TCqDersou7KopIlvl1IWKXmJJ7iXccO_ah738A9oYnoWbHb18NB7ExYGQOBwCvnGlGVe_UCLX0Q9LJ-Kq1-uuzelOwQEBYOO_TqDp91fxIqZKpzxjWmfpr2XhUgvquoZUC2uxqksWSgb9R6oLyv06X4AjxZLaV3HO3p6Jrxl4SP-7gQZu4fUXbyO2uJGwdOyOSgovqpNJMBX0yUZPmS7rHq-DIVUTYGv5RfdUzERI96gqsqrYPrF4TaJgrx-KdljqhzIwKH85r_cGTs97i19VPn4RcY7TzrxUsenoePioa1PAts-vgI8nu5F5B5gZ0Ofn39oaSPNG13-Y7-thNkTFS_crFpm8FtqTPZ_WrTIzIlQTboFc4RzpetHo6UvbgpYM8jDIuV2xVy_Gmvw5jRIsCLNVkEaRuTFTAkVlQYohLLndSxgNdRUNlvUez1Bvpk1hsDr-z2eiDc-GUfJFF2ZhYb3HGU2PS2y-Rvq70X0ZqEqVjUbgObIwToxT21-oZ3B4hRu2b-SbGGd_rmA6iTE9Jca6-BlRif5DiwrVyFiATmR0XuOMfF-ZCEuCAgf_ZhFojRT3nc_Aa_z1xMYqaAXUkaxvwKmiLmjHzxTeXBKApLz8N-___zT1VYeeOvBf7JFXe_dhdhjF16e9GvrN34eEWBHgovmjQWkaNnE6aD4ZdzFbOtin5oUg3OoN3Fulz5oNXfJR7q0qw7w4KvraTEIKq1oiuCjYsduYVsFsNyKR_8wwwWZxClJ_rtOPd0Bc3RkIUYGmLlSJyG_oVeYIOHg695bZ6WmO6MeLFbUufLcZWM7s4x8X7mR6-KkuDvCPyeEjA6JTJXWLA8w-K2BGyTn9fHX-rqv0IJQhf1fnwbzck3LujVIiWCT4--4Y5h_jKdeZlA2TKeLSY9_33YEqrZG1msvf8RLwf0B6t8BYZOCsHhaToFMUouNwCzdzP_KtyCcg35njd3UgNLE4_MJdRzLUGT93VCrSxqcO_59J310oa9JQBMWfM-9Ak61oi_2RnTilgbRyGxGDbLEX5hyJXVkxDW9-ihvwdc228VSQutNORaXu0CJebj-AyDo1wTY882qAFxtOO0Ef1Yym4AXBu12rZzK6ajzou4GYuzI4i1sLSND7PAWsyERPmCZ4SO3txG8Qq8wrp56gKvS8o-v3xoxBPn45dVJchmZBy6L-0EktJRJQzsCDlwn0LShkjN9MtgP3PaUtXigqmmzWpM2Q_3OuEzKzGa6vxnm8qexa7KobBcC1ETWh4sU9iLKUAVr9zPRtLsh0AZRsVw8gv2i2rVS0bEZXQZ4yTL1wKSEUhZFACOYLsYP1_F0c_6rLbbtRQvukgoL5KuP-8Bp2zxD3zBZnr2QwhvYOCHjxWBy9b2qCaLEQpnCGGNIebyRziuqyVdQpzE3q5wqA4BHOlYCyguV13JsL0fTyULs8HdHSp3HBTPOPkofBhrC13O-ziSS4l59fbBAVVCLksKdmTNC7W7Q4tUy7dHXNes4u0jgNrMyJgCJOXZRzKVN8QsAQoIYH_aB_3RcHHXAGK-GGQJl0sDRfv5aGWuBwRA8169fy-r7h1rQ9jpNMb6ZU6sOaZnZUU3h7dSk6rFqceTHx3smqFb-iYp4pc1aBC23OMqqXgbhKX5MfCmHe3hTd0ZcYO3aGEjM-nrRCS723RlaSXKELXrKFb5xdfanHqycAZCxZHz5ijpa-BzTQGhyNvLymTlR5nIxz1abGEyZ0Jf7HfCtiyMjUYF_zRSZuHiJBhSZh1CXW3JmlENyUCtsTfPougboEEXcQqvNRKTTpXOW5SroP9n7GwfqenxtnXIfDHLi4cTHjGj8zHHHnoh9KVEkFhzINPMgoV54fMzF5KhFXbaT7N_FN2fKUgbuVLYRL4n5yx7_KcBY2SkYpMF8832Tp-mkms1QtYKzks0l8Rjz708Gt5blpY47RkhV-Z3y_uakANfsEyx1D1AYpv86JMvfS-Dwey7SbdH0NHsTAMqwuaFkD2NUrR1wAdCQhi4Q-79BqCJrv5-am3qmkfrA7EE2wEUsHMnhrA1nbMV-i4qQW8s4X9_BxzLF7Wvmk7TnGdH6EddiSFY0TS9mg7t-SNQAfhpP1PN-vRmlZjMTf29FM64facY3vYJ0Xh9gOgrCH6C-3fZYKTT_lnGuITYT2dss_E6ECpxoJkxw2wvBslLJLzy_hCPZwbcCnTQjW0rtvei5L5A0_wylwTCb30Je2XbxpRZTj_PkiZgVg-RvQqzKgdZ_ufGS7FW8HNX0DSb1Z5FRhAshOHP2Rx9StzFrthheDUYBW8TimhpaufZsj8CzDfu8rJgbzLLfZA5SUKRJjaJ7BY5J52VmA7xIg3X_1gke9bNiAYU2d4N6b99HXSA4sm4NqVhy5Zqvp_Vk1ZseFFM1NJfg5tO4pSjL7ymnMMhFSn5djaCl4jcmUMfUPQ9e73S1rYAdfw8IyTQWG-_doU-qQuBS_umsFQG5o--SyYt9lhwh2GfcyizJvyE4Y43C7ZZWi9PSq0daEhFK071pbdwsk6_grmMORVL8lEPEO-osAhlgVdUhHCBZZ3NtnbCHsNgVIK46r8NvFqzI4qnM.icyXeQcvcxbVSflIIZFeBQ"
+ }
+ })
+ .WithEncryptedMetaData(
+ "eyJhbGciOiJSU0EtT0FFUC0yNTYiLCJlbmMiOiJBMjU2R0NNIiwia2lkIjoidnI3Y1dLR2wtZzRXYV9DUkdvd05oQVlXX2dRYi1ha01iaWlneE4wRWtESSIsImN0eSI6ImFwcGxpY2F0aW9uL2pzb24iLCJ6aXAiOiJERUYifQ.qZQOE3A2YltQnDGSjul_0S_WJhhpiXdSA49hGDcWuGruv-MdU98jfk1rM1M9u4xnwtqn-qsP0v5SPa4nPDhcpTMcKRAslknCUIBmf6VeI4sw6MhiSpK1gUNrHhsOshgasdjcdsr_pAZnCGehjRgbho3HCK70ZySvluSkSiqe5cRoDCRV2sjOAjhCjCKczF02eQObdhz0jAyTo_R8HLJBK6hvTYASpETg_SZA2g7Nfo4bppnKfGZ1O5ckU9g5PzvFq_HKYveFNscUDSnEWmYP226xxCWmmu08vXoeBbxUqxl74Psh122YQ53MBrYR3vB2gATfXqtDf3Ihx6LF_Si-wkN9x33dkGmY4bWQ2SW6fb31YX_t3TADPjfqNp8dvWxB_mvlEocDLtB1O23vRarFTpq9K_XStkJesJHWLQuVsYNOaOb5xI0hbavWGn7dYFeeBWV5mubBGhcHmV0Trp78kBoE0Szivtj-fIII8hvJClSLi6_e3DPXjjXRGH7V3Eqy5p1rSthRMiaEXvwh_rDVdANOlBqKjpJxxjYblweaRsKslH3lnFESBF-mOE8y1DZZaDJaHKX0xZunFAdqHTb3D004Fl9QaJ4OWls9xlrhgPQzcE6Ys8Fzkza729gZIUv3Dhamus6b4eYNr5Xim76A-wWmdEtWc8NO7nxQWdNR_7w.9lMbW8qmYyLUa36X.OX03rP-YobtUG_9rS8WHH7X3CnQ52N3zZojB0njIK-Jja2G6OEVcbAKnCBr7GNw27KSGpGFMNJi9GKZMQT8vDEvgoKLGgFmReErCgbRQxeJatHq_wNQ582TdmvJ7Dfcn7EsGHhUiC_xJY-tLJB86ah3OFUR3-K3IkmAvGzygXpTpQFKm4Af_mNS4i3f5lzCBZzYlPxJ9QJzKabzYM2doDKZrAmLx5FhRVrxznCUfZLvriBiut32MLozr-A_81ExAp1dclacUb5GsqYJYKVpfL_FpXqIcBFEO5N473fy_fLbb4TlUBog_3tkpYVMN7ScZpDDOUafgiJBqy4NSFg9bX-BUPZep8hax3m06q0IlXZmHVJcK-WcPA2NDXkAIunZB1LMPinp7AAsyAn9415RHV-kzOj-9KS22gc63undtOn5CXDg16aD7FFiMFVCaZIvBdU_1sHJak1yNzfFWdDFH1jEgj7SSOlX37_c1XbT5mgFlcUcz9McSoLn3ygVjFUu6HWJNwrIFDFgDA4NFIyq3foD0ERI.xwF5NBhFKq_akxCFVTgFFw")
+ .WithEncryptedData(
+ "eyJhbGciOiJSU0EtT0FFUC0yNTYiLCJlbmMiOiJBMjU2R0NNIiwia2lkIjoidnI3Y1dLR2wtZzRXYV9DUkdvd05oQVlXX2dRYi1ha01iaWlneE4wRWtESSIsImN0eSI6ImFwcGxpY2F0aW9uL2pzb24iLCJ6aXAiOiJERUYifQ.n4wCQ34WFuY_KJPrEUvnSGmbhDX2WcO4AxvPFHuYNWPbNUNqU_wXnQT2mMgg0Wvlga3BchZAyZHTvX6SVWGTHWrP05lT42mrok9M3hH-fzd9Ep_Xy6LtSQtskGY0TMeGNNhZBwDPQYeOQnEXgW0z1AFSaVKRqCN4yy63R7Gx9qww-KyI8gMMJOEYhXmk8p7apOrZcaBQZTYSV7lK_MmzfpmieVvGJbrFU7a190sMb_8EIxkHCOB4HFew5W9gFVX_WvS5ZviuHhEidBfACPd4xX6LeEV43hGNRkfeWKL88Ospbf0kfQfplYWli4_E1PfpQM_hUr-qd1HBzC-MyMbCGUohJHn3QzKN-vU8TSbLEQtloe-8LSn9ZyzMiaIraM7CzPhlH77N1Z7zV31b0-_71NFHACavbX5aw3NocO4QS7NbnRTDQVwLFqSPTc-oQCPGIFBu_R624FmIo63ZtfdCQ1zGP2qZDwoQtTwtFhAp3f3D1kqSw0nSZk0-bfcJA3zF4xK4gaPGS0BbHLi38Nq1GV2udPkPUr_1qZu2c0th5QYHumpi_KhGsWhRtNS4BdESkrovByYAl0bnZUo5J6LACk_Xvnf6rIAEkwAtQU1rHarWItxrREKEfSc-4Rx7OBusQa2JBrvL4b_Bjmiridn_f_idVlAP9slSoBzXIYAfF30._c6-H64cPnq6ORgK.f5g2GlsRxur6JjzodgP9cnqQ.fg5tUwRYYhSMvTwQKRJa_A")
+ .Submit();
+
+ _caseId = submission.CaseId!;
+ _submissionId = submission.Id!;
+
+ _caseId.Should().NotBeNull();
+ _submissionId.Should().NotBeNull();
+ }
+
+ [Test]
+ [Order(20)]
+ public void Sender_GetSubmissionState() {
+ // Act
+ var status = Sender.GetStatusForSubmission(_caseId, Settings.DestinationId);
+
+ // Assert
+ status.Count.Should().BeGreaterThan(0);
+ status.ForEach(
+ s => Logger.LogInformation("Status {When} {Event}", s.EventTime, s.EventType));
+ }
+
+ [Test]
+ [Order(30)]
+ public void Subscriber_GetSubmissionState() {
+ // Act
+ var status = Subscriber.GetStatusForSubmission(_caseId, Settings.DestinationId);
+
+ // Assert
+ status.Count.Should().BeGreaterThan(0);
+ status.ForEach(
+ s => Logger.LogInformation("Status {When} {Event}", s.EventTime, s.EventType));
+ }
+
+ [Test]
+ [Order(40)]
+ public void RequestSubmission() {
+ var subscriberWithSubmission = Subscriber.RequestSubmission(_submissionId);
+
+ var data = subscriberWithSubmission.GetDataJson();
+ Logger.LogInformation("Data {Data}", data);
+
+ data.Should().Be(@"{""data"":""value""}");
+
+ var attachments = subscriberWithSubmission.GetAttachments();
+ attachments.First().Filename.Should().Be("Test.pdf");
+
+ subscriberWithSubmission.AcceptSubmission();
+ }
+
+ [Test]
+ [Order(50)]
+ public void Sender_GetSubmissionState_AfterAccepting() {
+ // Act
+ var status = Sender.GetStatusForSubmission(_caseId, Settings.DestinationId);
+
+ // Assert
+ status.Count.Should().BeGreaterThan(0);
+ status.ForEach(
+ s => Logger.LogInformation("Status {When} {Event}", s.EventTime, s.EventType));
+ }
+}
diff --git a/FitConnect/EncryptedSender.cs b/FitConnect/EncryptedSender.cs
new file mode 100644
index 0000000000000000000000000000000000000000..b9fa33f6056b379486d94ba98d995f82fbff642d
--- /dev/null
+++ b/FitConnect/EncryptedSender.cs
@@ -0,0 +1,60 @@
+using FitConnect.Interfaces.Sender;
+using FitConnect.Models;
+using FitConnect.Services.Models.v1.Submission;
+using Microsoft.Extensions.Logging;
+
+namespace FitConnect;
+
+public partial class Sender {
+ public IWithEncryptedAttachments WithEncryptedAttachments(
+ Dictionary<string, string> attachments) {
+ if (Submission?.ServiceType == null) {
+ Logger?.LogError("Submission has no service type");
+ throw new ArgumentException("Submission has no service type");
+ }
+
+ var createSubmissionDto = (CreateSubmissionDto)Submission;
+ createSubmissionDto.AnnouncedAttachments = attachments.Keys.ToList();
+ var created = SubmissionService.CreateSubmission(createSubmissionDto);
+ Submission.Id = created.SubmissionId;
+ Submission.CaseId = created.CaseId;
+
+ if (Submission?.Id == null)
+ throw new ArgumentException("Submission is not ready");
+
+ Logger?.LogInformation("Uploading pre encrypted attachments");
+ UploadAttachmentsAsync(Submission.Id!, attachments);
+ return this;
+ }
+
+ public ISenderWithEncryptedData WithEncryptedData(string data) {
+ if (Submission?.Id == null)
+ throw new ArgumentException("Submission is not ready");
+
+ Submission.EncryptedData = data;
+ return this;
+ }
+
+ public ISenderWithEncryptedMetaData WithEncryptedMetaData(string metaData) {
+ if (Submission?.Id == null)
+ throw new ArgumentException("Submission is not ready");
+
+ Submission.EncryptedMetadata = metaData;
+ return this;
+ }
+
+
+ Submission ISenderWithEncryptedData.Submit() {
+ if (Submission == null) {
+ Logger?.LogCritical("Submission is null on submit");
+ throw new InvalidOperationException("Submission is not ready");
+ }
+
+ Logger?.LogTrace("Encrypted metadata: {EncryptedMeta}", Submission.EncryptedMetadata);
+ var result = SubmissionService
+ .SubmitSubmission(Submission.Id!, (SubmitSubmissionDto)Submission).Result;
+
+ Logger?.LogInformation("Submission sent");
+ return Submission;
+ }
+}
diff --git a/FitConnect/Encryption/FitEncryption.cs b/FitConnect/Encryption/FitEncryption.cs
index 4975ed142f25316c18ce1b3f94aecfe7e4ca9d20..9a611b597f5087c6e67278f680b19704f87e7cc5 100644
--- a/FitConnect/Encryption/FitEncryption.cs
+++ b/FitConnect/Encryption/FitEncryption.cs
@@ -49,6 +49,10 @@ public class FitEncryption {
PublicKeySignatureVerification = keySet.PublicKeySignatureVerification;
}
+ public FitEncryption(string publicKeyEncryption, ILogger? logger) : this(logger) {
+ PublicKeyEncryption = publicKeyEncryption;
+ }
+
public (string plainText, byte[] plainBytes, byte[] tag)
Decrypt(string cypherText, string key) {
@@ -270,4 +274,4 @@ public class FitEncryption {
return result.IsValid;
}
-}
\ No newline at end of file
+}
diff --git a/FitConnect/Interfaces/Sender/ISender.cs b/FitConnect/Interfaces/Sender/ISender.cs
index cbd6bfa5d0b8e8a31475276b4a42814f36fa5cc6..816d365d9dc2ab57a9065e3025e53bdcbdc3b336 100644
--- a/FitConnect/Interfaces/Sender/ISender.cs
+++ b/FitConnect/Interfaces/Sender/ISender.cs
@@ -10,10 +10,12 @@ public interface ISender : IFitConnectClient {
/// <param name="ags"></param>
/// <param name="ars"></param>
/// <param name="areaId"></param>
+ /// <param name="receivedPublicKey">Callback for presenting the public key</param>
/// <returns></returns>
public ISenderWithDestination FindDestinationId(string leiaKey, string? ags = null,
string? ars = null,
- string? areaId = null);
+ string? areaId = null,
+ Action<string>? receivedPublicKey = null);
/// <summary>
/// Configures the client for the given destination and loads the public key
@@ -22,6 +24,8 @@ public interface ISender : IFitConnectClient {
/// unique identifier of the clients destination
/// <para>eg: 00000000-0000-0000-0000-000000000000</para>
/// </param>
+ /// <param name="receivedPublicKey">Callback for presenting the public key</param>
/// <returns>the upload step for attachments</returns>
- public ISenderWithDestination WithDestination(string destinationId);
+ public ISenderWithDestination WithDestination(string destinationId,
+ Action<string>? receivedPublicKey = null);
}
diff --git a/FitConnect/Interfaces/Sender/ISenderWithAttachments.cs b/FitConnect/Interfaces/Sender/ISenderWithAttachments.cs
index d25ea83e297998541a8f27b64d5a39eeffb3103b..ede12e27995b57f2a31e569205502c2dd05f38be 100644
--- a/FitConnect/Interfaces/Sender/ISenderWithAttachments.cs
+++ b/FitConnect/Interfaces/Sender/ISenderWithAttachments.cs
@@ -1,13 +1,24 @@
+using FitConnect.Models;
+
namespace FitConnect.Interfaces.Sender;
public interface ISenderWithAttachments : ISenderReady {
/// <summary>
/// Data as string.
/// </summary>
- /// <param name="data">json or xml as string</param>
+ /// <param name="data">json as string</param>
/// <example>
- /// .WithData(@"{ ""name"": ""John Doe"" }")
+ /// .WithJsonData(@"{ ""name"": ""John Doe"" }")
/// </example>
/// <returns>next step to submit the data</returns>
- public ISenderWithData WithData(string data);
+ public ISenderWithData WithJsonData(string data);
+
+ /// <summary>
+ /// Data as string.
+ /// </summary>
+ /// <param name="data">xml as string</param>
+ /// <returns>next step to submit the data</returns>
+ public ISenderWithData WithXmlData(string data);
}
+
+
diff --git a/FitConnect/Interfaces/Sender/ISenderWithService.cs b/FitConnect/Interfaces/Sender/ISenderWithService.cs
index 2ce1321028967510fc5d2bdcd9441a0215eba562..680e5f8fb1991387217630e1f1219b6358318d3c 100644
--- a/FitConnect/Interfaces/Sender/ISenderWithService.cs
+++ b/FitConnect/Interfaces/Sender/ISenderWithService.cs
@@ -16,4 +16,24 @@ public interface ISenderWithService {
/// <param name="attachments">that are sent with the submission</param>
/// <returns>the step where additional data can be added to the submission</returns>
public ISenderWithAttachments WithAttachments(params Attachment[] attachments);
+
+ /// <summary>
+ /// Adding the encrypted attachments to the submission
+ /// </summary>
+ /// <param name="attachments">Dictionary with the UUID and the encrypted attachment</param>
+ /// <returns></returns>
+ public IWithEncryptedAttachments WithEncryptedAttachments(
+ Dictionary<string, string> attachments);
+}
+
+public interface IWithEncryptedAttachments {
+ public ISenderWithEncryptedMetaData WithEncryptedMetaData(string metaData);
+}
+
+public interface ISenderWithEncryptedMetaData : ISenderWithEncryptedData {
+ public ISenderWithEncryptedData WithEncryptedData(string data);
+}
+
+public interface ISenderWithEncryptedData {
+ public Submission Submit();
}
diff --git a/FitConnect/Models/Submission.cs b/FitConnect/Models/Submission.cs
index b8792a1d46a3790e20986c32dc9b4a42afad5ee0..d12e5dea2e1851eb11981b167d62ee85e4a4c141 100644
--- a/FitConnect/Models/Submission.cs
+++ b/FitConnect/Models/Submission.cs
@@ -26,6 +26,7 @@ public class Submission {
public string? EncryptedData { get; set; }
public string? MetaAuthentication => EncryptedMetadata?.Split('.').Last();
public string? DataAuthentication => EncryptedData?.Split('.').Last();
+ public string? DataMimeType { get; set; }
public bool IsSubmissionReadyToAdd(out string? error) {
var innerError = "";
diff --git a/FitConnect/Properties/AssemblyInfo.cs b/FitConnect/Properties/AssemblyInfo.cs
index 49986d47feefcf501c1b2de8b2b4b8d7025ecd6f..5a9aa85b20efa09d0c3536b5d3edd8d71205c4e2 100644
--- a/FitConnect/Properties/AssemblyInfo.cs
+++ b/FitConnect/Properties/AssemblyInfo.cs
@@ -13,6 +13,7 @@ using System.Runtime.CompilerServices;
[assembly:InternalsVisibleTo("IntegrationTests")]
+[assembly:InternalsVisibleTo("BasicUnitTest")]
// Von der MSBuild WriteCodeFragment-Klasse generiert.
diff --git a/FitConnect/Sender.cs b/FitConnect/Sender.cs
index a140a1e438302b4f29b79917226a5ab7835e0c19..d487b9c1de9e2871e1eb9a1c32493554647cbf65 100644
--- a/FitConnect/Sender.cs
+++ b/FitConnect/Sender.cs
@@ -1,5 +1,6 @@
using System.Security;
using System.Text.RegularExpressions;
+using System.Xml;
using Autofac;
using FitConnect.Encryption;
using FitConnect.Interfaces.Sender;
@@ -28,8 +29,9 @@ namespace FitConnect;
/// .Subm@it();
/// </code>
/// </example>
-public class Sender : FitConnectClient, ISender, ISenderWithDestination,
- ISenderWithAttachments, ISenderWithData, ISenderWithService {
+public partial class Sender : FitConnectClient, ISender, ISenderWithDestination,
+ ISenderWithAttachments, ISenderWithData, ISenderWithService, IWithEncryptedAttachments,
+ ISenderWithEncryptedMetaData, ISenderWithEncryptedData {
public string? PublicKey { get; set; }
public Submission? Submission { get; set; }
@@ -45,26 +47,29 @@ public class Sender : FitConnectClient, ISender, ISenderWithDestination,
public ISenderWithDestination FindDestinationId(string leiaKey, string? ags = null,
string? ars = null,
- string? areaId = null) {
+ string? areaId = null, Action<string>? receivedPublicKey = null) {
if (ags == null && ars == null && areaId == null)
throw new ArgumentException("One of the following must be provided: ags, ars, areaId");
var destinationId = RouteService.GetDestinationIdAsync(leiaKey, ags, ars, areaId).Result;
Logger?.LogInformation("Received destinations: {Destinations}",
destinationId.Select(d => d.DestinationId).Aggregate((a, b) => a + "," + b));
- return WithDestination(destinationId.First().DestinationId);
+ return WithDestination(destinationId.First().DestinationId, receivedPublicKey);
}
- public ISenderWithDestination WithDestination(string destinationId) {
+ public ISenderWithDestination WithDestination(string destinationId,
+ Action<string>? receivedPublicKey = null) {
if (!Regex.IsMatch(destinationId,
"^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"))
throw new ArgumentException("The destination must be a valid GUID");
Submission = CreateSubmission(destinationId).Result;
+ if (PublicKey != null)
+ receivedPublicKey?.Invoke(PublicKey!);
return this;
}
- public ISenderWithData WithData(string data) {
+ public ISenderWithData WithJsonData(string data) {
try {
JsonConvert.DeserializeObject(data);
}
@@ -74,6 +79,21 @@ public class Sender : FitConnectClient, ISender, ISenderWithDestination,
Submission!.Data = data;
+ Submission.DataMimeType = "application/json";
+ return this;
+ }
+
+ public ISenderWithData WithXmlData(string data) {
+ try {
+ var doc = new XmlDocument();
+ doc.LoadXml(data);
+ }
+ catch (Exception e) {
+ throw new ArgumentException("The data must be valid XML string", e);
+ }
+
+ Submission!.Data = data;
+ Submission.DataMimeType = "application/xml";
return this;
}
@@ -159,6 +179,7 @@ public class Sender : FitConnectClient, ISender, ISenderWithDestination,
return this;
}
+
public ISenderWithDestination FindDestinationId(Destination destination) {
throw new NotImplementedException();
}
@@ -181,7 +202,7 @@ public class Sender : FitConnectClient, ISender, ISenderWithDestination,
return submission;
}
- internal async Task<string> GetPublicKeyFromDestination(string destinationId) {
+ public async Task<string> GetPublicKeyFromDestination(string destinationId) {
var publicKey = await DestinationService.GetPublicKey(destinationId);
var keyIsValid = new CertificateHelper(Logger).ValidateCertificate(publicKey,
@@ -197,7 +218,7 @@ public class Sender : FitConnectClient, ISender, ISenderWithDestination,
/// </summary>
/// <param name="submission"></param>
/// <returns></returns>
- public static string CreateMetadata(Submission submission) {
+ internal static string CreateMetadata(Submission submission) {
var data = new Data {
Hash = new DataHash {
Type = "sha512",
@@ -205,9 +226,9 @@ public class Sender : FitConnectClient, ISender, ISenderWithDestination,
},
SubmissionSchema = new Fachdatenschema {
- SchemaUri = submission.ServiceType.Identifier,
- MimeType = "application/json"
- }
+ SchemaUri = submission.ServiceType.Identifier,
+ MimeType = submission.DataMimeType ?? "application/json"
+ }
};
var contentStructure = new ContentStructure {
Data = data,
@@ -231,6 +252,7 @@ public class Sender : FitConnectClient, ISender, ISenderWithDestination,
return JsonConvert.SerializeObject(metaData);
}
+
/// <summary>
/// Finding Areas
/// </summary>
diff --git a/IntegrationTests/CertificateValidation.cs b/IntegrationTests/CertificateValidation.cs
index 6a24b057720eba67e86b69fe8ced86098c8e9981..d7367decf578e5bc2d9447321d83310fd57f37f2 100644
--- a/IntegrationTests/CertificateValidation.cs
+++ b/IntegrationTests/CertificateValidation.cs
@@ -132,6 +132,7 @@ public class CertificateValidation {
}
[Test]
+ [Ignore("Not implemented")]
public void CheckPemFiles() {
if (!Directory.Exists("./certificates") || !Directory.Exists("./certificates/roots")) {
Assert.Inconclusive("No certificates found");
diff --git a/IntegrationTests/Sender/SenderTestHappyPath.cs b/IntegrationTests/Sender/SenderTestHappyPath.cs
index 89b33074301e82595b1b68adced0f28b72a11b04..b8f0f7d46de4c98f626a3fd0b622b03c5227f63e 100644
--- a/IntegrationTests/Sender/SenderTestHappyPath.cs
+++ b/IntegrationTests/Sender/SenderTestHappyPath.cs
@@ -107,7 +107,7 @@ public class SenderTestHappyPath : SenderTestBase {
.WithDestination(DestinationId)
.WithServiceType("ServiceName", "urn:de:fim:leika:leistung:99400048079000")
.WithAttachments(attachments)
- .WithData(JsonConvert.SerializeObject(new {
+ .WithJsonData(JsonConvert.SerializeObject(new {
FirstName = "John",
LastName = "Doe",
Age = 42,
@@ -148,7 +148,7 @@ public class SenderTestHappyPath : SenderTestBase {
.FindDestinationId("99400048079000", ars: "09372126")
.WithServiceType("ServiceName", "urn:de:fim:leika:leistung:99400048079000")
.WithAttachments(attachments)
- .WithData(JsonConvert.SerializeObject(new {
+ .WithJsonData(JsonConvert.SerializeObject(new {
FirstName = "John",
LastName = "Doe",
Age = 42,
diff --git a/IntegrationTests/Sender/SenderTestUnhappyPath.cs b/IntegrationTests/Sender/SenderTestUnhappyPath.cs
index 6e0f9c7e4bff7d67266d6c792b87971d00d00139..e0298aec861a2b94e4125b705e1dbd55cc9d028b 100644
--- a/IntegrationTests/Sender/SenderTestUnhappyPath.cs
+++ b/IntegrationTests/Sender/SenderTestUnhappyPath.cs
@@ -27,7 +27,7 @@ public class SenderTestUnhappyPath : SenderTestBase {
Sender.WithDestination(DestinationId)
.WithServiceType("Name", "urn:de:fim:leika:leistung:00000000000000")
.WithAttachments(new Attachment("Test.pdf", "Test PDF"))
- .WithData("This is very wrong");
+ .WithJsonData("This is very wrong");
})!
.Message.Should().Be("The data must be valid JSON string");
}
diff --git a/IntegrationTests/Sender/ThreadTest.cs b/IntegrationTests/Sender/ThreadTest.cs
index 2588b1db76c0418696901346514e9156392bab15..962a32f28237b2d9e2a98212033db79caadfc45e 100644
--- a/IntegrationTests/Sender/ThreadTest.cs
+++ b/IntegrationTests/Sender/ThreadTest.cs
@@ -52,7 +52,7 @@ public class ThreadTest {
Thread.Sleep(RandomNumberGenerator.GetInt32(100, 500));
delayed
- .WithData(JsonConvert.SerializeObject(new {
+ .WithJsonData(JsonConvert.SerializeObject(new {
Name = $"ThreadTest_{counter}",
ThreadId = counter
}))
diff --git a/LICENSES/CC0-1.0.txt b/LICENSES/CC0-1.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0e259d42c996742e9e3cba14c677129b2c1b6311
--- /dev/null
+++ b/LICENSES/CC0-1.0.txt
@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+ PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+ THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+ HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+ i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+ v. rights protecting the extraction, dissemination, use and reuse of data
+ in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation
+ thereof, including any amended or successor version of such
+ directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national
+ implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+ surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+ warranties of any kind concerning the Work, express, implied,
+ statutory or otherwise, including without limitation warranties of
+ title, merchantability, fitness for a particular purpose, non
+ infringement, or the absence of latent or other defects, accuracy, or
+ the present or absence of errors, whether or not discoverable, all to
+ the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+ that may apply to the Work or any use thereof, including without
+ limitation any person's Copyright and Related Rights in the Work.
+ Further, Affirmer disclaims responsibility for obtaining any necessary
+ consents, permissions or other rights required for any use of the
+ Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+ party to this document and has no duty or obligation with respect to
+ this CC0 or use of the Work.
diff --git a/LICENSES/EUPL-1.2.txt b/LICENSES/EUPL-1.2.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6d8cea430e21d06532225018850da91a3f44abf5
--- /dev/null
+++ b/LICENSES/EUPL-1.2.txt
@@ -0,0 +1,190 @@
+EUROPEAN UNION PUBLIC LICENCE v. 1.2
+EUPL © the European Union 2007, 2016
+
+This European Union Public Licence (the ‘EUPL’) applies to the Work (as defined below) which is provided under the
+terms of this Licence. Any use of the Work, other than as authorised under this Licence is prohibited (to the extent such
+use is covered by a right of the copyright holder of the Work).
+The Work is provided under the terms of this Licence when the Licensor (as defined below) has placed the following
+notice immediately following the copyright notice for the Work:
+ Licensed under the EUPL
+or has expressed by any other means his willingness to license under the EUPL.
+
+1.Definitions
+In this Licence, the following terms have the following meaning:
+— ‘The Licence’:this Licence.
+— ‘The Original Work’:the work or software distributed or communicated by the Licensor under this Licence, available
+as Source Code and also as Executable Code as the case may be.
+— ‘Derivative Works’:the works or software that could be created by the Licensee, based upon the Original Work or
+modifications thereof. This Licence does not define the extent of modification or dependence on the Original Work
+required in order to classify a work as a Derivative Work; this extent is determined by copyright law applicable in
+the country mentioned in Article 15.
+— ‘The Work’:the Original Work or its Derivative Works.
+— ‘The Source Code’:the human-readable form of the Work which is the most convenient for people to study and
+modify.
+— ‘The Executable Code’:any code which has generally been compiled and which is meant to be interpreted by
+a computer as a program.
+— ‘The Licensor’:the natural or legal person that distributes or communicates the Work under the Licence.
+— ‘Contributor(s)’:any natural or legal person who modifies the Work under the Licence, or otherwise contributes to
+the creation of a Derivative Work.
+— ‘The Licensee’ or ‘You’:any natural or legal person who makes any usage of the Work under the terms of the
+Licence.
+— ‘Distribution’ or ‘Communication’:any act of selling, giving, lending, renting, distributing, communicating,
+transmitting, or otherwise making available, online or offline, copies of the Work or providing access to its essential
+functionalities at the disposal of any other natural or legal person.
+
+2.Scope of the rights granted by the Licence
+The Licensor hereby grants You a worldwide, royalty-free, non-exclusive, sublicensable licence to do the following, for
+the duration of copyright vested in the Original Work:
+— use the Work in any circumstance and for all usage,
+— reproduce the Work,
+— modify the Work, and make Derivative Works based upon the Work,
+— communicate to the public, including the right to make available or display the Work or copies thereof to the public
+and perform publicly, as the case may be, the Work,
+— distribute the Work or copies thereof,
+— lend and rent the Work or copies thereof,
+— sublicense rights in the Work or copies thereof.
+Those rights can be exercised on any media, supports and formats, whether now known or later invented, as far as the
+applicable law permits so.
+In the countries where moral rights apply, the Licensor waives his right to exercise his moral right to the extent allowed
+by law in order to make effective the licence of the economic rights here above listed.
+The Licensor grants to the Licensee royalty-free, non-exclusive usage rights to any patents held by the Licensor, to the
+extent necessary to make use of the rights granted on the Work under this Licence.
+
+3.Communication of the Source Code
+The Licensor may provide the Work either in its Source Code form, or as Executable Code. If the Work is provided as
+Executable Code, the Licensor provides in addition a machine-readable copy of the Source Code of the Work along with
+each copy of the Work that the Licensor distributes or indicates, in a notice following the copyright notice attached to
+the Work, a repository where the Source Code is easily and freely accessible for as long as the Licensor continues to
+distribute or communicate the Work.
+
+4.Limitations on copyright
+Nothing in this Licence is intended to deprive the Licensee of the benefits from any exception or limitation to the
+exclusive rights of the rights owners in the Work, of the exhaustion of those rights or of other applicable limitations
+thereto.
+
+5.Obligations of the Licensee
+The grant of the rights mentioned above is subject to some restrictions and obligations imposed on the Licensee. Those
+obligations are the following:
+
+Attribution right: The Licensee shall keep intact all copyright, patent or trademarks notices and all notices that refer to
+the Licence and to the disclaimer of warranties. The Licensee must include a copy of such notices and a copy of the
+Licence with every copy of the Work he/she distributes or communicates. The Licensee must cause any Derivative Work
+to carry prominent notices stating that the Work has been modified and the date of modification.
+
+Copyleft clause: If the Licensee distributes or communicates copies of the Original Works or Derivative Works, this
+Distribution or Communication will be done under the terms of this Licence or of a later version of this Licence unless
+the Original Work is expressly distributed only under this version of the Licence — for example by communicating
+‘EUPL v. 1.2 only’. The Licensee (becoming Licensor) cannot offer or impose any additional terms or conditions on the
+Work or Derivative Work that alter or restrict the terms of the Licence.
+
+Compatibility clause: If the Licensee Distributes or Communicates Derivative Works or copies thereof based upon both
+the Work and another work licensed under a Compatible Licence, this Distribution or Communication can be done
+under the terms of this Compatible Licence. For the sake of this clause, ‘Compatible Licence’ refers to the licences listed
+in the appendix attached to this Licence. Should the Licensee's obligations under the Compatible Licence conflict with
+his/her obligations under this Licence, the obligations of the Compatible Licence shall prevail.
+
+Provision of Source Code: When distributing or communicating copies of the Work, the Licensee will provide
+a machine-readable copy of the Source Code or indicate a repository where this Source will be easily and freely available
+for as long as the Licensee continues to distribute or communicate the Work.
+Legal Protection: This Licence does not grant permission to use the trade names, trademarks, service marks, or names
+of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and
+reproducing the content of the copyright notice.
+
+6.Chain of Authorship
+The original Licensor warrants that the copyright in the Original Work granted hereunder is owned by him/her or
+licensed to him/her and that he/she has the power and authority to grant the Licence.
+Each Contributor warrants that the copyright in the modifications he/she brings to the Work are owned by him/her or
+licensed to him/her and that he/she has the power and authority to grant the Licence.
+Each time You accept the Licence, the original Licensor and subsequent Contributors grant You a licence to their contributions
+to the Work, under the terms of this Licence.
+
+7.Disclaimer of Warranty
+The Work is a work in progress, which is continuously improved by numerous Contributors. It is not a finished work
+and may therefore contain defects or ‘bugs’ inherent to this type of development.
+For the above reason, the Work is provided under the Licence on an ‘as is’ basis and without warranties of any kind
+concerning the Work, including without limitation merchantability, fitness for a particular purpose, absence of defects or
+errors, accuracy, non-infringement of intellectual property rights other than copyright as stated in Article 6 of this
+Licence.
+This disclaimer of warranty is an essential part of the Licence and a condition for the grant of any rights to the Work.
+
+8.Disclaimer of Liability
+Except in the cases of wilful misconduct or damages directly caused to natural persons, the Licensor will in no event be
+liable for any direct or indirect, material or moral, damages of any kind, arising out of the Licence or of the use of the
+Work, including without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, loss
+of data or any commercial damage, even if the Licensor has been advised of the possibility of such damage. However,
+the Licensor will be liable under statutory product liability laws as far such laws apply to the Work.
+
+9.Additional agreements
+While distributing the Work, You may choose to conclude an additional agreement, defining obligations or services
+consistent with this Licence. However, if accepting obligations, You may act only on your own behalf and on your sole
+responsibility, not on behalf of the original Licensor or any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against such Contributor by
+the fact You have accepted any warranty or additional liability.
+
+10.Acceptance of the Licence
+The provisions of this Licence can be accepted by clicking on an icon ‘I agree’ placed under the bottom of a window
+displaying the text of this Licence or by affirming consent in any other similar way, in accordance with the rules of
+applicable law. Clicking on that icon indicates your clear and irrevocable acceptance of this Licence and all of its terms
+and conditions.
+Similarly, you irrevocably accept this Licence and all of its terms and conditions by exercising any rights granted to You
+by Article 2 of this Licence, such as the use of the Work, the creation by You of a Derivative Work or the Distribution
+or Communication by You of the Work or copies thereof.
+
+11.Information to the public
+In case of any Distribution or Communication of the Work by means of electronic communication by You (for example,
+by offering to download the Work from a remote location) the distribution channel or media (for example, a website)
+must at least provide to the public the information requested by the applicable law regarding the Licensor, the Licence
+and the way it may be accessible, concluded, stored and reproduced by the Licensee.
+
+12.Termination of the Licence
+The Licence and the rights granted hereunder will terminate automatically upon any breach by the Licensee of the terms
+of the Licence.
+Such a termination will not terminate the licences of any person who has received the Work from the Licensee under
+the Licence, provided such persons remain in full compliance with the Licence.
+
+13.Miscellaneous
+Without prejudice of Article 9 above, the Licence represents the complete agreement between the Parties as to the
+Work.
+If any provision of the Licence is invalid or unenforceable under applicable law, this will not affect the validity or
+enforceability of the Licence as a whole. Such provision will be construed or reformed so as necessary to make it valid
+and enforceable.
+The European Commission may publish other linguistic versions or new versions of this Licence or updated versions of
+the Appendix, so far this is required and reasonable, without reducing the scope of the rights granted by the Licence.
+New versions of the Licence will be published with a unique version number.
+All linguistic versions of this Licence, approved by the European Commission, have identical value. Parties can take
+advantage of the linguistic version of their choice.
+
+14.Jurisdiction
+Without prejudice to specific agreement between parties,
+— any litigation resulting from the interpretation of this License, arising between the European Union institutions,
+bodies, offices or agencies, as a Licensor, and any Licensee, will be subject to the jurisdiction of the Court of Justice
+of the European Union, as laid down in article 272 of the Treaty on the Functioning of the European Union,
+— any litigation arising between other parties and resulting from the interpretation of this License, will be subject to
+the exclusive jurisdiction of the competent court where the Licensor resides or conducts its primary business.
+
+15.Applicable Law
+Without prejudice to specific agreement between parties,
+— this Licence shall be governed by the law of the European Union Member State where the Licensor has his seat,
+resides or has his registered office,
+— this licence shall be governed by Belgian law if the Licensor has no seat, residence or registered office inside
+a European Union Member State.
+
+
+ Appendix
+
+‘Compatible Licences’ according to Article 5 EUPL are:
+— GNU General Public License (GPL) v. 2, v. 3
+— GNU Affero General Public License (AGPL) v. 3
+— Open Software License (OSL) v. 2.1, v. 3.0
+— Eclipse Public License (EPL) v. 1.0
+— CeCILL v. 2.0, v. 2.1
+— Mozilla Public Licence (MPL) v. 2
+— GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3
+— Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for works other than software
+— European Union Public Licence (EUPL) v. 1.1, v. 1.2
+— Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong Reciprocity (LiLiQ-R+).
+
+The European Commission may update this Appendix to later versions of the above licences without producing
+a new version of the EUPL, as long as they provide the rights granted in Article 2 of this Licence and protect the
+covered Source Code from exclusive appropriation.
+All other changes or additions to this Appendix require the production of a new EUPL version.
diff --git a/MockContainer/MockContainer.cs b/MockContainer/MockContainer.cs
index 81f9b7f91b6a42029106470c8e250117e7e9453d..b931ee64c54aaf90075c5159d21c0a813f4aa79b 100644
--- a/MockContainer/MockContainer.cs
+++ b/MockContainer/MockContainer.cs
@@ -31,65 +31,107 @@ public class TestFile {
public static class Container {
public static IContainer Create() {
var builder = new ContainerBuilder();
+ var settings = CreateEncryptionSettings(builder);
builder.Register(c => new TestFile()).As<TestFile>();
builder.Register(c => CreateOAuthService().Object).As<IOAuthService>();
builder.Register(c => CreateRouteService().Object).As<IRouteService>();
builder.Register(c => CreateSubmissionService().Object).As<ISubmissionService>();
- builder.Register(c => CreateDestinationService().Object).As<IDestinationService>();
+ builder.Register(c => CreateDestinationService(settings).Object).As<IDestinationService>();
builder.Register(c => Mock.Of<ICasesService>()).As<ICasesService>();
builder.Register(c => LoggerFactory.Create(
b => {
b.AddConsole();
b.SetMinimumLevel(LogLevel.Information);
- }).CreateLogger("FluentSenderTests")
+ }).CreateLogger("E2E Tests")
).As<ILogger>();
- CreateEncryptionSettings(builder);
return builder.Build();
}
- private static Mock<IDestinationService> CreateDestinationService() {
+ private static Mock<IDestinationService> CreateDestinationService(MockSettings settings) {
var mock = new Mock<IDestinationService>();
mock.Setup(x => x.GetPublicKey(It.IsAny<string>())).Returns(() =>
- File.ReadAllTextAsync("./encryptionKeys/publicKey_encryption.json"));
+ Task.FromResult(settings.PublicKeyEncryption));
return mock;
}
- private static void CreateEncryptionSettings(ContainerBuilder builder) {
- var privateKeyDecryption = File.ReadAllText("./encryptionKeys/privateKey_decryption.json");
- var privateKeySigning = File.ReadAllText("./encryptionKeys/privateKey_signing.json");
- var publicKeyEncryption = File.ReadAllText("./encryptionKeys/publicKey_encryption.json");
- var publicKeySignature =
- File.ReadAllText("./encryptionKeys/publicKey_signature_verification.json");
- var setPublicKeys = File.ReadAllText("./encryptionKeys/set-public-keys.json");
-
- var credentials =
- JsonConvert.DeserializeObject<dynamic>(
- File.ReadAllText("./encryptionKeys/credentials.json"))!;
-
- var senderClientId = (string)credentials.sender.clientId;
- var senderClientSecret = (string)credentials.sender.clientSecret;
- var subscriberClientId = (string)credentials.subscriber.clientId;
- var subscriberClientSecret = (string)credentials.subscriber.clientSecret;
- var destinationId = (string)credentials.destinationId;
- var leikaKey = (string)credentials.leikaKey;
- var callbackSecret = (string)credentials.callbackSecret;
-
- builder.Register(c => new MockSettings(
+ private static MockSettings? GetSettingsFromEnvironment() {
+ Console.WriteLine("Getting settings from environment");
+ var privateKeyDecryption =
+ Environment.GetEnvironmentVariable("MOCK_PRIVATE_KEY_DECRYPTION")!;
+ var privateKeySigning = Environment.GetEnvironmentVariable("MOCK_PRIVATE_KEY_SIGNING")!;
+ var publicKeyEncryption = Environment.GetEnvironmentVariable("MOCK_PUBLIC_KEY_ENCRYPTION")!;
+ var publicKeySignature = Environment.GetEnvironmentVariable("MOCK_PUBLIC_KEY_SIGNATURE")!;
+ var setPublicKeys = Environment.GetEnvironmentVariable("MOCK_SET_PUBLIC_KEYS")!;
+ var senderClientId = Environment.GetEnvironmentVariable("MOCK_SENDER_CLIENT_ID")!;
+ var senderClientSecret = Environment.GetEnvironmentVariable("MOCK_SENDER_CLIENT_SECRET")!;
+ var subscriberClientId = Environment.GetEnvironmentVariable("MOCK_SUBSCRIBER_CLIENT_ID")!;
+ var subscriberClientSecret =
+ Environment.GetEnvironmentVariable("MOCK_SUBSCRIBER_CLIENT_SECRET")!;
+ var destinationId = Environment.GetEnvironmentVariable("MOCK_DESTINATION_ID")!;
+ var leikaKey = Environment.GetEnvironmentVariable("MOCK_LEIKA_KEY")!;
+ var callbackSecret = Environment.GetEnvironmentVariable("MOCK_CALLBACK_SECRET")!;
+
+ return new MockSettings(
+ privateKeyDecryption, privateKeySigning,
+ publicKeyEncryption, publicKeySignature,
+ senderClientId, senderClientSecret,
+ subscriberClientId, subscriberClientSecret,
+ destinationId, leikaKey, callbackSecret, setPublicKeys);
+ }
+
+ private static MockSettings? GetSettingsFromFiles() {
+ Console.WriteLine("Reading settings from files");
+ try {
+ var privateKeyDecryption =
+ File.ReadAllText("./encryptionKeys/privateKey_decryption.json");
+ var privateKeySigning = File.ReadAllText("./encryptionKeys/privateKey_signing.json");
+ var publicKeyEncryption =
+ File.ReadAllText("./encryptionKeys/publicKey_encryption.json");
+ var publicKeySignature =
+ File.ReadAllText("./encryptionKeys/publicKey_signature_verification.json");
+ var setPublicKeys = File.ReadAllText("./encryptionKeys/set-public-keys.json");
+
+ var credentials =
+ JsonConvert.DeserializeObject<dynamic>(
+ File.ReadAllText("./encryptionKeys/credentials.json"))!;
+
+ var senderClientId = (string)credentials.sender.clientId;
+ var senderClientSecret = (string)credentials.sender.clientSecret;
+ var subscriberClientId = (string)credentials.subscriber.clientId;
+ var subscriberClientSecret = (string)credentials.subscriber.clientSecret;
+ var destinationId = (string)credentials.destinationId;
+ var leikaKey = (string)credentials.leikaKey;
+ var callbackSecret = (string)credentials.callbackSecret;
+
+ return new MockSettings(
privateKeyDecryption, privateKeySigning,
publicKeyEncryption, publicKeySignature,
senderClientId, senderClientSecret,
subscriberClientId, subscriberClientSecret,
- destinationId, leikaKey, callbackSecret, setPublicKeys))
+ destinationId, leikaKey, callbackSecret, setPublicKeys);
+ }
+ catch {
+ Console.WriteLine("Files not found, using environment variables");
+ return null;
+ }
+ }
+
+
+ private static MockSettings CreateEncryptionSettings(ContainerBuilder builder) {
+ var settings = Environment.GetEnvironmentVariable("ENVIRONMENT_DRIVEN_TEST") == null
+ ? GetSettingsFromFiles()
+ : GetSettingsFromEnvironment();
+ if (settings == null)
+ throw new ArgumentException("Could not find settings file nor environment variables");
+
+ builder.Register(c => settings)
.As<MockSettings>();
- builder.Register(c => new KeySet {
- PrivateKeyDecryption = privateKeyDecryption,
- PrivateKeySigning = privateKeySigning,
- PublicKeyEncryption = publicKeyEncryption,
- PublicKeySignatureVerification = publicKeySignature
- }).As<KeySet>();
+ builder.Register(c => settings.ToKeySet()).As<KeySet>();
+
+ return settings;
}
private static Mock<IRouteService> CreateRouteService() {
@@ -175,3 +217,14 @@ public static class Container {
return submissionService;
}
}
+
+public static class MockSettingsExtensions {
+ public static KeySet ToKeySet(this MockSettings settings) {
+ return new KeySet() {
+ PrivateKeyDecryption = settings.PrivateKeyDecryption,
+ PrivateKeySigning = settings.PrivateKeySigning,
+ PublicKeyEncryption = settings.PublicKeyEncryption,
+ PublicKeySignatureVerification = settings.PublicKeySignatureVerification
+ };
+ }
+}
diff --git a/install_reuse.sh b/install_reuse.sh
new file mode 100755
index 0000000000000000000000000000000000000000..c10672a78718c52a932771b6071283aabbc045cc
--- /dev/null
+++ b/install_reuse.sh
@@ -0,0 +1,12 @@
+#!/bin/zsh
+
+# SPDX-FileCopyrightText: 2022 2022 FIT-Connect contributors
+#
+# SPDX-License-Identifier: EUPL-1.2
+
+brew install pipx
+pipx ensurepath
+
+# pipx run reuse addheader --copyright='2022 FIT-Connect contributors' --license 'EUPL-1.2' --skip-unrecognised --recursive .
+
+pipx run reuse lint
diff --git a/readme.md b/readme.md
index d8d28ef326e036a932a58e9f13e963b38af8748d..be4687f084b3224d4e85a290410c43b21f4c1ca0 100644
--- a/readme.md
+++ b/readme.md
@@ -35,8 +35,7 @@ Das FitConnect SDK kann an die folgenden Umgebungen angeschlossen werden:
- Staging: ```FitConnectEnvironment.Staging```
- Production: ```FitConnectEnvironment.Production```
-
-[FIT Connect Umgebungen](https://docs.fitko.de/FIT-Connect/docs/getting-started/first-steps/#environments)
+[FIT Connect Umgebungen](https://docs.fitko.de/fit-connect/docs/getting-started/first-steps/#environments)
Hierfür muss der Client die Environment auswählen oder einen eigenen Environment-Parameter übergeben.
@@ -53,9 +52,16 @@ flowchart LR
destination(WithDestination)
service(WithServiceType)
attachments(WithAttachments)
- data([WithData])
+ data(WithData)
+ encAttachments(WithEncryptedAttachments)
+ encMetadata(WithEncryptedMetadata)
+ encData(WithEncryptedData)
+ submit([Submit])
start-->destination-->service-->attachments-->data
+ service-->encAttachments-->encMetadata-->encData
+ data-->submit
+ encData-->submit
```
Das SDK verhindert auf Grund der FluentAPI, dass die Methoden in der falschen Reihe aufgerufen werden können.
@@ -208,10 +214,16 @@ Weißt die Submission zurück.
# Router
-Die Client-Implementierung der Router API
+Die Client-Implementierung der Router API
```csharp
Client.GetRouter(FitConnectEnvironment.Development, logger);
```
-[glossary](https://docs.fitko.de/FIT-Connect/docs/glossary/)
+[glossary](https://docs.fitko.de/fit-connect/docs/glossary/)
+
+### License
+
+Source code is licensed under the [EUPL](LICENSES/EUPL-1.2.txt).
+
+Rechtlicher Hinweis: Dieses Software Development Kit (SDK) ist dazu bestimmt, die Anbindung einer Software an die FIT-Connect-Infrastruktur zu ermöglichen. Hierfür kann das SDK in die anzubindenden Software integriert werden. Erfolgt die Integration des SDK in unveränderter Form, liegt keine Bearbeitung im Sinne der EUPL bzw. des deutschen Urheberrechts vor. Die Art und Weise der Verlinkung des SDK führt insbesondere nicht zur Schaffung eines abgeleiteten Werkes. Die unveränderte Übernahme des SDK in eine anzubindende Software führt damit nicht dazu, dass die anzubindende Software unter den Bedingungen der EUPL zu lizenzieren ist. Für die Weitergabe des SDK selbst - in unveränderter oder bearbeiteter Form, als Quellcode oder ausführbares Programm - gelten die Lizenzbedingungen der EUPL in unveränderter Weise.