Skip to content

Commit 63ce832

Browse files
authored
Add encryption support for repository (#9289)
Signed-off-by: Vikas Bansal <vikasvb90@users.noreply.github.com>
1 parent 4294d44 commit 63ce832

102 files changed

Lines changed: 2191 additions & 2577 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1111
- Add events correlation engine plugin ([#6854](https://github.com/opensearch-project/OpenSearch/issues/6854))
1212
- Introduce new dynamic cluster setting to control slice computation for concurrent segment search ([#9107](https://github.com/opensearch-project/OpenSearch/pull/9107))
1313
- Implement on behalf of token passing for extensions ([#8679](https://github.com/opensearch-project/OpenSearch/pull/8679))
14-
- Added encryption-sdk lib to provide encryption and decryption capabilities ([#8466](https://github.com/opensearch-project/OpenSearch/pull/8466))
14+
- Added encryption-sdk lib to provide encryption and decryption capabilities ([#8466](https://github.com/opensearch-project/OpenSearch/pull/8466) [#9289](https://github.com/opensearch-project/OpenSearch/pull/9289))
1515

1616
### Dependencies
1717
- Bump `log4j-core` from 2.18.0 to 2.19.0

distribution/tools/plugin-cli/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ dependencies {
4848
implementation 'org.apache.commons:commons-compress:1.23.0'
4949
}
5050

51+
configurations.implementation {
52+
exclude group: 'org.bouncycastle', module: 'bcprov-jdk15to18'
53+
}
54+
5155
tasks.named("dependencyLicenses").configure {
5256
mapping from: /bc.*/, to: 'bouncycastle'
5357
}

libs/common/src/main/java/org/opensearch/common/crypto/CryptoHandler.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
package org.opensearch.common.crypto;
1010

11+
import org.opensearch.common.annotation.ExperimentalApi;
1112
import org.opensearch.common.io.InputStreamContainer;
1213

1314
import java.io.IOException;
@@ -20,6 +21,7 @@
2021
* T - Encryption Metadata / CryptoContext
2122
* U - Parsed Encryption Metadata / CryptoContext
2223
*/
24+
@ExperimentalApi
2325
public interface CryptoHandler<T, U> {
2426

2527
/**

modules/transport-netty4/build.gradle

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,6 @@ thirdPartyAudit {
131131
'com.aayushatharva.brotli4j.encoder.Encoder$Parameters',
132132
// classes are missing
133133

134-
// from io.netty.logging.CommonsLoggerFactory (netty)
135-
'org.apache.commons.logging.Log',
136-
'org.apache.commons.logging.LogFactory',
137-
138134
// from Log4j (deliberate, Netty will fallback to Log4j 2)
139135
'org.apache.log4j.Level',
140136
'org.apache.log4j.Logger',
@@ -177,13 +173,6 @@ thirdPartyAudit {
177173
'org.jboss.marshalling.MarshallingConfiguration',
178174
'org.jboss.marshalling.Unmarshaller',
179175

180-
// from io.netty.util.internal.logging.InternalLoggerFactory (netty) - it's optional
181-
'org.slf4j.helpers.FormattingTuple',
182-
'org.slf4j.helpers.MessageFormatter',
183-
'org.slf4j.Logger',
184-
'org.slf4j.LoggerFactory',
185-
'org.slf4j.spi.LocationAwareLogger',
186-
187176
'com.google.protobuf.nano.CodedOutputByteBufferNano',
188177
'com.google.protobuf.nano.MessageNano',
189178
'com.ning.compress.BufferRecycler',

plugins/discovery-azure-classic/licenses/commons-logging-1.2.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

plugins/discovery-azure-classic/licenses/commons-logging-LICENSE.txt

Lines changed: 0 additions & 202 deletions
This file was deleted.

plugins/discovery-azure-classic/licenses/commons-logging-NOTICE.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

plugins/discovery-ec2/licenses/commons-logging-1.2.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)