7.7.5

Gruntfile.js

@@ -379,10 +379,6 @@ module.exports = function (grunt) {
                         src: "docs/**",
                         dest: "build/prod/"
                     },
-                    {
-                        src: "src/web/static/robots.txt",
-                        dest: "build/prod/"
-                    }
                 ]
             }
         },

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "7.7.4",
+  "version": "7.7.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "7.7.4",
+  "version": "7.7.5",
   "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
   "author": "n1474335 <n1474335@gmail.com>",
   "homepage": "https://gchq.github.io/CyberChef",

src/core/config/OperationConfig.js

@@ -1825,6 +1825,11 @@ const OperationConfig = {
                 name: "Cisco style",
                 type: "boolean",
                 value: MAC.CISCO_STYLE
+            },
+            {
+                name: "IPv6 interface ID",
+                type: "boolean",
+                value: MAC.IPV6_INTERFACE_ID
             }
         ]
     },

src/core/operations/MAC.js

@@ -34,6 +34,11 @@ const MAC = {
      * @default
      */
     CISCO_STYLE: false,
+    /**
+     * @constant
+     * @default
+     */
+    IPV6_INTERFACE_ID: false,
 
     /**
      * Format MAC addresses operation.
@@ -50,6 +55,7 @@ const MAC = {
             dashDelim = args[2],
             colonDelim = args[3],
             ciscoStyle = args[4],
+            ipv6IntID = args[5],
             outputList = [],
             macs = input.toLowerCase().split(/[,\s\r\n]+/);
 
@@ -57,23 +63,32 @@ const MAC = {
             let cleanMac = mac.replace(/[:.-]+/g, ""),
                 macHyphen = cleanMac.replace(/(.{2}(?=.))/g, "$1-"),
                 macColon = cleanMac.replace(/(.{2}(?=.))/g, "$1:"),
-                macCisco = cleanMac.replace(/(.{4}(?=.))/g, "$1.");
+                macCisco = cleanMac.replace(/(.{4}(?=.))/g, "$1."),
+                macIPv6 = cleanMac.slice(0, 6) + "fffe" + cleanMac.slice(6);
+
+            macIPv6 = macIPv6.replace(/(.{4}(?=.))/g, "$1:");
+            let bite = parseInt(macIPv6.slice(0, 2), 16) ^ 2;
+            bite = bite.toString(16).padStart(2, "0");
+            macIPv6 = bite + macIPv6.slice(2);
 
             if (outputCase === "Lower only") {
                 if (noDelim) outputList.push(cleanMac);
                 if (dashDelim) outputList.push(macHyphen);
                 if (colonDelim) outputList.push(macColon);
                 if (ciscoStyle) outputList.push(macCisco);
+                if (ipv6IntID) outputList.push(macIPv6);
             } else if (outputCase === "Upper only") {
                 if (noDelim) outputList.push(cleanMac.toUpperCase());
                 if (dashDelim) outputList.push(macHyphen.toUpperCase());
                 if (colonDelim) outputList.push(macColon.toUpperCase());
                 if (ciscoStyle) outputList.push(macCisco.toUpperCase());
+                if (ipv6IntID) outputList.push(macIPv6.toUpperCase());
             } else {
                 if (noDelim) outputList.push(cleanMac, cleanMac.toUpperCase());
                 if (dashDelim) outputList.push(macHyphen, macHyphen.toUpperCase());
                 if (colonDelim) outputList.push(macColon, macColon.toUpperCase());
                 if (ciscoStyle) outputList.push(macCisco, macCisco.toUpperCase());
+                if (ipv6IntID) outputList.push(macIPv6, macIPv6.toUpperCase());
             }
 
             outputList.push(

src/web/html/index.html

@@ -88,6 +88,7 @@
             window.loadingMsgsInt = setInterval(changeLoadingMsg, (Math.random() * 2000) + 1500);
         </script>
         <% if (!htmlWebpackPlugin.options.inline) { %>
+            <meta name="robots" content="noindex" />
             <script type="application/ld+json">
                 <% print(JSON.stringify(require("../static/structuredData.json"))); %>
             </script>

src/web/static/robots.txt

@@ -1,4 +0,0 @@
-user-agent: *
-disallow: /cyberchef.htm
-
-sitemap: https://gchq.github.io/CyberChef/sitemap.xml

src/web/static/sitemap.js

@@ -22,7 +22,7 @@ sitemap.add({
 
 for (let op in OperationConfig) {
     sitemap.add({
-        url: `/op=${encodeURIComponent(op)}`,
+        url: `/?op=${encodeURIComponent(op)}`,
         changeFreq: "yearly",
         priority: 0.5
     });