Merge pull request elastic#8761 from elastic/jasper/backport/8758/5.x

[backport] PR elastic#8758 to 5.x - Internal server error when saving a widget with German characters in name Former-commit-id: 2c0a221
airow · Oct 19, 2016 · a4b2224 · a4b2224
2 parents 163ac5d + 60759a1
commit a4b2224
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/core_plugins/elasticsearch/lib/create_proxy.js b/src/core_plugins/elasticsearch/lib/create_proxy.js
@@ -20,7 +20,17 @@ function createProxy(server, method, route, config) {
         xforward: true,
         timeout: server.config().get('elasticsearch.requestTimeout'),
         onResponse: function (err, responseFromUpstream, request, reply) {
-          reply(err, responseFromUpstream);
+          if (err) {
+            reply(err);
+            return;
+          }
+
+          if (responseFromUpstream.headers.location) {
+            // TODO: Workaround for #8705 until hapi has been updated to >= 15.0.0
+            responseFromUpstream.headers.location = encodeURI(responseFromUpstream.headers.location);
+          }
+
+          reply(null, responseFromUpstream);
         }
       }
     },

diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js
@@ -74,6 +74,16 @@ bdd.describe('visualize app', function describeIndexTests() {
       });
     });
 
+    bdd.it('should save and load with non-ascii characters', async function () {
+      const vizNamewithSpecialChars = `${vizName1} with Umlaut ä`;
+      const message = await PageObjects.visualize.saveVisualization(vizNamewithSpecialChars);
+
+      PageObjects.common.debug(`Saved viz message with umlaut = ${message}`);
+      expect(message).to.be(`Visualization Editor: Saved Visualization "${vizNamewithSpecialChars}"`);
+
+      await PageObjects.visualize.waitForToastMessageGone();
+    });
+
     bdd.it('should save and load', function () {
       return PageObjects.visualize.saveVisualization(vizName1)
       .then(function (message) {