117d8d2606
Merge branch 'master' into feature/search-request-refactoring
2015-09-29 18:50:52 +02:00
eeeb42abef
Clean up scripting permissions.
...
Now that groovy is factored out, we contain this dangerous stuff there.
TODO: look into those test hacks inspecting class protection domains, maybe we can
clean that one up too.
TODO: generalize the GroovyCodeSourcePermission to something all script engines check,
before entering accesscontrollerblocks. this way e.g. groovy script cannot coerce
python engine into creating something with more privs if it gets ahold of it... we
should probably protect the aws/gce hacks in the same way.
2015-09-29 09:54:12 -04:00
8426c14a6d
fixed compile errors
2015-09-29 15:32:06 +02:00
a21238beda
Merge branch 'master' into feature/search-request-refactoring
...
# Conflicts:
# plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/ChildQuerySearchTests.java
# plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/IndexedScriptTests.java
# plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/SearchFieldsTests.java
# plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/SearchStatsTests.java
# plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/SearchTimeoutTests.java
# plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/SimpleSortTests.java
# plugins/lang-groovy/src/test/java/org/elasticsearch/script/groovy/GroovyScriptTests.java
# plugins/lang-groovy/src/test/java/org/elasticsearch/script/groovy/GroovySecurityTests.java
2015-09-29 14:40:27 +02:00
1811286a60
Fix compilation error due to empty <p> tag
2015-09-29 04:17:36 -06:00
e0d42739dd
Factor groovy out of core into lang-groovy
2015-09-28 20:17:45 -04:00
f1cf592020
Test Fixes
2015-09-25 10:28:15 +01:00
9f08d48d34
Merge branch 'feature/query-refactoring' into feature/search-request-refactoring
...
# Conflicts:
# core/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java
# core/src/test/java/org/elasticsearch/script/IndexedScriptIT.java
# core/src/test/java/org/elasticsearch/script/OnDiskScriptIT.java
2015-09-25 10:14:53 +01:00
34de79370f
Merge branch 'master' into feature/query-refactoring
...
Conflicts:
core/src/main/java/org/elasticsearch/ElasticsearchException.java
2015-09-25 09:38:24 +02:00
f54155195a
fix lang js rest test (hopefully)
2015-09-23 23:34:42 +01:00
a163a0fc89
fixed script language plugins rest tests to use correct script syntax
2015-09-23 22:47:37 +01:00
3c9e69e15f
Parse query from deleteByQuery request body
2015-09-23 22:06:35 +01:00
6d307a3cfd
delete by query rest test fix (maybe)
2015-09-23 21:42:09 +01:00
4fe243a5ca
Merge pull request #13701 from jasontedor/fix-ping-timeout-settings-inconsistency
...
Fix ping timeout settings inconsistencies
2015-09-23 13:17:46 -04:00
d8b29f7beb
Fix ping timeout settings inconsistencies
...
This commit fixes ping timeout settings inconsistencies in
ZenDiscovery. In particular, the documentation refers to the ping
timeout setting as discovery.zen.ping_timeout but the code was
ultimately using discovery.zen.ping.timeout if this was set.
This commit also changes all instances of the raw string
“discovery.zen.ping_timeout” to the constant
o.e.d.z.ZenDiscovery.SETTING_PING_TIMEOUT.
Finally, this commit removes the legacy setting
"discovery.zen.initial_ping_timeout".
Closes #6579 , #9581 , #9908
2015-09-23 12:58:23 -04:00
3cb3514474
clean up for methods in SearchRequestBuilder so it works with SearchSourceBuilder
2015-09-23 10:44:23 +01:00
e1759b1a60
cleanup codebase to work with SearchSourceBuilder
2015-09-23 10:44:22 +01:00
6ab39c2e25
Remove -Xlint:-serial, the crazy exceptions are now gone
2015-09-22 20:51:11 -04:00
689af1a6d6
Factor expressions scripts out to lang-expression plugin
2015-09-22 20:33:47 -04:00
1aae68d2e8
Merge branch 'master' into feature/query-refactoring
...
Conflicts:
core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java
core/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java
core/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java
core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
core/src/main/java/org/elasticsearch/index/query/QueryParser.java
2015-09-22 12:43:55 +02:00
b582de79ae
Merge pull request #13702 from rmuir/broke_javadocs
...
Fix all javadocs issues, re-enable compiler warnings (but disable on java 9 where maven is broken)
2015-09-22 00:46:31 -04:00
2f67cacaa3
Fix all javadocs issues, re-enable compiler warnings (but disable on java9 where maven is broken)
2015-09-21 23:35:32 -04:00
8aa6aec344
Merge pull request #13663 from rjernst/license_cleanup
...
Remove unnecessary copies of license and notice files
2015-09-21 18:04:57 -07:00
7bcdae28ca
Merge pull request #13695 from rmuir/factor_out_scripts
...
Get lang-javascript, lang-python, securemock ready for script refactoring
2015-09-21 15:44:08 -04:00
f0733bd829
Get lang-javascript, lang-python, securemock ready for script refactoring.
...
I want to refactor scripting engines so we can contain dangerous "God-like" permissions
like createClassloader/sun.reflect. These are used for dynamic class generation (scripts, mocks).
This will mean some refactoring to ES core.
But first lets get the plugins in order first. I removed those permissions globally, and
fixed grants for lang-javascript, lang-python, securemock so that everything works.
lang-javascript needs no code changes, because rhino is properly written :)
lang-python needs accesscontroller blocks. securemock was already working as of 1.1
This is just a baby step, to try to do some of this incrementally! It doesn't yet provide
us anything.
2015-09-21 15:13:17 -04:00
f230eabc15
[cloud-azure] Split azure plugin in 3 plugins
...
Until now we had a cloud-azure plugin which is providing 3 distinct features:
* discovery on Azure
* snapshot/restore on Aure
* SMB store
This commit splits the plugin by feature so people can use either one or the other or both features.
Doc is updated accordingly.
2015-09-21 17:55:23 +02:00
859f63be6e
Fix plugins/cloud-azure/licenses/azure-LICENSE.txt
...
Closes #13679 .
2015-09-21 17:53:09 +02:00
cc69de5c5f
Merge branch 'master' into feature/query-refactoring
2015-09-21 15:38:43 +02:00
66cb36e9b3
update repository-s3 licenses
2015-09-19 07:41:30 +02:00
18c519145d
Remove unnecessary copies of license and notice files
...
We moved a lot of repositories into elasticsearch, but in their new
location they retained their LICENSE.txt and NOTICE.txt files. These are
all the same, and having the license and notice and the root of the
repository should be sufficient.
2015-09-18 17:48:30 -07:00
ed443a3752
update aws-java-sdk-ec2 sha1 hashes
2015-09-18 22:17:49 +02:00
2da1baf546
Merge branch 'master' into feature/query-refactoring
2015-09-18 20:38:15 +02:00
8662b52be8
Merge branch 'update-aws-sdk' of https://github.com/schonfeld/elasticsearch into schonfeld-update-aws-sdk
2015-09-18 20:00:06 +02:00
8289ce827d
Merge branch 'patch-1' of https://github.com/pandujar/elasticsearch into pandujar-patch-1
2015-09-18 16:22:28 +02:00
cd33ff6fd8
move the aws sdk version parameter to plugins/pom.xml
2015-09-18 10:10:51 -04:00
b94f32116c
update s3 sdk version
2015-09-18 09:43:35 -04:00
bab9523c56
Merge branch 'master' into feature/query-refactoring
...
Conflicts:
core/src/main/java/org/elasticsearch/ElasticsearchException.java
2015-09-18 12:05:03 +02:00
42237ed982
[discovery-ec2] Move integration tests to unit tests
...
Follow up for #12844 but in master branch where cloud-aws has been split in 2 projects. So we need to backport manually changes...
2015-09-17 23:09:07 +02:00
97ae657231
Merge remote-tracking branch 'origin/master'
2015-09-17 21:44:25 +02:00
422cfa27c0
Merge branch 'maven/elasticsearch-already-excluded'
2015-09-17 18:10:04 +02:00
d7a07d7a27
Fix missing AccessControllerBlock in GCE code
...
This fix imported from #13612
2015-09-17 11:03:50 -04:00
5b0ad2272e
[test] Fix search context check in DeleteByQueryTests
...
Closes #13580
2015-09-17 12:17:40 +02:00
6cfbf9cf54
Revert "quiet flakey gce tests"
...
This reverts commit 7eef7e42d4
2015-09-17 02:32:51 -04:00
5e15ba90bb
Revert "disable unit tests until they work"
...
This reverts commit 606cc456d2
2015-09-17 02:32:33 -04:00
b14326d494
Merge pull request #13611 from rjernst/spec_in_resources
...
Move rest-api-spec for plugins into test resources
2015-09-16 11:15:35 -07:00
606cc456d2
disable unit tests until they work
2015-09-16 10:26:01 -07:00
7eef7e42d4
quiet flakey gce tests
2015-09-16 09:59:38 -07:00
ff74e94260
Merge branch 'master' into feature/query-refactoring
...
Conflicts:
core/src/main/java/org/elasticsearch/common/unit/Fuzziness.java
core/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java
core/src/main/java/org/elasticsearch/index/query/IdsQueryParser.java
core/src/main/java/org/elasticsearch/index/query/functionscore/random/RandomScoreFunctionParser.java
core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java
2015-09-16 13:04:18 +02:00
45f757de6d
Test: Move rest-api-spec for plugins into test resources
...
Plugin tests require having rest-api tests, and currently copy that spec
from a directory in the root of the plugin source into the test
resources. This change moves the rest-api-spec dir into test resources
so it is like any other test resources. It also removes unnecessary
configuration for resources from the shared plugin pom.
2015-09-16 03:04:53 -07:00
01e6d8e3dc
Remove java.lang.reflect.ReflectPermission "suppressAccessChecks"
...
Closes #13603
Squashed commit of the following:
commit 8799fb42d80297a79285beaf407b1bbecdb5854d
Author: Robert Muir <rmuir@apache.org>
Date: Wed Sep 16 03:32:29 2015 -0400
Add randomizedtesting snapshot note
commit 0d874d9f0f5fddaeab8f48f9816a052dcaa691be
Author: Robert Muir <rmuir@apache.org>
Date: Wed Sep 16 03:11:01 2015 -0400
Add a mechanism for insecure plugins and get all tests passing
commit 80540aeb9a264f6f299aaa3bc89df7f9b7923a60
Author: Robert Muir <rmuir@apache.org>
Date: Tue Sep 15 22:59:29 2015 -0400
Really remove, we are killing this
commit 884818c1ad44ca2e7572a6998c086580be919657
Author: Robert Muir <rmuir@apache.org>
Date: Tue Sep 15 22:57:22 2015 -0400
fill in TODOs
commit 34f4cb81f249edfec4d8d211da892f8c987e5948
Author: Robert Muir <rmuir@apache.org>
Date: Tue Sep 15 22:31:43 2015 -0400
Publish snapshots of RR and lucene and cutover
commit d68eb9d66ce059761805c64d67e41a29098c9afa
Merge: f27e208 f62da59
2015-09-16 04:08:31 -04:00
Colin Goodheart-Smithe
Robert Muir
Lee Hinman
javanna
Jason Tedor
Christoph Büscher
Robert Muir
Ryan Ernst
David Pilato
Simon Willnauer
Michael Schonfeld
Tanguy Leroux