diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-10 14:43:00 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-10 14:43:00 +0000 |
| commit | bfba36542e138194af9305cef85a00ffb9f4c548 (patch) | |
| tree | 49714cf8afbdaeb12ac463a2328bdcd79601be0b /net/test | |
| parent | 735844ac9b440410b101127907090c17d3672852 (diff) | |
| download | chromium_src-bfba36542e138194af9305cef85a00ffb9f4c548.zip chromium_src-bfba36542e138194af9305cef85a00ffb9f4c548.tar.gz chromium_src-bfba36542e138194af9305cef85a00ffb9f4c548.tar.bz2 | |
Explicitly whitelist the test server port.
BUG=65859
TEST=yes please
Review URL: http://codereview.chromium.org/5519015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
| -rw-r--r-- | net/test/test_server.cc | 4 | ||||
| -rw-r--r-- | net/test/test_server.h | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/net/test/test_server.cc b/net/test/test_server.cc index d2d3fde..a6e5a82 100644 --- a/net/test/test_server.cc +++ b/net/test/test_server.cc @@ -159,6 +159,8 @@ bool TestServer::Start() { return false; } + allowed_port_.reset(new ScopedPortException(host_port_pair_.port())); + started_ = true; return true; } @@ -181,6 +183,8 @@ bool TestServer::Stop() { VLOG(1) << "Kill failed?"; } + allowed_port_.reset(); + return ret; } diff --git a/net/test/test_server.h b/net/test/test_server.h index 1ae0a50..4154302 100644 --- a/net/test/test_server.h +++ b/net/test/test_server.h @@ -17,6 +17,7 @@ #include "base/file_util.h" #include "base/process_util.h" #include "net/base/host_port_pair.h" +#include "net/base/net_util.h" #if defined(OS_WIN) #include "base/scoped_handle_win.h" @@ -180,6 +181,8 @@ class TestServer { // Handle of the Python process running the test server. base::ProcessHandle process_handle_; + scoped_ptr<net::ScopedPortException> allowed_port_; + #if defined(OS_WIN) // JobObject used to clean up orphaned child processes. ScopedHandle job_handle_; |