-
Notifications
You must be signed in to change notification settings - Fork 210
Add optional --ssl-ca-bundle flag for SSL certificate configuration #1802
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
Open
szaffarano
wants to merge
8
commits into
elementary-data:master
Choose a base branch
from
szaffarano:szaffarano/ssl-ca
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
572e790
Add optional ssl config flag
szaffarano ed66158
fix: honor SSL context for Slack workflow webhooks
haritamar 2c8f0e4
precommit fix
haritamar 76877dc
fix is_workflow logic
haritamar e98a1f0
Merge branch 'master' into szaffarano/ssl-ca
haritamar f475efe
refactor: replace --use-system-ca-files with --ssl-ca-bundle
haritamar 2395c2f
fix: validate empty ssl_ca_bundle values explicitly
haritamar c0b7c08
merge: resolve conflict with upstream master
haritamar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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
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 |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| import os | ||
| import ssl | ||
| from typing import Optional | ||
|
|
||
| import certifi | ||
|
|
||
| from elementary.utils.log import get_logger | ||
|
|
||
| logger = get_logger(__name__) | ||
|
|
||
| CERTIFI = "certifi" | ||
| SYSTEM = "system" | ||
|
|
||
|
|
||
| def create_ssl_context(ssl_ca_bundle: Optional[str] = None) -> Optional[ssl.SSLContext]: | ||
| """Resolve an ssl_ca_bundle setting into an SSLContext. | ||
|
|
||
| Returns ``None`` when *ssl_ca_bundle* is ``None`` so that each | ||
| library keeps its own default CA behaviour. | ||
| """ | ||
| if ssl_ca_bundle is None: | ||
| return None | ||
|
|
||
| value = ssl_ca_bundle.strip() | ||
| if not value: | ||
| raise ValueError( | ||
| "ssl_ca_bundle cannot be empty. Use 'certifi', 'system', or a CA bundle file path." | ||
| ) | ||
|
|
||
haritamar marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if value.lower() == CERTIFI: | ||
| logger.debug("Using certifi CA bundle for SSL context.") | ||
| return ssl.create_default_context(cafile=certifi.where()) | ||
|
|
||
| if value.lower() == SYSTEM: | ||
| logger.debug("Using system CA store for SSL context.") | ||
| return ssl.create_default_context() | ||
|
|
||
| if not os.path.isfile(value): | ||
| raise ValueError(f"ssl_ca_bundle path does not exist or is not a file: {value}") | ||
| logger.debug("Using custom CA bundle for SSL context: %s", value) | ||
| return ssl.create_default_context(cafile=value) | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.