mirror of
https://github.com/nadoo/glider.git
synced 2026-11-19 07:09:42 +08:00
ws: add support for security key check
This commit is contained in:
1 parent
68d8fb8b60
commit
88eee75aa7
6 files changed
+98
-74
No files matched your search
+45
-21
@@ -2,15 +2,19 @@ package ws
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"bytes"
|
||||
"crypto/rand"
|
||||
"crypto/sha1"
|
||||
"encoding/base64"
|
||||
"errors"
|
||||
"io"
|
||||
"net"
|
||||
"net/textproto"
|
||||
"strings"
|
||||
|
||||
"github.com/nadoo/glider/common/log"
|
||||
)
|
||||
|
||||
var keyGUID = []byte("258EAFA5-E914-47DA-95CA-C5AB0DC85B11")
|
||||
|
||||
// Client ws client
|
||||
type Client struct {
|
||||
host string
|
||||
@@ -41,31 +45,38 @@ func (c *Client) NewConn(rc net.Conn, target string) (*Conn, error) {
|
||||
|
||||
// Handshake handshakes with the server using HTTP to request a protocol upgrade
|
||||
func (c *Conn) Handshake(host, path string) error {
|
||||
c.Conn.Write([]byte("GET " + path + " HTTP/1.1\r\n"))
|
||||
// c.Conn.Write([]byte("Host: 127.0.0.1\r\n"))
|
||||
c.Conn.Write([]byte("Host: " + host + "\r\n"))
|
||||
c.Conn.Write([]byte("Upgrade: websocket\r\n"))
|
||||
c.Conn.Write([]byte("Connection: Upgrade\r\n"))
|
||||
c.Conn.Write([]byte("Origin: http://" + host + "\r\n"))
|
||||
c.Conn.Write([]byte("Sec-WebSocket-Key: w4v7O6xFTi36lq3RNcgctw==\r\n"))
|
||||
c.Conn.Write([]byte("Sec-WebSocket-Protocol: binary\r\n"))
|
||||
c.Conn.Write([]byte("Sec-WebSocket-Version: 13\r\n"))
|
||||
c.Conn.Write([]byte("\r\n"))
|
||||
clientKey := generateClientKey()
|
||||
|
||||
var buf bytes.Buffer
|
||||
buf.Write([]byte("GET " + path + " HTTP/1.1\r\n"))
|
||||
buf.Write([]byte("Host: " + host + "\r\n"))
|
||||
buf.Write([]byte("Upgrade: websocket\r\n"))
|
||||
buf.Write([]byte("Connection: Upgrade\r\n"))
|
||||
buf.Write([]byte("Origin: http://" + host + "\r\n"))
|
||||
buf.Write([]byte("Sec-WebSocket-Key: " + clientKey + "\r\n"))
|
||||
buf.Write([]byte("Sec-WebSocket-Protocol: binary\r\n"))
|
||||
buf.Write([]byte("Sec-WebSocket-Version: 13\r\n"))
|
||||
buf.Write([]byte("\r\n"))
|
||||
|
||||
if _, err := c.Conn.Write(buf.Bytes()); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
tpr := textproto.NewReader(bufio.NewReader(c.Conn))
|
||||
_, code, _, ok := parseFirstLine(tpr)
|
||||
if !ok || code != "101" {
|
||||
return errors.New("error in ws handshake")
|
||||
return errors.New("[ws] error in ws handshake parseFirstLine")
|
||||
}
|
||||
|
||||
// respHeader, err := tpr.ReadMIMEHeader()
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
respHeader, err := tpr.ReadMIMEHeader()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// // TODO: verify this
|
||||
// respHeader.Get("Sec-WebSocket-Accept")
|
||||
// fmt.Printf("respHeader: %+v\n", respHeader)
|
||||
serverKey := respHeader.Get("Sec-WebSocket-Accept")
|
||||
if serverKey != computeServerKey(clientKey) {
|
||||
return errors.New("[ws] error in ws handshake, got wrong Sec-Websocket-Key")
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -92,7 +103,7 @@ func parseFirstLine(tp *textproto.Reader) (r1, r2, r3 string, ok bool) {
|
||||
line, err := tp.ReadLine()
|
||||
// log.F("first line: %s", line)
|
||||
if err != nil {
|
||||
log.F("[http] read first line error:%s", err)
|
||||
// log.F("[ws] read first line error:%s", err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -104,3 +115,16 @@ func parseFirstLine(tp *textproto.Reader) (r1, r2, r3 string, ok bool) {
|
||||
s2 += s1 + 1
|
||||
return line[:s1], line[s1+1 : s2], line[s2+1:], true
|
||||
}
|
||||
|
||||
func generateClientKey() string {
|
||||
p := make([]byte, 16)
|
||||
rand.Read(p)
|
||||
return base64.StdEncoding.EncodeToString(p)
|
||||
}
|
||||
|
||||
func computeServerKey(clientKey string) string {
|
||||
h := sha1.New()
|
||||
h.Write([]byte(clientKey))
|
||||
h.Write(keyGUID)
|
||||
return base64.StdEncoding.EncodeToString(h.Sum(nil))
|
||||
}
|
||||
+13
-19
@@ -137,7 +137,7 @@ type frameReader struct {
|
||||
func FrameReader(r io.Reader) io.Reader {
|
||||
return &frameReader{
|
||||
Reader: r,
|
||||
buf: make([]byte, defaultFrameSize),
|
||||
buf: make([]byte, maxFrameHeaderSize), // NOTE: buf only used to save header bytes now
|
||||
}
|
||||
}
|
||||
|
||||
@@ -155,36 +155,30 @@ func (r *frameReader) Read(b []byte) (int, error) {
|
||||
r.leftBytes = int64(r.buf[1] & 0x7f)
|
||||
switch r.leftBytes {
|
||||
case 126:
|
||||
io.ReadFull(r.Reader, r.buf[:2])
|
||||
_, err := io.ReadFull(r.Reader, r.buf[:2])
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
r.leftBytes = int64(binary.BigEndian.Uint16(r.buf[0:]))
|
||||
case 127:
|
||||
io.ReadFull(r.Reader, r.buf[:8])
|
||||
_, err := io.ReadFull(r.Reader, r.buf[:8])
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
r.leftBytes = int64(binary.BigEndian.Uint64(r.buf[0:]))
|
||||
}
|
||||
}
|
||||
|
||||
var n, m int
|
||||
var err error
|
||||
if r.leftBytes > int64(len(r.buf)) {
|
||||
if len(b) < len(r.buf) {
|
||||
n, err = r.Reader.Read(r.buf[:len(b)])
|
||||
} else {
|
||||
n, err = r.Reader.Read(r.buf)
|
||||
}
|
||||
} else {
|
||||
if int64(len(b)) < r.leftBytes {
|
||||
n, err = io.ReadFull(r.Reader, r.buf[:len(b)])
|
||||
} else {
|
||||
n, err = io.ReadFull(r.Reader, r.buf[:r.leftBytes])
|
||||
}
|
||||
readLen := int64(len(b))
|
||||
if readLen > r.leftBytes {
|
||||
readLen = r.leftBytes
|
||||
}
|
||||
|
||||
m, err := r.Reader.Read(b[:readLen])
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
m = copy(b, r.buf[:n])
|
||||
r.leftBytes -= int64(m)
|
||||
|
||||
return m, err
|
||||
}
|
||||
Reference in new issue
Block a user