Merge pull request #1690 from murgatroid99/grpc-js_auth_error_codes

grpc-js: Don't propagate non-numeric errors from auth plugins
grpc · Feb 17, 2021 · a45c5c3 · a45c5c3
2 parents 24d1a04 + 40c19ea
commit a45c5c3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "gRPC Library for Node - pure JS implementation",
   "homepage": "https://grpc.io/",
   "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",

diff --git a/packages/grpc-js/src/call-credentials-filter.ts b/packages/grpc-js/src/call-credentials-filter.ts
@@ -21,6 +21,7 @@ import { BaseFilter, Filter, FilterFactory } from './filter';
 import { Metadata } from './metadata';
 import { Status } from './constants';
 import { splitHostPort } from './uri-parser';
+import { ServiceError } from './call';
 
 export class CallCredentialsFilter extends BaseFilter implements Filter {
   private serviceUrl: string;
@@ -51,12 +52,21 @@ export class CallCredentialsFilter extends BaseFilter implements Filter {
       service_url: this.serviceUrl,
     });
     const resultMetadata = await metadata;
-    resultMetadata.merge(await credsMetadata);
+    try {
+      resultMetadata.merge(await credsMetadata);
+    } catch (error) {
+      this.stream.cancelWithStatus(
+        Status.UNAUTHENTICATED,
+        `Failed to retrieve auth metadata with error: ${error.message}`
+      );
+      return Promise.reject<Metadata>('Failed to retrieve auth metadata');
+    }
     if (resultMetadata.get('authorization').length > 1) {
       this.stream.cancelWithStatus(
         Status.INTERNAL,
         '"authorization" metadata cannot have multiple values'
       );
+      return Promise.reject<Metadata>('"authorization" metadata cannot have multiple values');
     }
     return resultMetadata;
   }

diff --git a/packages/grpc-js/src/channel.ts b/packages/grpc-js/src/channel.ts
@@ -384,7 +384,7 @@ export class ChannelImplementation implements Channel {
               (error: Error & { code: number }) => {
                 // We assume the error code isn't 0 (Status.OK)
                 callStream.cancelWithStatus(
-                  error.code || Status.UNKNOWN,
+                  (typeof error.code === 'number') ? error.code : Status.UNKNOWN,
                   `Getting metadata from plugin failed with error: ${error.message}`
                 );
               }