BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

paypro: do not return error on untrusted cert. let peer decide whether to trust.

This commit is contained in:
Christopher Jeffrey 2014-08-01 16:07:56 -07:00 committed by Manuel Araoz
parent fd8f192dbd
commit 8cb2a96aff
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/models/core/Wallet.js
View File

@ -874,11 +874,9 @@ Wallet.prototype.receivePaymentRequest = function(options, pr, cb) {
return PayPro.RootCerts.getTrusted(pem);
}).filter(Boolean);
if (!trusted.length) {
if (typeof SSL_UNTRUSTED === 'undefined') {
return cb(new Error('Not a trusted certificate.'));
}
}
// if (!trusted.length) {
// return cb(new Error('Not a trusted certificate.'));
// }
// Verify Signature
var verified = pr.verify();
@ -928,7 +926,8 @@ Wallet.prototype.receivePaymentRequest = function(options, pr, cb) {
merchant_data: merchant_data.toString('hex')
},
signature: sig,
ca: ca
ca: ca,
untrusted: !ca
},
request_url: options.uri,
total: bignum('0', 10).toString(10)

5
test/test.PayPro.js
View File

@ -22,15 +22,10 @@ var Address = bitcore.Address;
var PayPro = bitcore.PayPro;
var startServer = require('./mocks/FakePayProServer');
var G = is_browser ? window : global;
G.SSL_UNTRUSTED = true;
var server;
describe('PayPro (in Wallet) model', function() {
var config = {
// requiredCopayers: 3,
// totalCopayers: 5,
requiredCopayers: 1,
totalCopayers: 1,
spendUnconfirmed: true,