1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-03 08:46:47 -05:00

own hosts in http config

This commit is contained in:
Darien Raymond 2016-01-26 10:28:09 +00:00
parent befd24c83e
commit 6b894c719d
3 changed files with 73 additions and 1 deletions

View File

@ -1,4 +1,18 @@
package http
import (
v2net "github.com/v2ray/v2ray-core/common/net"
)
type Config struct {
OwnHosts []v2net.Address
}
func (this *Config) IsOwnHost(host v2net.Address) bool {
for _, ownHost := range this.OwnHosts {
if ownHost.Equals(host) {
return true
}
}
return false
}

View File

@ -3,12 +3,38 @@
package http
import (
"encoding/json"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/proxy/internal/config"
)
func (this *Config) UnmarshalJSON(data []byte) error {
type JsonConfig struct {
Hosts []v2net.AddressJson `json:"ownHosts"`
}
jsonConfig := new(JsonConfig)
if err := json.Unmarshal(data, jsonConfig); err != nil {
return err
}
this.OwnHosts = make([]v2net.Address, len(jsonConfig.Hosts), len(jsonConfig.Hosts)+1)
for idx, host := range jsonConfig.Hosts {
this.OwnHosts[idx] = host.Address
}
v2rayHost := v2net.DomainAddress("local.v2ray.com")
if !this.IsOwnHost(v2rayHost) {
this.OwnHosts = append(this.OwnHosts, v2rayHost)
}
return nil
}
func init() {
config.RegisterInboundConfig("http",
func(data []byte) (interface{}, error) {
return new(Config), nil
rawConfig := new(Config)
err := json.Unmarshal(data, rawConfig)
return rawConfig, err
})
}

View File

@ -0,0 +1,32 @@
// +build json
package http_test
import (
"encoding/json"
"testing"
v2net "github.com/v2ray/v2ray-core/common/net"
. "github.com/v2ray/v2ray-core/proxy/http"
v2testing "github.com/v2ray/v2ray-core/testing"
"github.com/v2ray/v2ray-core/testing/assert"
)
func TestOwnHosts(t *testing.T) {
v2testing.Current(t)
rawJson := `{
"ownHosts": [
"127.0.0.1",
"google.com"
]
}`
config := new(Config)
err := json.Unmarshal([]byte(rawJson), config)
assert.Error(err).IsNil()
assert.Bool(config.IsOwnHost(v2net.IPAddress([]byte{127, 0, 0, 1}))).IsTrue()
assert.Bool(config.IsOwnHost(v2net.DomainAddress("google.com"))).IsTrue()
assert.Bool(config.IsOwnHost(v2net.DomainAddress("local.v2ray.com"))).IsTrue()
assert.Bool(config.IsOwnHost(v2net.DomainAddress("v2ray.com"))).IsFalse()
}