add krb5-selfsub and ms-selfsub

(cherry picked from commit fbeefd4990a53daabcbbc2130b39f0e7e1e6dd50)

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 2441f37389bf55f1f45b293138c90e2f43a27358..c051a8a96a911849e62b18bd8187cb5ffb5c1876 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -12590,12 +12590,13 @@ example.com. NS ns2.example.net.
              the rules are checked for each existing record type.
            </para>
            <para>
-             The <replaceable>ruletype</replaceable> field has 13
+             The <replaceable>ruletype</replaceable> field has 16
              values:
              <varname>name</varname>, <varname>subdomain</varname>,
              <varname>wildcard</varname>, <varname>self</varname>,
              <varname>selfsub</varname>, <varname>selfwild</varname>,
              <varname>krb5-self</varname>, <varname>ms-self</varname>,
+             <varname>krb5-selfsub</varname>, <varname>ms-selfsub</varname>,
              <varname>krb5-subdomain</varname>,
              <varname>ms-subdomain</varname>,
              <varname>tcp-self</varname>, <varname>6to4-self</varname>,
@@ -12754,6 +12755,20 @@ example.com. NS ns2.example.net.
                      </para>
                    </entry>
                  </row>
+                 <row rowsep="0">
+                   <entry colname="1">
+                     <para>
+                       <varname>ms-selfsub</varname>
+                     </para>
+                   </entry> <entry colname="2">
+                     <para>
+                       This is similar to <command>ms-self</command>
+                       except it also allows updates to any subdomain of
+                       the name specified in the Windows machine
+                       principal, not just to the name itself.
+                     </para>
+                   </entry>
+                 </row>
                  <row rowsep="0">
                    <entry colname="1">
                      <para>
@@ -12825,6 +12840,20 @@ example.com. NS ns2.example.net.
                      </para>
                    </entry>
                  </row>
+                 <row rowsep="0">
+                   <entry colname="1">
+                     <para>
+                       <varname>krb5-selfsub</varname>
+                     </para>
+                   </entry> <entry colname="2">
+                     <para>
+                       This is similar to <command>krb5-self</command>
+                       except it also allows updates to any subdomain of
+                       the name specified in the 'machine' part of the
+                       Kerberos principal, not just to the name itself.
+                     </para>
+                   </entry>
+                 </row>
                  <row rowsep="0">
                    <entry colname="1">
                      <para>

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 3b078e0225e109c7d092b695b4c74dcae04dd726..9584ed61254f583f1333c2e7c7d14fac6698c2e4 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1814,6 +1814,8 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) {
                        break;
                case dns_ssumatchtype_selfkrb5:
                case dns_ssumatchtype_selfms:
+               case dns_ssumatchtype_selfsubkrb5:
+               case dns_ssumatchtype_selfsubms:
                case dns_ssumatchtype_tcpself:
                case dns_ssumatchtype_6to4self:
                        if (tresult == ISC_R_SUCCESS &&

diff --git a/lib/dns/gssapictx.c b/lib/dns/gssapictx.c
index 5bcbc22a3ffe7fc1923bc374adbe6bd6976ff0d8..0bcb55fa47c51a302ca7b1b7a0fd658cb1564b32 100644 (file)
--- a/lib/dns/gssapictx.c
+++ b/lib/dns/gssapictx.c
@@ -348,11 +348,11 @@ cleanup:
 bool
 dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer,
                                    const dns_name_t *name,
-                                   const dns_name_t *realm)
+                                   const dns_name_t *realm,
+                                   bool subdomain)
 {
 #ifdef GSSAPI
        char sbuf[DNS_NAME_FORMATSIZE];
-       char nbuf[DNS_NAME_FORMATSIZE];
        char rbuf[DNS_NAME_FORMATSIZE];
        char *sname;
        char *rname;
@@ -367,8 +367,6 @@ dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer,
        result = dns_name_toprincipal(signer, &buffer);
        RUNTIME_CHECK(result == ISC_R_SUCCESS);
        isc_buffer_putuint8(&buffer, 0);
-       if (name != NULL)
-               dns_name_format(name, nbuf, sizeof(nbuf));
        dns_name_format(realm, rbuf, sizeof(rbuf));
 
        /*
@@ -382,6 +380,10 @@ dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer,
        *rname = '\0';
        rname++;
 
+       if (strcmp(rname, rbuf) != 0) {
+               return (false);
+       }
+
        /*
         * Find the host portion of the signer's name.  We do this by
         * searching for the first / character.  We then check to make
@@ -399,22 +401,30 @@ dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer,
                return (false);
 
        /*
-        * Now, we do a simple comparison between the name and the realm.
+        * If name is non NULL check that it matches against the
+        * machine name as expected.
         */
        if (name != NULL) {
-               if ((strcasecmp(sname, nbuf) == 0)
-                   && (strcmp(rname, rbuf) == 0))
-                       return (true);
-       } else {
-               if (strcmp(rname, rbuf) == 0)
-                       return (true);
+               dns_fixedname_t fixed;
+               dns_name_t *machine;
+
+               machine = dns_fixedname_initname(&fixed);
+               result = dns_name_fromstring(machine, sname, 0, NULL);
+               if (result != ISC_R_SUCCESS) {
+                       return (false);
+               }
+               if (subdomain) {
+                       return (dns_name_issubdomain(name, machine));
+               }
+               return (dns_name_equal(name, machine));
        }
 
-       return (false);
+       return (true);
 #else
        UNUSED(signer);
        UNUSED(name);
        UNUSED(realm);
+       UNUSED(subdomain);
        return (false);
 #endif
 }
