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

feat: support NODE_EXTRA_CA_CERTS #41689

Merged
merged 7 commits into from Apr 10, 2024
Merged

feat: support NODE_EXTRA_CA_CERTS #41689

merged 7 commits into from Apr 10, 2024

Conversation

codebytere
Copy link
Member

Description of Change

Closes #41590

Adds missing support for NODE_EXTRA_CA_CERTS in Electron. It works as-is with OpenSSL & BoringSSL both - as evidenced by the workaround employed for devcontainers.

Also allows re-enabling of some disabled Node.js smoke tests.

Checklist

Release Notes

Notes: Added support for NODE_EXTRA_CA_CERTS.

@codebytere codebytere added semver/minor backwards-compatible functionality target/28-x-y PR should also be added to the "28-x-y" branch. target/29-x-y PR should also be added to the "29-x-y" branch. target/30-x-y PR should also be added to the "30-x-y" branch. labels Mar 25, 2024
@codebytere codebytere requested a review from a team as a code owner March 25, 2024 13:35
@electron-cation electron-cation bot added api-review/requested 🗳 new-pr 🌱 PR opened in the last 24 hours labels Mar 25, 2024
@codebytere codebytere mentioned this pull request Mar 25, 2024
Closed
3 tasks
MarshallOfSound
MarshallOfSound requested changes Mar 25, 2024
View reviewed changes
Copy link
Member

@MarshallOfSound MarshallOfSound left a comment

Choose a reason for hiding this comment

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

I think either the run as node fuse or the node options fuse should disable support for this env bar to allow apps to safely opt out

@codebytere
Copy link
Member Author

@MarshallOfSound gated it into the node options fuse

@codebytere codebytere force-pushed the fix-ca-cert-respect branch 2 times, most recently from 225f456 to 627337f Compare March 27, 2024 09:54
nornagon
nornagon requested changes Mar 28, 2024
View reviewed changes
docs/api/environment-variables.md Outdated Show resolved Hide resolved
@nornagon
Copy link
Member

API LGTM

@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Apr 1, 2024
@codebytere codebytere requested a review from nornagon April 8, 2024 14:32
@BlackHole1 BlackHole1 mentioned this pull request Apr 9, 2024
Open
3 tasks
nornagon
nornagon approved these changes Apr 9, 2024
View reviewed changes
Copy link
Member

@nornagon nornagon left a comment

Choose a reason for hiding this comment

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

API LGTM, just copy nits.

shell/common/node_bindings.cc Outdated Show resolved Hide resolved
shell/common/node_bindings.cc Outdated Show resolved Hide resolved
MarshallOfSound
MarshallOfSound approved these changes Apr 9, 2024
View reviewed changes
Copy link
Member

@MarshallOfSound MarshallOfSound left a comment

Choose a reason for hiding this comment

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

API LGTM

jkleinsc
jkleinsc requested changes Apr 9, 2024
View reviewed changes
Copy link
Contributor

@jkleinsc jkleinsc left a comment

Choose a reason for hiding this comment

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

LGTM - just a small nit on the docs

docs/api/environment-variables.md Outdated Show resolved Hide resolved
@codebytere @jkleinsc
Update environment-variables.md
6bbcfe0 
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
@jkleinsc jkleinsc merged commit 43a9f70 into main Apr 10, 2024
17 of 18 checks passed
@jkleinsc jkleinsc deleted the fix-ca-cert-respect branch April 10, 2024 14:30
@release-clerk Release Clerk
Copy link

release-clerk bot commented Apr 10, 2024

Release Notes Persisted

Added support for NODE_EXTRA_CA_CERTS.

@trop
Copy link
Contributor

trop bot commented Apr 10, 2024

I was unable to backport this PR to "28-x-y" cleanly;
you will need to perform this backport manually.

@trop
Copy link
Contributor

trop bot commented Apr 10, 2024

I was unable to backport this PR to "29-x-y" cleanly;
you will need to perform this backport manually.

@trop trop bot added needs-manual-bp/28-x-y needs-manual-bp/29-x-y and removed target/28-x-y PR should also be added to the "28-x-y" branch. target/29-x-y PR should also be added to the "29-x-y" branch. labels Apr 10, 2024
@trop trop bot mentioned this pull request Apr 10, 2024
Merged
@trop
Copy link
Contributor

trop bot commented Apr 10, 2024

I was unable to backport this PR to "30-x-y" cleanly;
you will need to perform this backport manually.

@trop trop bot added needs-manual-bp/30-x-y and removed target/30-x-y PR should also be added to the "30-x-y" branch. labels Apr 10, 2024
@trop trop bot added merged/30-x-y PR was merged to the "30-x-y" branch. and removed in-flight/30-x-y labels Apr 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nornagon nornagon nornagon approved these changes

@jkleinsc jkleinsc jkleinsc approved these changes

@MarshallOfSound MarshallOfSound MarshallOfSound approved these changes

@ckerr ckerr Awaiting requested review from ckerr

@zcbenz zcbenz Awaiting requested review from zcbenz

Assignees
No one assigned
Labels
api-review/requested 🗳 merged/30-x-y PR was merged to the "30-x-y" branch. needs-manual-bp/28-x-y needs-manual-bp/29-x-y semver/minor backwards-compatible functionality
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Feature Request]: Electron does not respect NODE_EXTRA_CA_CERTS
4 participants
@codebytere @nornagon @jkleinsc @MarshallOfSound