Merge branch 'main' of https://github.com/kyma-project/busola into post-conversations

chriskari · chriskari · commit 701547f7408e · 2025-02-19T09:08:58.000+01:00
diff --git a/.github/workflows/accessibility-tests.yml b/.github/workflows/accessibility-tests.yml
@@ -27,7 +27,7 @@ jobs:
           ./.github/scripts/install-kyma.sh | tee kyma-alpha-deploy.log
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
       - name: Setup busola
         shell: bash
         run: |
diff --git a/.github/workflows/pull-integration-cluster-k3d.yml b/.github/workflows/pull-integration-cluster-k3d.yml
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/setup-node@v4
         name: Setup node
         with:
-          node-version: 20
+          node-version: 22
       - name: Setup Busola
         shell: bash
         run: |
diff --git a/.github/workflows/pull-integration-namespace-k3d.yml b/.github/workflows/pull-integration-namespace-k3d.yml
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/setup-node@v4
         name: Setup node
         with:
-          node-version: 20
+          node-version: 22
       - name: Setup Busola
         shell: bash
         run: |
diff --git a/.github/workflows/pull-kyma-integration-tests.yml b/.github/workflows/pull-kyma-integration-tests.yml
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/setup-node@v4
         name: Setup node
         with:
-          node-version: 20
+          node-version: 22
       - name: Deploy Busola
         id: deploy_busola
         shell: bash
diff --git a/.github/workflows/pull-lighthouse.yml b/.github/workflows/pull-lighthouse.yml
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/setup-node@v4
         name: Setup node
         with:
-          node-version: 20
+          node-version: 22
       - name: Run busola
         shell: bash
         run: |
diff --git a/.github/workflows/pull-smoke-test-prod.yml b/.github/workflows/pull-smoke-test-prod.yml
@@ -36,7 +36,7 @@ jobs:
           ./.github/scripts/install-kyma.sh | tee kyma-alpha-deploy.log
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
       - name: setup_busola
         shell: bash
         run: |
diff --git a/.github/workflows/pull-smoke-test-stage.yml b/.github/workflows/pull-smoke-test-stage.yml
@@ -35,7 +35,7 @@ jobs:
           ./.github/scripts/install-kyma.sh | tee kyma-alpha-deploy.log
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
       - name: Setup Busola
         shell: bash
         run: |
diff --git a/.github/workflows/pull-unit-tests.yml b/.github/workflows/pull-unit-tests.yml
@@ -27,7 +27,7 @@ jobs:
         uses: ./.github/actions/merge
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
       - name: setup_busola
         shell: bash
         run: |
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # this is a Dockerfile for single deployment app - both backend and frontends
 
 # ---- Base Alpine with Node ----
-FROM node:20.17-alpine3.20  AS builder
+FROM node:22.14-alpine3.21 AS builder
 ARG default_tag
 ARG tag
 
@@ -27,7 +27,7 @@ RUN npm run build:docker
 RUN cd /app/backend && npm run build
 
 # ---- Environments Configuration ----
-FROM node:20.17-alpine3.20 AS configuration
+FROM node:22.14-alpine3.21 AS configuration
 WORKDIR /kyma
 
 RUN apk add make
@@ -39,7 +39,7 @@ RUN npm ci
 RUN make prepare-configuration
 
 # ---- Serve ----
-FROM alpine:3.20.2
+FROM alpine:3.21.3
 WORKDIR /app
 
 RUN apk --no-cache upgrade && \
diff --git a/Dockerfile.web b/Dockerfile.web
@@ -1,5 +1,5 @@
 # ---- Base Alpine with Node ----
-FROM node:20.17-alpine3.20  AS builder
+FROM node:22.14-alpine3.21  AS builder
 ARG default_tag
 ARG tag
 
@@ -22,7 +22,7 @@ RUN export TAG=${tag:-$default_tag} &&  yq -i '.version = "'${TAG}'"' public/ver
 RUN npm run build:docker
 
 # ---- Environments Configuration ----
