Finish GC code for SSLSession and increase test coverage

tiran · tiran · commit a5d076599051 · 2016-09-24T10:48:05.000+02:00
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
@@ -1474,13 +1474,15 @@ def test_connect(self):
                             cert_reqs=ssl.CERT_NONE) as s:
             s.connect(self.server_addr)
             self.assertEqual({}, s.getpeercert())
+            self.assertFalse(s.server_side)
 
         # this should succeed because we specify the root cert
         with test_wrap_socket(socket.socket(socket.AF_INET),
                             cert_reqs=ssl.CERT_REQUIRED,
                             ca_certs=SIGNING_CA) as s:
             s.connect(self.server_addr)
             self.assertTrue(s.getpeercert())
+            self.assertFalse(s.server_side)
 
     def test_connect_fail(self):
         # This should fail because we have no verification certs. Connection
@@ -3028,6 +3030,7 @@ def test_server_accept(self):
             host = "127.0.0.1"
             port = support.bind_port(server)
             server = context.wrap_socket(server, server_side=True)
+            self.assertTrue(server.server_side)
 
             evt = threading.Event()
             remote = None
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -149,10 +149,12 @@ static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne)
 }
 
 #ifndef OPENSSL_NO_COMP
+/* LCOV_EXCL_START */
 static int COMP_get_type(const COMP_METHOD *meth)
 {
     return meth->type;
 }
+/* LCOV_EXCL_END */
 #endif
 
 static pem_password_cb *SSL_CTX_get_default_passwd_cb(SSL_CTX *ctx)
@@ -2408,8 +2410,7 @@ PySSL_get_session(PySSLSocket *self, void *closure) {
         Py_RETURN_NONE;
     }
 #endif
-
-    pysess = PyObject_New(PySSLSession, &PySSLSession_Type);
+    pysess = PyObject_GC_New(PySSLSession, &PySSLSession_Type);
     if (pysess == NULL) {
         SSL_SESSION_free(session);
         return NULL;
@@ -2419,6 +2420,7 @@ PySSL_get_session(PySSLSocket *self, void *closure) {
     pysess->ctx = self->ctx;
     Py_INCREF(pysess->ctx);
     pysess->session = session;
+    PyObject_GC_Track(pysess);
     return (PyObject *)pysess;
 }
 
@@ -4289,11 +4291,12 @@ static PyTypeObject PySSLMemoryBIO_Type = {
 static void
 PySSLSession_dealloc(PySSLSession *self)
 {
+    PyObject_GC_UnTrack(self);
     Py_XDECREF(self->ctx);
     if (self->session != NULL) {
         SSL_SESSION_free(self->session);
     }
-    PyObject_Del(self);
+    PyObject_GC_Del(self);
 }
 
 static PyObject *
@@ -4455,7 +4458,7 @@ static PyTypeObject PySSLSession_Type = {
     0,                                         /*tp_getattro*/
     0,                                         /*tp_setattro*/
     0,                                         /*tp_as_buffer*/
-    Py_TPFLAGS_DEFAULT,                        /*tp_flags*/
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,   /*tp_flags*/
     0,                                         /*tp_doc*/
     (traverseproc)PySSLSession_traverse,       /*tp_traverse*/
     (inquiry)PySSLSession_clear,               /*tp_clear*/
@@ -4590,6 +4593,7 @@ _ssl_RAND_status_impl(PyObject *module)
 }
 
 #ifndef OPENSSL_NO_EGD
+/* LCOV_EXCL_START */
 /*[clinic input]
 _ssl.RAND_egd
     path: object(converter="PyUnicode_FSConverter")
@@ -4615,6 +4619,7 @@ _ssl_RAND_egd_impl(PyObject *module, PyObject *path)
     }
     return PyLong_FromLong(bytes);
 }
+/* LCOV_EXCL_STOP */
 #endif /* OPENSSL_NO_EGD */
 
 

Original file line number	Diff line number	Diff line change
`@@ -149,10 +149,12 @@ static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne)`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`#ifndef OPENSSL_NO_COMP`
	`152`	`+/* LCOV_EXCL_START */`
`152`	`153`	`static int COMP_get_type(const COMP_METHOD *meth)`
`153`	`154`	`{`
`154`	`155`	`return meth->type;`
`155`	`156`	`}`
	`157`	`+/* LCOV_EXCL_END */`
`156`	`158`	`#endif`
`157`	`159`
`158`	`160`	`static pem_password_cb SSL_CTX_get_default_passwd_cb(SSL_CTX ctx)`
`@@ -2408,8 +2410,7 @@ PySSL_get_session(PySSLSocket self, void closure) {`
`2408`	`2410`	`Py_RETURN_NONE;`
`2409`	`2411`	`}`
`2410`	`2412`	`#endif`
`2411`		`-`
`2412`		`- pysess = PyObject_New(PySSLSession, &PySSLSession_Type);`
	`2413`	`+ pysess = PyObject_GC_New(PySSLSession, &PySSLSession_Type);`
`2413`	`2414`	`if (pysess == NULL) {`
`2414`	`2415`	`SSL_SESSION_free(session);`
`2415`	`2416`	`return NULL;`
`@@ -2419,6 +2420,7 @@ PySSL_get_session(PySSLSocket self, void closure) {`
`2419`	`2420`	`pysess->ctx = self->ctx;`
`2420`	`2421`	`Py_INCREF(pysess->ctx);`
`2421`	`2422`	`pysess->session = session;`
	`2423`	`+ PyObject_GC_Track(pysess);`
`2422`	`2424`	`return (PyObject *)pysess;`
`2423`	`2425`	`}`
`2424`	`2426`
`@@ -4289,11 +4291,12 @@ static PyTypeObject PySSLMemoryBIO_Type = {`
`4289`	`4291`	`static void`
`4290`	`4292`	`PySSLSession_dealloc(PySSLSession *self)`
`4291`	`4293`	`{`
	`4294`	`+ PyObject_GC_UnTrack(self);`
`4292`	`4295`	`Py_XDECREF(self->ctx);`
`4293`	`4296`	`if (self->session != NULL) {`
`4294`	`4297`	`SSL_SESSION_free(self->session);`
`4295`	`4298`	`}`
`4296`		`- PyObject_Del(self);`
	`4299`	`+ PyObject_GC_Del(self);`
`4297`	`4300`	`}`
`4298`	`4301`
`4299`	`4302`	`static PyObject *`
`@@ -4455,7 +4458,7 @@ static PyTypeObject PySSLSession_Type = {`
`4455`	`4458`	`0, /tp_getattro/`
`4456`	`4459`	`0, /tp_setattro/`
`4457`	`4460`	`0, /tp_as_buffer/`
`4458`		`- Py_TPFLAGS_DEFAULT, /tp_flags/`
	`4461`	`+ Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC, /tp_flags/`
`4459`	`4462`	`0, /tp_doc/`
`4460`	`4463`	`(traverseproc)PySSLSession_traverse, /tp_traverse/`
`4461`	`4464`	`(inquiry)PySSLSession_clear, /tp_clear/`
`@@ -4590,6 +4593,7 @@ _ssl_RAND_status_impl(PyObject *module)`
`4590`	`4593`	`}`
`4591`	`4594`
`4592`	`4595`	`#ifndef OPENSSL_NO_EGD`
	`4596`	`+/* LCOV_EXCL_START */`
`4593`	`4597`	`/*[clinic input]`
`4594`	`4598`	`_ssl.RAND_egd`
`4595`	`4599`	`path: object(converter="PyUnicode_FSConverter")`
`@@ -4615,6 +4619,7 @@ _ssl_RAND_egd_impl(PyObject module, PyObject path)`
`4615`	`4619`	`}`
`4616`	`4620`	`return PyLong_FromLong(bytes);`
`4617`	`4621`	`}`
	`4622`	`+/* LCOV_EXCL_STOP */`
`4618`	`4623`	`#endif /* OPENSSL_NO_EGD */`
`4619`	`4624`
`4620`	`4625`