Merge branch 'main' into CVE-2026-42035

Author: sbouchet

build/scripts/code-sshd-page/server.js

@@ -37,7 +37,7 @@ const server = http.createServer((req, res) => {
 
     let genKey = "PRIVATE KEY NOT FOUND";
     try {
-      genKey = fs.readFileSync(`/sshd/ssh_client_ed25519_key`, 'utf8');
+      genKey = fs.readFileSync(`/sshd/ssh_client_key`, 'utf8');
     } catch (err) {
      // continue
     }
@@ -113,8 +113,9 @@ const server = http.createServer((req, res) => {
   HostName 127.0.0.1
   User ${username}
   Port 2022
-  IdentityFile "$\{HOME\}/.ssh/ssh_client_ed25519_key"
-  UserKnownHostsFile /dev/null</pre>
+  IdentityFile "$\{HOME\}/.ssh/ssh_client_key"
+  UserKnownHostsFile /dev/null
+  StrictHostKeyChecking no</pre>
         </div>
         <div class="clipboard">
           <a href="#">
@@ -126,7 +127,7 @@ const server = http.createServer((req, res) => {
         </div>
         </div>
         <p>
-        Where <code class="path">$\{HOME\}/.ssh/ssh_client_ed25519_key</code> should be replaced by the absolute path to the private key file on your local system.
+        Where <code class="path">$\{HOME\}/.ssh/ssh_client_key</code> should be replaced by the absolute path to the private key file on your local system.
         </p>
         </li>
       </ol>

build/scripts/sshd.start

@@ -79,11 +79,10 @@ fi
 mkdir /var/tmp/ssh
 chmod 755 /var/tmp/ssh
 
-# Generate SSH Host keys
-$sshd_libdir/ssh-keygen -q -N "" -t dsa -f /var/tmp/ssh/ssh_host_dsa_key && \
-$sshd_libdir/ssh-keygen -q -N "" -t rsa -b 4096 -f /var/tmp/ssh/ssh_host_rsa_key && \
-$sshd_libdir/ssh-keygen -q -N "" -t ecdsa -f /var/tmp/ssh/ssh_host_ecdsa_key && \
-$sshd_libdir/ssh-keygen -q -N "" -t ed25519 -f /var/tmp/ssh/ssh_host_ed25519_key
+echo 'Generating SSH host keys ..'
+$sshd_libdir/ssh-keygen -q -N "" -t rsa -b 4096 -f /var/tmp/ssh/ssh_host_rsa_key || true
+$sshd_libdir/ssh-keygen -q -N "" -t ecdsa -f /var/tmp/ssh/ssh_host_ecdsa_key || true
+$sshd_libdir/ssh-keygen -q -N "" -t ed25519 -f /var/tmp/ssh/ssh_host_ed25519_key || true
 
 # Ensure appropriate permissions
 chmod 600 /var/tmp/ssh/ssh_host_* /sshd/sshd_config
@@ -107,10 +106,12 @@ sed -i \
 # Use keys that have been configured, and generate them otherwise
 mkdir -p $HOME/.ssh
 if [ -f /etc/ssh/dwo_ssh_key.pub ]; then
+  echo 'Using pre-configured SSH client key.'
   cp /etc/ssh/dwo_ssh_key.pub $HOME/.ssh/authorized_keys
 else
-  $sshd_libdir/ssh-keygen -q -N '' -t ed25519 -f /sshd/ssh_client_ed25519_key
-  cp /sshd/ssh_client_ed25519_key.pub $HOME/.ssh/authorized_keys
+  echo 'Generating SSH client key..'
+  $sshd_libdir/ssh-keygen -q -N '' -t ecdsa -f /sshd/ssh_client_key
+  cp /sshd/ssh_client_key.pub $HOME/.ssh/authorized_keys
 fi
 
 cp /sshd/sshd_config /var/tmp/ssh/

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "che-code",
-  "version": "7.117.0-next",
+  "version": "7.118.0-next",
   "description": "Run Code-OSS on kubernetes",
   "scripts": {
     "prepare": "cd code && npm install && npm run download-builtin-extensions",