mirror of
https://github.com/systemd/systemd.git
synced 2025-01-09 01:18:19 +03:00
Merge pull request #31141 from poettering/resolvectl-more-json
resolvectl: add JSON output support for "resolvectl query"
This commit is contained in:
Lennart Poettering
GitHub
commit
cd2f649dc6
@ -69,6 +69,9 @@
|
||||
<option>--type=</option>/<option>--class=</option> is used IDNA translation is turned off and domain
|
||||
names are processed as specified.</para>
|
||||
|
||||
<para>If combined with <option>--json=</option> (only supported in combination with
|
||||
<option>--type=</option>) will output the resource record data in a JSON object.</para>
|
||||
|
||||
<xi:include href="version-info.xml" xpointer="v239"/></listitem>
|
||||
</varlistentry>
|
||||
|
||||
@ -478,15 +481,7 @@
|
||||
</varlistentry>
|
||||
|
||||
<xi:include href="standard-options.xml" xpointer="json" />
|
||||
|
||||
<varlistentry>
|
||||
<term><option>-j</option></term>
|
||||
|
||||
<listitem><para>Short for <option>--json=auto</option></para>
|
||||
|
||||
<xi:include href="version-info.xml" xpointer="v252"/></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<xi:include href="standard-options.xml" xpointer="j" />
|
||||
<xi:include href="standard-options.xml" xpointer="no-pager" />
|
||||
<xi:include href="standard-options.xml" xpointer="help" />
|
||||
<xi:include href="standard-options.xml" xpointer="version" />
|
||||
|
||||
@ -184,6 +184,9 @@ static void print_source(uint64_t flags, usec_t rtt) {
|
||||
if (!arg_legend)
|
||||
return;
|
||||
|
||||
if (!FLAGS_SET(arg_json_format_flags, JSON_FORMAT_OFF))
|
||||
return;
|
||||
|
||||
if (flags == 0)
|
||||
return;
|
||||
|
||||
@ -250,6 +253,9 @@ static int resolve_host(sd_bus *bus, const char *name) {
|
||||
|
||||
assert(name);
|
||||
|
||||
if (!FLAGS_SET(arg_json_format_flags, JSON_FORMAT_OFF))
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "Use --json=pretty with --type=A or --type=AAAA to acquire address record information in JSON format.");
|
||||
|
||||
log_debug("Resolving %s (family %s, interface %s).", name, af_to_name(arg_family) ?: "*", isempty(arg_ifname) ? "*" : arg_ifname);
|
||||
|
||||
r = bus_message_new_method_call(bus, &req, bus_resolve_mgr, "ResolveHostname");
|
||||
@ -348,6 +354,9 @@ static int resolve_address(sd_bus *bus, int family, const union in_addr_union *a
|
||||
assert(IN_SET(family, AF_INET, AF_INET6));
|
||||
assert(address);
|
||||
|
||||
if (!FLAGS_SET(arg_json_format_flags, JSON_FORMAT_OFF))
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "Use --json=pretty with --type= to acquire resource record information in JSON format.");
|
||||
|
||||
if (ifindex <= 0)
|
||||
ifindex = arg_ifindex;
|
||||
|
||||
@ -433,11 +442,23 @@ static int output_rr_packet(const void *d, size_t l, int ifindex) {
|
||||
_cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL;
|
||||
int r;
|
||||
|
||||
assert(d || l == 0);
|
||||
|
||||
r = dns_resource_record_new_from_raw(&rr, d, l);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to parse RR: %m");
|
||||
|
||||
if (arg_raw == RAW_PAYLOAD) {
|
||||
if (!FLAGS_SET(arg_json_format_flags, JSON_FORMAT_OFF)) {
|
||||
_cleanup_(json_variant_unrefp) JsonVariant *j = NULL;
|
||||
r = dns_resource_record_to_json(rr, &j);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to convert RR to JSON: %m");
|
||||
|
||||
r = json_variant_dump(j, arg_json_format_flags, NULL, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
} else if (arg_raw == RAW_PAYLOAD) {
|
||||
void *data;
|
||||
ssize_t k;
|
||||
|
||||
@ -946,6 +967,9 @@ static int resolve_service(sd_bus *bus, const char *name, const char *type, cons
|
||||
static int verb_service(int argc, char **argv, void *userdata) {
|
||||
sd_bus *bus = userdata;
|
||||
|
||||
if (!FLAGS_SET(arg_json_format_flags, JSON_FORMAT_OFF))
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "Use --json=pretty with --type= to acquire resource record information in JSON format.");
|
||||
|
||||
if (argc == 2)
|
||||
return resolve_service(bus, NULL, NULL, argv[1]);
|
||||
else if (argc == 3)
|
||||
@ -1005,6 +1029,9 @@ static int verb_openpgp(int argc, char **argv, void *userdata) {
|
||||
sd_bus *bus = userdata;
|
||||
int q, r = 0;
|
||||
|
||||
if (!FLAGS_SET(arg_json_format_flags, JSON_FORMAT_OFF))
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "Use --json=pretty with --type= to acquire resource record information in JSON format.");
|
||||
|
||||
STRV_FOREACH(p, argv + 1) {
|
||||
q = resolve_openpgp(bus, *p);
|
||||
if (q < 0)
|
||||
@ -1056,6 +1083,9 @@ static int verb_tlsa(int argc, char **argv, void *userdata) {
|
||||
const char *family = "tcp";
|
||||
int q, r = 0;
|
||||
|
||||
if (!FLAGS_SET(arg_json_format_flags, JSON_FORMAT_OFF))
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "Use --json=pretty with --type= to acquire resource record information in JSON format.");
|
||||
|
||||
if (service_family_is_valid(argv[1])) {
|
||||
family = argv[1];
|
||||
args++;
|
||||
@ -3265,11 +3295,11 @@ static int native_help(void) {
|
||||
if (r < 0)
|
||||
return log_oom();
|
||||
|
||||
printf("%s [OPTIONS...] COMMAND ...\n"
|
||||
printf("%1$s [OPTIONS...] COMMAND ...\n"
|
||||
"\n"
|
||||
"%sSend control commands to the network name resolution manager, or%s\n"
|
||||
"%sresolve domain names, IPv4 and IPv6 addresses, DNS records, and services.%s\n"
|
||||
"\nCommands:\n"
|
||||
"%5$sSend control commands to the network name resolution manager, or%6$s\n"
|
||||
"%5$sresolve domain names, IPv4 and IPv6 addresses, DNS records, and services.%6$s\n"
|
||||
"\n%3$sCommands:%4$s\n"
|
||||
" query HOSTNAME|ADDRESS... Resolve domain names, IPv4 and IPv6 addresses\n"
|
||||
" service [[NAME] TYPE] DOMAIN Resolve service (SRV)\n"
|
||||
" openpgp EMAIL@DOMAIN... Query OpenPGP public key\n"
|
||||
@ -3292,7 +3322,7 @@ static int native_help(void) {
|
||||
" nta [LINK [DOMAIN...]] Get/set per-interface DNSSEC NTA\n"
|
||||
" revert LINK Revert per-interface configuration\n"
|
||||
" log-level [LEVEL] Get/set logging threshold for systemd-resolved\n"
|
||||
"\nOptions:\n"
|
||||
"\n%3$sOptions:%4$s\n"
|
||||
" -h --help Show this help\n"
|
||||
" --version Show package version\n"
|
||||
" --no-pager Do not pipe output into a pager\n"
|
||||
@ -3321,13 +3351,13 @@ static int native_help(void) {
|
||||
" --json=MODE Output as JSON\n"
|
||||
" -j Same as --json=pretty on tty, --json=short\n"
|
||||
" otherwise\n"
|
||||
"\nSee the %s for details.\n",
|
||||
"\nSee the %2$s for details.\n",
|
||||
program_invocation_short_name,
|
||||
ansi_highlight(),
|
||||
link,
|
||||
ansi_underline(),
|
||||
ansi_normal(),
|
||||
ansi_highlight(),
|
||||
ansi_normal(),
|
||||
link);
|
||||
ansi_normal());
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -821,6 +821,9 @@ run resolvectl reset-statistics --json=pretty
|
||||
|
||||
run resolvectl reset-statistics --json=short
|
||||
|
||||
test "$(resolvectl --json=short query -t AAAA localhost)" == '{"key":{"class":1,"type":28,"name":"localhost"},"address":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1]}'
|
||||
test "$(resolvectl --json=short query -t A localhost)" == '{"key":{"class":1,"type":1,"name":"localhost"},"address":[127,0,0,1]}'
|
||||
|
||||
# Check if resolved exits cleanly.
|
||||
restart_resolved
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user