m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-26 12:29:06 +01:00
Code

Merge pull request #1739 from MetaMask/origin-header

Browse Source 
metamask - append dapp origin domain to rpc request
This commit is contained in:
Dan Finlay 2017-07-05 10:27:21 -07:00 committed by GitHub
commit ce3d374d80
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/scripts/metamask-controller.js
View File

@ -184,7 +184,9 @@ module.exports = class MetamaskController extends EventEmitter {
eth_syncing: false, eth_syncing: false,
web3_clientVersion: `MetaMask/v${version}`, web3_clientVersion: `MetaMask/v${version}`,
}, },
// rpc data source
rpcUrl: this.networkController.getCurrentRpcAddress(), rpcUrl: this.networkController.getCurrentRpcAddress(),
originHttpHeaderKey: 'X-Metamask-Origin',
// account mgmt // account mgmt
getAccounts: (cb) => { getAccounts: (cb) => {
const isUnlocked = this.keyringController.memStore.getState().isUnlocked const isUnlocked = this.keyringController.memStore.getState().isUnlocked
@ -356,8 +358,13 @@ module.exports = class MetamaskController extends EventEmitter {
} }
setupProviderConnection (outStream, originDomain) { setupProviderConnection (outStream, originDomain) {
streamIntoProvider(outStream, this.provider, logger) streamIntoProvider(outStream, this.provider, onRequest, onResponse)
function logger (err, request, response) { // append dapp origin domain to request
function onRequest (request) {
request.origin = originDomain
}
// log rpc activity
function onResponse (err, request, response) {
if (err) return console.error(err) if (err) return console.error(err)
if (response.error) { if (response.error) {
console.error('Error in RPC response:\n', response.error) console.error('Error in RPC response:\n', response.error)

4
package.json
View File

@ -124,8 +124,8 @@
"valid-url": "^1.0.9", "valid-url": "^1.0.9",
"vreme": "^3.0.2", "vreme": "^3.0.2",
"web3": "0.19.1", "web3": "0.19.1",
"web3-provider-engine": "^13.0.3", "web3-provider-engine": "^13.1.1",
"web3-stream-provider": "^2.0.6", "web3-stream-provider": "^3.0.1",
"xtend": "^4.0.1" "xtend": "^4.0.1"
}, },
"devDependencies": { "devDependencies": {