Changeset 846

Timestamp:

03/13/07 13:01:22 (1 year ago)

Author:

mfenniak

Message:

add ssl support

Files:

• pg8000/trunk/pg8000.py (modified) (5 diffs)
• pg8000/trunk/pg8000_test.py (modified) (1 diff)

pg8000/trunk/pg8000.py

@@ -362 +362 @@
-            self.conn = None
-
-
+, ssl=False
-        return DBAPI.ConnectionWrapper(user=user, host=host,
-                unix_sock=unix_sock, port=port, database=database,
-
+, ssl=ssl
-    connect = staticmethod(connect)
-
@@ -692 +692 @@
-# @keyparam socket_timeout  Socket connect timeout measured in seconds.
-# Defaults to 60 seconds.
+#
+# @keyparam ssl     Use SSL encryption for TCP/IP socket.  Defaults to False.
-class Connection(Cursor):
-
+, ssl=False
-        self._row_desc = None
-        try:
-
+, ssl=ssl
-            #self.c.connect()
-            self.c.authenticate(user, password=password, database=database)
-        except socket.error, e:
+            print repr(e)
+            print dir(e)
+            print str(e)
+
-            raise InterfaceError("communication error", e)
-        Cursor.__init__(self, self)
@@ -729 +735 @@
-
-class Protocol(object):
+
+    class SSLRequest(object):
+        def __init__(self):
+            pass
+
+        def serialize(selF):
+            return struct.pack("!ii", 8, 80877103)
+
-    class StartupMessage(object):
-        def __init__(self, user, database=None):
@@ -1070 +1084 @@
-        createFromData = staticmethod(createFromData)
-
+    class SSLWrapper(object):
+        def __init__(self, sslobj):
+            self.sslobj = sslobj
+        def send(self, data):
+            self.sslobj.write(data)
+        def recv(self, num):
+            return self.sslobj.read(num)
+
-    class Connection(object):
-
+, ssl=False
-            self._client_encoding = "ascii"
-            if unix_sock == None and host != None:
@@ -1079 +1101 @@
-            else:
-                raise ProgrammingError("one of host or unix_sock must be provided")
-            self._sock.settimeout(socket_timeout)
-            if unix_sock == None and host != None:
-                self._sock.connect((host, port))
-            elif unix_sock != None:
-                self._sock.connect(unix_sock)
+            if ssl:
+                self._send(Protocol.SSLRequest())
+                resp = self._sock.recv(1)
+                if resp == 'S':
+                    self._sock = Protocol.SSLWrapper(socket.ssl(self._sock))
+                else:
+                    raise InterfaceError("server refuses SSL")
+            else:
+                # settimeout causes ssl failure, on windows.  Python bug 1462352.
+                self._sock.settimeout(socket_timeout)
-            self._state = "noauth"
-            self._backend_key_data = None

pg8000/trunk/pg8000_test.py

@@ -13 +13 @@
-        "database": "pg8000-test",
-        "password": "pg8000-test",
-
+
+
-        }
-db = pg8000.Connection(**db_connect)