big update ! to fix

cmd/iface/main.go

@@ -24,6 +24,7 @@ func main(){
 				case receivedFrame := <- receiver:
 					fmt.Printf("[default] received '%s'\n", receivedFrame.Payload.Buffer)
 					sender <- receivedFrame.Payload.Buffer
+					fmt.Printf("[default] sent\n")
 				case closeFunc := <- closer:
 					fmt.Printf("[default] client with protocol '%s' exited\n", client.Protocol)
 					closeFunc()

internal/http/upgrade/request/header_check.go

@@ -52,6 +52,9 @@ func (r *T) extractHostPort(bb header.HeaderValue) error {
 // checkOrigin checks the Origin Header
 func (r *T) extractOrigin(bb header.HeaderValue) error {
 
+	// bypass
+	if bypassOriginPolicy { return nil }
+
 	if len(bb) != 1 {
 		r.code = response.FORBIDDEN
 		return fmt.Errorf("Origin header must have a unique value")

internal/http/upgrade/request/private.go

@@ -53,7 +53,10 @@ func (r *T) parseHeader(b []byte) error {
 	}
 
 
-	if err != nil { return err }
+	if err != nil {
+		fmt.Printf("ERR: %s\n", err)
+		return err
+	}
 
 	return nil
 
@@ -76,7 +79,7 @@ func (r T) isComplete() error {
 	}
 
 	/* (3) Origin */
-	if len(r.origin) == 0 {
+	if !bypassOriginPolicy && len(r.origin) == 0 {
 		return fmt.Errorf("Missing 'Origin' header")
 	}
 

internal/http/upgrade/request/public.go

@@ -46,6 +46,7 @@ func Parse(r io.Reader) (request *T, err error) {
 	/* (3) Check completion */
 	err = req.isComplete()
 	if err != nil {
+		fmt.Printf("not complete: %s\b", err)
 		req.code = response.BAD_REQUEST
 		return req, err
 	}

internal/http/upgrade/request/types.go

@@ -3,6 +3,9 @@ package request
 import "git.xdrm.io/gws/internal/http/upgrade/request/parser/reqline"
 import "git.xdrm.io/gws/internal/http/upgrade/response"
 
+// If origin is required
+const bypassOriginPolicy = true
+
 // T represents an HTTP Upgrade request
 type T struct {
 	first       bool // whether the first line has been read (GET uri HTTP/version)

internal/ws/reader/reader.go

@@ -1,8 +1,8 @@
 package reader
 
 import (
-	"fmt"
 	"io"
+	"bufio"
 )
 
 // Maximum chunk size
@@ -11,27 +11,16 @@ const MaxChunkSize = 4096
 
 // Read reads a chunk of n bytes
 // err is io.EOF when done
-func ReadBytes(r io.Reader, n uint) ([]byte, error){
+func ReadBytes(br *bufio.Reader, n int) ([]byte, error){
 
-	res := make([]byte, 0, MaxChunkSize)
+	buf, err := br.Peek(n)
-
-	totalRead := uint(0)
-
-	// socket -> tmp( buffer)
-	for totalRead < n {
-
-		tmp := make([]byte, 1)
-
-		read, err := r.Read(tmp)
-		if err != nil { return nil, err }
-		if read == 0 { return nil, fmt.Errorf("Cannot read") }
-
-		totalRead += uint(1)
-
-		res = append(res, tmp[0])
 
+	if err == io.EOF && len(buf) < n && n > 0 {
+		err = io.ErrUnexpectedEOF
 	}
 
-	return res, nil
+	br.Discard(len(buf))
+
+	return buf, err
 
 }

ws/client.go

@@ -3,7 +3,6 @@ package ws
 import (
 	"fmt"
 	"time"
-	"bytes"
 )
 
 
@@ -15,19 +14,15 @@ import (
 // for a given client
 func (c *Client) asyncReader(s *Server) {
 
-	// Get buffer
-	buf := new(bytes.Buffer)
-
-
 
 	for {
 
 		var startTime int64 = time.Now().UnixNano()
 
 		// Try to read frame header
-		frame, err := ReadFrame(buf, c.sock)
+		frame, err := ReadFrame(c)
 		if err != nil {
-			fmt.Printf("%s\n", err)
+			fmt.Printf("[read.err] %s\n", err)
 			break
 		}
 
@@ -46,10 +41,12 @@ func (c *Client) asyncReader(s *Server) {
 	c.closec <- func(){
 
 		// Remove client from server
-		delete(s.clients, c.sock)
+		s.clientsMutex.Lock()
+		delete(s.clients, c.conn.sock)
+		s.clientsMutex.Unlock()
 
 		// Close socket
-		c.sock.Close()
+		c.conn.sock.Close()
 
 	}
 
@@ -64,17 +61,16 @@ func (c *Client) asyncWriter(s *Server){
 
 	for payload := range c.sendc {
 
-		fmt.Printf("Writing '%s'\n", payload)
-
 		// Build Frame
 		f := buildFrame(payload)
 
 		// Send over socket
-		senderr := f.Send(c.sock)
+		senderr := f.Send(&c.conn)
 		if senderr != nil {
 			fmt.Printf("Writing error: %s\n", senderr)
 		}
 
+
 	}
 
 

ws/frame.go

@@ -1,36 +1,36 @@
 package ws
 
 import (
+	"bufio"
 	"git.xdrm.io/gws/ws/frame/opcode"
 	"encoding/binary"
 	"git.xdrm.io/gws/ws/frame"
 	"fmt"
 	"git.xdrm.io/gws/internal/ws/reader"
 	"net"
-	"bytes"
 )
 
 
 
 
 // ReadFrame reads the frame from a socket
-func ReadFrame(b *bytes.Buffer, s net.Conn) (*Frame, error) {
+func ReadFrame(c *Client) (*Frame, error) {
 
 	f := new(Frame)
 
 	/* (1) Read header
 	---------------------------------------------------------*/
-	err := f.readHeader(b, s)
+	err := f.readHeader(c.conn.br)
 	if err != nil {
-		return nil, fmt.Errorf("Header read: %s\n", err)
+		return nil, err
 	}
 
 
 	/* (2) Read payload
 	---------------------------------------------------------*/
-	err = f.readPayload(b, s)
+	err = f.readPayload(c.conn.br)
 	if err != nil {
-		return nil, fmt.Errorf("Payload read: %s\n", err)
+		return nil, err
 	}
 
 
@@ -50,7 +50,7 @@ func ReadFrame(b *bytes.Buffer, s net.Conn) (*Frame, error) {
 
 		case opcode.PING:
 			fmt.Printf("Opcode: PING\n")
-			err = buildPong().Send(s)
+			err = buildPong().Send(&c.conn)
 			if err != nil {
 				return nil, fmt.Errorf("Pong frame: %s\n", err)
 			}
@@ -58,7 +58,7 @@ func ReadFrame(b *bytes.Buffer, s net.Conn) (*Frame, error) {
 
 		default:
 			fmt.Printf("Opcode: CLOSE\n")
-			buildClose().Send(s)
+			buildClose().Send(&c.conn)
 			return nil, fmt.Errorf("Unknown Opcode %x\n", f.Header.Opc)
 
 	}
@@ -69,19 +69,19 @@ func ReadFrame(b *bytes.Buffer, s net.Conn) (*Frame, error) {
 
 
 // readHeader reads the frame header
-func (f *Frame) readHeader(buf *bytes.Buffer, s net.Conn) error{
+func (f *Frame) readHeader(br *bufio.Reader) error{
 	var err error
 
 	/* (2) Byte 1: FIN and OpCode */
-	b, err := reader.ReadBytes(s, 1)
+	b, err := reader.ReadBytes(br, 1)
-	if err != nil { return fmt.Errorf("Cannot read byte Fin nor OpCode (%s)", err) }
+	if err != nil { return err }
 
 	f.Header.Fin = b[0] & 0x80 == 0x80
 	f.Header.Opc = frame.OpCode( b[0] & 0x0f )
 
 	/* (3) Byte 2: Mask and Length[0] */
-	b, err = reader.ReadBytes(s, 1)
+	b, err = reader.ReadBytes(br, 1)
-	if err != nil { return fmt.Errorf("Cannot read byte if has Mask nor Length (%s)", err) }
+	if err != nil { return err }
 
 	// if mask, byte array not nil
 	if b[0] & 0x80 == 0x80 {
@@ -94,15 +94,15 @@ func (f *Frame) readHeader(buf *bytes.Buffer, s net.Conn) error{
 	/* (4) Extended payload */
 	if f.Payload.Length == 127 {
 
-		bx, err := reader.ReadBytes(s, 8)
+		bx, err := reader.ReadBytes(br, 8)
-		if err != nil { return fmt.Errorf("Cannot read payload extended length of 64 bytes (%s)", err) }
+		if err != nil { return err }
 
 		f.Payload.Length = binary.BigEndian.Uint64(bx)
 
 	} else if f.Payload.Length == 126 {
 
-		bx, err := reader.ReadBytes(s, 2)
+		bx, err := reader.ReadBytes(br, 2)
-		if err != nil { return fmt.Errorf("Cannot read payload extended length of 16 bytes (%s)", err) }
+		if err != nil { return err }
 
 		f.Payload.Length = uint64( binary.BigEndian.Uint16(bx) )
 
@@ -111,8 +111,8 @@ func (f *Frame) readHeader(buf *bytes.Buffer, s net.Conn) error{
 	/* (5) Masking key */
 	if f.Header.Msk != nil {
 
-		bx, err := reader.ReadBytes(s, 4)
+		bx, err := reader.ReadBytes(br, 4)
-		if err != nil { return fmt.Errorf("Cannot read mask or 32 bytes (%s)", err) }
+		if err != nil { return err }
 
 		f.Header.Msk = make([]byte, 4)
 		copy(f.Header.Msk, bx)
@@ -134,10 +134,10 @@ func (f *Frame) readHeader(buf *bytes.Buffer, s net.Conn) error{
 
 
 // readPayload reads the frame payload
-func (f *Frame) readPayload(buf *bytes.Buffer, s net.Conn) error{
+func (f *Frame) readPayload(br *bufio.Reader) error{
 
 	/* (1) Read payload */
-	b, err := reader.ReadBytes(s, uint(f.Payload.Length) )
+	b, err := reader.ReadBytes(br, int(f.Payload.Length) )
 	if err != nil { return fmt.Errorf("Cannot read payload (%s)", err) }
 
 	f.Payload.Buffer = make([]byte, 0, f.Payload.Length)
@@ -229,66 +229,50 @@ func buildPong() *Frame{
 
 
 // Send sends a frame over a socket
-func (f Frame) Send(s net.Conn) error {
+func (f Frame) Send(c *Conn) error {
 
-	written := 0
+	frameHeader := make([]byte, 0, maxHeaderLength)
 
 	/* (1) Byte 0 : FIN + opcode */
-	buf := []byte{ 0x80 + byte(opcode.TEXT) }
+	frameHeader = append(frameHeader, 0x80 | byte(opcode.TEXT) )
-	w, err := s.Write(buf)
-	if err != nil { return err }
-	written += w
 
 	/* (2) Get payload length */
 	if f.Payload.Length < 126 { // simple
 
-		buf := []byte{ byte(f.Payload.Length) }
+		frameHeader = append(frameHeader, byte(f.Payload.Length) )
-		w, err = s.Write(buf)
-		if err != nil { return err }
-		written += w
 
 	} else if f.Payload.Length < 0xffff { // extended: 16 bits
 
-		w, err = s.Write( []byte{126} )
+
-		if err != nil { return err }
+		frameHeader = append(frameHeader, 126)
-		written += w
 
 		buf := make([]byte, 2)
 		binary.BigEndian.PutUint16(buf, uint16(f.Payload.Length))
-		w, err = s.Write(buf)
+		frameHeader = append(frameHeader, buf...)
-		if err != nil { return err }
-		written += w
 
 	} else if f.Payload.Length < 0xffffffffffffffff { // extended: 64 bits
 
-		w, err = s.Write( []byte{127} )
+		frameHeader = append(frameHeader, 127)
-		if err != nil { return err }
-		written += w
 
 		buf := make([]byte, 8)
 		binary.BigEndian.PutUint64(buf, f.Payload.Length)
-		w, err = s.Write(buf)
+		frameHeader = append(frameHeader, buf...)
-		if err != nil { return err }
-		written += w
 
 	}
 
-	/* (3) Payload */
+	/* (3) Add payload */
-	w, err = s.Write(f.Payload.Buffer)
+	writeBuffer := net.Buffers{frameHeader, f.Payload.Buffer[:f.Payload.Length]}
+	fmt.Printf("[send]\n")
+	_, err := writeBuffer.WriteTo(c.sock)
+	fmt.Printf("[/send] ")
 	if err != nil { return err }
 
-	fmt.Printf("[2] written %d bytes\n", written)
 
-
+	// fmt.Printf("    + Header\n")
-	fmt.Printf("    + Header\n")
+	// fmt.Printf("     + FIN:   %t\n", f.Header.Fin)
-	fmt.Printf("     + FIN:   %t\n", f.Header.Fin)
+	// fmt.Printf("     + OPC:   %x\n", f.Header.Opc)
-	fmt.Printf("     + OPC:   %x\n", f.Header.Opc)
+	// fmt.Printf("     + MASK?: %t\n", f.Header.Msk != nil)
-	fmt.Printf("     + MASK?: %t\n", f.Header.Msk != nil)
+	// fmt.Printf("     + LEN:   %d\n", f.Payload.Length)
-	if f.Header.Msk != nil {
-		fmt.Printf("     + MASK:  %x\n", f.Header.Msk)
-	}
-	fmt.Printf("     + LEN:   %d\n", f.Payload.Length)
-	fmt.Printf("Total written: %d bytes (%d + %d)\n", written+w, written, w)
 
 	return nil
 }

ws/private.go

@@ -1,6 +1,7 @@
 package ws
 
 import (
+	"bufio"
 	"git.xdrm.io/gws/upgrader"
 	"net"
 )
@@ -15,7 +16,10 @@ func (s *Server) dispatch(sock net.Conn, u *upgrader.T){
 
 
 	client := &Client{
+		conn: Conn{
 			sock: sock,
+			br: bufio.NewReader(sock),
+		},
 		Arguments: [][]string{ []string{ uri } },
 		Protocol:  string(u.Response.GetProtocol()),
 		recvc:     make(chan Frame,  maxChannelBufferLength),
@@ -66,7 +70,9 @@ func (s *Server) dispatch(sock net.Conn, u *upgrader.T){
 	client.Controller = controller
 
 	/* (2) Add client to server */
+	s.clientsMutex.Lock()
 	s.clients[sock] = client
+	s.clientsMutex.Unlock()
 
 	/* (3) Bind controller */
 	go controller.fun(client, client.recvc, client.sendc, client.closec)
@@ -75,7 +81,7 @@ func (s *Server) dispatch(sock net.Conn, u *upgrader.T){
 	go client.asyncWriter(s)
 
 	/* (5) Run asynchronous frame reader */
-	client.asyncReader(s)
+	go client.asyncReader(s)
 
 }
 

ws/server.go

@@ -77,7 +77,7 @@ func (s *Server) Launch() error {
 			continue
 		}
 		if upgrader.Response.GetStatusCode() != 101 {
-			fmt.Printf(" - upgrade bad request\n")
+			fmt.Printf(" - upgrade bad request (status code %d)\n", upgrader.Response.GetStatusCode())
 			sock.Close()
 			continue
 		}

ws/types.go

@@ -1,14 +1,23 @@
 package ws
 
 import (
+	"sync"
+	"bufio"
 	"net"
 	"git.xdrm.io/gws/internal/uri/parser"
 	"git.xdrm.io/gws/ws/frame"
 )
 
 const maxBufferLength        = 4096
+const maxHeaderLength        = 2 + 8 + 4
 const maxChannelBufferLength = 1
 
+// Represents a websocket connection (socket + reader)
+type Conn struct {
+	sock net.Conn
+	br   *bufio.Reader
+}
+
 // Represents a websocket controller callback function
 type ControllerFunc func(*Client, <-chan Frame, chan<- []byte, <-chan func())
 
@@ -21,7 +30,7 @@ type Controller struct {
 
 // Represents a websocket client
 type Client struct {
-	sock       net.Conn    // communication socket
+	conn       Conn        // connection (socket + reader)
 	Protocol   string      // choosen protocol (Sec-WebSocket-Protocol)
 	Arguments  [][]string  // URI parameters, index 0 is full URI, then matching groups
 
@@ -40,6 +49,7 @@ type Server struct {
 	port uint16        // server listening port
 
 	clients map[net.Conn]*Client  // clients
+	clientsMutex sync.Mutex
 
 	defaultController *Controller   // default controller
 	controllers       []*Controller // URI-bound controllers