FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Check the server certificate when ssl_verify_identity is set by SashaMIT · Pull Request #1282 · PyMySQL/PyMySQL · GitHub

Repository navigation

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .py  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
13 changes: 9 additions & 4 deletions pymysql/connections.py
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
Expand Up @@ -277,12 +277,17 @@ def _config(key, arg):
self._ssl_required = False
if not ssl_disabled:
if ssl_ca or ssl_cert or ssl_key or ssl_verify_cert or ssl_verify_identity:
ssl_verify_identity = bool(ssl_verify_identity)
if ssl_verify_identity:
verify_mode = True
elif ssl_verify_cert is not None:
verify_mode = ssl_verify_cert
else:
verify_mode = False
ssl = {
"ca": ssl_ca,
"check_hostname": bool(ssl_verify_identity),
"verify_mode": ssl_verify_cert
if ssl_verify_cert is not None
else False,
"check_hostname": ssl_verify_identity,
"verify_mode": verify_mode,
}
if ssl_cert is not None:
ssl["cert"] = ssl_cert
Expand Down
4 changes: 2 additions & 2 deletions pymysql/tests/test_connection.py
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
Expand Up @@ -749,7 +749,7 @@ def test_ssl_connect(self):
)
assert create_default_context.called
assert dummy_ssl_context.check_hostname
assert dummy_ssl_context.verify_mode == ssl.CERT_NONE
assert dummy_ssl_context.verify_mode == ssl.CERT_REQUIRED
dummy_ssl_context.load_cert_chain.assert_called_with(
"cert",
keyfile="key",
Expand All @@ -772,7 +772,7 @@ def test_ssl_connect(self):
)
assert create_default_context.called
assert dummy_ssl_context.check_hostname
assert dummy_ssl_context.verify_mode == ssl.CERT_NONE
assert dummy_ssl_context.verify_mode == ssl.CERT_REQUIRED
dummy_ssl_context.load_cert_chain.assert_called_with(
"cert",
keyfile="key",
Expand Down
Loading

Back | FazBrowse Home | New Git URL