Skip to content

如果有前置cryptor，使用前置cryptor #144

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Dec 5, 2014
Merged

如果有前置cryptor，使用前置cryptor #144

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions lib/wechat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,14 +343,17 @@ var serveEncrypt = function (that, req, res, next, _respond) {
var timestamp = req.query.timestamp;
var nonce = req.query.nonce;

// 判断是否已有前置cryptor
var cryptor = req.cryptor || that.cryptor;

if (method === 'GET') {
var echostr = req.query.echostr;
if (signature !== that.cryptor.getSignature(timestamp, nonce, echostr)) {
if (signature !== cryptor.getSignature(timestamp, nonce, echostr)) {
res.writeHead(401);
res.end('Invalid signature');
return;
}
var result = that.cryptor.decrypt(echostr);
var result = cryptor.decrypt(echostr);
// TODO 检查appId的正确性
res.writeHead(200);
res.end(result.message);
Expand All @@ -372,12 +375,12 @@ var serveEncrypt = function (that, req, res, next, _respond) {
}
var xml = formatMessage(result.xml);
var encryptMessage = xml.Encrypt;
if (signature !== that.cryptor.getSignature(timestamp, nonce, encryptMessage)) {
if (signature !== cryptor.getSignature(timestamp, nonce, encryptMessage)) {
res.writeHead(401);
res.end('Invalid signature');
return;
}
var decrypted = that.cryptor.decrypt(encryptMessage);
var decrypted = cryptor.decrypt(encryptMessage);
var messageWrapXml = decrypted.message;
if (messageWrapXml === '') {
res.writeHead(401);
Expand Down