Merge lp:~beidl/unity/unity-lockscreen-gestures into lp:unity

[Alfred E. Neumayer]

Security issue: Gestures on the lock screen allow to peek inside running applications.
As with keyboard input, gestures should be blocked while the screen is locked.

Security issue: Gestures on the lock screen allow to peek inside running applications.
As with keyboard input, gestures should be blocked while the screen is locked.

[Marco Trevisan (Treviño) (3v1n0)]

+1

review: Approve

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2014-04-10 10:11:21 +0000
+++ launcher/Launcher.cpp	2014-04-14 13:47:18 +0000
@@ -222,16 +222,17 @@
 
 void Launcher::OnDragUpdate(const nux::GestureEvent &event)
 {
-  drag_out_delta_x_ =
-    CLAMP(drag_out_delta_x_ + event.GetDelta().x, 0.0f, DRAG_OUT_PIXELS);
-  if(options()->hide_mode == LAUNCHER_HIDE_AUTOHIDE)
+  auto& wm = WindowManager::Default();
+
+  if (options()->hide_mode == LAUNCHER_HIDE_AUTOHIDE &&
+    !wm.IsScaleActive() && !wm.IsExpoActive() &&
+    !dash_is_open_ && !hud_is_open_)
   {
-    if(drag_out_delta_x_ > 0.0f)
-      parent_->ShowWindow(true);
-    else
-      parent_->ShowWindow(false);
+    drag_out_delta_x_ =
+      CLAMP(drag_out_delta_x_ + event.GetDelta().x, 0.0f, DRAG_OUT_PIXELS);
+
+    QueueDraw();
   }
-  QueueDraw();
 }
 
 void Launcher::OnDragFinish(const nux::GestureEvent &event)
@@ -1108,9 +1109,6 @@
   postreveal_mousemove_delta_x_ = 0;
   postreveal_mousemove_delta_y_ = 0;
 
-  if (!hide_launcher)
-    parent_->ShowWindow(true);
-
   if (nux::GetWindowThread()->IsEmbeddedWindow())
     parent_->EnableInputWindow(!hide_launcher, launcher::window_title, false, false);
 
@@ -1682,9 +1680,6 @@
   RenderArgs(args, bkg_box, &launcher_alpha, geo_absolute);
   bkg_box.width -= RIGHT_LINE_WIDTH.CP(cv_);
 
-  if (options()->hide_mode != LAUNCHER_HIDE_NEVER && bkg_box.x + bkg_box.width <= 0)
-    parent_->ShowWindow(false);
-
   nux::Color clear_colour = nux::Color(0x00000000);
 
   // clear region
 
=== modified file 'plugins/unityshell/src/UnityGestureTarget.cpp'
--- plugins/unityshell/src/UnityGestureTarget.cpp	2014-04-10 15:54:41 +0000
+++ plugins/unityshell/src/UnityGestureTarget.cpp	2014-04-14 13:47:18 +0000
@@ -38,6 +38,9 @@
 
 GestureDeliveryRequest UnityGestureTarget::GestureEvent(const nux::GestureEvent &event)
 {
+  if (UnityScreen::get(screen)->lockscreen_controller()->IsLocked())
+    return GestureDeliveryRequest::NONE;
+
   if (event.GetGestureClasses() & DRAG_GESTURE)
   {
     if (launcher.IsValid())
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-04-10 17:43:34 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-04-14 13:47:18 +0000
@@ -2222,6 +2222,9 @@
 
 void UnityScreen::SetUpAndShowSwitcher(switcher::ShowMode show_mode)
 {
+  if(lockscreen_controller_->IsLocked())
+    return;
+
   RaiseInputWindows();
 
   if (!optionGetAltTabBiasViewport())
@@ -3865,6 +3868,11 @@
   return launcher_controller_;
 }
 
+std::shared_ptr<lockscreen::Controller> UnityScreen::lockscreen_controller()
+{
+  return lockscreen_controller_;
+}
+
 void UnityScreen::InitGesturesSupport()
 {
   std::unique_ptr<nux::GestureBroker> gesture_broker(new UnityGestureBroker);
 
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2014-04-07 03:44:44 +0000
+++ plugins/unityshell/src/unityshell.h	2014-04-14 13:47:18 +0000
@@ -236,6 +236,7 @@
 
   switcher::Controller::Ptr switcher_controller();
   launcher::Controller::Ptr launcher_controller();
+  std::shared_ptr<lockscreen::Controller> lockscreen_controller();
 
   bool DoesPointIntersectUnityGeos(nux::Point const& pt);