refactor

cipher_test.go

@@ -14,7 +14,8 @@ const (
 func TestCipher(t *testing.T) {
 	password := RandPassword()
 	t.Log(password)
-	cipher := newCipher(password)
+	p, _ := parsePassword(password)
+	cipher := newCipher(p)
 	// 原数据
 	org := make([]byte, passwordLength)
 	for i := 0; i < passwordLength; i++ {
@@ -37,7 +38,8 @@ func TestCipher(t *testing.T) {
 
 func BenchmarkEncode(b *testing.B) {
 	password := RandPassword()
-	cipher := newCipher(password)
+	p, _ := parsePassword(password)
+	cipher := newCipher(p)
 	bs := make([]byte, MB)
 	b.ResetTimer()
 	rand.Read(bs)
@@ -46,7 +48,8 @@ func BenchmarkEncode(b *testing.B) {
 
 func BenchmarkDecode(b *testing.B) {
 	password := RandPassword()
-	cipher := newCipher(password)
+	p, _ := parsePassword(password)
+	cipher := newCipher(p)
 	bs := make([]byte, MB)
 	b.ResetTimer()
 	rand.Read(bs)

cmd/config.go

@@ -3,11 +3,11 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/mitchellh/go-homedir"
 	"io/ioutil"
 	"log"
 	"os"
 	"path"
-	"github.com/mitchellh/go-homedir"
 )
 
 var (
@@ -54,7 +54,7 @@ func (config *Config) ReadConfig() {
 
 		err = json.NewDecoder(file).Decode(config)
 		if err != nil {
-			log.Fatalf("格式不合法的 JSON 配置文件:\n%s", file)
+			log.Fatalf("格式不合法的 JSON 配置文件:\n%s", file.Name())
 		}
 	}
 }

cmd/e2e_test.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/gwuhaolin/lightsocks/core"
+	"github.com/gwuhaolin/lightsocks"
 	"golang.org/x/net/proxy"
 	"io"
 	"log"
@@ -63,12 +63,12 @@ func runEchoServer() {
 }
 
 func runLightsocksProxyServer() {
-	password := core.RandPassword()
-	serverS, err := core.NewLsLocal(password, LightSocksProxyLocalAddr, LightSocksProxyServerAddr)
+	password := lightsocks.RandPassword()
+	serverS, err := lightsocks.NewLsLocal(password, LightSocksProxyLocalAddr, LightSocksProxyServerAddr)
 	if err != nil {
 		log.Fatalln(err)
 	}
-	localS, err := core.NewLsServer(password, LightSocksProxyServerAddr)
+	localS, err := lightsocks.NewLsServer(password, LightSocksProxyServerAddr)
 	if err != nil {
 		log.Fatalln(err)
 	}

cmd/lightsocks-local/main.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
+	"github.com/gwuhaolin/lightsocks"
 	"github.com/gwuhaolin/lightsocks/cmd"
-	"github.com/gwuhaolin/lightsocks/core"
 	"log"
 	"net"
 )
@@ -25,7 +25,7 @@ func main() {
 	config.SaveConfig()
 
 	// 启动 local 端并监听
-	lsLocal, err := core.NewLsLocal(config.Password, config.ListenAddr, config.RemoteAddr)
+	lsLocal, err := lightsocks.NewLsLocal(config.Password, config.ListenAddr, config.RemoteAddr)
 	if err != nil {
 		log.Fatalln(err)
 	}

cmd/lightsocks-server/main.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
+	"github.com/gwuhaolin/lightsocks"
 	"github.com/gwuhaolin/lightsocks/cmd"
-	"github.com/gwuhaolin/lightsocks/core"
 	"github.com/phayes/freeport"
 	"log"
 	"net"
@@ -24,13 +24,13 @@ func main() {
 	config := &cmd.Config{
 		ListenAddr: fmt.Sprintf(":%d", port),
 		// 密码随机生成
-		Password: core.RandPassword(),
+		Password: lightsocks.RandPassword(),
 	}
 	config.ReadConfig()
 	config.SaveConfig()
 
 	// 启动 server 端并监听
-	lsServer, err := core.NewLsServer(config.Password, config.ListenAddr)
+	lsServer, err := lightsocks.NewLsServer(config.Password, config.ListenAddr)
 	if err != nil {
 		log.Fatalln(err)
 	}

password_test.go

@@ -1,8 +1,7 @@
 package lightsocks
 
 import (
-	"reflect"
-	"sort"
+			"sort"
 	"testing"
 )
 
@@ -27,20 +26,9 @@ func TestRandPassword(t *testing.T) {
 	}
 	sort.Sort(bsPassword)
 	for i := 0; i < passwordLength; i++ {
-		if password[i] != byte(i) {
+		if bsPassword[i] != byte(i) {
 			t.Error("不能出现任何一个重复的byte位，必须由 0-255 组成，并且都需要包含")
 		}
 	}
 }
 
-func TestPasswordString(t *testing.T) {
-	password := RandPassword()
-	decodePassword, err := parsePassword(password)
-	if err != nil {
-		t.Error(err)
-	} else {
-		if !reflect.DeepEqual(password, decodePassword) {
-			t.Error("密码转化成字符串后反解后数据不对应")
-		}
-	}
-}