Manybubbles has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/224652

Change subject: WIP: Disably dynamic elasticsearch dynamic scripting
......................................................................

WIP: Disably dynamic elasticsearch dynamic scripting

CirrusSearch is about to not need this any more:
I5aca0d6a0a72ff674603d00fb6b9519b1d73a0eb

Change-Id: I5fbf79c5b2b4b1a3db648d56d752676a21f02d4e
---
M puppet/modules/elasticsearch/files/elasticsearch.yml
1 file changed, 1 insertion(+), 100 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/52/224652/1

diff --git a/puppet/modules/elasticsearch/files/elasticsearch.yml 
b/puppet/modules/elasticsearch/files/elasticsearch.yml
index 03b8fa3..23665bb 100644
--- a/puppet/modules/elasticsearch/files/elasticsearch.yml
+++ b/puppet/modules/elasticsearch/files/elasticsearch.yml
@@ -1,101 +1,2 @@
-##
-# Turn dynamic scripting back on
-##
-# Elasticsearch 1.2.X turns dynamic scripting off by default.  Cirrus needs it 
on.
-# Elasticsearch 1.3.X will turn it back on using a new scripting language that 
is better sandboxed.
-# Cirrus will port to that when it is released, but for now, we use dynamic 
scripting.
-script.disable_dynamic: false
-
-## But turning dynamic scripting on is a security vulnerability if the server
-## is accessible to the world. Turn off global accessibility
+## Turn off global accessibility.
 network.host: "127.0.0.1"
-
-# The default sandbox for Groovy is too restrictive for Cirrus.  This adds a
-# few more allowed invocations.
-script.groovy.sandbox.class_whitelist:
- #Defaults
- - java.util.Date
- - java.util.Map
- - java.util.List
- - java.util.Set
- - java.util.ArrayList
- - java.util.Arrays
- - java.util.HashMap
- - java.util.HashSet
- - java.util.UUID
- - java.math.BigDecimal
- - org.joda.time.DateTime
- - org.joda.time.DateTimeZone
- - org.elasticsearch.common.joda.time.DateTime
- - org.elasticsearch.common.joda.time.DateTimeZone
- # Added for Cirrus
- - java.util.Locale
- - org.apache.lucene.util.automaton.RegExp
- - org.apache.lucene.util.automaton.CharacterRunAutomaton
- # Added for Translate
- - org.apache.lucene.search.spell.LevensteinDistance
-script.groovy.sandbox.package_whitelist:
- # Defaults
- - java.util
- - java.lang
- - org.joda.time
- - org.elasticsearch.common.joda.time
- # Added for Cirrus
- - org.apache.lucene.util.automaton
- # Added for Translate
- - org.apache.lucene.search.spell
-script.groovy.sandbox.receiver_whitelist:
- # Defaults
- - java.lang.Math
- - java.lang.Integer
- - "[I"
- - "[[I"
- - "[[[I"
- - java.lang.Float
- - "[F"
- - "[[F"
- - "[[[F"
- - java.lang.Double
- - "[D"
- - "[[D"
- - "[[[D"
- - java.lang.Long
- - "[J"
- - "[[J"
- - "[[[J"
- - java.lang.Short
- - "[S"
- - "[[S"
- - "[[[S"
- - java.lang.Character
- - "[C"
- - "[[C"
- - "[[[C"
- - java.lang.Byte
- - "[B"
- - "[[B"
- - "[[[B"
- - java.lang.Boolean
- - "[Z"
- - "[[Z"
- - "[[[Z"
- - java.math.BigDecimal
- - java.util.Arrays
- - java.util.Date
- - java.util.List
- - java.util.Map
- - java.util.Set
- - java.lang.Object
- - org.joda.time.DateTime
- - org.joda.time.DateTimeUtils
- - org.joda.time.DateTimeZone
- - org.joda.time.Instant
- - org.elasticsearch.common.joda.time.DateTime
- - org.elasticsearch.common.joda.time.DateTimeUtils
- - org.elasticsearch.common.joda.time.DateTimeZone
- - org.elasticsearch.common.joda.time.Instant
- # Added for Cirrus
- - org.apache.lucene.util.automaton.RegExp
- - org.apache.lucene.util.automaton.CharacterRunAutomaton
- # Added for Translate
- - org.apache.lucene.search.spell.LevensteinDistance

-- 
To view, visit https://gerrit.wikimedia.org/r/224652
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5fbf79c5b2b4b1a3db648d56d752676a21f02d4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Manybubbles <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to