Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix cookie parsing problem and location redirection with '//' at the beginning of location header #87

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix cookie parsing problem and location redirection with '//' at the beginning of location header #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3827864
fix #85 and fix #86
yyfrankyy Sep 18, 2012
8449e28
prevent cookie w/o Path=/ cause exception and fix #88
yyfrankyy Sep 18, 2012
d8ba955
use this.connection.encrypted for detecting https connection
yyfrankyy Sep 18, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions lib/browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,11 @@ Browser.prototype.request = function(method, path, options, fn, saveHistory){

// Redirect
if (status >= 300 && status < 400) {
if (0 == res.headers.location.indexOf('//')) {
var fwd = this.headers && this.headers['x-forwarded-proto'] == 'https';
var isHttps = this.connection.encrypted || fwd;
res.headers.location = (isHttps ? 'https:' : 'http:') + res.headers.location
}
var location = res.headers.location
, uri = url.parse(location)
, path = uri.pathname + (uri.search || '');
Expand Down Expand Up @@ -313,6 +318,10 @@ Browser.prototype.request = function(method, path, options, fn, saveHistory){
Browser.prototype.get =
Browser.prototype.visit =
Browser.prototype.open = function(path, options, fn, saveHistory){
// relative path
if (0 == path.indexOf('?')) {
path = url.parse(this.history[this.history.length - 1]).pathname + path;
}
if ('function' == typeof options) {
saveHistory = fn;
fn = options;
Expand All @@ -332,6 +341,10 @@ Browser.prototype.open = function(path, options, fn, saveHistory){
*/

Browser.prototype.head = function(path, options, fn, saveHistory){
// relative path
if (0 == path.indexOf('?')) {
path = url.parse(this.history[this.history.length - 1]).pathname + path;
}
if ('function' == typeof options) {
saveHistory = fn;
fn = options;
Expand All @@ -351,6 +364,10 @@ Browser.prototype.head = function(path, options, fn, saveHistory){
*/

Browser.prototype.post = function(path, options, fn, saveHistory){
// relative path
if (0 == path.indexOf('?')) {
path = url.parse(this.history[this.history.length - 1]).pathname + path;
}
if ('function' == typeof options) {
saveHistory = fn;
fn = options;
Expand All @@ -370,6 +387,10 @@ Browser.prototype.post = function(path, options, fn, saveHistory){
*/

Browser.prototype.put = function(path, options, fn, saveHistory){
// relative path
if (0 == path.indexOf('?')) {
path = url.parse(this.history[this.history.length - 1]).pathname + path;
}
if ('function' == typeof options) {
saveHistory = fn;
fn = options;
Expand All @@ -389,6 +410,10 @@ Browser.prototype.put = function(path, options, fn, saveHistory){
*/

Browser.prototype.delete = function(path, options, fn, saveHistory){
// relative path
if (0 == path.indexOf('?')) {
path = url.parse(this.history[this.history.length - 1]).pathname + path;
}
if ('function' == typeof options) {
saveHistory = fn;
fn = options;
Expand Down
4 changes: 2 additions & 2 deletions lib/cookie/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var Cookie = exports = module.exports = function Cookie(str, req) {
// Map the key/val pairs
str.split(/ *; */).reduce(function(obj, pair){
pair = pair.split(/ *= */);
obj[pair[0]] = pair[1] || true;
obj[pair[0].toLowerCase()] = pair[1] || true;
return obj;
}, this);

Expand All @@ -43,7 +43,7 @@ var Cookie = exports = module.exports = function Cookie(str, req) {
// Default or trim path
this.path = this.path
? this.path.trim()
: url.parse(req.url).pathname;
: (req ? url.parse(req.url).pathname : '/');
};

/**
Expand Down