Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
C
Coredns
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Railgun
Coredns
Commits
be551f21
Commit
be551f21
authored
Aug 08, 2017
by
Miek Gieben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
core: add missing trimzone files
*ugh*: forgot to add these files. This add the dnsutil.TrimZone function.
parent
7ed44cb6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
59 additions
and
0 deletions
+59
-0
middleware/pkg/dnsutil/zone.go
middleware/pkg/dnsutil/zone.go
+20
-0
middleware/pkg/dnsutil/zone_test.go
middleware/pkg/dnsutil/zone_test.go
+39
-0
No files found.
middleware/pkg/dnsutil/zone.go
0 → 100644
View file @
be551f21
package
dnsutil
import
(
"errors"
"github.com/miekg/dns"
)
// TrimZone removes the zone component from q. It returns the trimmed
// name or an error is zone is longer then qname. The trimmed name will be returned
// without a trailing dot.
func
TrimZone
(
q
string
,
z
string
)
(
string
,
error
)
{
zl
:=
dns
.
CountLabel
(
z
)
i
,
ok
:=
dns
.
PrevLabel
(
q
,
zl
)
if
ok
||
i
-
1
<
0
{
return
""
,
errors
.
New
(
"trimzone: overshot qname: "
+
q
+
"for zone "
+
z
)
}
// This includes the '.', remove on return
return
q
[
:
i
-
1
],
nil
}
middleware/pkg/dnsutil/zone_test.go
0 → 100644
View file @
be551f21
package
dnsutil
import
(
"errors"
"testing"
"github.com/miekg/dns"
)
func
TestTrimZone
(
t
*
testing
.
T
)
{
tests
:=
[]
struct
{
qname
string
zone
string
expected
string
err
error
}{
{
"a.example.org"
,
"example.org"
,
"a"
,
nil
},
{
"a.b.example.org"
,
"example.org"
,
"a.b"
,
nil
},
{
"b."
,
"."
,
"b"
,
nil
},
{
"example.org"
,
"example.org"
,
""
,
errors
.
New
(
"should err"
)},
{
"org"
,
"example.org"
,
""
,
errors
.
New
(
"should err"
)},
}
for
i
,
tc
:=
range
tests
{
got
,
err
:=
TrimZone
(
dns
.
Fqdn
(
tc
.
qname
),
dns
.
Fqdn
(
tc
.
zone
))
if
tc
.
err
!=
nil
&&
err
==
nil
{
t
.
Errorf
(
"Test %d, expected error got nil"
)
continue
}
if
tc
.
err
==
nil
&&
err
!=
nil
{
t
.
Errorf
(
"Test %d, expected no error got %v"
,
i
,
err
)
continue
}
if
got
!=
tc
.
expected
{
t
.
Errorf
(
"Test %d, expected %s, got %s"
,
i
,
tc
.
expected
,
got
)
continue
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment