From afcd88b9aa0c2a3801725ee6044d381910db2d4c Mon Sep 17 00:00:00 2001 From: Cosimo Alfarano Date: Fri, 7 Oct 2011 11:25:00 +0100 Subject: [PATCH 5/8] Enable anonymous authorization for tests Now that authorizatoin is in SASL mechs, enable anonymous authorizations when we are testing anonymous mechs functionality --- dbus/dbus-auth-script.c | 9 +++++++-- .../auth/anonymous-server-successful.auth-script | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dbus/dbus-auth-script.c b/dbus/dbus-auth-script.c index 06df299..6bf98e3 100644 --- a/dbus/dbus-auth-script.c +++ b/dbus/dbus-auth-script.c @@ -398,8 +398,8 @@ _dbus_auth_script_run (const DBusString *filename) _dbus_credentials_unref (creds); } - else if (_dbus_string_starts_with_c_str (&line, - "SERVER")) + else if (_dbus_string_starts_with_c_str (&line, "SERVER") || + _dbus_string_starts_with_c_str (&line, "SERVER_ANONYMOUS")) { DBusCredentials *creds; DBusAuthorization *authorization; @@ -417,6 +417,11 @@ _dbus_auth_script_run (const DBusString *filename) _dbus_warn ("no memory to create DBusAuthorization\n"); goto out; } + /* if we are testing an anonymous server, we need to enable + * anonymous authorization, or the mech will REJECT */ + if (_dbus_string_starts_with_c_str (&line, "SERVER_ANONYMOUS")) + _dbus_authorization_set_allow_anonymous (authorization, TRUE); + auth = _dbus_auth_server_new (&guid, authorization); /* DBusAuth owns it, or finalized on OOM */ _dbus_authorization_unref (authorization); diff --git a/test/data/auth/anonymous-server-successful.auth-script b/test/data/auth/anonymous-server-successful.auth-script index 172ae9d..c53b30f 100644 --- a/test/data/auth/anonymous-server-successful.auth-script +++ b/test/data/auth/anonymous-server-successful.auth-script @@ -1,6 +1,7 @@ ## this tests the server side in a successful auth of type ANONYMOUS -SERVER +## Act as a server that accepts anonymous authorization +SERVER_ANONYMOUS ## verify that prior to doing anything, we haven't authed as anyone EXPECT_HAVE_NO_CREDENTIALS SEND 'AUTH ANONYMOUS 442d42757320312e312e31' -- 1.7.6.3