Merge remote-tracking branch 'origin/bugfix/CLDSRV-755' into w/9.1/bugfix/CLDSRV-755

Author: Kerkesni

lib/routes/routeBackbeat.js

@@ -1450,7 +1450,7 @@ function routeIndexingAPIs(request, response, userInfo, log, callback) {
 }
 
 function routeBackbeatAPIProxy(request, response, requestContexts, log) {
-    const path = request.url.replace('/_/backbeat/api', '/_/');
+    const path = request.url.replace('/_/backbeat/api/', '/_/');
     const { host, port } = config.backbeat;
     const target = `http://${host}:${port}${path}`;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenko/cloudserver",
-  "version": "9.1.3",
+  "version": "9.1.4",
   "description": "Zenko CloudServer, an open-source Node.js implementation of a server handling the Amazon S3 protocol",
   "main": "index.js",
   "engines": {

tests/unit/routes/routeBackbeat.js

@@ -1,6 +1,7 @@
 const assert = require('assert');
 const sinon = require('sinon');
 const async = require('async');
+const http = require('http');
 const { promisify } = require('util');
 const metadataUtils = require('../../../lib/metadata/metadataUtils');
 const storeObject = require('../../../lib/api/apiUtils/object/storeObject');
@@ -702,6 +703,58 @@ describe('routeBackbeat', () => {
         assert.deepStrictEqual(mockResponse.body, null);
     });
     });
+
+    describe('routeBackbeatAPIProxy', () => {
+        let mockBackbeat;
+
+        const request = new DummyRequest({
+            method: 'POST',
+            url: '/_/backbeat/api/ingestion/pause',
+            socket: {
+                remoteAddress: '127.0.0.1',
+            },
+        }, Buffer.from(''));
+
+        beforeEach(() => {
+            mockBackbeat = http.createServer((req, res) => {
+                res.writeHead(200);
+                res.end();
+            });
+            mockBackbeat.listen(config.backbeat.port);
+        });
+
+        afterEach(() => {
+            mockBackbeat.close();
+            sinon.restore();
+        });
+
+        it('should correctly proxy the request to the backbeat API', async () => {
+            sinon.stub(auth.server, 'doAuth').yields(null, new AuthInfo({
+                canonicalID: 'abcdef/lifecycle',
+                accountDisplayName: 'Lifecycle Service Account',
+            }), undefined, undefined, undefined);
+
+            endPromise = new Promise(resolve => { resolveEnd = resolve; });
+            const response = {
+                on: sinon.stub(),
+                once: sinon.stub(),
+                emit: sinon.stub(),
+                setHeader: sinon.stub(),
+                end: sinon.stub().callsFake(() => {
+                    resolveEnd();
+                })
+            };
+
+            routeBackbeat('127.0.0.1', request, response, log);
+
+            void await endPromise;
+
+            const proxyReq = response.emit.getCall(0).args[1].req;
+            assert.strictEqual(proxyReq.method, 'POST');
+            assert.strictEqual(proxyReq.path, '/_/ingestion/pause');
+            assert.strictEqual(proxyReq.getHeader('host'), `localhost:${config.backbeat.port}`);
+        });
+    });
 });
 
 describe('routeBackbeat authorization', () => {