Add CA certificates from all bundles from /public-certs directory (#1038

) Signed-off-by: Mykola Morhun <mmorhun@redhat.com>
eclipse-che · Mar 18, 2021 · d059cdf · d059cdf
1 parent abb6768
commit d059cdf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/.../eclipse-che-theia-remote-impl-che-server/src/node/che-server-certificate-service-impl.ts b/.../eclipse-che-theia-remote-impl-che-server/src/node/che-server-certificate-service-impl.ts
@@ -30,11 +30,9 @@ export class CheServerCertificateServiceImpl implements CertificateService {
     if (existsPublicCrt) {
       const publicCertificates = await fs.readdir(PUBLIC_CRT_PATH);
       for (const publicCertificate of publicCertificates) {
-        if (publicCertificate.endsWith('.crt')) {
-          const certPath = path.join(PUBLIC_CRT_PATH, publicCertificate);
-          const content = await fs.readFile(certPath);
-          certificateAuthority.push(content);
-        }
+        const certPath = path.join(PUBLIC_CRT_PATH, publicCertificate);
+        const content = await fs.readFile(certPath);
+        certificateAuthority.push(content);
       }
     }
 

diff --git a/extensions/eclipse-che-theia-remote-impl-k8s/src/node/k8s-certificate-service-impl.ts b/extensions/eclipse-che-theia-remote-impl-k8s/src/node/k8s-certificate-service-impl.ts
@@ -30,11 +30,9 @@ export class K8sCertificateServiceImpl implements CertificateService {
     if (existsPublicCrt) {
       const publicCertificates = await fs.readdir(PUBLIC_CRT_PATH);
       for (const publicCertificate of publicCertificates) {
-        if (publicCertificate.endsWith('.crt')) {
-          const certPath = path.join(PUBLIC_CRT_PATH, publicCertificate);
-          const content = await fs.readFile(certPath);
-          certificateAuthority.push(content);
-        }
+        const certPath = path.join(PUBLIC_CRT_PATH, publicCertificate);
+        const content = await fs.readFile(certPath);
+        certificateAuthority.push(content);
       }
     }
 

diff --git a/plugins/workspace-plugin/src/ca-cert.ts b/plugins/workspace-plugin/src/ca-cert.ts
@@ -46,10 +46,8 @@ export const getCertificate = new Promise<string | undefined>(async resolve => {
   if (await fs.pathExists(PUBLIC_CRT_PATH)) {
     const publicCertificates = await fs.readdir(PUBLIC_CRT_PATH);
     for (const publicCertificate of publicCertificates) {
-      if (publicCertificate.endsWith('.crt')) {
-        const certPath = path.join(PUBLIC_CRT_PATH, publicCertificate);
-        certificates.push(await fs.readFile(certPath));
-      }
+      const certPath = path.join(PUBLIC_CRT_PATH, publicCertificate);
+      certificates.push(await fs.readFile(certPath));
     }
   }