improve 'METHOD_DENIED' error message (#2127)

* improve 'METHOD_DENIED' error message * fix * upstream fixes
ethereum · Jul 14, 2017 · 7fae2a8 · 7fae2a8
1 parent 65a9fb3
commit 7fae2a8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/modules/ipc/ipcProviderBackend.js b/modules/ipc/ipcProviderBackend.js
@@ -16,13 +16,12 @@ const log = require('../utils/logger').create('ipcProviderBackend');
 const Sockets = require('../socketManager');
 const Settings = require('../settings');
 const ethereumNode = require('../ethereumNode');
-const Windows = require('../windows');
 
 
 const ERRORS = {
-    INVALID_PAYLOAD: { code: -32600, message: 'Payload, or some of its content properties are invalid. Please check if they are valid HEX with 0x prefix.' },
-    METHOD_DENIED: { code: -32601, message: "Method \'__method__\' not allowed." },
-    METHOD_TIMEOUT: { code: -32603, message: "Request timed out for method  \'__method__\'." },
+    INVALID_PAYLOAD: { code: -32600, message: "Payload, or some of its content properties are invalid. Please check if they are valid HEX with '0x' prefix." },
+    METHOD_DENIED: { code: -32601, message: 'Method __method__ not allowed.' },
+    METHOD_TIMEOUT: { code: -32603, message: 'Request timed out for method  __method__.' },
     TX_DENIED: { code: -32603, message: 'Transaction denied' },
     BATCH_TX_DENIED: { code: -32603, message: 'Transactions denied, sendTransaction is not allowed in batch requests.' },
     BATCH_COMPILE_DENIED: { code: -32603, message: 'Compilation denied, compileSolidity is not allowed in batch requests.' },

diff --git a/modules/ipc/methods/base.js b/modules/ipc/methods/base.js
@@ -97,11 +97,11 @@ module.exports = class BaseProcessor {
         }
 
         // prevent dapps from acccesing admin endpoints
-        if (!/^eth_|^shh_|^net_|^web3_|^db_/.test(payload.method)) {
+        if (!/^eth_|^bzz_|^shh_|^net_|^web3_|^db_/.test(payload.method)) {
             delete payload.result;
-
-            payload.error = this.ERRORS.METHOD_DENIED;
+            const err = _.clone(this.ERRORS.METHOD_DENIED);
+            err.message = err.message.replace('__method__', `"${payload.method}"`);
+            payload.error = err;
         }
     }
 };
-