Skip to content
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

Jump to bottom

Update NuGets and fix issue with data protection keys overwriting each other from different instances #146

Merged
merged 36 commits into from
Oct 18, 2022
Merged

Update NuGets and fix issue with data protection keys overwriting each other from different instances #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
16afbd0
Rename addressspace -> namespace
barnstee Apr 26, 2022
92f9843
Merge from Main.
barnstee Apr 26, 2022
17b8157
Disable logerror warning.
barnstee Apr 26, 2022
18d239e
Fix using Async in method names.
barnstee Apr 26, 2022
75acfce
Implement disposeable on postgresql implementation.
barnstee Apr 26, 2022
4d70b01
bug fix.
barnstee Apr 26, 2022
5d9610d
Bug and code analyzer warning fixes and fix naming of cloudlibclient …
barnstee Apr 26, 2022
d845ce6
Fix regression.
barnstee Apr 26, 2022
deebebb
Fix regression.
barnstee Apr 26, 2022
6d589b4
Fix formatting.
barnstee Apr 26, 2022
cb2535f
fix formatting.
barnstee Apr 26, 2022
fd9e30e
fix formatting.
barnstee Apr 26, 2022
e709c24
fix formatting.
barnstee Apr 26, 2022
7de7975
Fix formatting.
barnstee Apr 26, 2022
816c567
Added docker compose back into solution file and deleted extra soluti…
barnstee Apr 26, 2022
3e56015
Fix one more (misspelt) addressspace -> namespace rename.
barnstee Apr 26, 2022
b545744
Merge branch 'main' into erichb
barnstee Apr 27, 2022
e3c9b3d
Remove dups from category and org queries.
barnstee Apr 27, 2022
9609842
Remove unneeded using.
barnstee Apr 27, 2022
c225b94
Fix cut and paste error.
barnstee Apr 27, 2022
b721cae
Fix client lib.
barnstee Apr 27, 2022
a61049b
Merge branch 'main' into erichb
barnstee Apr 27, 2022
2c4efda
Merge branch 'main' into erichb
barnstee May 2, 2022
d2d3643
Merge branch 'main' into erichb
barnstee May 3, 2022
9e74212
Merge branch 'main' into erichb
barnstee May 17, 2022
cc9ae95
Property name change from nodesetCreationTime to publicationDate to b…
barnstee May 17, 2022
dde6a30
Fix for bug https://github.com/OPCFoundation/UA-CloudLibrary/issues/90
barnstee May 19, 2022
8600e02
Merge branch 'main' into erichb
barnstee Jun 20, 2022
91fed6f
Merge branch 'main' into erichb
barnstee Jul 13, 2022
bbe837b
Fixes security CVE-2022-30187 and maintain stack info on exception.
barnstee Jul 26, 2022
43da89c
Merge branch 'main' into erichb
barnstee Jul 27, 2022
33b92ae
Merge branch 'main' into erichb
barnstee Sep 5, 2022
043779b
Fix build break and CVEs.
barnstee Sep 6, 2022
715a3f5
Merge branch 'main' into erichb
barnstee Sep 8, 2022
eda075f
Merge branch 'main' into erichb
barnstee Oct 18, 2022
3eb4c30
Added Azure Data Protection Key per instance and updated NuGets.
barnstee Oct 18, 2022
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
10 changes: 7 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,11 +348,15 @@ MigrationBackup/

# Ionide (cross platform F# VS Code tools) working folder
.ionide/

*.bak
*.orig

/Tests/CloudLibClientTests/Properties/launchSettings.json
/Properties/launchSettings.json
/SampleConsoleClient/Properties/launchSettings.json

