Commit Graph

217 Commits

Author SHA1 Message Date
Areek Zillur daf4a9765c [License] Feature agnostic licensing model
This commit changes the license plugin to work with license that are not tied to any specific feature in a bwc way. It refactors the license plugin api into a lighter weight API, enabling the license plugin to manage license expiration and acknowledgment triggers.

closes elastic/elasticsearch#683, elastic/elasticsearch#686, elastic/elasticsearch#687, elastic/elasticsearch#691

Original commit: elastic/x-pack-elasticsearch@537cd3933a
2015-10-09 00:32:15 -04:00
jaymode 7b0f2628cb updates to handle renamed RenderSearchTemplateAction
Original commit: elastic/x-pack-elasticsearch@03cb49ce52
2015-10-08 09:09:00 -04:00
Jason Tedor ee5f092eb5 Merge pull request elastic/elasticsearch#736 from jasontedor/replace-inet-addresses
Remove use of com.google.common.net.InetAddresses

Original commit: elastic/x-pack-elasticsearch@7fb80c9ff3
2015-10-07 20:29:58 -04:00
debadair 144d9e85df Shield Docs: Fixed GS verification step. Closes elastic/elasticsearch#760.
Original commit: elastic/x-pack-elasticsearch@9a2f810131
2015-10-07 13:46:27 -07:00
jaymode a876755fd5 fix compile error. SimilarityLookupService -> SimilarityService
Original commit: elastic/x-pack-elasticsearch@d2f7e6dcf4
2015-10-07 16:27:47 -04:00
jaymode 98095a5ca8 add shield 2.0.0-rc1 release notes
Original commit: elastic/x-pack-elasticsearch@22e6a1499f
2015-10-07 07:18:02 -04:00
Simon Willnauer b7ca362df5 Remove shard level injector usage
This commit catches up with master which removed the shard level injector
and changed the logic how the SearcherWrapper works and is installed.
The way we now install it is via a package private onModule(IndexModule) call.
There is no public API for this anymore.
The wrapper also doesn't need to watch the IndexShards state since now it will only
be used when the shard is STARTED or RECOVERED.

Original commit: elastic/x-pack-elasticsearch@42b9eeef3d
2015-10-05 14:43:45 +02:00
Jason Tedor 556e8ca401 Remove use of com.google.common.net.InetAddresses
This commit removes all uses of com.google.common.net.InetAddresses
across the codebase. This is one of the few remaining steps in the
eventual removal of Guava as a dependency.

Relates elastic/elasticsearchelastic/elasticsearch#13224

Original commit: elastic/x-pack-elasticsearch@f6a0ed1395
2015-10-02 15:28:19 +02:00
Nik Everett bee764b9ee Merge pull request elastic/elasticsearch#713 from elastic/immutable_set_be_gone
Remove ImmutableSet

Original commit: elastic/x-pack-elasticsearch@fe06937bc7
2015-09-25 21:46:22 -04:00
jaymode 44cd14d5f1 test: cleanup usages of node builder where we actually need Shield loaded
Some tests are still using a node builder for nodes that need to load Shield, which is not currently
supported by elasticsearch. This changes some to use a MockNode and awaits fix a tribe test
that was previously testing nothing.

Original commit: elastic/x-pack-elasticsearch@57d0c902b6
2015-09-25 13:05:07 -04:00
Nik Everett c6e7c9c1d6 Merge branch 'master' into immutable_set_be_gone
Original commit: elastic/x-pack-elasticsearch@faa212ffbd
2015-09-25 10:47:16 -04:00
jaymode dd8ce6017b test: update certificates to have more localhost subject alternative names
This updates our test certificates to have more subject alternative names and adds a script
to make regeneration easier in the future. Also added are the private keys in PEM format and
a .p12 version of the keystore. In the future we may want to start supporting PKCS12 keystores
and this will be a starting point for that.

Original commit: elastic/x-pack-elasticsearch@92c94c9f28
2015-09-25 10:36:28 -04:00
Nik Everett 81970a564f Fix Set->String conversion
Original commit: elastic/x-pack-elasticsearch@c34f2d252d
2015-09-25 10:16:34 -04:00
javanna ffc359b91d [TEST] fix compile errors due to breaking java api changes to QueryBuilders
Original commit: elastic/x-pack-elasticsearch@4e2f6f89c7
2015-09-25 16:13:32 +02:00
Nik Everett 7fe90ba03c Switch from Set to String comparison
Original commit: elastic/x-pack-elasticsearch@385ae531ee
2015-09-25 09:00:26 -04:00
Nik Everett e3b3ef3ef2 Remove ImmutableSet
Yet another step in the de-guava-ification process.

Original commit: elastic/x-pack-elasticsearch@d8c597c7ba
2015-09-24 16:51:45 -04:00
Nik Everett 974ae21899 Remove eclipse configuration files
These files are generated automatically with eclipse:eclipse so they shouldn't
be tracked in the repository.

