Commit Graph

3727 Commits

Author SHA1 Message Date
Lukas Olson f5ed992c43 Merge pull request elastic/elasticsearch#2598 from lukasolson/fix/login-background
[security-ui] Update login background color

Original commit: elastic/x-pack-elasticsearch@931f28cd6d
2016-06-28 09:07:48 -07:00
Yannick Welsch 1762d1d96c Fix wrong logger usages
Relates to elastic/elasticsearchelastic/elasticsearch#19126

Original commit: elastic/x-pack-elasticsearch@e644f2bd9c
2016-06-28 16:46:31 +02:00
Nik Everett 6f6426b444 Switch plugin action registration to pull
Original commit: elastic/x-pack-elasticsearch@2154918b6e
2016-06-28 08:56:54 -04:00
Joe Fleming a66c0cf463 Merge branch 'master' into reporting-controls
Original commit: elastic/x-pack-elasticsearch@4f0e7501ce
2016-06-27 16:39:10 -07:00
Lukas Olson 3e21cdb96d Merge pull request elastic/elasticsearch#2608 from lukasolson/fix/index-patterns
[security-ui] Retrieve index patterns from Kibana service instead of Elasticsearch

Original commit: elastic/x-pack-elasticsearch@2b524a8d28
2016-06-27 16:16:13 -07:00
Jason Tedor b378ff780b Modify poll interval setting in native realm test
This commit modifies the construction of the poll interval setting in
the native realm tests in response to upstream change
elastic/elasticsearchelastic/elasticsearch#2f638b5a23597967a98b1ced1deac91d64af5a44.

Original commit: elastic/x-pack-elasticsearch@c6f60f51f4
2016-06-27 18:43:33 -04:00
Lee Hinman a289fbd168 Add a tool to migrate users/roles from file to native realm
This adds the `bin/shield/migrate` tool that allows migrating users and
roles from the files to the native (API-based) store.

It looks like this:

```
λ bin/shield/migrate native -U http://localhost:9200 -u test_user -p changeme -n lee,foo -r role1,role2,role3,role4,foo
starting migration of users and roles...
importing users from [/home/hinmanm/scratch/elasticsearch-2.4.0-SNAPSHOT/config/shield/users]...
found existing users: [test_user, joe3, joe2]
migrating user [lee]
{"user":{"created":true}}
no user [foo] found, skipping
importing roles from [/home/hinmanm/scratch/elasticsearch-2.4.0-SNAPSHOT/config/shield/roles.yml]...
found existing roles: [marvel_user, role_query_fields, admin_role, role3, admin, remote_marvel_agent, power_user, role_new_format_name_array, role_run_as, logstash, role_fields, role_run_as1, role_new_format, kibana4_server, user, transport_client, role1.ab, role_query]
migrating role [role1]
{"role":{"created":true}}
migrating role [role2]
{"role":{"created":true}}
role [role3] already exists, skipping
migrating role [role4]
failed to migrate role [role4] with body: {"indices":[{"names":["idx2"]},{"names":["idx2"]},{"names":["idx1"]}]}
java.io.IOException: {"error":{"root_cause":[{"type":"parse_exception","reason":"failed to parse indices privileges for role [role4]. missing required [privileges] field"}],"type":"parse_exception","reason":"failed to parse indices privileges for role [role4]. missing required [privileges] field"},"status":400}
  at org.elasticsearch.shield.authc.esusers.tool.ESNativeRealmMigrateTool$MigrateUserOrRoles.postURL(ESNativeRealmMigrateTool.java:206)
  at org.elasticsearch.shield.authc.esusers.tool.ESNativeRealmMigrateTool$MigrateUserOrRoles.importRoles(ESNativeRealmMigrateTool.java:389)
  at org.elasticsearch.shield.authc.esusers.tool.ESNativeRealmMigrateTool$MigrateUserOrRoles.execute(ESNativeRealmMigrateTool.java:171)
  at org.elasticsearch.common.cli.CliTool.execute(CliTool.java:153)
  at org.elasticsearch.shield.authc.esusers.tool.ESNativeRealmMigrateTool.main(ESNativeRealmMigrateTool.java:91)
Caused by: java.io.IOException: Server returned HTTP response code: 400 for URL: http://localhost:9200/_shield/role/role4
  at sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:1840)
  at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1441)
  at org.elasticsearch.shield.authc.esusers.tool.ESNativeRealmMigrateTool$MigrateUserOrRoles.postURL(ESNativeRealmMigrateTool.java:192)
  ... 4 more

no role [foo] found, skipping
users and roles imported.
```

