Cleanup & bug fix

whitegerry · Sep 4, 2017 · 0fcae35 · 0fcae35
1 parent 390847d
commit 0fcae35
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/proxy/client.go b/proxy/client.go
@@ -193,8 +193,7 @@ func (proxy *ProxyHttpServer) CanDirectConnect(host string) bool {
 	// lookup at upstream
 	client := http.Client{Timeout: time.Second}
 	req, _ := http.NewRequest("GET", "http://"+proxy.Upstream, nil)
-	req.Header.Add(dnsHeader, host)
-	req.Header.Add(dnsHeaderID, AEncryptString(*G_Key))
+	req.Header.Add(dnsHeader, EncryptHost(host, "!"))
 	resp, err := client.Do(req)
 
 	if err != nil {

diff --git a/proxy/server.go b/proxy/server.go
@@ -14,9 +14,9 @@ type ProxyUpstreamHttpServer struct {
 }
 
 func (proxy *ProxyUpstreamHttpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if r.Method == "GET" && r.Header.Get(dnsHeader) != "" {
-		if ADecryptString(r.Header.Get(dnsHeaderID)) == *G_Key {
-			w.Write([]byte(lookup.LookupIP(r.Header.Get(dnsHeader))))
+	if dh := r.Header.Get(dnsHeader); r.Method == "GET" && dh != "" {
+		if x := DecryptHost(dh, "!"); x != "" {
+			w.Write([]byte(lookup.LookupIP(x)))
 			return
 		}
 	}

diff --git a/proxy/shocoex.go b/proxy/shocoex.go
@@ -55,7 +55,7 @@ func DecryptHost(text, mark string) string {
 			buf := Base35Decode(parts[i])
 
 			parts[i] = shoco.Decompress(ADecrypt(buf))
-			if parts[i][0] != mark[0] {
+			if len(parts[i]) == 0 || parts[i][0] != mark[0] {
 				return ""
 			}
 

diff --git a/proxy/util.go b/proxy/util.go
@@ -23,7 +23,6 @@ var (
 
 	rkeyHeader  = "X-Request-ID"
 	rkeyHeader2 = "X-Request-HTTP-ID"
-	dnsHeaderID = "X-Host-Lookup-ID"
 	dnsHeader   = "X-Host-Lookup"
 
 	hostHeadExtract = regexp.MustCompile(`(\S+)\.com`)