Commit Graph

4088 Commits

Author SHA1 Message Date
c-a-m 229c9c6c7d Truststore not needed when client auth is off
With this change the truststore is loaded only if client-auth is turned on.  This is causing problems
because we never expect the http endpoint to have client auth, but it still requires us to have a truststore

Fixes https://github.com/elasticsearch/elasticsearch-shield/issues/221

Original commit: elastic/x-pack-elasticsearch@40e2dc4de6
2014-10-17 18:24:16 -07:00
c-a-m 91bbc5b2ea Fixes default ldap group to role mapping file
Description: This fixes the name of the default file for group to role mapping.  It was missing the extension

Fixes https://github.com/elasticsearch/elasticsearch-shield/issues/223

Original commit: elastic/x-pack-elasticsearch@9ffcafd41e
2014-10-17 18:11:51 -07:00
uboness 836540455a Added additional Hasher implementations
- `BCRYPT`, `MD5`, `SHA1`, `SHA2`,
 - Also removed the support for bcrypt minor version y (i.e. $2y$) as it's not supported by our BCrypt implementation

Original commit: elastic/x-pack-elasticsearch@12cf024a59
2014-10-17 16:40:06 -07:00
Paul Echeverri 8b024befbf Merge branch 'doc-feedback' of https://github.com/palecur/elasticsearch-shield into doc-feedback
Conflicts:
	docs/structured/01-introduction.asciidoc
	docs/structured/02-architecture.asciidoc
	docs/structured/03-getting-started.asciidoc
	docs/structured/appendices/01-reference.asciidoc
	docs/structured/authentication/ldap.asciidoc
	docs/structured/authentication/message-authentication.asciidoc

Original commit: elastic/x-pack-elasticsearch@f0b7511ec7
2014-10-17 13:40:27 -07:00
Areek Zillur 8367fc43d5 minor fix
Original commit: elastic/x-pack-elasticsearch@9552d8fbb1
2014-10-17 10:58:24 -04:00
Areek Zillur 0b72572711 minor fixes
Original commit: elastic/x-pack-elasticsearch@59fcb1728f
2014-10-17 10:35:17 -04:00
Areek Zillur d0a5aea0e9 Completed License notification and tests
Original commit: elastic/x-pack-elasticsearch@7217698a11
2014-10-16 23:08:31 -04:00
c-a-m 1224454714 ldap: truststore fix for issue 168
https://github.com/elasticsearch/elasticsearch-shield/issues/168
This makes configuring a truststore for LDAP optional.

Original commit: elastic/x-pack-elasticsearch@944a7deb28
2014-10-16 17:57:54 -07:00
Paul Echeverri 2df57f0259 Merge branch 'master' of https://github.com/elasticsearch/elasticsearch-shield into doc-feedback
Conflicts:
	docs/structured/authentication/esusers.asciidoc
	docs/structured/authentication/ldap.asciidoc

Original commit: elastic/x-pack-elasticsearch@c270c60d27
2014-10-16 15:32:17 -07:00
c-a-m 547756f0c8 ldap: Changed default ldap behaviours
Changed URL default to ldaps and port 636.  No mode now defaults to ldap.
Added miscelleneous documentation for active directory.  Incorrect mode now
throws an exception

Original commit: elastic/x-pack-elasticsearch@0239380668
2014-10-16 15:09:10 -07:00
uboness 490409d7eb Fixes build errors around resource watching related tests
Original commit: elastic/x-pack-elasticsearch@a3614ce8c1
2014-10-16 14:40:08 -07:00
uboness 751142a600 Changed the default file watching delays to the minimum
Currently the minimum delay defaults to 5 seconds in es

Fixes elastic/elasticsearch#196

Original commit: elastic/x-pack-elasticsearch@3a99883a90
2014-10-16 13:04:07 -07:00
Areek Zillur 5fc3e264f0 Merge branch 'dev' into es_integration
Original commit: elastic/x-pack-elasticsearch@46b230d58e
2014-10-16 15:50:16 -04:00
Areek Zillur 68b5d71f37 minor: better CLT handling
Original commit: elastic/x-pack-elasticsearch@62a37bbbf1
2014-10-16 15:46:57 -04:00
Paul Echeverri 9a6600a2f3 Merge branch 'doc-feedback' of https://github.com/palecur/elasticsearch-shield
Conflicts:
	docs/public/01-introduction.asciidoc
	docs/public/02-architecture.asciidoc
	docs/public/03-gettingstarted.asciidoc
	docs/public/04-administration.asciidoc

