-
+
-
+
-
+
@@ -209,7 +104,7 @@
Bake!
-
+
diff --git a/src/web/index_assets/ieCheck.js b/src/web/index_assets/ieCheck.js
new file mode 100644
index 00000000..62b5fc6b
--- /dev/null
+++ b/src/web/index_assets/ieCheck.js
@@ -0,0 +1,5 @@
+// Must be text/javascript rather than application/javascript otherwise IE won't recognise it...
+if (navigator.userAgent && navigator.userAgent.match(/Trident/)) {
+ document.getElementById("notice").innerHTML += "Internet Explorer is not supported, please use Firefox or Chrome instead";
+ alert("Internet Explorer is not supported, please use Firefox or Chrome instead");
+}
diff --git a/src/web/index_assets/loadTheme.js b/src/web/index_assets/loadTheme.js
new file mode 100644
index 00000000..c94aff74
--- /dev/null
+++ b/src/web/index_assets/loadTheme.js
@@ -0,0 +1,108 @@
+"use strict";
+
+// Load theme before the preloader is shown
+try {
+ document.querySelector(":root").className = (JSON.parse(localStorage.getItem("options")) || {}).theme;
+} catch (err) {
+ // LocalStorage access is denied by security settings
+}
+
+// Define loading messages
+const loadingMsgs = [
+ "Proving P = NP...",
+ "Computing 6 x 9...",
+ "Mining bitcoin...",
+ "Dividing by 0...",
+ "Initialising Skynet...",
+ "[REDACTED]",
+ "Downloading more RAM...",
+ "Ordering 1s and 0s...",
+ "Navigating neural network...",
+ "Importing machine learning...",
+ "Issuing Alice and Bob one-time pads...",
+ "Mining bitcoin cash...",
+ "Generating key material by trying to escape vim...",
+ "for i in range(additional): Pylon()",
+ "(creating unresolved tension...",
+ "Symlinking emacs and vim to ed...",
+ "Training branch predictor...",
+ "Timing cache hits...",
+ "Speculatively executing recipes...",
+ "Adding LLM hallucinations...",
+ "Decompressing malware..."
+];
+
+// Shuffle array using Durstenfeld algorithm
+for (let i = loadingMsgs.length - 1; i > 0; --i) {
+ const j = Math.floor(Math.random() * (i + 1));
+ const temp = loadingMsgs[i];
+ loadingMsgs[i] = loadingMsgs[j];
+ loadingMsgs[j] = temp;
+}
+
+/**
+* Show next loading message and move it to the end of the array
+**/
+function changeLoadingMsg() {
+ const msg = loadingMsgs.shift();
+ loadingMsgs.push(msg);
+ try {
+ const el = document.getElementById("preloader-msg");
+ if (!el.classList.contains("loading"))
+ el.classList.add("loading"); // Causes CSS transition on first message
+ el.innerHTML = msg;
+ } catch (err) {
+ // This error was likely caused by the DOM not being ready yet,
+ // so we wait another second and then try again.
+ setTimeout(changeLoadingMsg, 1000);
+ }
+}
+
+changeLoadingMsg();
+window.loadingMsgsInt = setInterval(changeLoadingMsg, (Math.random() * 2000) + 1500);
+
+/**
+* If any errors are thrown during loading, handle them here
+*/
+function loadingErrorHandler(e) {
+
+ /**
+ * Escape HTMLs
+ */
+ function escapeHtml(str) {
+ const HTML_CHARS = {
+ "&": "&",
+ "<": "<",
+ ">": ">",
+ '"': """,
+ "'": "'", // ' not recommended because it's not in the HTML spec
+ "/": "/", // forward slash is included as it helps end an HTML entity
+ "`": "`"
+ };
+
+ return str.replace(/[&<>"'/`]/g, function (match) {
+ return HTML_CHARS[match];
+ });
+ }
+
+ const msg = e.message +
+ (e.filename ? "\nFilename: " + e.filename : "") +
+ (e.lineno ? "\nLine: " + e.lineno : "") +
+ (e.colno ? "\nColumn: " + e.colno : "") +
+ (e.error ? "\nError: " + e.error : "") +
+ "\nUser-Agent: " + navigator.userAgent +
+ "\nCyberChef version: <%= htmlWebpackPlugin.options.version %>";
+
+ clearInterval(window.loadingMsgsInt);
+ document.getElementById("preloader").remove();
+ document.getElementById("preloader-msg").remove();
+ document.getElementById("preloader-error").innerHTML =
+ "CyberChef encountered an error while loading.
" + + "The following browser versions are supported:" + + "
" + escapeHtml(navigator.userAgent) + "
" + + "If your browser is supported, please " + + "raise an issue including the following details:
" + + "
-
@@ -774,7 +669,7 @@
-
+
 %>)
+ Results
" + + "The following browser versions are supported:" + + "
- Google Chrome 50+
- Mozilla Firefox 38+
" + escapeHtml(navigator.userAgent) + "
" + + "If your browser is supported, please " + + "raise an issue including the following details:
" + + "
" + escapeHtml(msg) + ""; +}; +window.addEventListener("error", loadingErrorHandler); diff --git a/src/web/index_assets/style.css b/src/web/index_assets/style.css new file mode 100644 index 00000000..011bf897 --- /dev/null +++ b/src/web/index_assets/style.css @@ -0,0 +1,59 @@ +#banner .col:first-child { + text-align: left; + padding-left: 10px; +} + +#banner .col:last-child { + text-align: right; + padding-right: 0; +} + +#controls-content .form-group { + display: contents; +} + +#open-folder, +#open-file { + display: none; +} + +#input-tabs-wrapper, +#output-tabs-wrapper { + display: none; +} + +#save-all-to-file { + display: none; +} + +#save-link-group h6 { + display: inline; +} + +#save-link { + word-wrap: break-word; +} + +#options-body > p:first-child { + font-weight: bold; +} + +.favourites-action-label { + font-weight: bold; +} + +#about, +#keybindings { + padding: 20px; +} + +.fork-me-ribbon { + position: absolute; + top: 0; + right: 0; + border: 0; +} + +.clear-both { + clear: both; +} diff --git a/src/web/waiters/BackgroundWorkerWaiter.mjs b/src/web/waiters/BackgroundWorkerWaiter.mjs index 409c2bbb..fccd26fa 100644 --- a/src/web/waiters/BackgroundWorkerWaiter.mjs +++ b/src/web/waiters/BackgroundWorkerWaiter.mjs @@ -4,7 +4,7 @@ * @license Apache-2.0 */ -import ChefWorker from "worker-loader?inline=no-fallback!../../core/ChefWorker.js"; +import ChefWorker from "worker-loader!../../core/ChefWorker.js"; /** * Waiter to handle conversations with a ChefWorker in the background. diff --git a/src/web/waiters/InputWaiter.mjs b/src/web/waiters/InputWaiter.mjs index 94663a0b..0694d3dc 100644 --- a/src/web/waiters/InputWaiter.mjs +++ b/src/web/waiters/InputWaiter.mjs @@ -5,8 +5,8 @@ * @license Apache-2.0 */ -import LoaderWorker from "worker-loader?inline=no-fallback!../workers/LoaderWorker.js"; -import InputWorker from "worker-loader?inline=no-fallback!../workers/InputWorker.mjs"; +import LoaderWorker from "worker-loader!../workers/LoaderWorker.js"; +import InputWorker from "worker-loader!../workers/InputWorker.mjs"; import Utils, {debounce} from "../../core/Utils.mjs"; import {toBase64} from "../../core/lib/Base64.mjs"; import cptable from "codepage"; diff --git a/src/web/waiters/OutputWaiter.mjs b/src/web/waiters/OutputWaiter.mjs index 2b2cb096..61c77aed 100755 --- a/src/web/waiters/OutputWaiter.mjs +++ b/src/web/waiters/OutputWaiter.mjs @@ -10,7 +10,7 @@ import Dish from "../../core/Dish.mjs"; import {isUTF8, CHR_ENC_SIMPLE_REVERSE_LOOKUP} from "../../core/lib/ChrEnc.mjs"; import {detectFileType} from "../../core/lib/FileType.mjs"; import FileSaver from "file-saver"; -import ZipWorker from "worker-loader?inline=no-fallback!../workers/ZipWorker.mjs"; +import ZipWorker from "worker-loader!../workers/ZipWorker.mjs"; import { EditorView, diff --git a/src/web/waiters/WorkerWaiter.mjs b/src/web/waiters/WorkerWaiter.mjs index 296aa956..ca4695ee 100644 --- a/src/web/waiters/WorkerWaiter.mjs +++ b/src/web/waiters/WorkerWaiter.mjs @@ -5,8 +5,8 @@ * @license Apache-2.0 */ -import ChefWorker from "worker-loader?inline=no-fallback!../../core/ChefWorker.js"; -import DishWorker from "worker-loader?inline=no-fallback!../workers/DishWorker.mjs"; +import ChefWorker from "worker-loader!../../core/ChefWorker.js"; +import DishWorker from "worker-loader!../workers/DishWorker.mjs"; import { debounce } from "../../core/Utils.mjs"; /** diff --git a/webpack.config.js b/webpack.config.js index 4c6c00ba..e97c845b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -99,6 +99,9 @@ module.exports = { context: "node_modules/node-forge/dist", from: "prime.worker.min.js", to: "assets/forge/" + }, { + from: "src/web/index_assets/", + to: "assets/index_assets/" } ] }), @@ -202,7 +205,10 @@ module.exports = { }, { test: /\.svg$/, - type: "asset/inline", + type: "asset/resource", + generator: { + filename: "assets/[hash][ext]" + } }, { // Store font .fnt and .png files in a separate fonts folder test: /(\.fnt$|bmfonts\/.+\.png$)/, @@ -219,10 +225,13 @@ module.exports = { filename: "images/[name][ext]" } }, - { // Third party images are inlined + { // Third party images served as files test: /\.(png|jpg|gif)$/, exclude: /web\/static/, - type: "asset/inline", + type: "asset/resource", + generator: { + filename: "assets/[hash][ext]" + } }, ] },