Add support to configure system password for Oracle database #10601
+150
−8
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,6 +31,20 @@ private void runTest(OracleContainer container, String databaseName, String user | |
| assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1); | ||
| } | ||
|
|
||
| private void runTestSystemUser(OracleContainer container, String databaseName, String username, String password) | ||
| throws SQLException { | ||
| //Test config was honored | ||
| assertThat(container.getDatabaseName()).isEqualTo(databaseName); | ||
| assertThat(container.getUsername()).isEqualTo(username); | ||
| assertThat(container.getPassword()).isEqualTo(password); | ||
|
|
||
| //Test we can get a connection and execute a system-level command | ||
| container.start(); | ||
| ResultSet resultSet = performQuery(container, "GRANT DBA TO " + username); | ||
| int resultSetInt = resultSet.getInt(1); | ||
| assertThat(resultSetInt).as("A basic system user query succeeds").isEqualTo(1); | ||
| } | ||
|
|
||
| @Test | ||
| public void testDefaultSettings() throws SQLException { | ||
| try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)) { | ||
|
|
@@ -77,7 +91,7 @@ public void testCustomUser() throws SQLException { | |
| @Test | ||
| public void testSID() throws SQLException { | ||
| try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME).usingSid()) { | ||
| runTestSystemUser(oracle, "freepdb1", "system", "test"); | ||
|
|
||
| // Match against the last ':' | ||
| String urlSuffix = oracle.getJdbcUrl().split("(\\:)(?!.*\\:)", 2)[1]; | ||
|
|
@@ -92,7 +106,29 @@ public void testSIDAndCustomPassword() throws SQLException { | |
| .usingSid() | ||
| .withPassword("testPassword") | ||
| ) { | ||
| runTestSystemUser(oracle, "freepdb1", "system", "testPassword"); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testSeparateSystemAndAppPasswords() throws SQLException { | ||
| // SID mode should use system password | ||
| try ( | ||
| OracleContainer oracleSid = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME) | ||
| .usingSid() | ||
| .withOraclePassword("SysP@ss1!") | ||
| .withPassword("AppP@ss1!") | ||
| ) { | ||
| runTestSystemUser(oracleSid, "freepdb1", "system", "SysP@ss1!"); | ||
| } | ||
|
|
||
| // Non-SID mode should use application user's password | ||
| try ( | ||
| OracleContainer oraclePdb = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME) | ||
| .withOraclePassword("SysP@ss2!") | ||
| .withPassword("AppP@ss2!") | ||
| ) { | ||
| runTest(oraclePdb, "freepdb1", "test", "AppP@ss2!"); | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -61,6 +61,18 @@ public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> { | |
|
|
||
| private String password = APP_USER_PASSWORD; | ||
|
|
||
| /** | ||
| * Password for Oracle system user (e.g. SYSTEM/SYS). Defaults to {@link #APP_USER_PASSWORD} | ||
| * for backwards compatibility, but can be customized independently via {@link #withOraclePassword(String)}. | ||
| */ | ||
| private String oraclePassword = APP_USER_PASSWORD; | ||
|
|
||
| /** | ||
| * Tracks whether {@link #withOraclePassword(String)} was called to avoid overriding | ||
| * the system password when {@link #withPassword(String)} is used for the application user only. | ||
| */ | ||
| private boolean oraclePasswordExplicitlySet = false; | ||
|
|
||
| private boolean usingSid = false; | ||
|
|
||
| public OracleContainer(String dockerImageName) { | ||
|
|
@@ -125,7 +137,8 @@ public String getUsername() { | |
|
|
||
| @Override | ||
| public String getPassword() { | ||
| // When connecting via SID we authenticate as SYSTEM. Use the dedicated system password. | ||
| return isUsingSid() ? oraclePassword : password; | ||
| } | ||
|
|
||
| @Override | ||
|
|
@@ -155,6 +168,27 @@ public OracleContainer withPassword(String password) { | |
| throw new IllegalArgumentException("Password cannot be null or empty"); | ||
| } | ||
| this.password = password; | ||
| // Maintain backwards compatibility: if oracle password wasn't set explicitly, | ||
| // align it with the application user's password. | ||
| if (!oraclePasswordExplicitlySet) { | ||
| this.oraclePassword = password; | ||
| } | ||
| return self(); | ||
| } | ||
|
|
||
| /** | ||
| * Sets the password for the Oracle system user (SYSTEM/SYS). This is independent from the | ||
| * application user password set via {@link #withPassword(String)}. | ||
| * | ||
| * @param oraclePassword password for SYSTEM/SYS users inside the container | ||
| * @return this container instance | ||
| */ | ||
| public OracleContainer withOraclePassword(String oraclePassword) { | ||
| if (StringUtils.isEmpty(oraclePassword)) { | ||
| throw new IllegalArgumentException("Oracle password cannot be null or empty"); | ||
| } | ||
| this.oraclePassword = oraclePassword; | ||
| this.oraclePasswordExplicitlySet = true; | ||
| return self(); | ||
| } | ||
|
|
||
|
|
@@ -203,7 +237,8 @@ public String getTestQueryString() { | |
|
|
||
| @Override | ||
| protected void configure() { | ||
| // Configure system user password independently from application user's password | ||
| withEnv("ORACLE_PASSWORD", oraclePassword); | ||
|
|
||
| // Only set ORACLE_DATABASE if different than the default. | ||
| if (databaseName != DEFAULT_DATABASE_NAME) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,6 +31,20 @@ private void runTest(OracleContainer container, String databaseName, String user | |
| assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1); | ||
| } | ||
|
|
||
| private void runTestSystemUser(OracleContainer container, String databaseName, String username, String password) | ||
| throws SQLException { | ||
| //Test config was honored | ||
|
|
||
| assertThat(container.getDatabaseName()).isEqualTo(databaseName); | ||
| assertThat(container.getUsername()).isEqualTo(username); | ||
| assertThat(container.getPassword()).isEqualTo(password); | ||
|
|
||
| //Test we can get a connection and execute a system-level command | ||
|
|
||
| container.start(); | ||
| ResultSet resultSet = performQuery(container, "GRANT DBA TO " + username); | ||
| int resultSetInt = resultSet.getInt(1); | ||
| assertThat(resultSetInt).as("A basic system user query succeeds").isEqualTo(1); | ||
| } | ||
|
|
||
| @Test | ||
| public void testDefaultSettings() throws SQLException { | ||
| try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME);) { | ||
|
|
@@ -77,7 +91,7 @@ public void testCustomUser() throws SQLException { | |
| @Test | ||
| public void testSID() throws SQLException { | ||
| try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME).usingSid();) { | ||
| runTestSystemUser(oracle, "xepdb1", "system", "test"); | ||
|
|
||
| // Match against the last ':' | ||
| String urlSuffix = oracle.getJdbcUrl().split("(\\:)(?!.*\\:)", 2)[1]; | ||
|
|
@@ -92,7 +106,29 @@ public void testSIDAndCustomPassword() throws SQLException { | |
| .usingSid() | ||
| .withPassword("testPassword"); | ||
| ) { | ||
| runTestSystemUser(oracle, "xepdb1", "system", "testPassword"); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testSeparateSystemAndAppPasswords() throws SQLException { | ||
|
There was a problem hiding this comment. should have two tests instead? |
||
| // SID mode should use system password | ||
|
|
||
| try ( | ||
| OracleContainer oracleSid = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME) | ||
| .usingSid() | ||
| .withOraclePassword("SysP@ss1!") | ||
| .withPassword("AppP@ss1!") | ||
| ) { | ||
| runTestSystemUser(oracleSid, "xepdb1", "system", "SysP@ss1!"); | ||
| } | ||
|
|
||
| // Non-SID mode should use application user's password | ||
|
|
||
| try ( | ||
| OracleContainer oraclePdb = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME) | ||
| .withOraclePassword("SysP@ss2!") | ||
| .withPassword("AppP@ss2!") | ||
| ) { | ||
| runTest(oraclePdb, "xepdb1", "test", "AppP@ss2!"); | ||
| } | ||
| } | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.