6f88c44030
fix conflict
...
Original commit: elastic/x-pack-elasticsearch@d0da2c43e3
2014-10-23 12:02:40 -04:00
82648c240f
Fixed typo in esusers help
...
Closes elastic/elasticsearch#216
Original commit: elastic/x-pack-elasticsearch@07b4782cdc
2014-10-23 12:42:40 +02:00
9b6823683c
Added some missing logging around realms
...
Closes elastic/elasticsearch#214
Original commit: elastic/x-pack-elasticsearch@648410ff8f
2014-10-23 11:15:02 +02:00
b2ffc1d7b9
Better error message for parsing error of role.yml
...
added the role name to the error message where the parsing error was encountered.
Closes elastic/elasticsearch#245
Original commit: elastic/x-pack-elasticsearch@303b932864
2014-10-23 11:02:31 +02:00
15a8ed090e
ignore failing tests
...
Original commit: elastic/x-pack-elasticsearch@53cdd48143
2014-10-22 23:31:25 -04:00
59b101cfab
LicensesService Notification work
...
Original commit: elastic/x-pack-elasticsearch@cd7260dec9
2014-10-22 23:24:00 -04:00
a6ba0eec2d
Merge branch 'master' of https://github.com/elasticsearch/elasticsearch-shield into doc-feedback
...
Conflicts:
docs/public/06-ldap.asciidoc
docs/public/08-auditing.asciidoc
docs/structured/01-introduction.asciidoc
docs/structured/02-architecture.asciidoc
Original commit: elastic/x-pack-elasticsearch@ddf1f0d910
2014-10-22 16:34:16 -07:00
b5b6a1093c
Fixes filename case typo
...
This fixes a file-name case typo for LdapSslSocketFactory
Original commit: elastic/x-pack-elasticsearch@fb71a1116e
2014-10-22 17:12:46 -06:00
4b0f7c4379
Fixed the url settings to only call the toArray. Plus I changed one of the tests to use the single value style
...
Original commit: elastic/x-pack-elasticsearch@16326d2b6c
2014-10-22 17:00:55 -06:00
f517a6a8f3
Refactors "urls" -> "url"
...
This lets the url be configured as a single element (the most likely usage) or as an array. This also checks that multiple urls are either all "ldaps", or all "ldap", as it is not possible to mix them.
Original commit: elastic/x-pack-elasticsearch@b5a94b1d35
2014-10-22 17:00:55 -06:00
0777e8d94f
Fixed a bug in Permissions with multiple indices permission groups
...
The evalutation of the indices permission groups was wrong. Now, each index in the request is evaluated against all groups, such that:
1. for each index, at least one group must grant the request
2. all indices must be granted
Along the way, also changed the audit logs structures such that:
- moved the principal to "sit" next to the host
- now, if we're logging an indices request, we also log the related indices (this provides more context to the actual request)
Fixes elastic/elasticsearch#242
Original commit: elastic/x-pack-elasticsearch@95600d3148
2014-10-23 00:46:56 +02:00
1f390cc654
Merge branch 'master' of https://github.com/elasticsearch/elasticsearch-shield into doc-feedback
...
Original commit: elastic/x-pack-elasticsearch@1dc6bee15d
2014-10-22 15:46:54 -07:00
996f7aadf7
nuked ESLicenseProvider; minor cleanups
...
Original commit: elastic/x-pack-elasticsearch@92af8dc307
2014-10-22 17:46:46 -04:00
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
d7b3f77586
Packaging system refactoring (WIP)
...
Original commit: elastic/x-pack-elasticsearch@29751a866d
2014-10-22 16:41:18 -04:00
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
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
1f153402ef
unify encoding; minor fixes & clean up imports
...
Original commit: elastic/x-pack-elasticsearch@0d00a7b177
2014-10-22 12:17:13 -04:00
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
3c551ab6d9
remove jackson as dep
...
Original commit: elastic/x-pack-elasticsearch@09418be764
2014-10-21 23:08:01 -04:00
e59cf4538a
major refactor: make ESLicense more consistent; restructure ESLicenseManager
...
Original commit: elastic/x-pack-elasticsearch@cb60bfb539
2014-10-21 23:05:29 -04:00
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
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
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
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
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
b9d92bae5a
reformat code
...
Original commit: elastic/x-pack-elasticsearch@9df9af2804
2014-10-20 15:45:01 -04:00
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
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
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
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
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
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
8367fc43d5
minor fix
...
Original commit: elastic/x-pack-elasticsearch@9552d8fbb1
2014-10-17 10:58:24 -04:00
0b72572711
minor fixes
...
Original commit: elastic/x-pack-elasticsearch@59fcb1728f
2014-10-17 10:35:17 -04:00
d0a5aea0e9
Completed License notification and tests
...
Original commit: elastic/x-pack-elasticsearch@7217698a11
2014-10-16 23:08:31 -04:00
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
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
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
490409d7eb
Fixes build errors around resource watching related tests
...
Original commit: elastic/x-pack-elasticsearch@a3614ce8c1
2014-10-16 14:40:08 -07:00
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
5fc3e264f0
Merge branch 'dev' into es_integration
...
Original commit: elastic/x-pack-elasticsearch@46b230d58e
2014-10-16 15:50:16 -04:00
68b5d71f37
minor: better CLT handling
...
Original commit: elastic/x-pack-elasticsearch@62a37bbbf1
2014-10-16 15:46:57 -04:00
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
ffeb0b4332
Changed all configuration files to be visible
...
Original commit: elastic/x-pack-elasticsearch@f1db8b43bb
2014-10-15 15:22:00 -07:00
d807b20f4a
initial stab at LicensesClientServices
...
Original commit: elastic/x-pack-elasticsearch@99e334e890
2014-10-14 23:07:59 -04:00
0ffa8c2c8e
minor tests
...
Original commit: elastic/x-pack-elasticsearch@07cacbe89a
2014-10-14 23:07:32 -04:00
6c16d562bc
restructure package for trial
...
Original commit: elastic/x-pack-elasticsearch@0ae53fab2e
2014-10-14 14:07:21 -04:00
52d29f4fbb
metaData fixes; Initial licneseClientService; trial license encoding/decoding
...
Original commit: elastic/x-pack-elasticsearch@6913a4dc23
2014-10-14 13:21:42 -04:00
97df195c02
[TEST] adapt ShieldRestTests to new users_roles format
...
Original commit: elastic/x-pack-elasticsearch@455a4e3fbc
2014-10-14 10:54:21 +02:00
Areek Zillur
uboness
Paul Echeverri
c-a-m
Igor Motov
Suyog Rao
javanna