xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ndb/dns: mark ns record authoritative when in our area for delegation

Browse source 
I have the problem that i need to delegate a subdomain
to another name server that is confused about its own zone
(and its own name) returning unusable ns records.

With this, one can make up a nameserver entry in ndb that
is authoritative and owned by us for that nameserver,
and then put it in the soa=delegated ns entry.

This promotes the ns record in the soa=delegated to
Authoritative, which avoids overriding the ns rr's from
the confused server for the delegated zone.
This commit is contained in:
cinap_lenrek 2020-10-17 21:28:25 +02:00
parent d310da13ba
commit bf18724738
2 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/src/cmd/ndb/dn.c
View file

@ -641,7 +641,8 @@ dnauthdb(void)
if(rp->ttl < minttl)
rp->ttl = minttl;
rp->auth = 1;
}
} else if(rp->type == Tns && inmyarea(rp->host->name))
rp->auth = 1;
}
l = &rp->next;
}

50
sys/src/cmd/ndb/dnarea.c
View file

@ -7,36 +7,36 @@
Area *owned, *delegated;
static Area*
nameinarea(char *name, Area *s)
{
int len;
for(len = strlen(name); s != nil; s = s->next){
if(s->len > len)
continue;
if(cistrcmp(s->soarr->owner->name, name + len - s->len) == 0)
if(len == s->len || name[len - s->len - 1] == '.')
return s;
}
return nil;
}
/*
* true if a name is in our area
*/
Area*
inmyarea(char *name)
{
int len;
Area *s, *d;
len = strlen(name);
for(s = owned; s; s = s->next){
if(s->len > len)
continue;
if(cistrcmp(s->soarr->owner->name, name + len - s->len) == 0)
if(len == s->len || name[len - s->len - 1] == '.')
break;
}
s = nameinarea(name, owned);
if(s == nil)
return nil;
/* name is in area `s' */
for(d = delegated; d; d = d->next){
if(d->len > len)
continue;
if(cistrcmp(d->soarr->owner->name, name + len - d->len) == 0)
if(len == d->len || name[len - d->len - 1] == '.')
return nil; /* name is in a delegated subarea */
}
return s; /* name is in area `s' and not in a delegated subarea */
d = nameinarea(name, delegated);
if(d && d->len > s->len)
return nil;
return s; /* name is in owned area `s' and not in a delegated subarea */
}
/*
@ -48,6 +48,9 @@ addarea(DN *dp, RR *rp, Ndbtuple *t)
{
Area *s;
Area **l;
int len;
len = strlen(dp->name);
lock(&dnlock);
if(t->val[0])
@ -55,11 +58,14 @@ addarea(DN *dp, RR *rp, Ndbtuple *t)
else
l = &owned;
for (s = *l; s != nil; s = s->next)
for (s = *l; s != nil; l = &s->next, s = s->next){
if(s->len < len)
break;
if(s->soarr->owner == dp) {
unlock(&dnlock);
return; /* we've already got one */
}
}
/*
* The area contains a copy of the soa rr that created it.
@ -67,7 +73,7 @@ addarea(DN *dp, RR *rp, Ndbtuple *t)
* as the area does.
*/
s = emalloc(sizeof(*s));
s->len = strlen(dp->name);
s->len = len;
rrcopy(rp, &s->soarr);
s->soarr->owner = dp;
s->soarr->db = 1;