crabatool 1.0.280 → 1.0.282

package/hash.json

@@ -0,0 +1,7 @@
+{
+  "http://crabadoc.ca.com/js/utils/utils.js": "sha384-yqLsT1eKgMFhyGpdBnVBHom80H3rQ4iCLbg9kAmJ2zuJCF6oCxj1najJz5KPnRS/",
+  "F:/newcrabadoc/www/js/utils/utils.js": "sha384-yqLsT1eKgMFhyGpdBnVBHom80H3rQ4iCLbg9kAmJ2zuJCF6oCxj1najJz5KPnRS/",
+  "./test/test.js": "sha384-VQy3WyY/3vG+HckZphZEXGAZGOVP/NhqD8fx6wBjMPtfIaX5dUjMOxR+F23VhxAw",
+  "./test/beefun.js": "sha384-pkh4Pn8P8Bt2R3KEeN7N2WBZHd7xFWCD8fY2LuCdypHQv1DXLG538f1Jr+pCyJcM",
+  "https://s5.vip.wpscdn.cn/web-libs/2t/js/userinfo-collect/1.0.3/vas2t-userinfo-collect.min.js": "sha384-2Un6NCB1ePpHBqkNtvTjXtHbxHbwcNV/f72LUUSB7ysPpPkauvVsVTs61wW7cKq2"
+}

package/index.js

@@ -110,5 +110,13 @@ function checkFast(args) {
   }
 
 
+  if (args.includes('-makeHash')) {
+    start.bindAndCheckConfig('-files');
+    start.bindAndCheckConfig('-outJson');
+    require('./tool/hash.js').start(); // wps安全改造，工具生成js和css的hash值
+    return false;
+  }
+
+
   return true;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.280",
+  "version": "1.0.282",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -16,7 +16,8 @@
     "checkUpdate": "node run.js -checkUpdate -version master -webPath F:\\crabaevery\\www",
     "upload": "node run.js -upload -version master -Debug true -host http://127.0.0.1:9998 -hidejspath true -targetPath F:\\CarpaNET_NEW",
     "crabaNgp": "node run.js -mergejs -hidejspath true -targetPath F:\\CarpaNET_NEW\\src\\Carpa.Web\\js\\crabaNgp -inNames initMs.js,businessControl.js -outName F:\\CarpaMS\\src\\js\\crabaNgp.js",
