Webpack subresource integrity

4 files changed, 35 insertions, 4 deletions

diff --git a/language-web/build.gradle b/language-web/build.gradle
index 5cf7e684..dcb69406 100644
--- a/language-web/build.gradle
+++ b/language-web/build.gradle
@@ -12,7 +12,8 @@ dependencies {
 def webpackOutputDir = "${buildDir}/webpack"
 def productionResources = "${webpackOutputDir}/production"
 def mainClass = 'org.eclipse.viatra.solver.language.web.ServerLauncher'
-def currentNodeEnv = System.getenv('NODE_ENV') ?: 'development'
+def devMode = System.getenv('NODE_ENV') != 'production'
+def currentNodeEnv =  devMode ? 'development' : 'production'
 
 apply plugin: 'com.moowork.node'
 
@@ -59,7 +60,11 @@ shadowJar {
 }
 
 task jettyRun(type: JavaExec) {
-        dependsOn webpackDevelopment
+        if (devMode) {
+                dependsOn webpackDevelopment
+        } else {
+                dependsOn webpackProduction
+        }
         dependsOn sourceSets.main.runtimeClasspath
         classpath = sourceSets.main.runtimeClasspath.filter{it.exists()}
         main = mainClass
diff --git a/language-web/package-lock.json b/language-web/package-lock.json
index 1c98ca49..b785cfe9 100644
--- a/language-web/package-lock.json
+++ b/language-web/package-lock.json
@@ -1666,6 +1666,12 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "before-build-webpack": {
+      "version": "0.2.11",
+      "resolved": "https://registry.npmjs.org/before-build-webpack/-/before-build-webpack-0.2.11.tgz",
+      "integrity": "sha512-xigRuKoJmla3cO/BP76CDlmkXmQFrjlHv6oS16RxmbckYTfi5I3ZBp7MnoKv+C05DqDT1pSl+znLf7pv1Vv4ew==",
+      "dev": true
+    },
     "big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -8719,6 +8725,12 @@
         "mime-types": "~2.1.24"
       }
     },
+    "typed-assert": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/typed-assert/-/typed-assert-1.0.7.tgz",
+      "integrity": "sha512-TiBedJnGT3nNss19TyQ/JLwXy57pNDYBAja1gC0uLCKN4ps7FF3sSh71oImHDiKk8i5EuQ1G0CEOPeeA+ClWXQ==",
+      "dev": true
+    },
     "unbox-primitive": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
@@ -9448,6 +9460,15 @@
         }
       }
     },
+    "webpack-subresource-integrity": {
+      "version": "5.0.0-alpha.5",
+      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.0.0-alpha.5.tgz",
+      "integrity": "sha512-bZVkt3W7wbvNXoM+vHNNTB9V6z0Xce1MJRcMeK7EwY0Nf4RpOxp8S5APRWKWDZX6ufxIZ9MZo8aISZRUcvO3uA==",
+      "dev": true,
+      "requires": {
+        "typed-assert": "^1.0.4"
+      }
+    },
     "websocket-driver": {
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
diff --git a/language-web/package.json b/language-web/package.json
index f4813a49..7ae01946 100644
--- a/language-web/package.json
+++ b/language-web/package.json
@@ -22,6 +22,7 @@
     "@babel/core": "^7.14.6",
     "@babel/preset-env": "^7.14.7",
     "babel-loader": "^8.2.2",
+    "before-build-webpack": "^0.2.11",
     "css-loader": "^5.2.6",
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^5.3.2",
@@ -32,7 +33,8 @@
     "style-loader": "^3.0.0",
     "webpack": "^5.41.0",
     "webpack-cli": "^4.7.2",
-    "webpack-dev-server": "^3.11.2"
+    "webpack-dev-server": "^3.11.2",
+    "webpack-subresource-integrity": "^5.0.0-alpha.5"
   },
   "dependencies": {
     "codemirror": "^5.62.0",
diff --git a/language-web/webpack.config.js b/language-web/webpack.config.js
index f047f6c6..385c1024 100644
--- a/language-web/webpack.config.js
+++ b/language-web/webpack.config.js
@@ -3,7 +3,8 @@ const path = require('path');
 
 const WebpackBeforeBuildPlugin = require('before-build-webpack');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const { SubresourceIntegrityPlugin } = require('webpack-subresource-integrity');
 
 const currentNodeEnv = process.env.NODE_ENV || 'development';
 const devMode = currentNodeEnv !== 'production';
@@ -28,6 +29,7 @@ module.exports = {
     publicPath: '/',
     filename: devMode ? '[name].js' : '[contenthash].js',
     chunkFilename: devMode ? '[id].js' : '[contenthash].js',
+    crossOriginLoading: 'anonymous',
   },
   module: {
     rules: [
@@ -103,6 +105,7 @@ module.exports = {
       filename: '[contenthash].css',
       chunkFilename: '[contenthash].css',
     }),
+    new SubresourceIntegrityPlugin(),
     new HtmlWebpackPlugin({
       template: 'src/main/html/index.html',
       minify: devMode ? false : {