mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-25 20:00:09 +01:00
22e8b28790
* gnome/applet/applet-dbus-devices.c, gnome/applet/other-network-dialog.c, gnome/applet/wso-none.c, libnm-util/dbus-helpers.c, libnm-util/dbus-helpers.h, src/nm-dbus-nm.c: Fix several issues. 'Connect to Other' and 'Create New Network' both failed in the non-encrypted case because we were not appending the security options to the DBUS message. And 'Connect to Other' was also failing in the encrypted case because we were not incrementing to the next DBUS parameter. All fixed. Thanks to dcdw for some debugging help. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1276 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
275 lines
8 KiB
C
275 lines
8 KiB
C
/* NetworkManager Wireless Applet -- Display wireless access points and allow user control
|
|
*
|
|
* Dan Williams <dcbw@redhat.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* (C) Copyright 2005 Red Hat, Inc.
|
|
*/
|
|
|
|
|
|
#include <dbus/dbus.h>
|
|
#include <glib.h>
|
|
#include <iwlib.h>
|
|
|
|
#include "dbus-helpers.h"
|
|
#include "cipher.h"
|
|
|
|
|
|
static void we_cipher_append_helper (DBusMessageIter *iter, int we_cipher)
|
|
{
|
|
dbus_int32_t dbus_we_cipher = (dbus_int32_t) we_cipher;
|
|
|
|
g_return_if_fail (iter != NULL);
|
|
|
|
dbus_message_iter_append_basic (iter, DBUS_TYPE_INT32, &dbus_we_cipher);
|
|
}
|
|
|
|
dbus_bool_t
|
|
nmu_security_serialize_wep (DBusMessageIter *iter,
|
|
const char *key,
|
|
int auth_alg)
|
|
{
|
|
const char * fake_key = "";
|
|
|
|
g_return_val_if_fail (iter != NULL, FALSE);
|
|
g_return_val_if_fail ((auth_alg == IW_AUTH_ALG_OPEN_SYSTEM) || (auth_alg == IW_AUTH_ALG_SHARED_KEY), FALSE);
|
|
|
|
/* Second arg: hashed key (STRING) */
|
|
dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, key ? &key : &fake_key);
|
|
|
|
/* Third arg: WEP authentication algorithm (INT32) */
|
|
dbus_message_iter_append_basic (iter, DBUS_TYPE_INT32, &auth_alg);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
dbus_bool_t
|
|
nmu_security_deserialize_wep (DBusMessageIter *iter,
|
|
char **key,
|
|
int *key_len,
|
|
int *auth_alg)
|
|
{
|
|
DBusMessageIter subiter;
|
|
char * dbus_key;
|
|
int dbus_key_len;
|
|
dbus_int32_t dbus_auth_alg;
|
|
|
|
g_return_val_if_fail (iter != NULL, FALSE);
|
|
g_return_val_if_fail (key != NULL, FALSE);
|
|
g_return_val_if_fail (*key == NULL, FALSE);
|
|
g_return_val_if_fail (key_len != NULL, FALSE);
|
|
g_return_val_if_fail (auth_alg != NULL, FALSE);
|
|
|
|
/* Next arg: key (STRING) */
|
|
g_return_val_if_fail (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_STRING, FALSE);
|
|
|
|
dbus_message_iter_get_basic (iter, &dbus_key);
|
|
g_return_val_if_fail (dbus_key != NULL, FALSE);
|
|
|
|
/* Next arg: authentication algorithm (INT32) */
|
|
g_return_val_if_fail (dbus_message_iter_next (iter), FALSE);
|
|
g_return_val_if_fail (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_INT32, FALSE);
|
|
|
|
dbus_message_iter_get_basic (iter, &dbus_auth_alg);
|
|
g_return_val_if_fail ((dbus_auth_alg == IW_AUTH_ALG_OPEN_SYSTEM)
|
|
|| (dbus_auth_alg == IW_AUTH_ALG_SHARED_KEY), FALSE);
|
|
|
|
*key = strlen (dbus_key) > 0 ? dbus_key : NULL;
|
|
*key_len = strlen (dbus_key);
|
|
*auth_alg = dbus_auth_alg;
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
dbus_bool_t
|
|
nmu_security_serialize_none_with_cipher (DBusMessage *message)
|
|
{
|
|
dbus_bool_t result = TRUE;
|
|
DBusMessageIter iter;
|
|
|
|
g_return_val_if_fail (message != NULL, FALSE);
|
|
|
|
dbus_message_iter_init_append (message, &iter);
|
|
|
|
/* First arg: WE Cipher (INT32) */
|
|
we_cipher_append_helper (&iter, IW_AUTH_CIPHER_NONE);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
dbus_bool_t
|
|
nmu_security_serialize_wep_with_cipher (DBusMessage *message,
|
|
IEEE_802_11_Cipher *cipher,
|
|
const char *ssid,
|
|
const char *input,
|
|
int auth_alg)
|
|
{
|
|
char * key = NULL;
|
|
dbus_bool_t result = TRUE;
|
|
DBusMessageIter iter;
|
|
|
|
g_return_val_if_fail (message != NULL, FALSE);
|
|
g_return_val_if_fail (cipher != NULL, FALSE);
|
|
g_return_val_if_fail ((auth_alg == IW_AUTH_ALG_OPEN_SYSTEM) || (auth_alg == IW_AUTH_ALG_SHARED_KEY), FALSE);
|
|
|
|
dbus_message_iter_init_append (message, &iter);
|
|
|
|
/* First arg: WE Cipher (INT32) */
|
|
we_cipher_append_helper (&iter, ieee_802_11_cipher_get_we_cipher (cipher));
|
|
|
|
key = ieee_802_11_cipher_hash (cipher, ssid, input);
|
|
result = nmu_security_serialize_wep (&iter, key, auth_alg);
|
|
g_free (key);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
dbus_bool_t
|
|
nmu_security_serialize_wpa_psk (DBusMessageIter *iter,
|
|
const char *key,
|
|
int wpa_version,
|
|
int key_mgt)
|
|
{
|
|
g_return_val_if_fail (iter != NULL, FALSE);
|
|
g_return_val_if_fail (key != NULL, FALSE);
|
|
g_return_val_if_fail ((wpa_version == IW_AUTH_WPA_VERSION_WPA) || (wpa_version == IW_AUTH_WPA_VERSION_WPA2), FALSE);
|
|
g_return_val_if_fail ((key_mgt == IW_AUTH_KEY_MGMT_802_1X) || (key_mgt == IW_AUTH_KEY_MGMT_PSK), FALSE);
|
|
|
|
/* Second arg: hashed key (STRING) */
|
|
dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &key);
|
|
|
|
/* Third arg: WPA version (INT32) */
|
|
dbus_message_iter_append_basic (iter, DBUS_TYPE_INT32, &wpa_version);
|
|
|
|
/* Fourth arg: WPA key management (INT32) */
|
|
dbus_message_iter_append_basic (iter, DBUS_TYPE_INT32, &key_mgt);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
dbus_bool_t
|
|
nmu_security_deserialize_wpa_psk (DBusMessageIter *iter,
|
|
char **key,
|
|
int *key_len,
|
|
int *wpa_version,
|
|
int *key_mgt)
|
|
{
|
|
DBusMessageIter subiter;
|
|
char * dbus_key;
|
|
int dbus_key_len;
|
|
dbus_int32_t dbus_wpa_version;
|
|
dbus_int32_t dbus_key_mgt;
|
|
|
|
g_return_val_if_fail (iter != NULL, FALSE);
|
|
g_return_val_if_fail (key != NULL, FALSE);
|
|
g_return_val_if_fail (*key == NULL, FALSE);
|
|
g_return_val_if_fail (key_len != NULL, FALSE);
|
|
g_return_val_if_fail (wpa_version != NULL, FALSE);
|
|
g_return_val_if_fail (key_mgt != NULL, FALSE);
|
|
|
|
/* Next arg: key (STRING) */
|
|
g_return_val_if_fail (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_STRING, FALSE);
|
|
|
|
dbus_message_iter_get_basic (iter, &dbus_key);
|
|
g_return_val_if_fail (dbus_key != NULL, FALSE);
|
|
|
|
/* Next arg: WPA version (INT32) */
|
|
g_return_val_if_fail (dbus_message_iter_next (iter), FALSE);
|
|
g_return_val_if_fail (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_INT32, FALSE);
|
|
|
|
dbus_message_iter_get_basic (iter, &dbus_wpa_version);
|
|
g_return_val_if_fail ((dbus_wpa_version == IW_AUTH_WPA_VERSION_WPA)
|
|
|| (dbus_wpa_version == IW_AUTH_WPA_VERSION_WPA2), FALSE);
|
|
|
|
/* Next arg: WPA key management (INT32) */
|
|
g_return_val_if_fail (dbus_message_iter_next (iter), FALSE);
|
|
g_return_val_if_fail (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_INT32, FALSE);
|
|
|
|
dbus_message_iter_get_basic (iter, &dbus_key_mgt);
|
|
g_return_val_if_fail ((dbus_key_mgt == IW_AUTH_KEY_MGMT_802_1X)
|
|
|| (dbus_key_mgt == IW_AUTH_KEY_MGMT_PSK), FALSE);
|
|
|
|
*key = strlen (dbus_key) > 0 ? dbus_key : NULL;
|
|
*key_len = strlen (dbus_key);
|
|
*wpa_version = dbus_wpa_version;
|
|
*key_mgt = dbus_key_mgt;
|
|
return TRUE;
|
|
}
|
|
|
|
dbus_bool_t
|
|
nmu_security_serialize_wpa_psk_with_cipher (DBusMessage *message,
|
|
IEEE_802_11_Cipher *cipher,
|
|
const char *ssid,
|
|
const char *input,
|
|
int wpa_version,
|
|
int key_mgt)
|
|
{
|
|
char * key = NULL;
|
|
dbus_bool_t result = TRUE;
|
|
DBusMessageIter iter;
|
|
|
|
g_return_val_if_fail (message != NULL, FALSE);
|
|
g_return_val_if_fail (cipher != NULL, FALSE);
|
|
g_return_val_if_fail ((wpa_version == IW_AUTH_WPA_VERSION_WPA) || (wpa_version == IW_AUTH_WPA_VERSION_WPA2), FALSE);
|
|
g_return_val_if_fail ((key_mgt == IW_AUTH_KEY_MGMT_802_1X) || (key_mgt == IW_AUTH_KEY_MGMT_PSK), FALSE);
|
|
|
|
dbus_message_iter_init_append (message, &iter);
|
|
|
|
/* First arg: WE Cipher (INT32) */
|
|
we_cipher_append_helper (&iter, ieee_802_11_cipher_get_we_cipher (cipher));
|
|
|
|
key = ieee_802_11_cipher_hash (cipher, ssid, input);
|
|
result = nmu_security_serialize_wpa_psk (&iter, key, wpa_version, key_mgt);
|
|
g_free (key);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
/*
|
|
* nmu_create_dbus_error_message
|
|
*
|
|
* Make a pretty DBus error message
|
|
*
|
|
*/
|
|
DBusMessage *
|
|
nmu_create_dbus_error_message (DBusMessage *message,
|
|
const char *namespace,
|
|
const char *exception,
|
|
const char *format,
|
|
...)
|
|
{
|
|
DBusMessage * reply;
|
|
va_list args;
|
|
char * errmsg;
|
|
char * full_exception;
|
|
|
|
errmsg = g_malloc0 (513);
|
|
va_start (args, format);
|
|
vsnprintf (errmsg, 512, format, args);
|
|
va_end (args);
|
|
|
|
full_exception = g_strdup_printf ("%s.%s", namespace, exception);
|
|
reply = dbus_message_new_error (message, full_exception, errmsg);
|
|
g_free (full_exception);
|
|
g_free (errmsg);
|
|
|
|
return reply;
|
|
}
|
|
|
|
|