Preserving boom error headers for index pattern exceptions (#17725)

elastic · Apr 18, 2018 · bf2b6b0 · bf2b6b0
1 parent 2a715c8
commit bf2b6b0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/server/index_patterns/service/lib/errors.js b/src/server/index_patterns/service/lib/errors.js
@@ -47,6 +47,10 @@ export function convertEsError(indices, error) {
     return createNoMatchingIndicesError(indices);
   }
 
+  if (error.isBoom) {
+    return error;
+  }
+
   const statusCode = error.statusCode;
   const message = error.body ? error.body.error : undefined;
   return Boom.boomify(error, { statusCode, message });

diff --git a/test/api_integration/apis/index_patterns/es_errors/errors.js b/test/api_integration/apis/index_patterns/es_errors/errors.js
@@ -117,6 +117,17 @@ export default function ({ getService }) {
 
         expect(converted.output.statusCode).to.be(401);
       });
+
+      it('preserves headers from Boom errors', () => {
+        const error = new Error();
+        error.statusCode = 401;
+        const boomError = Boom.boomify(error, { statusCode: error.statusCode });
+        const wwwAuthenticate = 'Basic realm="Authorization Required"';
+        boomError.output.headers['WWW-Authenticate'] = wwwAuthenticate;
+        const converted = convertEsError(indices, boomError);
+
+        expect(converted.output.headers['WWW-Authenticate']).to.be(wwwAuthenticate);
+      });
     });
   });
 }