Apache Solr open-source search software
SOLR-16429: Add AWS STS support in s3-repository (#1041)
Houston Putmand03f7fef9399
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 900587bbc63..879888aa590 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -91,6 +91,8 @@ Improvements* SOLR-16404: Prometheus Exporter: Use HTTP2 Solr clients. (Houston Putman)+* SOLR-16429: The s3-repository module now supports AWS STS, and therefore Web Identity Tokens, by default. (Josh Souza via Houston Putman)+Optimizations---------------------* SOLR-16120: Optimise hl.fl expansion. (Christine Poerschke, David Smiley, Mike Drob)diff --git a/solr/licenses/sts-2.17.63.jar.sha1 b/solr/licenses/sts-2.17.63.jar.sha1new file mode 100644index 00000000000..45055636a76--- /dev/null+++ b/solr/licenses/sts-2.17.63.jar.sha1@@ -0,0 +1 @@+754aafd124c5f081fb2a21eef862bedd10f0ef8adiff --git a/solr/licenses/sts-LICENSE-ASL.txt b/solr/licenses/sts-LICENSE-ASL.txtnew file mode 100644index 00000000000..1eef70a9b9f--- /dev/null+++ b/solr/licenses/sts-LICENSE-ASL.txt@@ -0,0 +1,206 @@++ 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.++ Note: Other license terms may apply to certain, identified software files contained within or distributed+ with the accompanying software if such terms are included in the directory containing the accompanying software.+ Such other license terms will then apply in lieu of the terms of the software license above.diff --git a/solr/licenses/sts-NOTICE.txt b/solr/licenses/sts-NOTICE.txtnew file mode 100644index 00000000000..7b5a0689032--- /dev/null+++ b/solr/licenses/sts-NOTICE.txt@@ -0,0 +1,25 @@+AWS SDK for Java 2.0+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.++This product includes software developed by+Amazon Technologies, Inc (http://www.amazon.com/).++**********************+THIRD PARTY COMPONENTS+**********************+This software includes third party software subject to the following copyrights:+- XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty.+- PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc.+- Apache Commons Lang - https://github.com/apache/commons-lang+- Netty Reactive Streams - https://github.com/playframework/netty-reactive-streams+- Jackson-core - https://github.com/FasterXML/jackson-core+- Jackson-dataformat-cbor - https://github.com/FasterXML/jackson-dataformats-binary++The licenses for these third party components are included in LICENSE.txt++- For Apache Commons Lang see also this required NOTICE:+ Apache Commons Lang+ Copyright 2001-2020 The Apache Software Foundation++ This product includes software developed at+ The Apache Software Foundation (https://www.apache.org/).diff --git a/solr/modules/s3-repository/build.gradle b/solr/modules/s3-repository/build.gradleindex 6b1c6cc3365..1dfe43d5649 100644--- a/solr/modules/s3-repository/build.gradle+++ b/solr/modules/s3-repository/build.gradle@@ -34,6 +34,9 @@ dependencies {exclude group: 'software.amazon.awssdk', module: 'netty-nio-client'}implementation(group: 'software.amazon.awssdk', name: 'sdk-core')+ runtimeOnly(group: 'software.amazon.awssdk', name: 'sts') {+ exclude group: 'software.amazon.awssdk', module: 'netty-nio-client'+ }implementation 'com.google.guava:guava'implementation 'org.slf4j:slf4j-api'diff --git a/versions.lock b/versions.lockindex eabbc141120..078d5778afd 100644--- a/versions.lock+++ b/versions.lock@@ -307,24 +307,25 @@ org.threeten:threetenbp:1.6.0 (4 constraints: 0433a25f)org.tukaani:xz:1.9 (1 constraints: 030c5be9)org.xerial.snappy:snappy-java:1.1.8.2 (4 constraints: 8c382ee2)org.yaml:snakeyaml:1.30 (2 constraints: 772ad909)-software.amazon.awssdk:annotations:2.17.63 (17 constraints: e2ff18d3)-software.amazon.awssdk:apache-client:2.17.63 (3 constraints: 951d4b90)+software.amazon.awssdk:annotations:2.17.63 (18 constraints: 690ceab3)+software.amazon.awssdk:apache-client:2.17.63 (4 constraints: 0d2a0ae3)software.amazon.awssdk:arns:2.17.63 (2 constraints: 21185ac1)-software.amazon.awssdk:auth:2.17.63 (4 constraints: d42bf4dd)-software.amazon.awssdk:aws-core:2.17.63 (5 constraints: 8641079a)-software.amazon.awssdk:aws-query-protocol:2.17.63 (2 constraints: e31dac7f)+software.amazon.awssdk:auth:2.17.63 (5 constraints: 4c38fb3f)+software.amazon.awssdk:aws-core:2.17.63 (6 constraints: fe4df51e)+software.amazon.awssdk:aws-query-protocol:2.17.63 (3 constraints: 5b2ab1dd)software.amazon.awssdk:aws-xml-protocol:2.17.63 (2 constraints: 21185ac1)software.amazon.awssdk:bom:2.17.63 (1 constraints: 7505bf40)-software.amazon.awssdk:http-client-spi:2.17.63 (10 constraints: 63992164)+software.amazon.awssdk:http-client-spi:2.17.63 (11 constraints: dba5da79)software.amazon.awssdk:json-utils:2.17.63 (3 constraints: 4227d652)-software.amazon.awssdk:metrics-spi:2.17.63 (6 constraints: c555c7a0)-software.amazon.awssdk:profiles:2.17.63 (7 constraints: ef54aaf2)-software.amazon.awssdk:protocol-core:2.17.63 (4 constraints: 123cc09e)-software.amazon.awssdk:regions:2.17.63 (5 constraints: a4388089)+software.amazon.awssdk:metrics-spi:2.17.63 (7 constraints: 3d62fd12)+software.amazon.awssdk:profiles:2.17.63 (8 constraints: 6761f245)+software.amazon.awssdk:protocol-core:2.17.63 (5 constraints: 8a48db59)+software.amazon.awssdk:regions:2.17.63 (6 constraints: 1c45a6c5)software.amazon.awssdk:s3:2.17.63 (3 constraints: bb244128)-software.amazon.awssdk:sdk-core:2.17.63 (9 constraints: 107bb50f)+software.amazon.awssdk:sdk-core:2.17.63 (10 constraints: 8887fee5)+software.amazon.awssdk:sts:2.17.63 (2 constraints: d1113a15)software.amazon.awssdk:third-party-jackson-core:2.17.63 (2 constraints: 931b14a8)-software.amazon.awssdk:utils:2.17.63 (16 constraints: 93f23eb1)+software.amazon.awssdk:utils:2.17.63 (17 constraints: 0bffaaab)software.amazon.eventstream:eventstream:1.0.1 (2 constraints: 2e1ae62b)ua.net.nlp:morfologik-ukrainian-search:4.9.1 (1 constraints: d5126e1e)xerces:xercesImpl:2.12.2 (1 constraints: 8e0c7d0e)