-FROM node:20.17-alpine3.20 as configuration
+FROM node:22.14-alpine3.21 as configuration
 WORKDIR /kyma
 
 RUN apk add make
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Busola project contains additional sub-projects:
 ## Prerequisites
 
 - [`npm`](https://www.npmjs.com/) in version 10.x
-- [`node`](https://nodejs.org/en/) in version 20.x
+- [`node`](https://nodejs.org/en/) in version 22.x
 
 Busola supports:
 
diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -1,5 +1,5 @@
 # ---- Base Alpine with Node ----
-FROM alpine:3.20.3 AS base
+FROM alpine:3.21.3 AS base
 # install node
 RUN apk add --update nodejs npm
 
diff --git a/backend/common.js b/backend/common.js
@@ -7,6 +7,7 @@ const express = require('express');
 const path = require('path');
 const fs = require('fs');
 const uuid = require('uuid').v4;
+const escape = require('lodash.escape');
 
 // https://github.tools.sap/sgs/SAP-Global-Trust-List/blob/master/approved.pem
 const certs = fs.readFileSync('certs.pem', 'utf8');
@@ -47,7 +48,7 @@ export const makeHandleRequest = () => {
         id: req.id,
         method: req.method,
         url: req.url,
-        apiServerAddress: req.headers['x-cluster-url'],
+        apiServerAddress: escape(req.headers['x-cluster-url']),
         code: req.code,
         stack: req.stack,
         type: req.type,
@@ -63,6 +64,7 @@ export const makeHandleRequest = () => {
       headersData = extractHeadersData(req);
     } catch (e) {
       req.log.error('Headers error:' + e.message);
+      res.contentType('text/plain');
       res.status(400).send('Headers are missing or in a wrong format.');
       return;
     }
@@ -71,7 +73,8 @@ export const makeHandleRequest = () => {
       filters.forEach(filter => filter(req, headersData));
     } catch (e) {
       req.log.error('Filters rejected the request: ' + e.message);
-      res.status(400).send('Request ID: ' + req.id);
+      res.contentType('text/plain');
+      res.status(400).send('Request ID: ' + escape(req.id));
       return;
     }
 
@@ -120,7 +123,10 @@ export const makeHandleRequest = () => {
 
     function throwInternalServerError(originalError) {
       req.log.warn(originalError);
-      res.status(502).send('Request ID: ' + req.id);
+      res.contentType('text/plain');
+      res
+        .status(502)
+        .send('Internal server error. Request ID: ' + escape(req.id));
     }
   };
 };
@@ -143,11 +149,19 @@ function extractHeadersData(req) {
   const clientKeyDataHeader = 'x-client-key-data';
   const authorizationHeader = 'x-k8s-authorization';
   let targetApiServer;
+
   if (req.headers[urlHeader]) {
-    targetApiServer = handleDockerDesktopSubsitution(
-      new URL(req.headers[urlHeader]),
-    );
+    try {
+      targetApiServer = handleDockerDesktopSubsitution(
+        new URL(req.headers[urlHeader]),
+      );
+    } catch (e) {
+      throw new Error('Invalid cluster URL provided.');
+    }
+  } else {
+    throw new Error('Missing required cluster URL.');
   }
+
   const ca = decodeHeaderToBuffer(req.headers[caHeader]) || certs;
   const cert = decodeHeaderToBuffer(req.headers[clientCAHeader]);
   const key = decodeHeaderToBuffer(req.headers[clientKeyDataHeader]);
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -20,6 +20,7 @@
     "https": "^1.0.0",
     "jose": "^5.2.4",
     "js-yaml": "^4.1.0",
+    "lodash.escape": "^4.0.1",
     "lodash.merge": "^4.6.2",
     "pino-http": "^5.7.0",
     "uuid": "^8.3.2"
diff --git a/kyma/README.md b/kyma/README.md
@@ -36,7 +36,7 @@ The `extensions` directory contains a general extensibility configuration to avo
 ## Prerequisites
 
 - [`npm`](https://www.npmjs.com/) in version 10.x
-- [Node.js](https://nodejs.org/en/) in version 20.x
+- [Node.js](https://nodejs.org/en/) in version 22.x
 - [Make](https://www.gnu.org/software/make/)
 
 ## Installation
