Commit Graph

247 Commits

Author SHA1 Message Date
Nik Everett 8231e856c2 Remove and ban @Test
Original commit: elastic/x-pack-elasticsearch@02425ca13d
2015-10-20 18:20:46 -04:00
jaymode 7380e45abb document the user_group_attribute setting for LDAP realms
Closes elastic/elasticsearch#284

Original commit: elastic/x-pack-elasticsearch@d90aecbe3b
2015-10-20 14:43:08 -04:00
debadair 84ffc956a8 Shield Docs: Clarified that Shield does not support AD distribution groups. Closes elastic/elasticsearch#520.
Original commit: elastic/x-pack-elasticsearch@39f57ff08d
2015-10-20 10:34:52 -07:00
debadair 0123d33e87 Shield Docs: Updated Marvel config and license management for 2.0.
Original commit: elastic/x-pack-elasticsearch@3d225c2562
2015-10-20 10:13:51 -07:00
Steve Kearns e1dde82724 Update LICENSE.txt for shield and watcher with new EULA
Original commit: elastic/x-pack-elasticsearch@9dd554efff
2015-10-20 15:47:00 +02:00
Jay Modi 5f3ba2cd43 Merge pull request elastic/elasticsearch#827 from jaymode/docs_alias_dls
update the wording around filtered aliases and document level security

Original commit: elastic/x-pack-elasticsearch@86958f1404
2015-10-19 10:10:42 -04:00
jaymode f7a8d31d6a update the wording around filtered aliases and document level security
Also, remove an extra period in DLS/FLS section title.

Closes elastic/elasticsearch#542
Closes elastic/elasticsearch#798

Original commit: elastic/x-pack-elasticsearch@a1556b37c7
2015-10-19 09:48:54 -04:00
javanna baa36f7bae adapt to upstream java count api removal
Original commit: elastic/x-pack-elasticsearch@ea6c53b88e
2015-10-19 15:10:59 +02:00
Colin Goodheart-Smithe 4cd02142a2 fixes for compile errors due to search request refactoring in core
Original commit: elastic/x-pack-elasticsearch@8808789912
2015-10-16 08:18:20 +01:00
Tanguy Leroux 4dd5bfe0e7 Shield: Fix compilation error in IndexAuditTrailTests
Original commit: elastic/x-pack-elasticsearch@744d133fc4
2015-10-16 08:52:15 +02:00
uboness 68f85b5527 Added missing privileges for the marvel_user role
Original commit: elastic/x-pack-elasticsearch@f3d629a878
2015-10-15 18:03:00 -07:00
Areek Zillur ae552efc3c [license] simplify Licensee interface
Currently, Licensee#onChange is called with a license and its status, It would be
cleaner if it accepted the license's operationMode and status as parameters instead.
This hides the license responsible for the notification from the consumer plugins and only
provides the license information used by the commercial plugins to turn features on via
operationMode and status to act on whether the current license is enabled, in
grace_period or disabled.

Original commit: elastic/x-pack-elasticsearch@b0ea7ec32b
2015-10-15 17:57:54 -04:00
PhaedrusTheGreek 6707b5d847 fixed a single character in reference docs
Original commit: elastic/x-pack-elasticsearch@6fdbe33ff9
2015-10-15 13:28:30 -04:00
uboness 21bb43ce3c Updated the marvel & kibana roles
- kibana 2.x explicitly creates the `.kibana` index now and it requires the indices/create permission
- added back the marvel agent/user roles

Closes elastic/elasticsearch#696

Original commit: elastic/x-pack-elasticsearch@bb9f22219e
2015-10-15 08:15:34 -07:00
Jason Tedor a0b9d424e6 Reflect upstream changes to o.e.c.m.IndexMetaData
This commit reflects some upstream method removals from
o.e.c.m.IndexMetaData.

Original commit: elastic/x-pack-elasticsearch@74b25628dc
2015-10-14 21:05:35 -04:00
jaymode 05befa5ebb test: start at 0 instead of 1
In the test we always create at least one type_ factory but the test incorrectly used type_1
as the first, when it should have been type_0

Original commit: elastic/x-pack-elasticsearch@e4128cbc26
2015-10-14 17:23:25 -04:00
jaymode f19e68ecb8 shield: only enable custom realms with a platinum or trial license
In elastic/elasticsearch#788, the enabling and disabling of features was added for shield, but custom realms were not
being enabled/disabled based on license type. This commit adds that functionality.

Relates to elastic/elasticsearch#689

