[GR-30512] Socket module: add AF_PACKET and AF_UNIX constants.

steve-s · steve-s · commit c7e1845da14f · 2021-09-17T10:18:14.000Z
PullRequest: graalpython/1963
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PosixConstants.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PosixConstants.java
@@ -132,6 +132,8 @@ public final class PosixConstants {
     public static final MandatoryIntConstant AF_UNSPEC;
     public static final MandatoryIntConstant AF_INET;
     public static final MandatoryIntConstant AF_INET6;
+    public static final OptionalIntConstant AF_PACKET;
+    public static final MandatoryIntConstant AF_UNIX;
     public static final MandatoryIntConstant SOCK_DGRAM;
     public static final MandatoryIntConstant SOCK_STREAM;
     public static final MandatoryIntConstant INADDR_ANY;
@@ -354,6 +356,9 @@ public final class PosixConstants {
         AF_UNSPEC = reg.createMandatoryInt("AF_UNSPEC");
         AF_INET = reg.createMandatoryInt("AF_INET");
         AF_INET6 = reg.createMandatoryInt("AF_INET6");
+        // Following two aren't really supported, but we can fail later:
+        AF_PACKET = reg.createOptionalInt("AF_PACKET");
+        AF_UNIX = reg.createMandatoryInt("AF_UNIX");
         SOCK_DGRAM = reg.createMandatoryInt("SOCK_DGRAM");
         SOCK_STREAM = reg.createMandatoryInt("SOCK_STREAM");
         INADDR_ANY = reg.createMandatoryInt("INADDR_ANY");
@@ -483,7 +488,7 @@ public final class PosixConstants {
         waitOptions = new IntConstant[]{WNOHANG, WUNTRACED};
         accessMode = new IntConstant[]{R_OK, W_OK, X_OK, F_OK};
         rtld = new IntConstant[]{RTLD_LAZY, RTLD_NOW, RTLD_GLOBAL, RTLD_LOCAL};
-        socketFamily = new IntConstant[]{AF_UNSPEC, AF_INET, AF_INET6};
+        socketFamily = new IntConstant[]{AF_UNSPEC, AF_INET, AF_INET6, AF_PACKET, AF_UNIX};
         socketType = new IntConstant[]{SOCK_DGRAM, SOCK_STREAM};
         ip4Address = new IntConstant[]{INADDR_ANY, INADDR_BROADCAST, INADDR_NONE, INADDR_LOOPBACK, INADDR_ALLHOSTS_GROUP, INADDR_MAX_LOCAL_GROUP, INADDR_UNSPEC_GROUP};
         gaiFlags = new IntConstant[]{AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST, AI_V4MAPPED, AI_ALL, AI_ADDRCONFIG, AI_IDN, AI_CANONIDN, AI_NUMERICSERV};
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PosixConstantsDarwin.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PosixConstantsDarwin.java
@@ -122,6 +122,7 @@ static void getConstants(PosixConstants.Registry constants) {
         constants.put("AF_UNSPEC", 0);
         constants.put("AF_INET", 2);
         constants.put("AF_INET6", 30);
+        constants.put("AF_UNIX", 1);
         constants.put("SOCK_DGRAM", 2);
         constants.put("SOCK_STREAM", 1);
         constants.put("INADDR_ANY", 0x00000000);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PosixConstantsLinux.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PosixConstantsLinux.java
@@ -125,6 +125,8 @@ static void getConstants(PosixConstants.Registry constants) {
         constants.put("AF_UNSPEC", 0);
         constants.put("AF_INET", 2);
         constants.put("AF_INET6", 10);
+        constants.put("AF_PACKET", 17);
+        constants.put("AF_UNIX", 1);
         constants.put("SOCK_DGRAM", 2);
         constants.put("SOCK_STREAM", 1);
         constants.put("INADDR_ANY", 0x00000000);
diff --git a/graalpython/lib-python/3/multiprocessing/connection.py b/graalpython/lib-python/3/multiprocessing/connection.py
@@ -47,9 +47,11 @@
 default_family = 'AF_INET'
 families = ['AF_INET']
 
-if hasattr(socket, 'AF_UNIX'):
-    default_family = 'AF_UNIX'
-    families += ['AF_UNIX']
+# Begin Truffle change
+# if hasattr(socket, 'AF_UNIX'):
+#    default_family = 'AF_UNIX'
+#    families += ['AF_UNIX']
+# End Truffle change
 
 if sys.platform == 'win32':
     default_family = 'AF_PIPE'
diff --git a/graalpython/lib-python/3/test/_test_multiprocessing.py b/graalpython/lib-python/3/test/_test_multiprocessing.py
@@ -3344,7 +3344,9 @@ def test_context(self):
         if self.TYPE == 'processes':
             self.assertRaises(OSError, l.accept)
 
+    # GR-28433
     @unittest.skipIf(IS_LINUX, "module 'socket' has no attribute 'AF_UNIX'")
+    @unittest.skipIf(sys.implementation.name == 'graalpython', "module 'socket' has no attribute 'AF_UNIX'")
     @unittest.skipUnless(util.abstract_sockets_supported,
                          "test needs abstract socket support")
     def test_abstract_socket(self):
diff --git a/graalpython/lib-python/3/test/support/__init__.py b/graalpython/lib-python/3/test/support/__init__.py
@@ -2718,7 +2718,8 @@ def skip_if_pgo_task(test):
 _bind_nix_socket_error = None
 def skip_unless_bind_unix_socket(test):
     """Decorator for tests requiring a functional bind() for unix sockets."""
-    if not hasattr(socket, 'AF_UNIX'):
+    # GR-28433
+    if (not hasattr(socket, 'AF_UNIX')) or sys.implementation.name == 'graalpython':
         return unittest.skip('No UNIX Sockets')(test)
     global _bind_nix_socket_error
     if _bind_nix_socket_error is None:
diff --git a/graalpython/lib-python/3/test/test_asyncio/functional.py b/graalpython/lib-python/3/test/test_asyncio/functional.py
@@ -54,7 +54,9 @@ def tcp_server(self, server_prog, *,
                    max_clients=10):
 
         if addr is None:
-            if hasattr(socket, 'AF_UNIX') and family == socket.AF_UNIX:
+            # GR-28433
+            import sys
+            if hasattr(socket, 'AF_UNIX') and family == socket.AF_UNIX and sys.implementation.name != 'graalpython':
                 with tempfile.NamedTemporaryFile() as tmp:
                     addr = tmp.name
             else:
diff --git a/graalpython/lib-python/3/test/test_asyncio/test_base_events.py b/graalpython/lib-python/3/test/test_asyncio/test_base_events.py
@@ -1683,6 +1683,7 @@ def test_create_datagram_endpoint_sock(self):
         self.loop.run_until_complete(protocol.done)
         self.assertEqual('CLOSED', protocol.state)
 
+    @unittest.skipIf(sys.implementation.name == 'graalpython', 'GR-28433')
     @unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'No UNIX Sockets')
     def test_create_datagram_endpoint_sock_unix(self):
         fut = self.loop.create_datagram_endpoint(
diff --git a/graalpython/lib-python/3/test/test_asyncio/test_events.py b/graalpython/lib-python/3/test/test_asyncio/test_events.py
@@ -868,6 +868,7 @@ def test_create_unix_server(self):
         # close server
         server.close()
 
+    @unittest.skipIf(sys.implementation.name == 'graalpython', 'GR-28433')
     @unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'No UNIX Sockets')
     def test_create_unix_server_path_socket_error(self):
         proto = MyProto(loop=self.loop)
diff --git a/graalpython/lib-python/3/test/test_asyncio/test_unix_events.py b/graalpython/lib-python/3/test/test_asyncio/test_unix_events.py
@@ -264,6 +264,7 @@ def test_close_on_finalizing(self, m_signal, m_sys):
         self.assertFalse(m_signal.signal.called)
 
 
+@unittest.skipIf(sys.implementation.name == 'graalpython', 'GR-28433')
 @unittest.skipUnless(hasattr(socket, 'AF_UNIX'),
                      'UNIX Sockets are not supported')
 class SelectorEventLoopUnixSocketTests(test_utils.TestCase):
diff --git a/graalpython/lib-python/3/test/test_asyncore.py b/graalpython/lib-python/3/test/test_asyncore.py
@@ -17,7 +17,9 @@
 
 
 TIMEOUT = 3
-HAS_UNIX_SOCKETS = hasattr(socket, 'AF_UNIX')
+# GR-28433
+HAS_UNIX_SOCKETS = hasattr(socket, 'AF_UNIX') and sys.implementation.name != 'graalpython'
+
 
 class dummysocket:
     def __init__(self):
diff --git a/graalpython/lib-python/3/test/test_logging.py b/graalpython/lib-python/3/test/test_logging.py
@@ -1055,13 +1055,17 @@ def server_close(self):
         super(TestUDPServer, self).server_close()
         self._closed = True
 
-if hasattr(socket, "AF_UNIX"):
+
+# GR-28433
+if hasattr(socket, "AF_UNIX") and sys.implementation.name != 'graalpython':
     class TestUnixStreamServer(TestTCPServer):
         address_family = socket.AF_UNIX
 
+
     class TestUnixDatagramServer(TestUDPServer):
         address_family = socket.AF_UNIX
 
+
 # - end of server_helper section
 
 class SMTPHandlerTest(BaseTest):
@@ -1732,12 +1736,13 @@ def _get_temp_domain_socket():
     os.remove(fn)
     return fn
 
-@unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")
-class UnixSocketHandlerTest(SocketHandlerTest):
 
+# GR-28433
+@unittest.skipUnless(hasattr(socket, "AF_UNIX") and sys.implementation.name != 'graalpython', "Unix sockets required")
+class UnixSocketHandlerTest(SocketHandlerTest):
     """Test for SocketHandler with unix sockets."""
 
-    if hasattr(socket, "AF_UNIX"):
+    if hasattr(socket, "AF_UNIX") and sys.implementation.name != 'graalpython':
         server_class = TestUnixStreamServer
 
     def setUp(self):
@@ -1813,12 +1818,13 @@ def test_output(self):
         self.handled.wait()
         self.assertEqual(self.log_output, "spam\neggs\n")
 
-@unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")
-class UnixDatagramHandlerTest(DatagramHandlerTest):
 
+# GR-28433
+@unittest.skipUnless(hasattr(socket, "AF_UNIX") and sys.implementation.name != 'graalpython', "Unix sockets required")
+class UnixDatagramHandlerTest(DatagramHandlerTest):
     """Test for DatagramHandler using Unix sockets."""
 
-    if hasattr(socket, "AF_UNIX"):
+    if hasattr(socket, "AF_UNIX") and sys.implementation.name != 'graalpython':
         server_class = TestUnixDatagramServer
 
     def setUp(self):
@@ -1897,12 +1903,13 @@ def test_output(self):
         self.handled.wait()
         self.assertEqual(self.log_output, b'<11>h\xc3\xa4m-sp\xc3\xa4m')
 
-@unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")
-class UnixSysLogHandlerTest(SysLogHandlerTest):
 
+# GR-28433
+@unittest.skipUnless(hasattr(socket, "AF_UNIX") and sys.implementation.name != 'graalpython', "Unix sockets required")
+class UnixSysLogHandlerTest(SysLogHandlerTest):
     """Test for SysLogHandler with Unix sockets."""
 
-    if hasattr(socket, "AF_UNIX"):
+    if hasattr(socket, "AF_UNIX") and sys.implementation.name != 'graalpython':
         server_class = TestUnixDatagramServer
 
     def setUp(self):
diff --git a/graalpython/lib-python/3/test/test_pathlib.py b/graalpython/lib-python/3/test/test_pathlib.py
@@ -2055,6 +2055,7 @@ def test_is_socket_false(self):
         self.assertIs((P / 'fileA\udfff').is_socket(), False)
         self.assertIs((P / 'fileA\x00').is_socket(), False)
 
+    @unittest.skipIf(sys.implementation.name == 'graalpython', 'GR-28433')
     @unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")
     def test_is_socket_true(self):
         P = self.cls(BASE, 'mysock')
diff --git a/graalpython/lib-python/3/test/test_socket.py b/graalpython/lib-python/3/test/test_socket.py
@@ -1799,7 +1799,7 @@ def test_socket_fileno(self):
             s.bind((support.HOSTv6, 0, 0, 0))
             self._test_socket_fileno(s, socket.AF_INET6, socket.SOCK_STREAM)
 
-        if hasattr(socket, "AF_UNIX"):
+        if hasattr(socket, "AF_UNIX") and sys.implementation.name != 'graalpython':
             tmpdir = tempfile.mkdtemp()
             self.addCleanup(shutil.rmtree, tmpdir)
             s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
@@ -4083,28 +4083,38 @@ class SendrecvmsgUnixStreamTestBase(SendrecvmsgConnectedBase,
                                     ConnectedStreamTestMixin, UnixStreamBase):
     pass
 
+
+@unittest.skipIf(sys.implementation.name == 'graalpython', 'GR-28433')
 @requireAttrs(socket.socket, "sendmsg")
 @requireAttrs(socket, "AF_UNIX")
 class SendmsgUnixStreamTest(SendmsgStreamTests, SendrecvmsgUnixStreamTestBase):
     pass
 
+
+@unittest.skipIf(sys.implementation.name == 'graalpython', 'GR-28433')
 @requireAttrs(socket.socket, "recvmsg")
 @requireAttrs(socket, "AF_UNIX")
 class RecvmsgUnixStreamTest(RecvmsgTests, RecvmsgGenericStreamTests,
                             SendrecvmsgUnixStreamTestBase):
     pass
 
+
+@unittest.skipIf(sys.implementation.name == 'graalpython', 'GR-28433')
 @requireAttrs(socket.socket, "recvmsg_into")
 @requireAttrs(socket, "AF_UNIX")
 class RecvmsgIntoUnixStreamTest(RecvmsgIntoTests, RecvmsgGenericStreamTests,
                                 SendrecvmsgUnixStreamTestBase):
     pass
 
+
+@unittest.skipIf(sys.implementation.name == 'graalpython', 'GR-28433')
 @requireAttrs(socket.socket, "sendmsg", "recvmsg")
 @requireAttrs(socket, "AF_UNIX", "SOL_SOCKET", "SCM_RIGHTS")
 class RecvmsgSCMRightsStreamTest(SCMRightsTest, SendrecvmsgUnixStreamTestBase):
     pass
 
+
+@unittest.skipIf(sys.implementation.name == 'graalpython', 'GR-28433')
 @requireAttrs(socket.socket, "sendmsg", "recvmsg_into")
 @requireAttrs(socket, "AF_UNIX", "SOL_SOCKET", "SCM_RIGHTS")
 class RecvmsgIntoSCMRightsStreamTest(RecvmsgIntoMixin, SCMRightsTest,
@@ -4278,7 +4288,8 @@ def __init__(self, methodName='runTest'):
 
     def _check_defaults(self, sock):
         self.assertIsInstance(sock, socket.socket)
-        if hasattr(socket, 'AF_UNIX'):
+        # GR-28433
+        if hasattr(socket, 'AF_UNIX') and sys.implementation.name != 'graalpython':
             self.assertEqual(sock.family, socket.AF_UNIX)
         else:
             self.assertEqual(sock.family, socket.AF_INET)
@@ -5055,6 +5066,7 @@ def test_setblocking_invalidfd(self):
             sock.setblocking(False)
 
 
+@unittest.skipIf(sys.implementation.name == 'graalpython', 'GR-28433')
 @unittest.skipUnless(sys.platform == 'linux' and hasattr(socket, "AF_UNIX"), 'Linux specific test')
 class TestLinuxAbstractNamespace(unittest.TestCase):
 
@@ -5097,6 +5109,8 @@ def testBytearrayName(self):
             s.bind(bytearray(b"\x00python\x00test\x00"))
             self.assertEqual(s.getsockname(), b"\x00python\x00test\x00")
 
+
+@unittest.skipIf(sys.implementation.name == 'graalpython', 'GR-28433')
 @unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'test needs socket.AF_UNIX')
 class TestUnixDomain(unittest.TestCase):
 
diff --git a/graalpython/lib-python/3/test/test_socketserver.py b/graalpython/lib-python/3/test/test_socketserver.py
@@ -22,7 +22,9 @@
 TEST_STR = b"hello world\n"
 HOST = test.support.HOST
 
-HAVE_UNIX_SOCKETS = hasattr(socket, "AF_UNIX")
+# GR-28433
+import sys
+HAVE_UNIX_SOCKETS = hasattr(socket, "AF_UNIX") and sys.implementation.name != 'graalpython'
 requires_unix_sockets = unittest.skipUnless(HAVE_UNIX_SOCKETS,
                                             'requires Unix sockets')
 HAVE_FORKING = hasattr(os, "fork")
