fixbug

@@ -29,20 +29,17 @@ class DingTalkEncryptor {
 
   encrypt(random, plainText) {
     try {
-      const randomBuf = Buffer.from(random);
-      const plainTextBuf = Buffer.from(plainText);
-      const textLen = plainTextBuf.length;
-      const textLenBuf = Buffer.from([(textLen >> 24 & 255), (textLen >> 16 & 255), (textLen >> 8 & 255), (textLen & 255)]);
-      const cropIdBuf = Buffer.from(this.corpId);
-      const padCount = 32 - (randomBuf.length + textLenBuf.length + plainTextBuf.length + cropIdBuf.length) % 32;
-      const padBuf = Buffer.from(new Array(padCount).fill(padCount));
-      const finalBuf = Buffer.concat([randomBuf, textLenBuf, plainTextBuf, cropIdBuf, padBuf]);  
-   
-      const encrypted = CryptoJS.AES.encrypt( CryptoJS.enc.Hex.parse(finalBuf.toString('hex')), this.keySpec, {   
+      const wordArray = CryptoJS.lib.WordArray.create([],16); 
+      const textLen = plainText.length; 
+      const textLenBuf = CryptoJS.lib.WordArray.create([textLen & 255]); 
+      const plainTextBuf = CryptoJS.enc.Utf8.parse(plainText);
+      const cropIdBuf = CryptoJS.enc.Utf8.parse(this.corpId); 
+      const finalBuf =wordArray.concat(textLenBuf).concat(plainTextBuf).concat(cropIdBuf) 
+      const encrypted = CryptoJS.AES.encrypt(finalBuf, this.keySpec, {   
           iv: this.iv,
           mode: CryptoJS.mode.CBC,
           padding:CryptoJS.pad.Pkcs7 
-      }); 
+      });  
       return encrypted.toString();
     } catch (e) {
       console.log(e)
@@ -78,7 +75,7 @@ class DingTalkEncryptor {
     }
 
     if (cropId != this.corpId) {
-      console.log(cropId, this.corpId)
+      console.log(cropId, this.corpId,plainText,cropId.length ,this.corpId.length)
       throw new DingTalkEncryptException(900010);
     } else {
       return plainText;

 'use strict';
+/**
+ HTTP请求结果校验返回字段值失败 HttpRequest: 
+ curl 'http://test.alice.dodokeroro.cn:6655/dingtalk/events?
+ signature=1e08e2b73b7581207d82eb4c96d7238aaf3a7f17&
+ msg_signature=1e08e2b73b7581207d82eb4c96d7238aaf3a7f17&timestamp=1648094231677&nonce=7wgzaO5O' -d '{"encrypt":"4nzVlKqXYwYsH8IkfhGnRvzlKgud0gmSGKTWfq6bjClSpLNM8FYEQNTcA0Jc2yuvxlkxkhsbvvYTeCcXScU41CowiBhcuXONqj8amCINX83UYb6qSL5+aLl1VA6gcxPK"}' -H 'Content-Type:application/json' HttpCode:200 HttpReponse:
 
+
+*/
 const DingTalkEncryptor = require('./DingTalkEncryptor');
 const utils = require('./Utils');
 
@@ -7,11 +14,13 @@ const utils = require('./Utils');
 // const DingTalkEncryptException = require('./DingTalkEncryptException');
 
 /** 加解密需要，可以随机填写。如 "12345" */
-const TOKEN = 'OUOdEgcMFxNDqoiADrf';
+// const TOKEN = 'OUOdEgcMFxNDqoiADrf';
+const TOKEN = 'BQB3WotDFx7gOKb5ewn6m';
 /** 加密密钥，用于回调数据的加密，固定为43个字符，从[a-z, A-Z, 0-9]共62个字符中随机生成*/
 // const ENCODING_AES_KEY = 'TXpRMU5qYzRPVEF4TWpNME5UWTNPRGt3TVRJek5EVTI';
 // const ENCODING_AES_KEY = utils.getRandomStr(43);
-const ENCODING_AES_KEY = 'FRArTXHBSiMuyPjOjk4RqhOLuQ54d75A6PyYbFrShJy';
+// const ENCODING_AES_KEY = 'FRArTXHBSiMuyPjOjk4RqhOLuQ54d75A6PyYbFrShJy';
+const ENCODING_AES_KEY ='96MzrEOxlqKx3OulRLJx0KzelfHKM7zz82sw4eI4UxD';
 // console.log('ENCODING_AES_KEY:\n' + ENCODING_AES_KEY);
 // let buffer = Buffer.from(ENCODING_AES_KEY + '=', 'base64');
 // const base64Str  = buffer.toString('base64');
@@ -27,8 +36,8 @@ const encryptor = new DingTalkEncryptor(TOKEN, ENCODING_AES_KEY, CORP_ID);
 const ENCRYPT_RANDOM_16 = 'aaaabbbbccccdddd';
 // const timeStamp = (new Date().getTime()).toString();
 // const nonce = utils.getRandomStr(8);
-const timeStamp = '1648014018742';
-const nonce = 'AU1FFNAK';
+let timeStamp = '1648094231677';
+let nonce = '7wgzaO5O';
 
 /** 测试加解密响应报文或者字符串 */
 // const testJson = {
@@ -53,8 +62,14 @@ const unencryptedJson = 'success';
 // const decryptedJson = encryptor.decrypt(encryptedJson);
 // console.log(`  \nnode decryptedJson:\n ${decryptedJson}, (${decryptedJson.length})`);
 // console.log('  \nnode sign:\n ' + encryptor.getSignature(TOKEN, timeStamp, nonce, encryptedJson));
-const signature =  '99011aff26fe6eea2aea3b9f1c17620483e8495d'; 
-const encryptMsg =  'kKCIt2zJ1xPfCex1h3d4ZULhLvXi3RBbht1GxAsYK/Y9iZcw06P20xGTq8Lb9bskrd7fypdzcqo0GHvk+9zLonIXPFNKRTRkswZaH+t1A5683FoDYlXOsBRgpCsjSljo';
+let signature =  '1e08e2b73b7581207d82eb4c96d7238aaf3a7f17'; 
+let encryptMsg =  '4nzVlKqXYwYsH8IkfhGnRvzlKgud0gmSGKTWfq6bjClSpLNM8FYEQNTcA0Jc2yuvxlkxkhsbvvYTeCcXScU41CowiBhcuXONqj8amCINX83UYb6qSL5+aLl1VA6gcxPK';
+
+// signature='3cd3eac8d324861d85e6a359e4765fc4cc689832';
+// timeStamp='1648094231747';
+// nonce='LY6iii48'; 
+// encryptMsg='jGaRz1YkaX3MdQMoe4s31TwVDYhFuH3gYCz4AzJsuSi/VV2C2ijIZTL83I4xnM4KU0DMdjaMuMTYqurW3o6rcNityAmHf0QchJQyaQaEBIM=';
+
 
 const plainText = encryptor.getDecryptMsg(signature, timeStamp, nonce, encryptMsg)
 
@@ -64,4 +79,9 @@ console.log("plainText::",plainText)
 const result = encryptor.getEncryptedMap(unencryptedJson, timeStamp, utils.getRandomStr(8));
 
 
-console.log("result::",result)
\ No newline at end of file
+console.log("result::",result)
+ 
+const plainText2 = encryptor.getDecryptMsg(result.msg_signature, result.timeStamp, result.nonce, result.encrypt)
+
+
+console.log("plainText222::",plainText2)
\ No newline at end of file

 {
   "name": "dingtalk-encrypt",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "dingTalk Encrypt Nodejs Version.",
   "main": "index.js",
   "scripts": {