From 6ccaf837d18267bb64a70873f8534b38f95aeb9a Mon Sep 17 00:00:00 2001 From: Marta <84308731+martafullen@users.noreply.github.com> Date: Fri, 7 Jun 2024 12:12:37 +0200 Subject: [PATCH 1/6] image now includes curl and nano (#265) --- src/docker/Dockerfile-AasxServerBlazor | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/docker/Dockerfile-AasxServerBlazor b/src/docker/Dockerfile-AasxServerBlazor index 06351bd29..a24ba7faa 100644 --- a/src/docker/Dockerfile-AasxServerBlazor +++ b/src/docker/Dockerfile-AasxServerBlazor @@ -8,7 +8,8 @@ COPY ./LICENSE.TXT /repo/LICENSE.txt RUN dotnet publish -c Release -o /out/AasxServerBlazor AasxServerBlazor FROM mcr.microsoft.com/dotnet/aspnet:6.0 as base -RUN apt-get update && apt-get install -y libgdiplus +RUN apt update && apt upgrade --yes +RUN apt install -y curl nano libgdiplus EXPOSE 5001 COPY --from=build-env /out/AasxServerBlazor/ /AasxServerBlazor/ COPY ./content-for-demo/ /AasxServerBlazor/ From fd25fd76ca98da4d419218e904005f6d15ad73d7 Mon Sep 17 00:00:00 2001 From: Oliver Date: Mon, 10 Jun 2024 10:37:48 +0200 Subject: [PATCH 2/6] Update CONTRIBUTORS.md From 7f898172847934997785fc5f838588a501f9bb74 Mon Sep 17 00:00:00 2001 From: Oliver Date: Mon, 10 Jun 2024 11:10:47 +0200 Subject: [PATCH 3/6] Update CONTRIBUTORS.md --- CONTRIBUTORS.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 53f42f193..1d19dad77 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -5,7 +5,7 @@ contributes to this project. ## Contributing Companies -> NOTE: The names of contributing companies and individuals are sorted alphabetically solely for improved readability and do not reflect any value or hierarchy. +> **NOTE**: The names of contributing companies and individuals are sorted alphabetically solely for improved readability and do not reflect any value or hierarchy. Our heartfelt thanks go to the following companies and institutes, whose support and collaboration have been invaluable to the success of this project. Their contributions matter greatly and are deeply appreciated: @@ -23,6 +23,9 @@ contributions matter greatly and are deeply appreciated: | [TUD Dresden University of Technology](https://tu-dresden.de/) | TU Dresden Logo | | [ZHAW Zürcher Hochschule für Angewandte Wissenschaften](https://www.zhaw.ch/) | ZHAW Logo | +> **NOTE:** All logos provided here are direct links from the respective company or organization's website and are not stored or used directly on our site. Each logo is licensed under its respective organization. The rights to use these logos within this project are held by the IDTA e.V.; however, the original rights remain with the respective organizations. For any questions or requests regarding additional use, please contact the IDTA at info@idtwin.org. + + ## Contributing People We are profoundly grateful to the following individuals for their time, effort, and dedication. Their contributions have been instrumental in the development @@ -32,12 +35,12 @@ and success of this project: * [AlexanderWollbrink](https://github.com/AlexanderWollbrink) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/)) * [Andreas Orzelski](https://github.com/aorzelskiGH) ([Phoenix Contact](https://www.phoenixcontact.com/)) * [Bastian Roessl](mailto:bastian.roessl@iosb-ina.fraunhofer.de) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/)) -* [dschubertpxc](https://github.com/dschubertpxc) +* [dschubertpxc](https://github.com/dschubertpxc) ([Phoenix Contact](https://www.phoenixcontact.com/)) * [Gerd Brost](mailto:gerd.brost@aisec.fraunhofer.de) ([Fraunhofer AISEC](https://www.aisec.fraunhofer.de/)) * [Harish Itian](https://github.com/harishpakala) ([Otto Von Guericke University](https://www.ovgu.de)) * [jjtikekar](https://github.com/jjtikekar) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/)) * [Juilee Tikekar](https://github.com/juileetikekar) ([Industrial Digital Twin Association e.V. (IDTA)](https://www.idtwin.org/)) -* [Magnus Redeker](https://github.com/magnus-redeker) +* [Magnus Redeker](https://github.com/magnus-redeker) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/)) * [Marko Ristin](https://github.com/mristin) ([ZHAW Zürcher Hochschule für Angewandte Wissenschaften](https://www.zhaw.ch/)) * [Marta Fullen](https://github.com/martafullen) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/)) * [Michael Hoffmeister](https://github.com/MichaelHoffmeisterFesto) ([Festo](https://www.festo.com)) From a0b029788941f8c090625398a99bd3ac515ea40b Mon Sep 17 00:00:00 2001 From: juileetikekar Date: Mon, 10 Jun 2024 14:10:36 +0200 Subject: [PATCH 4/6] Add parameters "external-blazor" --- src/AasxServerBlazor/startForDemo.bat | 2 +- src/AasxServerBlazor/startForDemo.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AasxServerBlazor/startForDemo.bat b/src/AasxServerBlazor/startForDemo.bat index 464eeec0f..38a0003ca 100644 --- a/src/AasxServerBlazor/startForDemo.bat +++ b/src/AasxServerBlazor/startForDemo.bat @@ -1 +1 @@ -AasxServerBlazor.exe --no-security --data-path aasxs +AasxServerBlazor.exe --no-security --data-path aasxs --external-blazor http://localhost:5001 diff --git a/src/AasxServerBlazor/startForDemo.sh b/src/AasxServerBlazor/startForDemo.sh index bdf52e0f6..9eead6701 100755 --- a/src/AasxServerBlazor/startForDemo.sh +++ b/src/AasxServerBlazor/startForDemo.sh @@ -1 +1 @@ -dotnet AasxServerBlazor.dll --no-security --data-path ./aasxs --host 0.0.0.0 $OPTIONSAASXSERVER \ No newline at end of file +dotnet AasxServerBlazor.dll --no-security --data-path ./aasxs --external-blazor http://localhost:5001 \ No newline at end of file From 78fa4aef52b111e0d5ad355d7726df7b0aa1c0b5 Mon Sep 17 00:00:00 2001 From: aorzelskiGH Date: Mon, 10 Jun 2024 14:32:12 +0200 Subject: [PATCH 5/6] Fix null in .value --- src/AasxServerBlazor/Properties/launchSettings.json | 6 +++--- src/AasxServerStandardBib/SecurityClient.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/AasxServerBlazor/Properties/launchSettings.json b/src/AasxServerBlazor/Properties/launchSettings.json index a98906cea..a6384874b 100644 --- a/src/AasxServerBlazor/Properties/launchSettings.json +++ b/src/AasxServerBlazor/Properties/launchSettings.json @@ -1,4 +1,4 @@ -{ +{ "profiles": { "IIS Express": { "commandName": "IISExpress", @@ -10,11 +10,11 @@ }, "AasxServerBlazor": { "commandName": "Project", - "commandLineArgs": "--no-security --secret-string-api 1234 --aasx-in-memory 1000 --data-path \"C:\\Development\" --edit --external-blazor http://localhost:5001", + "commandLineArgs": "--no-security --secret-string-api 1234 --aasx-in-memory 1000 --data-path \"\\\\wsl.localhost\\Ubuntu\\home\\oze\\plugfest\\aasxs-repository\" --edit --external-blazor http://localhost:5001", "launchBrowser": true, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development", - "AASREGISTRY": "https://registry.dpp40-2-v2.industrialdigitaltwin.org", + "AASREGISTRY": "http://localhost:50001", "IFRAMEPATH": "https://dpp40-2-v2.industrialdigitaltwin.org/dashboard/submodelViewV3.html" }, "applicationUrl": "http://localhost:5001", diff --git a/src/AasxServerStandardBib/SecurityClient.cs b/src/AasxServerStandardBib/SecurityClient.cs index dde5af27d..d8effc0be 100644 --- a/src/AasxServerStandardBib/SecurityClient.cs +++ b/src/AasxServerStandardBib/SecurityClient.cs @@ -333,7 +333,7 @@ static void operation_authenticate(Operation op, int envIndex, DateTime timeStam if (authServerEndPoint != null && authServerCertificate != null && clientCertificate != null && accessToken != null) { - if (accessToken.Value != "") + if (!string.IsNullOrWhiteSpace(accessToken.Value)) { bool valid = true; var jwtToken = new JwtSecurityToken(accessToken.Value); From 765fa900efd23de42f74a05a87ff44b65e081c50 Mon Sep 17 00:00:00 2001 From: aorzelskiGH Date: Mon, 10 Jun 2024 14:44:46 +0200 Subject: [PATCH 6/6] Fix value null --- src/AasxServerStandardBib/SecurityClient.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/AasxServerStandardBib/SecurityClient.cs b/src/AasxServerStandardBib/SecurityClient.cs index d8effc0be..61d5f2401 100644 --- a/src/AasxServerStandardBib/SecurityClient.cs +++ b/src/AasxServerStandardBib/SecurityClient.cs @@ -333,7 +333,10 @@ static void operation_authenticate(Operation op, int envIndex, DateTime timeStam if (authServerEndPoint != null && authServerCertificate != null && clientCertificate != null && accessToken != null) { - if (!string.IsNullOrWhiteSpace(accessToken.Value)) + if (accessToken.Value == null) + accessToken.Value = ""; + + if (accessToken.Value != "") { bool valid = true; var jwtToken = new JwtSecurityToken(accessToken.Value);