Commit 16e4bdb1 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

ssh: Use QAPI BlockdevOptionsSsh object 



Create a BlockdevOptionsSsh object in connect_to_ssh() and take the
options from there. 'host_key_check' is still processed separately
because it's not in the schema yet.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
parent 63fd65a0

block/ssh.c

+62 −75
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "qemu/sockets.h"

#include "qemu/uri.h"

#include "qapi/qapi-visit-sockets.h"

#include "qapi/qapi-visit-block-core.h"

#include "qapi/qmp/qdict.h"

#include "qapi/qmp/qstring.h"

#include "qapi/qobject-input-visitor.h"
@@ -543,21 +544,6 @@ static QemuOptsList ssh_runtime_opts = { 
            .type = QEMU_OPT_NUMBER,

            .help = "Port to connect to",

        },

        {

            .name = "path",

            .type = QEMU_OPT_STRING,

            .help = "Path of the image on the host",

        },

        {

            .name = "user",

            .type = QEMU_OPT_STRING,

            .help = "User as which to connect",

        },

        {

            .name = "host_key_check",

            .type = QEMU_OPT_STRING,

            .help = "Defines how and what to check the host key against",

        },

        { /* end of list */ }

    },

};
@@ -582,23 +568,31 @@ static bool ssh_process_legacy_socket_options(QDict *output_opts, 
    return true;

}



static InetSocketAddress *ssh_config(QDict *options, Error **errp)

static BlockdevOptionsSsh *ssh_parse_options(QDict *options, Error **errp)

{

    InetSocketAddress *inet = NULL;

    QDict *addr = NULL;

    QObject *crumpled_addr = NULL;

    Visitor *iv = NULL;

    Error *local_error = NULL;



    qdict_extract_subqdict(options, &addr, "server.");

    if (!qdict_size(addr)) {

        error_setg(errp, "SSH server address missing");

        goto out;

    BlockdevOptionsSsh *result = NULL;

    QemuOpts *opts = NULL;

    Error *local_err = NULL;

    QObject *crumpled;

    const QDictEntry *e;

    Visitor *v;



    /* Translate legacy options */

    opts = qemu_opts_create(&ssh_runtime_opts, NULL, 0, &error_abort);

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        goto fail;

    }



    crumpled_addr = qdict_crumple(addr, errp);

    if (!crumpled_addr) {

        goto out;

    if (!ssh_process_legacy_socket_options(options, opts, errp)) {

        goto fail;

    }



    /* Create the QAPI object */

    crumpled = qdict_crumple(options, errp);

    if (crumpled == NULL) {

        goto fail;

    }



    /*
@@ -609,51 +603,50 @@ static InetSocketAddress *ssh_config(QDict *options, Error **errp) 
     * but when they come from -drive, they're all QString.  The

     * visitor expects the former.

     */

    iv = qobject_input_visitor_new(crumpled_addr);

    visit_type_InetSocketAddress(iv, NULL, &inet, &local_error);

    if (local_error) {

        error_propagate(errp, local_error);

        goto out;

    v = qobject_input_visitor_new(crumpled);

    visit_type_BlockdevOptionsSsh(v, NULL, &result, &local_err);

    visit_free(v);

    qobject_decref(crumpled);



    if (local_err) {

        error_propagate(errp, local_err);

        goto fail;

    }



out:

    QDECREF(addr);

    qobject_decref(crumpled_addr);

    visit_free(iv);

    return inet;

    /* Remove the processed options from the QDict (the visitor processes

     * _all_ options in the QDict) */

    while ((e = qdict_first(options))) {

        qdict_del(options, e->key);

    }



fail:

    qemu_opts_del(opts);

    return result;

}



static int connect_to_ssh(BDRVSSHState *s, QDict *options,

                          int ssh_flags, int creat_mode, Error **errp)

{

    BlockdevOptionsSsh *opts;

    int r, ret;

    QemuOpts *opts = NULL;

    Error *local_err = NULL;

    const char *user, *path, *host_key_check;

    const char *user, *host_key_check;

    long port = 0;



    opts = qemu_opts_create(&ssh_runtime_opts, NULL, 0, &error_abort);

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (local_err) {

        ret = -EINVAL;

        error_propagate(errp, local_err);

        goto err;

    }



    if (!ssh_process_legacy_socket_options(options, opts, errp)) {

        ret = -EINVAL;

        goto err;

    host_key_check = qdict_get_try_str(options, "host_key_check");

    if (!host_key_check) {

        host_key_check = "yes";

    } else {

        qdict_del(options, "host_key_check");

    }



    path = qemu_opt_get(opts, "path");

    if (!path) {

        ret = -EINVAL;

        error_setg(errp, "No path was specified");

        goto err;

    opts = ssh_parse_options(options, errp);

    if (opts == NULL) {

        return -EINVAL;

    }



    user = qemu_opt_get(opts, "user");

    if (!user) {

    if (opts->has_user) {

        user = opts->user;

    } else {

        user = g_get_user_name();

        if (!user) {

            error_setg_errno(errp, errno, "Can't get user name");
@@ -662,17 +655,9 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options, 
        }

    }



    host_key_check = qemu_opt_get(opts, "host_key_check");

    if (!host_key_check) {

        host_key_check = "yes";

    }



    /* Pop the config into our state object, Exit if invalid */

    s->inet = ssh_config(options, errp);

    if (!s->inet) {

        ret = -EINVAL;

        goto err;

    }

    s->inet = opts->server;

    opts->server = NULL;



    if (qemu_strtol(s->inet->port, NULL, 10, &port) < 0) {

        error_setg(errp, "Use only numeric port value");
@@ -729,15 +714,17 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options, 


    /* Open the remote file. */

    DPRINTF("opening file %s flags=0x%x creat_mode=0%o",

            path, ssh_flags, creat_mode);

    s->sftp_handle = libssh2_sftp_open(s->sftp, path, ssh_flags, creat_mode);

            opts->path, ssh_flags, creat_mode);

    s->sftp_handle = libssh2_sftp_open(s->sftp, opts->path, ssh_flags,

                                       creat_mode);

    if (!s->sftp_handle) {

        session_error_setg(errp, s, "failed to open remote file '%s'", path);

        session_error_setg(errp, s, "failed to open remote file '%s'",

                           opts->path);

        ret = -EINVAL;

        goto err;

    }



    qemu_opts_del(opts);

    qapi_free_BlockdevOptionsSsh(opts);



    r = libssh2_sftp_fstat(s->sftp_handle, &s->attrs);

    if (r < 0) {
@@ -764,7 +751,7 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options, 
    }

    s->session = NULL;



    qemu_opts_del(opts);

    qapi_free_BlockdevOptionsSsh(opts);



    return ret;

}