Merging PR # 160, modulo RBAC diagram.

Original commit: elastic/x-pack-elasticsearch@5eeb9d82a3
2014-10-15 16:46:32 -07:00
uboness ffeb0b4332 Changed all configuration files to be visible
Original commit: elastic/x-pack-elasticsearch@f1db8b43bb
2014-10-15 15:22:00 -07:00
Areek Zillur d807b20f4a initial stab at LicensesClientServices
Original commit: elastic/x-pack-elasticsearch@99e334e890
2014-10-14 23:07:59 -04:00
Areek Zillur 0ffa8c2c8e minor tests
Original commit: elastic/x-pack-elasticsearch@07cacbe89a
2014-10-14 23:07:32 -04:00
Areek Zillur 6c16d562bc restructure package for trial
Original commit: elastic/x-pack-elasticsearch@0ae53fab2e
2014-10-14 14:07:21 -04:00
Areek Zillur 52d29f4fbb metaData fixes; Initial licneseClientService; trial license encoding/decoding
Original commit: elastic/x-pack-elasticsearch@6913a4dc23
2014-10-14 13:21:42 -04:00
javanna 97df195c02 [TEST] adapt ShieldRestTests to new users_roles format
Original commit: elastic/x-pack-elasticsearch@455a4e3fbc
2014-10-14 10:54:21 +02:00
javanna aaf1762bd6 [TEST] adapted users_roles tests to new format role:users
Original commit: elastic/x-pack-elasticsearch@d1aef6900c
2014-10-14 10:32:45 +02:00
Igor Motov a8f5f0151d Refactor injection mechanism
Original commit: elastic/x-pack-elasticsearch@a85d5213bf
2014-10-13 21:56:20 -04:00
uboness 78377c7cd2 Change users_roles format to be keyed by roles
Having roles as the keys is more aligned with the LDAP role_mapping file and with linux's group file (where the groups serve as the keys)

Also added support for comment lines (starting with `#`) in `.users` and `.users_roles` files

Original commit: elastic/x-pack-elasticsearch@60faf7330f
2014-10-13 15:10:07 -07:00
uboness 4621bb7620 Fixed the HasherTests so they'll pass under windows
Original commit: elastic/x-pack-elasticsearch@69a0a00751
2014-10-13 14:40:24 -07:00
c-a-m 858e7e9e35 users: Removed default users and user->role mappings
This will force users to create a user via the esusers
This also adds log warning when no users are found.

Original commit: elastic/x-pack-elasticsearch@3c31f8d3b0
2014-10-13 13:56:54 -06:00
c-a-m 07875c530c bug: Invalid role causing NPE
https://github.com/elasticsearch/elasticsearch-shield/issues/116

This removes null predicates that result from roles without any privileges.

Original commit: elastic/x-pack-elasticsearch@9e90237f1c
2014-10-13 10:13:18 -06:00
javanna f69c1c616a FilesUserRolesStore to return an empty array when there's no roles for a user
This prevents us from spreading the null invariant all over the place ending up with causing NPEs.

Closes elastic/elasticsearch#147