/UACloudLibraryServer/key-4fe0b423-c5df-420c-b3ae-6065476796ad.xml
/UACloudLibraryServer/key-f10e50be-5170-4621-b53a-63207cf7c4d3.xml
*.bak
*.orig
/UACloudLibraryServer/key-11993b0e-678c-41aa-98e2-66e04014e18a.xml
/Tests/CloudLibClientTests/Properties/launchSettings.json
/UACloudLibraryServer/key-05693226-ed9e-43ad-9909-f876686ef1a9.xml
11 changes: 6 additions & 5 deletions UACloudLibraryServer/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public void ConfigureServices(IServiceCollection services)
// setup data protection
switch (Configuration["HostingPlatform"])
{
case "Azure": services.AddDataProtection().PersistKeysToAzureBlobStorage(Configuration["BlobStorageConnectionString"], "keys", "keys"); break;
case "Azure": services.AddDataProtection().PersistKeysToAzureBlobStorage(Configuration["BlobStorageConnectionString"], "keys", Configuration["DataProtectionBlobName"]); break;
case "AWS": services.AddDataProtection().PersistKeysToAWSSystemsManager($"/{serviceName}/DataProtection"); break;
case "GCP": services.AddDataProtection().PersistKeysToGoogleCloudStorage(Configuration["BlobStorageConnectionString"], "DataProtectionProviderKeys.xml"); break;
default: services.AddDataProtection().PersistKeysToFileSystem(new DirectoryInfo(Directory.GetCurrentDirectory())); break;
Expand Down Expand Up @@ -225,10 +225,11 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, AppDbCon

app.UseAuthorization();

app.UseGraphQLPlayground(new PlaygroundOptions() {
RequestCredentials = RequestCredentials.Include
},
"/graphqlui");
app.UseGraphQLPlayground(
"/graphqlui",
new PlaygroundOptions() {
RequestCredentials = RequestCredentials.Include
});
app.UseGraphQLGraphiQL("/graphiql");

app.UseEndpoints(endpoints => {
Expand Down
61 changes: 32 additions & 29 deletions UACloudLibraryServer/UA-CloudLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,51 +16,54 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Amazon.AspNetCore.DataProtection.SSM" Version="2.1.0" />
<PackageReference Include="Amazon.AspNetCore.DataProtection.SSM" Version="3.0.0" />
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.2" />
<PackageReference Include="AWSSDK.S3" Version="3.7.8.10" />
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.1.130" />
<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.2.1" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.13.0" />
<PackageReference Include="Google.Cloud.Storage.V1" Version="3.7.0" />
<PackageReference Include="AWSSDK.S3" Version="3.7.9.69" />
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.1.215" />
<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.2.3" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.14.0" />
<PackageReference Include="Google.Cloud.Storage.V1" Version="4.1.0" />
<PackageReference Include="Google.Cloud.AspNetCore.DataProtection.Storage" Version="1.0.0-alpha03" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.5" />
<PackageReference Include="HotChocolate" Version="12.7.0" />
<PackageReference Include="HotChocolate.Data" Version="12.7.0" />
<PackageReference Include="HotChocolate.Types.Scalars" Version="12.7.0" />
<PackageReference Include="HotChocolate.AspNetCore" Version="12.7.0" />
<PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="12.7.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.10" />
<PackageReference Include="HotChocolate" Version="12.15.0" />
<PackageReference Include="HotChocolate.Data" Version="12.15.0" />
<PackageReference Include="HotChocolate.Types.Scalars" Version="12.15.0" />
<PackageReference Include="HotChocolate.AspNetCore" Version="12.15.0" />
<PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="12.15.0" />
<PackageReference Include="CESMII.OpcUa.NodeSetImporter" Version="1.0.0-beta.11" />
<PackageReference Include="CESMII.OpcUa.NodeSetModel.EF" Version="1.0.0-beta.11" />
<PackageReference Include="CESMII.OpcUa.NodeSetModel.Factory.Opc" Version="1.0.0-beta.11" />
<PackageReference Include="CESMII.OpcUa.NodeSetModel" Version="1.0.0-beta.11" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="5.2.1" />
<PackageReference Include="GraphQL.Server.Ui.Playground" Version="5.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.5">
<PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="7.1.1" />
<PackageReference Include="GraphQL.Server.Ui.Playground" Version="7.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.2" />
<PackageReference Include="Npgsql" Version="6.0.4" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.4" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
<PackageReference Include="Npgsql" Version="6.0.7" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.7" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.4.370.12" />
<PackageReference Include="SendGrid" Version="9.26.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.3.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.3.0" />
<PackageReference Include="SendGrid" Version="9.28.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
</ItemGroup>
</Project>