Skip to content

various atp and ssl JRF database refactoring #1366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 26, 2023
Merged

Conversation

jshum2479
Copy link
Member

This fixes -run_rcu against SSL database and various refactoring of both ATP and SSL JRF database domain creation.

@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Jan 26, 2023

runner.atpDB = true; // "ATP".equals(databaseType); // or scan if there are any 'ssl' in properties ?
runner.atpSSlArgs = sslArgs.toString();
runner.sSlArgs = sslArgs.toString();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

runner.sslArgs is a more appropriate name

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed


runner.sslDB = true;
runner.atpSSlArgs = sslArgs.toString();
runner.sSlArgs = sslArgs.toString();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment as above

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@@ -377,11 +350,11 @@ private String[] getCommandLineArgs(String operationSwitch) {
arguments.add(SERVER_DN_SWITCH);
arguments.add("CN=ignored");
arguments.add(SSLARGS);
arguments.add(atpSSlArgs);
arguments.add(sSlArgs);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again


if not ssl_conn_properties.has_key(DRIVER_PARAMS_NET_FAN_ENABLED):
ssl_conn_properties[DRIVER_PARAMS_NET_FAN_ENABLED] = 'false'
ssl_conn_properties[DRIVER_PARAMS_NET_SSL_VERSION] = '1.2'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why don't we set this only if it is not set, like you are doing for the previous property?

Copy link
Member Author

@jshum2479 jshum2479 Jan 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, the fan enabled should always be false, plus these properties must be that value for it to work properly. There is a comment in the code, not sure why it didn't show up in PR.

# hard coding for now, may need to expose it if ATP access changed later

if not ssl_conn_properties.has_key(DRIVER_PARAMS_NET_FAN_ENABLED):
ssl_conn_properties[DRIVER_PARAMS_NET_FAN_ENABLED] = 'false'
ssl_conn_properties[DRIVER_PARAMS_NET_SSL_VERSION] = '1.2'
ssl_conn_properties[DRIVER_PARAMS_NET_SERVER_DN_MATCH_PROPERTY] = 'false'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment about only setting if not already specified.

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 5 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@robertpatrick robertpatrick merged commit 086c3d1 into main Jan 26, 2023
@robertpatrick robertpatrick deleted the ssl-db-rcuinfo-relax branch January 26, 2023 21:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants