Skip to content

Commit 3821bd9

Browse files
committed
Fix broken SSL test
1 parent 3881c1b commit 3821bd9

File tree

3 files changed

+68
-23
lines changed

3 files changed

+68
-23
lines changed

graalpython/com.oracle.graal.python.test/src/tests/test_ssl.py

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
import ssl
4242
import os
4343
import json
44-
import sys
45-
import subprocess
44+
4645

4746
def data_file(name):
4847
return os.path.join(os.path.dirname(__file__), "ssldata", name)
@@ -255,26 +254,6 @@ def test_load_default_verify_paths(self):
255254
else:
256255
del env["SSL_CERT_DIR"]
257256

258-
@unittest.skipIf(sys.implementation.name == 'cpython', "graalpython specific")
259-
def test_load_default_verify_keystore(self):
260-
# execute with javax.net.ssl.trustStore=tests/ssldata/signing_keystore.jks
261-
# the JKS keystore:
262-
# - contains one trusted certificate, the same as in tests/ssldata/signing_ca.pem
263-
# - password is testssl
264-
curdir = os.path.abspath(os.path.dirname(__file__))
265-
src = "import ssl, sys, os\n" \
266-
"sys.path.append('" + curdir + "')\n" \
267-
"from test_ssl import data_file, check_handshake\n" \
268-
"server_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)\n" \
269-
"server_context.load_cert_chain(data_file('signed_cert.pem'))\n" \
270-
"client_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)\n" \
271-
"check_handshake(server_context, client_context, ssl.SSLCertVerificationError)\n" \
272-
"client_context.load_default_certs()\n" \
273-
"check_handshake(server_context, client_context)\n"
274-
env = os.environ.copy()
275-
env['JAVA_TOOL_OPTIONS'] = "-Djavax.net.ssl.trustStore=" + curdir + "/ssldata/signing_keystore.jks"
276-
subprocess.run([sys.executable, '-c', src], env=env)
277-
278257
def test_verify_mode(self):
279258
signed_cert = data_file("signed_cert.pem")
280259
signed_cert2 = data_file("keycertecc.pem")
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
2+
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3+
#
4+
# The Universal Permissive License (UPL), Version 1.0
5+
#
6+
# Subject to the condition set forth below, permission is hereby granted to any
7+
# person obtaining a copy of this software, associated documentation and/or
8+
# data (collectively the "Software"), free of charge and under any and all
9+
# copyright rights in the Software, and any and all patent rights owned or
10+
# freely licensable by each licensor hereunder covering either (i) the
11+
# unmodified Software as contributed to or provided by such licensor, or (ii)
12+
# the Larger Works (as defined below), to deal in both
13+
#
14+
# (a) the Software, and
15+
#
16+
# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
17+
# one is included with the Software each a "Larger Work" to which the Software
18+
# is contributed by such licensors),
19+
#
20+
# without restriction, including without limitation the rights to copy, create
21+
# derivative works of, display, perform, and distribute the Software and make,
22+
# use, sell, offer for sale, import, export, have made, and have sold the
23+
# Software and the Larger Work(s), and to sublicense the foregoing rights on
24+
# either these or other terms.
25+
#
26+
# This license is subject to the following condition:
27+
#
28+
# The above copyright notice and either this complete permission notice or at a
29+
# minimum a reference to the UPL must be included in all copies or substantial
30+
# portions of the Software.
31+
#
32+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
33+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
34+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
35+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
36+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
37+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
38+
# SOFTWARE.
39+
40+
import os
41+
import subprocess
42+
import sys
43+
44+
from textwrap import dedent
45+
46+
if sys.implementation.name == "graalpython":
47+
def test_load_default_verify_keystore():
48+
# execute with javax.net.ssl.trustStore=tests/ssldata/signing_keystore.jks
49+
# the JKS keystore:
50+
# - contains one trusted certificate, the same as in tests/ssldata/signing_ca.pem
51+
# - password is testssl
52+
curdir = os.path.abspath(os.path.dirname(__file__))
53+
src = dedent(f"""\
54+
import ssl, sys, os
55+
sys.path.append('{curdir}')
56+
from test_ssl import data_file, check_handshake
57+
server_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
58+
server_context.load_cert_chain(data_file('signed_cert.pem'))
59+
client_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
60+
check_handshake(server_context, client_context, ssl.SSLCertVerificationError)
61+
client_context.load_default_certs()
62+
check_handshake(server_context, client_context)
63+
""")
64+
env = os.environ.copy()
65+
env['JAVA_TOOL_OPTIONS'] = f"-Djavax.net.ssl.trustStore={curdir}/ssldata/signing_keystore.jks"
66+
subprocess.run([sys.executable, '-c', src], env=env, check=True)

mx.graalpython/mx_graalpython.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ def update_unittest_tags(args):
435435
mx.warn("Potential regressions:\n" + '\n'.join(x[1] for x in diff))
436436

437437

438-
AOT_INCOMPATIBLE_TESTS = ["test_interop.py", "test_jarray.py"]
438+
AOT_INCOMPATIBLE_TESTS = ["test_interop.py", "test_jarray.py", "test_ssl_java_integration.py"]
439439

440440

441441
class GraalPythonTags(object):

0 commit comments

Comments
 (0)