shill: vpn: Deprecate flimflam namespace.
CL:170123 moves all DBus service constants from the flimflam namespace
to the shill namespace. This CL removes the use of the flimflam
namespace in VPN code.
BUG=chromium:295425
CQ-DEPEND=CL:170123
TEST=Unit tests and trybot runs on release builders.
Change-Id: I8359f5b5ca456138b8cc596c14a11e8e37e7f5fe
Reviewed-on: https://chromium-review.googlesource.com/170207
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
diff --git a/l2tp_ipsec_driver.cc b/l2tp_ipsec_driver.cc
index 397ed2c..cbfc695 100644
--- a/l2tp_ipsec_driver.cc
+++ b/l2tp_ipsec_driver.cc
@@ -65,18 +65,17 @@
const char L2TPIPSecDriver::kL2TPIPSecVPNPath[] = "/usr/sbin/l2tpipsec_vpn";
// static
const VPNDriver::Property L2TPIPSecDriver::kProperties[] = {
- { flimflam::kL2tpIpsecAuthenticationType, 0 },
- { flimflam::kL2tpIpsecCaCertNssProperty, 0 },
- { flimflam::kL2tpIpsecClientCertIdProperty, 0 },
- { flimflam::kL2tpIpsecClientCertSlotProperty, 0 },
- { flimflam::kL2tpIpsecIkeVersion, 0 },
- { flimflam::kL2tpIpsecPasswordProperty,
- Property::kCredential | Property::kWriteOnly },
- { flimflam::kL2tpIpsecPinProperty, Property::kCredential },
- { flimflam::kL2tpIpsecPskProperty, Property::kCredential },
- { flimflam::kL2tpIpsecUserProperty, 0 },
- { flimflam::kProviderHostProperty, 0 },
- { flimflam::kProviderTypeProperty, 0 },
+ { kL2tpIpsecAuthenticationType, 0 },
+ { kL2tpIpsecCaCertNssProperty, 0 },
+ { kL2tpIpsecClientCertIdProperty, 0 },
+ { kL2tpIpsecClientCertSlotProperty, 0 },
+ { kL2tpIpsecIkeVersion, 0 },
+ { kL2tpIpsecPasswordProperty, Property::kCredential | Property::kWriteOnly },
+ { kL2tpIpsecPinProperty, Property::kCredential },
+ { kL2tpIpsecPskProperty, Property::kCredential },
+ { kL2tpIpsecUserProperty, 0 },
+ { kProviderHostProperty, 0 },
+ { kProviderTypeProperty, 0 },
{ kL2tpIpsecCaCertPemProperty, Property::kArray },
{ kL2tpIpsecTunnelGroupProperty, 0 },
{ kL2TPIPSecIPSecTimeoutProperty, 0 },
@@ -142,7 +141,7 @@
}
string L2TPIPSecDriver::GetProviderType() const {
- return flimflam::kProviderL2tpIpsec;
+ return kProviderL2tpIpsec;
}
void L2TPIPSecDriver::IdleService() {
@@ -207,7 +206,7 @@
}
bool L2TPIPSecDriver::InitOptions(vector<string> *options, Error *error) {
- string vpnhost = args()->LookupString(flimflam::kProviderHostProperty, "");
+ string vpnhost = args()->LookupString(kProviderHostProperty, "");
if (vpnhost.empty()) {
Error::PopulateAndLog(
error, Error::kInvalidArguments, "VPN host not specified.");
@@ -231,12 +230,12 @@
InitNSSOptions(options);
}
- AppendValueOption(flimflam::kL2tpIpsecClientCertIdProperty,
+ AppendValueOption(kL2tpIpsecClientCertIdProperty,
"--client_cert_id", options);
- AppendValueOption(flimflam::kL2tpIpsecClientCertSlotProperty,
+ AppendValueOption(kL2tpIpsecClientCertSlotProperty,
"--client_cert_slot", options);
- AppendValueOption(flimflam::kL2tpIpsecPinProperty, "--user_pin", options);
- AppendValueOption(flimflam::kL2tpIpsecUserProperty, "--user", options);
+ AppendValueOption(kL2tpIpsecPinProperty, "--user_pin", options);
+ AppendValueOption(kL2tpIpsecUserProperty, "--user", options);
AppendValueOption(kL2TPIPSecIPSecTimeoutProperty, "--ipsec_timeout", options);
AppendValueOption(kL2TPIPSecLeftProtoPortProperty,
"--leftprotoport", options);
@@ -260,7 +259,7 @@
}
bool L2TPIPSecDriver::InitPSKOptions(vector<string> *options, Error *error) {
- string psk = args()->LookupString(flimflam::kL2tpIpsecPskProperty, "");
+ string psk = args()->LookupString(kL2tpIpsecPskProperty, "");
if (!psk.empty()) {
if (!file_util::CreateTemporaryFileInDir(
manager()->run_path(), &psk_file_) ||
@@ -279,9 +278,9 @@
void L2TPIPSecDriver::InitNSSOptions(vector<string> *options) {
string ca_cert =
- args()->LookupString(flimflam::kL2tpIpsecCaCertNssProperty, "");
+ args()->LookupString(kL2tpIpsecCaCertNssProperty, "");
if (!ca_cert.empty()) {
- const string &vpnhost = args()->GetString(flimflam::kProviderHostProperty);
+ const string &vpnhost = args()->GetString(kProviderHostProperty);
vector<char> id(vpnhost.begin(), vpnhost.end());
FilePath certfile = nss_->GetDERCertfile(ca_cert, id);
if (certfile.empty()) {
@@ -367,13 +366,13 @@
void L2TPIPSecDriver::GetLogin(string *user, string *password) {
LOG(INFO) << "Login requested.";
string user_property =
- args()->LookupString(flimflam::kL2tpIpsecUserProperty, "");
+ args()->LookupString(kL2tpIpsecUserProperty, "");
if (user_property.empty()) {
LOG(ERROR) << "User not set.";
return;
}
string password_property =
- args()->LookupString(flimflam::kL2tpIpsecPasswordProperty, "");
+ args()->LookupString(kL2tpIpsecPasswordProperty, "");
if (password_property.empty()) {
LOG(ERROR) << "Password not set.";
return;
@@ -433,12 +432,10 @@
KeyValueStore L2TPIPSecDriver::GetProvider(Error *error) {
SLOG(VPN, 2) << __func__;
KeyValueStore props = VPNDriver::GetProvider(error);
- props.SetBool(flimflam::kPassphraseRequiredProperty,
- args()->LookupString(
- flimflam::kL2tpIpsecPasswordProperty, "").empty());
- props.SetBool(flimflam::kL2tpIpsecPskRequiredProperty,
- args()->LookupString(
- flimflam::kL2tpIpsecPskProperty, "").empty());
+ props.SetBool(kPassphraseRequiredProperty,
+ args()->LookupString(kL2tpIpsecPasswordProperty, "").empty());
+ props.SetBool(kL2tpIpsecPskRequiredProperty,
+ args()->LookupString(kL2tpIpsecPskProperty, "").empty());
return props;
}
@@ -451,14 +448,14 @@
// We output an enum for each of the authentication types specified,
// even if more than one is set at the same time.
bool has_remote_authentication = false;
- if (args()->LookupString(flimflam::kL2tpIpsecCaCertNssProperty, "") != "") {
+ if (args()->LookupString(kL2tpIpsecCaCertNssProperty, "") != "") {
metrics_->SendEnumToUMA(
Metrics::kMetricVpnRemoteAuthenticationType,
Metrics::kVpnRemoteAuthenticationTypeL2tpIpsecCertificate,
Metrics::kMetricVpnRemoteAuthenticationTypeMax);
has_remote_authentication = true;
}
- if (args()->LookupString(flimflam::kL2tpIpsecPskProperty, "") != "") {
+ if (args()->LookupString(kL2tpIpsecPskProperty, "") != "") {
metrics_->SendEnumToUMA(
Metrics::kMetricVpnRemoteAuthenticationType,
Metrics::kVpnRemoteAuthenticationTypeL2tpIpsecPsk,
@@ -473,7 +470,7 @@
}
bool has_user_authentication = false;
- if (args()->LookupString(flimflam::kL2tpIpsecClientCertIdProperty,
+ if (args()->LookupString(kL2tpIpsecClientCertIdProperty,
"") != "") {
metrics_->SendEnumToUMA(
Metrics::kMetricVpnUserAuthenticationType,
@@ -481,7 +478,7 @@
Metrics::kMetricVpnUserAuthenticationTypeMax);
has_user_authentication = true;
}
- if (args()->LookupString(flimflam::kL2tpIpsecPasswordProperty, "") != "") {
+ if (args()->LookupString(kL2tpIpsecPasswordProperty, "") != "") {
metrics_->SendEnumToUMA(
Metrics::kMetricVpnUserAuthenticationType,
Metrics::kVpnUserAuthenticationTypeL2tpIpsecUsernamePassword,
diff --git a/l2tp_ipsec_driver_unittest.cc b/l2tp_ipsec_driver_unittest.cc
index 23c5e66..c6e37fa 100644
--- a/l2tp_ipsec_driver_unittest.cc
+++ b/l2tp_ipsec_driver_unittest.cc
@@ -149,10 +149,8 @@
Error unused_error;
PropertyStore store;
driver_->InitPropertyStore(&store);
- store.SetStringProperty(flimflam::kL2tpIpsecPskProperty, "x",
- &unused_error);
- store.SetStringProperty(flimflam::kL2tpIpsecPasswordProperty, "y",
- &unused_error);
+ store.SetStringProperty(kL2tpIpsecPskProperty, "x", &unused_error);
+ store.SetStringProperty(kL2tpIpsecPasswordProperty, "y", &unused_error);
EXPECT_CALL(metrics_, SendEnumToUMA(
Metrics::kMetricVpnDriver,
Metrics::kVpnDriverL2tpIpsec,
@@ -216,7 +214,7 @@
}
TEST_F(L2TPIPSecDriverTest, GetProviderType) {
- EXPECT_EQ(flimflam::kProviderL2tpIpsec, GetProviderType());
+ EXPECT_EQ(kProviderL2tpIpsec, GetProviderType());
}
TEST_F(L2TPIPSecDriverTest, Cleanup) {
@@ -264,9 +262,9 @@
static const char kCaCertNSS[] = "{1234}";
static const char kPSK[] = "foobar";
- SetArg(flimflam::kProviderHostProperty, kHost);
- SetArg(flimflam::kL2tpIpsecCaCertNssProperty, kCaCertNSS);
- SetArg(flimflam::kL2tpIpsecPskProperty, kPSK);
+ SetArg(kProviderHostProperty, kHost);
+ SetArg(kL2tpIpsecCaCertNssProperty, kCaCertNSS);
+ SetArg(kL2tpIpsecPskProperty, kPSK);
FilePath empty_cert;
EXPECT_CALL(nss_, GetDERCertfile(kCaCertNSS, _)).WillOnce(Return(empty_cert));
@@ -298,7 +296,7 @@
EXPECT_TRUE(options.empty());
EXPECT_TRUE(error.IsSuccess());
- SetArg(flimflam::kL2tpIpsecPskProperty, kPSK);
+ SetArg(kL2tpIpsecPskProperty, kPSK);
EXPECT_FALSE(driver_->InitPSKOptions(&options, &error));
EXPECT_TRUE(options.empty());
@@ -324,8 +322,8 @@
static const char kNSSCertfile[] = "/tmp/nss-cert";
FilePath empty_cert;
FilePath nss_cert(kNSSCertfile);
- SetArg(flimflam::kProviderHostProperty, kHost);
- SetArg(flimflam::kL2tpIpsecCaCertNssProperty, kCaCertNSS);
+ SetArg(kProviderHostProperty, kHost);
+ SetArg(kL2tpIpsecCaCertNssProperty, kCaCertNSS);
EXPECT_CALL(nss_,
GetDERCertfile(kCaCertNSS,
ElementsAreArray(kHost, arraysize(kHost) - 1)))
@@ -418,16 +416,16 @@
static const char kUser[] = "joesmith";
static const char kPassword[] = "random-password";
string user, password;
- SetArg(flimflam::kL2tpIpsecUserProperty, kUser);
+ SetArg(kL2tpIpsecUserProperty, kUser);
driver_->GetLogin(&user, &password);
EXPECT_TRUE(user.empty());
EXPECT_TRUE(password.empty());
- SetArg(flimflam::kL2tpIpsecUserProperty, "");
- SetArg(flimflam::kL2tpIpsecPasswordProperty, kPassword);
+ SetArg(kL2tpIpsecUserProperty, "");
+ SetArg(kL2tpIpsecPasswordProperty, kPassword);
driver_->GetLogin(&user, &password);
EXPECT_TRUE(user.empty());
EXPECT_TRUE(password.empty());
- SetArg(flimflam::kL2tpIpsecUserProperty, kUser);
+ SetArg(kL2tpIpsecUserProperty, kUser);
driver_->GetLogin(&user, &password);
EXPECT_EQ(kUser, user);
EXPECT_EQ(kPassword, password);
@@ -450,7 +448,7 @@
// Provide the required arguments.
static const char kHost[] = "192.168.2.254";
- SetArg(flimflam::kProviderHostProperty, kHost);
+ SetArg(kProviderHostProperty, kHost);
// TODO(quiche): Instead of setting expectations based on what
// ExternalTask will call, mock out ExternalTask. Non-trivial,
@@ -470,7 +468,7 @@
TEST_F(L2TPIPSecDriverTest, Connect) {
EXPECT_CALL(*service_, SetState(Service::kStateConfiguring));
static const char kHost[] = "192.168.2.254";
- SetArg(flimflam::kProviderHostProperty, kHost);
+ SetArg(kProviderHostProperty, kHost);
// TODO(quiche): Instead of setting expectations based on what
// ExternalTask will call, mock out ExternalTask. Non-trivial,
@@ -518,11 +516,9 @@
driver_->InitPropertyStore(&store);
const string kUser = "joe";
Error error;
- EXPECT_TRUE(
- store.SetStringProperty(flimflam::kL2tpIpsecUserProperty, kUser, &error));
+ EXPECT_TRUE(store.SetStringProperty(kL2tpIpsecUserProperty, kUser, &error));
EXPECT_TRUE(error.IsSuccess());
- EXPECT_EQ(kUser,
- GetArgs()->LookupString(flimflam::kL2tpIpsecUserProperty, ""));
+ EXPECT_EQ(kUser, GetArgs()->LookupString(kL2tpIpsecUserProperty, ""));
}
TEST_F(L2TPIPSecDriverTest, GetProvider) {
@@ -532,24 +528,21 @@
KeyValueStore props;
Error error;
EXPECT_TRUE(
- store.GetKeyValueStoreProperty(
- flimflam::kProviderProperty, &props, &error));
- EXPECT_TRUE(props.LookupBool(flimflam::kPassphraseRequiredProperty, false));
- EXPECT_TRUE(
- props.LookupBool(flimflam::kL2tpIpsecPskRequiredProperty, false));
+ store.GetKeyValueStoreProperty(kProviderProperty, &props, &error));
+ EXPECT_TRUE(props.LookupBool(kPassphraseRequiredProperty, false));
+ EXPECT_TRUE(props.LookupBool(kL2tpIpsecPskRequiredProperty, false));
}
{
KeyValueStore props;
- SetArg(flimflam::kL2tpIpsecPasswordProperty, "random-password");
- SetArg(flimflam::kL2tpIpsecPskProperty, "random-psk");
+ SetArg(kL2tpIpsecPasswordProperty, "random-password");
+ SetArg(kL2tpIpsecPskProperty, "random-psk");
Error error;
EXPECT_TRUE(
- store.GetKeyValueStoreProperty(
- flimflam::kProviderProperty, &props, &error));
- EXPECT_FALSE(props.LookupBool(flimflam::kPassphraseRequiredProperty, true));
+ store.GetKeyValueStoreProperty(kProviderProperty, &props, &error));
+ EXPECT_FALSE(props.LookupBool(kPassphraseRequiredProperty, true));
EXPECT_FALSE(
- props.LookupBool(flimflam::kL2tpIpsecPskRequiredProperty, true));
- EXPECT_FALSE(props.ContainsString(flimflam::kL2tpIpsecPasswordProperty));
+ props.LookupBool(kL2tpIpsecPskRequiredProperty, true));
+ EXPECT_FALSE(props.ContainsString(kL2tpIpsecPasswordProperty));
}
}
diff --git a/openvpn_driver.cc b/openvpn_driver.cc
index c2af243..2deeb78 100644
--- a/openvpn_driver.cc
+++ b/openvpn_driver.cc
@@ -69,39 +69,38 @@
const char OpenVPNDriver::kOpenVPNScript[] = SHIMDIR "/openvpn-script";
// static
const VPNDriver::Property OpenVPNDriver::kProperties[] = {
- { flimflam::kOpenVPNAuthNoCacheProperty, 0 },
- { flimflam::kOpenVPNAuthProperty, 0 },
- { flimflam::kOpenVPNAuthRetryProperty, 0 },
- { flimflam::kOpenVPNAuthUserPassProperty, 0 },
- { flimflam::kOpenVPNCaCertNSSProperty, 0 },
- { flimflam::kOpenVPNCaCertProperty, 0 },
- { flimflam::kOpenVPNCipherProperty, 0 },
- { flimflam::kOpenVPNClientCertIdProperty, Property::kCredential },
- { flimflam::kOpenVPNCompLZOProperty, 0 },
- { flimflam::kOpenVPNCompNoAdaptProperty, 0 },
- { flimflam::kOpenVPNKeyDirectionProperty, 0 },
- { flimflam::kOpenVPNNsCertTypeProperty, 0 },
- { flimflam::kOpenVPNOTPProperty,
+ { kOpenVPNAuthNoCacheProperty, 0 },
+ { kOpenVPNAuthProperty, 0 },
+ { kOpenVPNAuthRetryProperty, 0 },
+ { kOpenVPNAuthUserPassProperty, 0 },
+ { kOpenVPNCaCertNSSProperty, 0 },
+ { kOpenVPNCaCertProperty, 0 },
+ { kOpenVPNCipherProperty, 0 },
+ { kOpenVPNClientCertIdProperty, Property::kCredential },
+ { kOpenVPNCompLZOProperty, 0 },
+ { kOpenVPNCompNoAdaptProperty, 0 },
+ { kOpenVPNKeyDirectionProperty, 0 },
+ { kOpenVPNNsCertTypeProperty, 0 },
+ { kOpenVPNOTPProperty,
Property::kEphemeral | Property::kCredential | Property::kWriteOnly },
- { flimflam::kOpenVPNPasswordProperty,
- Property::kCredential | Property::kWriteOnly },
- { flimflam::kOpenVPNPinProperty, Property::kCredential },
- { flimflam::kOpenVPNPortProperty, 0 },
- { flimflam::kOpenVPNProtoProperty, 0 },
- { flimflam::kOpenVPNProviderProperty, 0 },
- { flimflam::kOpenVPNPushPeerInfoProperty, 0 },
- { flimflam::kOpenVPNRemoteCertEKUProperty, 0 },
- { flimflam::kOpenVPNRemoteCertKUProperty, 0 },
- { flimflam::kOpenVPNRemoteCertTLSProperty, 0 },
- { flimflam::kOpenVPNRenegSecProperty, 0 },
- { flimflam::kOpenVPNServerPollTimeoutProperty, 0 },
- { flimflam::kOpenVPNShaperProperty, 0 },
- { flimflam::kOpenVPNStaticChallengeProperty, 0 },
- { flimflam::kOpenVPNTLSAuthContentsProperty, 0 },
- { flimflam::kOpenVPNTLSRemoteProperty, 0 },
- { flimflam::kOpenVPNUserProperty, 0 },
- { flimflam::kProviderHostProperty, 0 },
- { flimflam::kProviderTypeProperty, 0 },
+ { kOpenVPNPasswordProperty, Property::kCredential | Property::kWriteOnly },
+ { kOpenVPNPinProperty, Property::kCredential },
+ { kOpenVPNPortProperty, 0 },
+ { kOpenVPNProtoProperty, 0 },
+ { kOpenVPNProviderProperty, 0 },
+ { kOpenVPNPushPeerInfoProperty, 0 },
+ { kOpenVPNRemoteCertEKUProperty, 0 },
+ { kOpenVPNRemoteCertKUProperty, 0 },
+ { kOpenVPNRemoteCertTLSProperty, 0 },
+ { kOpenVPNRenegSecProperty, 0 },
+ { kOpenVPNServerPollTimeoutProperty, 0 },
+ { kOpenVPNShaperProperty, 0 },
+ { kOpenVPNStaticChallengeProperty, 0 },
+ { kOpenVPNTLSAuthContentsProperty, 0 },
+ { kOpenVPNTLSRemoteProperty, 0 },
+ { kOpenVPNUserProperty, 0 },
+ { kProviderHostProperty, 0 },
+ { kProviderTypeProperty, 0 },
{ kOpenVPNCaCertPemProperty, Property::kArray },
{ kOpenVPNCertProperty, 0 },
{ kOpenVPNExtraCertPemProperty, Property::kArray },
@@ -574,7 +573,7 @@
}
void OpenVPNDriver::InitOptions(vector<vector<string>> *options, Error *error) {
- string vpnhost = args()->LookupString(flimflam::kProviderHostProperty, "");
+ string vpnhost = args()->LookupString(kProviderHostProperty, "");
if (vpnhost.empty()) {
Error::PopulateAndLog(
error, Error::kInvalidArguments, "VPN host not specified.");
@@ -603,12 +602,12 @@
InitLoggingOptions(options);
AppendValueOption(kVPNMTUProperty, "mtu", options);
- AppendValueOption(flimflam::kOpenVPNProtoProperty, "proto", options);
- AppendValueOption(flimflam::kOpenVPNPortProperty, "port", options);
+ AppendValueOption(kOpenVPNProtoProperty, "proto", options);
+ AppendValueOption(kOpenVPNPortProperty, "port", options);
AppendValueOption(kOpenVPNTLSAuthProperty, "tls-auth", options);
{
string contents =
- args()->LookupString(flimflam::kOpenVPNTLSAuthContentsProperty, "");
+ args()->LookupString(kOpenVPNTLSAuthContentsProperty, "");
if (!contents.empty()) {
if (!file_util::CreateTemporaryFile(&tls_auth_file_) ||
file_util::WriteFile(
@@ -621,20 +620,17 @@
AppendOption("tls-auth", tls_auth_file_.value(), options);
}
}
- AppendValueOption(
- flimflam::kOpenVPNTLSRemoteProperty, "tls-remote", options);
- AppendValueOption(flimflam::kOpenVPNCipherProperty, "cipher", options);
- AppendValueOption(flimflam::kOpenVPNAuthProperty, "auth", options);
- AppendFlag(flimflam::kOpenVPNAuthNoCacheProperty, "auth-nocache", options);
- AppendValueOption(
- flimflam::kOpenVPNAuthRetryProperty, "auth-retry", options);
- AppendFlag(flimflam::kOpenVPNCompLZOProperty, "comp-lzo", options);
- AppendFlag(flimflam::kOpenVPNCompNoAdaptProperty, "comp-noadapt", options);
- AppendFlag(
- flimflam::kOpenVPNPushPeerInfoProperty, "push-peer-info", options);
- AppendValueOption(flimflam::kOpenVPNRenegSecProperty, "reneg-sec", options);
- AppendValueOption(flimflam::kOpenVPNShaperProperty, "shaper", options);
- AppendValueOption(flimflam::kOpenVPNServerPollTimeoutProperty,
+ AppendValueOption(kOpenVPNTLSRemoteProperty, "tls-remote", options);
+ AppendValueOption(kOpenVPNCipherProperty, "cipher", options);
+ AppendValueOption(kOpenVPNAuthProperty, "auth", options);
+ AppendFlag(kOpenVPNAuthNoCacheProperty, "auth-nocache", options);
+ AppendValueOption(kOpenVPNAuthRetryProperty, "auth-retry", options);
+ AppendFlag(kOpenVPNCompLZOProperty, "comp-lzo", options);
+ AppendFlag(kOpenVPNCompNoAdaptProperty, "comp-noadapt", options);
+ AppendFlag(kOpenVPNPushPeerInfoProperty, "push-peer-info", options);
+ AppendValueOption(kOpenVPNRenegSecProperty, "reneg-sec", options);
+ AppendValueOption(kOpenVPNShaperProperty, "shaper", options);
+ AppendValueOption(kOpenVPNServerPollTimeoutProperty,
"server-poll-timeout", options);
if (!InitCAOptions(options, error)) {
@@ -646,15 +642,14 @@
AppendValueOption(kOpenVPNPingExitProperty, "ping-exit", options);
AppendValueOption(kOpenVPNPingRestartProperty, "ping-restart", options);
- AppendValueOption(
- flimflam::kOpenVPNNsCertTypeProperty, "ns-cert-type", options);
+ AppendValueOption(kOpenVPNNsCertTypeProperty, "ns-cert-type", options);
InitClientAuthOptions(options);
InitPKCS11Options(options);
// TLS suport.
string remote_cert_tls =
- args()->LookupString(flimflam::kOpenVPNRemoteCertTLSProperty, "");
+ args()->LookupString(kOpenVPNRemoteCertTLSProperty, "");
if (remote_cert_tls.empty()) {
remote_cert_tls = "server";
}
@@ -664,13 +659,10 @@
// This is an undocumented command line argument that works like a .cfg file
// entry. TODO(sleffler): Maybe roll this into the "tls-auth" option?
- AppendValueOption(
- flimflam::kOpenVPNKeyDirectionProperty, "key-direction", options);
+ AppendValueOption(kOpenVPNKeyDirectionProperty, "key-direction", options);
// TODO(sleffler): Support more than one eku parameter.
- AppendValueOption(
- flimflam::kOpenVPNRemoteCertEKUProperty, "remote-cert-eku", options);
- AppendValueOption(
- flimflam::kOpenVPNRemoteCertKUProperty, "remote-cert-ku", options);
+ AppendValueOption(kOpenVPNRemoteCertEKUProperty, "remote-cert-eku", options);
+ AppendValueOption(kOpenVPNRemoteCertKUProperty, "remote-cert-ku", options);
if (!InitManagementChannelOptions(options, error)) {
return;
@@ -701,9 +693,9 @@
bool OpenVPNDriver::InitCAOptions(
vector<vector<string>> *options, Error *error) {
string ca_cert =
- args()->LookupString(flimflam::kOpenVPNCaCertProperty, "");
+ args()->LookupString(kOpenVPNCaCertProperty, "");
string ca_cert_nss =
- args()->LookupString(flimflam::kOpenVPNCaCertNSSProperty, "");
+ args()->LookupString(kOpenVPNCaCertNSSProperty, "");
vector<string> ca_cert_pem;
if (args()->ContainsStrings(kOpenVPNCaCertPemProperty)) {
ca_cert_pem = args()->GetStrings(kOpenVPNCaCertPemProperty);
@@ -729,7 +721,7 @@
string cert_file;
if (!ca_cert_nss.empty()) {
DCHECK(ca_cert.empty() && ca_cert_pem.empty());
- const string &vpnhost = args()->GetString(flimflam::kProviderHostProperty);
+ const string &vpnhost = args()->GetString(kProviderHostProperty);
vector<char> id(vpnhost.begin(), vpnhost.end());
FilePath certfile = nss_->GetPEMCertfile(ca_cert_nss, id);
if (certfile.empty()) {
@@ -760,10 +752,10 @@
}
void OpenVPNDriver::InitPKCS11Options(vector<vector<string>> *options) {
- string id = args()->LookupString(flimflam::kOpenVPNClientCertIdProperty, "");
+ string id = args()->LookupString(kOpenVPNClientCertIdProperty, "");
if (!id.empty()) {
string provider =
- args()->LookupString(flimflam::kOpenVPNProviderProperty, "");
+ args()->LookupString(kOpenVPNProviderProperty, "");
if (provider.empty()) {
provider = kDefaultPKCS11Provider;
}
@@ -774,13 +766,13 @@
void OpenVPNDriver::InitClientAuthOptions(vector<vector<string>> *options) {
bool has_cert = AppendValueOption(kOpenVPNCertProperty, "cert", options) ||
- !args()->LookupString(flimflam::kOpenVPNClientCertIdProperty, "").empty();
+ !args()->LookupString(kOpenVPNClientCertIdProperty, "").empty();
bool has_key = AppendValueOption(kOpenVPNKeyProperty, "key", options);
// If the AuthUserPass property is set, or the User property is non-empty, or
// there's neither a key, nor a cert available, specify user-password client
// authentication.
- if (args()->ContainsString(flimflam::kOpenVPNAuthUserPassProperty) ||
- !args()->LookupString(flimflam::kOpenVPNUserProperty, "").empty() ||
+ if (args()->ContainsString(kOpenVPNAuthUserPassProperty) ||
+ !args()->LookupString(kOpenVPNUserProperty, "").empty() ||
(!has_cert && !has_key)) {
AppendOption("auth-user-pass", options);
}
@@ -920,15 +912,14 @@
}
string OpenVPNDriver::GetProviderType() const {
- return flimflam::kProviderOpenVpn;
+ return kProviderOpenVpn;
}
KeyValueStore OpenVPNDriver::GetProvider(Error *error) {
SLOG(VPN, 2) << __func__;
KeyValueStore props = VPNDriver::GetProvider(error);
- props.SetBool(flimflam::kPassphraseRequiredProperty,
- args()->LookupString(
- flimflam::kOpenVPNPasswordProperty, "").empty());
+ props.SetBool(kPassphraseRequiredProperty,
+ args()->LookupString(kOpenVPNPasswordProperty, "").empty());
return props;
}
@@ -991,8 +982,8 @@
Metrics::kVpnDriverOpenVpn,
Metrics::kMetricVpnDriverMax);
- if (args()->LookupString(flimflam::kOpenVPNCaCertNSSProperty, "") != "" ||
- args()->LookupString(flimflam::kOpenVPNCaCertProperty, "") != "") {
+ if (args()->LookupString(kOpenVPNCaCertNSSProperty, "") != "" ||
+ args()->LookupString(kOpenVPNCaCertProperty, "") != "") {
metrics_->SendEnumToUMA(
Metrics::kMetricVpnRemoteAuthenticationType,
Metrics::kVpnRemoteAuthenticationTypeOpenVpnCertificate,
@@ -1005,22 +996,22 @@
}
bool has_user_authentication = false;
- if (args()->LookupString(flimflam::kOpenVPNOTPProperty, "") != "") {
+ if (args()->LookupString(kOpenVPNOTPProperty, "") != "") {
metrics_->SendEnumToUMA(
Metrics::kMetricVpnUserAuthenticationType,
Metrics::kVpnUserAuthenticationTypeOpenVpnUsernamePasswordOtp,
Metrics::kMetricVpnUserAuthenticationTypeMax);
has_user_authentication = true;
}
- if (args()->LookupString(flimflam::kOpenVPNAuthUserPassProperty, "") != ""||
- args()->LookupString(flimflam::kOpenVPNUserProperty, "") != "") {
+ if (args()->LookupString(kOpenVPNAuthUserPassProperty, "") != "" ||
+ args()->LookupString(kOpenVPNUserProperty, "") != "") {
metrics_->SendEnumToUMA(
Metrics::kMetricVpnUserAuthenticationType,
Metrics::kVpnUserAuthenticationTypeOpenVpnUsernamePassword,
Metrics::kMetricVpnUserAuthenticationTypeMax);
has_user_authentication = true;
}
- if (args()->LookupString(flimflam::kOpenVPNClientCertIdProperty, "") != "" ||
+ if (args()->LookupString(kOpenVPNClientCertIdProperty, "") != "" ||
args()->LookupString(kOpenVPNCertProperty, "") != "") {
metrics_->SendEnumToUMA(
Metrics::kMetricVpnUserAuthenticationType,
diff --git a/openvpn_driver_unittest.cc b/openvpn_driver_unittest.cc
index e7a2929..a47cf58 100644
--- a/openvpn_driver_unittest.cc
+++ b/openvpn_driver_unittest.cc
@@ -360,10 +360,8 @@
Error unused_error;
PropertyStore store;
driver_->InitPropertyStore(&store);
- store.SetStringProperty(flimflam::kOpenVPNCaCertProperty, "x",
- &unused_error);
- store.SetStringProperty(flimflam::kOpenVPNUserProperty, "y",
- &unused_error);
+ store.SetStringProperty(kOpenVPNCaCertProperty, "x", &unused_error);
+ store.SetStringProperty(kOpenVPNUserProperty, "y", &unused_error);
driver_->Notify("up", config);
}
@@ -583,9 +581,9 @@
static const char kTLSAuthContents[] = "SOME-RANDOM-CONTENTS\n";
static const char kID[] = "TestPKCS11ID";
FilePath empty_cert;
- SetArg(flimflam::kProviderHostProperty, kHost);
- SetArg(flimflam::kOpenVPNTLSAuthContentsProperty, kTLSAuthContents);
- SetArg(flimflam::kOpenVPNClientCertIdProperty, kID);
+ SetArg(kProviderHostProperty, kHost);
+ SetArg(kOpenVPNTLSAuthContentsProperty, kTLSAuthContents);
+ SetArg(kOpenVPNClientCertIdProperty, kID);
driver_->rpc_task_.reset(new RPCTask(&control_, this));
driver_->tunnel_interface_ = kInterfaceName;
EXPECT_CALL(*management_server_, Start(_, _, _)).WillOnce(Return(true));
@@ -615,7 +613,7 @@
}
TEST_F(OpenVPNDriverTest, InitOptionsHostWithPort) {
- SetArg(flimflam::kProviderHostProperty, "v.com:1234");
+ SetArg(kProviderHostProperty, "v.com:1234");
driver_->rpc_task_.reset(new RPCTask(&control_, this));
driver_->tunnel_interface_ = kInterfaceName;
EXPECT_CALL(*management_server_, Start(_, _, _)).WillOnce(Return(true));
@@ -641,19 +639,19 @@
ExpectInFlags(options, "ca", OpenVPNDriver::kDefaultCACertificates);
options.clear();
- SetArg(flimflam::kOpenVPNCaCertProperty, kCaCert);
+ SetArg(kOpenVPNCaCertProperty, kCaCert);
EXPECT_TRUE(driver_->InitCAOptions(&options, &error));
ExpectInFlags(options, "ca", kCaCert);
EXPECT_TRUE(error.IsSuccess());
- SetArg(flimflam::kOpenVPNCaCertNSSProperty, kCaCertNSS);
+ SetArg(kOpenVPNCaCertNSSProperty, kCaCertNSS);
EXPECT_FALSE(driver_->InitCAOptions(&options, &error));
EXPECT_EQ(Error::kInvalidArguments, error.type());
EXPECT_EQ("Can't specify more than one of CACert, CACertNSS and CACertPEM.",
error.message());
- SetArg(flimflam::kOpenVPNCaCertProperty, "");
- SetArg(flimflam::kProviderHostProperty, kHost);
+ SetArg(kOpenVPNCaCertProperty, "");
+ SetArg(kProviderHostProperty, kHost);
FilePath empty_cert;
FilePath nss_cert(kNSSCertfile);
EXPECT_CALL(nss_,
@@ -681,8 +679,8 @@
error.message());
options.clear();
- SetArg(flimflam::kOpenVPNCaCertNSSProperty, "");
- SetArg(flimflam::kProviderHostProperty, "");
+ SetArg(kOpenVPNCaCertNSSProperty, "");
+ SetArg(kProviderHostProperty, "");
static const char kPEMCertfile[] = "/tmp/pem-cert";
FilePath pem_cert(kPEMCertfile);
EXPECT_CALL(*certificate_file_, CreatePEMFromStrings(kCaCertPEM))
@@ -728,15 +726,15 @@
// Key available, AuthUserPass set.
options.clear();
- SetArg(flimflam::kOpenVPNAuthUserPassProperty, kTestValue);
+ SetArg(kOpenVPNAuthUserPassProperty, kTestValue);
driver_->InitClientAuthOptions(&options);
ExpectInFlags(options, "auth-user-pass");
ExpectInFlags(options, "key", kTestValue);
// Key available, User set.
options.clear();
- RemoveStringArg(flimflam::kOpenVPNAuthUserPassProperty);
- SetArg(flimflam::kOpenVPNUserProperty, "user");
+ RemoveStringArg(kOpenVPNAuthUserPassProperty);
+ SetArg(kOpenVPNUserProperty, "user");
driver_->InitClientAuthOptions(&options);
ExpectInFlags(options, "auth-user-pass");
ExpectInFlags(options, "key", kTestValue);
@@ -745,8 +743,8 @@
options.clear();
RemoveStringArg(kOpenVPNKeyProperty);
RemoveStringArg(kOpenVPNCertProperty);
- RemoveStringArg(flimflam::kOpenVPNUserProperty);
- SetArg(flimflam::kOpenVPNClientCertIdProperty, "");
+ RemoveStringArg(kOpenVPNUserProperty);
+ SetArg(kOpenVPNClientCertIdProperty, "");
driver_->InitClientAuthOptions(&options);
ExpectInFlags(options, "auth-user-pass");
ExpectNotInFlags(options, "key");
@@ -755,7 +753,7 @@
// Non-empty PKCS11 certificate id, no user/password/cert.
options.clear();
- SetArg(flimflam::kOpenVPNClientCertIdProperty, kTestValue);
+ SetArg(kOpenVPNClientCertIdProperty, kTestValue);
driver_->InitClientAuthOptions(&options);
ExpectNotInFlags(options, "auth-user-pass");
ExpectNotInFlags(options, "key");
@@ -765,7 +763,7 @@
// PKCS11 certificate id available, AuthUserPass set.
options.clear();
- SetArg(flimflam::kOpenVPNAuthUserPassProperty, kTestValue);
+ SetArg(kOpenVPNAuthUserPassProperty, kTestValue);
driver_->InitClientAuthOptions(&options);
ExpectInFlags(options, "auth-user-pass");
ExpectNotInFlags(options, "key");
@@ -773,8 +771,8 @@
// PKCS11 certificate id available, User set.
options.clear();
- RemoveStringArg(flimflam::kOpenVPNAuthUserPassProperty);
- SetArg(flimflam::kOpenVPNUserProperty, "user");
+ RemoveStringArg(kOpenVPNAuthUserPassProperty);
+ SetArg(kOpenVPNUserProperty, "user");
driver_->InitClientAuthOptions(&options);
ExpectInFlags(options, "auth-user-pass");
ExpectNotInFlags(options, "key");
@@ -787,13 +785,13 @@
EXPECT_TRUE(options.empty());
static const char kID[] = "TestPKCS11ID";
- SetArg(flimflam::kOpenVPNClientCertIdProperty, kID);
+ SetArg(kOpenVPNClientCertIdProperty, kID);
driver_->InitPKCS11Options(&options);
ExpectInFlags(options, "pkcs11-id", kID);
ExpectInFlags(options, "pkcs11-providers", "libchaps.so");
static const char kProvider[] = "libpkcs11.so";
- SetArg(flimflam::kOpenVPNProviderProperty, kProvider);
+ SetArg(kOpenVPNProviderProperty, kProvider);
options.clear();
driver_->InitPKCS11Options(&options);
ExpectInFlags(options, "pkcs11-id", kID);
@@ -901,7 +899,7 @@
EXPECT_FALSE(driver_->device_);
static const char kHost[] = "192.168.2.254";
- SetArg(flimflam::kProviderHostProperty, kHost);
+ SetArg(kProviderHostProperty, kHost);
EXPECT_CALL(*management_server_, Start(_, _, _)).WillOnce(Return(true));
EXPECT_CALL(manager_, IsOnline()).WillOnce(Return(false));
EXPECT_CALL(glib_, SpawnAsync(_, _, _, _, _, _, _, _)).WillOnce(Return(true));
@@ -995,7 +993,7 @@
EXPECT_FALSE(driver_->SpawnOpenVPN());
static const char kHost[] = "192.168.2.254";
- SetArg(flimflam::kProviderHostProperty, kHost);
+ SetArg(kProviderHostProperty, kHost);
driver_->tunnel_interface_ = "tun0";
driver_->rpc_task_.reset(new RPCTask(&control_, this));
EXPECT_CALL(*management_server_, Start(_, _, _))
@@ -1132,10 +1130,9 @@
driver_->InitPropertyStore(&store);
const string kUser = "joe";
Error error;
- EXPECT_TRUE(
- store.SetStringProperty(flimflam::kOpenVPNUserProperty, kUser, &error));
+ EXPECT_TRUE(store.SetStringProperty(kOpenVPNUserProperty, kUser, &error));
EXPECT_TRUE(error.IsSuccess());
- EXPECT_EQ(kUser, GetArgs()->LookupString(flimflam::kOpenVPNUserProperty, ""));
+ EXPECT_EQ(kUser, GetArgs()->LookupString(kOpenVPNUserProperty, ""));
}
TEST_F(OpenVPNDriverTest, GetProvider) {
@@ -1145,19 +1142,17 @@
KeyValueStore props;
Error error;
EXPECT_TRUE(
- store.GetKeyValueStoreProperty(
- flimflam::kProviderProperty, &props, &error));
- EXPECT_TRUE(props.LookupBool(flimflam::kPassphraseRequiredProperty, false));
+ store.GetKeyValueStoreProperty(kProviderProperty, &props, &error));
+ EXPECT_TRUE(props.LookupBool(kPassphraseRequiredProperty, false));
}
{
KeyValueStore props;
- SetArg(flimflam::kOpenVPNPasswordProperty, "random-password");
+ SetArg(kOpenVPNPasswordProperty, "random-password");
Error error;
EXPECT_TRUE(
- store.GetKeyValueStoreProperty(
- flimflam::kProviderProperty, &props, &error));
- EXPECT_FALSE(props.LookupBool(flimflam::kPassphraseRequiredProperty, true));
- EXPECT_FALSE(props.ContainsString(flimflam::kOpenVPNPasswordProperty));
+ store.GetKeyValueStoreProperty(kProviderProperty, &props, &error));
+ EXPECT_FALSE(props.LookupBool(kPassphraseRequiredProperty, true));
+ EXPECT_FALSE(props.ContainsString(kOpenVPNPasswordProperty));
}
}
diff --git a/openvpn_management_server.cc b/openvpn_management_server.cc
index d47db41..07e1246 100644
--- a/openvpn_management_server.cc
+++ b/openvpn_management_server.cc
@@ -100,7 +100,7 @@
hold_waiting_ = false;
driver_->AppendOption("management-query-passwords", options);
- if (driver_->AppendValueOption(flimflam::kOpenVPNStaticChallengeProperty,
+ if (driver_->AppendValueOption(kOpenVPNStaticChallengeProperty,
"static-challenge",
options)) {
options->back().push_back("1"); // Force echo.
@@ -258,12 +258,9 @@
void OpenVPNManagementServer::PerformStaticChallenge(const string &tag) {
LOG(INFO) << "Perform static challenge: " << tag;
- string user =
- driver_->args()->LookupString(flimflam::kOpenVPNUserProperty, "");
- string password =
- driver_->args()->LookupString(flimflam::kOpenVPNPasswordProperty, "");
- string otp =
- driver_->args()->LookupString(flimflam::kOpenVPNOTPProperty, "");
+ string user = driver_->args()->LookupString(kOpenVPNUserProperty, "");
+ string password = driver_->args()->LookupString(kOpenVPNPasswordProperty, "");
+ string otp = driver_->args()->LookupString(kOpenVPNOTPProperty, "");
if (user.empty() || password.empty() || otp.empty()) {
NOTIMPLEMENTED() << ": Missing credentials:"
<< (user.empty() ? " no-user" : "")
@@ -284,15 +281,13 @@
b64_password.c_str(),
b64_otp.c_str()));
// Don't reuse OTP.
- driver_->args()->RemoveString(flimflam::kOpenVPNOTPProperty);
+ driver_->args()->RemoveString(kOpenVPNOTPProperty);
}
void OpenVPNManagementServer::PerformAuthentication(const string &tag) {
LOG(INFO) << "Perform authentication: " << tag;
- string user =
- driver_->args()->LookupString(flimflam::kOpenVPNUserProperty, "");
- string password =
- driver_->args()->LookupString(flimflam::kOpenVPNPasswordProperty, "");
+ string user = driver_->args()->LookupString(kOpenVPNUserProperty, "");
+ string password = driver_->args()->LookupString(kOpenVPNPasswordProperty, "");
if (user.empty() || password.empty()) {
NOTIMPLEMENTED() << ": Missing credentials:"
<< (user.empty() ? " no-user" : "")
@@ -306,7 +301,7 @@
void OpenVPNManagementServer::SupplyTPMToken(const string &tag) {
SLOG(VPN, 2) << __func__ << "(" << tag << ")";
- string pin = driver_->args()->LookupString(flimflam::kOpenVPNPinProperty, "");
+ string pin = driver_->args()->LookupString(kOpenVPNPinProperty, "");
if (pin.empty()) {
NOTIMPLEMENTED() << ": Missing PIN.";
driver_->FailService(Service::kFailureInternal, Service::kErrorDetailsNone);
diff --git a/openvpn_management_server_unittest.cc b/openvpn_management_server_unittest.cc
index 13723ca..cc9359b 100644
--- a/openvpn_management_server_unittest.cc
+++ b/openvpn_management_server_unittest.cc
@@ -59,24 +59,24 @@
}
void ExpectStaticChallengeResponse() {
- driver_.args()->SetString(flimflam::kOpenVPNUserProperty, "jojo");
- driver_.args()->SetString(flimflam::kOpenVPNPasswordProperty, "yoyo");
- driver_.args()->SetString(flimflam::kOpenVPNOTPProperty, "123456");
+ driver_.args()->SetString(kOpenVPNUserProperty, "jojo");
+ driver_.args()->SetString(kOpenVPNPasswordProperty, "yoyo");
+ driver_.args()->SetString(kOpenVPNOTPProperty, "123456");
SetConnectedSocket();
ExpectSend("username \"Auth\" jojo\n");
ExpectSend("password \"Auth\" \"SCRV1:eW95bw==:MTIzNDU2\"\n");
}
void ExpectAuthenticationResponse() {
- driver_.args()->SetString(flimflam::kOpenVPNUserProperty, "jojo");
- driver_.args()->SetString(flimflam::kOpenVPNPasswordProperty, "yoyo");
+ driver_.args()->SetString(kOpenVPNUserProperty, "jojo");
+ driver_.args()->SetString(kOpenVPNPasswordProperty, "yoyo");
SetConnectedSocket();
ExpectSend("username \"Auth\" jojo\n");
ExpectSend("password \"Auth\" \"yoyo\"\n");
}
void ExpectPINResponse() {
- driver_.args()->SetString(flimflam::kOpenVPNPinProperty, "987654");
+ driver_.args()->SetString(kOpenVPNPinProperty, "987654");
SetConnectedSocket();
ExpectSend("password \"User-Specific TPM Token FOO\" \"987654\"\n");
}
@@ -177,8 +177,7 @@
TEST_F(OpenVPNManagementServerTest, Start) {
const string kStaticChallenge = "static-challenge";
- driver_.args()->SetString(
- flimflam::kOpenVPNStaticChallengeProperty, kStaticChallenge);
+ driver_.args()->SetString(kOpenVPNStaticChallengeProperty, kStaticChallenge);
const int kSocket = 123;
EXPECT_CALL(sockets_, Socket(AF_INET, SOCK_STREAM, IPPROTO_TCP))
.WillOnce(Return(kSocket));
@@ -335,7 +334,7 @@
EXPECT_TRUE(
server_.ProcessNeedPasswordMessage(
">PASSWORD:Need 'Auth' SC:user/password/otp"));
- EXPECT_FALSE(driver_.args()->ContainsString(flimflam::kOpenVPNOTPProperty));
+ EXPECT_FALSE(driver_.args()->ContainsString(kOpenVPNOTPProperty));
}
TEST_F(OpenVPNManagementServerTest, ProcessNeedPasswordMessageAuth) {
@@ -389,23 +388,23 @@
EXPECT_CALL(driver_, FailService(Service::kFailureInternal,
Service::kErrorDetailsNone)).Times(3);
server_.PerformStaticChallenge("Auth");
- driver_.args()->SetString(flimflam::kOpenVPNUserProperty, "jojo");
+ driver_.args()->SetString(kOpenVPNUserProperty, "jojo");
server_.PerformStaticChallenge("Auth");
- driver_.args()->SetString(flimflam::kOpenVPNPasswordProperty, "yoyo");
+ driver_.args()->SetString(kOpenVPNPasswordProperty, "yoyo");
server_.PerformStaticChallenge("Auth");
}
TEST_F(OpenVPNManagementServerTest, PerformStaticChallenge) {
ExpectStaticChallengeResponse();
server_.PerformStaticChallenge("Auth");
- EXPECT_FALSE(driver_.args()->ContainsString(flimflam::kOpenVPNOTPProperty));
+ EXPECT_FALSE(driver_.args()->ContainsString(kOpenVPNOTPProperty));
}
TEST_F(OpenVPNManagementServerTest, PerformAuthenticationNoCreds) {
EXPECT_CALL(driver_, FailService(Service::kFailureInternal,
Service::kErrorDetailsNone)).Times(2);
server_.PerformAuthentication("Auth");
- driver_.args()->SetString(flimflam::kOpenVPNUserProperty, "jojo");
+ driver_.args()->SetString(kOpenVPNUserProperty, "jojo");
server_.PerformAuthentication("Auth");
}
diff --git a/vpn_driver.cc b/vpn_driver.cc
index 780b1c0..bd38fde 100644
--- a/vpn_driver.cc
+++ b/vpn_driver.cc
@@ -143,7 +143,7 @@
}
store->RegisterDerivedKeyValueStore(
- flimflam::kProviderProperty,
+ kProviderProperty,
KeyValueStoreAccessor(
new CustomAccessor<VPNDriver, KeyValueStore>(
this, &VPNDriver::GetProvider, NULL)));
@@ -213,7 +213,7 @@
KeyValueStore VPNDriver::GetProvider(Error *error) {
SLOG(VPN, 2) << __func__;
- string provider_prefix = string(flimflam::kProviderProperty) + ".";
+ string provider_prefix = string(kProviderProperty) + ".";
KeyValueStore provider_properties;
for (size_t i = 0; i < property_count_; i++) {
@@ -277,7 +277,7 @@
}
string VPNDriver::GetHost() const {
- return args_.LookupString(flimflam::kProviderHostProperty, "");
+ return args_.LookupString(kProviderHostProperty, "");
}
} // namespace shill
diff --git a/vpn_driver_unittest.cc b/vpn_driver_unittest.cc
index d5be5fe..cf766de 100644
--- a/vpn_driver_unittest.cc
+++ b/vpn_driver_unittest.cc
@@ -79,7 +79,7 @@
{ kPSKProperty, Property::kCredential },
{ kPasswordProperty, Property::kCredential },
{ kPortProperty, 0 },
- { flimflam::kProviderTypeProperty, 0 },
+ { kProviderTypeProperty, 0 },
};
VPNDriverUnderTest::VPNDriverUnderTest(
@@ -148,7 +148,7 @@
KeyValueStore provider_properties;
Error error;
EXPECT_TRUE(store.GetKeyValueStoreProperty(
- flimflam::kProviderProperty, &provider_properties, &error));
+ kProviderProperty, &provider_properties, &error));
if (!provider_properties.ContainsString(key)) {
return false;
}
@@ -164,7 +164,7 @@
KeyValueStore provider_properties;
Error error;
EXPECT_TRUE(store.GetKeyValueStoreProperty(
- flimflam::kProviderProperty, &provider_properties, &error));
+ kProviderProperty, &provider_properties, &error));
if (!provider_properties.ContainsStrings(key)) {
return false;
}
@@ -215,7 +215,7 @@
}
TEST_F(VPNDriverTest, Save) {
- SetArg(flimflam::kProviderTypeProperty, "");
+ SetArg(kProviderTypeProperty, "");
SetArg(kPINProperty, kPIN);
SetArg(kPortProperty, kPort);
SetArg(kPasswordProperty, kPassword);
@@ -227,7 +227,7 @@
SetStringList(kStorageID, kEapCaCertPemProperty, kCaCerts))
.WillOnce(Return(true));
EXPECT_CALL(storage,
- SetString(kStorageID, flimflam::kProviderTypeProperty, ""))
+ SetString(kStorageID, kProviderTypeProperty, ""))
.WillOnce(Return(true));
EXPECT_CALL(storage, SetString(kStorageID, kPortProperty, kPort))
.WillOnce(Return(true));
@@ -240,7 +240,7 @@
EXPECT_CALL(storage, SetString(_, kOTPProperty, _)).Times(0);
EXPECT_CALL(storage, SetString(_, kEapCaCertPemProperty, _)).Times(0);
EXPECT_CALL(storage, DeleteKey(kStorageID, kEapCaCertPemProperty)).Times(0);
- EXPECT_CALL(storage, DeleteKey(kStorageID, flimflam::kProviderTypeProperty))
+ EXPECT_CALL(storage, DeleteKey(kStorageID, kProviderTypeProperty))
.Times(0);
EXPECT_CALL(storage, DeleteKey(kStorageID, kL2tpIpsecCaCertPemProperty));
EXPECT_CALL(storage, DeleteKey(kStorageID, kPSKProperty));
@@ -295,7 +295,7 @@
const string kProviderType = "boo";
SetArg(kPortProperty, kPort);
SetArg(kPasswordProperty, kPassword);
- SetArg(flimflam::kProviderTypeProperty, kProviderType);
+ SetArg(kProviderTypeProperty, kProviderType);
SetArg(kVPNHostProperty, "");
const vector<string> kCaCerts{ "cert1" };
SetArgArray(kEapCaCertPemProperty, kCaCerts);
@@ -344,7 +344,7 @@
// name in the Properties dict with the prefix removed.
{
string value;
- EXPECT_TRUE(GetProviderPropertyString(store, flimflam::kTypeProperty,
+ EXPECT_TRUE(GetProviderPropertyString(store, kTypeProperty,
&value));
EXPECT_EQ(kProviderType, value);
}
diff --git a/vpn_provider.cc b/vpn_provider.cc
index 959bc0e..947fc53 100644
--- a/vpn_provider.cc
+++ b/vpn_provider.cc
@@ -46,14 +46,14 @@
string *host_ptr,
Error *error) {
SLOG(VPN, 2) << __func__;
- string type = args.LookupString(flimflam::kProviderTypeProperty, "");
+ string type = args.LookupString(kProviderTypeProperty, "");
if (type.empty()) {
Error::PopulateAndLog(
error, Error::kNotSupported, "Missing VPN type property.");
return false;
}
- string host = args.LookupString(flimflam::kProviderHostProperty, "");
+ string host = args.LookupString(kProviderHostProperty, "");
if (host.empty()) {
Error::PopulateAndLog(
error, Error::kNotSupported, "Missing VPN host property.");
@@ -62,7 +62,7 @@
*type_ptr = type,
*host_ptr = host,
- *name_ptr = args.LookupString(flimflam::kNameProperty, "");
+ *name_ptr = args.LookupString(kNameProperty, "");
return true;
}
@@ -136,30 +136,30 @@
SLOG(VPN, 2) << __func__;
const StoreInterface *storage = profile->GetConstStorage();
set<string> groups =
- storage->GetGroupsWithKey(flimflam::kProviderTypeProperty);
+ storage->GetGroupsWithKey(kProviderTypeProperty);
for (set<string>::iterator it = groups.begin(); it != groups.end(); ++it) {
if (!StartsWithASCII(*it, "vpn_", false)) {
continue;
}
string type;
- if (!storage->GetString(*it, flimflam::kProviderTypeProperty, &type)) {
+ if (!storage->GetString(*it, kProviderTypeProperty, &type)) {
LOG(ERROR) << "Group " << *it << " is missing the "
- << flimflam::kProviderTypeProperty << " property.";
+ << kProviderTypeProperty << " property.";
continue;
}
string name;
- if (!storage->GetString(*it, flimflam::kNameProperty, &name)) {
+ if (!storage->GetString(*it, kNameProperty, &name)) {
LOG(ERROR) << "Group " << *it << " is missing the "
- << flimflam::kNameProperty << " property.";
+ << kNameProperty << " property.";
continue;
}
string host;
- if (!storage->GetString(*it, flimflam::kProviderHostProperty, &host)) {
+ if (!storage->GetString(*it, kProviderHostProperty, &host)) {
LOG(ERROR) << "Group " << *it << " is missing the "
- << flimflam::kProviderHostProperty << " property.";
+ << kProviderHostProperty << " property.";
continue;
}
@@ -200,11 +200,11 @@
#else
scoped_ptr<VPNDriver> driver;
- if (type == flimflam::kProviderOpenVpn) {
+ if (type == kProviderOpenVpn) {
driver.reset(new OpenVPNDriver(
control_interface_, dispatcher_, metrics_, manager_,
manager_->device_info(), manager_->glib()));
- } else if (type == flimflam::kProviderL2tpIpsec) {
+ } else if (type == kProviderL2tpIpsec) {
driver.reset(new L2TPIPSecDriver(
control_interface_, dispatcher_, metrics_, manager_,
manager_->device_info(), manager_->glib()));
diff --git a/vpn_provider_unittest.cc b/vpn_provider_unittest.cc
index 00d12b3..c63e505 100644
--- a/vpn_provider_unittest.cc
+++ b/vpn_provider_unittest.cc
@@ -75,7 +75,7 @@
TEST_F(VPNProviderTest, GetServiceNoType) {
KeyValueStore args;
Error e;
- args.SetString(flimflam::kTypeProperty, flimflam::kTypeVPN);
+ args.SetString(kTypeProperty, kTypeVPN);
ServiceRefPtr service = provider_.GetService(args, &e);
EXPECT_EQ(Error::kNotSupported, e.type());
EXPECT_FALSE(service);
@@ -84,10 +84,10 @@
TEST_F(VPNProviderTest, GetServiceUnsupportedType) {
KeyValueStore args;
Error e;
- args.SetString(flimflam::kTypeProperty, flimflam::kTypeVPN);
- args.SetString(flimflam::kProviderTypeProperty, "unknown-vpn-type");
- args.SetString(flimflam::kProviderHostProperty, kHost);
- args.SetString(flimflam::kNameProperty, kName);
+ args.SetString(kTypeProperty, kTypeVPN);
+ args.SetString(kProviderTypeProperty, "unknown-vpn-type");
+ args.SetString(kProviderHostProperty, kHost);
+ args.SetString(kNameProperty, kName);
ServiceRefPtr service = provider_.GetService(args, &e);
EXPECT_EQ(Error::kNotSupported, e.type());
EXPECT_FALSE(service);
@@ -95,10 +95,10 @@
TEST_F(VPNProviderTest, GetService) {
KeyValueStore args;
- args.SetString(flimflam::kTypeProperty, flimflam::kTypeVPN);
- args.SetString(flimflam::kProviderTypeProperty, flimflam::kProviderOpenVpn);
- args.SetString(flimflam::kProviderHostProperty, kHost);
- args.SetString(flimflam::kNameProperty, kName);
+ args.SetString(kTypeProperty, kTypeVPN);
+ args.SetString(kProviderTypeProperty, kProviderOpenVpn);
+ args.SetString(kProviderHostProperty, kHost);
+ args.SetString(kNameProperty, kName);
{
Error error;
@@ -248,41 +248,34 @@
const string kVPNIdentifierNoName("vpn_no_name");
groups.insert(kVPNIdentifierNoName);
- const string kOpenVPNProvider(flimflam::kProviderOpenVpn);
- EXPECT_CALL(storage, GetString(kVPNIdentifierNoName,
- flimflam::kProviderTypeProperty,
- _))
- .WillRepeatedly(DoAll(SetArgumentPointee<2>(kOpenVPNProvider),
- Return(true)));
+ const string kOpenVPNProvider(kProviderOpenVpn);
+ EXPECT_CALL(storage,
+ GetString(kVPNIdentifierNoName, kProviderTypeProperty, _))
+ .WillRepeatedly(
+ DoAll(SetArgumentPointee<2>(kOpenVPNProvider), Return(true)));
const string kVPNIdentifierNoHost("vpn_no_host");
groups.insert(kVPNIdentifierNoHost);
- EXPECT_CALL(storage, GetString(kVPNIdentifierNoHost,
- flimflam::kProviderTypeProperty,
- _))
- .WillRepeatedly(DoAll(SetArgumentPointee<2>(kOpenVPNProvider),
- Return(true)));
+ EXPECT_CALL(storage,
+ GetString(kVPNIdentifierNoHost, kProviderTypeProperty, _))
+ .WillRepeatedly(
+ DoAll(SetArgumentPointee<2>(kOpenVPNProvider), Return(true)));
const string kName("name");
- EXPECT_CALL(storage, GetString(kVPNIdentifierNoHost,
- flimflam::kNameProperty, _))
+ EXPECT_CALL(storage, GetString(kVPNIdentifierNoHost, kNameProperty, _))
.WillRepeatedly(DoAll(SetArgumentPointee<2>(kName), Return(true)));
const string kVPNIdentifierValid("vpn_valid");
groups.insert(kVPNIdentifierValid);
- EXPECT_CALL(storage, GetString(kVPNIdentifierValid,
- flimflam::kProviderTypeProperty,
- _))
- .WillRepeatedly(DoAll(SetArgumentPointee<2>(kOpenVPNProvider),
- Return(true)));
- EXPECT_CALL(storage, GetString(kVPNIdentifierValid,
- flimflam::kNameProperty, _))
+ EXPECT_CALL(storage, GetString(kVPNIdentifierValid, kProviderTypeProperty, _))
+ .WillRepeatedly(
+ DoAll(SetArgumentPointee<2>(kOpenVPNProvider), Return(true)));
+ EXPECT_CALL(storage, GetString(kVPNIdentifierValid, kNameProperty, _))
.WillRepeatedly(DoAll(SetArgumentPointee<2>(kName), Return(true)));
const string kHost("1.2.3.4");
- EXPECT_CALL(storage, GetString(kVPNIdentifierValid,
- flimflam::kProviderHostProperty, _))
+ EXPECT_CALL(storage, GetString(kVPNIdentifierValid, kProviderHostProperty, _))
.WillRepeatedly(DoAll(SetArgumentPointee<2>(kHost), Return(true)));
- EXPECT_CALL(storage, GetGroupsWithKey(flimflam::kProviderTypeProperty))
+ EXPECT_CALL(storage, GetGroupsWithKey(kProviderTypeProperty))
.WillRepeatedly(Return(groups));
EXPECT_CALL(manager_, device_info())
@@ -294,8 +287,7 @@
.WillOnce(Return(true));
provider_.CreateServicesFromProfile(profile);
- GetServiceAt(0)->driver()->args()->SetString(flimflam::kProviderHostProperty,
- kHost);
+ GetServiceAt(0)->driver()->args()->SetString(kProviderHostProperty, kHost);
// Calling this again should not create any more services (checked by the
// Times(1) above).
provider_.CreateServicesFromProfile(profile);
@@ -305,8 +297,8 @@
static const char kName[] = "test-vpn-service";
static const char kStorageID[] = "test_vpn_storage_id";
static const char *kTypes[] = {
- flimflam::kProviderOpenVpn,
- flimflam::kProviderL2tpIpsec,
+ kProviderOpenVpn,
+ kProviderL2tpIpsec,
};
const size_t kTypesCount = arraysize(kTypes);
EXPECT_CALL(manager_, device_info())
diff --git a/vpn_service.cc b/vpn_service.cc
index 15dde68..886a300 100644
--- a/vpn_service.cc
+++ b/vpn_service.cc
@@ -38,7 +38,7 @@
driver_(driver) {
SetConnectable(true);
set_save_credentials(false);
- mutable_store()->RegisterString(flimflam::kVPNDomainProperty, &vpn_domain_);
+ mutable_store()->RegisterString(kVPNDomainProperty, &vpn_domain_);
mutable_store()->RegisterDerivedString(
kPhysicalTechnologyProperty,
StringAccessor(
@@ -80,13 +80,13 @@
// static
string VPNService::CreateStorageIdentifier(const KeyValueStore &args,
Error *error) {
- string host = args.LookupString(flimflam::kProviderHostProperty, "");
+ string host = args.LookupString(kProviderHostProperty, "");
if (host.empty()) {
Error::PopulateAndLog(
error, Error::kInvalidProperty, "Missing VPN host.");
return "";
}
- string name = args.LookupString(flimflam::kNameProperty, "");
+ string name = args.LookupString(kNameProperty, "");
if (name.empty()) {
Error::PopulateAndLog(error, Error::kNotSupported, "Missing VPN name.");
return "";
@@ -182,7 +182,7 @@
<< friendly_name() << " -> " << name;
KeyValueStore *args = driver_->args();
- args->SetString(flimflam::kNameProperty, name);
+ args->SetString(kNameProperty, name);
string new_storage_id = CreateStorageIdentifier(*args, error);
if (new_storage_id.empty()) {
return false;
diff --git a/vpn_service_unittest.cc b/vpn_service_unittest.cc
index 8337a5b..a8d39e0 100644
--- a/vpn_service_unittest.cc
+++ b/vpn_service_unittest.cc
@@ -140,7 +140,7 @@
TEST_F(VPNServiceTest, CreateStorageIdentifierNoHost) {
KeyValueStore args;
Error error;
- args.SetString(flimflam::kNameProperty, "vpn-name");
+ args.SetString(kNameProperty, "vpn-name");
EXPECT_EQ("", VPNService::CreateStorageIdentifier(args, &error));
EXPECT_EQ(Error::kInvalidProperty, error.type());
}
@@ -148,7 +148,7 @@
TEST_F(VPNServiceTest, CreateStorageIdentifierNoName) {
KeyValueStore args;
Error error;
- args.SetString(flimflam::kProviderHostProperty, "10.8.0.1");
+ args.SetString(kProviderHostProperty, "10.8.0.1");
EXPECT_EQ("", VPNService::CreateStorageIdentifier(args, &error));
EXPECT_EQ(Error::kNotSupported, error.type());
}
@@ -156,8 +156,8 @@
TEST_F(VPNServiceTest, CreateStorageIdentifier) {
KeyValueStore args;
Error error;
- args.SetString(flimflam::kNameProperty, "vpn-name");
- args.SetString(flimflam::kProviderHostProperty, "10.8.0.1");
+ args.SetString(kNameProperty, "vpn-name");
+ args.SetString(kProviderHostProperty, "10.8.0.1");
EXPECT_EQ("vpn_10_8_0_1_vpn_name",
VPNService::CreateStorageIdentifier(args, &error));
EXPECT_TRUE(error.IsSuccess());
@@ -301,7 +301,7 @@
DBus::Error error;
// A null change returns false, but with error set to success.
EXPECT_FALSE(DBusAdaptor::SetProperty(service_->mutable_store(),
- flimflam::kNameProperty,
+ kNameProperty,
DBusAdaptor::StringToVariant(
service_->friendly_name()),
&error));
@@ -310,7 +310,7 @@
TEST_F(VPNServiceTest, SetNameProperty) {
const string kHost = "1.2.3.4";
- driver_->args()->SetString(flimflam::kProviderHostProperty, kHost);
+ driver_->args()->SetString(kProviderHostProperty, kHost);
string kOldId = service_->GetStorageIdentifier();
DBus::Error error;
const string kName = "New Name";
@@ -320,7 +320,7 @@
EXPECT_CALL(*profile, UpdateService(_));
service_->set_profile(profile);
EXPECT_TRUE(DBusAdaptor::SetProperty(service_->mutable_store(),
- flimflam::kNameProperty,
+ kNameProperty,
DBusAdaptor::StringToVariant(kName),
&error));
EXPECT_NE(service_->GetStorageIdentifier(), kOldId);
@@ -335,7 +335,7 @@
scoped_refptr<MockProfile> profile(
new NiceMock<MockProfile>(&control_, &metrics_, &manager_));
service_->set_profile(profile);
- driver_->args()->SetString(flimflam::kProviderHostProperty, kHost);
+ driver_->args()->SetString(kProviderHostProperty, kHost);
TestNamePropertyChange(service_, GetAdaptor());
}
@@ -380,8 +380,7 @@
.WillOnce(Return(Technology::kWifi));
Error error;
- EXPECT_EQ(flimflam::kTypeWifi,
- service_->GetPhysicalTechologyProperty(&error));
+ EXPECT_EQ(kTypeWifi, service_->GetPhysicalTechologyProperty(&error));
EXPECT_TRUE(error.IsSuccess());
// Clear expectations now, so the Return(lower_connection_) action releases