Skip to content
This repository was archived by the owner on Mar 3, 2020. It is now read-only.

Socks5 support #709

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

Socks5 support #709

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ff51b15
support
addicted2sounds Jan 18, 2015
852bae8
proxy set
addicted2sounds Jan 18, 2015
573674d
changed argument to socks5
addicted2sounds Jan 18, 2015
0dd392f
browser#set_proxy tests copied
May 20, 2015
b2f2d7a
browser#set_proxy tests copied
May 20, 2015
f938ed1
commented socks5 tests
May 20, 2015
8db420b
Merge remote-tracking branch 'upstream/master'
Jun 5, 2015
8dc288a
Merge branch 'master' of https://github.com/thoughtbot/capybara-webkit
addicted2sounds Jul 13, 2015
077affd
Merge remote-tracking branch 'upstream/master'
addicted2sounds May 24, 2016
343a99d
removed extra lines from browser spec
addicted2sounds May 24, 2016
61979c2
fixed hound offences
addicted2sounds May 24, 2016
d33b803
fixed hound offences for hash
addicted2sounds May 24, 2016
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
89 changes: 0 additions & 89 deletions Gemfile.lock
View file
Open in desktop

This file was deleted.

12 changes: 7 additions & 5 deletions lib/capybara/webkit/browser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,8 @@ def get_cookies

def set_proxy(options = {})
options = default_proxy_options.merge(options)
command("SetProxy", options[:host], options[:port], options[:user], options[:pass])
command "SetProxy", options[:host], options[:port], options[:user],
options[:pass], options[:type]
end

def clear_proxy
Expand Down Expand Up @@ -321,10 +322,11 @@ def read_response

def default_proxy_options
{
:host => "localhost",
:port => "0",
:user => "",
:pass => ""
host: "localhost",
Copy link

@houndci-bot houndci-bot May 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use 2 spaces for indentation in a hash, relative to the start of the line where the left curly brace is.

port: "0",
user: "",
pass: "",
type: "http"
Copy link

@houndci-bot houndci-bot May 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Put a comma after the last item of a multiline hash.

}
end
end
Expand Down
13 changes: 7 additions & 6 deletions src/SetProxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ void SetProxy::start()
// default to empty proxy
QNetworkProxy proxy;

if (arguments().size() > 0)
proxy = QNetworkProxy(QNetworkProxy::HttpProxy,
arguments()[0],
(quint16)(arguments()[1].toInt()),
arguments()[2],
arguments()[3]);
if (arguments().size() > 0) {
proxy.setType((arguments()[4] == "socks5") ? QNetworkProxy::Socks5Proxy : QNetworkProxy::HttpProxy);
proxy.setHostName(arguments()[0]);
proxy.setPort((quint16)(arguments()[1].toInt()));
proxy.setUser(arguments()[2]);
proxy.setPassword(arguments()[3]);
}

manager()->networkAccessManager()->setProxy(proxy);
finish(true);
Expand Down