Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 95261a1779 | |||
| 12f9f4d444 |
@@ -1,3 +1,7 @@
|
||||
### 0.3.0 / 2013-09-09
|
||||
|
||||
* Support client URLs with Basic Auth credentials
|
||||
|
||||
### 0.2.2 / 2013-07-05
|
||||
|
||||
* No functional changes, just updates to package.json
|
||||
|
||||
@@ -53,6 +53,9 @@ var instance = {
|
||||
if (this._protocols.length > 0)
|
||||
headers.push('Sec-WebSocket-Protocol: ' + this._protocols.join(', '));
|
||||
|
||||
if (uri.auth)
|
||||
headers.push('Authorization: Basic ' + new Buffer(uri.auth, 'utf8').toString('base64'));
|
||||
|
||||
return new Buffer(headers.concat(this.__headers.toString(), '').join('\r\n'), 'utf8');
|
||||
},
|
||||
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
, "keywords" : ["websocket"]
|
||||
, "license" : "MIT"
|
||||
|
||||
, "version" : "0.2.2"
|
||||
, "version" : "0.3.0"
|
||||
, "engines" : {"node": ">=0.4.0"}
|
||||
, "main" : "./lib/websocket/driver"
|
||||
, "devDependencies" : {"jstest": ""}
|
||||
|
||||
@@ -10,9 +10,13 @@ test.describe("Client", function() { with(this) {
|
||||
null
|
||||
})
|
||||
|
||||
define("url", function() {
|
||||
return "ws://www.example.com/socket"
|
||||
})
|
||||
|
||||
define("driver", function() {
|
||||
if (this._driver) return this._driver
|
||||
this._driver = new Client("ws://www.example.com/socket", this.options())
|
||||
this._driver = new Client(this.url(), this.options())
|
||||
var self = this
|
||||
this._driver.on('open', function(e) { self.open = true })
|
||||
this._driver.on('message', function(e) { self.message += e.data })
|
||||
@@ -80,6 +84,23 @@ test.describe("Client", function() { with(this) {
|
||||
}})
|
||||
}})
|
||||
|
||||
describe("with basic auth", function() { with(this) {
|
||||
define("url", function() { return "ws://user:pass@www.example.com/socket" })
|
||||
|
||||
it("writes the handshake with Authorization", function() { with(this) {
|
||||
expect(driver().io, "emit").given("data", buffer(
|
||||
"GET /socket HTTP/1.1\r\n" +
|
||||
"Host: www.example.com\r\n" +
|
||||
"Upgrade: websocket\r\n" +
|
||||
"Connection: Upgrade\r\n" +
|
||||
"Sec-WebSocket-Key: 2vBVWg4Qyk3ZoM/5d3QD9Q==\r\n" +
|
||||
"Sec-WebSocket-Version: 13\r\n" +
|
||||
"Authorization: Basic dXNlcjpwYXNz\r\n" +
|
||||
"\r\n"))
|
||||
driver().start()
|
||||
}})
|
||||
}})
|
||||
|
||||
describe("with custom headers", function() { with(this) {
|
||||
before(function() { with(this) {
|
||||
driver().setHeader("User-Agent", "Chrome")
|
||||
|
||||
Reference in New Issue
Block a user