[sensors] Add Permission guard to the generic sensor apis.

third_party/WebKit/Source/modules/sensor/SensorProxy.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/sensor/SensorProxy.h"
 
 #include "core/frame/LocalFrame.h"
+#include "modules/permissions/PermissionUtils.h"
 #include "modules/sensor/SensorProviderProxy.h"
 #include "modules/sensor/SensorReading.h"
+#include "platform/UserGestureIndicator.h"
 #include "platform/mojo/MojoHelper.h"
+#include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/Platform.h"
+#include "wtf/RefPtr.h"
 
 using namespace device::mojom::blink;
 
 namespace blink {
 
+using mojom::blink::PermissionName;
+using mojom::blink::PermissionService;
+using mojom::blink::PermissionStatus;
+
 SensorProxy::SensorProxy(SensorType sensorType,
+                         PermissionService* permissionService,
+                         PassRefPtr<SecurityOrigin> origin,
                          SensorProviderProxy* provider,
                          std::unique_ptr<SensorReadingFactory> readingFactory)
     : m_type(sensorType),
       m_mode(ReportingMode::CONTINUOUS),
       m_provider(provider),
       m_clientBinding(this),
       m_state(SensorProxy::Uninitialized),
       m_suspended(false),
       m_readingFactory(std::move(readingFactory)),
-      m_maximumFrequency(0.0) {}
+      m_maximumFrequency(0.0),
+      m_permissionStatus(PermissionStatus::ASK),
+      m_permissionService(permissionService),
+      m_securityOrigin(std::move(origin)) {}

[Mikhail, 2016/11/15 14:03:18]

no need to move PassRefPtr, I think PassRefPtr itself is deprecated now.

[riju_, 2016/11/16 12:38:25]

Done.

+
+void SensorProxy::onPermissionUpdate(PermissionStatus status) {
+  if (m_permissionStatus != status) {
+    m_permissionStatus = status;
+    SensorPermissionChanged();
+  }
+
+  // Keep listening to changes.
+  m_permissionService->GetNextPermissionChange(
+      createPermissionDescriptor(PermissionName::SENSORS), m_securityOrigin,
+      m_permissionStatus,
+      convertToBaseCallback(
+          WTF::bind(&SensorProxy::onPermissionUpdate, wrapPersistent(this))));
+}
 
 SensorProxy::~SensorProxy() {}
 
 void SensorProxy::dispose() {
   m_clientBinding.Close();
 }
 
 DEFINE_TRACE(SensorProxy) {
   visitor->trace(m_reading);
   visitor->trace(m_observers);
@@ skipping 11 matching lines @@
 
 void SensorProxy::initialize() {
   if (m_state != Uninitialized)
     return;
 
   if (!m_provider->sensorProvider()) {
     handleSensorError();
     return;
   }
 
-  m_state = Initializing;
-  auto callback = convertToBaseCallback(
-      WTF::bind(&SensorProxy::onSensorCreated, wrapWeakPersistent(this)));
-  m_provider->sensorProvider()->GetSensor(m_type, mojo::GetProxy(&m_sensor),
-                                          callback);
+  // Request permission.
+  if (m_permissionStatus == PermissionStatus::ASK) {

[Mikhail, 2016/11/15 14:03:18]

what if (m_permissionStatus != PermissionStatus::ASK) ? We should either
continue initialization or stop with error, depending on its actual value.

[riju_, 2016/11/16 12:38:25]

Done.

+    m_permissionService->RequestPermission(

[shalamov, 2016/11/14 14:40:06]

Can be garbage, if invalidated.

[riju_, 2016/11/16 12:38:25]

Acknowledged.

+        createPermissionDescriptor(PermissionName::SENSORS), m_securityOrigin,
+        UserGestureIndicator::processingUserGesture(),
+        convertToBaseCallback(
+            WTF::bind(&SensorProxy::onPermissionUpdate, wrapPersistent(this))));
+  }
 }
 
 void SensorProxy::addConfiguration(
     SensorConfigurationPtr configuration,
     std::unique_ptr<Function<void(bool)>> callback) {
   DCHECK(isInitialized());
   m_sensor->AddConfiguration(std::move(configuration),
                              convertToBaseCallback(std::move(callback)));
 }
 
@@ skipping 47 matching lines @@
 
 void SensorProxy::RaiseError() {
   handleSensorError();
 }
 
 void SensorProxy::SensorReadingChanged() {
   for (Observer* observer : m_observers)
     observer->onSensorReadingChanged();
 }
 
+void SensorProxy::SensorPermissionChanged() {
+  // If Permission is revoked throw error and reset connection.
+  if (m_permissionStatus != PermissionStatus::GRANTED) {
+    m_provider->onPermissionServiceConnectionError();

[shalamov, 2016/11/14 14:40:06]

This will invalidate permission proxy when permission is denied, consecutive
initialize will crash. If I read thru code correctly :D

[Mikhail, 2016/11/15 14:03:18]

we should prepare implementation for more granular permissions,
'handleSensorError' would be enough. Also 'onerror' event with an appropriate
description must be send to the user.

[riju_, 2016/11/16 12:38:25]

Acknowledged.

[riju_, 2016/11/16 12:38:25]

My bad, handleSensorError() is called now

+  } else {
+    m_state = Initializing;

[shalamov, 2016/11/14 14:40:07]

Can there be a case when we get "GRANTED" and proxy is already initialized?

[Mikhail, 2016/11/15 14:03:18]

we should not assign m_state here. What if SensorProxy is already initialized?

[riju_, 2016/11/16 12:38:26]

Added a check now, so that we don't call GetProxy more than once.

+    auto callback = convertToBaseCallback(
+        WTF::bind(&SensorProxy::onSensorCreated, wrapWeakPersistent(this)));
+    m_provider->sensorProvider()->GetSensor(m_type, mojo::GetProxy(&m_sensor),
+                                            callback);
+  }
+}
+
 void SensorProxy::handleSensorError(ExceptionCode code,
                                     String sanitizedMessage,
                                     String unsanitizedMessage) {
   if (!Platform::current()) {
     // TODO(rockot): Remove this hack once renderer shutdown sequence is fixed.
     return;
   }
 
   m_state = Uninitialized;
   // The m_sensor.reset() will release all callbacks and its bound parameters,
@@ skipping 61 matching lines @@
   const device::OneWriterSeqLock& seqlock = buffer->seqlock.value();
   auto version = seqlock.ReadBegin();
   auto readingData = buffer->reading;
   if (seqlock.ReadRetry(version))
     return false;
   result = readingData;
   return true;
 }
 
 }  // namespace blink