From ddd08e75b1e7fa1f6dfef3d30a0c1ef8c63e4d07 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Tue, 27 Aug 2019 19:25:05 +0200

Subject: [PATCH] resolved: allow access to Set*Link and Revert methods through

 polkit

This matches what is done in networkd very closely. In fact even the

policy descriptions are all identical (with s/network/resolve), except

for the last one:

resolved has org.freedesktop.resolve1.revert while

networkd has org.freedesktop.network1.revert-ntp and

org.freedesktop.network1.revert-dns so the description is a bit different.

Conflicts:

	src/resolve/resolved-bus.c

	src/resolve/resolved-link-bus.c

Related: #1746857

---

 src/resolve/org.freedesktop.resolve1.policy | 99 +++++++++++++++++++++

 src/resolve/resolved-bus.c                  | 22 ++---

 src/resolve/resolved-link-bus.c             | 97 +++++++++++++++++---

 3 files changed, 197 insertions(+), 21 deletions(-)

diff --git a/src/resolve/org.freedesktop.resolve1.policy b/src/resolve/org.freedesktop.resolve1.policy

index b65ba3e56a..592c4eb8b0 100644

--- a/src/resolve/org.freedesktop.resolve1.policy

+++ b/src/resolve/org.freedesktop.resolve1.policy

@@ -40,4 +40,103 @@

                 <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>

         </action>

+        <action id="org.freedesktop.resolve1.set-dns-servers">

+                <description gettext-domain="systemd">Set DNS servers</description>

+                <message gettext-domain="systemd">Authentication is required to set DNS servers.</message>

+                <defaults>

+                        <allow_any>auth_admin</allow_any>

+                        <allow_inactive>auth_admin</allow_inactive>

+                        <allow_active>auth_admin_keep</allow_active>

+                </defaults>

+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>

+        </action>

+

+        <action id="org.freedesktop.resolve1.set-domains">

+                <description gettext-domain="systemd">Set domains</description>

+                <message gettext-domain="systemd">Authentication is required to set domains.</message>

+                <defaults>

+                        <allow_any>auth_admin</allow_any>

+                        <allow_inactive>auth_admin</allow_inactive>

+                        <allow_active>auth_admin_keep</allow_active>

+                </defaults>

+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>

+        </action>

+

+        <action id="org.freedesktop.resolve1.set-default-route">

+                <description gettext-domain="systemd">Set default route</description>

+                <message gettext-domain="systemd">Authentication is required to set default route.</message>

+                <defaults>

+                        <allow_any>auth_admin</allow_any>

+                        <allow_inactive>auth_admin</allow_inactive>

+                        <allow_active>auth_admin_keep</allow_active>

+                </defaults>

+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>

+        </action>

+

+        <action id="org.freedesktop.resolve1.set-llmnr">

+                <description gettext-domain="systemd">Enable/disable LLMNR</description>

+                <message gettext-domain="systemd">Authentication is required to enable or disable LLMNR.</message>

+                <defaults>

+                        <allow_any>auth_admin</allow_any>

+                        <allow_inactive>auth_admin</allow_inactive>

+                        <allow_active>auth_admin_keep</allow_active>

+                </defaults>

+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>

+        </action>

+

+        <action id="org.freedesktop.resolve1.set-mdns">

+                <description gettext-domain="systemd">Enable/disable multicast DNS</description>

+                <message gettext-domain="systemd">Authentication is required to enable or disable multicast DNS.</message>

+                <defaults>

+                        <allow_any>auth_admin</allow_any>

+                        <allow_inactive>auth_admin</allow_inactive>

+                        <allow_active>auth_admin_keep</allow_active>

+                </defaults>

+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>

+        </action>

+

+        <action id="org.freedesktop.resolve1.set-dns-over-tls">

+                <description gettext-domain="systemd">Enable/disable DNS over TLS</description>

+                <message gettext-domain="systemd">Authentication is required to enable or disable DNS over TLS.</message>

