mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-21 10:14:41 +00:00
ba15ee5f50
* libnm-util/nm-setting-vpn.c libnm-util/nm-setting-vpn.h - Split VPN secrets from VPN data so that settings services can actually figure out that they are secrets and store them accordingly * system-settings/plugins/keyfile/nm-keyfile-connection.c system-settings/plugins/keyfile/reader.c system-settings/plugins/keyfile/reader.h system-settings/plugins/keyfile/writer.c - Store VPN secrets separately from VPN data so that they can be fetched on demand - Implement the get_secrets() call so that (a) secrets don't leak out to unprivileged callers, and (b) secrets can be sent to privileged callers when needed * vpn-daemons/vpnc/src/nm-vpnc-service.c - Handle split VPN secrets git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4031 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
101 lines
3.3 KiB
C
101 lines
3.3 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
|
|
/*
|
|
* Dan Williams <dcbw@redhat.com>
|
|
* Tambet Ingo <tambet@gmail.com>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library 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
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
* Boston, MA 02110-1301 USA.
|
|
*
|
|
* (C) Copyright 2007 - 2008 Red Hat, Inc.
|
|
* (C) Copyright 2007 - 2008 Novell, Inc.
|
|
*/
|
|
|
|
#ifndef NM_SETTING_VPN_H
|
|
#define NM_SETTING_VPN_H
|
|
|
|
#include <nm-setting.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define NM_TYPE_SETTING_VPN (nm_setting_vpn_get_type ())
|
|
#define NM_SETTING_VPN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_VPN, NMSettingVPN))
|
|
#define NM_SETTING_VPN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_VPN, NMSettingVPNClass))
|
|
#define NM_IS_SETTING_VPN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_VPN))
|
|
#define NM_IS_SETTING_VPN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_VPN))
|
|
#define NM_SETTING_VPN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_VPN, NMSettingVPNClass))
|
|
|
|
#define NM_SETTING_VPN_SETTING_NAME "vpn"
|
|
|
|
typedef enum
|
|
{
|
|
NM_SETTING_VPN_ERROR_UNKNOWN = 0,
|
|
NM_SETTING_VPN_ERROR_INVALID_PROPERTY,
|
|
NM_SETTING_VPN_ERROR_MISSING_PROPERTY,
|
|
} NMSettingVpnError;
|
|
|
|
#define NM_TYPE_SETTING_VPN_ERROR (nm_setting_vpn_error_get_type ())
|
|
GType nm_setting_vpn_error_get_type (void);
|
|
|
|
#define NM_SETTING_VPN_ERROR nm_setting_vpn_error_quark ()
|
|
GQuark nm_setting_vpn_error_quark (void);
|
|
|
|
#define NM_SETTING_VPN_SERVICE_TYPE "service-type"
|
|
#define NM_SETTING_VPN_USER_NAME "user-name"
|
|
#define NM_SETTING_VPN_DATA "data"
|
|
#define NM_SETTING_VPN_SECRETS "secrets"
|
|
|
|
typedef struct {
|
|
NMSetting parent;
|
|
|
|
char *service_type;
|
|
|
|
/* username of the user requesting this connection, thus
|
|
* it's really only valid for user connections, and it also
|
|
* should never be saved out to persistent config.
|
|
*/
|
|
char *user_name;
|
|
|
|
/* The hash table is created at setting object
|
|
* init time and should not be replaced. It is
|
|
* a char * -> char * mapping, and both the key
|
|
* and value are owned by the hash table, and should
|
|
* be allocated with functions whose value can be
|
|
* freed with g_free(). Should not contain secrets.
|
|
*/
|
|
GHashTable *data;
|
|
|
|
/* The hash table is created at setting object
|
|
* init time and should not be replaced. It is
|
|
* a char * -> char * mapping, and both the key
|
|
* and value are owned by the hash table, and should
|
|
* be allocated with functions whose value can be
|
|
* freed with g_free(). Should contain secrets only.
|
|
*/
|
|
GHashTable *secrets;
|
|
} NMSettingVPN;
|
|
|
|
typedef struct {
|
|
NMSettingClass parent;
|
|
} NMSettingVPNClass;
|
|
|
|
GType nm_setting_vpn_get_type (void);
|
|
|
|
NMSetting *nm_setting_vpn_new (void);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* NM_SETTING_VPN_H */
|