Merge pull request #764 from snyk/fix/make-primary-srv-request-to-rig…

…ht-place fix: secondary to primary calls to right endpoint
snyk · May 10, 2024 · afc4f45 · afc4f45
2 parents f9399dd + ee9c9b2
commit afc4f45
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/lib/server/routesHandlers/httpRequestHandler.ts b/lib/server/routesHandlers/httpRequestHandler.ts
@@ -28,6 +28,7 @@ export const overloadHttpRequestWithConnectionDetailsMiddleware = async (
       localHostname.match(regex)
     ) {
       const url = new URL(`http://${req.hostname}${req.url}`);
+      url.hostname = req.hostname.replace(/-[0-9]{1,2}$/, '');
       url.searchParams.append('connection_role', 'primary');
       logger.debug({}, 'Making request to primary');
       const postFilterPreparedRequest: PostFilterPreparedRequest = {

diff --git a/test/unit/old-client-redirect.test.ts b/test/unit/old-client-redirect.test.ts
@@ -34,7 +34,7 @@ jest.mock('node:os', () => {
 
 describe('Testing older clients specific logic', () => {
   it('Testing the old client redirected to primary from secondary pods', async () => {
-    nock(`http://127.0.0.1`)
+    nock(`http://my-server-name`)
       .persist()
       .get(
         '/broker/7fe7a57b-aa0d-416a-97fc-472061737e25/path?connection_role=primary',
@@ -49,14 +49,15 @@ describe('Testing older clients specific logic', () => {
       overloadHttpRequestWithConnectionDetailsMiddleware,
     );
 
-    const response = await request(app).get(
-      '/broker/7fe7a57b-aa0d-416a-97fc-472061737e25/path',
-    );
+    const response = await request(app)
+      .get('/broker/7fe7a57b-aa0d-416a-97fc-472061737e25/path')
+      .set('Host', 'my-server-name-1');
+
     expect(response.status).toEqual(200);
     expect(response.body).toEqual({ test: 'value' });
   });
   it('Testing the old client redirected to primary from secondary pods - POST request', async () => {
-    nock(`http://127.0.0.1`)
+    nock(`http://my-server-name`)
       .persist()
       .post(
         '/broker/7fe7a57b-aa0d-416a-97fc-472061737e25/path?connection_role=primary',
@@ -73,6 +74,7 @@ describe('Testing older clients specific logic', () => {
 
     const response = await request(app)
       .post('/broker/7fe7a57b-aa0d-416a-97fc-472061737e25/path')
+      .set('Host', 'my-server-name-1')
       .send({ test: 'value2' });
 
     expect(response.status).toEqual(200);
@@ -82,7 +84,7 @@ describe('Testing older clients specific logic', () => {
     const fileJson = JSON.parse(
       readFileSync(`${fixtures}/accept/ghe.json`).toString(),
     );
-    nock(`http://127.0.0.1`)
+    nock(`http://my-server-name`)
       .persist()
       .get(
         '/broker/7fe7a57b-aa0d-416a-97fc-472061737e25/file?connection_role=primary',
@@ -97,9 +99,9 @@ describe('Testing older clients specific logic', () => {
       overloadHttpRequestWithConnectionDetailsMiddleware,
     );
 
-    const response = await request(app).get(
-      '/broker/7fe7a57b-aa0d-416a-97fc-472061737e25/file',
-    );
+    const response = await request(app)
+      .get('/broker/7fe7a57b-aa0d-416a-97fc-472061737e25/file')
+      .set('Host', 'my-server-name-1');
 
     expect(response.status).toEqual(200);
     expect(response.body).toEqual(fileJson);