+                <defaults>

+                        <allow_any>auth_admin</allow_any>

+                        <allow_inactive>auth_admin</allow_inactive>

+                        <allow_active>auth_admin_keep</allow_active>

+                </defaults>

+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>

+        </action>

+

+        <action id="org.freedesktop.resolve1.set-dnssec">

+                <description gettext-domain="systemd">Enable/disable DNSSEC</description>

+                <message gettext-domain="systemd">Authentication is required to enable or disable DNSSEC.</message>

+                <defaults>

+                        <allow_any>auth_admin</allow_any>

+                        <allow_inactive>auth_admin</allow_inactive>

+                        <allow_active>auth_admin_keep</allow_active>

+                </defaults>

+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>

+        </action>

+

+        <action id="org.freedesktop.resolve1.set-dnssec-negative-trust-anchors">

+                <description gettext-domain="systemd">Set DNSSEC Negative Trust Anchors</description>

+                <message gettext-domain="systemd">Authentication is required to set DNSSEC Negative Trust Anchros.</message>

+                <defaults>

+                        <allow_any>auth_admin</allow_any>

+                        <allow_inactive>auth_admin</allow_inactive>

+                        <allow_active>auth_admin_keep</allow_active>

+                </defaults>

+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>

+        </action>

+

+        <action id="org.freedesktop.resolve1.revert">

+                <description gettext-domain="systemd">Revert name resolution settings</description>

+                <message gettext-domain="systemd">Authentication is required to revert name resolution settings.</message>

+                <defaults>

+                        <allow_any>auth_admin</allow_any>

+                        <allow_inactive>auth_admin</allow_inactive>

+                        <allow_active>auth_admin_keep</allow_active>

+                </defaults>

+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>

+        </action>

+

 </policyconfig>

diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c

index da0a909dd6..4d6cc4fd48 100644

--- a/src/resolve/resolved-bus.c

+++ b/src/resolve/resolved-bus.c

