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

WIP

Browse Source
This commit is contained in:
Jonathan Leibiusky @xetorthio
2017-07-25 16:36:10 -03:00
parent 8424479e76
commit 53e6078cc5
22 changed files with 307 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
router/host.go Normal file
View File

@@ -0,0 +1,71 @@
package router
import (
"fmt"
"regexp"
"strconv"
"strings"
)
const hostPattern = "^.*ip([0-9]{1,3}-[0-9]{1,3}-[0-9]{1,3}-[0-9]{1,3})-([0-9|a-z]+)(?:-?([0-9]{1,5}))?(?:\\.([a-z|A-Z|0-9|_|\\-\\.]+))?(?:\\:([0-9]{1,5}))?$"
var hostRegex *regexp.Regexp
func init() {
hostRegex = regexp.MustCompile(hostPattern)
}
type HostOpts struct {
TLD string
EncodedPort int
Port int
}
type HostInfo struct {
SessionId string
InstanceIP string
TLD string
EncodedPort int
Port int
}
func EncodeHost(sessionId, instanceIP string, opts HostOpts) string {
encodedIP := strings.Replace(instanceIP, ".", "-", -1)
sub := fmt.Sprintf("ip%s-%s", encodedIP, sessionId)
if opts.EncodedPort > 0 {
sub = fmt.Sprintf("%s-%d", sub, opts.EncodedPort)
}
if opts.TLD != "" {
sub = fmt.Sprintf("%s.%s", sub, opts.TLD)
}
if opts.Port > 0 {
sub = fmt.Sprintf("%s:%d", sub, opts.Port)
}
return sub
}
func DecodeHost(host string) (HostInfo, error) {
info := HostInfo{}
matches := hostRegex.FindStringSubmatch(host)
if len(matches) != 6 {
return HostInfo{}, fmt.Errorf("Couldn't find host in string")
}
info.InstanceIP = strings.Replace(matches[1], "-", ".", -1)
info.SessionId = matches[2]
info.TLD = matches[4]
if matches[3] != "" {
i, _ := strconv.Atoi(matches[3])
info.EncodedPort = i
}
if matches[5] != "" {
i, _ := strconv.Atoi(matches[5])
info.Port = i
}
return info, nil
}

45
router/host_test.go Normal file
View File

@@ -0,0 +1,45 @@
package router
import (
"testing"
"github.com/stretchr/testify/assert"
)
func TestEncodeHostInfo(t *testing.T) {
host := EncodeHost("aaabbbcccddd", "10.0.0.1", HostOpts{})
assert.Equal(t, "ip10-0-0-1-aaabbbcccddd", host)
opts := HostOpts{EncodedPort: 8080}
host = EncodeHost("aaabbbcccddd", "10.0.0.1", opts)
assert.Equal(t, "ip10-0-0-1-aaabbbcccddd-8080", host)
opts = HostOpts{TLD: "foo.bar"}
host = EncodeHost("aaabbbcccddd", "10.0.0.1", opts)
assert.Equal(t, "ip10-0-0-1-aaabbbcccddd.foo.bar", host)
opts = HostOpts{TLD: "foo.bar", EncodedPort: 8080, Port: 443}
host = EncodeHost("aaabbbcccddd", "10.0.0.1", opts)
assert.Equal(t, "ip10-0-0-1-aaabbbcccddd-8080.foo.bar:443", host)
}
func TestDecodeHostInfo(t *testing.T) {
info, err := DecodeHost("ip10-0-0-1-aaabbbcccddd")
assert.Nil(t, err)
assert.Equal(t, HostInfo{InstanceIP: "10.0.0.1", SessionId: "aaabbbcccddd"}, info)
info, err = DecodeHost("ip10-0-0-1-aaabbbcccddd-8080")
assert.Nil(t, err)
assert.Equal(t, HostInfo{InstanceIP: "10.0.0.1", SessionId: "aaabbbcccddd", EncodedPort: 8080}, info)
info, err = DecodeHost("ip10-0-0-1-aaabbbcccddd-8080.foo.bar")
assert.Nil(t, err)
assert.Equal(t, HostInfo{InstanceIP: "10.0.0.1", SessionId: "aaabbbcccddd", EncodedPort: 8080, TLD: "foo.bar"}, info)
info, err = DecodeHost("ip10-0-0-1-aaabbbcccddd-8080.foo.bar:443")
assert.Nil(t, err)
assert.Equal(t, HostInfo{InstanceIP: "10.0.0.1", SessionId: "aaabbbcccddd", EncodedPort: 8080, TLD: "foo.bar", Port: 443}, info)
_, err = DecodeHost("ip10-0-0-1")
assert.NotNil(t, err)
}

