Skip to content

Add support for TLS #13

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

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

Add support for TLS #13

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: 9 additions & 2 deletions qpython/qconnection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import socket
import struct
import ssl

from qpython import MetaData, CONVERSION_OPTIONS
from qpython.qtype import QException
Expand Down Expand Up @@ -63,6 +64,7 @@ class QConnection(object):
- `password` (`string` or `None`) - password for q authentication/authorization
- `timeout` (`nonnegative float` or `None`) - set a timeout on blocking socket operations
- `encoding` (`string`) - string encoding for data deserialization
- `useTls` (` boolean`) - use TLS for sockets, **Default**: ``False``
- `reader_class` (subclass of `QReader`) - data deserializer
- `writer_class` (subclass of `QWriter`) - data serializer
:Options:
Expand All @@ -79,11 +81,12 @@ class QConnection(object):

MAX_PROTOCOL_VERSION = 6

def __init__(self, host, port, username = None, password = None, timeout = None, encoding = 'latin-1', reader_class = None, writer_class = None, **options):
def __init__(self, host, port, username = None, password = None, timeout = None, encoding = 'latin-1', useTls = False, reader_class = None, writer_class = None, **options):
self.host = host
self.port = port
self.username = username
self.password = password
self.useTls = useTls

self._connection = None
self._connection_file = None
Expand Down Expand Up @@ -151,7 +154,11 @@ def open(self):
def _init_socket(self):
'''Initialises the socket used for communicating with a q service,'''
try:
self._connection = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
if self.useTls:
context = ssl.create_default_context()
sock = context.wrap_socket(sock, server_hostname=self.host)
self._connection = sock
self._connection.connect((self.host, self.port))
self._connection.settimeout(self.timeout)
self._connection_file = self._connection.makefile('b')
Expand Down