-    "webPath": "node ./test/test.js -checkjs -webhooks 0 -webPath F:\\crabaevery\\www -modName crabaevery"
+    "webPath": "node ./test/test.js -checkjs -webhooks 0 -webPath F:\\crabaevery\\www -modName crabaevery",
+    "makeHash": "node run.js -makeHash -files http://crabadoc.ca.com/js/utils/utils.js,F:/newcrabadoc/www/js/utils/utils.js,./test/test.js,./test/beefun.js,https://s5.vip.wpscdn.cn/web-libs/2t/js/userinfo-collect/1.0.3/vas2t-userinfo-collect.min.js?a=1 -outJson ./hash.json"
   },
   "author": "wssf",
   "dependencies": {

package/tool/checkjs.js

@@ -158,6 +158,10 @@ module.exports.start = async function() {
   var errKeys = Object.keys(errDatas);
   var warnKeys = Object.keys(warnDatas);
   var infoKeys = Object.keys(infoDatas);
+  var reportData = {
+    projectName: getModName(),
+    branchName: getBranchName(),
+  }
   if (errKeys.length > 0 || warnKeys.length > 0 || notUtf8List.length > 0 || warnGspxCount > 0 || gspxData.errorList.length > 0) {
     status = '有异常';
   }
@@ -168,6 +172,8 @@ module.exports.start = async function() {
   var webhookList = [];
   var info = [];
   var localVersion = upgrade.getLocalVersion();
+  var generateDate = new Date().toString();
+  reportData.date = generateDate;
   info.push(`# ${modName}代码检测报告`);
   webhookList.push(info[0]);
 
@@ -178,7 +184,7 @@ module.exports.start = async function() {
     info.push(`| 平台版本 | ${localVersion.version} |`);
     info.push(`| 平台日期 | ${localVersion.date} |`);
   }
-  info.push(`| 生成报告时间 | ${new Date().toString()} |`);
+  info.push(`| 生成报告时间 | ${generateDate} |`);
   info.push(`| 分支名 | ${branchName} |`);
   info.push(`| 检测主机 | ${utils.getHostName()}(${utils.getLocalIPs()}) |`);
   info.push(`| 网站路径 | ${config.webPath} |`);
@@ -206,6 +212,17 @@ module.exports.start = async function() {
     info.push(`| gspx页面异常数 | ${gspxData.errorList.length}个 |${calc(gspxData.errorList.length, gspxData.count)}|`);
   }
 
+  reportData.data = {
+    errorCount: errKeys.length,
+    warnCount: errKeys.length,
+    tipCount: errKeys.length,
+    fileSize: fileSize,
+    fileSizeCount: bigList.length,
+    gspxWarnCount: warnGspxCount.length,
+    gspxErrorCount: gspxData.errorList.length,
+    jsTotal: jsFiles.length,
+    gspxTotal: gspxData.count
+  }
 
   webhookList.push(`1. 助手版本：${config.Version} `);
   if (localVersion.version) {
@@ -380,6 +397,7 @@ module.exports.start = async function() {
   var reportUrl = getReportUrl(id);
   var content = info.concat(detail).join('  \r\n');
   postReport(id, reportUrl, content, sonar);
+  postReportData(reportData)
 
   // 推送到钉钉
   if (status != '无异常') { // 检查结果检查就不发到钉钉了； ps:健康也发到钉钉，鼓励开发继续保持；
@@ -588,4 +606,19 @@ function postWebhooks(id, reportUrl, webhookList) {
       //console.log(error);
     });
   }
+}
+
+function postReportData(data) {
+  axios({
+    method: 'post',
+    url: config.reportHost + '/apis/saveReportData',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  }).then(function(response) {
+    console.log("推送报告数据");
+    //console.log(response.data);
+  }).catch(function(error) {
+    console.log("推送报告数据:" + error.message);
+    //console.log(error);
+  });
 }

package/tool/hash.js

@@ -0,0 +1,54 @@
+
+var config = require('../lib/config.js');
+var path = require('path');
+var fs = require('fs');
+var utils = require('../lib/utils.js');
+var os = require('os');
+const crypto = require('crypto');
+var requestSync = require('sync-request');
+
+
+module.exports.start = function() {
+  var hash = {};
+  var files = config.files.split(',');
+  files.forEach(function(f) {
+
+    console.log(f);
+    var content;
+    if (f.startsWith('http')) {
+      var res = requestSync("GET", f);
+      content = res.getBody();
+    } else if (fs.existsSync(f)) {
+      content = fs.readFileSync(f);
+    } else {
+      console.error('文件不存在:' + f);
+      return;
+    }
+
+    var index = f.indexOf('?');
+    if (index > 0) {
+      f = f.substr(0, index);
+    }
+
+    // SRI Hash Generator
+    // https://www.srihash.org/
+
+    var hex = sha384(content); // 将文件内容进行hash计算
+    hash[f] = 'sha384-' + hex; //  使用 base64 编码 sha384 算法计算出摘要后的 integrity 值的示例
+  });
+
+  utils.mkdirsSync(config.outJson);
+  fs.writeFileSync(config.outJson, JSON.stringify(hash));
+}
+
+function sha256(str) {
+  const hash = crypto.createHash('sha256');
+  hash.update(str);
+  return hash.digest('base64');
+}
+
+function sha384(str) {
+  const hash = crypto.createHash('sha384');
+  hash.update(str);
+  return hash.digest('base64');
+}