Skip to content

Commit 300ecc9

Browse files
Hailong-amHailong-am
committed
Merge remote-tracking branch 'upstream/main' into shardLock
2 parents c6960c2 + a03db0d commit 300ecc9

102 files changed

Lines changed: 4691 additions & 952 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55

66
## [Unreleased 2.x]
77
### Added
8+
- Add support for Azure Managed Identity in repository-azure ([#12423](https://github.com/opensearch-project/OpenSearch/issues/12423))
89
- Add useCompoundFile index setting ([#13478](https://github.com/opensearch-project/OpenSearch/pull/13478))
10+
- Make outbound side of transport protocol dependent ([#13293](https://github.com/opensearch-project/OpenSearch/pull/13293))
911

1012
### Dependencies
1113
- Bump `com.github.spullara.mustache.java:compiler` from 0.9.10 to 0.9.13 ([#13329](https://github.com/opensearch-project/OpenSearch/pull/13329), [#13559](https://github.com/opensearch-project/OpenSearch/pull/13559))
1214
- Bump `org.gradle.test-retry` from 1.5.8 to 1.5.9 ([#13442](https://github.com/opensearch-project/OpenSearch/pull/13442))
1315
- Bump `org.apache.commons:commons-text` from 1.11.0 to 1.12.0 ([#13557](https://github.com/opensearch-project/OpenSearch/pull/13557))
1416
- Bump `org.hdrhistogram:HdrHistogram` from 2.1.12 to 2.2.1 ([#13556](https://github.com/opensearch-project/OpenSearch/pull/13556))
17+
- Bump `com.gradle.enterprise` from 3.17.2 to 3.17.3 ([#13641](https://github.com/opensearch-project/OpenSearch/pull/13641))
18+
- Bump `org.apache.hadoop:hadoop-minicluster` from 3.3.6 to 3.4.0 ([#13642](https://github.com/opensearch-project/OpenSearch/pull/13642))
1519

1620
### Changed
1721
- Add ability for Boolean and date field queries to run when only doc_values are enabled ([#11650](https://github.com/opensearch-project/OpenSearch/pull/11650))
@@ -25,6 +29,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2529
### Fixed
2630
- Fix negative RequestStats metric issue ([#13553](https://github.com/opensearch-project/OpenSearch/pull/13553))
2731
- Fix get field mapping API returns 404 error in mixed cluster with multiple versions ([#13624](https://github.com/opensearch-project/OpenSearch/pull/13624))
32+
- Allow clearing `remote_store.compatibility_mode` setting ([#13646](https://github.com/opensearch-project/OpenSearch/pull/13646))
2833

2934
### Security
3035

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
This project has adopted the [Amazon Open Source Code of Conduct](CODE_OF_CONDUCT.md). For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq), or contact [opensource-codeofconduct@amazon.com](mailto:opensource-codeofconduct@amazon.com) with any additional questions or comments.
4646

4747
## Security
48-
If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/) or directly via email to aws-security@amazon.com. Please do **not** create a public GitHub issue.
48+
If you discover a potential security issue in this project we ask that you notify OpenSearch Security directly via email to security@opensearch.org. Please do **not** create a public GitHub issue.
4949

5050
## License
5151

‎SECURITY.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
## Reporting a Vulnerability
22

3-
If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/) or directly via email to aws-security@amazon.com. Please do **not** create a public GitHub issue.
3+
If you discover a potential security issue in this project we ask that you notify OpenSearch Security directly via email to security@opensearch.org. Please do **not** create a public GitHub issue.

‎buildSrc/src/main/java/org/opensearch/gradle/precommit/LicenseAnalyzer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public class LicenseAnalyzer {
145145
+ "AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n"
146146
+ "LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n"
147147
+ "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n"
148-
+ "SOFTWARE\\.\n").replaceAll("\\s+", "\\\\s*"),
148+
+ "SOFTWARE\\.?\n").replaceAll("\\s+", "\\\\s*"),
149149
Pattern.DOTALL
150150
)
151151
),

‎plugins/repository-azure/build.gradle‎

Lines changed: 85 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,21 @@ dependencies {
5656
api "io.netty:netty-transport-native-unix-common:${versions.netty}"
5757
implementation project(':modules:transport-netty4')
5858
api 'com.azure:azure-storage-blob:12.23.0'
59+
api 'com.azure:azure-identity:1.11.4'
60+
// Start of transitive dependencies for azure-identity
61+
api 'com.microsoft.azure:msal4j-persistence-extension:1.2.0'
62+
api "net.java.dev.jna:jna-platform:${versions.jna}"
63+
api 'com.microsoft.azure:msal4j:1.14.3'
64+
api 'com.nimbusds:oauth2-oidc-sdk:11.9.1'
65+
api 'com.nimbusds:nimbus-jose-jwt:9.37.3'
66+
api 'com.nimbusds:content-type:2.3'
67+
api 'com.nimbusds:lang-tag:1.7'
68+
// Both msal4j:1.14.3 and oauth2-oidc-sdk:11.9.1 has compile dependency on different versions of json-smart,
69+
// selected the higher version which is 2.5.0
70+
api 'net.minidev:json-smart:2.5.0'
71+
api 'net.minidev:accessors-smart:2.5.0'
72+
api "org.ow2.asm:asm:${versions.asm}"
73+
// End of transitive dependencies for azure-identity
5974
api "io.projectreactor.netty:reactor-netty-core:${versions.reactor_netty}"
6075
api "io.projectreactor.netty:reactor-netty-http:${versions.reactor_netty}"
6176
api "org.slf4j:slf4j-api:${versions.slf4j}"
@@ -180,7 +195,76 @@ thirdPartyAudit {
180195
'io.micrometer.observation.ObservationHandler',
181196
'io.micrometer.observation.ObservationRegistry',
182197
'io.micrometer.observation.ObservationRegistry$ObservationConfig',
183-
'io.micrometer.tracing.handler.DefaultTracingObservationHandler'
198+
'io.micrometer.tracing.handler.DefaultTracingObservationHandler',
199+
// Start of the list of classes from the optional compile/provided dependencies used in "com.nimbusds:oauth2-oidc-sdk".
200+
'com.google.crypto.tink.subtle.Ed25519Sign',
201+
'com.google.crypto.tink.subtle.Ed25519Sign$KeyPair',
202+
'com.google.crypto.tink.subtle.Ed25519Verify',
203+
'com.google.crypto.tink.subtle.X25519',
204+
'com.google.crypto.tink.subtle.XChaCha20Poly1305',
205+
'jakarta.servlet.ServletRequest',
206+
'jakarta.servlet.http.HttpServletRequest',
207+
'jakarta.servlet.http.HttpServletResponse',
208+
'javax.servlet.ServletRequest',
209+
'javax.servlet.http.HttpServletRequest',
210+
'javax.servlet.http.HttpServletResponse',
211+
// net.shibboleth.utilities:java-support.* is declared as optional in the plugin `bnd-maven-plugin` used in "com.nimbusds:oauth2-oidc-sdk"
212+
// Worth nothing that, the latest dependency "net.shibboleth.utilities:java-support:8.0.0" has many vulnerabilities.
213+
// Hence ignored.
214+
'net.shibboleth.utilities.java.support.xml.SerializeSupport',
215+
'org.bouncycastle.asn1.pkcs.PrivateKeyInfo',
216+
'org.bouncycastle.asn1.x509.AlgorithmIdentifier',
217+
'org.bouncycastle.asn1.x509.SubjectPublicKeyInfo',
218+
'org.bouncycastle.cert.X509CertificateHolder',
219+
'org.bouncycastle.cert.jcajce.JcaX509CertificateHolder',
220+
'org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder',
221+
'org.bouncycastle.crypto.InvalidCipherTextException',
222+
'org.bouncycastle.crypto.engines.AESEngine',
223+
'org.bouncycastle.crypto.modes.GCMBlockCipher',
224+
'org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider',
225+
'org.bouncycastle.jce.provider.BouncyCastleProvider',
226+
'org.bouncycastle.openssl.PEMKeyPair',
227+
'org.bouncycastle.openssl.PEMParser',
228+
'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter',
229+
'org.bouncycastle.operator.jcajce.JcaContentSignerBuilder',
230+
'org.cryptomator.siv.SivMode',
231+
'org.opensaml.core.config.InitializationException',
232+
'org.opensaml.core.config.InitializationService',
233+
'org.opensaml.core.xml.XMLObject',
234+
'org.opensaml.core.xml.XMLObjectBuilder',
235+
'org.opensaml.core.xml.XMLObjectBuilderFactory',
236+
'org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport',
237+
'org.opensaml.core.xml.io.Marshaller',
238+
'org.opensaml.core.xml.io.MarshallerFactory',
239+
'org.opensaml.core.xml.io.MarshallingException',
240+
'org.opensaml.core.xml.io.Unmarshaller',
241+
'org.opensaml.core.xml.io.UnmarshallerFactory',
242+
'org.opensaml.core.xml.schema.XSString',
243+
'org.opensaml.core.xml.schema.impl.XSStringBuilder',
244+
'org.opensaml.saml.saml2.core.Assertion',
245+
'org.opensaml.saml.saml2.core.Attribute',
246+
'org.opensaml.saml.saml2.core.AttributeStatement',
247+
'org.opensaml.saml.saml2.core.AttributeValue',
248+
'org.opensaml.saml.saml2.core.Audience',
249+
'org.opensaml.saml.saml2.core.AudienceRestriction',
250+
'org.opensaml.saml.saml2.core.AuthnContext',
251+
'org.opensaml.saml.saml2.core.AuthnContextClassRef',
252+
'org.opensaml.saml.saml2.core.AuthnStatement',
253+
'org.opensaml.saml.saml2.core.Conditions',
254+
'org.opensaml.saml.saml2.core.Issuer',
255+
'org.opensaml.saml.saml2.core.NameID',
256+
'org.opensaml.saml.saml2.core.Subject',
257+
'org.opensaml.saml.saml2.core.SubjectConfirmation',
258+
'org.opensaml.saml.saml2.core.SubjectConfirmationData',
259+
'org.opensaml.saml.security.impl.SAMLSignatureProfileValidator',
260+
'org.opensaml.security.credential.BasicCredential',
261+
'org.opensaml.security.credential.Credential',
262+
'org.opensaml.security.credential.UsageType',
263+
'org.opensaml.xmlsec.signature.Signature',
264+
'org.opensaml.xmlsec.signature.support.SignatureException',
265+
'org.opensaml.xmlsec.signature.support.SignatureValidator',
266+
'org.opensaml.xmlsec.signature.support.Signer',
267+
// End of the list of classes from the optional compile/provided dependencies used in "com.nimbusds:oauth2-oidc-sdk".
184268
)
185269

186270
ignoreViolations(

‎plugins/repository-azure/licenses/accessors-smart-2.5.0.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
aca011492dfe9c26f4e0659028a4fe0970829dd8

0 commit comments

Comments
 (0)