Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion matrix_client/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ def __init__(self, base_url, token=None):
self.url = base_url
self.token = token
self.txn_id = 0
self.validate_cert = True

def initial_sync(self, limit=1):
"""Perform /initialSync.
Expand All @@ -66,6 +67,10 @@ def initial_sync(self, limit=1):
"""
return self._send("GET", "/initialSync", query_params={"limit": limit})

def validate_certificate(self, valid):
self.validate_cert = valid
return

def register(self, login_type, **kwargs):
"""Performs /register.

Expand Down Expand Up @@ -306,7 +311,7 @@ def _send(self, method, path, content=None, query_params={}, headers={}):
response = requests.request(
method, endpoint, params=query_params,
data=json.dumps(content), headers=headers
# , verify=False #if you want to use SSL without verifying the Cert
, verify=self.validate_cert #if you want to use SSL without verifying the Cert
)

if response.status_code < 200 or response.status_code >= 300:
Expand Down
3 changes: 2 additions & 1 deletion matrix_client/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ def global_callback(incoming_event):

"""

def __init__(self, base_url, token=None):
def __init__(self, base_url, token=None, valid_cert_check=True):
self.api = MatrixHttpApi(base_url, token)
self.api.validate_certificate(valid_cert_check)
self.listeners = []
self.rooms = {
# room_id: Room
Expand Down