Original commit: elastic/x-pack-elasticsearch@625c3ef18a
2015-10-14 15:29:53 -04:00
Alexander Reelsen b927fd08bc Watcher: Adhere to new licensing requirements
* Basic license equlas disabling
* trial/gold/platinum: everything is allowed
* On expiry: actions of watches do not execute, PUT/GET on watches is disabled

Closes elastic/elasticsearch#688

Original commit: elastic/x-pack-elasticsearch@7017c62136
2015-10-14 17:59:09 +02:00
jaymode 6dbad15e56 always sign messages when message signing is enabled
This change allows for messages to be signed when message signing is enabled and a system
key is not present. This is accomplished by generating a random key on startup and then using
HKDF with HmacSHA1 to generate the keying material to be used to sign the messages. The random
key from the originating node is added to the signed message so that the signing key can be
derived on the receiving node.

When a system key is present, the system key is used for signing and the preexisting behavior
is maintained.

Closes elastic/elasticsearch#711

Original commit: elastic/x-pack-elasticsearch@c41fdc0ac3
2015-10-14 06:44:22 -04:00
Simon Willnauer baa06fb6fb Delegate CoreCacheKey for all reader wrappers
This change removes obsolete forbidden API usage, cuts over
from an interface to an abstract class for IndexSearcherWrapper and
delegates all core cache keys to the wrapped reader.

Relates to elastic/elasticsearch#774

Original commit: elastic/x-pack-elasticsearch@3799bab0d9
2015-10-14 10:29:47 +02:00
jaymode b698cde334 make AbstractLicenseeComponents compatible with the found license plugin
Original commit: elastic/x-pack-elasticsearch@6b664d3956
2015-10-13 14:42:37 -04:00
jaymode 28948f8930 shield: enable and disable features based on license type
Shield now supports the ability to disable or enable individual features based on the type of
license that is currently installed. The change replaces the LicenseService in shield with a
ShieldLicensee that is notified on changes to the license. The ShieldLicensee then updates
a ShieldLicenseState object, which contains the logic and methods to check for features being
enabled or disabled. The ShieldLicenseState object is used by consumers to check the status
of a feature. The decoupling of the feature enablement from the ShieldLicensee class was done
to work around circular dependency issues.

Closes elastic/elasticsearch#689

Original commit: elastic/x-pack-elasticsearch@442514496d
2015-10-13 10:57:19 -04:00
Martijn van Groningen 72c015f82e DLS: Use the cache keys of the wrapped reader instead of the document subset reader itself.
Original commit: elastic/x-pack-elasticsearch@14ff21cc5b
2015-10-11 22:12:36 +02:00
Jason Tedor b468c74401 Remove Guava as a dependency
This commit removes Guava as a dependency. Note that Guava will remain
as a test-only dependency (transitively through Elasticsearch through
Jimfs).

Relates elastic/elasticsearchelastic/elasticsearch#13224

Original commit: elastic/x-pack-elasticsearch@fe23d5f25f
2015-10-09 14:56:03 -04:00
Nik Everett 59ac529e8b Merge pull request elastic/elasticsearch#740 from nik9000/immutable_map_be_gone
Remove and ban ImmutableMap

Original commit: elastic/x-pack-elasticsearch@7f1dfb5bb6
2015-10-09 12:56:12 -04:00
Jason Tedor e8dc52857d Merge pull request elastic/elasticsearch#735 from jasontedor/straight-cache-homey
Remove use of com.google.common.cache.*

Original commit: elastic/x-pack-elasticsearch@c9551c65e6
2015-10-09 12:28:10 -04:00
Nik Everett 2bde3de3f0 Merge branch 'master' into immutable_map_be_gone
Original commit: elastic/x-pack-elasticsearch@62358ec345
2015-10-09 12:25:28 -04:00
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
Nik Everett dab504f6ba Remove ImmutableMap$Builder
Original commit: elastic/x-pack-elasticsearch@f0d3f71887
2015-10-05 17:11:33 -04:00
Nik Everett 1d61278b2d More ImmutableMap banning
Original commit: elastic/x-pack-elasticsearch@59fee6e288
2015-10-05 13:35:31 -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
Jason Tedor 5c0b4b04ca Remove use of com.google.common.cache.*
This commit removes the use of com.google.common.cache.Cache,
com.google.common.cache.CacheBuilder and
com.google.common.cache.CacheLoader.

Relates elastic/elasticsearchelastic/elasticsearch#13224, elastic/elasticsearchelastic/elasticsearch#13717

Original commit: elastic/x-pack-elasticsearch@04c254ee95
2015-10-02 13:09:42 +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