2012-02-24 18:48:55 +00:00
|
|
|
/*
|
|
|
|
* viruri.c: URI parsing wrappers for libxml2 functions
|
|
|
|
*
|
|
|
|
* Copyright (C) 2012 Red Hat, Inc.
|
|
|
|
*
|
2012-07-27 09:39:53 +00:00
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; If not, see
|
|
|
|
* <http://www.gnu.org/licenses/>.
|
2012-02-24 18:48:55 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
#include "viruri.h"
|
|
|
|
|
|
|
|
#include "memory.h"
|
|
|
|
#include "util.h"
|
Centralize error reporting for URI parsing/formatting problems
Move error reporting out of the callers, into virURIParse
and virURIFormat, to get consistency.
* include/libvirt/virterror.h, src/util/virterror.c: Add VIR_FROM_URI
* src/util/viruri.c, src/util/viruri.h: Add error reporting
* src/esx/esx_driver.c, src/libvirt.c, src/libxl/libxl_driver.c,
src/lxc/lxc_driver.c, src/openvz/openvz_driver.c,
src/qemu/qemu_driver.c, src/qemu/qemu_migration.c,
src/remote/remote_driver.c, src/uml/uml_driver.c,
src/vbox/vbox_tmpl.c, src/vmx/vmx.c, src/xen/xen_driver.c,
src/xen/xend_internal.c, tests/viruritest.c: Remove error
reporting
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-03-20 12:16:54 +00:00
|
|
|
#include "virterror_internal.h"
|
2012-03-20 13:59:32 +00:00
|
|
|
#include "buf.h"
|
Centralize error reporting for URI parsing/formatting problems
Move error reporting out of the callers, into virURIParse
and virURIFormat, to get consistency.
* include/libvirt/virterror.h, src/util/virterror.c: Add VIR_FROM_URI
* src/util/viruri.c, src/util/viruri.h: Add error reporting
* src/esx/esx_driver.c, src/libvirt.c, src/libxl/libxl_driver.c,
src/lxc/lxc_driver.c, src/openvz/openvz_driver.c,
src/qemu/qemu_driver.c, src/qemu/qemu_migration.c,
src/remote/remote_driver.c, src/uml/uml_driver.c,
src/vbox/vbox_tmpl.c, src/vmx/vmx.c, src/xen/xen_driver.c,
src/xen/xend_internal.c, tests/viruritest.c: Remove error
reporting
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-03-20 12:16:54 +00:00
|
|
|
|
|
|
|
#define VIR_FROM_THIS VIR_FROM_URI
|
|
|
|
|
2012-03-20 13:59:32 +00:00
|
|
|
static int
|
|
|
|
virURIParamAppend(virURIPtr uri,
|
|
|
|
const char *name,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
char *pname = NULL;
|
|
|
|
char *pvalue = NULL;
|
|
|
|
|
|
|
|
if (!(pname = strdup(name)))
|
|
|
|
goto no_memory;
|
|
|
|
if (!(pvalue = strdup (value)))
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (VIR_RESIZE_N(uri->params, uri->paramsAlloc, uri->paramsCount, 1) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
uri->params[uri->paramsCount].name = pname;
|
|
|
|
uri->params[uri->paramsCount].value = pvalue;
|
|
|
|
uri->params[uri->paramsCount].ignore = 0;
|
|
|
|
uri->paramsCount++;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
no_memory:
|
|
|
|
VIR_FREE(pname);
|
|
|
|
VIR_FREE(pvalue);
|
|
|
|
virReportOOMError();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
virURIParseParams(virURIPtr uri)
|
|
|
|
{
|
|
|
|
const char *end, *eq;
|
|
|
|
const char *query = uri->query;
|
|
|
|
|
|
|
|
if (!query || query[0] == '\0')
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
while (*query) {
|
|
|
|
char *name = NULL, *value = NULL;
|
|
|
|
|
|
|
|
/* Find the next separator, or end of the string. */
|
|
|
|
end = strchr (query, '&');
|
|
|
|
if (!end)
|
|
|
|
end = strchr (query, ';');
|
|
|
|
if (!end)
|
|
|
|
end = query + strlen (query);
|
|
|
|
|
|
|
|
/* Find the first '=' character between here and end. */
|
|
|
|
eq = strchr (query, '=');
|
|
|
|
if (eq && eq >= end) eq = NULL;
|
|
|
|
|
|
|
|
/* Empty section (eg. "&&"). */
|
|
|
|
if (end == query)
|
|
|
|
goto next;
|
|
|
|
|
|
|
|
/* If there is no '=' character, then we have just "name"
|
|
|
|
* and consistent with CGI.pm we assume value is "".
|
|
|
|
*/
|
|
|
|
else if (!eq) {
|
|
|
|
name = xmlURIUnescapeString (query, end - query, NULL);
|
|
|
|
if (!name) goto no_memory;
|
|
|
|
}
|
|
|
|
/* Or if we have "name=" here (works around annoying
|
|
|
|
* problem when calling xmlURIUnescapeString with len = 0).
|
|
|
|
*/
|
|
|
|
else if (eq+1 == end) {
|
|
|
|
name = xmlURIUnescapeString (query, eq - query, NULL);
|
|
|
|
if (!name) goto no_memory;
|
|
|
|
}
|
|
|
|
/* If the '=' character is at the beginning then we have
|
|
|
|
* "=value" and consistent with CGI.pm we _ignore_ this.
|
|
|
|
*/
|
|
|
|
else if (query == eq)
|
|
|
|
goto next;
|
|
|
|
|
|
|
|
/* Otherwise it's "name=value". */
|
|
|
|
else {
|
|
|
|
name = xmlURIUnescapeString (query, eq - query, NULL);
|
|
|
|
if (!name)
|
|
|
|
goto no_memory;
|
|
|
|
value = xmlURIUnescapeString (eq+1, end - (eq+1), NULL);
|
|
|
|
if (!value) {
|
|
|
|
VIR_FREE(name);
|
|
|
|
goto no_memory;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Append to the parameter set. */
|
|
|
|
if (virURIParamAppend(uri, name, value ? value : "") < 0) {
|
|
|
|
VIR_FREE(name);
|
|
|
|
VIR_FREE(value);
|
|
|
|
goto no_memory;
|
|
|
|
}
|
|
|
|
VIR_FREE(name);
|
|
|
|
VIR_FREE(value);
|
|
|
|
|
|
|
|
next:
|
|
|
|
query = end;
|
|
|
|
if (*query) query ++; /* skip '&' separator */
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
no_memory:
|
|
|
|
virReportOOMError();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-02-24 18:48:55 +00:00
|
|
|
/**
|
|
|
|
* virURIParse:
|
|
|
|
* @uri: URI to parse
|
|
|
|
*
|
|
|
|
* Wrapper for xmlParseURI
|
|
|
|
*
|
|
|
|
* Unfortunately there are few things that should be managed after
|
|
|
|
* parsing the URI. Fortunately there is only one thing now and its
|
|
|
|
* removing of square brackets around IPv6 addresses.
|
|
|
|
*
|
|
|
|
* @returns the parsed uri object with some fixes
|
|
|
|
*/
|
|
|
|
virURIPtr
|
|
|
|
virURIParse(const char *uri)
|
|
|
|
{
|
2012-03-20 13:33:41 +00:00
|
|
|
xmlURIPtr xmluri;
|
|
|
|
virURIPtr ret = NULL;
|
2012-02-24 18:48:55 +00:00
|
|
|
|
2012-03-20 13:33:41 +00:00
|
|
|
xmluri = xmlParseURI(uri);
|
|
|
|
|
|
|
|
if (!xmluri) {
|
Centralize error reporting for URI parsing/formatting problems
Move error reporting out of the callers, into virURIParse
and virURIFormat, to get consistency.
* include/libvirt/virterror.h, src/util/virterror.c: Add VIR_FROM_URI
* src/util/viruri.c, src/util/viruri.h: Add error reporting
* src/esx/esx_driver.c, src/libvirt.c, src/libxl/libxl_driver.c,
src/lxc/lxc_driver.c, src/openvz/openvz_driver.c,
src/qemu/qemu_driver.c, src/qemu/qemu_migration.c,
src/remote/remote_driver.c, src/uml/uml_driver.c,
src/vbox/vbox_tmpl.c, src/vmx/vmx.c, src/xen/xen_driver.c,
src/xen/xend_internal.c, tests/viruritest.c: Remove error
reporting
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-03-20 12:16:54 +00:00
|
|
|
/* libxml2 does not tell us what failed. Grr :-( */
|
2012-07-18 10:26:24 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Unable to parse URI %s"), uri);
|
Centralize error reporting for URI parsing/formatting problems
Move error reporting out of the callers, into virURIParse
and virURIFormat, to get consistency.
* include/libvirt/virterror.h, src/util/virterror.c: Add VIR_FROM_URI
* src/util/viruri.c, src/util/viruri.h: Add error reporting
* src/esx/esx_driver.c, src/libvirt.c, src/libxl/libxl_driver.c,
src/lxc/lxc_driver.c, src/openvz/openvz_driver.c,
src/qemu/qemu_driver.c, src/qemu/qemu_migration.c,
src/remote/remote_driver.c, src/uml/uml_driver.c,
src/vbox/vbox_tmpl.c, src/vmx/vmx.c, src/xen/xen_driver.c,
src/xen/xend_internal.c, tests/viruritest.c: Remove error
reporting
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-03-20 12:16:54 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2012-03-20 13:33:41 +00:00
|
|
|
if (VIR_ALLOC(ret) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (xmluri->scheme &&
|
|
|
|
!(ret->scheme = strdup(xmluri->scheme)))
|
|
|
|
goto no_memory;
|
|
|
|
if (xmluri->server &&
|
|
|
|
!(ret->server = strdup(xmluri->server)))
|
|
|
|
goto no_memory;
|
|
|
|
ret->port = xmluri->port;
|
|
|
|
if (xmluri->path &&
|
|
|
|
!(ret->path = strdup(xmluri->path)))
|
|
|
|
goto no_memory;
|
|
|
|
#ifdef HAVE_XMLURI_QUERY_RAW
|
|
|
|
if (xmluri->query_raw &&
|
|
|
|
!(ret->query = strdup(xmluri->query_raw)))
|
|
|
|
goto no_memory;
|
|
|
|
#else
|
|
|
|
if (xmluri->query &&
|
|
|
|
!(ret->query = strdup(xmluri->query)))
|
|
|
|
goto no_memory;
|
|
|
|
#endif
|
|
|
|
if (xmluri->fragment &&
|
|
|
|
!(ret->fragment = strdup(xmluri->fragment)))
|
|
|
|
goto no_memory;
|
2012-04-05 15:52:42 +00:00
|
|
|
if (xmluri->user &&
|
|
|
|
!(ret->user = strdup(xmluri->user)))
|
|
|
|
goto no_memory;
|
2012-03-20 13:33:41 +00:00
|
|
|
|
2012-02-24 18:48:55 +00:00
|
|
|
/* First check: does it even make sense to jump inside */
|
Centralize error reporting for URI parsing/formatting problems
Move error reporting out of the callers, into virURIParse
and virURIFormat, to get consistency.
* include/libvirt/virterror.h, src/util/virterror.c: Add VIR_FROM_URI
* src/util/viruri.c, src/util/viruri.h: Add error reporting
* src/esx/esx_driver.c, src/libvirt.c, src/libxl/libxl_driver.c,
src/lxc/lxc_driver.c, src/openvz/openvz_driver.c,
src/qemu/qemu_driver.c, src/qemu/qemu_migration.c,
src/remote/remote_driver.c, src/uml/uml_driver.c,
src/vbox/vbox_tmpl.c, src/vmx/vmx.c, src/xen/xen_driver.c,
src/xen/xend_internal.c, tests/viruritest.c: Remove error
reporting
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-03-20 12:16:54 +00:00
|
|
|
if (ret->server != NULL &&
|
2012-02-24 18:48:55 +00:00
|
|
|
ret->server[0] == '[') {
|
|
|
|
size_t length = strlen(ret->server);
|
|
|
|
|
|
|
|
/* We want to modify the server string only if there are
|
|
|
|
* square brackets on both ends and inside there is IPv6
|
|
|
|
* address. Otherwise we could make a mistake by modifying
|
|
|
|
* something other than an IPv6 address. */
|
|
|
|
if (ret->server[length - 1] == ']' && strchr(ret->server, ':')) {
|
|
|
|
memmove(&ret->server[0], &ret->server[1], length - 2);
|
|
|
|
ret->server[length - 2] = '\0';
|
|
|
|
}
|
|
|
|
/* Even after such modification, it is completely ok to free
|
|
|
|
* the uri with xmlFreeURI() */
|
|
|
|
}
|
|
|
|
|
2012-03-20 13:59:32 +00:00
|
|
|
if (virURIParseParams(ret) < 0)
|
|
|
|
goto error;
|
|
|
|
|
2012-03-20 13:33:41 +00:00
|
|
|
xmlFreeURI(xmluri);
|
|
|
|
|
2012-02-24 18:48:55 +00:00
|
|
|
return ret;
|
2012-03-20 13:33:41 +00:00
|
|
|
|
|
|
|
no_memory:
|
|
|
|
virReportOOMError();
|
2012-03-20 13:59:32 +00:00
|
|
|
error:
|
2012-03-20 13:33:41 +00:00
|
|
|
xmlFreeURI(xmluri);
|
|
|
|
virURIFree(ret);
|
|
|
|
return NULL;
|
2012-02-24 18:48:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virURIFormat:
|
|
|
|
* @uri: URI to format
|
|
|
|
*
|
|
|
|
* Wrapper for xmlSaveUri
|
|
|
|
*
|
|
|
|
* This function constructs back everything that @ref virURIParse
|
|
|
|
* changes after parsing
|
|
|
|
*
|
|
|
|
* @returns the constructed uri as a string
|
|
|
|
*/
|
|
|
|
char *
|
2012-03-20 13:37:55 +00:00
|
|
|
virURIFormat(virURIPtr uri)
|
2012-02-24 18:48:55 +00:00
|
|
|
{
|
2012-03-20 13:33:41 +00:00
|
|
|
xmlURI xmluri;
|
2012-02-24 18:48:55 +00:00
|
|
|
char *tmpserver = NULL;
|
|
|
|
char *ret;
|
|
|
|
|
2012-03-20 13:33:41 +00:00
|
|
|
memset(&xmluri, 0, sizeof(xmluri));
|
|
|
|
|
|
|
|
xmluri.scheme = uri->scheme;
|
|
|
|
xmluri.server = uri->server;
|
|
|
|
xmluri.port = uri->port;
|
|
|
|
xmluri.path = uri->path;
|
2012-03-26 10:23:45 +00:00
|
|
|
#ifdef HAVE_XMLURI_QUERY_RAW
|
|
|
|
xmluri.query_raw = uri->query;
|
|
|
|
#else
|
2012-03-20 13:33:41 +00:00
|
|
|
xmluri.query = uri->query;
|
2012-03-26 10:23:45 +00:00
|
|
|
#endif
|
2012-03-20 13:33:41 +00:00
|
|
|
xmluri.fragment = uri->fragment;
|
2012-04-05 15:52:42 +00:00
|
|
|
xmluri.user = uri->user;
|
2012-03-20 13:33:41 +00:00
|
|
|
|
2012-02-24 18:48:55 +00:00
|
|
|
/* First check: does it make sense to do anything */
|
2012-03-20 13:33:41 +00:00
|
|
|
if (xmluri.server != NULL &&
|
|
|
|
strchr(xmluri.server, ':') != NULL) {
|
2012-02-24 18:48:55 +00:00
|
|
|
|
2012-03-26 10:23:45 +00:00
|
|
|
if (virAsprintf(&tmpserver, "[%s]", xmluri.server) < 0) {
|
|
|
|
virReportOOMError();
|
2012-02-24 18:48:55 +00:00
|
|
|
return NULL;
|
2012-03-26 10:23:45 +00:00
|
|
|
}
|
2012-02-24 18:48:55 +00:00
|
|
|
|
2012-03-20 13:33:41 +00:00
|
|
|
xmluri.server = tmpserver;
|
2012-02-24 18:48:55 +00:00
|
|
|
}
|
|
|
|
|
2012-03-20 13:33:41 +00:00
|
|
|
ret = (char *)xmlSaveUri(&xmluri);
|
Centralize error reporting for URI parsing/formatting problems
Move error reporting out of the callers, into virURIParse
and virURIFormat, to get consistency.
* include/libvirt/virterror.h, src/util/virterror.c: Add VIR_FROM_URI
* src/util/viruri.c, src/util/viruri.h: Add error reporting
* src/esx/esx_driver.c, src/libvirt.c, src/libxl/libxl_driver.c,
src/lxc/lxc_driver.c, src/openvz/openvz_driver.c,
src/qemu/qemu_driver.c, src/qemu/qemu_migration.c,
src/remote/remote_driver.c, src/uml/uml_driver.c,
src/vbox/vbox_tmpl.c, src/vmx/vmx.c, src/xen/xen_driver.c,
src/xen/xend_internal.c, tests/viruritest.c: Remove error
reporting
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-03-20 12:16:54 +00:00
|
|
|
if (!ret) {
|
|
|
|
virReportOOMError();
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2012-02-24 18:48:55 +00:00
|
|
|
|
Centralize error reporting for URI parsing/formatting problems
Move error reporting out of the callers, into virURIParse
and virURIFormat, to get consistency.
* include/libvirt/virterror.h, src/util/virterror.c: Add VIR_FROM_URI
* src/util/viruri.c, src/util/viruri.h: Add error reporting
* src/esx/esx_driver.c, src/libvirt.c, src/libxl/libxl_driver.c,
src/lxc/lxc_driver.c, src/openvz/openvz_driver.c,
src/qemu/qemu_driver.c, src/qemu/qemu_migration.c,
src/remote/remote_driver.c, src/uml/uml_driver.c,
src/vbox/vbox_tmpl.c, src/vmx/vmx.c, src/xen/xen_driver.c,
src/xen/xend_internal.c, tests/viruritest.c: Remove error
reporting
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-03-20 12:16:54 +00:00
|
|
|
cleanup:
|
2012-03-20 13:33:41 +00:00
|
|
|
VIR_FREE(tmpserver);
|
2012-02-24 18:48:55 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2012-03-20 11:59:42 +00:00
|
|
|
|
|
|
|
|
2012-03-20 13:59:32 +00:00
|
|
|
char *virURIFormatParams(virURIPtr uri)
|
|
|
|
{
|
|
|
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
|
|
|
int i, amp = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < uri->paramsCount; ++i) {
|
|
|
|
if (!uri->params[i].ignore) {
|
|
|
|
if (amp) virBufferAddChar (&buf, '&');
|
|
|
|
virBufferStrcat (&buf, uri->params[i].name, "=", NULL);
|
|
|
|
virBufferURIEncodeString (&buf, uri->params[i].value);
|
|
|
|
amp = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (virBufferError(&buf)) {
|
|
|
|
virBufferFreeAndReset(&buf);
|
|
|
|
virReportOOMError();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return virBufferContentAndReset(&buf);
|
|
|
|
}
|
|
|
|
|
2012-03-20 11:59:42 +00:00
|
|
|
/**
|
|
|
|
* virURIFree:
|
|
|
|
* @uri: uri to free
|
|
|
|
*
|
|
|
|
* Frees the URI
|
|
|
|
*/
|
|
|
|
void virURIFree(virURIPtr uri)
|
|
|
|
{
|
2012-03-20 13:59:32 +00:00
|
|
|
size_t i;
|
|
|
|
|
2012-03-20 13:33:41 +00:00
|
|
|
if (!uri)
|
|
|
|
return;
|
|
|
|
|
|
|
|
VIR_FREE(uri->scheme);
|
|
|
|
VIR_FREE(uri->server);
|
2012-03-20 13:59:32 +00:00
|
|
|
VIR_FREE(uri->user);
|
2012-03-20 13:33:41 +00:00
|
|
|
VIR_FREE(uri->path);
|
|
|
|
VIR_FREE(uri->query);
|
2012-03-20 13:59:32 +00:00
|
|
|
VIR_FREE(uri->fragment);
|
|
|
|
|
|
|
|
for (i = 0 ; i < uri->paramsCount ; i++) {
|
|
|
|
VIR_FREE(uri->params[i].name);
|
|
|
|
VIR_FREE(uri->params[i].value);
|
|
|
|
}
|
|
|
|
VIR_FREE(uri->params);
|
|
|
|
|
2012-03-20 13:33:41 +00:00
|
|
|
VIR_FREE(uri);
|
2012-03-20 11:59:42 +00:00
|
|
|
}
|