Update test branch

.github/workflows/ci_desktop.yml

@@ -7,6 +7,7 @@ on:
       - 'Src/WitsmlExplorer.Api/**'
       - 'Src/WitsmlExplorer.Frontend/**'
       - 'Src/WitsmlExplorer.Desktop/**'
+      - 'yarn.lock'
 
 permissions: {}
 
@@ -20,7 +21,7 @@ jobs:
         with:
           node-version: '20'
       - name: Install dependencies
-        run: yarn --network-timeout 100000
+        run: yarn install --frozen-lockfile --network-timeout 100000
         working-directory: ./Src/WitsmlExplorer.Desktop
       - name: Linting
         run: yarn lint

.github/workflows/ci_frontend.yml

@@ -5,6 +5,7 @@ on:
       - main
     paths:
       - 'Src/WitsmlExplorer.Frontend/**'
+      - 'yarn.lock'
 
 permissions: {}
 
@@ -18,7 +19,7 @@ jobs:
         with:
           node-version: '20'
       - name: Install dependencies
-        run: yarn
+        run: yarn install --frozen-lockfile
         working-directory: ./Src/WitsmlExplorer.Frontend
       - name: Linting
         run: yarn lint

.github/workflows/dispatch_merge.yml

@@ -18,6 +18,7 @@ jobs:
         run: |
           curl -L \
             -X POST \
+            -fS \
             -H "Accept: application/vnd.github+json" \
             -H "Authorization: Bearer ${{ secrets.DISPATCH_TOKEN }}"\
             -H "X-GitHub-Api-Version: 2022-11-28" \

.github/workflows/dispatch_tag.yml

@@ -29,6 +29,7 @@ jobs:
         run: |
           curl -L \
             -X POST \
+            -fS \
             -H "Accept: application/vnd.github+json" \
             -H "Authorization: Bearer ${{ secrets.DISPATCH_TOKEN }}"\
             -H "X-GitHub-Api-Version: 2022-11-28" \

.prettierrc.json

@@ -3,5 +3,6 @@
   "tabWidth": 2,
   "semi": true,
   "singleQuote": false,
-  "quoteProps": "consistent"
+  "quoteProps": "consistent",
+  "endOfLine": "lf"
 }

Directory.Packages.props

@@ -11,15 +11,17 @@
     </PackageVersion>
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.2" />
     <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.38.1" />
+    <PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.53.1" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Identity.Web" Version="2.17.1" />
+    <PackageVersion Include="Microsoft.Identity.Web" Version="4.1.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="MongoDB.Driver" Version="2.24.0" />
     <PackageVersion Include="Moq" Version="4.20.70" />
     <PackageVersion Include="NetCore.AutoRegisterDi" Version="2.2.1" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Serilog" Version="3.1.1" />
     <PackageVersion Include="Serilog.AspNetCore" Version="8.0.1" />
     <PackageVersion Include="Serilog.Expressions" Version="4.0.0" />
@@ -30,10 +32,13 @@
     <PackageVersion Include="Spectre.Console" Version="0.48.0" />
     <PackageVersion Include="Spectre.Console.Cli" Version="0.48.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageVersion Include="System.Formats.Asn1" Version="9.0.9" />
     <PackageVersion Include="System.Runtime.Caching" Version="8.0.1" />
+    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="6.0.3" />
     <PackageVersion Include="System.ServiceModel.Http" Version="8.0.0" />
     <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
     <PackageVersion Include="LiteDB" Version="5.0.19" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="xunit" Version="2.7.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>

Docker/Server/docker-compose.yml

@@ -1,6 +1,5 @@
 version: '3.7'
 services:
-
   mongo: # Remove this if you are not using mongodb.
     image: mongo:4.4.1
     container_name: witsmlexplorer-mongodb
@@ -30,15 +29,15 @@ services:
     container_name: witsmlexplorer-frontend
 
   nginx:
-    image: nginx:1.21-alpine
+    image: nginx:1.29-alpine
     restart: unless-stopped
     container_name: witsmlexplorer-nginx
     ports:
       - 80:80
       - 443:443
     volumes:
-      - /data/nginx:/etc/nginx     #May be changed
-      - /data/logs:/var/log/nginx  #May be changed
+      - /data/nginx:/etc/nginx #May be changed
+      - /data/logs:/var/log/nginx #May be changed
     depends_on:
       - web
       - api

Docker/Server/nginx.conf

@@ -25,6 +25,13 @@ http {
     ssl_certificate /etc/nginx/certs/public.cer;
     ssl_certificate_key /etc/nginx/certs/private.pem;
 
+    # Security headers to prevent XSS and other attacks
+    add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src 'self' data: blob:; font-src 'self' data:; connect-src 'self' ws: wss: https://login.microsoftonline.com https://*.login.microsoftonline.com; frame-ancestors 'none'; base-uri 'self'; form-action 'self'" always;
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header X-Frame-Options "DENY" always;
+    add_header X-XSS-Protection "1; mode=block" always;
+    add_header Referrer-Policy "strict-origin-when-cross-origin" always;
+
     location / {
       proxy_pass "http://web";
       error_log /var/log/front_end_errors.log;

Dockerfile-frontend

@@ -19,7 +19,7 @@ ENV VITE_AZURE_AD_SCOPE_API=${AZURE_AD_SCOPE_API}
 
 RUN yarn test && yarn build
 
-FROM nginx:1-alpine AS final
+FROM nginx:1.29-alpine AS final
 ARG EXPOSE_PORT=3000
 WORKDIR /usr/share/nginx/html
 RUN rm -rf ./*