github/docker-labs
1
0
Fork 0
mirror of https://github.com/bingohuang/docker-labs.git synced 2025-07-14 18:27:25 +08:00
Code Issues Releases Wiki Activity

Make regex more restrictive to allow the proxy to be more deterministic.

Browse Source 
Make it to not depend on a specific TLD.
This commit is contained in:
Jonathan Leibiusky @xetorthio 2016-11-23 11:49:07 -03:00
parent b4ce06fa20
commit 6af6f42721
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api.go
View File

@ -36,6 +36,12 @@ func main() {
} }
r := mux.NewRouter() r := mux.NewRouter()
// Reverse proxy (needs to be the first route, to make sure it is the first thing we check)
proxyHandler := handlers.NewMultipleHostReverseProxy()
r.Host(`{node:ip[0-9]{1,3}_[0-9]{1,3}_[0-9]{1,3}_[0-9]{1,3}}-{port:[0-9]*}.{tld:.*}`).Handler(proxyHandler)
r.Host(`{node:ip[0-9]{1,3}_[0-9]{1,3}_[0-9]{1,3}_[0-9]{1,3}}.{tld:.*}`).Handler(proxyHandler)
r.StrictSlash(false) r.StrictSlash(false)
r.HandleFunc("/ping", http.HandlerFunc(handlers.Ping)).Methods("GET") r.HandleFunc("/ping", http.HandlerFunc(handlers.Ping)).Methods("GET")
@ -59,11 +65,6 @@ func main() {
r.Handle("/sessions/{sessionId}/ws/", server) r.Handle("/sessions/{sessionId}/ws/", server)
// Reverse proxy
proxyHandler := handlers.NewMultipleHostReverseProxy()
r.Host(`{node}-{port:[0-9]*}.play-with-docker.com`).Handler(proxyHandler)
r.Host(`{node}.play-with-docker.com`).Handler(proxyHandler)
n := negroni.Classic() n := negroni.Classic()
n.UseHandler(r) n.UseHandler(r)

2
services/session.go
View File

@ -108,12 +108,14 @@ func NewSession() (*Session, error) {
log.Println("ERROR NETWORKING") log.Println("ERROR NETWORKING")
return nil, err return nil, err
} }
log.Printf("Network [%s] created for session [%s]\n", s.Id, s.Id)
// Connect PWD daemon to the new network // Connect PWD daemon to the new network
if err := ConnectNetwork("pwd", s.Id); err != nil { if err := ConnectNetwork("pwd", s.Id); err != nil {
log.Println("ERROR NETWORKING") log.Println("ERROR NETWORKING")
return nil, err return nil, err
} }
log.Printf("Connected pwd to network [%s]\n", s.Id)
// We store sessions as soon as we create one so we don't delete new sessions on an api restart // We store sessions as soon as we create one so we don't delete new sessions on an api restart
if err := saveSessionsToDisk(); err != nil { if err := saveSessionsToDisk(); err != nil {