wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 993893 - B2G NFC: NfcManager APIs will also check nfc-write permission. r=dimi

Browse Source
This commit is contained in:
Yoshi Huang 2014-04-09 17:58:28 +08:00
parent e4d3efa00a
commit 2ee60a253a
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dom/system/gonk/Nfc.js
View File

@ -57,7 +57,10 @@ const NFC_IPC_MSG_NAMES = [
const NFC_IPC_PEER_MSG_NAMES = [
"NFC:RegisterPeerTarget",
"NFC:UnregisterPeerTarget",
"NFC:UnregisterPeerTarget"
];
const NFC_IPC_MANAGER_MSG_NAMES = [
"NFC:CheckP2PRegistration",
"NFC:NotifyUserAcceptedP2P",
"NFC:NotifySendFileStatus"
@ -117,6 +120,10 @@ XPCOMUtils.defineLazyGetter(this, "gMessageManager", function () {
for (let msgname of NFC_IPC_PEER_MSG_NAMES) {
ppmm.addMessageListener(msgname, this);
}
for (let msgname of NFC_IPC_MANAGER_MSG_NAMES) {
ppmm.addMessageListener(msgname, this);
}
},
_unregisterMessageListeners: function _unregisterMessageListeners() {
@ -128,6 +135,11 @@ XPCOMUtils.defineLazyGetter(this, "gMessageManager", function () {
for (let msgname of NFC_IPC_PEER_MSG_NAMES) {
ppmm.removeMessageListener(msgname, this);
}
for (let msgname of NFC_IPC_MANAGER_MSG_NAMES) {
ppmm.removeMessageListener(msgname, this);
}
ppmm = null;
},
@ -309,19 +321,11 @@ XPCOMUtils.defineLazyGetter(this, "gMessageManager", function () {
" from a content process with no 'nfc-write' privileges.");
return null;
}
// Add extra permission check for below events:
// 'NFC:CheckP2PRegistration' , 'NFC:NotifyUserAcceptedP2P',
// 'NFC:NotifySendFileStatus'
if ((msg.name == "NFC:CheckP2PRegistration") ||
(msg.name == "NFC:NotifyUserAcceptedP2P") ||
(msg.name == "NFC:NotifySendFileStatus")) {
// ONLY privileged Content can send these events
if (!msg.target.assertPermission("nfc-manager")) {
debug("NFC message " + message.name +
" from a content process with no 'nfc-manager' privileges.");
return null;
}
} else if (NFC_IPC_MANAGER_MSG_NAMES.indexOf(msg.name) != -1) {
if (!msg.target.assertPermission("nfc-manager")) {
debug("NFC message " + message.name +
" from a content process with no 'nfc-manager' privileges.");
return null;
}
} else {
debug("Ignoring unknown message type: " + msg.name);