static struct agent_input_data vpnagent_input_handler[] = {
{ "OpenConnect.Cookie", false, "OpenConnect Cookie? ",
request_input_string_return },
+ { "OpenConnect.ServerCert", false,
+ "OpenConnect server certificate hash? ",
+ request_input_string_return },
+ { "OpenConnect.VPNHost", false, "OpenConnect VPN server? ",
+ request_input_string_return },
{ "Username", false, "VPN username? ", request_input_string_return },
{ "Password", false, "VPN password? ", request_input_string_return },
{ },
{
int i;
- if (input == NULL)
+ if (!input)
return -1;
for (i = 0; input[i] != '\0'; i++)
static char *strip_path(char *path)
{
char *name = strrchr(path, '/');
- if (name != NULL)
+ if (name)
name++;
else
name = path;
{
static char *path = NULL;
- if (path == NULL)
+ if (!path)
path = g_strdup_printf("/net/connman/connmanctl%d", getpid());
return path;
static void pending_message_remove(struct agent_data *request)
{
- if (request->message != NULL) {
+ if (request->message) {
dbus_message_unref(request->message);
request->message = NULL;
}
- if (request->reply != NULL) {
+ if (request->reply) {
dbus_message_unref(request->reply);
request->reply = NULL;
}
else
__connmanctl_agent_mode("", NULL, NULL);
- if (agent_request.message != NULL)
+ if (agent_request.message)
next_request = &agent_request;
- else if (vpn_agent_request.message != NULL)
+ else if (vpn_agent_request.message)
next_request = &vpn_agent_request;
- if (next_request == NULL)
+ if (!next_request)
return;
pending_message = next_request->message;
static bool handle_message(DBusMessage *message, struct agent_data *request,
GDBusMethodFunction function)
{
- if (agent_request.pending_function == NULL &&
- vpn_agent_request.pending_function == NULL)
+ if (!agent_request.pending_function &&
+ !vpn_agent_request.pending_function)
return true;
request->message = dbus_message_ref(message);
return NULL;
}
+static DBusMessage *agent_report_peer_error(DBusConnection *connection,
+ DBusMessage *message, void *user_data)
+{
+ struct agent_data *request = user_data;
+ char *path, *peer, *error;
+ DBusMessageIter iter;
+
+ if (handle_message(message, request,
+ agent_report_peer_error) == false)
+ return NULL;
+
+ dbus_message_iter_init(message, &iter);
+
+ dbus_message_iter_get_basic(&iter, &path);
+ peer = strip_path(path);
+
+ dbus_message_iter_next(&iter);
+ dbus_message_iter_get_basic(&iter, &error);
+
+ __connmanctl_save_rl();
+ fprintf(stdout, "Agent ReportPeerError %s\n", peer);
+ fprintf(stdout, " %s\n", error);
+ __connmanctl_redraw_rl();
+
+ request->message = dbus_message_ref(message);
+ __connmanctl_agent_mode("Retry (yes/no)? ",
+ report_error_return, request);
+ return NULL;
+}
+
static void request_input_next(struct agent_data *request)
{
int i;
- for (i = 0; request->input[i].attribute != NULL; i++) {
+ for (i = 0; request->input[i].attribute; i++) {
if (request->input[i].requested == true) {
- if(request->input[i].func != NULL)
+ if (request->input[i].func)
__connmanctl_agent_mode(request->input[i].prompt,
request->input[i].func,
request);
struct agent_data *request = user_data;
int len = 0;
- if (input != NULL)
+ if (input)
len = strlen(input);
if (len > 0 && len <= 32) {
/* TBD passphrase length checking */
- if (input != NULL)
+ if (input)
len = strlen(input);
if (len == 0 && request->input[WPS].requested == false)
struct agent_data *request = user_data;
int i;
- for (i = 0; request->input[i].attribute != NULL; i++) {
+ for (i = 0; request->input[i].attribute; i++) {
if (request->input[i].requested == true) {
request_input_append(request,
request->input[i].attribute, input);
request_input_next(request);
}
-static DBusMessage *agent_request_input(DBusConnection *connection,
- DBusMessage *message, void *user_data)
+static void parse_agent_request(struct agent_data *request,
+ DBusMessageIter *iter)
{
- struct agent_data *request = user_data;
- DBusMessageIter iter, dict, entry, variant;
- char *service, *str, *field;
- DBusMessageIter dict_entry, field_entry, field_value;
- char *argument, *value, *attr_type;
-
+ DBusMessageIter dict, entry, variant, dict_entry;
+ DBusMessageIter field_entry, field_value;
+ char *field, *argument, *value;
+ char *attr_type = NULL;
int i;
- if (handle_message(message, request, agent_request_input) == false)
- return NULL;
-
- dbus_message_iter_init(message, &iter);
-
- dbus_message_iter_get_basic(&iter, &str);
- service = strip_path(str);
-
- dbus_message_iter_next(&iter);
- dbus_message_iter_recurse(&iter, &dict);
-
- __connmanctl_save_rl();
- if (strcmp(request->interface, AGENT_INTERFACE) == 0)
- fprintf(stdout, "Agent RequestInput %s\n", service);
- else
- fprintf(stdout, "VPN Agent RequestInput %s\n", service);
- __connmanctl_dbus_print(&dict, " ", " = ", "\n");
- fprintf(stdout, "\n");
-
- dbus_message_iter_recurse(&iter, &dict);
+ dbus_message_iter_recurse(iter, &dict);
while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
dbus_message_iter_next(&dict_entry);
}
- for (i = 0; request->input[i].attribute != NULL; i++) {
+ for (i = 0; request->input[i].attribute; i++) {
if (strcmp(field, request->input[i].attribute) == 0) {
request->input[i].requested = true;
break;
dbus_message_iter_next(&dict);
}
+}
+
+static DBusMessage *agent_request_input(DBusConnection *connection,
+ DBusMessage *message, void *user_data)
+{
+ struct agent_data *request = user_data;
+ DBusMessageIter iter, dict;
+ char *service, *str;
+
+ if (handle_message(message, request, agent_request_input) == false)
+ return NULL;
+
+ dbus_message_iter_init(message, &iter);
+
+ dbus_message_iter_get_basic(&iter, &str);
+ service = strip_path(str);
+
+ dbus_message_iter_next(&iter);
+ dbus_message_iter_recurse(&iter, &dict);
+
+ __connmanctl_save_rl();
+ if (strcmp(request->interface, AGENT_INTERFACE) == 0)
+ fprintf(stdout, "Agent RequestInput %s\n", service);
+ else
+ fprintf(stdout, "VPN Agent RequestInput %s\n", service);
+ __connmanctl_dbus_print(&dict, " ", " = ", "\n");
+ fprintf(stdout, "\n");
+
+ parse_agent_request(request, &iter);
+
+ request->reply = dbus_message_new_method_return(message);
+ dbus_message_iter_init_append(request->reply, &request->iter);
+
+ dbus_message_iter_open_container(&request->iter, DBUS_TYPE_ARRAY,
+ DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
+ DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
+ DBUS_DICT_ENTRY_END_CHAR_AS_STRING,
+ &request->dict);
+
+ request_input_next(request);
+
+ return NULL;
+}
+
+static void request_authorization_return(char *input, void *user_data)
+{
+ struct agent_data *request = user_data;
+
+ switch (confirm_input(input)) {
+ case 1:
+ request->reply = dbus_message_new_method_return(
+ request->message);
+ dbus_message_iter_init_append(request->reply, &request->iter);
+
+ dbus_message_iter_open_container(&request->iter,
+ DBUS_TYPE_ARRAY,
+ DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
+ DBUS_TYPE_STRING_AS_STRING
+ DBUS_TYPE_VARIANT_AS_STRING
+ DBUS_DICT_ENTRY_END_CHAR_AS_STRING,
+ &request->dict);
+ dbus_message_iter_close_container(&request->iter,
+ &request->dict);
+ g_dbus_send_message(agent_connection, request->reply);
+ request->reply = NULL;
+ break;
+ case 0:
+ g_dbus_send_error(agent_connection, request->message,
+ "net.connman.Agent.Error.Rejected", NULL);
+ break;
+ default:
+ g_dbus_send_error(agent_connection, request->message,
+ "net.connman.Agent.Error.Canceled", NULL);
+ break;
+ }
+
+ pending_message_remove(request);
+ pending_command_complete("");
+}
+
+static DBusMessage *
+agent_request_peer_authorization(DBusConnection *connection,
+ DBusMessage *message, void *user_data)
+{
+ struct agent_data *request = user_data;
+ DBusMessageIter iter, dict;
+ char *peer, *str;
+ bool input;
+ int i;
+
+ if (handle_message(message, request, agent_request_peer_authorization)
+ == false)
+ return NULL;
+
+ dbus_message_iter_init(message, &iter);
+
+ dbus_message_iter_get_basic(&iter, &str);
+ peer = strip_path(str);
+
+ dbus_message_iter_next(&iter);
+ dbus_message_iter_recurse(&iter, &dict);
+
+ __connmanctl_save_rl();
+ fprintf(stdout, "Agent RequestPeerAuthorization %s\n", peer);
+ __connmanctl_dbus_print(&dict, " ", " = ", "\n");
+ fprintf(stdout, "\n");
+
+ parse_agent_request(request, &iter);
+
+ for (input = false, i = 0; request->input[i].attribute; i++) {
+ if (request->input[i].requested == true) {
+ input = true;
+ break;
+ }
+ }
+
+ if (!input) {
+ request->message = dbus_message_ref(message);
+ __connmanctl_agent_mode("Accept connection (yes/no)? ",
+ request_authorization_return, request);
+ return NULL;
+ }
request->reply = dbus_message_new_method_return(message);
dbus_message_iter_init_append(request->reply, &request->iter);
GDBUS_ARGS({ "service", "o" },
{ "error", "s" }),
NULL, agent_report_error) },
+ { GDBUS_ASYNC_METHOD("ReportPeerError",
+ GDBUS_ARGS({ "peer", "o" },
+ { "error", "s" }),
+ NULL, agent_report_peer_error) },
{ GDBUS_ASYNC_METHOD("RequestInput",
GDBUS_ARGS({ "service", "o" },
{ "fields", "a{sv}" }),
GDBUS_ARGS({ "fields", "a{sv}" }),
agent_request_input) },
+ { GDBUS_ASYNC_METHOD("RequestPeerAuthorization",
+ GDBUS_ARGS({ "peer", "o" },
+ { "fields", "a{sv}" }),
+ GDBUS_ARGS({ "fields", "a{sv}" }),
+ agent_request_peer_authorization) },
{ },
};
-static int agent_register_return(DBusMessageIter *iter, const char *error,
- void *user_data)
+static int agent_register_return(DBusMessageIter *iter, int errnum,
+ const char *error, void *user_data)
{
DBusConnection *connection = user_data;
- if (error != NULL) {
+ if (error) {
g_dbus_unregister_interface(connection, agent_path(),
AGENT_INTERFACE);
fprintf(stderr, "Error registering Agent: %s\n", error);
return -EINPROGRESS;
}
+static void append_path(DBusMessageIter *iter, void *user_data)
+{
+ const char *path = user_data;
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &path);
+}
+
int __connmanctl_agent_register(DBusConnection *connection)
{
char *path = agent_path();
agent_connection = connection;
- if (g_dbus_register_interface(connection, path,
+ if (!g_dbus_register_interface(connection, path,
AGENT_INTERFACE, agent_methods,
- NULL, NULL, &agent_request,
- NULL) == FALSE) {
+ NULL, NULL, &agent_request, NULL)) {
fprintf(stderr, "Error: Failed to register Agent callbacks\n");
return 0;
}
result = __connmanctl_dbus_method_call(connection, CONNMAN_SERVICE,
CONNMAN_PATH, "net.connman.Manager", "RegisterAgent",
- agent_register_return, connection,
- DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID);
+ agent_register_return, connection, append_path, path);
if (result != -EINPROGRESS) {
g_dbus_unregister_interface(connection, agent_path(),
return result;
}
-static int agent_unregister_return(DBusMessageIter *iter, const char *error,
- void *user_data)
+static int agent_unregister_return(DBusMessageIter *iter, int errnum,
+ const char *error, void *user_data)
{
- if (error != NULL) {
+ if (error) {
fprintf(stderr, "Error unregistering Agent: %s\n", error);
return 0;
}
result = __connmanctl_dbus_method_call(connection, CONNMAN_SERVICE,
CONNMAN_PATH, "net.connman.Manager", "UnregisterAgent",
- agent_unregister_return, NULL,
- DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID);
+ agent_unregister_return, NULL, append_path, path);
if (result != -EINPROGRESS)
fprintf(stderr, "Error: Failed to unregister Agent\n");
{ },
};
-static int vpn_agent_register_return(DBusMessageIter *iter, const char *error,
- void *user_data)
+static int vpn_agent_register_return(DBusMessageIter *iter, int errnum,
+ const char *error, void *user_data)
{
DBusConnection *connection = user_data;
- if (error != NULL) {
+ if (error) {
g_dbus_unregister_interface(connection, agent_path(),
VPN_AGENT_INTERFACE);
fprintf(stderr, "Error registering VPN Agent: %s\n", error);
agent_connection = connection;
- if (g_dbus_register_interface(connection, path,
- VPN_AGENT_INTERFACE, vpn_agent_methods,
- NULL, NULL, &vpn_agent_request,
- NULL) == FALSE) {
+ if (!g_dbus_register_interface(connection, path,
+ VPN_AGENT_INTERFACE, vpn_agent_methods,
+ NULL, NULL, &vpn_agent_request, NULL)) {
fprintf(stderr, "Error: Failed to register VPN Agent "
"callbacks\n");
return 0;
result = __connmanctl_dbus_method_call(connection, VPN_SERVICE,
VPN_PATH, "net.connman.vpn.Manager", "RegisterAgent",
- vpn_agent_register_return, connection,
- DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID);
+ vpn_agent_register_return, connection, append_path,
+ path);
if (result != -EINPROGRESS) {
g_dbus_unregister_interface(connection, agent_path(),
return result;
}
-static int vpn_agent_unregister_return(DBusMessageIter *iter,
+static int vpn_agent_unregister_return(DBusMessageIter *iter, int errnum,
const char *error, void *user_data)
{
- if (error != NULL) {
+ if (error) {
fprintf(stderr, "Error unregistering VPN Agent: %s\n", error);
return 0;
}
result = __connmanctl_dbus_method_call(connection, VPN_SERVICE,
VPN_PATH, "net.connman.vpn.Manager", "UnregisterAgent",
- vpn_agent_unregister_return, NULL,
- DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID);
+ vpn_agent_unregister_return, NULL, append_path, path);
if (result != -EINPROGRESS)
fprintf(stderr, "Error: Failed to unregister VPN Agent\n");