From 47793b89300a19c5fd13b781f03dd580fc0186a6 Mon Sep 17 00:00:00 2001 From: Ondrej Dubaj Date: Tue, 18 Jan 2022 14:58:57 +0100 Subject: [PATCH] remove AuthenticationOciClient plugin due to missing oracle dependency --- .../a/NativeAuthenticationProvider.java | 2 - .../AuthenticationOciClient.java | 218 ------------------ .../cj/LocalizedErrorMessages.properties | 12 - 3 files changed, 232 deletions(-) delete mode 100644 src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java index b9a8ca6..3d5f145 100644 --- a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java +++ b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java @@ -58,7 +58,6 @@ import com.mysql.cj.protocol.a.NativeConstants.StringSelfDataType; import com.mysql.cj.protocol.a.authentication.AuthenticationFidoClient; import com.mysql.cj.protocol.a.authentication.AuthenticationKerberosClient; import com.mysql.cj.protocol.a.authentication.AuthenticationLdapSaslClientPlugin; -import com.mysql.cj.protocol.a.authentication.AuthenticationOciClient; import com.mysql.cj.protocol.a.authentication.CachingSha2PasswordPlugin; import com.mysql.cj.protocol.a.authentication.MysqlClearPasswordPlugin; import com.mysql.cj.protocol.a.authentication.MysqlNativePasswordPlugin; @@ -257,7 +256,6 @@ public class NativeAuthenticationProvider implements AuthenticationProvider { - public static String PLUGIN_NAME = "authentication_oci_client"; - - private String sourceOfAuthData = PLUGIN_NAME; - - protected Protocol protocol = null; - private MysqlCallbackHandler usernameCallbackHandler = null; - private String configFingerprint = null; - private String configKeyFile = null; - private String configSecurityTokenFile = null; - private RSAPrivateKey privateKey = null; - private byte[] token = null; - - @Override - public void init(Protocol prot, MysqlCallbackHandler cbh) { - this.protocol = prot; - this.usernameCallbackHandler = cbh; - } - - @Override - public void reset() { - this.configFingerprint = null; - this.privateKey = null; - } - - @Override - public void destroy() { - reset(); - this.protocol = null; - this.usernameCallbackHandler = null; - } - - @Override - public String getProtocolPluginName() { - return PLUGIN_NAME; - } - - @Override - public boolean requiresConfidentiality() { - return false; - } - - @Override - public boolean isReusable() { - return false; - } - - @Override - public void setAuthenticationParameters(String user, String password) { - if (user == null && this.usernameCallbackHandler != null) { - // Fall back to system login user. - this.usernameCallbackHandler.handle(new UsernameCallback(System.getProperty("user.name"))); - } - } - - @Override - public void setSourceOfAuthData(String sourceOfAuthData) { - this.sourceOfAuthData = sourceOfAuthData; - } - - @Override - public boolean nextAuthenticationStep(NativePacketPayload fromServer, List toServer) { - toServer.clear(); - - if (!this.sourceOfAuthData.equals(PLUGIN_NAME) || fromServer.getPayloadLength() == 0) { - // Cannot do anything with whatever payload comes from the server, so just skip this iteration and wait for a Protocol::AuthSwitchRequest or a - // Protocol::AuthNextFactor. - toServer.add(new NativePacketPayload(0)); - return true; - } - - loadOciConfig(); - initializePrivateKey(); - initializeToken(); - - byte[] nonce = fromServer.readBytes(StringSelfDataType.STRING_EOF); - byte[] signature = ExportControlled.sign(nonce, this.privateKey); - if (signature == null) { - signature = new byte[0]; - } - String payload = String.format("{\"fingerprint\":\"%s\", \"signature\":\"%s\", \"token\":\"%s\"}", this.configFingerprint, - Base64.getEncoder().encodeToString(signature), new String(this.token)); - toServer.add(new NativePacketPayload(payload.getBytes(Charset.defaultCharset()))); - return true; - } - - private void loadOciConfig() { - ConfigFile configFile; - try { - String configFilePath = this.protocol.getPropertySet().getStringProperty(PropertyKey.ociConfigFile.getKeyName()).getStringValue(); - String configProfile = this.protocol.getPropertySet().getStringProperty(PropertyKey.ociConfigProfile.getKeyName()).getStringValue(); - if (StringUtils.isNullOrEmpty(configFilePath)) { - configFile = ConfigFileReader.parseDefault(configProfile); - } else if (Files.exists(Paths.get(configFilePath))) { - configFile = ConfigFileReader.parse(configFilePath, configProfile); - } else { - throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.ConfigFileNotFound")); - } - } catch (NoClassDefFoundError e) { - throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciSdkNotFound"), e); - } catch (IOException e) { - throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciConfigFileError"), e); - } catch (IllegalArgumentException e) { - throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.ProfileNotFound"), e); - } - - this.configFingerprint = configFile.get("fingerprint"); - if (StringUtils.isNullOrEmpty(this.configFingerprint)) { - throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciConfigFileMissingEntry")); - } - this.configKeyFile = configFile.get("key_file"); - if (StringUtils.isNullOrEmpty(this.configKeyFile)) { - throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciConfigFileMissingEntry")); - } - this.configSecurityTokenFile = configFile.get("security_token_file"); - } - - private void initializePrivateKey() { - if (this.privateKey != null) { - // Already initialized. - return; - } - try { - Path keyFilePath = Paths.get(this.configKeyFile); - if (Files.notExists(keyFilePath)) { - throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.PrivateKeyNotFound")); - } - String key = new String(Files.readAllBytes(keyFilePath)); - this.privateKey = ExportControlled.decodeRSAPrivateKey(key); - } catch (IOException e) { - throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.FailedReadingPrivateKey"), e); - } catch (RSAException | IllegalArgumentException e) { - throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.PrivateKeyNotValid"), e); - } - } - - private void initializeToken() { - if (this.token != null) { - // Already initialized. - return; - } - if (StringUtils.isNullOrEmpty(this.configSecurityTokenFile)) { - this.token = new byte[0]; - return; - } - try { - Path securityTokenFilePath = Paths.get(this.configSecurityTokenFile); - if (Files.notExists(securityTokenFilePath)) { - throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.SecurityTokenFileNotFound")); - } - long size = Files.size(securityTokenFilePath); - if (size > 10240) { // Fail if above 10KB. - throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.SecurityTokenTooBig")); - } - this.token = Files.readAllBytes(Paths.get(this.configSecurityTokenFile)); - } catch (IOException e) { - throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.FailedReadingSecurityTokenFile"), e); - } - } -} diff --git a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties index 786c4cc..6268362 100644 --- a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties +++ b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties @@ -49,18 +49,6 @@ AuthenticationLdapSaslClientPlugin.MissingLdapServerHostname=An LDAP Server host AuthenticationLdapSaslClientPlugin.FailCreateSaslClient=Failed creating a SASL client for the authentication mechanism ''{0}''. AuthenticationLdapSaslClientPlugin.ErrProcessingAuthIter=Error while processing an authentication iteration for the authentication mechanism ''{0}''. -AuthenticationOciClientPlugin.ConfigFileNotFound=OCI configuration file not found. -AuthenticationOciClientPlugin.OciSdkNotFound=The OCI SDK cannot be found or it is not installed. -AuthenticationOciClientPlugin.OciConfigFileError=The OCI configuration file cannot be read. -AuthenticationOciClientPlugin.ProfileNotFound=The specified profile is not found in the OCI configuration file. -AuthenticationOciClientPlugin.OciConfigFileMissingEntry=The OCI configuration file does not contain a ''fingerprint'' or ''key_file'' entry. -AuthenticationOciClientPlugin.PrivateKeyNotFound=The private key cannot be found at the location referenced in the OCI configuration entry ''key_file''. -AuthenticationOciClientPlugin.FailedReadingPrivateKey=Failed reading the private key file referenced in the OCI configuration entry ''key_file''. -AuthenticationOciClientPlugin.PrivateKeyNotValid=The OCI configuration entry ''key_file'' does not reference a valid key file. -AuthenticationOciClientPlugin.SecurityTokenFileNotFound=The security token file cannot be found at the location referenced in the OCI configuration entry ''security_token_file''. -AuthenticationOciClientPlugin.SecurityTokenTooBig=Invalid security token file. File size above 10 KB. -AuthenticationOciClientPlugin.FailedReadingSecurityTokenFile=Failed reading the security token file referenced in the OCI configuration entry ''security_token_file''. - AuthenticationProvider.BadDefaultAuthenticationPlugin=Improper value "{0}" for property ''defaultAuthenticationPlugin''. AuthenticationProvider.DefaultAuthenticationPluginIsNotListed=Default authentication plugin "{0}" is neither one of the built-in plugins nor one of the plugins listed in ''authenticationPlugins''. AuthenticationProvider.BadDisabledAuthenticationPlugin=Can''t disable the default authentication plugin. Either remove "{0}" from the disabled authentication plugins list, or choose a different default authentication plugin. -- 2.33.0