Merge pull request #3 from isocolsky/REST_auth

REST + command line client
This commit is contained in:
Matias Alejo Garcia 2015-02-12 17:00:52 -03:00
commit 6ef5283688
5 changed files with 189 additions and 70 deletions

4
.gitignore vendored
View File

@ -29,4 +29,6 @@ node_modules
*.swp
out/
db/
db/
.bit

94
app.js
View File

@ -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/:id/copayers/', 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);
});
});
});

145
lib/clilib.js Normal file
View File

@ -0,0 +1,145 @@
'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('./signutils');
var BASE_URL = 'http://localhost:3001/copay/api/';
var cli = {};
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) {}
};
clilib.createWallet = function(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);
});
});
};
clilib.joinWallet = function(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);
});
};
clilib.status = function(cb) {
request({
method: 'get',
url: _getUrl('v1/dump/'),
}, function(err, res, body) {
if (err) return cb(err);
console.log(body);
return cb();
});
};
clilib.send = function(addressTo, amount, message, cb) {
};
clilib.sign = function(proposalId, cb) {
};
clilib.reject = function(proposalId, cb) {
};
clilib.address = function(cb) {
};
clilib.history = function(limit, cb) {
};
module.exports = clilib;

View File

@ -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;

View File

@ -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",