#include <gcrypt.h>
#include "greeter.h"
-#include "ldm-marshal.h"
#include "configuration.h"
+enum {
+ PROP_0,
+ PROP_ACTIVE_USERNAME,
+};
+
enum {
CONNECTED,
CREATE_SESSION,
struct GreeterPrivate
{
- /* Session running on */
- Session *session;
-
/* PAM service to authenticate with */
gchar *pam_service;
gchar *autologin_pam_service;
/* Remote session name */
gchar *remote_session;
+ /* Currently selected user */
+ gchar *active_username;
+
/* PAM session being constructed by the greeter */
Session *authentication_session;
/* Communication channels to communicate with */
GIOChannel *to_greeter_channel;
GIOChannel *from_greeter_channel;
+ guint from_greeter_watch;
};
-G_DEFINE_TYPE (Greeter, greeter, G_TYPE_OBJECT);
+G_DEFINE_TYPE (Greeter, greeter, SESSION_TYPE);
/* Messages from the greeter to the server */
typedef enum
static gboolean read_cb (GIOChannel *source, GIOCondition condition, gpointer data);
Greeter *
-greeter_new (Session *session, const gchar *pam_service, const gchar *autologin_pam_service)
+greeter_new (void)
{
- Greeter *greeter;
+ return g_object_new (GREETER_TYPE, NULL);
+}
- greeter = g_object_new (GREETER_TYPE, NULL);
- greeter->priv->session = g_object_ref (session);
+void
+greeter_set_pam_services (Greeter *greeter, const gchar *pam_service, const gchar *autologin_pam_service)
+{
+ g_free (greeter->priv->pam_service);
greeter->priv->pam_service = g_strdup (pam_service);
+ g_free (greeter->priv->autologin_pam_service);
greeter->priv->autologin_pam_service = g_strdup (autologin_pam_service);
- greeter->priv->use_secure_memory = config_get_boolean (config_get_instance (), "LightDM", "lock-memory");
-
- return greeter;
}
void
g_io_channel_write_chars (greeter->priv->to_greeter_channel, (gchar *) message, message_length, NULL, &error);
if (error)
- g_warning ("Error writing to greeter: %s", error->message);
+ l_warning (greeter, "Error writing to greeter: %s", error->message);
g_clear_error (&error);
g_io_channel_flush (greeter->priv->to_greeter_channel, NULL);
}
GHashTableIter iter;
gpointer key, value;
- g_debug ("Greeter connected version=%s", version);
+ l_debug (greeter, "Greeter connected version=%s", version);
length = string_length (VERSION);
g_hash_table_iter_init (&iter, greeter->priv->hints);
messages_length = session_get_messages_length (session);
/* Respond to d-bus query with messages */
- g_debug ("Prompt greeter with %d message(s)", messages_length);
+ l_debug (greeter, "Prompt greeter with %d message(s)", messages_length);
size = int_length () + string_length (session_get_username (session)) + int_length ();
for (i = 0; i < messages_length; i++)
size += int_length () + string_length (messages[i].msg);
{
int result;
- g_debug ("Authenticate result for user %s: %s", session_get_username (session), session_get_authentication_result_string (session));
+ l_debug (greeter, "Authenticate result for user %s: %s", session_get_username (session), session_get_authentication_result_string (session));
result = session_get_authentication_result (session);
if (session_get_is_authenticated (session))
{
if (session_get_user (session))
- g_debug ("User %s authorized", session_get_username (session));
+ l_debug (greeter, "User %s authorized", session_get_username (session));
else
{
- g_debug ("User %s authorized, but no account of that name exists", session_get_username (session));
+ l_debug (greeter, "User %s authorized, but no account of that name exists", session_get_username (session));
result = PAM_USER_UNKNOWN;
}
}
if (username[0] == '\0')
{
- g_debug ("Greeter start authentication");
+ l_debug (greeter, "Greeter start authentication");
username = NULL;
}
else
- g_debug ("Greeter start authentication for %s", username);
+ l_debug (greeter, "Greeter start authentication for %s", username);
reset_session (greeter);
+ if (greeter->priv->active_username)
+ g_free (greeter->priv->active_username);
+ greeter->priv->active_username = g_strdup (username);
+ g_object_notify (G_OBJECT (greeter), "active-username");
+
greeter->priv->authentication_sequence_number = sequence_number;
g_signal_emit (greeter, signals[CREATE_SESSION], 0, &greeter->priv->authentication_session);
if (!greeter->priv->authentication_session)
static void
handle_login_as_guest (Greeter *greeter, guint32 sequence_number)
{
- g_debug ("Greeter start authentication for guest account");
+ l_debug (greeter, "Greeter start authentication for guest account");
reset_session (greeter);
if (!greeter->priv->allow_guest)
{
- g_debug ("Guest account is disabled");
+ l_debug (greeter, "Guest account is disabled");
send_end_authentication (greeter, sequence_number, "", PAM_USER_UNKNOWN);
return;
}
if (username[0] == '\0')
{
- g_debug ("Greeter start authentication for remote session %s", session_name);
+ l_debug (greeter, "Greeter start authentication for remote session %s", session_name);
username = NULL;
}
else
- g_debug ("Greeter start authentication for remote session %s as user %s", session_name, username);
+ l_debug (greeter, "Greeter start authentication for remote session %s as user %s", session_name, username);
reset_session (greeter);
return;
}
- g_debug ("Continue authentication");
+ l_debug (greeter, "Continue authentication");
/* Build response */
response = calloc (messages_length, sizeof (struct pam_response));
if (greeter->priv->authentication_session == NULL)
return;
- g_debug ("Cancel authentication");
+ l_debug (greeter, "Cancel authentication");
reset_session (greeter);
}
if (greeter->priv->guest_account_authenticated || session_get_is_authenticated (greeter->priv->authentication_session))
{
if (session)
- g_debug ("Greeter requests session %s", session);
+ l_debug (greeter, "Greeter requests session %s", session);
else
- g_debug ("Greeter requests default session");
+ l_debug (greeter, "Greeter requests default session");
greeter->priv->start_session = TRUE;
g_signal_emit (greeter, signals[START_SESSION], 0, session_type, session, &result);
}
else
{
- g_debug ("Ignoring start session request, user is not authorized");
+ l_debug (greeter, "Ignoring start session request, user is not authorized");
result = FALSE;
}
if (!greeter->priv->guest_account_authenticated && !session_get_is_authenticated (greeter->priv->authentication_session))
{
- g_debug ("Ignoring set language request, user is not authorized");
+ l_debug (greeter, "Ignoring set language request, user is not authorized");
return;
}
// FIXME: Could use this
if (greeter->priv->guest_account_authenticated)
{
- g_debug ("Ignoring set language request for guest user");
+ l_debug (greeter, "Ignoring set language request for guest user");
return;
}
- g_debug ("Greeter sets language %s", language);
+ l_debug (greeter, "Greeter sets language %s", language);
user = session_get_user (greeter->priv->authentication_session);
user_set_language (user, language);
}
guint8 *buffer;
if (greeter->priv->n_read - *offset < sizeof (guint32))
{
- g_warning ("Not enough space for int, need %zu, got %zu", sizeof (guint32), greeter->priv->n_read - *offset);
+ l_warning (greeter, "Not enough space for int, need %zu, got %zu", sizeof (guint32), greeter->priv->n_read - *offset);
return 0;
}
buffer = greeter->priv->read_buffer + *offset;
if (HEADER_SIZE + payload_length < HEADER_SIZE)
{
- g_warning ("Payload length of %u octets too long", payload_length);
+ l_warning (greeter, "Payload length of %u octets too long", payload_length);
return HEADER_SIZE;
}
length = read_int (greeter, offset);
if (greeter->priv->n_read - *offset < length)
{
- g_warning ("Not enough space for string, need %u, got %zu", length, greeter->priv->n_read - *offset);
+ l_warning (greeter, "Not enough space for string, need %u, got %zu", length, greeter->priv->n_read - *offset);
return g_strdup ("");
}
if (condition == G_IO_HUP)
{
- g_debug ("Greeter closed communication channel");
+ l_debug (greeter, "Greeter closed communication channel");
return FALSE;
}
&n_read,
&error);
if (error)
- g_warning ("Error reading from greeter: %s", error->message);
+ l_warning (greeter, "Error reading from greeter: %s", error->message);
g_clear_error (&error);
if (status != G_IO_STATUS_NORMAL)
return TRUE;
max_secrets = (G_MAXUINT32 - 1) / sizeof (gchar *);
if (n_secrets > max_secrets)
{
- g_warning ("Array length of %u elements too long", n_secrets);
+ l_warning (greeter, "Array length of %u elements too long", n_secrets);
return FALSE;
}
secrets = g_malloc (sizeof (gchar *) * (n_secrets + 1));
g_free (language);
break;
default:
- g_warning ("Unknown message from greeter: %d", id);
+ l_warning (greeter, "Unknown message from greeter: %d", id);
break;
}
return TRUE;
}
-Session *
-greeter_get_session (Greeter *greeter)
-{
- g_return_val_if_fail (greeter != NULL, NULL);
- return greeter->priv->session;
-}
-
gboolean
greeter_get_guest_authenticated (Greeter *greeter)
{
return greeter->priv->start_session;
}
-gboolean
-greeter_start (Greeter *greeter)
+const gchar *
+greeter_get_active_username (Greeter *greeter)
+{
+ g_return_val_if_fail (greeter != NULL, NULL);
+ return greeter->priv->active_username;
+}
+
+static gboolean
+greeter_start (Session *session)
{
+ Greeter *greeter = GREETER (session);
int to_greeter_pipe[2], from_greeter_pipe[2];
gboolean result = FALSE;
gchar *value;
greeter->priv->from_greeter_channel = g_io_channel_unix_new (from_greeter_pipe[0]);
g_io_channel_set_encoding (greeter->priv->from_greeter_channel, NULL, NULL);
g_io_channel_set_buffered (greeter->priv->from_greeter_channel, FALSE);
- g_io_add_watch (greeter->priv->from_greeter_channel, G_IO_IN | G_IO_HUP, read_cb, greeter);
+ greeter->priv->from_greeter_watch = g_io_add_watch (greeter->priv->from_greeter_channel, G_IO_IN | G_IO_HUP, read_cb, greeter);
/* Let the greeter session know how to communicate with the daemon */
value = g_strdup_printf ("%d", from_greeter_pipe[1]);
- session_set_env (greeter->priv->session, "LIGHTDM_TO_SERVER_FD", value);
+ session_set_env (SESSION (greeter), "LIGHTDM_TO_SERVER_FD", value);
g_free (value);
value = g_strdup_printf ("%d", to_greeter_pipe[0]);
- session_set_env (greeter->priv->session, "LIGHTDM_FROM_SERVER_FD", value);
+ session_set_env (SESSION (greeter), "LIGHTDM_FROM_SERVER_FD", value);
g_free (value);
/* Don't allow the daemon end of the pipes to be accessed in child processes */
fcntl (to_greeter_pipe[1], F_SETFD, FD_CLOEXEC);
fcntl (from_greeter_pipe[0], F_SETFD, FD_CLOEXEC);
- result = session_start (greeter->priv->session);
+ result = SESSION_CLASS (greeter_parent_class)->start (session);
/* Close the session ends of the pipe */
close (to_greeter_pipe[0]);
return FALSE;
}
+static void
+greeter_stop (Session *session)
+{
+ Greeter *greeter = GREETER (session);
+
+ /* Stop any events occurring after we've stopped */
+ if (greeter->priv->authentication_session)
+ g_signal_handlers_disconnect_matched (greeter->priv->authentication_session, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, greeter);
+
+ SESSION_CLASS (greeter_parent_class)->stop (session);
+}
+
static void
greeter_init (Greeter *greeter)
{
greeter->priv = G_TYPE_INSTANCE_GET_PRIVATE (greeter, GREETER_TYPE, GreeterPrivate);
greeter->priv->read_buffer = secure_malloc (greeter, HEADER_SIZE);
greeter->priv->hints = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+ greeter->priv->use_secure_memory = config_get_boolean (config_get_instance (), "LightDM", "lock-memory");
}
static void
self = GREETER (object);
- g_signal_handlers_disconnect_matched (self->priv->session, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, self);
- g_object_unref (self->priv->session);
g_free (self->priv->pam_service);
g_free (self->priv->autologin_pam_service);
secure_free (self, self->priv->read_buffer);
g_hash_table_unref (self->priv->hints);
g_free (self->priv->remote_session);
+ g_free (self->priv->active_username);
if (self->priv->authentication_session)
{
g_signal_handlers_disconnect_matched (self->priv->authentication_session, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, self);
g_io_channel_unref (self->priv->to_greeter_channel);
if (self->priv->from_greeter_channel)
g_io_channel_unref (self->priv->from_greeter_channel);
+ if (self->priv->from_greeter_watch)
+ g_source_remove (self->priv->from_greeter_watch);
G_OBJECT_CLASS (greeter_parent_class)->finalize (object);
}
+static void
+greeter_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+}
+
+static void
+greeter_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ Greeter *greeter = GREETER (object);
+
+ switch (prop_id) {
+ case PROP_ACTIVE_USERNAME:
+ g_value_set_string (value, greeter_get_active_username (greeter));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
static void
greeter_class_init (GreeterClass *klass)
{
+ SessionClass *session_class = SESSION_CLASS (klass);
GObjectClass *object_class = G_OBJECT_CLASS (klass);
klass->create_session = greeter_real_create_session;
klass->start_session = greeter_real_start_session;
+ session_class->start = greeter_start;
+ session_class->stop = greeter_stop;
object_class->finalize = greeter_finalize;
+ object_class->get_property = greeter_get_property;
+ object_class->set_property = greeter_set_property;
signals[CONNECTED] =
g_signal_new ("connected",
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GreeterClass, connected),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
signals[CREATE_SESSION] =
G_STRUCT_OFFSET (GreeterClass, create_session),
g_signal_accumulator_first_wins,
NULL,
- ldm_marshal_OBJECT__VOID,
+ NULL,
SESSION_TYPE, 0);
signals[START_SESSION] =
G_STRUCT_OFFSET (GreeterClass, start_session),
g_signal_accumulator_true_handled,
NULL,
- ldm_marshal_BOOLEAN__INT_STRING,
+ NULL,
G_TYPE_BOOLEAN, 2, G_TYPE_INT, G_TYPE_STRING);
+ g_object_class_install_property (object_class,
+ PROP_ACTIVE_USERNAME,
+ g_param_spec_string ("active-username",
+ "active-username",
+ "Active username",
+ NULL,
+ G_PARAM_READABLE));
+
g_type_class_add_private (klass, sizeof (GreeterPrivate));
}
projects / sojka / lightdm.git / blobdiff