6776518bea
This refactoring takes a careful approach to avoid rushing the change: * stub headers are left in all the old locations of webrtc/base * existing GN targets are kept and now just forward to the moved ones using public_deps. The only exception to the above is the base_java target and its .java files, which were moved to webrtc/rtc_base right away since it's not possible to use public_deps for android_library. To avoid breaking builds, a temporary Dummy.java file was added to the new intermediate target in webrtc/rtc_base:base_java as well to avoid hitting a GN assert in the android_library template. The above approach should make the transition smooth without breaking downstream. A helper script was created (https://codereview.webrtc.org/2879203002/) and was run like this: stub-headers.py -s webrtc/base -d webrtc/rtc_base -i 7634 stub-headers.py -s webrtc/base/numerics -d webrtc/rtc_base/numerics -i 7634 Fixed invalid header guards in the following files: webrtc/base/base64.h webrtc/base/cryptstring.h webrtc/base/event.h webrtc/base/flags.h webrtc/base/httpbase.h webrtc/base/httpcommon-inl.h webrtc/base/httpcommon.h webrtc/base/httpserver.h webrtc/base/logsinks.h webrtc/base/macutils.h webrtc/base/nattypes.h webrtc/base/openssladapter.h webrtc/base/opensslstreamadapter.h webrtc/base/pathutils.h webrtc/base/physicalsocketserver.h webrtc/base/proxyinfo.h webrtc/base/sigslot.h webrtc/base/sigslotrepeater.h webrtc/base/socket.h webrtc/base/socketaddresspair.h webrtc/base/socketfactory.h webrtc/base/stringutils.h webrtc/base/testbase64.h webrtc/base/testutils.h webrtc/base/transformadapter.h webrtc/base/win32filesystem.h Added new header guards to: sslroots.h testbase64.h BUG=webrtc:7634 NOTRY=True NOPRESUBMIT=True R=kwiberg@webrtc.org Review-Url: https://codereview.webrtc.org/2877023002 . Cr-Commit-Position: refs/heads/master@{#18816}
78 lines
2.9 KiB
C++
78 lines
2.9 KiB
C++
/*
|
|
* Copyright 2009 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include "webrtc/base/gunit.h"
|
|
#include "webrtc/base/httpserver.h"
|
|
#include "webrtc/base/proxyserver.h"
|
|
#include "webrtc/base/socketadapters.h"
|
|
#include "webrtc/base/testclient.h"
|
|
#include "webrtc/base/testechoserver.h"
|
|
#include "webrtc/base/virtualsocketserver.h"
|
|
|
|
using rtc::Socket;
|
|
using rtc::Thread;
|
|
using rtc::SocketAddress;
|
|
|
|
static const SocketAddress kSocksProxyIntAddr("1.2.3.4", 1080);
|
|
static const SocketAddress kSocksProxyExtAddr("1.2.3.5", 0);
|
|
static const SocketAddress kHttpsProxyIntAddr("1.2.3.4", 443);
|
|
static const SocketAddress kHttpsProxyExtAddr("1.2.3.5", 0);
|
|
static const SocketAddress kBogusProxyIntAddr("1.2.3.4", 999);
|
|
|
|
// Sets up a virtual socket server and HTTPS/SOCKS5 proxy servers.
|
|
class ProxyTest : public testing::Test {
|
|
public:
|
|
ProxyTest() : ss_(new rtc::VirtualSocketServer()), thread_(ss_.get()) {
|
|
socks_.reset(new rtc::SocksProxyServer(
|
|
ss_.get(), kSocksProxyIntAddr, ss_.get(), kSocksProxyExtAddr));
|
|
https_.reset(new rtc::HttpListenServer());
|
|
https_->Listen(kHttpsProxyIntAddr);
|
|
}
|
|
~ProxyTest() {}
|
|
|
|
rtc::SocketServer* ss() { return ss_.get(); }
|
|
|
|
private:
|
|
std::unique_ptr<rtc::SocketServer> ss_;
|
|
rtc::AutoSocketServerThread thread_;
|
|
std::unique_ptr<rtc::SocksProxyServer> socks_;
|
|
// TODO: Make this a real HTTPS proxy server.
|
|
std::unique_ptr<rtc::HttpListenServer> https_;
|
|
};
|
|
|
|
// Tests whether we can use a SOCKS5 proxy to connect to a server.
|
|
TEST_F(ProxyTest, TestSocks5Connect) {
|
|
rtc::AsyncSocket* socket =
|
|
ss()->CreateAsyncSocket(kSocksProxyIntAddr.family(), SOCK_STREAM);
|
|
rtc::AsyncSocksProxySocket* proxy_socket =
|
|
new rtc::AsyncSocksProxySocket(socket, kSocksProxyIntAddr,
|
|
"", rtc::CryptString());
|
|
// TODO: IPv6-ize these tests when proxy supports IPv6.
|
|
|
|
rtc::TestEchoServer server(Thread::Current(),
|
|
SocketAddress(INADDR_ANY, 0));
|
|
|
|
std::unique_ptr<rtc::AsyncTCPSocket> packet_socket(
|
|
rtc::AsyncTCPSocket::Create(proxy_socket, SocketAddress(INADDR_ANY, 0),
|
|
server.address()));
|
|
EXPECT_TRUE(packet_socket != nullptr);
|
|
rtc::TestClient client(std::move(packet_socket));
|
|
|
|
EXPECT_EQ(Socket::CS_CONNECTING, proxy_socket->GetState());
|
|
EXPECT_TRUE(client.CheckConnected());
|
|
EXPECT_EQ(Socket::CS_CONNECTED, proxy_socket->GetState());
|
|
EXPECT_EQ(server.address(), client.remote_address());
|
|
client.Send("foo", 3);
|
|
EXPECT_TRUE(client.CheckNextPacket("foo", 3, nullptr));
|
|
EXPECT_TRUE(client.CheckNoPacket());
|
|
}
|