Skip to content
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

HPCC-32053 Avoid crash when secure roxie is configured with no cert #18762

Merged
merged 1 commit into from
Jun 13, 2024

Conversation

ghalliday
Copy link
Member

@ghalliday ghalliday commented Jun 13, 2024

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Cloud-compatibility
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Smoketest:

  • Send notifications about my Pull Request position in Smoketest queue.
  • Test my draft Pull Request.

Testing:

@ghalliday ghalliday requested a review from asselitx June 13, 2024 11:22
Copy link

Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-32053

Jirabot Action Result:
Workflow Transition: Merge Pending
Updated PR
Assigning user: [email protected]

Copy link
Contributor

@asselitx asselitx left a comment

Choose a reason for hiding this comment

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

It looks like the root cause of the error may be in my implementation of initBareMetalRoxieTargets in TpWrapper.cpp. If it is a valid configuration to have a secure roxie but no cert, and we treat the roxie as actually secure then your fix is good as-is.

On the other hand, if such a configuration is functionally the same as a non-secure roxie, then I believe that it could be solved with a change to just that file alone with something like this. First on line 2134, create a null tlsConfig

Owned<IPropertyTree> tlsConfig;

Then on line 2161 instead of checking for the name 'ssl' check to see if tlsConfig is non-null

Owned<ISmartSocketFactory> sf = tlsConfig ? createSecureSmartSocketFactory(addressList, tlsConfig) : createSmartSocketFactory(addressList);

@ghalliday ghalliday merged commit 512dc6a into hpcc-systems:candidate-9.6.x Jun 13, 2024
50 of 52 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants