SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolvectl: render DNS errors as JSON

Browse Source 
When --json is requested, resolution errors returned by resolved still went
through text logging. That made scripts parse stderr even though the
varlink error already carried structured fields such as rcode and EDE.

Add a small JSON error dumper for resolvectl query errors. It outputs the
queried name and varlink error id alongside the original varlink parameters
so DNSError and DNSSECValidationFailed expose rcode, extendedDNSErrorCode,
extendedDNSErrorMessage, queryString, and result without duplicating the
schema in resolvectl.

Keep non-JSON text output and silent warn_missing NXDOMAIN handling
unchanged. Document the JSON resolution error object in resolvectl(1),
including the distinction between resolved errors and local invocation or
connection errors.

Closes #42904
This commit is contained in:
dongshengyuan
2026-08-08 08:33:31 +09:00
committed by Yu Watanabe
parent 7427ac3a63
commit 32b3aabfe7
3 changed files with 59 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resolve/resolvectl.c
+45 -11
View File
@@ -278,6 +278,31 @@ static void print_ifindex_comment(int printed_so_far, int ifindex) {
ansi_grey(), ifname, ansi_normal());
}
static int dump_resolve_error_json(const char *name, const char *error_id, sd_json_variant *parameters, int ret) {
_cleanup_(sd_json_variant_unrefp) sd_json_variant *j = NULL;
int r;
assert(name);
assert(!isempty(error_id));
if (parameters)
j = sd_json_variant_ref(parameters);
r = sd_json_variant_set_field_string(&j, "name", name);
if (r < 0)
return r;
r = sd_json_variant_set_field_string(&j, "error", error_id);
if (r < 0)
return r;
r = sd_json_variant_dump(j, arg_json_format_flags, /* f= */ NULL, /* prefix= */ NULL);
if (r < 0)
return r;
return ret;
}
static int varlink_log_resolve_error(const char *name, const char *error_id, sd_json_variant *reply, bool warn_missing) {
int r;
@@ -285,6 +310,26 @@ static int varlink_log_resolve_error(const char *name, const char *error_id, sd_
assert(!isempty(error_id));
int ret = sd_varlink_error_to_errno(error_id, reply);
_cleanup_(resolve_error_done) ResolveError error = {
.rcode = _DNS_RCODE_INVALID,
.ede_rcode = _DNS_EDE_RCODE_INVALID,
};
if (reply) {
r = dispatch_resolve_error(/* name = */ NULL, reply, SD_JSON_LOG, &error);
if (r < 0)
log_debug_errno(r, "Failed to dispatch error JSON, ignoring: %m");
}
if (error.rcode == DNS_RCODE_NXDOMAIN && !warn_missing)
return -ENXIO;
if (sd_json_format_enabled(arg_json_format_flags))
return dump_resolve_error_json(
name,
error_id,
reply,
error.rcode == DNS_RCODE_NXDOMAIN ? -ENXIO : ret);
static const struct {
const char *error_id;
const char *msg;
@@ -318,14 +363,6 @@ static int varlink_log_resolve_error(const char *name, const char *error_id, sd_
if (streq(error_id, "io.systemd.Resolve.InconsistentServiceRecords"))
return log_error_errno(ret, "%s: resolve call failed: '%s' does not provide a consistent set of service resource records", name, name);
_cleanup_(resolve_error_done) ResolveError error = {
.rcode = _DNS_RCODE_INVALID,
.ede_rcode = _DNS_EDE_RCODE_INVALID,
};
r = dispatch_resolve_error(/* name = */ NULL, reply, SD_JSON_LOG, &error);
if (r < 0)
log_debug_errno(r, "Failed to dispatch error JSON, ignoring: %m");
_cleanup_free_ char *msg_extended = NULL;
if (error.ede_rcode >= 0) {
msg_extended = strjoin(" (",
@@ -342,9 +379,6 @@ static int varlink_log_resolve_error(const char *name, const char *error_id, sd_
if (error.rcode != _DNS_RCODE_INVALID) {
if (error.rcode == DNS_RCODE_NXDOMAIN) {
if (!warn_missing)
return -ENXIO;
return log_error_errno(SYNTHETIC_ERRNO(ENXIO), "%s: resolve call failed: Name '%s' not found%s%s",
name, error.query_string ?: name, error.ede_rcode >= 0 ? ":" : "", strempty(msg_extended));
}