Original commit: elastic/x-pack-elasticsearch@3ce47c0ffd
2016-06-27 14:20:45 -06:00
Nik Everett a673c44036 Support IndicesModule list constructor
Original commit: elastic/x-pack-elasticsearch@c88e2b82b7
2016-06-27 15:04:17 -04:00
Boaz Leskes 62a46a2e8d revert elastic/x-pack@0513ff4168 as https://github.com/elastic/elasticsearch/pull/18992 was reverted as well
Original commit: elastic/x-pack-elasticsearch@febaaff840
2016-06-27 20:19:20 +02:00
Luca Cavanna b5bb2d2fdc Merge pull request elastic/elasticsearch#2576 from javanna/fix/xpack-rest-testcase-watcher
[TEST] remove start and stop watcher from XPackRestTestCase

Original commit: elastic/x-pack-elasticsearch@192be0db8b
2016-06-27 14:52:39 +02:00
Alexander Reelsen ebf00cc9e5 Dependencies: Upgrade jimfs to 1.1 removed unneeded guava calls (elastic/elasticsearch#2614)
Guava should only be used by the HTML sanitizer and no other code

Original commit: elastic/x-pack-elasticsearch@6a20674768
2016-06-27 11:07:15 +02:00
Alexander Reelsen 32c9f86124 Watcher: Support for inline attachments (elastic/elasticsearch#2601)
If an attachment is configured of disposition type INLINE, and is referred to
in HTML body parts, then some email clients can display images inside of an HTML
email and refer to those attachments.

Watcher already had support for inlined attachments, however this could not be configured
from a watch, but just via the Java API. Also it was not tested.

This commit changes the attachment to decide on creation if it should be inline or a regular
attachment and adds a test.

Relates elastic/elasticsearch#2381
Relates elastic/elasticsearch#2464
Closes elastic/elasticsearch#2557

Original commit: elastic/x-pack-elasticsearch@84935ffb18
2016-06-27 10:45:10 +02:00
Lee Hinman 88d0d4ddf5 Merge remote-tracking branch 'dakrone/fix-too-strict-validation'
Original commit: elastic/x-pack-elasticsearch@efb2d5ece6
2016-06-24 12:18:38 -06:00
Lee Hinman 4990296a5c Remove too-strict validation of role names
When parsing the privileges, we now no longer throw an exception if
there haven't been any names parsed out. This is not an issue though,
because we validate that the `names` array is not empty when we parse
it, and that it's not `null` before returning from the function.

Adds a rest test that sends things out of order to test this still
works.

Resolves elastic/elasticsearch#2606

Original commit: elastic/x-pack-elasticsearch@62a38bea8f
2016-06-24 12:00:24 -06:00
Robert Muir 8dce698219 Merge pull request elastic/elasticsearch#2571 from rmuir/restore_order
improve painless slack example

Original commit: elastic/x-pack-elasticsearch@3add93c1f4
2016-06-24 12:27:53 -04:00
Alexander Reelsen f78f848681 Watcher: Fix acknowledgement REST API endpoints
Add new REST API endpoint to acknoweldging actions. The old endpoints
have not been removed as part of this PR, but can be in the next major
version.

Update the documentation to remove the parameter based example, and
mention that the old endpoints are going to be removed in the future.

Closes elastic/elasticsearch#2517

Original commit: elastic/x-pack-elasticsearch@e2558e9e1f
2016-06-24 16:50:35 +02:00
Tanguy Leroux 6ed9f50457 Fix SearchInputIT.testSearchInlineTemplate
The search type is overridden from default to query_and_fetch by the search action if the number of shards to request is equal to 1

Original commit: elastic/x-pack-elasticsearch@a9552c697c
2016-06-24 09:19:59 +02:00
Joe Fleming d52418d92e Merge pull request elastic/elasticsearch#2565 from w33ble/fix/reporting-phantom-path
Fix Phantom unpacking on Distro packages

Original commit: elastic/x-pack-elasticsearch@4a59fbff64
2016-06-23 12:49:55 -04:00
Joe Fleming 742a807907 Merge branch 'master' into fix/reporting-phantom-path
Original commit: elastic/x-pack-elasticsearch@badcc6f883
2016-06-23 11:18:54 -05:00
Yannick Welsch 74efdd4a94 Disable failing test NodeStatsTests.testNodeStats
Original commit: elastic/x-pack-elasticsearch@954badc4a4
2016-06-23 13:36:06 +02:00
Tanguy Leroux a20fb42b70 Fix SearchInputIT.testSearchIndexedTemplate
Original commit: elastic/x-pack-elasticsearch@4011a7bc9b
2016-06-23 12:33:49 +02:00
Tanguy Leroux 77a641b0fc Mute SecurityCachePermissionIT as it was before
Original commit: elastic/x-pack-elasticsearch@89c40f7bc0
2016-06-23 10:26:45 +02:00
Yannick Welsch b3ba1be659 Fix checkstyle line length limit
Original commit: elastic/x-pack-elasticsearch@717ab001d1
2016-06-23 10:01:02 +02:00
Tanguy Leroux 99ade96091 Watcher: Remove usage of SearchRequest's template support
Template support is going to be removed from the Search API to its own Search Template API in the lang-mustache module (see elastic/elasticsearch#17906, elastic/elasticsearch#18765). This commit changes Watcher's SearchInput and SearchTransform classes so that it now uses a WatcherSearchTemplateRequest that contains both the search request and the template. Search request and template are rendered using WatcherSearchTemplateRequestService before being executed.

Original commit: elastic/x-pack-elasticsearch@bfa16ab80f
2016-06-23 09:31:47 +02:00
Alexander Reelsen f6abf979ce Fixed compilation issue
Relates elastic/elasticsearchelastic/elasticsearch#18914

Original commit: elastic/x-pack-elasticsearch@35b6960b9e
2016-06-23 09:06:02 +02:00
Lukas Olson 14896b174e Merge pull request elastic/elasticsearch#2573 from lukasolson/fix/all-fields
[security-ui] Default new roles to have access to all fields

Original commit: elastic/x-pack-elasticsearch@535a0287e8
2016-06-22 11:30:42 -07:00
Tim Sullivan 56798c59b7 Merge pull request elastic/elasticsearch#2564 from tsullivan/monitoring-ui-overview-welcome-msg
monitoring ui: provide welcome message on new overview

Original commit: elastic/x-pack-elasticsearch@dcd92d2ea0
2016-06-22 10:33:56 -07:00
Tim Sullivan 14c49b4af9 Merge pull request elastic/elasticsearch#2578 from tsullivan/monitoring-ui-alpha4-rc-fix-kibanainstanceslink
Monitoring UI: Fix link in header of Kibana panel

Original commit: elastic/x-pack-elasticsearch@e59b678b0b
2016-06-22 10:32:02 -07:00
Nik Everett 9aecf6330a Handle core removing addField
It is addStoredField now.

Original commit: elastic/x-pack-elasticsearch@265d716b31
2016-06-22 12:45:25 -04:00
javanna ffae647b8b [TEST] remove start and stop watcher from XPackRestTestCase
We were ignoring the response code which is always 401 because the license is not good to start watcher. Plus all tests run fine without these methods.

Original commit: elastic/x-pack-elasticsearch@f93e1c2777
2016-06-22 15:51:53 +02:00
Alexander Reelsen 5883efc976 Watcher: Remove support for _timestamp field in index action (elastic/elasticsearch#2575)
The watch index action was using the _timestamp field by default.
This functionality now needs to be configured explicitely for a special
field that is part of that document which is going to be indexed.

Relates elastic/elasticsearchelastic/elasticsearch#18980

Original commit: elastic/x-pack-elasticsearch@dfa4cf2296
2016-06-22 14:31:27 +02:00
Luca Cavanna 694a91cd2f Merge pull request elastic/elasticsearch#2433 from javanna/feature/http_client
Low level RestClient

Original commit: elastic/x-pack-elasticsearch@7a0c0eb9e6
2016-06-22 09:59:57 +02:00
javanna 1ea3397956 Merge branch 'master' into feature/http_client
Original commit: elastic/x-pack-elasticsearch@cb39e935d5
2016-06-22 09:50:28 +02:00
Alexander Reelsen 4f55896af8 Tests: Fix ManualPublicSmtpServersTester to make it work again
Original commit: elastic/x-pack-elasticsearch@8cf12ed485
2016-06-22 08:40:25 +02:00
Lukas Olson f62ed15929 Merge pull request elastic/elasticsearch#2540 from epixa/2045-401redirect
security: Auth redirects determined by kbn-version header

Original commit: elastic/x-pack-elasticsearch@ad5777d52c
2016-06-21 10:23:36 -07:00
Joe Fleming 37cef8f978 Merge branch 'master' into reporting-controls
Original commit: elastic/x-pack-elasticsearch@c5639eeb17
2016-06-21 10:48:07 -04:00
javanna a030239c9e Merge branch 'master' into feature/http_client
Original commit: elastic/x-pack-elasticsearch@6437c6572d
2016-06-21 16:22:25 +02:00
Joe Fleming 493b437673 Merge branch 'master' into fix/reporting-phantom-path
Original commit: elastic/x-pack-elasticsearch@05da659188
2016-06-21 09:50:12 -04:00
Martijn van Groningen 52bdda62c7 fixed compile error caused by change in core
Original commit: elastic/x-pack-elasticsearch@92e4939d8f
2016-06-21 09:38:25 +02:00
Daniel Mitterdorfer d5e7536766 Adjust line length in ChainTransformTests to 140 chars
Original commit: elastic/x-pack-elasticsearch@bbced70aa7
2016-06-21 07:28:00 +02:00
Shaunak Kashyap 91174ae066 Merge pull request elastic/elasticsearch#2537 from ycombinator/license-checking-cleanup
License checking cleanup

Original commit: elastic/x-pack-elasticsearch@e666b13b70
2016-06-20 20:18:07 -05:00
Lukas Olson 5169891eac Merge pull request elastic/elasticsearch#2370 from lukasolson/feature/account-settings
[security-ui] Create account settings page where password can be changed

Original commit: elastic/x-pack-elasticsearch@3d206d9492
2016-06-20 15:06:57 -07:00
Lukas Olson e5e3bea49f Merge pull request elastic/elasticsearch#2553 from lukasolson/fix/suggested-fields
[security-ui] Suggest fields instead of types when editing role

Original commit: elastic/x-pack-elasticsearch@eb6f55b963
2016-06-20 12:12:44 -07:00
Tim Sullivan 0dd0613ca2 Merge pull request elastic/elasticsearch#2550 from tsullivan/monitoring-ui-styles-clusteroverview
monitoring ui: styling fixes to cluster overview

Original commit: elastic/x-pack-elasticsearch@8ae4aa40fe
2016-06-20 11:03:46 -07:00
Tim Sullivan d8680b48d5 Merge pull request elastic/elasticsearch#2548 from tsullivan/monitoring-ui-fix-nodata-executor
monitoring ui: fix executor for no-data page

Original commit: elastic/x-pack-elasticsearch@9bbad70ede
2016-06-20 09:40:39 -07:00
Simon Willnauer a54d3bc3d5 Remove LazyInitializable and friends (elastic/elasticsearch#2558)
This class should have never existed, I fixed all places where we messed aroudn with this
and resolved dependencies or let guice deal with it.

Original commit: elastic/x-pack-elasticsearch@6a42c4153d
2016-06-20 17:25:30 +02:00
jaymode c024dbfc49 security: remove use of shield in files and directory names
This commit removes as much of the use of shield as possible in the source code.

See elastic/elasticsearch#2383

Original commit: elastic/x-pack-elasticsearch@00009cc06e
2016-06-20 10:26:10 -04:00
Simon Willnauer 0fcbf8c6ca Cleanup unnecessary modules and use current version across the board (elastic/elasticsearch#2556)
Followup for elastic/elasticsearchelastic/elasticsearch#18969

Original commit: elastic/x-pack-elasticsearch@c86a5969c7
2016-06-20 12:15:32 +02:00
Tanguy Leroux 24e9baeefb Remove scriptRemoved() method
Related to elastic/elasticsearch@18572

Original commit: elastic/x-pack-elasticsearch@ec43b58111
2016-06-20 10:33:18 +02:00
Lukas Olson f5d8a7c4e6 Merge branch 'master' into feature/account-settings
Original commit: elastic/x-pack-elasticsearch@6942ae6cb2
2016-06-17 13:54:20 -07:00