From b07a19b961dc9521fd15d18f62e30990d4945f28 Mon Sep 17 00:00:00 2001
From: Grey Baker <greysteil@gmail.com>
Date: Tue, 2 Oct 2018 11:13:13 +0100
Subject: [PATCH] Ensure malformedRegistryResponse errors always have a
 dependency name (#6455)

---
 __tests__/registries/npm-registry.js     | 19 +++++++++++++++++++
 src/registries/npm-registry.js           |  5 +++--
 src/resolvers/registries/npm-resolver.js |  9 ++++++---
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/__tests__/registries/npm-registry.js b/__tests__/registries/npm-registry.js
index b9a85834cd..8fb5e57529 100644
--- a/__tests__/registries/npm-registry.js
+++ b/__tests__/registries/npm-registry.js
@@ -866,4 +866,23 @@ describe('checkOutdated functional test', () => {
 
     expect(message).toEqual(expect.stringContaining('No valid versions'));
   });
+
+  test('package with an empty response', async () => {
+    const testCwd = '.';
+    const {mockRequestManager, mockRegistries, mockReporter} = createMocks();
+    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter, true, []);
+
+    mockRequestManager.request = () => {
+      return {};
+    };
+
+    let message;
+    try {
+      await npmRegistry.checkOutdated(mockConfig, 'left-pad', '2.0.0');
+    } catch (err) {
+      message = err.message;
+    }
+
+    expect(message).toEqual(expect.stringContaining('malformed response from registry for "left-pad"'));
+  });
 });
diff --git a/src/registries/npm-registry.js b/src/registries/npm-registry.js
index 5a4f40c421..edd741902a 100644
--- a/src/registries/npm-registry.js
+++ b/src/registries/npm-registry.js
@@ -190,14 +190,15 @@ export default class NpmRegistry extends Registry {
   }
 
   async checkOutdated(config: Config, name: string, range: string): CheckOutdatedReturn {
-    const req = await this.request(NpmRegistry.escapeName(name), {unfiltered: true});
+    const escapedName = NpmRegistry.escapeName(name);
+    const req = await this.request(escapedName, {unfiltered: true});
     if (!req) {
       throw new Error('couldnt find ' + name);
     }
 
     // By default use top level 'repository' and 'homepage' values
     let {repository, homepage} = req;
-    const wantedPkg = await NpmResolver.findVersionInRegistryResponse(config, range, req);
+    const wantedPkg = await NpmResolver.findVersionInRegistryResponse(config, escapedName, range, req);
 
     // But some local repositories like Verdaccio do not return 'repository' nor 'homepage'
     // in top level data structure, so we fallback to wanted package manifest
diff --git a/src/resolvers/registries/npm-resolver.js b/src/resolvers/registries/npm-resolver.js
index 6d9ae791ee..3cd99a0b92 100644
--- a/src/resolvers/registries/npm-resolver.js
+++ b/src/resolvers/registries/npm-resolver.js
@@ -31,6 +31,7 @@ export default class NpmResolver extends RegistryResolver {
 
   static async findVersionInRegistryResponse(
     config: Config,
+    name: string,
     range: string,
     body: RegistryResponse,
     request: ?PackageRequest,
@@ -40,7 +41,7 @@ export default class NpmResolver extends RegistryResolver {
     }
 
     if (!body['dist-tags'] || !body.versions) {
-      throw new MessageError(config.reporter.lang('malformedRegistryResponse', body.name));
+      throw new MessageError(config.reporter.lang('malformedRegistryResponse', name));
     }
 
     if (range in body['dist-tags']) {
@@ -91,10 +92,12 @@ export default class NpmResolver extends RegistryResolver {
       }
     }
 
-    const body = await this.config.registries.npm.request(NpmRegistry.escapeName(this.name));
+    const escapedName = NpmRegistry.escapeName(this.name);
+    const desiredRange = desiredVersion || this.range;
+    const body = await this.config.registries.npm.request(escapedName);
 
     if (body) {
-      return NpmResolver.findVersionInRegistryResponse(this.config, desiredVersion || this.range, body, this.request);
+      return NpmResolver.findVersionInRegistryResponse(this.config, escapedName, desiredRange, body, this.request);
     } else {
       return null;
     }