Skip to content

Enable nzpy server CA certification mandatory. #86

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
mansi18p wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enable nzpy server CA certification mandatory. #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec24fa9
initial changes for adding skipCertVerification option
mansi18p Apr 17, 2025
aa35c0c
setting skipcertVerification value as true by default
mansi18p May 7, 2025
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
4 changes: 2 additions & 2 deletions nzpy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ def connect(user, host='localhost', unix_sock=None, port=5432, database=None,
application_name=None, max_prepared_statements=1000,
datestyle='ISO', logLevel=0, tcp_keepalive=True,
char_varchar_encoding='latin', logOptions=LogOptions.Inherit,
pgOptions=None):
pgOptions=None, skipCertVerification=True):

return Connection(user, host, unix_sock, port, database, password, ssl,
securityLevel, timeout, application_name,
max_prepared_statements, datestyle, logLevel,
tcp_keepalive, char_varchar_encoding,
logOptions, pgOptions)
logOptions, pgOptions, skipCertVerification)


apilevel = "2.0"
Expand Down
4 changes: 2 additions & 2 deletions nzpy/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,7 +1138,7 @@ def __init__(
securityLevel, timeout, application_name,
max_prepared_statements, datestyle, logLevel, tcp_keepalive,
char_varchar_encoding, logOptions=LogOptions.Inherit,
pgOptions=None):
pgOptions=None, skipCertVerification=True):
self._char_varchar_encoding = char_varchar_encoding
self._client_encoding = "utf8"
self._commands_with_count = (
Expand Down Expand Up @@ -1518,7 +1518,7 @@ def conn_send_query():

hs = handshake.Handshake(self._usock, self._sock, ssl, self.log)
response = hs.startup(database, securityLevel,
user, password, pgOptions)
user, password, pgOptions, skipCertVerification)

if response is not False:
self._flush = response.flush
Expand Down
15 changes: 9 additions & 6 deletions nzpy/handshake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def __init__(self, _usock, _sock, ssl, log):
self.guardium_clientHostName = gethostname()
self.guardium_applName = path.basename(argv[0])

def startup(self, database, securityLevel, user, password, pgOptions):
def startup(self, database, securityLevel, user, password, pgOptions, skipCertVerification):
# Negotiate the handshake version (connection protocol)
if not self.conn_handshake_negotiate(self._sock.write, self._sock.read,
self._sock.flush, self._hsVersion,
Expand All @@ -91,7 +91,7 @@ def startup(self, database, securityLevel, user, password, pgOptions):
self._sock.flush, database,
securityLevel, self._hsVersion,
self._protocol1, self._protocol2,
user, pgOptions):
user, pgOptions, skipCertVerification):
self.log.warning("Error in conn_send_handshake_info")
return False

Expand Down Expand Up @@ -165,15 +165,15 @@ def conn_handshake_negotiate(self, _write, _read, _flush,
def conn_send_handshake_info(self, _write, _read, _flush, _database,
securityLevel, _hsVersion,
_protocol1, _protocol2,
user, pgOptions):
user, pgOptions, skipCertVerification):
# We need database information at the backend in order to
# select security restrictions. So always send the database first
if not self.conn_send_database(_write, _read, _flush, _database):
return False

# If the backend supports security features and if the driver
# requires secured session, negotiate security requirements now
if not self.conn_secure_session(securityLevel):
if not self.conn_secure_session(securityLevel, skipCertVerification):
return False

if not self.conn_set_next_dataprotocol(self._protocol1,
Expand Down Expand Up @@ -240,7 +240,7 @@ def conn_set_next_dataprotocol(self, _protocol1, _protocol2):
self._protocol1, self._protocol2)
return True

def conn_secure_session(self, securityLevel):
def conn_secure_session(self, securityLevel, skipCertVerification):
information = HSV2_SSL_NEGOTIATE
currSecLevel = securityLevel
ssl_context = None
Expand Down Expand Up @@ -294,8 +294,11 @@ def conn_secure_session(self, securityLevel):
ssl_context = ssl.create_default_context(
cafile=ca_certs)
ssl_context.check_hostname = False
if ca_certs is None:
if ca_certs is None or ca_certs == "":
ssl_context.verify_mode = ssl.CERT_NONE
if not skipCertVerification:
self.log.warning("Could not load ca certificate %s : too long , possibly corrupted or file not found",ca_certs)
return False
else:
ssl_context.verify_mode = ssl.CERT_REQUIRED

Expand Down