support more proxy type

utils/crypto/crypto_test.go

@@ -22,15 +22,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestWriter(t *testing.T) {
-	// Empty key.
-	assert := assert.New(t)
-	key := ""
-	buffer := bytes.NewBuffer(nil)
-	_, err := NewWriter(buffer, []byte(key))
-	assert.NoError(err)
-}
-
 func TestCrypto(t *testing.T) {
 	assert := assert.New(t)
 
@@ -40,12 +31,10 @@ func TestCrypto(t *testing.T) {
 	buffer := bytes.NewBuffer(nil)
 	encWriter, err := NewWriter(buffer, []byte(key))
 	assert.NoError(err)
+	decReader := NewReader(buffer, []byte(key))
 
 	encWriter.Write([]byte(text))
 
-	decReader, err := NewReader(buffer, []byte(key))
-	assert.NoError(err)
-
 	c := bytes.NewBuffer(nil)
 	io.Copy(c, decReader)
 	assert.Equal(text, string(c.Bytes()))

utils/crypto/decode.go

@@ -24,13 +24,13 @@ import (
 )
 
 // NewReader returns a new Reader that decrypts bytes from r
-func NewReader(r io.Reader, key []byte) (*Reader, error) {
+func NewReader(r io.Reader, key []byte) *Reader {
 	key = pbkdf2.Key(key, []byte(salt), 64, aes.BlockSize, sha1.New)
 
 	return &Reader{
 		r:   r,
 		key: key,
-	}, nil
+	}
 }
 
 // Reader is an io.Reader that can read encrypted bytes.

utils/crypto/encode.go

@@ -67,10 +67,6 @@ type Writer struct {
 
 // Write satisfies the io.Writer interface.
 func (w *Writer) Write(p []byte) (nRet int, errRet error) {
-	return w.write(p)
-}
-
-func (w *Writer) write(p []byte) (nRet int, errRet error) {
 	if w.err != nil {
 		return 0, w.err
 	}

utils/vhost/vhost.go

@@ -50,26 +50,35 @@ func NewVhostMuxer(listener frpNet.Listener, vhostFunc muxFunc, authFunc httpAut
 	return mux, nil
 }
 
-// listen for a new domain name, if rewriteHost is not empty  and rewriteFunc is not nil, then rewrite the host header to rewriteHost
-func (v *VhostMuxer) Listen(name, location, rewriteHost, userName, passWord string) (l *Listener, err error) {
+type VhostRouteConfig struct {
+	Domain      string
+	Location    string
+	RewriteHost string
+	Username    string
+	Password    string
+}
+
+// listen for a new domain name, if rewriteHost is not empty  and rewriteFunc is not nil
+// then rewrite the host header to rewriteHost
+func (v *VhostMuxer) Listen(cfg *VhostRouteConfig) (l *Listener, err error) {
 	v.mutex.Lock()
 	defer v.mutex.Unlock()
 
-	_, ok := v.registryRouter.Exist(name, location)
+	_, ok := v.registryRouter.Exist(cfg.Domain, cfg.Location)
 	if ok {
-		return nil, fmt.Errorf("hostname [%s] location [%s] is already registered", name, location)
+		return nil, fmt.Errorf("hostname [%s] location [%s] is already registered", cfg.Domain, cfg.Location)
 	}
 
 	l = &Listener{
-		name:        name,
-		location:    location,
-		rewriteHost: rewriteHost,
-		userName:    userName,
-		passWord:    passWord,
+		name:        cfg.Domain,
+		location:    cfg.Location,
+		rewriteHost: cfg.RewriteHost,
+		userName:    cfg.Username,
+		passWord:    cfg.Password,
 		mux:         v,
 		accept:      make(chan frpNet.Conn),
 	}
-	v.registryRouter.Add(name, location, l)
+	v.registryRouter.Add(cfg.Domain, cfg.Location, l)
 	return l, nil
 }