crabatool 1.0.281 → 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.281",
+  "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/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');
+}