Skip to content

GitLab

P
polkit
Commit 914df46f authored by David Zeuthen's avatar David Zeuthen
Browse files
Options

rework API of polkitagent 

still a work in progress, supporting multiple identities (wheel style auth) is 99% complete.
parent 2e5f1546
Hide whitespace changes
Inline Side-by-side
Showing with 1063 additions and 582 deletions
src/polkitagent/Makefile.am
View file @ 914df46f
......@@ -37,15 +37,15 @@ libpolkit_agent_1includedir=$(includedir)/polkit-1/polkitagent
libpolkit_agent_1include_HEADERS = \
polkitagent.h \
polkitagenttypes.h \
polkitagentauthenticationsession.h \
polkitagentauthenticationagent.h \
polkitagentsession.h \
polkitagentlistener.h \
$(NULL)
libpolkit_agent_1_la_SOURCES = \
polkitagent.h \
polkitagenttypes.h \
polkitagentauthenticationsession.h polkitagentauthenticationsession.c \
polkitagentauthenticationagent.h polkitagentauthenticationagent.c \
polkitagentsession.h polkitagentsession.c \
polkitagentlistener.h polkitagentlistener.c \
$(BUILT_SOURCES) \
$(NULL)
......
src/polkitagent/polkitagent.h
View file @ 914df46f
......@@ -23,8 +23,8 @@
#define __POLKIT_AGENT_H
#define _POLKIT_AGENT_INSIDE_POLKIT_AGENT_H 1
#include <polkitagent/polkitagentauthenticationagent.h>
#include <polkitagent/polkitagentauthenticationsession.h>
#include <polkitagent/polkitagentlistener.h>
#include <polkitagent/polkitagentsession.h>
#undef _POLKIT_AGENT_INSIDE_POLKIT_AGENT_H
#endif /* __POLKIT_AGENT_H */
src/polkitagent/polkitagentauthenticationagent.h deleted 100644 → 0
View file @ 2e5f1546
/*
* Copyright (C) 2008 Red Hat, Inc.
*
* 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., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*
* Author: David Zeuthen <davidz@redhat.com>
*/
#ifndef __POLKIT_AGENT_AUTHENTICATION_AGENT_H
#define __POLKIT_AGENT_AUTHENTICATION_AGENT_H
#include <polkit/polkit.h>
#include <polkitagent/polkitagenttypes.h>
G_BEGIN_DECLS
#define POLKIT_AGENT_TYPE_AUTHENTICATION_AGENT (polkit_agent_authentication_agent_get_type ())
#define POLKIT_AGENT_AUTHENTICATION_AGENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), POLKIT_AGENT_TYPE_AUTHENTICATION_AGENT, PolkitAgentAuthenticationAgent))
#define POLKIT_AGENT_AUTHENTICATION_AGENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), POLKIT_AGENT_TYPE_AUTHENTICATION_AGENT, PolkitAgentAuthenticationAgentClass))
#define POLKIT_AGENT_AUTHENTICATION_AGENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), POLKIT_AGENT_TYPE_AUTHENTICATION_AGENT,PolkitAgentAuthenticationAgentClass))
#define POLKIT_AGENT_IS_AUTHENTICATION_AGENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), POLKIT_AGENT_TYPE_AUTHENTICATION_AGENT))
#define POLKIT_AGENT_IS_AUTHENTICATION_AGENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), POLKIT_AGENT_TYPE_AUTHENTICATION_AGENT))
#if 0
typedef struct _PolkitAgentAuthenticationAgent PolkitAgentAuthenticationAgent;
#endif
typedef struct _PolkitAgentAuthenticationAgentClass PolkitAgentAuthenticationAgentClass;
/* TODO: we probably want to express this interface in another way but this is good enough for now */
typedef void (*PolkitAgentAuthenticationAgentBeginFunc) (PolkitAgentAuthenticationAgent *agent,
const gchar *action_id,
const gchar *cookie,
GList *identities,
gpointer pending_call);
typedef void (*PolkitAgentAuthenticationAgentCancelFunc) (PolkitAgentAuthenticationAgent *agent,
const gchar *cookie,
gpointer user_data);
GType polkit_agent_authentication_agent_get_type (void) G_GNUC_CONST;
PolkitAgentAuthenticationAgent *polkit_agent_authentication_agent_new (PolkitAgentAuthenticationAgentBeginFunc begin_func,
PolkitAgentAuthenticationAgentCancelFunc cancel_func,
gpointer user_data);
void polkit_agent_authentication_agent_finish (PolkitAgentAuthenticationAgent *agent,
gpointer pending_call,
GError *error);
/* --- */
G_END_DECLS
#endif /* __POLKIT_AGENT_AUTHENTICATION_AGENT_H */
src/polkitagent/polkitagentauthenticationsession.c deleted 100644 → 0
View file @ 2e5f1546
/*
* Copyright (C) 2008 Red Hat, Inc.
*
* 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., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*
* Author: David Zeuthen <davidz@redhat.com>
*/
/* TODO: This whole class needs to be rewritten so it uses the main loop etc. etc.
*
* And we REALLY REALLY really really should use signals instead of callbacks...
*/
/**
* SECTION:polkitagentauthenticationsession
* @title: PolkitAgentAuthenticationSession
* @short_description: Authentcation Sessions
*
* The #PolkitAgentAuthenticationSession class is used for implementing authentication agents.
*/
/* for getline(), see below */
#define _GNU_SOURCE
#include "config.h"
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <pwd.h>
#include "polkitagentauthenticationsession.h"
struct _PolkitAgentAuthenticationSession
{
GObject parent_instance;
gchar *cookie;
PolkitIdentity *identity;
int child_stdin;
int child_stdout;
GPid child_pid;
FILE *child_stdout_f;
int child_watch_id;
int io_watch_id;
gboolean success;
gboolean helper_is_running;
PolkitAgentAuthenticationSessionConversationPromptEchoOff func_prompt_echo_off;
PolkitAgentAuthenticationSessionConversationPromptEchoOn func_prompt_echo_on;
PolkitAgentAuthenticationSessionConversationErrorMessage func_error_message;
PolkitAgentAuthenticationSessionConversationTextInfo func_text_info;
PolkitAgentAuthenticationSessionDone func_done;
void *user_data;
};
struct _PolkitAgentAuthenticationSessionClass
{
GObjectClass parent_class;
};
G_DEFINE_TYPE (PolkitAgentAuthenticationSession, polkit_agent_authentication_session, G_TYPE_OBJECT);
static void
polkit_agent_authentication_session_init (PolkitAgentAuthenticationSession *session)
{
}
static void
polkit_agent_authentication_session_finalize (GObject *object)
{
PolkitAgentAuthenticationSession *session;
session = POLKIT_AGENT_AUTHENTICATION_SESSION (object);
g_free (session->cookie);
if (session->identity != NULL)
g_object_unref (session->identity);
if (G_OBJECT_CLASS (polkit_agent_authentication_session_parent_class)->finalize != NULL)
G_OBJECT_CLASS (polkit_agent_authentication_session_parent_class)->finalize (object);
}
static void
polkit_agent_authentication_session_class_init (PolkitAgentAuthenticationSessionClass *klass)
{
GObjectClass *gobject_class;
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = polkit_agent_authentication_session_finalize;
}
PolkitAgentAuthenticationSession *
polkit_agent_authentication_session_new (PolkitIdentity *identity,
const gchar *cookie)
{
PolkitAgentAuthenticationSession *session;
session = POLKIT_AGENT_AUTHENTICATION_SESSION (g_object_new (POLKIT_AGENT_TYPE_AUTHENTICATION_SESSION, NULL));
session->identity = g_object_ref (identity);
session->cookie = g_strdup (cookie);
return session;
}
void
polkit_agent_authentication_session_set_functions (PolkitAgentAuthenticationSession *session,
PolkitAgentAuthenticationSessionConversationPromptEchoOff func_prompt_echo_off,
PolkitAgentAuthenticationSessionConversationPromptEchoOn func_prompt_echo_on,
PolkitAgentAuthenticationSessionConversationErrorMessage func_error_message,
PolkitAgentAuthenticationSessionConversationTextInfo func_text_info,
PolkitAgentAuthenticationSessionDone func_done,
void *user_data)
{
session->func_prompt_echo_off = func_prompt_echo_off;
session->func_prompt_echo_on = func_prompt_echo_on;
session->func_error_message = func_error_message;
session->func_text_info = func_text_info;
session->func_done = func_done;
session->user_data = user_data;
}
static void
child_watch_func (GPid pid, gint status, gpointer user_data)
{
PolkitAgentAuthenticationSession *session = POLKIT_AGENT_AUTHENTICATION_SESSION (user_data);
gint exit_code;
gboolean input_was_bogus;
g_return_if_fail (session->helper_is_running);
exit_code = WEXITSTATUS (status);
g_debug ("pid %d terminated", pid);
waitpid (pid, &status, 0);
if (exit_code >= 2)
input_was_bogus = TRUE;
else
input_was_bogus = FALSE;
session->success = (exit_code == 0);
session->helper_is_running = FALSE;
session->func_done (session, session->success, input_was_bogus, session->user_data);
}
static gboolean
io_watch_have_data (GIOChannel *channel, GIOCondition condition, gpointer user_data)
{
PolkitAgentAuthenticationSession *session = POLKIT_AGENT_AUTHENTICATION_SESSION (user_data);
char *line;
size_t line_len;
gchar *id;
size_t id_len;
gchar *response;
gchar *response_prefix;
int fd;
g_return_val_if_fail (session->helper_is_running, FALSE);
fd = g_io_channel_unix_get_fd (channel);
line = NULL;
line_len = 0;
/* TODO: getline is GNU only, see kit_getline() in old polkit */
while (getline (&line, &line_len, session->child_stdout_f) != -1)
{
if (strlen (line) > 0 && line[strlen (line) - 1] == '\n')
line[strlen (line) - 1] = '\0';
response = NULL;
response_prefix = NULL;
id = "PAM_PROMPT_ECHO_OFF ";
if (g_str_has_prefix (line, id))
{
id_len = strlen (id);
response_prefix = "";
response = session->func_prompt_echo_off (session,
line + id_len,
session->user_data);
goto processed;
}
id = "PAM_PROMPT_ECHO_ON ";
if (g_str_has_prefix (line, id))
{
id_len = strlen (id);
response_prefix = "";
response = session->func_prompt_echo_on (session,
line + id_len,
session->user_data);
goto processed;
}
id = "PAM_ERROR_MSG ";
if (g_str_has_prefix (line, id))
{
id_len = strlen (id);
session->func_error_message (session,
line + id_len,
session->user_data);
goto processed;
}
id = "PAM_TEXT_INFO ";
if (g_str_has_prefix (line, id))
{
id_len = strlen (id);
session->func_text_info (session,
line + id_len,
session->user_data);
goto processed;
}
processed:
if (response != NULL && response_prefix != NULL)
{
char *buf;
gboolean add_newline;
/* add a newline if there isn't one already... */
add_newline = FALSE;
if (response[strlen (response) - 1] != '\n')
{
add_newline = TRUE;
}
buf = g_strdup_printf ("%s%s%c",
response_prefix,
response,
add_newline ? '\n' : '\0');
write (session->child_stdin, buf, strlen (buf));
g_free (buf);
g_free (response);
}
}
if (line != NULL)
free (line);
return FALSE;
}
gboolean
polkit_agent_authentication_session_initiate_auth (PolkitAgentAuthenticationSession *session)
{
uid_t uid;
GError *error;
gchar *helper_argv[4];
GIOChannel *channel;
gboolean ret;
struct passwd *passwd;
ret = FALSE;
/* TODO: also support authorization for other kinds of identities */
if (!POLKIT_IS_UNIX_USER (session->identity))
{
g_warning ("Unsupported identity type");
goto error;
}
uid = polkit_unix_user_get_uid (POLKIT_UNIX_USER (session->identity));
passwd = getpwuid (uid);
if (passwd == NULL)
{
g_warning ("No user with uid %d", uid);
goto error;
}
helper_argv[0] = PACKAGE_LIBEXEC_DIR "/polkit-agent-helper-1";
helper_argv[1] = passwd->pw_name;
helper_argv[2] = session->cookie;
helper_argv[3] = NULL;
session->child_stdin = -1;
session->child_stdout = -1;
error = NULL;
if (!g_spawn_async_with_pipes (NULL,
(char **) helper_argv,
NULL,
G_SPAWN_DO_NOT_REAP_CHILD |
0,//G_SPAWN_STDERR_TO_DEV_NULL,
NULL,
NULL,
&session->child_pid,
&session->child_stdin,
&session->child_stdout,
NULL,
&error))
{
g_warning ("Cannot spawn helper: %s\n", error->message);
g_error_free (error);
goto error;
}
session->child_watch_id = g_child_watch_add (session->child_pid, child_watch_func, session);
channel = g_io_channel_unix_new (session->child_stdout);
session->io_watch_id = g_io_add_watch (channel, G_IO_IN, io_watch_have_data, session);
g_io_channel_unref (channel);
/* so we can use getline... */
session->child_stdout_f = fdopen (session->child_stdout, "r");
session->success = FALSE;
session->helper_is_running = TRUE;
ret = TRUE;
error:
return ret;
}
void
polkit_agent_authentication_session_cancel (PolkitAgentAuthenticationSession *session)
{
GPid pid;
g_return_if_fail (session->helper_is_running);
pid = session->child_pid;
session->child_pid = 0;
if (pid > 0)
{
int status;
kill (pid, SIGTERM);
waitpid (pid, &status, 0);
session->helper_is_running = FALSE;
}
session->func_done (session, FALSE, FALSE, session->user_data);
}
src/polkitagent/polkitagentauthenticationsession.h deleted 100644 → 0
View file @ 2e5f1546
/*
* Copyright (C) 2008 Red Hat, Inc.
*
* 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., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*
* Author: David Zeuthen <davidz@redhat.com>
*/
#ifndef __POLKIT_AGENT_AUTHENTICATION_SESSION_H
#define __POLKIT_AGENT_AUTHENTICATION_SESSION_H
#include <polkit/polkit.h>
#include <polkitagent/polkitagenttypes.h>
G_BEGIN_DECLS
#define POLKIT_AGENT_TYPE_AUTHENTICATION_SESSION (polkit_agent_authentication_session_get_type())
#define POLKIT_AGENT_AUTHENTICATION_SESSION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), POLKIT_AGENT_TYPE_AUTHENTICATION_SESSION, PolkitAgentAuthenticationSession))
#define POLKIT_AGENT_AUTHENTICATION_SESSION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), POLKIT_AGENT_TYPE_AUTHENTICATION_SESSION, PolkitAgentAuthenticationSessionClass))
#define POLKIT_AGENT_AUTHENTICATION_SESSION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), POLKIT_AGENT_TYPE_AUTHENTICATION_SESSION, PolkitAgentAuthenticationSessionClass))
#define POLKIT_AGENT_IS_AUTHENTICATION_SESSION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), POLKIT_AGENT_TYPE_AUTHENTICATION_SESSION))
#define POLKIT_AGENT_IS_AUTHENTICATION_SESSION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), POLKIT_AGENT_TYPE_AUTHENTICATION_SESSION))
/**
* PolkitAgentAuthenticationSessionConversationPromptEchoOff:
* @session: A #PolkitAgentAuthenticationSession.
* @prompt: prompt passed by the authentication layer; do not free this string
* @user_data: user data pointer as passed into polkit_agent_authorization_session_set_functions()
*
* Type for callback function that is invoked when the authentication
* layer needs to ask the user a secret and the UI should NOT echo what
* the user types on the screen.
*
* Returns: the answer obtained from the user; must be allocated with
* malloc(3) and will be freed by the #PolkitAgentAuthenticationSession class.
**/
typedef char* (*PolkitAgentAuthenticationSessionConversationPromptEchoOff) (PolkitAgentAuthenticationSession *session,
const gchar *prompt,
gpointer user_data);
/**
* PolkitAgentAuthenticationSessionConversationPromptEchoOn:
* @session: A #PolkitAgentAuthenticationSession.
* @prompt: prompt passed by the authentication layer; do not free this string
* @user_data: user data pointer as passed into polkit_agent_authorization_session_set_functions()
*
* Type for callback function that is invoked when the authentication
* layer needs to ask the user a secret and the UI should echo what
* the user types on the screen.
*
* Returns: the answer obtained from the user; must be allocated with
* malloc(3) and will be freed by the #PolkitAgentAuthenticationSession class.
**/
typedef char* (*PolkitAgentAuthenticationSessionConversationPromptEchoOn) (PolkitAgentAuthenticationSession *session,
const gchar *prompt,
gpointer user_data);
/**
* PolkitAgentAuthenticationSessionConversationErrorMessage:
* @session: A #PolkitAgentAuthenticationSession.
* @error_message: error message passed by the authentication layer; do not free this string
* @user_data: user data pointer as passed into polkit_agent_authorization_session_set_functions()
*
* Type for callback function that is invoked when the authentication
* layer produces an error message that should be displayed in the UI.
**/
typedef void (*PolkitAgentAuthenticationSessionConversationErrorMessage) (PolkitAgentAuthenticationSession *session,
const gchar *error_message,
gpointer user_data);
/**
* PolkitAgentAuthenticationSessionConversationTextInfo:
* @session: A #PolkitAgentAuthenticationSession.
* @text_info: information passed by the authentication layer; do not free this string
* @user_data: user data pointer as passed into polkit_agent_authorization_session_set_functions()
*
* Type for callback function that is invoked when the authentication
* layer produces an informational message that should be displayed in
* the UI.
**/
typedef void (*PolkitAgentAuthenticationSessionConversationTextInfo) (PolkitAgentAuthenticationSession *session,
const gchar *text_info,
gpointer user_data);
/**
* PolkitAgentAuthenticationSessionDone:
* @session: A #PolkitAgentAuthenticationSession.
* @gained_authorization: whether the authorization was obtained
* @invalid_data: whether the input data was bogus (not including bad passwords)
* @user_data: user data pointer as passed into polkit_agent_authorization_session_set_functions()
*
* This function is called when the granting process ends; either if
* successful or if it was canceled using e.g. polkit_agent_authorization_session_cancel_auth().
**/
typedef void (*PolkitAgentAuthenticationSessionDone) (PolkitAgentAuthenticationSession *session,
gboolean gained_authorization,
gboolean invalid_data,
gpointer user_data);
#if 0
typedef struct _PolkitAgentAuthenticationSession PolkitAgentAuthenticationSession;
#endif
typedef struct _PolkitAgentAuthenticationSessionClass PolkitAgentAuthenticationSessionClass;
GType polkit_agent_authentication_session_get_type (void) G_GNUC_CONST;
PolkitAgentAuthenticationSession *polkit_agent_authentication_session_new (PolkitIdentity *identity,
const gchar *cookie);
/* TODO: would be much nicer to use signals here */
void polkit_agent_authentication_session_set_functions
(PolkitAgentAuthenticationSession *session,
PolkitAgentAuthenticationSessionConversationPromptEchoOff func_prompt_echo_off,
PolkitAgentAuthenticationSessionConversationPromptEchoOn func_prompt_echo_on,
PolkitAgentAuthenticationSessionConversationErrorMessage func_error_message,
PolkitAgentAuthenticationSessionConversationTextInfo func_text_info,
PolkitAgentAuthenticationSessionDone func_done,
void *user_data);
gboolean polkit_agent_authentication_session_initiate_auth (PolkitAgentAuthenticationSession *session);
void polkit_agent_authentication_session_cancel (PolkitAgentAuthenticationSession *session);
G_END_DECLS
#endif /* __POLKIT_AGENT_AUTHENTICATION_SESSION_H */
src/polkitagent/polkitagenthelper.c
View file @ 914df46f
......@@ -40,7 +40,7 @@
* sensitive information.
*/
#undef PAH_DEBUG
//#define PAH_DEBUG
#define PAH_DEBUG
static gboolean send_dbus_message (const char *cookie, const char *user);
......
src/polkitagent/polkitagentauthenticationagent.c → src/polkitagent/polkitagentlistener.c
View file @ 914df46f
......@@ -24,17 +24,29 @@
#include <polkit/polkitprivate.h>
#include "_polkitagentbindings.h"
#include "polkitagentauthenticationagent.h"
#include "polkitagentlistener.h"
/**
* SECTION:polkitagentauthenticationagent
* @title: PolkitAgentAuthenticationAgent
* @short_description: Authentication Agent
* SECTION:polkitagentlistener
* @title: PolkitAgentListener
* @short_description: Authentication Agent Listener
*
* The #PolkitAgentAuthenticationAgent class is used for implementing authentication agents.
* The #PolkitAgentListener is an abstract base class used for implementing authentication agents.