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.

Sign up for GitHub

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

Jump to bottom

HPCC-30746 Add support for bare-metal DFS TLS #18005

Merged
merged 1 commit into from
Nov 9, 2023
Merged

HPCC-30746 Add support for bare-metal DFS TLS #18005

merged 1 commit into from
Nov 9, 2023

Conversation

jakesmith
Copy link
Member

@jakesmith jakesmith commented Nov 8, 2023 •
edited
Loading

  1. Fix some issues that prevented the DFS service from being useable in bare-metal.
  2. Allow dafilesrv in standard (non-SSL) configuration, to also listen for SSL connections.
    So that existing bare-metal connections continue to use existing port, and DFS calls can use the TLS route.
  3. Modify the dafilesrv secret hook mapping, so that it allows no secret, which means, still establish a secure connection (TLS), but without certificates.

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:

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 8, 2023

https://track.hpccsystems.com/browse/HPCC-30746
Jira updated

ghalliday
ghalliday approved these changes Nov 9, 2023
View reviewed changes
Copy link
Member

@ghalliday ghalliday left a comment

Choose a reason for hiding this comment

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

I didn't see anything wrong/logic flaws, although I didn't follow it all. One question.

fs/dafsclient/rmtclient.cpp Outdated
@@ -340,6 +340,31 @@ IDAFS_Exception *createDafsExceptionV(int code, const char *format, ...)
return ret;
}

unsigned getPreferredDafsClientPort(bool external)
{
if (isContainerized())
Copy link
Member

Choose a reason for hiding this comment

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

Does this mean this is not called when K8s calls bare-metal? Will this trigger failures?

Copy link
Member Author

@jakesmith jakesmith Nov 9, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

that was a late addition and a mistake, there is 1 context it is called in which is explicitly bare-metal only (which is why added, thinking it was the only place), but it is also refactored code that could be called in general/in containerized too in theory (possibly only via containerized when ~foreign has been enabled..)
I'll remove.

@jakesmith
HPCC-30746 Add support for bare-metal DFS TLS
bf1b435 
1) Fix some issues that prevented the DFS service from
being useable in bare-metal.
2) Allow dafilesrv in standard (non-SSL) configuration, to also
listen for SSL connections.
So that existing bare-metal connections continue to use existing
port, and DFS calls can use the TLS route.
3) Modify the dafilesrv secret hook mapping, so that it allows
no secret, which means, still establish a secure connection (TLS),
but without certificates.

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
@jakesmith jakesmith force-pushed the HPCC-30746-baremetal-dfs-tls branch from dba71ca to bf1b435 Compare November 9, 2023 12:57
@jakesmith
Copy link
Member Author

@ghalliday - removed the isContainerized() test form getPreferredDafsClientPort (squashed in).

mckellyln
mckellyln reviewed Nov 9, 2023
View reviewed changes
thorlcr/thorutil/thormisc.cpp
@@ -1067,7 +1067,7 @@ bool getBestFilePart(CActivityBase *activity, IPartDescriptor &partDesc, OwnedIF
file.setown(createDaliServixFile(rfn));
}
else
file.setown(createIFile(locationName.str()));
file.setown(createIFile(rfn)); // use rfn not locationName, to preserve port through hooking mechanisms
Copy link
Contributor

Choose a reason for hiding this comment

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

good find.

mckellyln
mckellyln approved these changes Nov 9, 2023
View reviewed changes
Copy link
Contributor

@mckellyln mckellyln left a comment

Choose a reason for hiding this comment

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

Approved.

@ghalliday ghalliday merged commit 37d9f4b into hpcc-systems:candidate-9.4.x Nov 9, 2023
40 of 51 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mckellyln mckellyln mckellyln approved these changes

@ghalliday ghalliday ghalliday approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jakesmith @ghalliday @mckellyln