Skip to content

gh-109109: Expose retrieving certificate chains in SSL module #109113

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.

Sign up for GitHub

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

Merged
gpshead merged 10 commits into from
Sep 20, 2023
Merged

gh-109109: Expose retrieving certificate chains in SSL module #109113

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dae06d1
Expose retrieving certificate chains in SSL module
matiuszka Sep 7, 2023
676f9b1
Merge branch 'main' into main
matiuszka Sep 7, 2023
1418dd1
Review remarks applied
matiuszka Sep 8, 2023
0cdfe19
Trim white spaces
matiuszka Sep 8, 2023
4a51db2
Review fixes.
matiuszka Sep 11, 2023
6206f4f
Merge branch 'main' into main
matiuszka Sep 12, 2023
701c62a
Update Lib/ssl.py
matiuszka Sep 13, 2023
4c31619
Merge branch 'main' into main
matiuszka Sep 19, 2023
f925937
Review fixes
matiuszka Sep 19, 2023
5cb139d
NEWS entry.
gpshead Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Review fixes.
  • Loading branch information
@matiuszka
matiuszka committed Sep 11, 2023
commit 4a51db29416e7a5f09fa5394280bc7b20c1c8c56
6 changes: 2 additions & 4 deletions Doc/library/ssl.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,16 +1215,14 @@ SSL sockets also have the following additional methods and attributes:
.. method:: SSLSocket.get_verified_chain()
Comment thread
matiuszka marked this conversation as resolved.

Returns verified certificate chain provided by the other
end of the SSL channel as a list of ``_ssl.Certificate``.
Return ``None`` if no certificates were provided.
end of the SSL channel as a list of DER-encoded bytes.

.. versionadded:: 3.13

.. method:: SSLSocket.get_unverified_chain()

Returns unverified certificate chain provided by the other
Comment thread
gpshead marked this conversation as resolved.
Outdated
end of the SSL channel as a list of ``_ssl.Certificate``.
Return ``None`` if no certificates were provided.
end of the SSL channel as a list of DER-encoded bytes.

.. versionadded:: 3.13

Expand Down
20 changes: 14 additions & 6 deletions Lib/ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,17 +878,25 @@ def getpeercert(self, binary_form=False):

def get_verified_chain(self):
"""Returns verified certificate chain provided by the other
end of the SSL channel as a list of ``_ssl.Certificate``.
Return ``None`` if no certificates were provided.
end of the SSL channel as a list of DER-encoded bytes.
"""
return self._sslobj.get_verified_chain()
chain = self._sslobj.get_verified_chain()

if chain is None:
return []

return [cert.public_bytes(_ssl.ENCODING_DER) for cert in chain]

def get_unverified_chain(self):
"""Returns unverified certificate chain provided by the other
end of the SSL channel as a list of ``_ssl.Certificate``.
Return ``None`` if no certificates were provided.
end of the SSL channel as a list of DER-encoded bytes.
"""
return self._sslobj.get_unverified_chain()
chain = self._sslobj.get_verified_chain()
Comment thread
matiuszka marked this conversation as resolved.
Outdated

if chain is None:
return []

return [cert.public_bytes(_ssl.ENCODING_DER) for cert in chain]

def selected_npn_protocol(self):
"""Return the currently selected NPN protocol as a string, or ``None``
Expand Down