33
router/l2/l2.go
View File

@@ -7,7 +7,6 @@ import (
"log"
"net"
"os"
"strings"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
@@ -18,31 +17,23 @@ import (
)
func director(host string) (*net.TCPAddr, error) {
chunks := strings.Split(host, ":")
matches := config.NameFilter.FindStringSubmatch(chunks[0])
var rawHost, port string
if len(matches) == 3 {
rawHost = matches[1]
port = matches[2]
} else if len(matches) == 2 {
rawHost = matches[1]
} else {
return nil, fmt.Errorf("Couldn't find host in string")
info, err := router.DecodeHost(host)
if err != nil {
return nil, err
}
if port == "" {
if len(chunks) == 2 {
port = chunks[1]
} else {
port = "80"
}
port := info.Port
if info.EncodedPort > 0 {
port = info.EncodedPort
}
dstHost := strings.Replace(rawHost, "-", ".", -1)
if port == 0 {
// TODO: Should default depending on the protocol
port = 80
}
t, err := net.ResolveTCPAddr("tcp4", fmt.Sprintf("%s:%s", dstHost, port))
t, err := net.ResolveTCPAddr("tcp4", fmt.Sprintf("%s:%d", info.InstanceIP, port))
if err != nil {
return nil, err
}

21
router/l2/l2_test.go
View File

@@ -7,41 +7,38 @@ import (
)
func TestDirector(t *testing.T) {
addr, err := director("ip10-0-0-1-8080.foo.bar")
addr, err := director("ip10-0-0-1-aabb-8080.foo.bar")
assert.Nil(t, err)
assert.Equal(t, "10.0.0.1:8080", addr.String())
addr, err = director("ip10-0-0-1.foo.bar")
addr, err = director("ip10-0-0-1-aabb.foo.bar")
assert.Nil(t, err)
assert.Equal(t, "10.0.0.1:80", addr.String())
addr, err = director("ip10-0-0-1.foo.bar:9090")
addr, err = director("ip10-0-0-1-aabb.foo.bar:9090")
assert.Nil(t, err)
assert.Equal(t, "10.0.0.1:9090", addr.String())
addr, err = director("ip10-0-0-1-2222.foo.bar:9090")
addr, err = director("ip10-0-0-1-aabb-2222.foo.bar:9090")
assert.Nil(t, err)
assert.Equal(t, "10.0.0.1:2222", addr.String())
addr, err = director("lala.ip10-0-0-1-2222.foo.bar")
addr, err = director("lala.ip10-0-0-1-aabb-2222.foo.bar")
assert.Nil(t, err)
assert.Equal(t, "10.0.0.1:2222", addr.String())
addr, err = director("lala.ip10-0-0-1-2222")
addr, err = director("lala.ip10-0-0-1-aabb-2222")
assert.Nil(t, err)
assert.Equal(t, "10.0.0.1:2222", addr.String())
addr, err = director("ip10-0-0-1-2222")
addr, err = director("ip10-0-0-1-aabb-2222")
assert.Nil(t, err)
assert.Equal(t, "10.0.0.1:2222", addr.String())
addr, err = director("ip10-0-0-1")
addr, err = director("ip10-0-0-1-aabb")
assert.Nil(t, err)
assert.Equal(t, "10.0.0.1:80", addr.String())
_, err = director("lala10-0-0-1.foo.bar")
assert.NotNil(t, err)
_, err = director("ip10-0-0-1-10-20")
_, err = director("lala10-0-0-1-aabb.foo.bar")
assert.NotNil(t, err)
}