Bug #2694 (#2731) (#2742)

Co-authored-by: Siddhu545 <[email protected]>
Co-authored-by: Josh Mock <[email protected]>
Co-authored-by: Siddharth Khengare <[email protected]>

Author: 4 people

src/client.ts

@@ -203,10 +203,32 @@ export default class Client extends API {
     if ((opts.cloud != null || opts.serverMode === 'serverless') && opts[kChild] === undefined) {
       if (opts.cloud != null) {
         const { id } = opts.cloud
+        if (typeof id !== 'string') {
+          throw new errors.ConfigurationError('Cloud ID must be a string.')
+        }
+
+        const parts = id.split(':')
+        if (parts.length !== 2 || parts[1] === '') {
+          throw new errors.ConfigurationError(
+            'Cloud ID must be in the format "name:base64string".'
+          )
+        }
+
         // the cloud id is `cluster-name:base64encodedurl`
         // the url is a string divided by two '$', the first is the cloud url
         // the second the elasticsearch instance, the third the kibana instance
-        const cloudUrls = Buffer.from(id.split(':')[1], 'base64').toString().split('$')
+
+        let cloudUrls
+        try {
+          cloudUrls = Buffer.from(parts[1], 'base64').toString().split('$')
+        } catch (err) {
+          throw new errors.ConfigurationError('Cloud ID base64 decoding failed.')
+        }
+        if (cloudUrls.length < 2 || cloudUrls[0] === '' || cloudUrls[1] === '') {
+          throw new errors.ConfigurationError(
+            'Cloud ID base64 must contain at least two "$" separated parts: "<cloudUrl>$<esId>[$<kibanaId>]".'
+          )
+        }
 
         opts.node = `https://${cloudUrls[1]}.${cloudUrls[0]}`
       }

test/unit/client.test.ts

@@ -287,9 +287,25 @@ test('Elastic Cloud config', t => {
   t.equal(connection?.url.hostname, 'abcd.localhost')
   t.equal(connection?.url.protocol, 'https:')
 
+  t.test('Invalid Cloud ID will throw ConfigurationError', t => {
+    t.throws(() => new Client({
+      cloud : {
+        id : 'invalidCloudIdThatIsNotBase64'
+      },
+      auth : {
+        username: 'elastic',
+        password: 'changeme'
+      }
+
+    }), errors.ConfigurationError)
+    t.end()
+  })
+
   t.end()
 })
 
+
+
 test('Override default Elastic Cloud options', t => {
   const client = new Client({
     cloud: {