Original commit: elastic/x-pack-elasticsearch@3d5adf94ec
2014-10-13 11:26:01 +02:00
javanna 6173496a52 [TEST] fixed typo s/ingored/ignored
Original commit: elastic/x-pack-elasticsearch@7301340df8
2014-10-13 11:26:01 +02:00
Areek Zillur 07ec8ef93f minor helpers for trial licenses
Original commit: elastic/x-pack-elasticsearch@7bd3fdded7
2014-10-10 20:17:55 -04:00
Areek Zillur 6b208bce8f implemented Trial licenses
Original commit: elastic/x-pack-elasticsearch@64b987a991
2014-10-10 18:56:29 -04:00
uboness 5b3ae0c4d9 Added caching to allowed indices matcher
In order to prevent too many automata constructions (which can be expensive) all the time, the automatas are now cached per action/privilege (since there are limited number of those, we don't expect a cache explosion).

 Closes elastic/elasticsearch#125

Original commit: elastic/x-pack-elasticsearch@27a4e1fdbe
2014-10-10 19:26:45 +02:00
javanna f2aca1e9bc Cli tools: make sure that the status code is returned from scripts
The status code wasn't returned from java mains (always 0), also it got lost anyway within our scripts that are calling the java mains.

Relates to elastic/elasticsearch#142

Original commit: elastic/x-pack-elasticsearch@db62486605
2014-10-10 14:40:42 +02:00
javanna bad27996f9 [TEST] improved registered actions sanity check test
Shield needs to know about all the actions that are registered in core. We now check not only the external actions, meaning the classes that implement the Action interface, exposed via java api, but also all the transport handlers registered through the transport, which will contains all shard/node level actions plus the internal actions that are not exposed via java api.

We maintain two files, one for external actions, and one for the internal ones, and we check whether actions have been added or removed to/from core, to make sure we know about those changes.

Original commit: elastic/x-pack-elasticsearch@d6b68c44ee
2014-10-10 12:16:49 +02:00
Karel Minarik 5514201d4d Fixed typo in `esusers` command description
Closes elastic/elasticsearch#140

Original commit: elastic/x-pack-elasticsearch@223e76fc3f
2014-10-10 12:08:26 +02:00
Areek Zillur f05ccaa3f9 Added Service Interfaces; start trial license impl; spec out licensesService
Original commit: elastic/x-pack-elasticsearch@1e5b311113
2014-10-09 17:20:38 -04:00
javanna c20e4efe2d Improve error message when the cluster has no indices
When the indices are empty, replaced the error message `IndexMissingException[[[]] missing]` with `IndexMissingException[[[_all]] missing]`

Closes elastic/elasticsearch#138

Original commit: elastic/x-pack-elasticsearch@b590547722
2014-10-09 16:32:01 +02:00
Areek Zillur 90466deb0c remove redundant code
Original commit: elastic/x-pack-elasticsearch@d61cb5554c
2014-10-08 23:26:50 -04:00
Areek Zillur d7ec84afd7 Major refactoring of LicenseManager; Initial integration with LicenseService; still a lot of TODOs
Original commit: elastic/x-pack-elasticsearch@880984062a
2014-10-08 23:19:06 -04:00
Areek Zillur 0bcdb016be added setup section to README
Original commit: elastic/x-pack-elasticsearch@4c842072f6
2014-10-07 13:56:23 -04:00
Areek Zillur 68eb791965 added setup section to README
Original commit: elastic/x-pack-elasticsearch@dbf593ef16
2014-10-07 13:54:55 -04:00
Areek Zillur 85a72ee3b5 update Transport tests
Original commit: elastic/x-pack-elasticsearch@1623939755
2014-10-07 13:15:38 -04:00
Areek Zillur 0306614c00 cleanup
Original commit: elastic/x-pack-elasticsearch@03d4ae524c
2014-10-07 13:10:40 -04:00
c-a-m 7f77627396 Merge branch 'mrsolo-enhance/static'
Original commit: elastic/x-pack-elasticsearch@c62fc1e081
2014-10-07 11:07:59 -06:00
Bill Hwang 0cb46872cf [CI] Added custom pmd xml file
Add missing file

Original commit: elastic/x-pack-elasticsearch@2939191b32
2014-10-07 11:06:35 -06:00
Bill Hwang 2a1ce81960 [CI] Added static analysis dependencies
Modified pom.xml to do static analysis without Jenkins

'mvn -DskipTests=true -Pstatic clean compile site' to start analysis
The reports are at target/site/project-reports.html.

Original commit: elastic/x-pack-elasticsearch@ddec28e8d0
2014-10-07 11:06:35 -06:00
Areek Zillur 533220e15a fix circular dependency on LicensesService
Original commit: elastic/x-pack-elasticsearch@d419878c35
2014-10-07 13:04:13 -04:00
Areek Zillur a034f96497 Merge branch 'dev' into es_integration
Original commit: elastic/x-pack-elasticsearch@7b3a74f175
2014-10-07 12:38:24 -04:00
Alexander Reelsen aec86a060e incorporated review comments
Original commit: elastic/x-pack-elasticsearch@f4c8ed918f
2014-10-07 18:10:08 +02:00
Alexander Reelsen 994f785715 Logging: Stop logging closed channel exceptions by default
Original commit: elastic/x-pack-elasticsearch@c563ecaafb
2014-10-07 18:10:08 +02:00