From 2aeeecd90f9880618b0929d67a151fcb2bc41719 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Thu, 12 Feb 2015 14:12:09 -0300 Subject: [PATCH 1/3] add body-parser to compute request message --- app.js | 94 +++++++++++++++++----------------------------------- package.json | 1 + 2 files changed, 32 insertions(+), 63 deletions(-) diff --git a/app.js b/app.js index 85ba2e2..0e1c9a5 100644 --- a/app.js +++ b/app.js @@ -3,14 +3,15 @@ var _ = require('lodash'); var async = require('async'); var log = require('npmlog'); -var CopayServer = require('./lib/server'); var express = require('express'); var querystring = require('querystring'); +var bodyParser = require('body-parser') + +var CopayServer = require('./lib/server'); log.debug = log.verbose; log.level = 'debug'; -var POST_LIMIT = 1024 * 100 /* Max POST 100 kb */ ; CopayServer.initialize(); @@ -32,6 +33,12 @@ var allowCORS = function(req, res, next) { } app.use(allowCORS); +var POST_LIMIT = 1024 * 100 /* Max POST 100 kb */ ; + +app.use(bodyParser.json({ + limit: POST_LIMIT +})); + var port = process.env.COPAY_PORT || 3001; var router = express.Router(); @@ -60,82 +67,45 @@ function getCredentials(req) { return { copayerId: identity, + signature: req.header('x-signature'), }; }; function getServerWithAuth(req, res, cb) { var credentials = getCredentials(req); - - CopayServer.getInstanceWithAuth({ + var auth = { copayerId: credentials.copayerId, - message: 'hello world!', - signature: '3045022100addd20e5413865d65d561ad2979f2289a40d52594b1f804840babd9a63e4ebbf02204b86285e1fcab02df772e7a1325fc4b511ecad79a8f80a2bd1ad8bfa858ac3d4', - }, function(err, server) { + message: req.url + '|' + JSON.stringify(req.body), + signature: credentials.signature, + }; + + CopayServer.getInstanceWithAuth(auth, function(err, server) { if (err) return returnError(err, res); return cb(server); }); }; -function authenticate() { - return true; -}; - -function parsePost(req, res, cb) { - var queryData = ''; - req.on('data', function(data) { - queryData += data; - if (queryData.length > POST_LIMIT) { - queryData = ''; - res.writeHead(413, { - 'Content-Type': 'text/plain' - }); - res.end(); - req.connection.destroy(); - } - }).on('end', function() { - try { - var params = JSON.parse(queryData); - cb(params); - } catch (ex) { - returnError({ - code: 400, - message: 'Unable to parse request' - }, res); - } - }); -}; - router.post('/v1/wallets/', function(req, res) { - parsePost(req, res, function(params) { - var server = CopayServer.getInstance(); - server.createWallet(params, function(err, wallet) { - if (err) returnError(err, res); + var server = CopayServer.getInstance(); + server.createWallet(req.body, function(err, wallet) { + if (err) returnError(err, res); - res.json(wallet); - }); + res.json(wallet); }); }); -router.post('/v1/wallets/:id/join/', function(req, res) { - parsePost(req, res, function(params) { - params.walletId = req.params['id']; - var server = CopayServer.getInstance(); - server.joinWallet(params, function(err) { - if (err) returnError(err, res); +router.post('/v1/wallets/join/', function(req, res) { + req.body.walletId = req.params['id']; + var server = CopayServer.getInstance(); + server.joinWallet(req.body, function(err) { + if (err) returnError(err, res); - res.end(); - }); + res.end(); }); }); router.get('/v1/wallets/', function(req, res) { - var credentials = getCredentials(req); - - CopayServer.getInstanceWithAuth(getCredentials(req) { - copayerId: credentials.copayerId, - message: 'hello world!', - signature: '3045022100addd20e5413865d65d561ad2979f2289a40d52594b1f804840babd9a63e4ebbf02204b86285e1fcab02df772e7a1325fc4b511ecad79a8f80a2bd1ad8bfa858ac3d4', - }, function(err, server) { + getServerWithAuth(req, res, function(server) { if (err) return returnError(err, res); server.getWallet({}, function(err, wallet) { if (err) returnError(err, res); @@ -145,12 +115,10 @@ router.get('/v1/wallets/', function(req, res) { }); router.post('/v1/addresses/', function(req, res) { - parsePost(req, res, function(params) { - getServerWithAuth(req, res, function(server) { - server.createAddress(params, function(err, address) { - if (err) returnError(err, res); - res.json(address); - }); + getServerWithAuth(req, res, function(server) { + server.createAddress(req.body, function(err, address) { + if (err) returnError(err, res); + res.json(address); }); }); }); diff --git a/package.json b/package.json index aec9ce8..3adba26 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "async": "^0.9.0", "bitcore": "0.10.0", "bitcore-explorers": "^0.9.1", + "body-parser": "^1.11.0", "commander": "^2.6.0", "express": "^4.10.0", "inherits": "^2.0.1", From 050e5701ecc37a25065d3fc8a7f85b16a344e9f9 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Thu, 12 Feb 2015 16:42:32 -0300 Subject: [PATCH 2/3] command line client --- .gitignore | 4 +- app.js | 2 +- cli.js | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++ lib/server.js | 15 +++-- 4 files changed, 166 insertions(+), 8 deletions(-) create mode 100644 cli.js diff --git a/.gitignore b/.gitignore index 34b12be..4e23ec8 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,6 @@ node_modules *.swp out/ -db/ \ No newline at end of file +db/ + +.bit \ No newline at end of file diff --git a/app.js b/app.js index 0e1c9a5..4198b52 100644 --- a/app.js +++ b/app.js @@ -94,7 +94,7 @@ router.post('/v1/wallets/', function(req, res) { }); }); -router.post('/v1/wallets/join/', function(req, res) { +router.post('/v1/wallets/:id/copayers/', function(req, res) { req.body.walletId = req.params['id']; var server = CopayServer.getInstance(); server.joinWallet(req.body, function(err) { diff --git a/cli.js b/cli.js new file mode 100644 index 0000000..26d1f86 --- /dev/null +++ b/cli.js @@ -0,0 +1,153 @@ +'use strict'; + +var _ = require('lodash'); +var async = require('async'); +var log = require('npmlog'); +var request = require('request') +var commander = require('commander') +log.debug = log.verbose; +log.level = 'debug'; +var fs = require('fs') + +var Bitcore = require('bitcore') +var SignUtils = require('./lib/signutils'); + +var BASE_URL = 'http://localhost:3001/copay/api/'; + +function getUrl(path) { + return BASE_URL + path; +}; + + +function signRequest(url, args) { + +}; + +function save(data) { + fs.writeFileSync('./.bit', JSON.stringify(data)); +}; + +function load() { + try { + return JSON.parse(fs.readFileSync('./.bit')); + } catch (ex) {} +}; + + + +function createWallet(walletName, copayerName, m, n, cb) { + var data = load(); + if (!data) { + data = {}; + data.xPrivKey = new Bitcore.HDPrivateKey().toString(); + data.m = m; + } + var privKey = new Bitcore.PrivateKey(); + var pubKey = privKey.toPublicKey(); + + var args = { + name: walletName, + m: m, + n: n, + pubKey: pubKey.toString(), + }; + + request({ + method: 'post', + url: getUrl('v1/wallets'), + body: args, + json: true, + }, function(err, res, body) { + if (err) return cb(err); + var walletId = body; + var secret = walletId + '|' + privKey.toString(); + + joinWallet(secret, copayerName, function(err) { + if (err) return cb(err); + + save(data); + return cb(null, secret); + }); + }); +}; + +function joinWallet(secret, copayerName, cb) { + var data = load(); + if (!data) { + data = {}; + data.xPrivKey = new Bitcore.HDPrivateKey().toString(); + } + var secretSplit = secret.split('|'); + var walletId = secretSplit[0]; + var privKey = Bitcore.PrivateKey.fromString(secretSplit[1]); + var pubKey = privKey.toPublicKey(); + + var xPubKey = new Bitcore.HDPublicKey(data.xPrivKey).toString(); + var xPubKeySignature = SignUtils.sign(xPubKey, privKey); + + var args = { + walletId: walletId, + name: copayerName, + xPubKey: xPubKey, + xPubKeySignature: xPubKeySignature, + }; + + request({ + method: 'post', + url: getUrl('v1/wallets/' + walletId + '/copayers'), + body: args, + json: true, + }, function(err, res, body) { + if (err) return cb(err); + + var copayerId = body; + data.copayerId = copayerId; + save(data); + return status(cb); + }); +}; + +function status(cb) { + request({ + method: 'get', + url: getUrl('v1/dump/'), + }, function(err, res, body) { + if (err) return cb(err); + + console.log(body); + return cb(); + }); +}; + +function send(addressTo, amount, message, cb) { + +}; + +function sign(proposalId, cb) { + +}; + +function reject(proposalId, cb) { + +}; + +function address(cb) { + +}; + +function history(limit, cb) { + +}; + + +// createWallet('test wallet', 'test copayer', 2, 2, function(err, secret) { +// if (err) process.exit(err); +// var data = load(); +// console.log('ESTE ES EL SECRET', secret); +// console.log('ESTE ES EL STORAGE', data); +// }); + + +// joinWallet('1b44f598-ced5-4fe1-bac3-d9f4563c3011|9b483158c271036035ea639a57761247902222784ef03142b552800e35082929', 'otro copayer', function(err) { +// if (err) process.exit(err); +// }); diff --git a/lib/server.js b/lib/server.js index 09206f8..f47bd39 100644 --- a/lib/server.js +++ b/lib/server.js @@ -66,7 +66,7 @@ CopayServer.getInstance = function() { */ CopayServer.getInstanceWithAuth = function(opts, cb) { - if (!Utils.checkRequired(opts, ['copayerId', 'message', 'signature'])) + if (!Utils.checkRequired(opts, ['copayerId', 'message', 'signature'])) return cb(new ClientError('Required argument missing')); var server = new CopayServer(); @@ -124,6 +124,7 @@ CopayServer.prototype.createWallet = function(opts, cb) { }); self.storage.storeWallet(wallet, function(err) { + log.debug('Wallet created', wallet.id); return cb(err, wallet.id); }); }; @@ -164,6 +165,8 @@ CopayServer.prototype._verifySignature = function(text, signature, pubKey) { CopayServer.prototype._notify = function(type, data) { var self = this; + log.debug('Notification', type, data); + var walletId = self.walletId || data.walletId; $.checkState(walletId); @@ -191,7 +194,7 @@ CopayServer.prototype.joinWallet = function(opts, cb) { if (!Utils.checkRequired(opts, ['walletId', 'name', 'xPubKey', 'xPubKeySignature'])) return cb(new ClientError('Required argument missing')); - if (_.isEmpty(opts.name)) + if (_.isEmpty(opts.name)) return cb(new ClientError('Invalid copayer name')); Utils.runLocked(opts.walletId, cb, function(cb) { @@ -206,7 +209,7 @@ CopayServer.prototype.joinWallet = function(opts, cb) { if (_.find(wallet.copayers, { xPubKey: opts.xPubKey })) return cb(new ClientError('CINWALLET', 'Copayer already in wallet')); - if (wallet.copayers.length == wallet.n) + if (wallet.copayers.length == wallet.n) return cb(new ClientError('WFULL', 'Wallet full')); var copayer = new Copayer({ @@ -239,7 +242,7 @@ CopayServer.prototype.createAddress = function(opts, cb) { Utils.runLocked(self.walletId, cb, function(cb) { self.getWallet({}, function(err, wallet) { if (err) return cb(err); - if (!wallet.isComplete()) + if (!wallet.isComplete()) return cb(new ClientError('Wallet is not complete')); var address = wallet.createAddress(false); @@ -733,14 +736,14 @@ CopayServer.prototype.getTxs = function(opts, cb) { /** - * Retrieves notifications in the range (maxTs-minTs). + * Retrieves notifications in the range (maxTs-minTs). * Times are in UNIX EPOCH. Order is assured even for events with the same time * * @param {Object} opts.minTs (defaults to 0) * @param {Object} opts.maxTs (defaults to now) * @param {Object} opts.limit * @param {Object} opts.reverse (default false) - * @returns {Notification[]} Notifications + * @returns {Notification[]} Notifications */ CopayServer.prototype.getNotifications = function(opts, cb) { var self = this; From 8a8c1118272359fb65cdf7b67e15a350ee34359f Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Thu, 12 Feb 2015 16:50:10 -0300 Subject: [PATCH 3/3] CLI lib --- cli.js => lib/clilib.js | 42 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 25 deletions(-) rename cli.js => lib/clilib.js (70%) diff --git a/cli.js b/lib/clilib.js similarity index 70% rename from cli.js rename to lib/clilib.js index 26d1f86..6c0a52a 100644 --- a/cli.js +++ b/lib/clilib.js @@ -10,11 +10,14 @@ log.level = 'debug'; var fs = require('fs') var Bitcore = require('bitcore') -var SignUtils = require('./lib/signutils'); +var SignUtils = require('./signutils'); var BASE_URL = 'http://localhost:3001/copay/api/'; -function getUrl(path) { +var cli = {}; + + +function _getUrl(path) { return BASE_URL + path; }; @@ -35,7 +38,7 @@ function load() { -function createWallet(walletName, copayerName, m, n, cb) { +clilib.createWallet = function(walletName, copayerName, m, n, cb) { var data = load(); if (!data) { data = {}; @@ -54,7 +57,7 @@ function createWallet(walletName, copayerName, m, n, cb) { request({ method: 'post', - url: getUrl('v1/wallets'), + url: _getUrl('v1/wallets'), body: args, json: true, }, function(err, res, body) { @@ -71,7 +74,7 @@ function createWallet(walletName, copayerName, m, n, cb) { }); }; -function joinWallet(secret, copayerName, cb) { +clilib.joinWallet = function(secret, copayerName, cb) { var data = load(); if (!data) { data = {}; @@ -94,7 +97,7 @@ function joinWallet(secret, copayerName, cb) { request({ method: 'post', - url: getUrl('v1/wallets/' + walletId + '/copayers'), + url: _getUrl('v1/wallets/' + walletId + '/copayers'), body: args, json: true, }, function(err, res, body) { @@ -107,10 +110,10 @@ function joinWallet(secret, copayerName, cb) { }); }; -function status(cb) { +clilib.status = function(cb) { request({ method: 'get', - url: getUrl('v1/dump/'), + url: _getUrl('v1/dump/'), }, function(err, res, body) { if (err) return cb(err); @@ -119,35 +122,24 @@ function status(cb) { }); }; -function send(addressTo, amount, message, cb) { +clilib.send = function(addressTo, amount, message, cb) { }; -function sign(proposalId, cb) { +clilib.sign = function(proposalId, cb) { }; -function reject(proposalId, cb) { +clilib.reject = function(proposalId, cb) { }; -function address(cb) { +clilib.address = function(cb) { }; -function history(limit, cb) { +clilib.history = function(limit, cb) { }; - -// createWallet('test wallet', 'test copayer', 2, 2, function(err, secret) { -// if (err) process.exit(err); -// var data = load(); -// console.log('ESTE ES EL SECRET', secret); -// console.log('ESTE ES EL STORAGE', data); -// }); - - -// joinWallet('1b44f598-ced5-4fe1-bac3-d9f4563c3011|9b483158c271036035ea639a57761247902222784ef03142b552800e35082929', 'otro copayer', function(err) { -// if (err) process.exit(err); -// }); +module.exports = clilib;