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 1073014 - Part 2: Use message.origin property to get secure element name. r=allstars.chh

Browse Source
This commit is contained in:
Krzysztof Mioduszewski 2014-11-04 03:14:00 -05:00
parent 0e0c03d0ec
commit de74468807
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/nfc/messages/HCIEventTransactionSystemMessageConfigurator.js
View File

@ -43,7 +43,7 @@ HCIEventTransactionSystemMessageConfigurator.prototype = {
return new Promise((resolve, reject) => {
appsService.getManifestFor(aManifestURL)
.then((aManifest) => this._checkAppManifest(aMessage.seName, aMessage.aid, aManifest))
.then((aManifest) => this._checkAppManifest(aMessage.origin, aMessage.aid, aManifest))
.then(() => {
// FIXME: Bug 884594: Access Control Enforcer
// Here we will call ace.isAllowed function which will also return
@ -62,13 +62,13 @@ HCIEventTransactionSystemMessageConfigurator.prototype = {
// we might be doing some async hash computations here, returning
// a resolved/rejected promise for now so we can easily fit the method
// into a Promise chain
_checkAppManifest: function _checkAppManifest(aSeName, aAid, aManifest) {
_checkAppManifest: function _checkAppManifest(aOrigin, aAid, aManifest) {
DEBUG && debug("aManifest " + JSON.stringify(aManifest));
// convert AID and Secure Element name to uppercased string for comparison
// with manifest secure_element_access rules
let aid = this._byteAIDToHex(aAid);
let seName = aSeName.toUpperCase();
let seName = (aOrigin) ? aOrigin.toUpperCase() : "";
let hciRules = aManifest["secure_element_access"] || [];
let matchingRule = hciRules.find((rule) => {