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
2454d23c
Commit
2454d23c
authored
Mar 19, 2016
by
Miek Gieben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
only rewrite types when they are given in uppercase
parent
b186c6bc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
core/setup/rewrite.go
core/setup/rewrite.go
+3
-3
middleware/rewrite/rewrite.go
middleware/rewrite/rewrite.go
+10
-0
No files found.
core/setup/rewrite.go
View file @
2454d23c
...
@@ -30,7 +30,7 @@ func rewriteParse(c *Controller) ([]rewrite.Rule, error) {
...
@@ -30,7 +30,7 @@ func rewriteParse(c *Controller) ([]rewrite.Rule, error) {
for
c
.
Next
()
{
for
c
.
Next
()
{
var
rule
rewrite
.
Rule
var
rule
rewrite
.
Rule
var
err
error
var
err
error
var
base
=
"
/
"
var
base
=
"
.
"
var
pattern
,
to
string
var
pattern
,
to
string
var
status
int
var
status
int
var
ext
[]
string
var
ext
[]
string
...
@@ -57,7 +57,7 @@ func rewriteParse(c *Controller) ([]rewrite.Rule, error) {
...
@@ -57,7 +57,7 @@ func rewriteParse(c *Controller) ([]rewrite.Rule, error) {
return
nil
,
c
.
ArgErr
()
return
nil
,
c
.
ArgErr
()
}
}
to
=
strings
.
Join
(
args1
,
" "
)
to
=
strings
.
Join
(
args1
,
" "
)
case
"ext"
:
case
"ext"
:
// TODO(miek): fix or remove
args1
:=
c
.
RemainingArgs
()
args1
:=
c
.
RemainingArgs
()
if
len
(
args1
)
==
0
{
if
len
(
args1
)
==
0
{
return
nil
,
c
.
ArgErr
()
return
nil
,
c
.
ArgErr
()
...
@@ -73,7 +73,7 @@ func rewriteParse(c *Controller) ([]rewrite.Rule, error) {
...
@@ -73,7 +73,7 @@ func rewriteParse(c *Controller) ([]rewrite.Rule, error) {
return
nil
,
err
return
nil
,
err
}
}
ifs
=
append
(
ifs
,
ifCond
)
ifs
=
append
(
ifs
,
ifCond
)
case
"status"
:
case
"status"
:
// TODO(miek): fix or remove
if
!
c
.
NextArg
()
{
if
!
c
.
NextArg
()
{
return
nil
,
c
.
ArgErr
()
return
nil
,
c
.
ArgErr
()
}
}
...
...
middleware/rewrite/rewrite.go
View file @
2454d23c
...
@@ -3,6 +3,8 @@
...
@@ -3,6 +3,8 @@
package
rewrite
package
rewrite
import
(
import
(
"strings"
"github.com/miekg/coredns/middleware"
"github.com/miekg/coredns/middleware"
"github.com/miekg/dns"
"github.com/miekg/dns"
"golang.org/x/net/context"
"golang.org/x/net/context"
...
@@ -64,7 +66,15 @@ type SimpleRule struct {
...
@@ -64,7 +66,15 @@ type SimpleRule struct {
func
NewSimpleRule
(
from
,
to
string
)
SimpleRule
{
func
NewSimpleRule
(
from
,
to
string
)
SimpleRule
{
tpf
:=
dns
.
StringToType
[
from
]
tpf
:=
dns
.
StringToType
[
from
]
tpt
:=
dns
.
StringToType
[
to
]
tpt
:=
dns
.
StringToType
[
to
]
// It's only a type if uppercase is used.
if
from
!=
strings
.
ToUpper
(
from
)
{
tpf
=
0
}
if
to
!=
strings
.
ToUpper
(
to
)
{
tpt
=
0
}
// lowercase and fully qualify the others here? TODO(miek)
return
SimpleRule
{
From
:
from
,
To
:
to
,
fromType
:
tpf
,
toType
:
tpt
}
return
SimpleRule
{
From
:
from
,
To
:
to
,
fromType
:
tpf
,
toType
:
tpt
}
}
}
...
...
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