mirror of https://github.com/fatedier/frp.git
Merge pull request #88 from fatedier/fatedier/wildcard_domains
utils/vhost: support wildcard domains
This commit is contained in:
commit
0e1752b5ce
|
@ -71,6 +71,18 @@ func (v *VhostMuxer) Listen(name string, rewriteHost string) (l *Listener, err e
|
||||||
func (v *VhostMuxer) getListener(name string) (l *Listener, exist bool) {
|
func (v *VhostMuxer) getListener(name string) (l *Listener, exist bool) {
|
||||||
v.mutex.RLock()
|
v.mutex.RLock()
|
||||||
defer v.mutex.RUnlock()
|
defer v.mutex.RUnlock()
|
||||||
|
// first we check the full hostname
|
||||||
|
// if not exist, then check the wildcard_domain such as *.example.com
|
||||||
|
l, exist = v.registryMap[name]
|
||||||
|
if exist {
|
||||||
|
return l, exist
|
||||||
|
}
|
||||||
|
domainSplit := strings.Split(name, ".")
|
||||||
|
if len(domainSplit) < 3 {
|
||||||
|
return l, false
|
||||||
|
}
|
||||||
|
domainSplit[0] = "*"
|
||||||
|
name = strings.Join(domainSplit, ".")
|
||||||
l, exist = v.registryMap[name]
|
l, exist = v.registryMap[name]
|
||||||
return l, exist
|
return l, exist
|
||||||
}
|
}
|
||||||
|
@ -93,21 +105,26 @@ func (v *VhostMuxer) run() {
|
||||||
|
|
||||||
func (v *VhostMuxer) handle(c *conn.Conn) {
|
func (v *VhostMuxer) handle(c *conn.Conn) {
|
||||||
if err := c.SetDeadline(time.Now().Add(v.timeout)); err != nil {
|
if err := c.SetDeadline(time.Now().Add(v.timeout)); err != nil {
|
||||||
|
c.Close()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
sConn, name, err := v.vhostFunc(c)
|
sConn, name, err := v.vhostFunc(c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
c.Close()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
name = strings.ToLower(name)
|
name = strings.ToLower(name)
|
||||||
|
// get listener by hostname
|
||||||
l, ok := v.getListener(name)
|
l, ok := v.getListener(name)
|
||||||
if !ok {
|
if !ok {
|
||||||
|
c.Close()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = sConn.SetDeadline(time.Time{}); err != nil {
|
if err = sConn.SetDeadline(time.Time{}); err != nil {
|
||||||
|
c.Close()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
c.SetTcpConn(sConn)
|
c.SetTcpConn(sConn)
|
||||||
|
|
Loading…
Reference in New Issue