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

ssl.SSLError explicit support #2297

Merged
merged 20 commits into from
Oct 4, 2017
Merged

Conversation

hellysmile
Copy link
Member

@hellysmile hellysmile commented Sep 28, 2017

What do these changes do?

Explicit ssl.SSLError support and ssl.CertificateError

Are there changes in behavior for the user?

Right now Connector wraps any OSError to ClientConnectorError

raise ClientConnectorError(req, exc) from exc

Later connect wraps it one more time
except OSError as exc:
at this point real OSError is lost and 2 times raise from

Not sure is there any reason to catch OSError in connect

If explicitly re raise ClientConnectorError only tests.test_connector.test_connect_connection_error fails, but it seems mocked wrong, cuz there is no way to raise OSError from _create_connection it is already re raised to ClientConnectorError in _create_direct_connection

For first, can we remove catching OSError from connect? It makes no sense as for me

Related issue number

#2294

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
  • Documentation reflects the changes
  • If you provide code modification, please add yourself to CONTRIBUTORS.txt
    • The format is <Name> <Surname>.
    • Please keep alphabetical order, the file is sorted by names.
  • Add a new news fragment into the changes folder
    • name it <issue_id>.<type> for example (588.bug)
    • if you don't have an issue_id change it to the pr id after creating the pr
    • ensure type is one of the following:
      • .feature: Signifying a new feature.
      • .bugfix: Signifying a bug fix.
      • .doc: Signifying a documentation improvement.
      • .removal: Signifying a deprecation or removal of public API.
      • .misc: A ticket has been closed, but it is not of interest to users.
    • Make sure to use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files."

@codecov-io
Copy link

codecov-io commented Sep 28, 2017

Codecov Report

Merging #2297 into master will decrease coverage by 0.05%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2297      +/-   ##
==========================================
- Coverage   97.24%   97.19%   -0.06%     
==========================================
  Files          39       39              
  Lines        8198     8227      +29     
  Branches     1433     1435       +2     
==========================================
+ Hits         7972     7996      +24     
- Misses         98      102       +4     
- Partials      128      129       +1
Impacted Files Coverage Δ
aiohttp/client_exceptions.py 94.73% <100%> (-5.27%) ⬇️
aiohttp/connector.py 97.39% <100%> (-0.21%) ⬇️
aiohttp/client_reqrep.py 97.35% <100%> (+0.02%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 540da48...aca5c57. Read the comment docs.

@hellysmile hellysmile changed the title WIP ssl.SSLError support ssl.SSLError explicit support Sep 29, 2017
@hellysmile
Copy link
Member Author

I am not sure hot to add tests when ssl module is not available

@@ -390,6 +394,11 @@ def connect(self, req):
if self._closed:
proto.close()
raise ClientConnectionError("Connector is closed.")
except ClientConnectorSSLError as exc:
Copy link
Member Author

Choose a reason for hiding this comment

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

What about just raise here?

Copy link
Member

@asvetlov asvetlov left a comment

Choose a reason for hiding this comment

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

LGTM
@fafhrd91 could you review too?
Four eyes is better than two.

@fafhrd91
Copy link
Member

fafhrd91 commented Oct 2, 2017

will look later today

@fafhrd91 fafhrd91 self-requested a review October 2, 2017 16:01
@asvetlov asvetlov merged commit 803510b into aio-libs:master Oct 4, 2017
@lock
Copy link

lock bot commented Oct 28, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a [new issue] for related bugs.
If you feel like there's important points made in this discussion, please include those exceprts into that [new issue].
[new issue]: https://github.com/aio-libs/aiohttp/issues/new

@lock lock bot added the outdated label Oct 28, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Oct 28, 2019
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Oct 28, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bot:chronographer:provided There is a change note present in this PR outdated
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants