Merge pull request #944 from MetaMask/i938-uri-validation

I938 uri validation

CHANGELOG.md

@@ -5,6 +5,7 @@
 ## 2.14.1 2016-12-20
 
 - Temporarily disable extension reload detection causing infinite reload bug.
+- Implemented basic checking for valid RPC URIs.
 
 ## 2.14.0 2016-12-16
 

app/scripts/notice-controller.js

@@ -9,7 +9,7 @@ module.exports = class NoticeController extends EventEmitter {
     this.noticePoller = null
   }
 
-  getState() {
+  getState () {
     var lastUnreadNotice = this.getLatestUnreadNotice()
 
     return {
@@ -18,7 +18,7 @@ module.exports = class NoticeController extends EventEmitter {
     }
   }
 
-  getNoticesList() {
+  getNoticesList () {
     var data = this.configManager.getData()
     if ('noticesList' in data) {
       return data.noticesList
@@ -27,28 +27,28 @@ module.exports = class NoticeController extends EventEmitter {
     }
   }
 
-  setNoticesList(list) {
+  setNoticesList (list) {
     var data = this.configManager.getData()
     data.noticesList = list
     this.configManager.setData(data)
     return Promise.resolve(true)
   }
 
-  markNoticeRead(notice, cb) {
-    cb = cb || function(err){ if (err) throw err }
+  markNoticeRead (notice, cb) {
+    cb = cb || function (err) { if (err) throw err }
     try {
       var notices = this.getNoticesList()
       var id = notice.id
       notices[id].read = true
       this.setNoticesList(notices)
-      let latestNotice = this.getLatestUnreadNotice()
+      const latestNotice = this.getLatestUnreadNotice()
       cb(null, latestNotice)
     } catch (err) {
       cb(err)
     }
   }
 
-  updateNoticesList() {
+  updateNoticesList () {
     return this._retrieveNoticeData().then((newNotices) => {
       var oldNotices = this.getNoticesList()
       var combinedNotices = this._mergeNotices(oldNotices, newNotices)
@@ -56,7 +56,7 @@ module.exports = class NoticeController extends EventEmitter {
     })
   }
 
-  getLatestUnreadNotice() {
+  getLatestUnreadNotice () {
     var notices = this.getNoticesList()
     var filteredNotices = notices.filter((notice) => {
       return notice.read === false
@@ -73,7 +73,7 @@ module.exports = class NoticeController extends EventEmitter {
     }, 300000)
   }
 
-  _mergeNotices(oldNotices, newNotices) {
+  _mergeNotices (oldNotices, newNotices) {
     var noticeMap = this._mapNoticeIds(oldNotices)
     newNotices.forEach((notice) => {
       if (noticeMap.indexOf(notice.id) === -1) {
@@ -83,11 +83,11 @@ module.exports = class NoticeController extends EventEmitter {
     return oldNotices
   }
 
-  _mapNoticeIds(notices) {
+  _mapNoticeIds (notices) {
     return notices.map((notice) => notice.id)
   }
 
-  _retrieveNoticeData() {
+  _retrieveNoticeData () {
     // Placeholder for the API.
     return Promise.resolve(hardCodedNotices)
   }

package.json

@@ -91,6 +91,7 @@
     "textarea-caret": "^3.0.1",
     "three.js": "^0.73.2",
     "through2": "^2.0.1",
+    "valid-url": "^1.0.9",
     "vreme": "^3.0.2",
     "web3": "0.17.0-beta",
     "web3-provider-engine": "^8.1.14",

ui/app/config.js

@@ -4,11 +4,13 @@ const h = require('react-hyperscript')
 const connect = require('react-redux').connect
 const actions = require('./actions')
 const currencies = require('./conversion.json').rows
+const validUrl = require('valid-url')
 module.exports = connect(mapStateToProps)(ConfigScreen)
 
 function mapStateToProps (state) {
   return {
     metamask: state.metamask,
+    warning: state.appState.warning,
   }
 }
 
@@ -20,6 +22,7 @@ function ConfigScreen () {
 ConfigScreen.prototype.render = function () {
   var state = this.props
   var metamaskState = state.metamask
+  var warning = state.warning
 
   return (
     h('.flex-column.flex-grow', [
@@ -34,6 +37,14 @@ ConfigScreen.prototype.render = function () {
         h('h2.page-subtitle', 'Settings'),
       ]),
 
+      h('.error', {
+        style: {
+          display: warning ? 'block' : 'none',
+          padding: '0 20px',
+          textAlign: 'center',
+        },
+      }, warning),
+
       // conf view
       h('.flex-column.flex-justify-center.flex-grow.select-none', [
         h('.flex-space-around', {
@@ -57,7 +68,7 @@ ConfigScreen.prototype.render = function () {
                 if (event.key === 'Enter') {
                   var element = event.target
                   var newRpc = element.value
-                  state.dispatch(actions.setRpcTarget(newRpc))
+                  rpcValidation(newRpc, state)
                 }
               },
             }),
@@ -69,7 +80,7 @@ ConfigScreen.prototype.render = function () {
                 event.preventDefault()
                 var element = document.querySelector('input#new_rpc')
                 var newRpc = element.value
-                state.dispatch(actions.setRpcTarget(newRpc))
+                rpcValidation(newRpc, state)
               },
             }, 'Save'),
           ]),
@@ -99,6 +110,19 @@ ConfigScreen.prototype.render = function () {
   )
 }
 
+function rpcValidation (newRpc, state) {
+  if (validUrl.isWebUri(newRpc)) {
+    state.dispatch(actions.setRpcTarget(newRpc))
+  } else {
+    var appendedRpc = `http://${newRpc}`
+    if (validUrl.isWebUri(appendedRpc)) {
+      state.dispatch(actions.displayWarning('URIs require the appropriate HTTP/HTTPS prefix.'))
+    } else {
+      state.dispatch(actions.displayWarning('Invalid RPC URI'))
+    }
+  }
+}
+
 function currentConversionInformation (metamaskState, state) {
   var currentFiat = metamaskState.currentFiat
   var conversionDate = metamaskState.conversionDate