| From aa59c26b76954860b4c7f7e57d1d4b8b99ccfa6f Mon Sep 17 00:00:00 2001 |
| From: Richard Jones <rjones@redhat.com> |
| Date: Mon, 8 Jun 2015 11:56:57 +0200 |
| Subject: [PATCH 04/30] block/ssh: Propagate errors through authenticate() |
| |
| Message-id: <1433764620-20506-4-git-send-email-rjones@redhat.com> |
| Patchwork-id: 65478 |
| O-Subject: [RHEL-7.2 qemu-kvm PATCH 3/6] block/ssh: Propagate errors through authenticate() |
| Bugzilla: 1226683 |
| RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com> |
| RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com> |
| RH-Acked-by: Laszlo Ersek <lersek@redhat.com> |
| |
| From: Markus Armbruster <armbru@redhat.com> |
| |
| Signed-off-by: Markus Armbruster <armbru@redhat.com> |
| Reviewed-by: Richard W.M. Jones <rjones@redhat.com> |
| Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> |
| |
| Upstream-status: 4618e658e6dadd1ba53585157984eac71cb706c6 |
| Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| block/ssh.c | 23 ++++++++++++++--------- |
| 1 file changed, 14 insertions(+), 9 deletions(-) |
| |
| diff --git a/block/ssh.c b/block/ssh.c |
| index 6ffcff1..5908e6d 100644 |
| |
| |
| @@ -434,7 +434,7 @@ static int check_host_key(BDRVSSHState *s, const char *host, int port, |
| return -EINVAL; |
| } |
| |
| -static int authenticate(BDRVSSHState *s, const char *user) |
| +static int authenticate(BDRVSSHState *s, const char *user, Error **errp) |
| { |
| int r, ret; |
| const char *userauthlist; |
| @@ -445,7 +445,8 @@ static int authenticate(BDRVSSHState *s, const char *user) |
| userauthlist = libssh2_userauth_list(s->session, user, strlen(user)); |
| if (strstr(userauthlist, "publickey") == NULL) { |
| ret = -EPERM; |
| - error_report("remote server does not support \"publickey\" authentication"); |
| + error_setg(errp, |
| + "remote server does not support \"publickey\" authentication"); |
| goto out; |
| } |
| |
| @@ -453,17 +454,18 @@ static int authenticate(BDRVSSHState *s, const char *user) |
| agent = libssh2_agent_init(s->session); |
| if (!agent) { |
| ret = -EINVAL; |
| - session_error_report(s, "failed to initialize ssh-agent support"); |
| + session_error_setg(errp, s, "failed to initialize ssh-agent support"); |
| goto out; |
| } |
| if (libssh2_agent_connect(agent)) { |
| ret = -ECONNREFUSED; |
| - session_error_report(s, "failed to connect to ssh-agent"); |
| + session_error_setg(errp, s, "failed to connect to ssh-agent"); |
| goto out; |
| } |
| if (libssh2_agent_list_identities(agent)) { |
| ret = -EINVAL; |
| - session_error_report(s, "failed requesting identities from ssh-agent"); |
| + session_error_setg(errp, s, |
| + "failed requesting identities from ssh-agent"); |
| goto out; |
| } |
| |
| @@ -474,7 +476,8 @@ static int authenticate(BDRVSSHState *s, const char *user) |
| } |
| if (r < 0) { |
| ret = -EINVAL; |
| - session_error_report(s, "failed to obtain identity from ssh-agent"); |
| + session_error_setg(errp, s, |
| + "failed to obtain identity from ssh-agent"); |
| goto out; |
| } |
| r = libssh2_agent_userauth(agent, user, identity); |
| @@ -488,8 +491,8 @@ static int authenticate(BDRVSSHState *s, const char *user) |
| } |
| |
| ret = -EPERM; |
| - error_report("failed to authenticate using publickey authentication " |
| - "and the identities held by your ssh-agent"); |
| + error_setg(errp, "failed to authenticate using publickey authentication " |
| + "and the identities held by your ssh-agent"); |
| |
| out: |
| if (agent != NULL) { |
| @@ -577,8 +580,10 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options, |
| } |
| |
| /* Authenticate. */ |
| - ret = authenticate(s, user); |
| + ret = authenticate(s, user, &err); |
| if (ret < 0) { |
| + qerror_report_err(err); |
| + error_free(err); |
| goto err; |
| } |
| |
| -- |
| 1.8.3.1 |
| |