system-proxy: Remove SetSystemTrafficCredentials
SetSystemTrafficCredentials was replaced with SetAuthenticationDetails
which allows more detailed configurations like specifying a protection
space for the credentials and Kerberos configuration details.
BUG=chromium:1076377
TEST=none
Change-Id: Ibe29d13f1170e7b1456519d80361dd083a1e6986
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2308530
Tested-by: Andreea-Elena Costinas <acostinas@google.com>
Commit-Queue: Andreea-Elena Costinas <acostinas@google.com>
Reviewed-by: Hugo Benichi <hugobenichi@google.com>
Reviewed-by: Pavol Marko <pmarko@chromium.org>
diff --git a/system-proxy/dbus/org.chromium.SystemProxy.conf b/system-proxy/dbus/org.chromium.SystemProxy.conf
index 8011778..0e9e9c0 100644
--- a/system-proxy/dbus/org.chromium.SystemProxy.conf
+++ b/system-proxy/dbus/org.chromium.SystemProxy.conf
@@ -18,9 +18,6 @@
send_member="SetAuthenticationDetails"/>
<allow send_destination="org.chromium.SystemProxy"
send_interface="org.chromium.SystemProxy"
- send_member="SetSystemTrafficCredentials"/>
- <allow send_destination="org.chromium.SystemProxy"
- send_interface="org.chromium.SystemProxy"
send_member="ShutDown"/>
<allow receive_interface="org.chromium.SystemProxy"
receive_member="WorkerActive"
diff --git a/system-proxy/dbus_bindings/org.chromium.SystemProxy.xml b/system-proxy/dbus_bindings/org.chromium.SystemProxy.xml
index e089e8f..55dea65 100644
--- a/system-proxy/dbus_bindings/org.chromium.SystemProxy.xml
+++ b/system-proxy/dbus_bindings/org.chromium.SystemProxy.xml
@@ -18,22 +18,6 @@
</arg>
<annotation name="org.chromium.DBus.Method.Kind" value="simple" />
</method>
- <method name="SetSystemTrafficCredentials">
- <tp:docstring>
- Sets the credentails for authenticating system services to the remote web proxy.
- </tp:docstring>
- <arg name="request" type="ay" direction="in">
- <tp:docstring>
- Serialized SetSystemTrafficCredentialsRequest message.
- </tp:docstring>
- </arg>
- <arg name="response" type="ay" direction="out">
- <tp:docstring>
- Serialized SetSystemTrafficCredentialsResponse message.
- </tp:docstring>
- </arg>
- <annotation name="org.chromium.DBus.Method.Kind" value="simple"/>
- </method>
<method name="ShutDown">
<tp:docstring>
Shuts down the daemon. The daemon will exit with code 0 which prevents an Upstart respawn.
diff --git a/system-proxy/sandboxed_worker.h b/system-proxy/sandboxed_worker.h
index b2714b3..e631c9d 100644
--- a/system-proxy/sandboxed_worker.h
+++ b/system-proxy/sandboxed_worker.h
@@ -61,7 +61,6 @@
private:
friend class SystemProxyAdaptorTest;
- FRIEND_TEST(SystemProxyAdaptorTest, SetSystemTrafficCredentials);
FRIEND_TEST(SystemProxyAdaptorTest, SetAuthenticationDetails);
FRIEND_TEST(SystemProxyAdaptorTest, KerberosEnabled);
FRIEND_TEST(SystemProxyAdaptorTest, ProxyResolutionFilter);
diff --git a/system-proxy/system_proxy_adaptor.cc b/system-proxy/system_proxy_adaptor.cc
index 07d6920..4105130 100644
--- a/system-proxy/system_proxy_adaptor.cc
+++ b/system-proxy/system_proxy_adaptor.cc
@@ -141,14 +141,6 @@
return SerializeProto(response);
}
-std::vector<uint8_t> SystemProxyAdaptor::SetSystemTrafficCredentials(
- const std::vector<uint8_t>& request_blob) {
- SetSystemTrafficCredentialsResponse response;
- response.set_error_message("Deprecated. Please use SetAuthenticationDetails");
-
- return SerializeProto(response);
-}
-
std::vector<uint8_t> SystemProxyAdaptor::ShutDown() {
LOG(INFO) << "Received shutdown request.";
diff --git a/system-proxy/system_proxy_adaptor.h b/system-proxy/system_proxy_adaptor.h
index eb79aac..8772112 100644
--- a/system-proxy/system_proxy_adaptor.h
+++ b/system-proxy/system_proxy_adaptor.h
@@ -47,8 +47,6 @@
// org::chromium::SystemProxyInterface: (see org.chromium.SystemProxy.xml).
std::vector<uint8_t> SetAuthenticationDetails(
const std::vector<uint8_t>& request_blob) override;
- std::vector<uint8_t> SetSystemTrafficCredentials(
- const std::vector<uint8_t>& request_blob) override;
std::vector<uint8_t> ShutDown() override;
void GetChromeProxyServersAsync(
@@ -67,7 +65,6 @@
private:
friend class SystemProxyAdaptorTest;
FRIEND_TEST(SystemProxyAdaptorTest, SetAuthenticationDetails);
- FRIEND_TEST(SystemProxyAdaptorTest, SetSystemTrafficCredentials);
FRIEND_TEST(SystemProxyAdaptorTest, KerberosEnabled);
FRIEND_TEST(SystemProxyAdaptorTest, ShutDown);
FRIEND_TEST(SystemProxyAdaptorTest, ConnectNamespace);
