add client support for explicit tls #183
Conversation
…cit TLS. Added error checking on AUTH TLS command to raise TLSError if the command fails. Added "sslcontext" parameter to client.upgrade_to_tls() for a custom context when manually upgrading a connection. Added the "transport" property when checking the stream writer for the SSL object.
# Conflicts: # src/aioftp/client.py
…ion checks have been removed
…ified upgrade procedure.
|
Is it a client-only explicit tls support? I see no new commands in server.py |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #183 +/- ##
==========================================
- Coverage 98.83% 98.34% -0.50%
==========================================
Files 6 6
Lines 1896 1936 +40
==========================================
+ Hits 1874 1904 +30
- Misses 22 32 +10 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
From what I understood, yep! It has a new As I said, I'm not the author of the code, I'm mostly trying to get this merged as it solves the issue for me (without this I can't connect to a server with ftps) I can adjust anything that needs to be adjusted in the code, and/or write more unit tests if needed! Just let me know :) |
|
There is also mechaninc in ftp to remove tls out from connection, so this pr is less than a 1/4 of what need to be done. But, I think we will merge this anyway after review/changes, since I think no one will implement full support till the universe end |
3773888 to
af68cc0
Compare
|
Hi @pohmelie Thanks for the review I've done the adjustments you requested, will try to add a couple of tests and docs tomorrow. Let me know if there's any other required adjustment here |
|
@pohmelie sorry for not taking a look earlier. I have made the adjustments you asked, added some tests and some documentation. Let me know if anything else is missing :) |
|
Hi @pohmelie , Friendly ping about this PR :) Waiting on this to be merged and released to be able to use it in a project at work |
Co-authored-by: Nikita Melentev <multisosnooley@gmail.com>
|
@pohmelie should be all good now! :) |
Checkout the tests for python 3.9 |
Fixed it. Ended up removing the typing info. Although I like type annotations, this project doesn't make use of them, so no need to have them. |
|
Nah, broken again. Did you run tests localy? |
I had before, but not after the typing removal, by bad :( (the culprit was this: Fixed now, ran the tests locally to make sure (but not in every python version supported) |
|
Thank you for the contribution @bellini666 |
|
@pohmelie thanks mostly to @sammichaels . I just made sure his work on his fork got here :) |
Hi @pohmelie ,
I saw the discussion on #37 and decided to create this PR based on @sammichaels fork.
The only thing I did here was to merge the fork on top of the upstream master branch and adjust the conflicts.
Please let me know what I need to do to get this merged and released and I'll adjust it myself, as I currently need explicit TLS support and the code here seems to make it work.