epic/play-with-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for setting alias when creatign instance. (#140)

Browse Source 
* Add support for setting alias when creatign instance.

The POST to create a instance now provides an `alias` field which
then can be used to access the instance services through the following
URL:

`http://<alias>-<short_session>-<port>.<tld>`

When creating a session you can now send an `alias`

* Remove unnecessary function

* Add alias support for DNS resolution
This commit is contained in:
Marcos Nils
2017-05-11 17:39:17 -03:00
committed by GitHub
parent 62c5d3761d
commit 61a0bb4db1
5 changed files with 59 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
handlers/dns.go
View File

@@ -8,16 +8,20 @@ import (
"strings"
"github.com/miekg/dns"
"github.com/play-with-docker/play-with-docker/services"
)
var dnsFilter = regexp.MustCompile(`pwd[0-9]{1,3}_[0-9]{1,3}_[0-9]{1,3}_[0-9]{1,3}`)
var dnsFilter = regexp.MustCompile(`^.*pwd([0-9]{1,3}_[0-9]{1,3}_[0-9]{1,3}_[0-9]{1,3}(?:-[0-9]{1,5})?)\..*$`)
var aliasFilter = regexp.MustCompile(`^.*pwd(.*?)-(.*?)[\.-].*`)
func DnsRequest(w dns.ResponseWriter, r *dns.Msg) {
if len(r.Question) > 0 && dnsFilter.MatchString(r.Question[0].Name) {
// this is something we know about and we should try to handle
question := r.Question[0].Name
domainChunks := strings.Split(question, ".")
tldChunks := strings.Split(strings.TrimPrefix(domainChunks[0], "pwd"), "-")
match := dnsFilter.FindStringSubmatch(question)
tldChunks := strings.Split(match[1], "-")
ip := strings.Replace(tldChunks[0], "_", ".", -1)
m := new(dns.Msg)
@@ -31,6 +35,25 @@ func DnsRequest(w dns.ResponseWriter, r *dns.Msg) {
m.Answer = append(m.Answer, a)
w.WriteMsg(m)
return
} else if len(r.Question) > 0 && aliasFilter.MatchString(r.Question[0].Name) {
// this is something we know about and we should try to handle
question := r.Question[0].Name
match := aliasFilter.FindStringSubmatch(question)
i := services.FindInstanceByAlias(match[2], match[1])
m := new(dns.Msg)
m.SetReply(r)
m.Authoritative = true
m.RecursionAvailable = true
a, err := dns.NewRR(fmt.Sprintf("%s 60 IN A %s", question, i.IP))
if err != nil {
log.Fatal(err)
}
m.Answer = append(m.Answer, a)
w.WriteMsg(m)
return
} else {
if len(r.Question) > 0 {
question := r.Question[0].Name