Bug 1205156 - Add telemetry to measure how often getUserMedia is used over non-secure origins r=jib

This commit is contained in:
Richard Barnes 2015-09-17 08:44:50 -04:00
parent 58a1ac6f5c
commit 558b41e2c2
2 changed files with 58 additions and 1 deletions

View File

@ -33,6 +33,7 @@
#include "nsAppDirectoryServiceDefs.h" #include "nsAppDirectoryServiceDefs.h"
#include "nsIInputStream.h" #include "nsIInputStream.h"
#include "nsILineInputStream.h" #include "nsILineInputStream.h"
#include "mozilla/Telemetry.h"
#include "mozilla/Types.h" #include "mozilla/Types.h"
#include "mozilla/PeerIdentity.h" #include "mozilla/PeerIdentity.h"
#include "mozilla/dom/ContentChild.h" #include "mozilla/dom/ContentChild.h"
@ -1579,6 +1580,16 @@ nsresult MediaManager::GenerateUUID(nsAString& aResult)
return NS_OK; return NS_OK;
} }
enum class GetUserMediaSecurityState {
Other = 0,
HTTPS = 1,
File = 2,
App = 3,
Localhost = 4,
Loop = 5,
Privileged = 6
};
/** /**
* The entry point for this file. A call from Navigator::mozGetUserMedia * The entry point for this file. A call from Navigator::mozGetUserMedia
* will end up here. MediaManager is a singleton that is responsible * will end up here. MediaManager is a singleton that is responsible
@ -1630,9 +1641,47 @@ MediaManager::GetUserMedia(nsPIDOMWindow* aWindow,
bool privileged = loop || IsPrivileged(); bool privileged = loop || IsPrivileged();
bool isHTTPS = false; bool isHTTPS = false;
docURI->SchemeIs("https", &isHTTPS); docURI->SchemeIs("https", &isHTTPS);
nsCString host;
nsresult rv = docURI->GetHost(host);
// Test for some other schemes that ServiceWorker recognizes
bool isFile;
docURI->SchemeIs("file", &isFile);
bool isApp;
docURI->SchemeIs("app", &isApp);
// Same localhost check as ServiceWorkers uses
// (see IsFromAuthenticatedOriginInternal())
bool isLocalhost = NS_SUCCEEDED(rv) &&
(host.LowerCaseEqualsLiteral("localhost") ||
host.LowerCaseEqualsLiteral("127.0.0.1") ||
host.LowerCaseEqualsLiteral("::1"));
// Record telemetry about whether the source of the call was secure, i.e.,
// privileged or HTTPS. We may handle other cases
if (loop) {
Telemetry::Accumulate(Telemetry::WEBRTC_GET_USER_MEDIA_SECURE_ORIGIN,
(uint32_t) GetUserMediaSecurityState::Loop);
} else if (privileged) {
Telemetry::Accumulate(Telemetry::WEBRTC_GET_USER_MEDIA_SECURE_ORIGIN,
(uint32_t) GetUserMediaSecurityState::Privileged);
} else if (isHTTPS) {
Telemetry::Accumulate(Telemetry::WEBRTC_GET_USER_MEDIA_SECURE_ORIGIN,
(uint32_t) GetUserMediaSecurityState::HTTPS);
} else if (isFile) {
Telemetry::Accumulate(Telemetry::WEBRTC_GET_USER_MEDIA_SECURE_ORIGIN,
(uint32_t) GetUserMediaSecurityState::File);
} else if (isApp) {
Telemetry::Accumulate(Telemetry::WEBRTC_GET_USER_MEDIA_SECURE_ORIGIN,
(uint32_t) GetUserMediaSecurityState::App);
} else if (isLocalhost) {
Telemetry::Accumulate(Telemetry::WEBRTC_GET_USER_MEDIA_SECURE_ORIGIN,
(uint32_t) GetUserMediaSecurityState::Localhost);
} else {
Telemetry::Accumulate(Telemetry::WEBRTC_GET_USER_MEDIA_SECURE_ORIGIN,
(uint32_t) GetUserMediaSecurityState::Other);
}
nsCString origin; nsCString origin;
nsresult rv = nsPrincipal::GetOriginForURI(docURI, origin); rv = nsPrincipal::GetOriginForURI(docURI, origin);
if (NS_WARN_IF(NS_FAILED(rv))) { if (NS_WARN_IF(NS_FAILED(rv))) {
return rv; return rv;
} }

View File

@ -6472,6 +6472,14 @@
"n_buckets": "29", "n_buckets": "29",
"description": "The number of times AddIceCandidate failed on a given PeerConnection, given that ICE failed." "description": "The number of times AddIceCandidate failed on a given PeerConnection, given that ICE failed."
}, },
"WEBRTC_GET_USER_MEDIA_SECURE_ORIGIN": {
"alert_emails": ["seceng@mozilla.org"],
"expires_in_version": "50",
"kind": "enumerated",
"n_values": 15,
"description": "Origins for getUserMedia calls (0=other, 1=HTTPS, 2=file, 3=app, 4=localhost, 5=loop, 6=privileged)",
"releaseChannelCollection": "opt-out"
},
"DEVTOOLS_DEBUGGER_RDP_LOCAL_TRACERDETACH_MS": { "DEVTOOLS_DEBUGGER_RDP_LOCAL_TRACERDETACH_MS": {
"expires_in_version": "never", "expires_in_version": "never",
"kind": "exponential", "kind": "exponential",