first code import

Author: Charles-Antoine Mathieu

.gitignore

@@ -0,0 +1,12 @@
+*.log
+
+ssl/
+*.key
+*.crt
+
+wsp_server/wsp_server
+wsp_client/wsp_client
+test_api/test_api
+
+# IntelliJ IDEA
+.idea

Godeps/Godeps.json

@@ -28,16 +28,23 @@ WSP server configuration
 ------------------------
 
 ```
-# wsp_server.conf.yml
+# wsp_server.cfg
 ---
-host: 127.0.0.1
-port: 8080
-timeout : 1
+host : 127.0.0.1                     # Address to bind the HTTP server
+port : 8080                          # Port to bind the HTTP server
+timeout : 1000                       # Time to wait before acquiring a WS connection to forward the request (milliseconds)
+blacklist :                          # Forbidden destination ( deny nothing if empty )
+ - method : ".*"                     #   Applied in order before whitelist
+   url : "^http(s)?://google.*"      #   None must match
+whitelist :                          # Allowed destinations  ( allow all if empty )
+ - method : "^GET$"                  #   Applied in order after blacklist
+   url : "^http(s)?://.*"            #   One must match
+
 ```
 
 ```
-$ go build wsp_server.go
-$ ./wsp_server -config wsp_server.conf.yml
+$ cd wsp_client && go build
+$ ./wsp_server -config wsp_server.cfg
 {
   "Host": "127.0.0.1",
   "Port": 8080
@@ -63,13 +70,19 @@ WSP proxy configuration
 -----------------------
 
 ```
-# wsp_client.conf.yml
+# wsp_client.cfg
 ---
-targets :
- - ws://127.0.0.1:8080/register
-poolMinSize : 10
-poolMinIdleSize : 5
-poolMaxSize : 100
+targets :                            # Endpoints to connect to
+ - ws://127.0.0.1:8080/register      #
+poolminsize : 10                     # Default number of concurrent open (TCP) connections per WSP server
+poolminidlesize : 5                  # Default number of concurrent open (TCP) connections to keep idle per WSP server
+poolmaxsize : 100                    # Maximum number of concurrent open (TCP) connections per WSP server
+blacklist :                          # Forbidden destination ( deny nothing if empty )
+ - method : ".*"                     #   Applied in order before whitelist
+   url : ".*forbidden.*"             #   None must match
+whitelist :                          # Allowed destinations  ( allow all if empty )
+ - method : "^GET$"                  #   Applied in order after blacklist
+   url : "^https://.*"               #   One must match
 ```
 
  - poolMinSize is the default number of opened TCP/HTTP/WS connections
@@ -83,8 +96,8 @@ poolMaxSize : 100
  the proxy will ever initiate per WSP server.
 
 ```
-$ go build wsp_client.go
-$ ./wsp_client -config wsp_client.conf.yml
+$ cd wsp_client && go build
+$ ./wsp_client -config wsp_client.cfg
 {
   "ID": "7e2d8782-f893-4ff3-7e9d-299b4c0a518a",
   "Targets": [

Godeps/Readme

@@ -0,0 +1,43 @@
+package client
+
+import (
+	"net/http"
+
+	"github.com/gorilla/websocket"
+)
+
+// Client connects to one or more Server using HTTP websockets
+// The Server can then send HTTP requests to execute
+type Client struct {
+	Config *Config
+
+	client *http.Client
+	dialer *websocket.Dialer
+	pools  map[string]*Pool
+}
+
+// NewClient creates a new Proxy
+func NewClient(config *Config) (c *Client) {
+	c = new(Client)
+	c.Config = config
+	c.client = &http.Client{}
+	c.dialer = &websocket.Dialer{}
+	c.pools = make(map[string]*Pool)
+	return
+}
+
+// Start the Proxy
+func (c *Client) Start() {
+	for _, target := range c.Config.Targets {
+		pool := NewPool(c, target)
+		c.pools[target] = pool
+		go pool.Start()
+	}
+}
+
+// Shutdown the Proxy
+func (c *Client) Shutdown() {
+	for _, pool := range c.pools {
+		pool.Shutdown()
+	}
+}

README.md

@@ -0,0 +1,73 @@
+package client
+
+import (
+	"io/ioutil"
+
+	"github.com/nu7hatch/gouuid"
+	"gopkg.in/yaml.v2"
+
+	"github.com/root-gg/wsp/common"
+)
+
+// Config configures an Proxy
+type Config struct {
+	ID              string
+	Targets         []string
+	PoolMinSize     int
+	PoolMinIdleSize int
+	PoolMaxSize     int
+	Whitelist       []*common.Rule
+	Blacklist       []*common.Rule
+}
+
+// NewConfig creates a new ProxyConfig
+func NewConfig() (config *Config) {
+	config = new(Config)
+
+	id, err := uuid.NewV4()
+	if err != nil {
+		panic(err)
+	}
+	config.ID = id.String()
+
+	config.Targets = []string{"ws://127.0.0.1:8080/register"}
+	config.PoolMinSize = 10
+	config.PoolMinIdleSize = 5
+	config.PoolMaxSize = 100
+
+	config.Whitelist = make([]*common.Rule, 0)
+	config.Blacklist = make([]*common.Rule, 0)
+
+	return
+}
+
+// LoadConfiguration loads configuration from a YAML file
+func LoadConfiguration(path string) (config *Config, err error) {
+	config = NewConfig()
+
+	bytes, err := ioutil.ReadFile(path)
+	if err != nil {
+		return
+	}
+
+	err = yaml.Unmarshal(bytes, config)
+	if err != nil {
+		return
+	}
+
+	// Compile the rules
+
+	for _, rule := range config.Whitelist {
+		if err = rule.Compile(); err != nil {
+			return
+		}
+	}
+
+	for _, rule := range config.Blacklist {
+		if err = rule.Compile(); err != nil {
+			return
+		}
+	}
+
+	return
+}