Original commit: elastic/x-pack-elasticsearch@3869ddebfa
2015-09-24 14:08:49 -04:00
jaymode 0d1602255b test: make the remote cluster a test cluster in the RemoteIndexAuditTrailStartingTests
This also stops the remote IndexAuditTrail services prior to wiping the cluster to prevent possible
writes after a template has been deleted.

Original commit: elastic/x-pack-elasticsearch@30ef226250
2015-09-24 08:33:58 -04:00
jaymode 6a7462be3e update the IPFilter to always allow traffic from a bound address
This change updates the IPFilter to always allow traffic from the bound addresses of the node
even if they have been explicitly disabled. This behavior can be disabled through a setting but
that could be dangerous if the blocking rule is added via a persistent setting stored in the cluster
state.

Closes elastic/elasticsearch#487

Original commit: elastic/x-pack-elasticsearch@4c1cf9455f
2015-09-23 10:30:43 -04:00
jaymode 2e0b87f6c6 audit tampered request when verifying the user header fails
When we receive a message and cannot decode the signed user header, we should audit
this as a tampered request. The request may not be tampered if nodes are configured
differently in terms of system keys, but this at least provides some evidence of the bad
request on the nodes that receives it.

Closes elastic/elasticsearch#647

Original commit: elastic/x-pack-elasticsearch@2f3411d9f9
2015-09-23 08:51:56 -04:00
Nik Everett 56bb508254 Merge pull request elastic/elasticsearch#694 from nik9000/immutable_map_entry_set_be_gone
Stop using ImmutableMap#entrySet

Original commit: elastic/x-pack-elasticsearch@43d6598d27
2015-09-23 08:29:17 -04:00
Nik Everett f5398a739a Stop using ImmutableMap#entrySet
This is the first in a series of changes that will support banning Guava's
ImmutableSet.

Original commit: elastic/x-pack-elasticsearch@7f95900186
2015-09-22 16:49:10 -04:00
jaymode 7c8bad6b53 create basic interface for a caching realm
This extracts an interface for methods that a caching realm must implement. The idea for this
interface is to allow for custom realms to integrate easily with the clear cache api. With this change
a custom realm can implement this API and the clear cache action can call the evict or evictAll
methods on the realm.

Closes elastic/elasticsearch#544

