[glib/wip/smcv/gdbus-127001] gdbus-peer: Specifically listen on 127.0.0.1



commit 7021b84f1051f61d28fba373ca559f0b3aaec5f8
Author: Simon McVittie <smcv collabora com>
Date:   Mon Nov 4 13:31:14 2019 +0000

    gdbus-peer: Specifically listen on 127.0.0.1
    
    This bypasses any issues we might have with containers where IPv6 is
    returned by name resolution (particularly since GNOME/glib!616) but
    doesn't necessarily actually work.
    
    This comes at a minor test-coverage cost: we don't test GDBusServer's
    default behaviour when told to listen on "tcp:" or "nonce-tcp:", and
    on systems where IPv6 is available, we don't test it. If we want to
    do those, we should perhaps do them in separate tests, and disable
    those tests when binding to ::1 doesn't work.
    
    Mitigates: GNOME/glib#1912
    Signed-off-by: Simon McVittie <smcv collabora com>

 gio/tests/gdbus-peer.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gio/tests/gdbus-peer.c b/gio/tests/gdbus-peer.c
index 7887ab917..d01bc9a7a 100644
--- a/gio/tests/gdbus-peer.c
+++ b/gio/tests/gdbus-peer.c
@@ -278,7 +278,7 @@ setup_test_address (void)
       tmp_address = g_strdup_printf ("unix:dir=%s", tmpdir);
     }
   else
-    tmp_address = g_strdup ("nonce-tcp:");
+    tmp_address = g_strdup ("nonce-tcp:host=127.0.0.1");
 }
 
 #ifdef G_OS_UNIX
@@ -726,7 +726,7 @@ do_test_peer (void)
   c = g_dbus_connection_new_for_address_sync (is_unix ? "unix:path=/tmp/gdbus-test-does-not-exist-pid" :
                                               /* NOTE: Even if something is listening on port 12345 the 
connection
                                                * will fail because the nonce file doesn't exist */
-                                              
"nonce-tcp:host=localhost,port=12345,noncefile=this-does-not-exist-gdbus",
+                                              
"nonce-tcp:host=127.0.0.1,port=12345,noncefile=this-does-not-exist-gdbus",
                                               G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT,
                                               NULL, /* GDBusAuthObserver */
                                               NULL, /* cancellable */
@@ -1375,7 +1375,7 @@ nonce_tcp_service_thread_func (gpointer user_data)
 
   error = NULL;
   observer = g_dbus_auth_observer_new ();
-  server = g_dbus_server_new_sync ("nonce-tcp:",
+  server = g_dbus_server_new_sync ("nonce-tcp:host=127.0.0.1",
                                    G_DBUS_SERVER_FLAGS_NONE,
                                    test_guid,
                                    observer,
@@ -1584,7 +1584,7 @@ tcp_anonymous_service_thread_func (gpointer user_data)
   g_main_context_push_thread_default (service_context);
 
   error = NULL;
-  server = g_dbus_server_new_sync ("tcp:",
+  server = g_dbus_server_new_sync ("tcp:host=127.0.0.1",
                                    G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS,
                                    test_guid,
                                    NULL, /* GDBusObserver* */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]