pattern

.gitignore

@@ -5,3 +5,4 @@ dist
 websocks.cer
 websocks.key
 *.config.json
+*.pac

config/config.go

@@ -61,9 +61,9 @@ var Command = cli.Command{
 					Usage: "local listening port",
 				},
 				cli.StringFlag{
-					Name:  "p",
+					Name:  "pattern",
 					Value: "/websocks",
-					Usage: "server.com/pattern, like password, start with '/'",
+					Usage: "server.com/pattern",
 				},
 				cli.BoolFlag{
 					Name:  "tls",

config/server.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/gorilla/websocket"
 	"github.com/lzjluzijie/websocks/core"
+	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 )
 
@@ -40,12 +41,17 @@ func GetServerConfig(path string) (server *core.Server, err error) {
 func GenerateServerConfig(c *cli.Context) (err error) {
 	path := c.String("path")
 	listenAddr := c.String("l")
-	pattern := c.String("p")
+	pattern := c.String("pattern")
 	tls := c.Bool("tls")
 	certPath := c.String("cert")
 	keyPath := c.String("key")
 	reverseProxy := c.String("reverse-proxy")
 
+	if []byte(pattern)[0] != '/' {
+		err = errors.New("pattern does not start with '/'")
+		return
+	}
+
 	config := &core.ServerConfig{
 		Pattern:      pattern,
 		ListenAddr:   listenAddr,

websocks.go

@@ -5,12 +5,13 @@ import (
 
 	"io/ioutil"
 
+	"errors"
+	"runtime"
+
 	"github.com/juju/loggo"
 	"github.com/lzjluzijie/websocks/config"
 	"github.com/lzjluzijie/websocks/core"
 	"github.com/urfave/cli"
-	"runtime"
-	"errors"
 	"golang.org/x/sys/windows/registry"
 )
 
@@ -151,11 +152,11 @@ func main() {
 				}
 
 				k, err := registry.OpenKey(registry.CURRENT_USER, `Software\Microsoft\Windows\CurrentVersion\Internet Settings`, registry.ALL_ACCESS)
-				if err != nil{
+				if err != nil {
 					return
 				}
 
-				err = k.SetStringValue("AutoConfigURL", "http://127.0.0.1:23333/pac")
+				err = k.SetStringValue("AutoConfigURL", "http://127.0.0.1:10801/pac")
 				return
 			},
 		},