Skip to content

daemon_config: Detect proxy env var and use it if found #1348

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

Merged
merged 5 commits into from
Feb 11, 2020
Merged

daemon_config: Detect proxy env var and use it if found #1348

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad06387
url_downloader: Detect proxy env var and use it if found
Feb 5, 2020
3a8471a
daemon_config: Move proxy discover into the daemon_config
Feb 11, 2020
eee45fd
proxy_support: Accounts for socks type proxies in env var
Feb 11, 2020
f7245b6
tests: Add network proxy setup test
Feb 11, 2020
a4883b6
test: Add scope_guard to reset proxy when test finishes
Feb 11, 2020
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
18 changes: 18 additions & 0 deletions tests/test_daemon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <multipass/vm_image_host.h>
#include <multipass/vm_image_vault.h>

#include "mock_environment_helpers.h"
#include "mock_virtual_machine_factory.h"
#include "stub_cert_store.h"
#include "stub_certprovider.h"
Expand Down Expand Up @@ -367,6 +368,23 @@ TEST_F(Daemon, failed_restart_command_returns_fulfilled_promise)
EXPECT_TRUE(is_ready(status_promise.get_future()));
}

TEST_F(Daemon, proxy_contains_valid_info)
{
QString username{"username"};
QString password{"password"};
QString hostname{"192.168.1.1"};
qint16 port{3128};
QString proxy = QString("%1:%2@%3:%4").arg(username).arg(password).arg(hostname).arg(port);

mpt::SetEnvScope env("http_proxy", proxy.toUtf8());

auto config = config_builder.build();

EXPECT_THAT(config->network_proxy->user(), username);
EXPECT_THAT(config->network_proxy->password(), password);
EXPECT_THAT(config->network_proxy->hostName(), hostname);
EXPECT_THAT(config->network_proxy->port(), port);
}

namespace
{
Expand Down