@@ -422,14 +432,13 @@ dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer,
 bool
 dst_gssapi_identitymatchesrealmms(const dns_name_t *signer,
                                  const dns_name_t *name,
-                                 const dns_name_t *realm)
+                                 const dns_name_t *realm,
+                                 bool subdomain)
 {
 #ifdef GSSAPI
        char sbuf[DNS_NAME_FORMATSIZE];
-       char nbuf[DNS_NAME_FORMATSIZE];
        char rbuf[DNS_NAME_FORMATSIZE];
        char *sname;
-       char *nname;
        char *rname;
        isc_buffer_t buffer;
        isc_result_t result;
@@ -442,8 +451,6 @@ dst_gssapi_identitymatchesrealmms(const dns_name_t *signer,
        result = dns_name_toprincipal(signer, &buffer);
        RUNTIME_CHECK(result == ISC_R_SUCCESS);
        isc_buffer_putuint8(&buffer, 0);
-       if (name != NULL)
-               dns_name_format(name, nbuf, sizeof(nbuf));
        dns_name_format(realm, rbuf, sizeof(rbuf));
 
        /*
@@ -477,36 +484,35 @@ dst_gssapi_identitymatchesrealmms(const dns_name_t *signer,
        *sname = '\0';
        sname = sbuf;
 
-       /*
-        * Find the first . in the target name, and make it the end of
-        * the string.   The rest of the name has to match the realm.
-        */
-       if (name != NULL) {
-               nname = strchr(nbuf, '.');
-               if (nname == NULL)
-                       return (false);
-               *nname++ = '\0';
+       if (strcmp(rname, rbuf) != 0) {
+               return (false);
        }
 
        /*
-        * Now, we do a simple comparison between the name and the realm.
+        * Now, we check that the realm matches (case sensitive) and that
+        * 'name' matches against 'machinename' qualified with 'realm'.
         */
        if (name != NULL) {
-               if ((strcasecmp(sname, nbuf) == 0)
-                   && (strcmp(rname, rbuf) == 0)
-                   && (strcasecmp(nname, rbuf) == 0))
-                       return (true);
-       } else {
-               if (strcmp(rname, rbuf) == 0)
-                       return (true);
-       }
+               dns_fixedname_t fixed;
+               dns_name_t *machine;
 
+               machine = dns_fixedname_initname(&fixed);
+               result = dns_name_fromstring2(machine, sbuf, realm, 0, NULL);
+               if (result != ISC_R_SUCCESS) {
+                       return (false);
+               }
+               if (subdomain) {
+                       return (dns_name_issubdomain(name, machine));
+               }
+               return (dns_name_equal(name, machine));
+       }
 
-       return (false);
+       return (true);
 #else
        UNUSED(signer);
        UNUSED(name);
        UNUSED(realm);
+       UNUSED(subdomain);
        return (false);
 #endif
 }

diff --git a/lib/dns/include/dns/ssu.h b/lib/dns/include/dns/ssu.h
index 1cfc90960dcb937757be38cc2fd7dee3ca5868d7..e04670f661e853f74cf3adc61b131d004a4b9a5f 100644 (file)
--- a/lib/dns/include/dns/ssu.h
+++ b/lib/dns/include/dns/ssu.h
@@ -39,9 +39,11 @@ typedef enum {
        dns_ssumatchtype_6to4self = 11,
        dns_ssumatchtype_external = 12,
        dns_ssumatchtype_local = 13,
-       dns_ssumatchtype_max = 13,      /* max value */
+       dns_ssumatchtype_selfsubms = 14,
+       dns_ssumatchtype_selfsubkrb5 = 15,
+       dns_ssumatchtype_max = 15,      /* max value */
 
-       dns_ssumatchtype_dlz = 14       /* intentionally higher than _max */
+       dns_ssumatchtype_dlz = 16       /* intentionally higher than _max */
 } dns_ssumatchtype_t;
 
 isc_result_t

diff --git a/lib/dns/include/dst/gssapi.h b/lib/dns/include/dst/gssapi.h
index e08dee280107f7fd559bd0ee31f54e89dea5a2e9..8ce6c30459f5d6f9c918c4a13e483d733af0febe 100644 (file)
--- a/lib/dns/include/dst/gssapi.h
+++ b/lib/dns/include/dst/gssapi.h
@@ -189,7 +189,8 @@ gss_error_tostring(uint32_t major, uint32_t minor,
 bool
 dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer,
                                    const dns_name_t *name,
-                                   const dns_name_t *realm);
+                                   const dns_name_t *realm,
+                                   bool subdomain);
 /*
  *     Compare a "signer" (in the format of a Kerberos-format Kerberos5
  *     principal: host/example.com@EXAMPLE.COM) to the realm name stored
@@ -200,7 +201,8 @@ dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer,
 bool
 dst_gssapi_identitymatchesrealmms(const dns_name_t *signer,
                                  const dns_name_t *name,
-                                 const dns_name_t *realm);
+                                 const dns_name_t *realm,
+                                 bool subdomain);
 /*
  *     Compare a "signer" (in the format of a Kerberos-format Kerberos5
  *     principal: host/example.com@EXAMPLE.COM) to the realm name stored

diff --git a/lib/dns/ssu.c b/lib/dns/ssu.c
index f76405d2c158c8fabf7e47a3390b2e6bc9ab5edc..f3e06d42e1e1abdd3b2bdcb2f0fc3ba7047213c2 100644 (file)
--- a/lib/dns/ssu.c
+++ b/lib/dns/ssu.c
@@ -397,6 +397,8 @@ dns_ssutable_checkrules2(dns_ssutable_t *table, const dns_name_t *signer,
                        break;
                case dns_ssumatchtype_selfkrb5:
                case dns_ssumatchtype_selfms:
+               case dns_ssumatchtype_selfsubkrb5:
+               case dns_ssumatchtype_selfsubms:
                case dns_ssumatchtype_subdomainkrb5:
                case dns_ssumatchtype_subdomainms:
                        if (signer == NULL)
@@ -466,29 +468,55 @@ dns_ssutable_checkrules2(dns_ssutable_t *table, const dns_name_t *signer,
                                continue;
                        break;
                case dns_ssumatchtype_selfkrb5:
-                       if (!dst_gssapi_identitymatchesrealmkrb5(signer, name,
-                                                              rule->identity))
-                               continue;
-                       break;
+                       if (dst_gssapi_identitymatchesrealmkrb5(signer, name,
+                                                               rule->identity,
+                                                               false))
+                       {
+                               break;
+                       }
+                       continue;
                case dns_ssumatchtype_selfms:
-                       if (!dst_gssapi_identitymatchesrealmms(signer, name,
-                                                              rule->identity))
-                               continue;
-                       break;
+                       if (dst_gssapi_identitymatchesrealmms(signer, name,
+                                                             rule->identity,
+                                                             false))
+                       {
+                               break;
+                       }
+                       continue;
+               case dns_ssumatchtype_selfsubkrb5:
+                       if (dst_gssapi_identitymatchesrealmkrb5(signer, name,
+                                                               rule->identity,
+                                                               true))
+                       {
+                               break;
+                       }
+                       continue;
+               case dns_ssumatchtype_selfsubms:
+                       if (dst_gssapi_identitymatchesrealmms(signer, name,
+                                                             rule->identity,
+                                                             true))
+                               break;
+                       continue;
                case dns_ssumatchtype_subdomainkrb5:
                        if (!dns_name_issubdomain(name, rule->name))
                                continue;
-                       if (!dst_gssapi_identitymatchesrealmkrb5(signer, NULL,
-                                                              rule->identity))
-                               continue;
-                       break;
+                       if (dst_gssapi_identitymatchesrealmkrb5(signer, NULL,
+                                                               rule->identity,
+                                                               false))
+                       {
+                               break;
+                       }
+                       continue;
                case dns_ssumatchtype_subdomainms:
                        if (!dns_name_issubdomain(name, rule->name))
                                continue;
-                       if (!dst_gssapi_identitymatchesrealmms(signer, NULL,
-                                                              rule->identity))
-                               continue;
-                       break;
+                       if (dst_gssapi_identitymatchesrealmms(signer, NULL,
+                                                             rule->identity,
+                                                             false))
+                       {
+                               break;
+                       }
+                       continue;
                case dns_ssumatchtype_tcpself:
                        tcpself = dns_fixedname_initname(&fixed);
                        reverse_from_address(tcpself, addr);
@@ -661,8 +689,12 @@ dns_ssu_mtypefromstring(const char *str, dns_ssumatchtype_t *mtype) {
                *mtype = dns_ssumatchtype_selfwild;
        } else if (strcasecmp(str, "ms-self") == 0) {
                *mtype = dns_ssumatchtype_selfms;
+       } else if (strcasecmp(str, "ms-selfsub") == 0) {
+               *mtype = dns_ssumatchtype_selfsubms;
        } else if (strcasecmp(str, "krb5-self") == 0) {
                *mtype = dns_ssumatchtype_selfkrb5;
+       } else if (strcasecmp(str, "krb5-selfsub") == 0) {
+               *mtype = dns_ssumatchtype_selfsubkrb5;
        } else if (strcasecmp(str, "ms-subdomain") == 0) {
                *mtype = dns_ssumatchtype_subdomainms;
        } else if (strcasecmp(str, "krb5-subdomain") == 0) {

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index ebd0a54e05091f9c4160777b476617c89b1b31ee..7eef4582aa9e1d19e4bf0d740bedd83eb043fbbd 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -322,9 +322,10 @@ doc_matchname(cfg_printer_t *pctx, const cfg_type_t *type) {
 }
 
 static const char *matchtype_enums[] = {
-       "6to4-self", "external", "krb5-self", "krb5-subdomain", "ms-self",
-       "ms-subdomain", "name", "self", "selfsub", "selfwild", "subdomain",
-       "tcp-self", "wildcard", "zonesub", NULL
+       "6to4-self", "external", "krb5-self", "krb5-selfsub",
+       "krb5-subdomain", "ms-self", "ms-selfsub", "ms-subdomain",
+       "name", "self", "selfsub", "selfwild", "subdomain", "tcp-self",
+       "wildcard", "zonesub", NULL
 };
 
 static cfg_type_t cfg_type_matchtype = {