From 05d1556bd59c114b64b395470d44cfe35ad01144 Mon Sep 17 00:00:00 2001 From: Peter Nied Date: Fri, 6 May 2022 16:04:51 +0000 Subject: [PATCH] Add supression for all removal warnings Use of the SecurityManager and AccessController have been deprecated and will be removed in java versions after 17. While this is an issue its also one that will take a concerted effort to resolve. These warning messages making discovering build errors and other warnings more difficult; hence adding this supression logic. For tracking the effort to replace these components look into https://github.com/opensearch-project/OpenSearch/issues/1687 Signed-off-by: Peter Nied --- .../dlic/auth/http/jwt/AbstractHTTPJwtAuthenticator.java | 1 + .../com/amazon/dlic/auth/http/jwt/HTTPJwtAuthenticator.java | 1 + .../dlic/auth/http/kerberos/HTTPSpnegoAuthenticator.java | 2 ++ .../dlic/auth/http/saml/AuthTokenProcessorHandler.java | 1 + .../amazon/dlic/auth/http/saml/HTTPSamlAuthenticator.java | 2 ++ .../amazon/dlic/auth/http/saml/Saml2SettingsProvider.java | 1 + .../dlic/auth/http/saml/SamlFilesystemMetadataResolver.java | 1 + .../dlic/auth/http/saml/SamlHTTPMetadataResolver.java | 2 ++ .../dlic/auth/ldap/backend/LDAPAuthorizationBackend.java | 6 ++++-- .../java/com/amazon/dlic/auth/ldap/util/LdapHelper.java | 1 + src/main/java/com/amazon/dlic/auth/ldap/util/Utils.java | 1 + .../amazon/dlic/auth/ldap2/LDAPAuthenticationBackend2.java | 3 +++ .../amazon/dlic/auth/ldap2/LDAPAuthorizationBackend2.java | 1 + .../java/com/amazon/dlic/auth/ldap2/MakeJava9Happy.java | 1 + .../java/com/amazon/dlic/auth/ldap2/PrivilegedProvider.java | 2 ++ .../java/org/opensearch/security/DefaultObjectMapper.java | 6 ++++++ .../org/opensearch/security/NonValidatingObjectMapper.java | 1 + .../org/opensearch/security/OpenSearchSecurityPlugin.java | 1 + .../opensearch/security/auditlog/impl/AbstractAuditLog.java | 2 ++ .../org/opensearch/security/auditlog/impl/AuditLogImpl.java | 2 ++ .../org/opensearch/security/auditlog/sink/KafkaSink.java | 1 + .../org/opensearch/security/auditlog/sink/WebhookSink.java | 2 ++ .../opensearch/security/configuration/DlsFlsValveImpl.java | 1 + .../org/opensearch/security/dlic/rest/support/Utils.java | 2 ++ .../opensearch/security/ssl/DefaultSecurityKeyStore.java | 2 ++ .../security/ssl/OpenSearchSecuritySSLPlugin.java | 1 + .../security/ssl/transport/DefaultPrincipalExtractor.java | 1 + .../security/ssl/transport/SecuritySSLNettyTransport.java | 1 + .../org/opensearch/security/ssl/util/SSLRequestHelper.java | 1 + .../java/org/opensearch/security/support/Base64Helper.java | 2 ++ .../security/support/ReflectiveAttributeAccessors.java | 3 +++ .../opensearch/security/support/SnapshotRestoreHelper.java | 1 + 32 files changed, 54 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/amazon/dlic/auth/http/jwt/AbstractHTTPJwtAuthenticator.java b/src/main/java/com/amazon/dlic/auth/http/jwt/AbstractHTTPJwtAuthenticator.java index a75810c83d..49fc70ed61 100644 --- a/src/main/java/com/amazon/dlic/auth/http/jwt/AbstractHTTPJwtAuthenticator.java +++ b/src/main/java/com/amazon/dlic/auth/http/jwt/AbstractHTTPJwtAuthenticator.java @@ -78,6 +78,7 @@ public AbstractHTTPJwtAuthenticator(Settings settings, Path configPath) { } @Override + @SuppressWarnings("removal") public AuthCredentials extractCredentials(RestRequest request, ThreadContext context) throws OpenSearchSecurityException { final SecurityManager sm = System.getSecurityManager(); diff --git a/src/main/java/com/amazon/dlic/auth/http/jwt/HTTPJwtAuthenticator.java b/src/main/java/com/amazon/dlic/auth/http/jwt/HTTPJwtAuthenticator.java index 0b827bab76..131db394ea 100644 --- a/src/main/java/com/amazon/dlic/auth/http/jwt/HTTPJwtAuthenticator.java +++ b/src/main/java/com/amazon/dlic/auth/http/jwt/HTTPJwtAuthenticator.java @@ -114,6 +114,7 @@ public HTTPJwtAuthenticator(final Settings settings, final Path configPath) { @Override + @SuppressWarnings("removal") public AuthCredentials extractCredentials(RestRequest request, ThreadContext context) throws OpenSearchSecurityException { final SecurityManager sm = System.getSecurityManager(); diff --git a/src/main/java/com/amazon/dlic/auth/http/kerberos/HTTPSpnegoAuthenticator.java b/src/main/java/com/amazon/dlic/auth/http/kerberos/HTTPSpnegoAuthenticator.java index 8e4bae67f3..aade6697a1 100644 --- a/src/main/java/com/amazon/dlic/auth/http/kerberos/HTTPSpnegoAuthenticator.java +++ b/src/main/java/com/amazon/dlic/auth/http/kerberos/HTTPSpnegoAuthenticator.java @@ -70,6 +70,7 @@ public class HTTPSpnegoAuthenticator implements HTTPAuthenticator { private Set acceptorPrincipal; private Path acceptorKeyTabPath; + @SuppressWarnings("removal") public HTTPSpnegoAuthenticator(final Settings settings, final Path configPath) { super(); try { @@ -165,6 +166,7 @@ public Void run() { } @Override + @SuppressWarnings("removal") public AuthCredentials extractCredentials(final RestRequest request, ThreadContext threadContext) { final SecurityManager sm = System.getSecurityManager(); diff --git a/src/main/java/com/amazon/dlic/auth/http/saml/AuthTokenProcessorHandler.java b/src/main/java/com/amazon/dlic/auth/http/saml/AuthTokenProcessorHandler.java index 54d909d959..4436fe8130 100644 --- a/src/main/java/com/amazon/dlic/auth/http/saml/AuthTokenProcessorHandler.java +++ b/src/main/java/com/amazon/dlic/auth/http/saml/AuthTokenProcessorHandler.java @@ -125,6 +125,7 @@ class AuthTokenProcessorHandler { } + @SuppressWarnings("removal") boolean handle(RestRequest restRequest, RestChannel restChannel) throws Exception { try { final SecurityManager sm = System.getSecurityManager(); diff --git a/src/main/java/com/amazon/dlic/auth/http/saml/HTTPSamlAuthenticator.java b/src/main/java/com/amazon/dlic/auth/http/saml/HTTPSamlAuthenticator.java index d26ad879c3..9404b1cec1 100644 --- a/src/main/java/com/amazon/dlic/auth/http/saml/HTTPSamlAuthenticator.java +++ b/src/main/java/com/amazon/dlic/auth/http/saml/HTTPSamlAuthenticator.java @@ -258,6 +258,7 @@ public void destroy() { } } + @SuppressWarnings("removal") static void ensureOpenSamlInitialization() { if (openSamlInitialized) { return; @@ -299,6 +300,7 @@ public Void run() throws InitializationException { } } + @SuppressWarnings("removal") private MetadataResolver createMetadataResolver(final Settings settings, final Path configPath) throws Exception { final AbstractMetadataResolver metadataResolver; diff --git a/src/main/java/com/amazon/dlic/auth/http/saml/Saml2SettingsProvider.java b/src/main/java/com/amazon/dlic/auth/http/saml/Saml2SettingsProvider.java index d4d250ed56..8081921494 100644 --- a/src/main/java/com/amazon/dlic/auth/http/saml/Saml2SettingsProvider.java +++ b/src/main/java/com/amazon/dlic/auth/http/saml/Saml2SettingsProvider.java @@ -67,6 +67,7 @@ public class Saml2SettingsProvider { this.spSignaturePrivateKey = spSignaturePrivateKey; } + @SuppressWarnings("removal") Saml2Settings get() throws SamlConfigException { try { HashMap configProperties = new HashMap<>(); diff --git a/src/main/java/com/amazon/dlic/auth/http/saml/SamlFilesystemMetadataResolver.java b/src/main/java/com/amazon/dlic/auth/http/saml/SamlFilesystemMetadataResolver.java index 40984bd058..c6646c67a1 100644 --- a/src/main/java/com/amazon/dlic/auth/http/saml/SamlFilesystemMetadataResolver.java +++ b/src/main/java/com/amazon/dlic/auth/http/saml/SamlFilesystemMetadataResolver.java @@ -34,6 +34,7 @@ public class SamlFilesystemMetadataResolver extends FilesystemMetadataResolver { } @Override + @SuppressWarnings("removal") protected byte[] fetchMetadata() throws ResolverException { try { return AccessController.doPrivileged(new PrivilegedExceptionAction() { diff --git a/src/main/java/com/amazon/dlic/auth/http/saml/SamlHTTPMetadataResolver.java b/src/main/java/com/amazon/dlic/auth/http/saml/SamlHTTPMetadataResolver.java index 26588d9a7f..da31310062 100644 --- a/src/main/java/com/amazon/dlic/auth/http/saml/SamlHTTPMetadataResolver.java +++ b/src/main/java/com/amazon/dlic/auth/http/saml/SamlHTTPMetadataResolver.java @@ -41,6 +41,7 @@ public class SamlHTTPMetadataResolver extends HTTPMetadataResolver { } @Override + @SuppressWarnings("removal") protected byte[] fetchMetadata() throws ResolverException { try { return AccessController.doPrivileged(new PrivilegedExceptionAction() { @@ -64,6 +65,7 @@ private static SettingsBasedSSLConfigurator.SSLConfig getSSLConfig(Settings sett return new SettingsBasedSSLConfigurator(settings, configPath, "idp").buildSSLConfig(); } + @SuppressWarnings("removal") private static HttpClient createHttpClient(Settings settings, Path configPath) throws Exception { try { final SecurityManager sm = System.getSecurityManager(); diff --git a/src/main/java/com/amazon/dlic/auth/ldap/backend/LDAPAuthorizationBackend.java b/src/main/java/com/amazon/dlic/auth/ldap/backend/LDAPAuthorizationBackend.java index 32e0b67965..3aeb9e36ff 100755 --- a/src/main/java/com/amazon/dlic/auth/ldap/backend/LDAPAuthorizationBackend.java +++ b/src/main/java/com/amazon/dlic/auth/ldap/backend/LDAPAuthorizationBackend.java @@ -117,6 +117,7 @@ public LDAPAuthorizationBackend(final Settings settings, final Path configPath) this.userBaseSettings = LDAPAuthenticationBackend.getUserBaseSettings(settings); } + @SuppressWarnings("removal") public static void checkConnection(final ConnectionConfig connectionConfig, String bindDn, byte[] password) throws Exception { final SecurityManager sm = System.getSecurityManager(); @@ -146,6 +147,7 @@ public Void run() throws Exception { } + @SuppressWarnings("removal") public static Connection getConnection(final Settings settings, final Path configPath) throws Exception { final SecurityManager sm = System.getSecurityManager(); @@ -201,7 +203,7 @@ private static List> convertOldStyleSettingsToNewSty return Collections.singletonList(result.entrySet().iterator().next()); } - @SuppressWarnings("unchecked") + @SuppressWarnings("removal") private static void checkConnection0(final ConnectionConfig connectionConfig, String bindDn, byte[] password, final ClassLoader cl, final boolean needRestore) throws KeyStoreException, NoSuchAlgorithmException, CertificateException, FileNotFoundException, IOException, LdapException { @@ -244,7 +246,6 @@ public Void run() throws Exception { } } - @SuppressWarnings("unchecked") private static Connection getConnection0(final Settings settings, final Path configPath, final ClassLoader cl, final boolean needRestore) throws KeyStoreException, NoSuchAlgorithmException, CertificateException, FileNotFoundException, IOException, LdapException { @@ -477,6 +478,7 @@ private void restoreClassLoader() { }; } + @SuppressWarnings("removal") private static void restoreClassLoader0(final ClassLoader cl) { try { AccessController.doPrivileged(new PrivilegedExceptionAction() { diff --git a/src/main/java/com/amazon/dlic/auth/ldap/util/LdapHelper.java b/src/main/java/com/amazon/dlic/auth/ldap/util/LdapHelper.java index a525e5d863..133f337386 100644 --- a/src/main/java/com/amazon/dlic/auth/ldap/util/LdapHelper.java +++ b/src/main/java/com/amazon/dlic/auth/ldap/util/LdapHelper.java @@ -43,6 +43,7 @@ public class LdapHelper { private static SearchFilter ALL = new SearchFilter("(objectClass=*)"); + @SuppressWarnings("removal") public static List search(final Connection conn, final String unescapedDn, SearchFilter filter, final SearchScope searchScope) throws LdapException { diff --git a/src/main/java/com/amazon/dlic/auth/ldap/util/Utils.java b/src/main/java/com/amazon/dlic/auth/ldap/util/Utils.java index 72f39dcccf..69a00770ee 100644 --- a/src/main/java/com/amazon/dlic/auth/ldap/util/Utils.java +++ b/src/main/java/com/amazon/dlic/auth/ldap/util/Utils.java @@ -41,6 +41,7 @@ private Utils() { } + @SuppressWarnings("removal") public static void unbindAndCloseSilently(final Connection connection) { if (connection == null) { return; diff --git a/src/main/java/com/amazon/dlic/auth/ldap2/LDAPAuthenticationBackend2.java b/src/main/java/com/amazon/dlic/auth/ldap2/LDAPAuthenticationBackend2.java index 3255537219..9dfac4231c 100755 --- a/src/main/java/com/amazon/dlic/auth/ldap2/LDAPAuthenticationBackend2.java +++ b/src/main/java/com/amazon/dlic/auth/ldap2/LDAPAuthenticationBackend2.java @@ -85,6 +85,7 @@ public LDAPAuthenticationBackend2(final Settings settings, final Path configPath } @Override + @SuppressWarnings("removal") public User authenticate(final AuthCredentials credentials) throws OpenSearchSecurityException { final SecurityManager sm = System.getSecurityManager(); @@ -184,6 +185,7 @@ public String getType() { return "ldap"; } + @SuppressWarnings("removal") @Override public boolean exists(final User user) { final SecurityManager sm = System.getSecurityManager(); @@ -230,6 +232,7 @@ private boolean exists0(final User user) { } } + @SuppressWarnings("removal") private void authenticateByLdapServer(final Connection connection, final String dn, byte[] password) throws LdapException { final SecurityManager sm = System.getSecurityManager(); diff --git a/src/main/java/com/amazon/dlic/auth/ldap2/LDAPAuthorizationBackend2.java b/src/main/java/com/amazon/dlic/auth/ldap2/LDAPAuthorizationBackend2.java index 118848460b..86b70476c6 100755 --- a/src/main/java/com/amazon/dlic/auth/ldap2/LDAPAuthorizationBackend2.java +++ b/src/main/java/com/amazon/dlic/auth/ldap2/LDAPAuthorizationBackend2.java @@ -120,6 +120,7 @@ private static List> convertOldStyleSettingsToNewSty return Collections.singletonList(result.entrySet().iterator().next()); } + @SuppressWarnings("removal") @Override public void fillRoles(final User user, final AuthCredentials optionalAuthCreds) throws OpenSearchSecurityException { diff --git a/src/main/java/com/amazon/dlic/auth/ldap2/MakeJava9Happy.java b/src/main/java/com/amazon/dlic/auth/ldap2/MakeJava9Happy.java index 3f6e77ec07..57bc72710d 100644 --- a/src/main/java/com/amazon/dlic/auth/ldap2/MakeJava9Happy.java +++ b/src/main/java/com/amazon/dlic/auth/ldap2/MakeJava9Happy.java @@ -29,6 +29,7 @@ public class MakeJava9Happy { private static ClassLoader classLoader; private static boolean isJava9OrHigher = PlatformDependent.javaVersion() >= 9;; + @SuppressWarnings("removal") static ClassLoader getClassLoader() { if (!isJava9OrHigher) { return null; diff --git a/src/main/java/com/amazon/dlic/auth/ldap2/PrivilegedProvider.java b/src/main/java/com/amazon/dlic/auth/ldap2/PrivilegedProvider.java index a0650e6f2d..d6ed283241 100644 --- a/src/main/java/com/amazon/dlic/auth/ldap2/PrivilegedProvider.java +++ b/src/main/java/com/amazon/dlic/auth/ldap2/PrivilegedProvider.java @@ -85,6 +85,7 @@ public JndiProviderConfig getProviderConfig() { } @Override + @SuppressWarnings("removal") public ProviderConnection create() throws LdapException { final SecurityManager sm = System.getSecurityManager(); @@ -121,6 +122,7 @@ public PrivilegedProviderConnection(ProviderConnection delegate, JndiProviderCon this.jndiProviderConfig = jndiProviderConfig; } + @SuppressWarnings("removal") public Response bind(BindRequest request) throws LdapException { final SecurityManager sm = System.getSecurityManager(); diff --git a/src/main/java/org/opensearch/security/DefaultObjectMapper.java b/src/main/java/org/opensearch/security/DefaultObjectMapper.java index daf3331955..d2dacee9ee 100644 --- a/src/main/java/org/opensearch/security/DefaultObjectMapper.java +++ b/src/main/java/org/opensearch/security/DefaultObjectMapper.java @@ -100,6 +100,7 @@ public static T getOrDefault(Map properties, String key, T d return value != null ? value : defaultValue; } + @SuppressWarnings("removal") public static T readTree(JsonNode node, Class clazz) throws IOException { final SecurityManager sm = System.getSecurityManager(); @@ -120,6 +121,7 @@ public T run() throws Exception { } } + @SuppressWarnings("removal") public static T readValue(String string, Class clazz) throws IOException { final SecurityManager sm = System.getSecurityManager(); @@ -140,6 +142,7 @@ public T run() throws Exception { } } + @SuppressWarnings("removal") public static JsonNode readTree(String string) throws IOException { final SecurityManager sm = System.getSecurityManager(); @@ -160,6 +163,7 @@ public JsonNode run() throws Exception { } } + @SuppressWarnings("removal") public static String writeValueAsString(Object value, boolean omitDefaults) throws JsonProcessingException { final SecurityManager sm = System.getSecurityManager(); @@ -181,6 +185,7 @@ public String run() throws Exception { } + @SuppressWarnings("removal") public static T readValue(String string, TypeReference tr) throws IOException { final SecurityManager sm = System.getSecurityManager(); @@ -202,6 +207,7 @@ public T run() throws Exception { } + @SuppressWarnings("removal") public static T readValue(String string, JavaType jt) throws IOException { final SecurityManager sm = System.getSecurityManager(); diff --git a/src/main/java/org/opensearch/security/NonValidatingObjectMapper.java b/src/main/java/org/opensearch/security/NonValidatingObjectMapper.java index 06da407c80..c98ccdf9bb 100644 --- a/src/main/java/org/opensearch/security/NonValidatingObjectMapper.java +++ b/src/main/java/org/opensearch/security/NonValidatingObjectMapper.java @@ -59,6 +59,7 @@ public static void inject(final InjectableValues.Std injectableValues) { nonValidatingObjectMapper.setInjectableValues(injectableValues); } + @SuppressWarnings("removal") public static T readValue(String string, JavaType jt) throws IOException { final SecurityManager sm = System.getSecurityManager(); diff --git a/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java b/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java index 2ba04baec2..301f6892b6 100644 --- a/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java +++ b/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java @@ -258,6 +258,7 @@ private static boolean isSslCertReloadEnabled(final Settings settings) { return settings.getAsBoolean(ConfigConstants.SECURITY_SSL_CERT_RELOAD_ENABLED, false); } + @SuppressWarnings("removal") public OpenSearchSecurityPlugin(final Settings settings, final Path configPath) { super(settings, configPath, isDisabled(settings)); diff --git a/src/main/java/org/opensearch/security/auditlog/impl/AbstractAuditLog.java b/src/main/java/org/opensearch/security/auditlog/impl/AbstractAuditLog.java index b201bd0957..c24fde1a7e 100644 --- a/src/main/java/org/opensearch/security/auditlog/impl/AbstractAuditLog.java +++ b/src/main/java/org/opensearch/security/auditlog/impl/AbstractAuditLog.java @@ -79,6 +79,7 @@ import static org.opensearch.common.xcontent.DeprecationHandler.THROW_UNSUPPORTED_OPERATION; + public abstract class AbstractAuditLog implements AuditLog { protected final Logger log = LogManager.getLogger(this.getClass()); @@ -508,6 +509,7 @@ public void logDocumentDeleted(ShardId shardId, Delete delete, DeleteResult resu save(msg); } + @SuppressWarnings("removal") protected void logExternalConfig() { final ComplianceConfig complianceConfig = getComplianceConfig(); diff --git a/src/main/java/org/opensearch/security/auditlog/impl/AuditLogImpl.java b/src/main/java/org/opensearch/security/auditlog/impl/AuditLogImpl.java index 6a9c131eda..0c6043e1a1 100644 --- a/src/main/java/org/opensearch/security/auditlog/impl/AuditLogImpl.java +++ b/src/main/java/org/opensearch/security/auditlog/impl/AuditLogImpl.java @@ -59,6 +59,7 @@ public AuditLogImpl(final Settings settings, this(settings, configPath, clientProvider, threadPool, resolver, clusterService, null); } + @SuppressWarnings("removal") public AuditLogImpl(final Settings settings, final Path configPath, final Client clientProvider, @@ -103,6 +104,7 @@ private Boolean removeShutdownHook() { } @Override + @SuppressWarnings("removal") public void close() throws IOException { log.info("Closing {}", getClass().getSimpleName()); diff --git a/src/main/java/org/opensearch/security/auditlog/sink/KafkaSink.java b/src/main/java/org/opensearch/security/auditlog/sink/KafkaSink.java index 2d3a1fdede..46035ea037 100644 --- a/src/main/java/org/opensearch/security/auditlog/sink/KafkaSink.java +++ b/src/main/java/org/opensearch/security/auditlog/sink/KafkaSink.java @@ -41,6 +41,7 @@ public class KafkaSink extends AuditLogSink { private Producer producer; private String topicName; + @SuppressWarnings("removal") public KafkaSink(final String name, final Settings settings, final String settingsPrefix, AuditLogSink fallbackSink) { super(name, settings, settingsPrefix, fallbackSink); diff --git a/src/main/java/org/opensearch/security/auditlog/sink/WebhookSink.java b/src/main/java/org/opensearch/security/auditlog/sink/WebhookSink.java index bdb00a8bfb..a2fbf33de3 100644 --- a/src/main/java/org/opensearch/security/auditlog/sink/WebhookSink.java +++ b/src/main/java/org/opensearch/security/auditlog/sink/WebhookSink.java @@ -102,6 +102,7 @@ public WebhookSink(final String name, final Settings settings, final String sett } @Override + @SuppressWarnings("removal") public boolean doStore(AuditMessage msg) { if (Strings.isEmpty(webhookUrl)) { log.debug("Webhook URL is null"); @@ -299,6 +300,7 @@ protected boolean doPost(String url, String payload) { } } + @SuppressWarnings("removal") private KeyStore getEffectiveKeyStore(final Path configPath) { return AccessController.doPrivileged(new PrivilegedAction() { diff --git a/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java b/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java index bd8219eac0..7526086508 100644 --- a/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java +++ b/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java @@ -562,6 +562,7 @@ private static Field getFieldPrivileged(Class cls, String name) { } } + @SuppressWarnings("removal") private static Field getField(Class cls, String name) { SpecialPermission.check(); return AccessController.doPrivileged((PrivilegedAction) () -> getFieldPrivileged(cls, name)); diff --git a/src/main/java/org/opensearch/security/dlic/rest/support/Utils.java b/src/main/java/org/opensearch/security/dlic/rest/support/Utils.java index 28f5c204e6..24223c3845 100644 --- a/src/main/java/org/opensearch/security/dlic/rest/support/Utils.java +++ b/src/main/java/org/opensearch/security/dlic/rest/support/Utils.java @@ -137,6 +137,7 @@ public static T serializeToXContentToPojo(String jsonContent, Class clazz } + @SuppressWarnings("removal") public static byte[] jsonMapToByteArray(Map jsonAsMap) throws IOException { final SecurityManager sm = System.getSecurityManager(); @@ -163,6 +164,7 @@ public byte[] run() throws Exception { } } + @SuppressWarnings("removal") public static Map byteArrayToMutableJsonMap(byte[] jsonBytes) throws IOException { final SecurityManager sm = System.getSecurityManager(); diff --git a/src/main/java/org/opensearch/security/ssl/DefaultSecurityKeyStore.java b/src/main/java/org/opensearch/security/ssl/DefaultSecurityKeyStore.java index d95797b8b7..9ffdf45794 100644 --- a/src/main/java/org/opensearch/security/ssl/DefaultSecurityKeyStore.java +++ b/src/main/java/org/opensearch/security/ssl/DefaultSecurityKeyStore.java @@ -738,6 +738,7 @@ private String[] getEnabledSSLProtocols(final SslProvider provider, boolean http } + @SuppressWarnings("removal") private void initEnabledSSLCiphers() { final List secureHttpSSLCiphers = SSLConfigConstants.getSecureSSLCiphers(settings, true); @@ -898,6 +899,7 @@ private SslContext buildSSLClientContext(final File _key, final File _cert, fina } + @SuppressWarnings("removal") private SslContext buildSSLContext0(final SslContextBuilder sslContextBuilder) throws SSLException { final SecurityManager sm = System.getSecurityManager(); diff --git a/src/main/java/org/opensearch/security/ssl/OpenSearchSecuritySSLPlugin.java b/src/main/java/org/opensearch/security/ssl/OpenSearchSecuritySSLPlugin.java index 15e93ae177..52983e7814 100644 --- a/src/main/java/org/opensearch/security/ssl/OpenSearchSecuritySSLPlugin.java +++ b/src/main/java/org/opensearch/security/ssl/OpenSearchSecuritySSLPlugin.java @@ -109,6 +109,7 @@ public class OpenSearchSecuritySSLPlugin extends Plugin implements SystemIndexPl // this(settings, configPath, false); // } + @SuppressWarnings("removal") protected OpenSearchSecuritySSLPlugin(final Settings settings, final Path configPath, boolean disabled) { if(disabled) { diff --git a/src/main/java/org/opensearch/security/ssl/transport/DefaultPrincipalExtractor.java b/src/main/java/org/opensearch/security/ssl/transport/DefaultPrincipalExtractor.java index fcb721946b..d717df2da6 100644 --- a/src/main/java/org/opensearch/security/ssl/transport/DefaultPrincipalExtractor.java +++ b/src/main/java/org/opensearch/security/ssl/transport/DefaultPrincipalExtractor.java @@ -40,6 +40,7 @@ public class DefaultPrincipalExtractor implements PrincipalExtractor { protected final Logger log = LogManager.getLogger(this.getClass()); @Override + @SuppressWarnings("removal") public String extractPrincipal(final X509Certificate x509Certificate, final Type type) { if (x509Certificate == null) { return null; diff --git a/src/main/java/org/opensearch/security/ssl/transport/SecuritySSLNettyTransport.java b/src/main/java/org/opensearch/security/ssl/transport/SecuritySSLNettyTransport.java index 465c5c3a8d..5b452edcad 100644 --- a/src/main/java/org/opensearch/security/ssl/transport/SecuritySSLNettyTransport.java +++ b/src/main/java/org/opensearch/security/ssl/transport/SecuritySSLNettyTransport.java @@ -210,6 +210,7 @@ protected class SSLClientChannelInitializer extends Netty4Transport.ClientChanne private final DiscoveryNode node; private SSLConnectionTestResult connectionTestResult; + @SuppressWarnings("removal") public SSLClientChannelInitializer(DiscoveryNode node) { this.node = node; hostnameVerificationEnabled = settings.getAsBoolean( diff --git a/src/main/java/org/opensearch/security/ssl/util/SSLRequestHelper.java b/src/main/java/org/opensearch/security/ssl/util/SSLRequestHelper.java index 97980b4a44..5bd72fba5d 100644 --- a/src/main/java/org/opensearch/security/ssl/util/SSLRequestHelper.java +++ b/src/main/java/org/opensearch/security/ssl/util/SSLRequestHelper.java @@ -102,6 +102,7 @@ public String toString() { } + @SuppressWarnings("removal") public static SSLInfo getSSLInfo(final Settings settings, final Path configPath, final RestRequest request, PrincipalExtractor principalExtractor) throws SSLPeerUnverifiedException { if(request == null || request.getHttpChannel() == null || !(request.getHttpChannel() instanceof Netty4HttpChannel)) { diff --git a/src/main/java/org/opensearch/security/support/Base64Helper.java b/src/main/java/org/opensearch/security/support/Base64Helper.java index 67aecad164..5f9286a20c 100644 --- a/src/main/java/org/opensearch/security/support/Base64Helper.java +++ b/src/main/java/org/opensearch/security/support/Base64Helper.java @@ -107,6 +107,7 @@ private final static class SafeObjectOutputStream extends ObjectOutputStream { private static final boolean useSafeObjectOutputStream = checkSubstitutionPermission(); + @SuppressWarnings("removal") private static boolean checkSubstitutionPermission() { SecurityManager sm = System.getSecurityManager(); if (sm != null) { @@ -135,6 +136,7 @@ static ObjectOutputStream create(ByteArrayOutputStream out) throws IOException { } } + @SuppressWarnings("removal") private SafeObjectOutputStream(OutputStream out) throws IOException { super(out); diff --git a/src/main/java/org/opensearch/security/support/ReflectiveAttributeAccessors.java b/src/main/java/org/opensearch/security/support/ReflectiveAttributeAccessors.java index e35b789c9c..dac49334e2 100644 --- a/src/main/java/org/opensearch/security/support/ReflectiveAttributeAccessors.java +++ b/src/main/java/org/opensearch/security/support/ReflectiveAttributeAccessors.java @@ -52,6 +52,7 @@ static class ReflectiveAttributeGetter implements Function { this.type = type; } + @SuppressWarnings("removal") @Override public R apply(O object) { final SecurityManager sm = System.getSecurityManager(); @@ -89,6 +90,7 @@ static class ProtectedReflectiveAttributeGetter implements Function this.type = type; } + @SuppressWarnings("removal") @Override public R apply(O object) { final SecurityManager sm = System.getSecurityManager(); @@ -128,6 +130,7 @@ static class ReflectiveAttributeSetter implements BiFunction { this.type = type; } + @SuppressWarnings("removal") @Override public Void apply(O object, R value) { final SecurityManager sm = System.getSecurityManager(); diff --git a/src/main/java/org/opensearch/security/support/SnapshotRestoreHelper.java b/src/main/java/org/opensearch/security/support/SnapshotRestoreHelper.java index 4a3e0f3e51..9e68e018ef 100644 --- a/src/main/java/org/opensearch/security/support/SnapshotRestoreHelper.java +++ b/src/main/java/org/opensearch/security/support/SnapshotRestoreHelper.java @@ -91,6 +91,7 @@ public static SnapshotInfo getSnapshotInfo(RestoreSnapshotRequest restoreRequest return snapshotInfo; } + @SuppressWarnings("removal") private static void setCurrentThreadName(final String name) { final SecurityManager sm = System.getSecurityManager();