Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature/Identity] Identity Module and tokens for internal authentication #5471

Closed
Closed
Show file tree
Hide file tree
Changes from 56 commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
a01cb3e
Create auth token after successful authc + authz for internal transpo…
cwperks Nov 21, 2022
9b176f3
WIP adding internalClusterTest
cwperks Nov 21, 2022
ba989cc
WIP on internal tokens
cwperks Nov 23, 2022
7fca5b5
WIP on internal tokens distributed through the cluster
cwperks Nov 25, 2022
d7324d0
WIP on internal tokens
cwperks Dec 5, 2022
1cf3bb2
Merge branch 'feature/identity' into internal-tokens
cwperks Dec 5, 2022
0bd3141
Fix flaky ShardIndexingPressureConcurrentExecutionTests (#5439)
Rishikesh1159 Dec 5, 2022
4662fb9
Add missing import
cwperks Dec 5, 2022
8277f5a
Create identity module
cwperks Dec 5, 2022
0c62564
Test rest wrapper with gradlew run
cwperks Dec 6, 2022
913cb3a
Fix bwc for cluster manager throttling settings (#5305)
dhwanilpatel Dec 6, 2022
750134e
Add HttpSmokeTestCaseWithIdentity
cwperks Dec 6, 2022
5500114
Update ingest-attachment plugin dependencies: Apache Tika 3.6.0, Apac…
reta Dec 6, 2022
e136240
WIP on verifying tokens passed through the cluster test
cwperks Dec 6, 2022
c3e3712
Remove sysout in RestClient
cwperks Dec 6, 2022
ca619bb
Create and use TokenInterceptorPlugin for IT
cwperks Dec 7, 2022
c7f0844
Add to CHANGELOG
cwperks Dec 7, 2022
8d321cd
Add package-info and disable missingJavadoc for identity module
cwperks Dec 7, 2022
1069660
Enhance CheckpointState to support no-op replication (#5282)
ashking94 Dec 7, 2022
ce1ee4b
Remove sysouts in ActionModule
cwperks Dec 7, 2022
40bc815
Run spotlessApply
cwperks Dec 7, 2022
a47fc78
Run spotlessApply on identity module
cwperks Dec 7, 2022
de33925
Fix :sandbox:modules:identity:loggerUsageCheck
cwperks Dec 7, 2022
88da9a5
Re-run ./gradlew :sandbox:modules:identity:spotlessApply
cwperks Dec 7, 2022
22ee0cc
Add Identity module tests
cwperks Dec 7, 2022
2416d37
[BUG] org.opensearch.repositories.s3.RepositoryS3ClientYamlTestSuiteI…
reta Dec 7, 2022
29d561f
Move basic auth tests to identity
cwperks Dec 7, 2022
42125b8
Add abstract
cwperks Dec 7, 2022
bc1874c
Modify ReindexFromRemoteWithAuthTests
cwperks Dec 8, 2022
ce17ea1
Bypass session error by ensuring user is logged out before login is c…
cwperks Dec 8, 2022
ce25dec
[Bug] fix case sensitivity for wildcard queries (#5462)
nknize Dec 8, 2022
52590e1
Create rest client against data nodes to ensure tranport requests are…
cwperks Dec 8, 2022
5fcc29d
Remove SecurityInterceptor
cwperks Dec 8, 2022
f7fcf57
Fix failing test ReindexIT.testDeleteByQueryTask
cwperks Dec 8, 2022
6822325
Switch to TEST scope
cwperks Dec 8, 2022
bea27b8
Support OpenSSL Provider with default Netty allocator (#5460)
reta Dec 9, 2022
a060c0a
Revert "build no-jdk distributions as part of release build (#4902)" …
rursprung Dec 9, 2022
6b9d75b
Move AuthenticationManager setup to IdentityPlugin createComponents
cwperks Dec 9, 2022
000fa6a
Remove sysout in SecurityRestFilter
cwperks Dec 9, 2022
8617dbe
Add max_shard_size parameter for Shrink API (fix supported version af…
reta Dec 9, 2022
0a50311
Run :server:spotlessApply
cwperks Dec 9, 2022
0f651b8
Sync CODEOWNERS with MAINTAINERS. (#5501)
dblock Dec 9, 2022
c6663fd
Added jackson dependency to server (#5366)
ryanbogan Dec 9, 2022
7108ee5
Fix flaky test BulkIntegrationIT.testDeleteIndexWhileIndexing (#5491)
Poojita-Raj Dec 9, 2022
67977a2
Add release notes for 2.4.1 (#5488)
xuezhou25 Dec 9, 2022
d4e5a28
Properly skip OnDemandBlockSnapshotIndexInputTests.testVariousBlockSi…
mch2 Dec 9, 2022
e41cbe5
Merge first batch of feature/extensions into main (#5347)
ryanbogan Dec 10, 2022
bceb40c
Bump commons-compress from 1.21 to 1.22 (#5520)
dependabot[bot] Dec 12, 2022
d38ebd9
Move Identity and IdentityTests to identity module
cwperks Dec 12, 2022
0cf6797
[Segment Replication] Trigger a round of replication for replica shar…
Rishikesh1159 Dec 12, 2022
b9e6ff0
Merge branch 'main' into internal-tokens
cwperks Dec 12, 2022
d3da9cf
Add missing sha files
cwperks Dec 12, 2022
2098d00
Remove opensearch-authn dependency on server and fix dependencyLicenses
cwperks Dec 12, 2022
54d1b48
Move noop tests to opensearch-authn
cwperks Dec 12, 2022
b8377c2
Fix precommit
cwperks Dec 12, 2022
2a98d8d
Add getClassLoader permission
cwperks Dec 12, 2022
c9234ca
Ignore flaky test and leave TODO statement
cwperks Dec 12, 2022
e22dc9d
Use AwaitsFix instead of Ignore
cwperks Dec 12, 2022
6f72712
Remove unused import
cwperks Dec 12, 2022
5cdf41d
Add accessUserInformation permission
cwperks Dec 13, 2022
08cd06f
Adding support to register settings dynamically (#5495)
ryanbogan Dec 13, 2022
ceca161
Updated 1.3.7 release notes date (#5536)
owaiskazi19 Dec 13, 2022
aecd1ea
Pre conditions check before updating weighted routing metadata (#4955)
imRishN Dec 13, 2022
ff16ebd
Atomically update cluster state with decommission status and correspo…
imRishN Dec 13, 2022
a15147c
Use shiro.ini for initialization
cwperks Dec 13, 2022
29b799d
Add commons-logging
cwperks Dec 13, 2022
a0e0a3f
fix thirdPartyAudit
cwperks Dec 13, 2022
f8fa37c
Add securityManager.subjectDAO.sessionStorageEvaluator.sessionStorage…
cwperks Dec 13, 2022
ea73119
Update Netty to 4.1.86.Final (#5529)
reta Dec 13, 2022
ec5144b
Update release date in 2.4.1 release notes (#5549)
dreamer-89 Dec 13, 2022
1710786
Update 2.4.1 release notes (#5552)
reta Dec 13, 2022
d549367
Ignore RestClientSingleHostIntegTests.testManyAsyncRequests
cwperks Dec 13, 2022
16236c0
Disable tests running many async requests
cwperks Dec 13, 2022
e9cbeb7
Use authenticate instead of login
cwperks Dec 13, 2022
507d0ea
Remove apply plugin: 'opensearch.testclusters'
cwperks Dec 14, 2022
54145d9
Add ability to disable identity via settings
cwperks Dec 14, 2022
6e8d469
Run spotlessApply
cwperks Dec 14, 2022
c61e08d
Re-run ci
cwperks Dec 14, 2022
e6fd640
Disable identity for qa full-cluster-restart
cwperks Dec 14, 2022
6992fa9
Add V_2_4_2 in Version
cwperks Dec 14, 2022
d3f6dfa
Refactor fuzziness interface on query builders (#5433)
noCharger Dec 14, 2022
22695a6
Remove identity.disabled in full-cluster-restart/build.gradle
cwperks Dec 14, 2022
a3b6216
Disable identity module by default and add setting to enable
cwperks Dec 14, 2022
88232b7
Set default to false
cwperks Dec 14, 2022
27db2a1
Test identity module with identity enabled
cwperks Dec 14, 2022
0475d1c
Upgrade lucene version (#5570)
dreamer-89 Dec 14, 2022
459c18e
Set identity enabled in HttpSmokeTestCaseWithIdentity
cwperks Dec 14, 2022
fe8fd67
Add CI bundle pattern to distribution download (#5348)
zelinh Dec 14, 2022
cb26035
Bump protobuf-java from 3.21.9 to 3.21.11 in /plugins/repository-hdfs…
dependabot[bot] Dec 14, 2022
68efc49
Remove added Version
cwperks Dec 15, 2022
d53c4b8
Merge branch 'main' into internal-tokens
cwperks Dec 15, 2022
1d56fa3
Re-enable tests with many async requests
cwperks Dec 15, 2022
4ddbd03
Remove changes in OpenSearchRestTestCase
cwperks Dec 15, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
# This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
* @opensearch-project/opensearch-core @reta

* @reta @anasalkouz @andrross @reta @Bukhtawar @CEHENKLE @dblock @setiah @kartg @kotwanikunal @mch2 @nknize @owaiskazi19 @adnapibar @Rishikesh1159 @ryanbogan @saratvemulapalli @shwetathareja @dreamer-89 @tlfeng @VachaShah @xuezhou25
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- [Identity] Strategy for Delegated Authority using Tokens ([#4826](https://github.com/opensearch-project/OpenSearch/pull/4826))
- [Identity] User operations: create update delete ([#4741](https://github.com/opensearch-project/OpenSearch/pull/4741))
- [Identity] Adds Basic Auth mechanism via Internal IdP ([#4798](https://github.com/opensearch-project/OpenSearch/pull/4798))
- [Identity] Identity Module and tokens for internal authentication ([#5471](https://github.com/opensearch-project/OpenSearch/pull/5471))
6 changes: 3 additions & 3 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

| Maintainer | GitHub ID | Affiliation |
| --------------- | --------- | ----------- |
| Abbas Hussain | [abbashus](https://github.com/abbashus) | Amazon |
| Anas Alkouz | [anasalkouz](https://github.com/anasalkouz) | Amazon |
| Andrew Ross | [andrross](https://github.com/andrross)| Amazon |
| Andriy Redko | [reta](https://github.com/reta) | Aiven |
Expand All @@ -22,8 +21,8 @@
| Rishikesh Pasham | [Rishikesh1159](https://github.com/Rishikesh1159) | Amazon|
| Ryan Bogan | [ryanbogan](https://github.com/ryanbogan) | Amazon |
| Sarat Vemulapalli | [saratvemulapalli](https://github.com/saratvemulapalli) | Amazon |
| Shweta Thareja |[shwetathareja](https://github.com/shwetathareja) | Amazon |
| Suraj Singh |[dreamer-89](https://github.com/dreamer-89) | Amazon |
| Shweta Thareja | [shwetathareja](https://github.com/shwetathareja) | Amazon |
| Suraj Singh | [dreamer-89](https://github.com/dreamer-89) | Amazon |
| Tianli Feng | [tlfeng](https://github.com/tlfeng) | Amazon |
| Vacha Shah | [VachaShah](https://github.com/VachaShah) | Amazon |
| Xue Zhou | [xuezhou25](https://github.com/xuezhou25) | Amazon |
Expand All @@ -32,6 +31,7 @@

| Maintainer | GitHub ID | Affiliation |
| --------------- | --------- | ----------- |
| Abbas Hussain | [abbashus](https://github.com/abbashus) | Amazon |
| Megha Sai Kavikondala | [meghasaik](https://github.com/meghasaik) | Amazon |

[This document](https://github.com/opensearch-project/.github/blob/main/MAINTAINERS.md) explains what maintainers do in this repo, and how they should be doing it. If you're interested in contributing, see [CONTRIBUTING](CONTRIBUTING.md).
2 changes: 1 addition & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ dependencies {
api localGroovy()

api 'commons-codec:commons-codec:1.15'
api 'org.apache.commons:commons-compress:1.21'
api 'org.apache.commons:commons-compress:1.22'
api 'org.apache.ant:ant:1.10.12'
api 'com.netflix.nebula:gradle-extra-configurations-plugin:8.0.0'
api 'com.netflix.nebula:nebula-publishing-plugin:4.6.0'
Expand Down
2 changes: 0 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,3 @@ systemProp.jdk.tls.client.protocols=TLSv1.2

# jvm args for faster test execution by default
systemProp.tests.jvm.argline=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m

systemProp.sandbox.enabled=true
1 change: 1 addition & 0 deletions gradle/missing-javadoc.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ configure([
project(":modules:repository-url"),
project(":modules:systemd"),
project(":modules:transport-netty4"),
project(":sandbox:modules:identity"),
project(":plugins:analysis-icu"),
project(":plugins:analysis-kuromoji"),
project(":plugins:analysis-nori"),
Expand Down
2 changes: 0 additions & 2 deletions modules/ingest-geoip/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ opensearchplugin {
dependencies {
api('com.maxmind.geoip2:geoip2:3.0.2')
// geoip2 dependencies:
api("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
api("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
api('com.maxmind.db:maxmind-db:2.1.0')

testImplementation 'org.elasticsearch:geolite2-databases:20191119'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,6 @@ public void testReindexWithBadAuthentication() throws Exception {
.destination("dest")
.setRemoteInfo(newRemoteInfo("junk", "auth", emptyMap()));
OpenSearchStatusException e = expectThrows(OpenSearchStatusException.class, () -> request.get());
assertThat(e.getMessage(), containsString("\"error\":\"junk does not exist in internal realm.\"")); // Due to native auth
// implementation
}

/**
Expand Down
7 changes: 7 additions & 0 deletions modules/transport-netty4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,13 @@ thirdPartyAudit {
'org.jboss.marshalling.MarshallingConfiguration',
'org.jboss.marshalling.Unmarshaller',

// from io.netty.util.internal.logging.InternalLoggerFactory (netty) - it's optional
'org.slf4j.helpers.FormattingTuple',
'org.slf4j.helpers.MessageFormatter',
'org.slf4j.Logger',
'org.slf4j.LoggerFactory',
'org.slf4j.spi.LocationAwareLogger',

'com.github.luben.zstd.Zstd',
'com.google.protobuf.ExtensionRegistryLite',
'com.google.protobuf.MessageLiteOrBuilder',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

package org.opensearch.transport;

import io.netty.channel.socket.InternetProtocolFamily;
import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.util.internal.SocketUtils;
import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory;

import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel;
import java.nio.channels.spi.SelectorProvider;
import java.util.List;

public class Netty4NioServerSocketChannel extends NioServerSocketChannel {
private static final InternalLogger logger = InternalLoggerFactory.getInstance(Netty4NioServerSocketChannel.class);

public Netty4NioServerSocketChannel() {
super();
}

public Netty4NioServerSocketChannel(SelectorProvider provider) {
super(provider);
}

public Netty4NioServerSocketChannel(SelectorProvider provider, InternetProtocolFamily family) {
super(provider, family);
}

public Netty4NioServerSocketChannel(ServerSocketChannel channel) {
super(channel);
}

@Override
protected int doReadMessages(List<Object> buf) throws Exception {
SocketChannel ch = SocketUtils.accept(javaChannel());

try {
if (ch != null) {
buf.add(new Netty4NioSocketChannel(this, ch));
return 1;
}
} catch (Throwable t) {
logger.warn("Failed to create a new channel from an accepted socket.", t);

try {
ch.close();
} catch (Throwable t2) {
logger.warn("Failed to close a socket.", t2);
}
}

return 0;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import io.netty.buffer.UnpooledByteBufAllocator;
import io.netty.channel.Channel;
import io.netty.channel.ServerChannel;
import io.netty.channel.socket.nio.NioServerSocketChannel;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.opensearch.common.Booleans;
Expand Down Expand Up @@ -181,7 +180,7 @@ public static Class<? extends ServerChannel> getServerChannelType() {
if (ALLOCATOR instanceof NoDirectBuffers) {
return CopyBytesServerSocketChannel.class;
} else {
return NioServerSocketChannel.class;
return Netty4NioServerSocketChannel.class;
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0ce1edb914c94ebc388f086c6827e8bdeec71ac2
202 changes: 202 additions & 0 deletions plugins/discovery-azure-classic/licenses/commons-lang-LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Apache Commons Lang
Copyright 2001-2015 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

This product includes software from the Spring Framework,
under the Apache License 2.0 (see: StringUtils.containsWhitespace())
2 changes: 0 additions & 2 deletions plugins/discovery-ec2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ dependencies {
api "commons-logging:commons-logging:${versions.commonslogging}"
api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
api "commons-codec:commons-codec:${versions.commonscodec}"
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
}

restResources {
Expand Down
Loading