f9e9c06648
The checking code from #56 landed, and started triggering for me on the `dockerroot` user. It's nice to know it works. Then the issue is... "what now"? It turns out in the case of `dockerroot` it's actually unused, so we could fix this by deleting it. But in general we need to support dynamic uids/gids/. And we can't yet take a hard dep on #49. So this patch changes things so we take a copy of the passwd/group data from the previous commit. Any users subsequently added in the *new* commit will be additive. Closes: https://github.com/projectatomic/rpm-ostree/issues/78
239 lines
6.5 KiB
C
239 lines
6.5 KiB
C
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
|
|
*
|
|
* Copyright (C) 2014 Colin Walters <walters@verbum.org>
|
|
*
|
|
* This program 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 of the licence 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, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include "rpmostree-json-parsing.h"
|
|
|
|
#include <string.h>
|
|
#include <glib-unix.h>
|
|
|
|
gboolean
|
|
_rpmostree_jsonutil_object_get_optional_string_member (JsonObject *object,
|
|
const char *member_name,
|
|
const char **out_value,
|
|
GError **error)
|
|
{
|
|
gboolean ret = FALSE;
|
|
JsonNode *node = json_object_get_member (object, member_name);
|
|
|
|
if (node != NULL)
|
|
{
|
|
*out_value = json_node_get_string (node);
|
|
if (!*out_value)
|
|
{
|
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
|
"Member '%s' is not a string", member_name);
|
|
goto out;
|
|
}
|
|
}
|
|
else
|
|
*out_value = NULL;
|
|
|
|
ret = TRUE;
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
const char *
|
|
_rpmostree_jsonutil_object_require_string_member (JsonObject *object,
|
|
const char *member_name,
|
|
GError **error)
|
|
{
|
|
const char *ret;
|
|
if (!_rpmostree_jsonutil_object_get_optional_string_member (object, member_name, &ret, error))
|
|
return NULL;
|
|
if (!ret)
|
|
{
|
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
|
"Member '%s' not found", member_name);
|
|
return NULL;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static gboolean
|
|
_jsonutil_node_check_int (JsonNode *node)
|
|
{
|
|
if (!node)
|
|
return FALSE;
|
|
|
|
if (json_node_get_value_type (node) != G_TYPE_INT64)
|
|
return FALSE;
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
gboolean
|
|
_rpmostree_jsonutil_object_get_optional_int_member (JsonObject *object,
|
|
const char *member_name,
|
|
gint64 *out_value,
|
|
gboolean *found,
|
|
GError **error)
|
|
{
|
|
gboolean ret = FALSE;
|
|
JsonNode *node = json_object_get_member (object, member_name);
|
|
|
|
if (node != NULL)
|
|
{
|
|
if (!_jsonutil_node_check_int (node))
|
|
{
|
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
|
"Member '%s' is not an integer", member_name);
|
|
goto out;
|
|
}
|
|
if (found)
|
|
*found = TRUE;
|
|
*out_value = json_node_get_int (node);
|
|
}
|
|
else
|
|
{
|
|
if (found)
|
|
*found = FALSE;
|
|
*out_value = 0;
|
|
}
|
|
|
|
ret = TRUE;
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
gboolean
|
|
_rpmostree_jsonutil_object_require_int_member (JsonObject *object,
|
|
const char *member_name,
|
|
gint64 *out_val,
|
|
GError **error)
|
|
{
|
|
gboolean found;
|
|
if (!_rpmostree_jsonutil_object_get_optional_int_member (object, member_name, out_val, &found, error))
|
|
return FALSE;
|
|
if (!found)
|
|
{
|
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
|
"Member '%s' not found", member_name);
|
|
return FALSE;
|
|
}
|
|
return TRUE;
|
|
}
|
|
|
|
gboolean
|
|
_rpmostree_jsonutil_object_get_optional_boolean_member (JsonObject *object,
|
|
const char *member_name,
|
|
gboolean *out_value,
|
|
GError **error)
|
|
{
|
|
gboolean ret = FALSE;
|
|
JsonNode *node = json_object_get_member (object, member_name);
|
|
|
|
if (node != NULL)
|
|
{
|
|
if (json_node_get_value_type (node) != G_TYPE_BOOLEAN)
|
|
{
|
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
|
"Member '%s' is not a boolean", member_name);
|
|
goto out;
|
|
}
|
|
*out_value = json_node_get_boolean (node);
|
|
}
|
|
|
|
ret = TRUE;
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
const char *
|
|
_rpmostree_jsonutil_array_require_string_element (JsonArray *array,
|
|
guint i,
|
|
GError **error)
|
|
{
|
|
const char *ret = json_array_get_string_element (array, i);
|
|
if (!ret)
|
|
{
|
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
|
"Element at index %u is not a string", i);
|
|
return NULL;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
gboolean
|
|
_rpmostree_jsonutil_array_require_int_element (JsonArray *array,
|
|
guint i,
|
|
gint64 *out_val,
|
|
GError **error)
|
|
{
|
|
JsonNode *node = json_array_get_element (array, i);
|
|
|
|
if (!_jsonutil_node_check_int (node))
|
|
{
|
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
|
"Element at index %u is not an integer", i);
|
|
*out_val = 0;
|
|
return FALSE;
|
|
}
|
|
|
|
*out_val = json_array_get_int_element (array, i);
|
|
return TRUE;
|
|
}
|
|
|
|
gboolean
|
|
_rpmostree_jsonutil_append_string_array_to (JsonObject *object,
|
|
const char *member_name,
|
|
GPtrArray *array,
|
|
GError **error)
|
|
{
|
|
JsonArray *jarray = json_object_get_array_member (object, member_name);
|
|
guint i, len;
|
|
|
|
if (!jarray)
|
|
{
|
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
|
"No member '%s' found", member_name);
|
|
return FALSE;
|
|
}
|
|
|
|
len = json_array_get_length (jarray);
|
|
for (i = 0; i < len; i++)
|
|
{
|
|
const char *v = _rpmostree_jsonutil_array_require_string_element (jarray, i, error);
|
|
if (!v)
|
|
return FALSE;
|
|
g_ptr_array_add (array, g_strdup (v));
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
GHashTable *
|
|
_rpmostree_jsonutil_jsarray_strings_to_set (JsonArray *array)
|
|
{
|
|
GHashTable *ret = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free);
|
|
guint i;
|
|
guint len = json_array_get_length (array);
|
|
|
|
for (i = 0; i < len; i++)
|
|
{
|
|
const char *elt = json_array_get_string_element (array, i);
|
|
g_hash_table_add (ret, g_strdup (elt));
|
|
}
|
|
|
|
return ret;
|
|
}
|