Commit Graph

6755 Commits

Author SHA1 Message Date
Areek Zillur 996f7aadf7 nuked ESLicenseProvider; minor cleanups
Original commit: elastic/x-pack-elasticsearch@92af8dc307
2014-10-22 17:46:46 -04:00
Paul Echeverri df7eba437e Merge branch 'master' of https://github.com/elasticsearch/elasticsearch-shield into doc-feedback
Original commit: elastic/x-pack-elasticsearch@4f890b59f6
2014-10-22 13:49:15 -07:00
Igor Motov d7b3f77586 Packaging system refactoring (WIP)
Original commit: elastic/x-pack-elasticsearch@29751a866d
2014-10-22 16:41:18 -04:00
Paul Echeverri d34c7cddf3 Merge branch 'master' of https://github.com/elasticsearch/elasticsearch-shield into doc-feedback
Conflicts:
	docs/structured/03-getting-started.asciidoc
	docs/structured/06-ldap.asciidoc
	docs/structured/authentication/message-authentication.asciidoc

Original commit: elastic/x-pack-elasticsearch@642beb53ca
2014-10-22 12:02:29 -07:00
uboness fa48c46813 Skip authentication for rest OPTIONS call
this is required by CORS for unauthenticated pre-flight OPTIONS requests

Closes elastic/elasticsearch#234

Original commit: elastic/x-pack-elasticsearch@c368b2cf27
2014-10-22 19:29:20 +02:00
Areek Zillur 1f153402ef unify encoding; minor fixes & clean up imports
Original commit: elastic/x-pack-elasticsearch@0d00a7b177
2014-10-22 12:17:13 -04:00
uboness 3d71356596 Fixes Transport Client that start up with shield in the classpath
Now a NOOP transport filter is bound by to the secured transport service in a transport client

Fixes elastic/elasticsearch#165

Original commit: elastic/x-pack-elasticsearch@7268bd445c
2014-10-22 06:18:59 +02:00
Areek Zillur 3c551ab6d9 remove jackson as dep
Original commit: elastic/x-pack-elasticsearch@09418be764
2014-10-21 23:08:01 -04:00
Areek Zillur e59cf4538a major refactor: make ESLicense more consistent; restructure ESLicenseManager
Original commit: elastic/x-pack-elasticsearch@cb60bfb539
2014-10-21 23:05:29 -04:00
Paul Echeverri afbb81fe53 Merge branch 'master' of https://github.com/elasticsearch/elasticsearch-shield into doc-feedback
Original commit: elastic/x-pack-elasticsearch@83e163e463
2014-10-21 12:47:00 -07:00
Paul Echeverri 45858f33c5 Merge branch 'master' of https://github.com/elasticsearch/elasticsearch-shield into doc-feedback
Original commit: elastic/x-pack-elasticsearch@31b0cf72db
2014-10-21 12:27:50 -07:00
Paul Echeverri 59e66bd373 Merge branch 'master' of https://github.com/elasticsearch/elasticsearch-shield into doc-feedback
Original commit: elastic/x-pack-elasticsearch@453d353111
2014-10-21 12:26:55 -07:00
Suyog Rao ce6646df2b Fix typo in esusers help description
Closes elastic/elasticsearch#222

Original commit: elastic/x-pack-elasticsearch@6c513be2aa
2014-10-20 22:44:06 -07:00
Paul Echeverri 21dfc7bfed Merge branch 'master' of https://github.com/elasticsearch/elasticsearch-shield into doc-feedback
Original commit: elastic/x-pack-elasticsearch@f7a6f816b8
2014-10-20 13:47:26 -07:00
Areek Zillur b9d92bae5a reformat code
Original commit: elastic/x-pack-elasticsearch@9df9af2804
2014-10-20 15:45:01 -04:00
Areek Zillur 1964ebc6f2 Consumer Plugin integration tests; Represent feature as string; proper handling of trial licenses
Original commit: elastic/x-pack-elasticsearch@d86f98a435
2014-10-20 15:42:23 -04:00
Igor Motov 9f84847681 First round of refactoring
ESLicenceManager is no longer a static singleton

Original commit: elastic/x-pack-elasticsearch@3e46f315a1
2014-10-20 11:06:06 -04:00
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