Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-25 17:59:25 +01:00
Code Releases Activity

client: Enable agent to query command-line options

Browse Source 
Enable agent to query the command-line options for the requested
credentials in non-interactive mode.
This commit is contained in:
Tim Kourt 2019-08-15 11:40:43 -07:00 committed by Denis Kenzior
parent c806e6a32a
commit cc7cab63d2
1 changed files with 85 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
client/agent.c
View File

@ -29,6 +29,7 @@
#include "agent.h" #include "agent.h"
#include "dbus-proxy.h" #include "dbus-proxy.h"
#include "display.h" #include "display.h"
#include "command.h"
#define IWD_AGENT_INTERFACE "net.connman.iwd.Agent" #define IWD_AGENT_INTERFACE "net.connman.iwd.Agent"
@ -49,6 +50,17 @@ static struct pending_op {
struct l_queue *saved_input; struct l_queue *saved_input;
} pending_op; } pending_op;
static struct l_dbus_message *agent_error(const char *text)
{
display_error(text);
command_set_exit_status(EXIT_FAILURE);
l_main_quit();
return NULL;
}
static struct l_dbus_message *release_method_call(struct l_dbus *dbus, static struct l_dbus_message *release_method_call(struct l_dbus *dbus,
struct l_dbus_message *message, struct l_dbus_message *message,
void *user_data) void *user_data)
@ -61,6 +73,24 @@ static struct l_dbus_message *release_method_call(struct l_dbus *dbus,
return l_dbus_message_new_method_return(message); return l_dbus_message_new_method_return(message);
} }
static struct l_dbus_message *request_passphrase_command_option(
struct l_dbus_message *message)
{
struct l_dbus_message *reply;
const char *passphrase;
passphrase = command_option_get(COMMAND_OPTION_PASSPHRASE);
if (!passphrase)
return agent_error("No passphrase is provided as "
"'--"COMMAND_OPTION_PASSPHRASE"' "
"command-line option.\n");
reply = l_dbus_message_new_method_return(message);
l_dbus_message_set_arguments(reply, "s", passphrase);
return reply;
}
static struct l_dbus_message *request_passphrase_method_call( static struct l_dbus_message *request_passphrase_method_call(
struct l_dbus *dbus, struct l_dbus *dbus,
struct l_dbus_message *message, struct l_dbus_message *message,
@ -72,6 +102,9 @@ static struct l_dbus_message *request_passphrase_method_call(
if (dbus_message_has_error(message)) if (dbus_message_has_error(message))
return NULL; return NULL;
if (!command_is_interactive_mode())
return request_passphrase_command_option(message);
l_dbus_message_get_arguments(message, "o", &path); l_dbus_message_get_arguments(message, "o", &path);
if (!path) if (!path)
return NULL; return NULL;
@ -103,6 +136,9 @@ static struct l_dbus_message *request_private_key_passphrase_method_call(
if (dbus_message_has_error(message)) if (dbus_message_has_error(message))
return NULL; return NULL;
if (!command_is_interactive_mode())
return request_passphrase_command_option(message);
l_dbus_message_get_arguments(message, "o", &path); l_dbus_message_get_arguments(message, "o", &path);
if (!path) if (!path)
return NULL; return NULL;
@ -123,6 +159,31 @@ static struct l_dbus_message *request_private_key_passphrase_method_call(
return NULL; return NULL;
} }
static struct l_dbus_message *request_username_and_password_command_option(
struct l_dbus_message *message)
{
struct l_dbus_message *reply;
const char *username;
const char *password;
username = command_option_get(COMMAND_OPTION_USERNAME);
if (!username)
return agent_error("No username is provided as "
"'--"COMMAND_OPTION_USERNAME"' "
"command-line option.\n");
password = command_option_get(COMMAND_OPTION_PASSWORD);
if (!password)
return agent_error("No password is provided as "
"'--"COMMAND_OPTION_PASSWORD"' "
"command-line option.\n");
reply = l_dbus_message_new_method_return(message);
l_dbus_message_set_arguments(reply, "ss", username, password);
return reply;
}
static struct l_dbus_message *request_username_and_password_method_call( static struct l_dbus_message *request_username_and_password_method_call(
struct l_dbus *dbus, struct l_dbus *dbus,
struct l_dbus_message *message, struct l_dbus_message *message,
@ -134,6 +195,9 @@ static struct l_dbus_message *request_username_and_password_method_call(
if (dbus_message_has_error(message)) if (dbus_message_has_error(message))
return NULL; return NULL;
if (!command_is_interactive_mode())
return request_username_and_password_command_option(message);
l_dbus_message_get_arguments(message, "o", &path); l_dbus_message_get_arguments(message, "o", &path);
if (!path) if (!path)
return NULL; return NULL;
@ -154,6 +218,24 @@ static struct l_dbus_message *request_username_and_password_method_call(
return NULL; return NULL;
} }
static struct l_dbus_message *request_user_password_command_option(
struct l_dbus_message *message)
{
struct l_dbus_message *reply;
const char *password;
password = command_option_get(COMMAND_OPTION_PASSWORD);
if (!password)
return agent_error("No password is provided as "
"'--"COMMAND_OPTION_PASSWORD"' "
"command-line option.\n");
reply = l_dbus_message_new_method_return(message);
l_dbus_message_set_arguments(reply, "s", password);
return reply;
}
static struct l_dbus_message *request_user_password_method_call( static struct l_dbus_message *request_user_password_method_call(
struct l_dbus *dbus, struct l_dbus *dbus,
struct l_dbus_message *message, struct l_dbus_message *message,
@ -167,6 +249,9 @@ static struct l_dbus_message *request_user_password_method_call(
if (dbus_message_has_error(message)) if (dbus_message_has_error(message))
return NULL; return NULL;
if (!command_is_interactive_mode())
return request_user_password_command_option(message);
l_dbus_message_get_arguments(message, "os", &path, &username); l_dbus_message_get_arguments(message, "os", &path, &username);
if (!path || !username) if (!path || !username)
return NULL; return NULL;