f31522130f
Build system (5 gaps hardened): - COOKBOOK_OFFLINE defaults to true (fork-mode) - normalize_patch handles diff -ruN format - New 'repo validate-patches' command (25/25 relibc patches) - 14 patched Qt/Wayland/display recipes added to protected list - relibc archive regenerated with current patch chain Boot fixes (fixable): - Full ISO EFI partition: 16 MiB → 1 MiB (matches mini, BIOS hardcoded 2 MiB offset) - D-Bus system bus: absolute /usr/bin/dbus-daemon path (was skipped) - redbear-sessiond: absolute /usr/bin/redbear-sessiond path (was skipped) - daemon framework: silenced spurious INIT_NOTIFY warnings for oneshot_async services (P0-daemon-silence-init-notify.patch) - udev-shim: demoted INIT_NOTIFY warning to INFO (expected for oneshot_async) - relibc: comprehensive named semaphores (sem_open/close/unlink) replacing upstream todo!() stubs - greeterd: Wayland socket timeout 15s → 30s (compositor DRM wait) - greeter-ui: built and linked (header guard unification, sem_compat stubs removed) - mc: un-ignored in both configs, fixed glib/libiconv/pcre2 transitive deps - greeter config: removed stale keymapd dependency from display/greeter services - prefix toolchain: relibc headers synced, _RELIBC_STDLIB_H guard unified Unfixable (diagnosed, upstream): - i2c-hidd: abort on no-I2C-hardware (QEMU) — process::exit → relibc abort - kded6/greeter-ui: page fault 0x8 — Qt library null deref - Thread panics fd != -1 — Rust std library on Redox - DHCP timeout / eth0 MAC — QEMU user-mode networking - hwrngd/thermald — no hardware RNG/thermal in VM - live preload allocation — BIOS memory fragmentation, continues on demand
312 lines
10 KiB
C
312 lines
10 KiB
C
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
/* dbus-syntax.c - utility functions for strings with special syntax
|
|
*
|
|
* Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
|
* Copyright © 2011 Nokia Corporation
|
|
*
|
|
* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
|
|
*
|
|
* Licensed under the Academic Free License version 2.1
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include "dbus-syntax.h"
|
|
|
|
#include "dbus-internals.h"
|
|
#include "dbus-marshal-validate.h"
|
|
#include "dbus-shared.h"
|
|
|
|
/**
|
|
* @defgroup DBusSyntax Utility functions for strings with special syntax
|
|
* @ingroup DBus
|
|
* @brief Parsing D-Bus type signatures
|
|
* @{
|
|
*/
|
|
|
|
/**
|
|
* Check an object path for validity. Remember that #NULL can always
|
|
* be passed instead of a DBusError *, if you don't care about having
|
|
* an error name and message.
|
|
*
|
|
* This function is suitable for validating C strings, but is not suitable
|
|
* for validating untrusted data from a network unless the string's length
|
|
* is also checked, since it assumes that the string ends at the first zero
|
|
* byte according to normal C conventions.
|
|
*
|
|
* @param path a potentially invalid object path, which must not be #NULL
|
|
* @param error error return
|
|
* @returns #TRUE if path is valid
|
|
*/
|
|
dbus_bool_t
|
|
dbus_validate_path (const char *path,
|
|
DBusError *error)
|
|
{
|
|
DBusString str;
|
|
int len;
|
|
|
|
_dbus_return_val_if_fail (path != NULL, FALSE);
|
|
|
|
_dbus_string_init_const (&str, path);
|
|
len = _dbus_string_get_length (&str);
|
|
|
|
/* In general, it ought to be valid... */
|
|
if (_DBUS_LIKELY (_dbus_validate_path (&str, 0, len)))
|
|
return TRUE;
|
|
|
|
/* slow path: string is invalid, find out why */
|
|
|
|
if (!_dbus_string_validate_utf8 (&str, 0, len))
|
|
{
|
|
/* don't quote the actual string here, since a DBusError also needs to
|
|
* be valid UTF-8 */
|
|
dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
|
|
"Object path was not valid UTF-8");
|
|
return FALSE;
|
|
}
|
|
|
|
/* FIXME: later, diagnose exactly how it was invalid */
|
|
dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
|
|
"Object path was not valid: '%s'", path);
|
|
return FALSE;
|
|
}
|
|
|
|
/**
|
|
* Check an interface name for validity. Remember that #NULL can always
|
|
* be passed instead of a DBusError *, if you don't care about having
|
|
* an error name and message.
|
|
*
|
|
* This function is suitable for validating C strings, but is not suitable
|
|
* for validating untrusted data from a network unless the string's length
|
|
* is also checked, since it assumes that the string ends at the first zero
|
|
* byte according to normal C conventions.
|
|
*
|
|
* @param name a potentially invalid interface name, which must not be #NULL
|
|
* @param error error return
|
|
* @returns #TRUE if name is valid
|
|
*/
|
|
dbus_bool_t
|
|
dbus_validate_interface (const char *name,
|
|
DBusError *error)
|
|
{
|
|
DBusString str;
|
|
int len;
|
|
|
|
_dbus_return_val_if_fail (name != NULL, FALSE);
|
|
|
|
_dbus_string_init_const (&str, name);
|
|
len = _dbus_string_get_length (&str);
|
|
|
|
/* In general, it ought to be valid... */
|
|
if (_DBUS_LIKELY (_dbus_validate_interface (&str, 0, len)))
|
|
return TRUE;
|
|
|
|
/* slow path: string is invalid, find out why */
|
|
|
|
if (!_dbus_string_validate_utf8 (&str, 0, len))
|
|
{
|
|
/* don't quote the actual string here, since a DBusError also needs to
|
|
* be valid UTF-8 */
|
|
dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
|
|
"Interface name was not valid UTF-8");
|
|
return FALSE;
|
|
}
|
|
|
|
/* FIXME: later, diagnose exactly how it was invalid */
|
|
dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
|
|
"Interface name was not valid: '%s'", name);
|
|
return FALSE;
|
|
}
|
|
|
|
/**
|
|
* Check a member (method/signal) name for validity. Remember that #NULL
|
|
* can always be passed instead of a DBusError *, if you don't care about
|
|
* having an error name and message.
|
|
*
|
|
* This function is suitable for validating C strings, but is not suitable
|
|
* for validating untrusted data from a network unless the string's length
|
|
* is also checked, since it assumes that the string ends at the first zero
|
|
* byte according to normal C conventions.
|
|
*
|
|
* @param name a potentially invalid member name, which must not be #NULL
|
|
* @param error error return
|
|
* @returns #TRUE if name is valid
|
|
*/
|
|
dbus_bool_t
|
|
dbus_validate_member (const char *name,
|
|
DBusError *error)
|
|
{
|
|
DBusString str;
|
|
int len;
|
|
|
|
_dbus_return_val_if_fail (name != NULL, FALSE);
|
|
|
|
_dbus_string_init_const (&str, name);
|
|
len = _dbus_string_get_length (&str);
|
|
|
|
/* In general, it ought to be valid... */
|
|
if (_DBUS_LIKELY (_dbus_validate_member (&str, 0, len)))
|
|
return TRUE;
|
|
|
|
/* slow path: string is invalid, find out why */
|
|
|
|
if (!_dbus_string_validate_utf8 (&str, 0, len))
|
|
{
|
|
/* don't quote the actual string here, since a DBusError also needs to
|
|
* be valid UTF-8 */
|
|
dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
|
|
"Member name was not valid UTF-8");
|
|
return FALSE;
|
|
}
|
|
|
|
/* FIXME: later, diagnose exactly how it was invalid */
|
|
dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
|
|
"Member name was not valid: '%s'", name);
|
|
return FALSE;
|
|
}
|
|
|
|
/**
|
|
* Check an error name for validity. Remember that #NULL
|
|
* can always be passed instead of a DBusError *, if you don't care about
|
|
* having an error name and message.
|
|
*
|
|
* This function is suitable for validating C strings, but is not suitable
|
|
* for validating untrusted data from a network unless the string's length
|
|
* is also checked, since it assumes that the string ends at the first zero
|
|
* byte according to normal C conventions.
|
|
*
|
|
* @param name a potentially invalid error name, which must not be #NULL
|
|
* @param error error return
|
|
* @returns #TRUE if name is valid
|
|
*/
|
|
dbus_bool_t
|
|
dbus_validate_error_name (const char *name,
|
|
DBusError *error)
|
|
{
|
|
DBusString str;
|
|
int len;
|
|
|
|
_dbus_return_val_if_fail (name != NULL, FALSE);
|
|
|
|
_dbus_string_init_const (&str, name);
|
|
len = _dbus_string_get_length (&str);
|
|
|
|
/* In general, it ought to be valid... */
|
|
if (_DBUS_LIKELY (_dbus_validate_error_name (&str, 0, len)))
|
|
return TRUE;
|
|
|
|
/* slow path: string is invalid, find out why */
|
|
|
|
if (!_dbus_string_validate_utf8 (&str, 0, len))
|
|
{
|
|
/* don't quote the actual string here, since a DBusError also needs to
|
|
* be valid UTF-8 */
|
|
dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
|
|
"Error name was not valid UTF-8");
|
|
return FALSE;
|
|
}
|
|
|
|
/* FIXME: later, diagnose exactly how it was invalid */
|
|
dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
|
|
"Error name was not valid: '%s'", name);
|
|
return FALSE;
|
|
}
|
|
|
|
/**
|
|
* Check a bus name for validity. Remember that #NULL
|
|
* can always be passed instead of a DBusError *, if you don't care about
|
|
* having an error name and message.
|
|
*
|
|
* This function is suitable for validating C strings, but is not suitable
|
|
* for validating untrusted data from a network unless the string's length
|
|
* is also checked, since it assumes that the string ends at the first zero
|
|
* byte according to normal C conventions.
|
|
*
|
|
* @param name a potentially invalid bus name, which must not be #NULL
|
|
* @param error error return
|
|
* @returns #TRUE if name is valid
|
|
*/
|
|
dbus_bool_t
|
|
dbus_validate_bus_name (const char *name,
|
|
DBusError *error)
|
|
{
|
|
DBusString str;
|
|
int len;
|
|
|
|
_dbus_return_val_if_fail (name != NULL, FALSE);
|
|
|
|
_dbus_string_init_const (&str, name);
|
|
len = _dbus_string_get_length (&str);
|
|
|
|
/* In general, it ought to be valid... */
|
|
if (_DBUS_LIKELY (_dbus_validate_bus_name (&str, 0, len)))
|
|
return TRUE;
|
|
|
|
/* slow path: string is invalid, find out why */
|
|
|
|
if (!_dbus_string_validate_utf8 (&str, 0, len))
|
|
{
|
|
/* don't quote the actual string here, since a DBusError also needs to
|
|
* be valid UTF-8 */
|
|
dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
|
|
"Bus name was not valid UTF-8");
|
|
return FALSE;
|
|
}
|
|
|
|
/* FIXME: later, diagnose exactly how it was invalid */
|
|
dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
|
|
"Bus name was not valid: '%s'", name);
|
|
return FALSE;
|
|
}
|
|
|
|
/**
|
|
* Check a string for validity. Strings on D-Bus must be valid UTF-8.
|
|
* Remember that #NULL can always be passed instead of a DBusError *,
|
|
* if you don't care about having an error name and message.
|
|
*
|
|
* This function is suitable for validating C strings, but is not suitable
|
|
* for validating untrusted data from a network unless the string's length
|
|
* is also checked, since it assumes that the string ends at the first zero
|
|
* byte according to normal C conventions.
|
|
*
|
|
* @param alleged_utf8 a string to be checked, which must not be #NULL
|
|
* @param error error return
|
|
* @returns #TRUE if alleged_utf8 is valid UTF-8
|
|
*/
|
|
dbus_bool_t
|
|
dbus_validate_utf8 (const char *alleged_utf8,
|
|
DBusError *error)
|
|
{
|
|
DBusString str;
|
|
|
|
_dbus_return_val_if_fail (alleged_utf8 != NULL, FALSE);
|
|
|
|
_dbus_string_init_const (&str, alleged_utf8);
|
|
|
|
if (_DBUS_LIKELY (_dbus_string_validate_utf8 (&str, 0,
|
|
_dbus_string_get_length (&str))))
|
|
return TRUE;
|
|
|
|
/* don't quote the actual string here, since a DBusError also needs to
|
|
* be valid UTF-8 */
|
|
dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
|
|
"String was not valid UTF-8");
|
|
return FALSE;
|
|
}
|
|
|
|
/** @} */ /* end of group */
|