powerbi-visuals-tools 3.4.2 → 3.4.3

package/.vscode/launch.json

@@ -24,6 +24,22 @@
             "program": "${workspaceFolder}\\bin\\pbiviz.js",
             "args": ["start"]
         },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "pbiviz-start t1 Linux",
+            "cwd": "${workspaceFolder}/testGround/t1",
+            "program": "${workspaceFolder}/bin/pbiviz.js",
+            "args": ["start"]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "pbiviz-package t1",
+            "cwd": "${workspaceFolder}\\testGround\\t1",
+            "program": "${workspaceFolder}\\bin\\pbiviz.js",
+            "args": ["package"]
+        },
         {
             "type": "node",
             "request": "launch",

package/Changelog.md

@@ -2,11 +2,18 @@
 
 This page contains information about changes to the PowerBI Visual Tools (pbiviz).
 
+## 3.4.3
+
+* Updated webpack assets compilation
+* Added environment logging for debugging purposes
+* Fixed certificate date verification for different regional settings
+
 ## 3.4.2
 
 * Migrated from `request` lib to node `https` standard method
 * Removed `friendly-errors-webpack-plugin` usage
 * Removed or updated deprecated dependencies
+* Fixed vulnerabilities
 
 ## 3.4.1
 

package/config.json

@@ -1 +1 @@
-{"templates":{"visuals":"templates/visuals","pbiviz":"templates/pbiviz.json.template","plugin":"templates/plugin.ts.template","package":"templates/package.json.template"},"generate":{"apiVersion":"3.8.0"},"constants":{"minAPIversion":"3.2.0"},"build":{"precompileFolder":".tmp/precompile","dropFolder":".tmp/drop","js":"tmp.visual.js","css":"visual.css","stats":"../../webpack.statistics.html"},"package":{"dropFolder":"dist"},"server":{"root":"webRoot","assetsRoute":"/assets","privateKey":"certs/PowerBICustomVisualTest_private.key","certificate":"certs/PowerBICustomVisualTest_public.crt","pfx":"certs/PowerBICustomVisualTest_public.pfx","port":"8080","passphrase":"29494060387342613"},"visualTemplates":{"circlecard":"https://codeload.github.com/microsoft/powerbi-visuals-circlecard-react/zip/master"}}
+{"templates":{"visuals":"templates/visuals","pbiviz":"templates/pbiviz.json.template","plugin":"templates/plugin.ts.template","package":"templates/package.json.template"},"generate":{"apiVersion":"3.8.0"},"constants":{"minAPIversion":"3.2.0"},"build":{"precompileFolder":".tmp/precompile","dropFolder":".tmp/drop","js":"tmp.visual.js","css":"visual.css","stats":"../../webpack.statistics.html"},"package":{"dropFolder":"dist"},"server":{"root":"webRoot","assetsRoute":"/assets","privateKey":"certs/PowerBICustomVisualTest_private.key","certificate":"certs/PowerBICustomVisualTest_public.crt","pfx":"certs/PowerBICustomVisualTest_public.pfx","port":"8080","passphrase":"558507214814856"},"visualTemplates":{"circlecard":"https://codeload.github.com/microsoft/powerbi-visuals-circlecard-react/zip/master"}}

package/lib/CertificateTools.js

@@ -56,7 +56,7 @@ async function createCertFile(config, open) {
     const subject = "localhost";
     const keyLength = 2048;
     const algorithm = "sha256";
-    const validPeriod = 180;
+    const validPeriod = 365;
 
     if (typeof open === 'undefined') {
         open = false;
@@ -389,10 +389,8 @@ async function veryfyCertFile(keyPath, certPath, pfxPath, passphrase) {
             if (!fs.existsSync(pfxPath) || !passphrase) {
                 return false;
             }
-            let certStr = await exec(`certutil -p ${passphrase} -dump "${pfxPath}"`);
-            let certStrSplitted = certStr.split('\r\n');
-            let regex = /(?<=: ).*/;
-            endDateStr = regex.exec(certStrSplitted[6]);
+            let certStr = await exec(`powershell.exe (New-Object System.Security.Cryptography.X509Certificates.X509Certificate2('${pfxPath}','${passphrase}')).NotAfter.ToString('yyyy-MM-dd HH:mm:ss')`);
+            endDateStr = certStr.trim();
         }
         // For Linux and Mac/darwin OS:
         else if (os.platform() === "linux" || os.platform() === "darwin") {
@@ -402,8 +400,8 @@ async function veryfyCertFile(keyPath, certPath, pfxPath, passphrase) {
             endDateStr = await exec(`openssl x509 -enddate -noout -in ${certPath} | cut -d = -f 2`);
         }
 
-        let endDate = new Date(Date.parse(endDateStr));
-        verifyCertDate = (endDate - new Date()) > certSafePeriod;
+        let endDate = Date.parse(endDateStr);
+        verifyCertDate = (endDate - Date.now()) > certSafePeriod;
         if (verifyCertDate) {
             ConsoleWriter.info(`Certificate is valid.`);
         } else {

package/lib/WebPackWrap.js

@@ -1,6 +1,7 @@
 "use strict";
 
 const fs = require('fs-extra');
+const os = require('os');
 const path = require('path');
 const webpack = require('webpack');
 const config = require('../config.json');
@@ -14,6 +15,7 @@ const exec = util.promisify(require('child_process').exec);
 const CertificateTools = require("../lib/CertificateTools");
 const visualPlugin = "visualPlugin.ts";
 const lodashCloneDeep = require('lodash.clonedeep');
+const npmPackage = require('../package.json');
 
 class WebPackGenerator {
 
@@ -80,11 +82,14 @@ class WebPackGenerator {
                 directory: path.join(visualPackage.basePath, config.build.dropFolder),
                 publicPath: config.server.assetsRoute
             },
-            https: {
-                key: options.key,
-                cert: options.cert,
-                pfx: options.pfx,
-                passphrase: options.passphrase
+            server: {
+                type: 'https',
+                options: {
+                    key: options.key,
+                    cert: options.cert,
+                    pfx: options.pfx,
+                    passphrase: options.passphrase
+                }
             }
         };
     }
@@ -108,6 +113,16 @@ class WebPackGenerator {
         }
     }
 
+    async getEnvironmentDetails() {
+        let env = {};
+        env.nodeVersion = process.versions.node;
+        env.osPlatform = await os.platform();
+        env.osVersion = await os.version ? os.version() : "undefined";
+        env.osReleaseVersion = await os.release();
+        env.toolsVersion = npmPackage.version;
+        return env;
+    }
+
     async configureCustomVisualsWebpackPlugin(visualPackage, options, tsconfig) {
         let pluginConfiguration = lodashCloneDeep(visualPackage.config);
         //(?=\D*$) - positive look-ahead to find last version symbols and exclude any non-digit symbols after the version.
@@ -127,6 +142,8 @@ class WebPackGenerator {
             await this.installAPIpackage();
         }
 
+        pluginConfiguration.env = await this.getEnvironmentDetails();
+
         let api = WebPackGenerator.loadAPIPackage(visualPackage);
         pluginConfiguration.apiVersion = api.version;
         pluginConfiguration.capabilitiesSchema = api.schemas.capabilities;
@@ -179,7 +196,7 @@ class WebPackGenerator {
                 new webpack.SourceMapDevToolPlugin({
                     filename: '[file].map',
                     publicPath: `https://localhost:${this.webpackConfig.devServer.port}/assets/`
-                  })
+                })
             );
         }
     }

package/lib/webpack.config.js

@@ -121,7 +121,7 @@ module.exports = {
         compress: true,
         port: 8080,
         hot: false,
-        https: true,
+        server: 'https',
         headers: {
             "access-control-allow-origin": "*",
             "cache-control": "public, max-age=0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "powerbi-visuals-tools",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "description": "Command line tool for creating and publishing visuals for Power BI",
   "main": "./lib/VisualPackage.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "mini-css-extract-plugin": "^1.4.0",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
-    "powerbi-visuals-webpack-plugin": "^2.3.1",
+    "powerbi-visuals-webpack-plugin": "^3.0.0",
     "process": "^0.11.10",
     "punycode": "^2.1.1",
     "querystring-es3": "^0.2.1",
@@ -83,7 +83,7 @@
     "webpack-dev-server": "^4.1.0"
   },
   "devDependencies": {
-    "eslint": "6.8.0",
+    "eslint": "^7.31.0",
     "jasmine": "3.5.0",
     "jasmine-spec-reporter": "5.0.1",
     "semver": "7.1.3",