Only disable update downloads over expensive connections, not all transfers.
Previous to this CL, all network traffic was disabled from the update engine
if an update wasn't allowed. Instead, in this CL, we switch to only disable
the update application portion (downloading and applying the payload). This
is done by moving the detection logic from the mechanism (the network fetcher)
to the user of said mechanism i.e. the omaha request/response actions.
I have done a little refactoring of the unittests to make this CL easier to
test and found 1 bug in the http_fetcher_unittests where we weren't sending
either the right URL or handling a server not existing correctly.
This CL comes with one caveat:
Technically in the previous impl if a download started over wifi then got
disconnected / retried and bounced to a different connection type that
we couldn't update over, we'd stop the update. This would no longer be true
here if the http_fetcher recovered seamlessly.
BUG=chromium:379832
TEST=Unittests
Change-Id: I6b1a76e4c030d4e384e8ba0b519424a35406aafb
Reviewed-on: https://chromium-review.googlesource.com/202435
Tested-by: Chris Sosa <sosa@chromium.org>
Reviewed-by: David Zeuthen <zeuthen@chromium.org>
Commit-Queue: Chris Sosa <sosa@chromium.org>
diff --git a/omaha_request_action.cc b/omaha_request_action.cc
index 9c5bbf5..9e43385 100644
--- a/omaha_request_action.cc
+++ b/omaha_request_action.cc
@@ -27,6 +27,7 @@
#include "update_engine/p2p_manager.h"
#include "update_engine/payload_state_interface.h"
#include "update_engine/prefs_interface.h"
+#include "update_engine/real_dbus_wrapper.h"
#include "update_engine/utils.h"
using base::Time;
@@ -879,17 +880,9 @@
output_object.update_exists = true;
SetOutputObject(output_object);
- if (params_->update_disabled()) {
- LOG(INFO) << "Ignoring Omaha updates as updates are disabled by policy.";
+ if (ShouldIgnoreUpdate(output_object)) {
output_object.update_exists = false;
completer.set_code(kErrorCodeOmahaUpdateIgnoredPerPolicy);
- // Note: We could technically delete the UpdateFirstSeenAt state here.
- // If we do, it'll mean a device has to restart the UpdateFirstSeenAt
- // and thus help scattering take effect when the AU is turned on again.
- // On the other hand, it also increases the chance of update starvation if
- // an admin turns AU on/off more frequently. We choose to err on the side
- // of preventing starvation at the cost of not applying scattering in
- // those cases.
return;
}
@@ -1359,4 +1352,55 @@
result, reaction, download_error_code);
}
+bool OmahaRequestAction::ShouldIgnoreUpdate(
+ const OmahaResponse& response) const {
+ if (params_->update_disabled()) {
+ LOG(INFO) << "Ignoring Omaha updates as updates are disabled by policy.";
+ return true;
+ }
+
+ // Note: policy decision to not update to a version we rolled back from.
+ string rollback_version =
+ system_state_->payload_state()->GetRollbackVersion();
+ if(!rollback_version.empty()) {
+ LOG(INFO) << "Detected previous rollback from version " << rollback_version;
+ if(rollback_version == response.version) {
+ LOG(INFO) << "Received version that we rolled back from. Ignoring.";
+ return true;
+ }
+ }
+
+ if(!IsUpdateAllowedOverCurrentConnection()) {
+ LOG(INFO) << "Update is not allowed over current connection.";
+ return true;
+ }
+
+ // Note: We could technically delete the UpdateFirstSeenAt state when we
+ // return true. If we do, it'll mean a device has to restart the
+ // UpdateFirstSeenAt and thus help scattering take effect when the AU is
+ // turned on again. On the other hand, it also increases the chance of update
+ // starvation if an admin turns AU on/off more frequently. We choose to err on
+ // the side of preventing starvation at the cost of not applying scattering in
+ // those cases.
+ return false;
+}
+
+bool OmahaRequestAction::IsUpdateAllowedOverCurrentConnection() const {
+ NetworkConnectionType type;
+ NetworkTethering tethering;
+ RealDBusWrapper dbus_iface;
+ ConnectionManager* connection_manager = system_state_->connection_manager();
+ if (!connection_manager->GetConnectionProperties(&dbus_iface,
+ &type, &tethering)) {
+ LOG(INFO) << "We could not determine our connection type. "
+ << "Defaulting to allow updates.";
+ return true;
+ }
+ bool is_allowed = connection_manager->IsUpdateAllowedOver(type, tethering);
+ LOG(INFO) << "We are connected via "
+ << connection_manager->StringForConnectionType(type)
+ << ", Updates allowed: " << (is_allowed ? "Yes" : "No");
+ return is_allowed;
+}
+
} // namespace chromeos_update_engine