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

Prevent duplicate default SSLContext instances #105348

Merged
merged 2 commits into from Dec 9, 2023

Conversation

vexofp
Copy link
Contributor

@vexofp vexofp commented Dec 8, 2023

needs #105362

Proposed change

This PR fixes the unintentional duplication of default SSLContext instances created in util/ssl.py (#105115), when the factory methods are called both with and without explicitly passing the default cipher list. The root cause of this behavior is that the @functools.cache decorator does not play nicely with default arguments. While the performance/efficiency impact of these duplicate contexts is quite small, so is the fix. 😄

The approach taken was to move the implementation and caching into private functions that do not have a default argument value. There are no changes to the actual implementation. The existing public functions now call those private functions, always passing in the argument explicitly to ensure reliable cache behavior. The public functions maintain their existing signatures (including the defaulted argument value), so there is no change to the public API.

A new test was added to verify the caching behavior.

The change in imap/coordinator.py is to resolve a mypy warning that cropped up. I suspect the @cache decorator was obscuring some of the type information previously. Now that it is removed from the public functions, mypy correctly caught that a str was incorrectly being passed where an enumeration value is required.

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • I have followed the perfect PR recommendations
  • The code has been formatted using Ruff (ruff format homeassistant tests)
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.
  • Untested files have been added to .coveragerc.

To help with the load of incoming pull requests:

Copy link

@home-assistant home-assistant bot left a comment

Choose a reason for hiding this comment

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

Hi @vexofp

It seems you haven't yet signed a CLA. Please do so here.

Once you do that we will be able to review and accept this pull request.

Thanks!

@home-assistant home-assistant bot marked this pull request as draft December 8, 2023 23:26
@home-assistant
Copy link

home-assistant bot commented Dec 8, 2023

Please take a look at the requested changes, and use the Ready for review button when you are done, thanks 👍

Learn more about our pull request process.

@home-assistant
Copy link

home-assistant bot commented Dec 8, 2023

Hey there @jbouwh, mind taking a look at this pull request as it has been labeled with an integration (imap) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of imap can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign imap Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

@vexofp
Copy link
Contributor Author

vexofp commented Dec 8, 2023

CLA signed! 🖊️

@vexofp vexofp marked this pull request as ready for review December 8, 2023 23:31
@bdraco
Copy link
Member

bdraco commented Dec 9, 2023

This looks like a good fix. Please split it into two PRs so it can be backported

One for imap
One for the util

@vexofp
Copy link
Contributor Author

vexofp commented Dec 9, 2023

Okay. I split the IMAP change off into #105362 and left only the util changes in this PR.

I guess that one will need to go first, then? In the meantime, this one is going to fail mypy due to that issue.

@bdraco bdraco marked this pull request as draft December 9, 2023 06:59
@bdraco bdraco marked this pull request as ready for review December 9, 2023 07:35
@bdraco
Copy link
Member

bdraco commented Dec 9, 2023

Thanks @vexofp

@bdraco bdraco merged commit 885410b into home-assistant:dev Dec 9, 2023
53 checks passed
Bre77 pushed a commit to Bre77/core that referenced this pull request Dec 10, 2023
@github-actions github-actions bot locked and limited conversation to collaborators Dec 10, 2023
@vexofp vexofp deleted the 105115-dup-sslcontext branch December 28, 2023 02:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Duplicate default SSLContext instances
3 participants