Add server.xsrf.token as a deprecated config. Closes #5635.

Fixes #5641
elastic · Dec 11, 2015 · d617fc6 · d617fc6
1 parent f44b822
commit d617fc6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/cli/serve/read_yaml_config.js b/src/cli/serve/read_yaml_config.js
@@ -35,6 +35,10 @@ let legacySettingMap = {
   verify_ssl: 'elasticsearch.ssl.verify',
 };
 
+const deprecatedSettings = {
+  'server.xsrf.token': 'server.xsrf.token is deprecated. It is no longer used when providing xsrf protection.'
+};
+
 module.exports = function (path) {
   if (!path) return {};
 
@@ -50,6 +54,10 @@ module.exports = function (path) {
     }
   }
 
+  _.each(deprecatedSettings, function (message, setting) {
+    if (_.get(file, setting)) console.error(message);
+  });
+
   // transform legeacy options into new namespaced versions
   return _.transform(file, function (config, val, key) {
     if (legacySettingMap.hasOwnProperty(key)) {

diff --git a/src/server/config/schema.js b/src/server/config/schema.js
@@ -44,6 +44,7 @@ module.exports = () => Joi.object({
     }),
     xsrf: Joi.object({
       disableProtection: Joi.boolean().default(false),
+      token: Joi.string().optional().notes('Deprecated')
     }).default(),
   }).default(),