Original commit: elastic/x-pack-elasticsearch@62b0029689
2015-09-22 13:28:39 -04:00
Robert Muir f610a347f0 Fix all doclint errors and warnings (so compile does not break with https://github.com/elastic/elasticsearch/pull/13702)
Original commit: elastic/x-pack-elasticsearch@6a05dcd6a2
2015-09-22 00:09:11 -04:00
Jason Tedor c91b5d9a5a Replace Integers.checkedCast with built-in method
Original commit: elastic/x-pack-elasticsearch@6c69849863
2015-09-18 08:55:08 -04:00
Jason Tedor 517b9eaa91 Remove use of com.google.common.primitives.Ints
This commit removes all uses of com.google.common.primitives.Ints
across the codebase.

Relates elastic/elasticsearchelastic/elasticsearch#13224

Original commit: elastic/x-pack-elasticsearch@9500282387
2015-09-18 08:55:08 -04:00
jaymode ba13e3bf1c test: add the index audit trail template to the excluded list when it is used
Closes elastic/elasticsearch#639

Original commit: elastic/x-pack-elasticsearch@111231b3b5
2015-09-17 09:21:58 -04:00
jaymode 04178cbc30 fix compilation errors caused by changes to wipe method
This commit keeps the behavior the same and does not exclude the index audit trail template from
being wiped, that will be done in a future commit.

Original commit: elastic/x-pack-elasticsearch@1ac9e22923
2015-09-17 08:02:45 -04:00
Jason Tedor 8942e1e559 Merge pull request elastic/elasticsearch#650 from jasontedor/joiner-be-gone
Remove use of com.google.common.base.Joiner

Original commit: elastic/x-pack-elasticsearch@fad27ff46b
2015-09-15 10:29:34 -04:00
Simon Willnauer d1c2698595 Fix forbidden API usage from upstream
Original commit: elastic/x-pack-elasticsearch@2bfcc83477
2015-09-15 15:51:22 +02:00
Jason Tedor f650e18045 Remove use of com.google.common.base.Joiner
This commit removes all uses of com.google.common.base.Joiner across
the codebase.

Relates elastic/elasticsearchelastic/elasticsearch#13224

Original commit: elastic/x-pack-elasticsearch@f69b2addca
2015-09-15 09:44:41 -04:00
jaymode a3ae0827fa fix the indexing of the request class for the IndexAuditTrail
The IndexAuditTrail was checking the logger level of the class before adding the request
class to the message, which was an error. The logger level should not control anything
about the IndexAuditTrail.

Closes elastic/elasticsearch#546

Original commit: elastic/x-pack-elasticsearch@35ee8ab453
2015-09-15 07:54:15 -04:00
Jason Tedor 52e58b8de0 Merge pull request elastic/elasticsearch#644 from jasontedor/iterables-be-gone
Remove use of com.google.common.collect.Iterables

Original commit: elastic/x-pack-elasticsearch@e24afb5c45
2015-09-15 07:52:37 -04:00
jaymode 8860364f72 update settings for tribes to fail if shield is not enabled or mandatory
In 2.0, plugins cannot specify mandatory settings, they can only specify a default additional
set of settings. For tribe nodes, we require shield to be enabled and be a mandatory plugin.
If the settings specified by the user conflict with this, we now throw an exception and fail
startup.

Closes elastic/elasticsearch#426

Original commit: elastic/x-pack-elasticsearch@db4d6d7923
2015-09-15 06:44:35 -04:00
debadair 8e343d21cc Shield Docs: Added links to the topics for the new features.
Original commit: elastic/x-pack-elasticsearch@1fcdecb940
2015-09-14 13:35:27 -07:00
debadair 019b63e5fb Shield Docs: Adding information about how to run as another user.
Original commit: elastic/x-pack-elasticsearch@7cc8fb28ad
2015-09-14 13:29:00 -07:00
debadair 326e55528c Shield Docs: New topic about using custom realms.
Original commit: elastic/x-pack-elasticsearch@e07d945d97
2015-09-14 13:21:28 -07:00
Jason Tedor 08de4a4ab1 Remove use of com.google.common.collect.Iterables
This commit removes all uses of com.google.common.collect.Iterables
across the codebase.

Relates elastic/elasticsearchelastic/elasticsearch#13224

Original commit: elastic/x-pack-elasticsearch@ca517de412
2015-09-14 13:26:04 -04:00
jaymode 3676d6e370 add 2.0.0-beta2 release notes for Shield
This adds the release notes to the documentation for Shield. Note, two new features do not
have links as the documentation for these are still pending.

Original commit: elastic/x-pack-elasticsearch@e66df5cf14
2015-09-14 11:09:56 -04:00
jaymode d5a44a6496 test: use test cluster scope for remote index audit trail tests
The SSL randomization can cause issues when running this test multiple times to look for an issue
since the suite cluster may have a different SSL value than the remote cluster during subsequent
runs.

Closes elastic/elasticsearch#607

Original commit: elastic/x-pack-elasticsearch@8ba3140c52
2015-09-14 09:34:19 -04:00
Simon Willnauer 2032c93da1 Catch up with core changes
This commit cuts over to StandardCharset vs. guavas Charsets, removes
obsolete uses of Collections2 / Function and replaces all LoadingCaches
with simple CHM#loadIfAbsent

Original commit: elastic/x-pack-elasticsearch@7d1d607e9e
2015-09-14 13:48:50 +02:00
Simon Willnauer 6fb4f7817c Use method references rather than Class instances to register transport handler.
This is caused by upstream changes in core.

Original commit: elastic/x-pack-elasticsearch@67f602abd1
2015-09-14 10:07:35 +02:00
Robert Muir 53cd14deda Remove remaining uses of setAccessible
This corresponds with https://github.com/elastic/elasticsearch/pull/13539

Original commit: elastic/x-pack-elasticsearch@29d235b8ed
2015-09-12 21:11:10 -04:00
Robert Muir 61c47634bd Fix wrong access modifiers for injected ctors, setAccessible is no longer used.
See https://github.com/elastic/elasticsearch/pull/13531

Original commit: elastic/x-pack-elasticsearch@658672b5fb
2015-09-12 03:30:33 -04:00
jaymode 29aac1c617 add missing PutMapping privilege for index audit trail user
Original commit: elastic/x-pack-elasticsearch@a2a107313d
2015-09-11 14:47:48 -04:00
jaymode ae66d4794a fix compile errors caused by cleanups in core
Original commit: elastic/x-pack-elasticsearch@a28d4b5ba0
2015-09-11 14:44:30 -04:00
Lee Hinman 3653bdc1b5 Merge remote-tracking branch 'dakrone/eclipse-jdk1.8'
Original commit: elastic/x-pack-elasticsearch@a1cdeff1d2
2015-09-11 10:00:49 -06:00
jaymode cb0f169655 update CLI tools to work with spaces in the home path
The CLI tools are launched by scripts and these scripts need to handle spaces in the
elasticsearch home path.

Closes elastic/elasticsearch#631

Original commit: elastic/x-pack-elasticsearch@6a4325d296
2015-09-11 11:15:19 -04:00
jaymode d3ee002180 set the user header on new requests in IndexAuditTrail
The IndexAuditTrail was not setting the appropriate user header on requests to see if the index exists and
the mapping is updated. This did not fail in tests because we set shield.user, but fails during a normal
installation.

Closes elastic/elasticsearch#626

Original commit: elastic/x-pack-elasticsearch@3771612b20
2015-09-11 08:29:48 -04:00
Lee Hinman 4a8df4f328 Update eclipse files for Java 1.8 move
Original commit: elastic/x-pack-elasticsearch@a2dd77ccf3
2015-09-10 10:04:31 -06:00