Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated to new recaptcha #2

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@ app.post('/', function(req, res) {

var privateKey = '1234567890abcdef'; // your private key here
var ip = req.ip;
var challenge = req.body.recaptcha_challenge_field;
var response = req.body.recaptcha_response_field;
var response = req.body['g-recaptcha-response'];

simple_recaptcha(privateKey, ip, challenge, response, function(err) {
simple_recaptcha(privateKey, ip, response, function(err) {
if (err) return res.send(err.message);
res.send('verified');
});
Expand Down
32 changes: 13 additions & 19 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,33 +1,35 @@
var http = require('http');
var https = require('https');

var options = {
host: 'www.google.com',
port: 80,
path: '/recaptcha/api/verify',
method: 'POST',
port: 443,
path: '/recaptcha/api/siteverify?',
method: 'GET',
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
};

module.exports = function(privateKey, remoteIP, challenge, response, cb) {
module.exports = function(privateKey, remoteIP, response, cb) {
var error = null;

if (!privateKey) {
error = 'Private key is required';
} else if (!remoteIP) {
error = 'Remote IP is required';
} else if (!challenge) {
error = 'Challenge is required';
} else if (!response) {
error = 'Response is required';
}

if (error) {
return cb(new Error(error));
}

options.path = '/recaptcha/api/siteverify?secret=' + privateKey +
'&remoteip=' + remoteIP +
'&response=' + response;

var request = http.request(options, function(response) {
var request = https.request(options, function(response) {
var body = '';

response.on('error', function(err) {
Expand All @@ -39,9 +41,8 @@ module.exports = function(privateKey, remoteIP, challenge, response, cb) {
});

response.on('end', function() {
var success = body.split('\n')[0] === "true";
var error = body.split('\n')[1];
if (!success) return cb(new Error(error));
var data = JSON.parse( body );
if (!data.success) return cb(new Error(data['error-codes']));
cb(null);
});

Expand All @@ -51,13 +52,6 @@ module.exports = function(privateKey, remoteIP, challenge, response, cb) {
return cb(new Error(err));
});

var query = 'privatekey=' + privateKey +
'&remoteip=' + remoteIP +
'&challenge=' + challenge +
'&response=' + response;

request.write(query);

request.end();

};
};
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simple-recaptcha",
"version": "0.0.3",
"version": "1.0.0",
"description": "Simple implementation of google's reCAPTCHA",
"main": "index.js",
"scripts": {
Expand Down
14 changes: 4 additions & 10 deletions test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,25 @@ var simple_recaptcha = require('../index');
describe('simple_recaptcha', function() {

it('should return an error when private key is empty', function() {
simple_recaptcha(null, '127.0.0.1', 'someChallenge', 'someResponse', function(err) {
simple_recaptcha(null, '127.0.0.1', 'someResponse', function(err) {
err.message.should.equal('Private key is required');
});
});

it('should return an error when remote IP is empty', function() {
simple_recaptcha('privKey', null, 'someChallenge', 'someResponse', function(err) {
simple_recaptcha('privKey', null, 'someResponse', function(err) {
err.message.should.equal('Remote IP is required');
});
});

it('should return an error when challenge is empty', function() {
simple_recaptcha('privKey', '127.0.0.1', null, 'someResponse', function(err) {
err.message.should.equal('Challenge is required');
});
});

it('should return an error when response is empty', function() {
simple_recaptcha('privKey', '127.0.0.1', 'someChallenge', null, function(err) {
simple_recaptcha('privKey', '127.0.0.1', null, function(err) {
err.message.should.equal('Response is required');
});
});

it('should return an error when private key is wrong', function() {
simple_recaptcha('privKey', '127.0.0.1', 'someChallenge', 'someResponse', function(err) {
simple_recaptcha('privKey', '127.0.0.1', 'someResponse', function(err) {
err.message.should.equal('invalid-site-private-key');
});
});
Expand Down