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.

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

Conditionally print certificate info #367

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Conditionally print certificate info #367

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@

import logbook
import json
import OpenSSL.crypto as crypto
from future.utils import bytes_to_native_str as n
from logbook import Logger, StreamHandler

Expand Down Expand Up @@ -118,6 +117,16 @@


def print_certificate_info(buff, sock, cert):
try:
import OpenSSL.crypto as crypto
except:
message = (
"{prefix}matrix: printing certificate info is not supported after reload, "
+ "see https://github.com/poljar/weechat-matrix/issues/357"
).format(prefix=W.prefix("network"))
W.prnt(buff, message)
return

cert_pem = ssl.DER_cert_to_PEM_cert(sock.getpeercert(True))

x509 = crypto.load_certificate(crypto.FILETYPE_PEM, cert_pem)
Expand Down