@@ -1848,18 +1848,18 @@ static const sd_bus_vtable resolve_vtable[] = {

         SD_BUS_METHOD("ResolveAddress", "iiayt", "a(is)t", bus_method_resolve_address, SD_BUS_VTABLE_UNPRIVILEGED),

         SD_BUS_METHOD("ResolveRecord", "isqqt", "a(iqqay)t", bus_method_resolve_record, SD_BUS_VTABLE_UNPRIVILEGED),

         SD_BUS_METHOD("ResolveService", "isssit", "a(qqqsa(iiay)s)aayssst", bus_method_resolve_service, SD_BUS_VTABLE_UNPRIVILEGED),

-        SD_BUS_METHOD("ResetStatistics", NULL, NULL, bus_method_reset_statistics, 0),

-        SD_BUS_METHOD("FlushCaches", NULL, NULL, bus_method_flush_caches, 0),

-        SD_BUS_METHOD("ResetServerFeatures", NULL, NULL, bus_method_reset_server_features, 0),

+        SD_BUS_METHOD("ResetStatistics", NULL, NULL, bus_method_reset_statistics, SD_BUS_VTABLE_UNPRIVILEGED),

+        SD_BUS_METHOD("FlushCaches", NULL, NULL, bus_method_flush_caches, SD_BUS_VTABLE_UNPRIVILEGED),

+        SD_BUS_METHOD("ResetServerFeatures", NULL, NULL, bus_method_reset_server_features, SD_BUS_VTABLE_UNPRIVILEGED),

         SD_BUS_METHOD("GetLink", "i", "o", bus_method_get_link, SD_BUS_VTABLE_UNPRIVILEGED),

-        SD_BUS_METHOD("SetLinkDNS", "ia(iay)", NULL, bus_method_set_link_dns_servers, 0),

-        SD_BUS_METHOD("SetLinkDomains", "ia(sb)", NULL, bus_method_set_link_domains, 0),

-        SD_BUS_METHOD("SetLinkLLMNR", "is", NULL, bus_method_set_link_llmnr, 0),

-        SD_BUS_METHOD("SetLinkMulticastDNS", "is", NULL, bus_method_set_link_mdns, 0),

-        SD_BUS_METHOD("SetLinkDNSOverTLS", "is", NULL, bus_method_set_link_dns_over_tls, 0),

-        SD_BUS_METHOD("SetLinkDNSSEC", "is", NULL, bus_method_set_link_dnssec, 0),

-        SD_BUS_METHOD("SetLinkDNSSECNegativeTrustAnchors", "ias", NULL, bus_method_set_link_dnssec_negative_trust_anchors, 0),

-        SD_BUS_METHOD("RevertLink", "i", NULL, bus_method_revert_link, 0),

+        SD_BUS_METHOD("SetLinkDNS", "ia(iay)", NULL, bus_method_set_link_dns_servers, SD_BUS_VTABLE_UNPRIVILEGED),

+        SD_BUS_METHOD("SetLinkDomains", "ia(sb)", NULL, bus_method_set_link_domains, SD_BUS_VTABLE_UNPRIVILEGED),

+        SD_BUS_METHOD("SetLinkLLMNR", "is", NULL, bus_method_set_link_llmnr, SD_BUS_VTABLE_UNPRIVILEGED),

+        SD_BUS_METHOD("SetLinkMulticastDNS", "is", NULL, bus_method_set_link_mdns, SD_BUS_VTABLE_UNPRIVILEGED),

+        SD_BUS_METHOD("SetLinkDNSOverTLS", "is", NULL, bus_method_set_link_dns_over_tls, SD_BUS_VTABLE_UNPRIVILEGED),

+        SD_BUS_METHOD("SetLinkDNSSEC", "is", NULL, bus_method_set_link_dnssec, SD_BUS_VTABLE_UNPRIVILEGED),

+        SD_BUS_METHOD("SetLinkDNSSECNegativeTrustAnchors", "ias", NULL, bus_method_set_link_dnssec_negative_trust_anchors, SD_BUS_VTABLE_UNPRIVILEGED),

+        SD_BUS_METHOD("RevertLink", "i", NULL, bus_method_revert_link, SD_BUS_VTABLE_UNPRIVILEGED),

         SD_BUS_METHOD("RegisterService", "sssqqqaa{say}", "o", bus_method_register_service, SD_BUS_VTABLE_UNPRIVILEGED),

         SD_BUS_METHOD("UnregisterService", "o", NULL, bus_method_unregister_service, SD_BUS_VTABLE_UNPRIVILEGED),

diff --git a/src/resolve/resolved-link-bus.c b/src/resolve/resolved-link-bus.c

index 46d2b11636..bf3e42264e 100644

--- a/src/resolve/resolved-link-bus.c

+++ b/src/resolve/resolved-link-bus.c

@@ -1,5 +1,9 @@

 /* SPDX-License-Identifier: LGPL-2.1+ */

+#include <net/if.h>

+#include <netinet/in.h>

+#include <sys/capability.h>

+

 #include "alloc-util.h"

 #include "bus-common-errors.h"

 #include "bus-util.h"

@@ -9,6 +13,7 @@

 #include "resolved-link-bus.h"

 #include "resolved-resolv-conf.h"

 #include "strv.h"

+#include "user-util.h"

 static BUS_DEFINE_PROPERTY_GET(property_get_dnssec_supported, "b", Link, link_dnssec_supported);

 static BUS_DEFINE_PROPERTY_GET2(property_get_dnssec_mode, "s", Link, link_get_dnssec_mode, dnssec_mode_to_string);

@@ -235,6 +240,15 @@ int bus_link_method_set_dns_servers(sd_bus_message *message, void *userdata, sd_

         if (r < 0)

                 return r;

+        r = bus_verify_polkit_async(message, CAP_NET_ADMIN,

+                                    "org.freedesktop.resolve1.set-dns-servers",

+                                    NULL, true, UID_INVALID,

+                                    &l->manager->polkit_registry, error);

+        if (r < 0)

+                return r;

+        if (r == 0)

+                return 1; /* Polkit will call us back */

+

         dns_server_mark_all(l->dns_servers);

         for (i = 0; i < n; i++) {

@@ -298,12 +312,21 @@ int bus_link_method_set_domains(sd_bus_message *message, void *userdata, sd_bus_

                         return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Root domain is not suitable as search domain");

         }

-        dns_search_domain_mark_all(l->search_domains);

-

         r = sd_bus_message_rewind(message, false);

         if (r < 0)

                 return r;

+        r = bus_verify_polkit_async(message, CAP_NET_ADMIN,

+                                    "org.freedesktop.resolve1.set-domains",

+                                    NULL, true, UID_INVALID,

+                                    &l->manager->polkit_registry, error);

+        if (r < 0)

+                return r;

+        if (r == 0)

+                return 1; /* Polkit will call us back */

+

+        dns_search_domain_mark_all(l->search_domains);

+

         for (;;) {

                 DnsSearchDomain *d;

                 const char *name;

@@ -371,6 +394,15 @@ int bus_link_method_set_llmnr(sd_bus_message *message, void *userdata, sd_bus_er

                         return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid LLMNR setting: %s", llmnr);

         }

+        r = bus_verify_polkit_async(message, CAP_NET_ADMIN,

+                                    "org.freedesktop.resolve1.set-llmnr",

+                                    NULL, true, UID_INVALID,

+                                    &l->manager->polkit_registry, error);

+        if (r < 0)

+                return r;

+        if (r == 0)

+                return 1; /* Polkit will call us back */

+

         l->llmnr_support = mode;

         link_allocate_scopes(l);

         link_add_rrs(l, false);

@@ -405,6 +437,15 @@ int bus_link_method_set_mdns(sd_bus_message *message, void *userdata, sd_bus_err

                         return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid MulticastDNS setting: %s", mdns);

         }

+        r = bus_verify_polkit_async(message, CAP_NET_ADMIN,

+                                    "org.freedesktop.resolve1.set-mdns",

+                                    NULL, true, UID_INVALID,

+                                    &l->manager->polkit_registry, error);

+        if (r < 0)

+                return r;

+        if (r == 0)

+                return 1; /* Polkit will call us back */

+

         l->mdns_support = mode;

         link_allocate_scopes(l);

         link_add_rrs(l, false);

@@ -439,6 +480,15 @@ int bus_link_method_set_dns_over_tls(sd_bus_message *message, void *userdata, sd

                         return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid DNSOverTLS setting: %s", dns_over_tls);

         }

+        r = bus_verify_polkit_async(message, CAP_NET_ADMIN,

+                                    "org.freedesktop.resolve1.set-dns-over-tls",

+                                    NULL, true, UID_INVALID,

+                                    &l->manager->polkit_registry, error);

+        if (r < 0)

+                return r;

+        if (r == 0)

+                return 1; /* Polkit will call us back */

+

         link_set_dns_over_tls_mode(l, mode);

         (void) link_save_user(l);

@@ -471,6 +521,15 @@ int bus_link_method_set_dnssec(sd_bus_message *message, void *userdata, sd_bus_e

                         return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid DNSSEC setting: %s", dnssec);

         }

+        r = bus_verify_polkit_async(message, CAP_NET_ADMIN,

+                                    "org.freedesktop.resolve1.set-dnssec",

+                                    NULL, true, UID_INVALID,

+                                    &l->manager->polkit_registry, error);

+        if (r < 0)

+                return r;

+        if (r == 0)

+                return 1; /* Polkit will call us back */

+

         link_set_dnssec_mode(l, mode);

         (void) link_save_user(l);

@@ -513,6 +572,15 @@ int bus_link_method_set_dnssec_negative_trust_anchors(sd_bus_message *message, v

                         return r;

         }

+        r = bus_verify_polkit_async(message, CAP_NET_ADMIN,

+                                    "org.freedesktop.resolve1.set-dnssec-negative-trust-anchors",

+                                    NULL, true, UID_INVALID,

+                                    &l->manager->polkit_registry, error);

+        if (r < 0)

+                return r;

+        if (r == 0)

+                return 1; /* Polkit will call us back */

+

         set_free_free(l->dnssec_negative_trust_anchors);

         l->dnssec_negative_trust_anchors = TAKE_PTR(ns);

@@ -532,6 +600,15 @@ int bus_link_method_revert(sd_bus_message *message, void *userdata, sd_bus_error

         if (r < 0)

                 return r;

+        r = bus_verify_polkit_async(message, CAP_NET_ADMIN,

+                                    "org.freedesktop.resolve1.revert",

+                                    NULL, true, UID_INVALID,

+                                    &l->manager->polkit_registry, error);

+        if (r < 0)

+                return r;

+        if (r == 0)

+                return 1; /* Polkit will call us back */

+

         link_flush_settings(l);

         link_allocate_scopes(l);

         link_add_rrs(l, false);

@@ -556,14 +633,14 @@ const sd_bus_vtable link_vtable[] = {

         SD_BUS_PROPERTY("DNSSECNegativeTrustAnchors", "as", property_get_ntas, 0, 0),

         SD_BUS_PROPERTY("DNSSECSupported", "b", property_get_dnssec_supported, 0, 0),

-        SD_BUS_METHOD("SetDNS", "a(iay)", NULL, bus_link_method_set_dns_servers, 0),

-        SD_BUS_METHOD("SetDomains", "a(sb)", NULL, bus_link_method_set_domains, 0),

-        SD_BUS_METHOD("SetLLMNR", "s", NULL, bus_link_method_set_llmnr, 0),

-        SD_BUS_METHOD("SetMulticastDNS", "s", NULL, bus_link_method_set_mdns, 0),

-        SD_BUS_METHOD("SetDNSOverTLS", "s", NULL, bus_link_method_set_dns_over_tls, 0),

-        SD_BUS_METHOD("SetDNSSEC", "s", NULL, bus_link_method_set_dnssec, 0),

-        SD_BUS_METHOD("SetDNSSECNegativeTrustAnchors", "as", NULL, bus_link_method_set_dnssec_negative_trust_anchors, 0),

-        SD_BUS_METHOD("Revert", NULL, NULL, bus_link_method_revert, 0),

+        SD_BUS_METHOD("SetDNS", "a(iay)", NULL, bus_link_method_set_dns_servers, SD_BUS_VTABLE_UNPRIVILEGED),

+        SD_BUS_METHOD("SetDomains", "a(sb)", NULL, bus_link_method_set_domains, SD_BUS_VTABLE_UNPRIVILEGED),

+        SD_BUS_METHOD("SetLLMNR", "s", NULL, bus_link_method_set_llmnr, SD_BUS_VTABLE_UNPRIVILEGED),

+        SD_BUS_METHOD("SetMulticastDNS", "s", NULL, bus_link_method_set_mdns, SD_BUS_VTABLE_UNPRIVILEGED),

+        SD_BUS_METHOD("SetDNSOverTLS", "s", NULL, bus_link_method_set_dns_over_tls, SD_BUS_VTABLE_UNPRIVILEGED),

+        SD_BUS_METHOD("SetDNSSEC", "s", NULL, bus_link_method_set_dnssec, SD_BUS_VTABLE_UNPRIVILEGED),

+        SD_BUS_METHOD("SetDNSSECNegativeTrustAnchors", "as", NULL, bus_link_method_set_dnssec_negative_trust_anchors, SD_BUS_VTABLE_UNPRIVILEGED),

+        SD_BUS_METHOD("Revert", NULL, NULL, bus_link_method_revert, SD_BUS_VTABLE_UNPRIVILEGED),

         SD_BUS_VTABLE_END

 };