Browse Source

Merge branch 'master' into chore/update-packages

a3957273 1 year ago
parent
commit
e532248701
2 changed files with 16 additions and 1 deletions
  1. 11 0
      src/core/operations/AnalyseHash.mjs
  2. 5 1
      src/web/waiters/RecipeWaiter.mjs

+ 11 - 0
src/core/operations/AnalyseHash.mjs

@@ -35,6 +35,17 @@ class AnalyseHash extends Operation {
     run(input, args) {
     run(input, args) {
         input = input.replace(/\s/g, "");
         input = input.replace(/\s/g, "");
 
 
+        // analyze hash if it is bcrypt
+        if (/^\$2[abxy]?\$[0-9]+\$[a-zA-Z0-9/.]{53}$/.test(input)) {
+            input = input.split("$");
+            return "Hash algorithm Identifier: $" + input[1] + "$\n" +
+                "Rounds: " + input[2] + "\n" +
+                "Base64 encoded Input salt(22 bytes): " + input[3].slice(0, 22) + "\n" +
+                "Base64 encoded hash(31 bytes): " + input[3].slice(22) + "\n\n" +
+                "Based on the length, this hash could have been generated by one of the following hashing functions:\n" +
+                "bcrypt";
+        }
+
         let output = "",
         let output = "",
             possibleHashFunctions = [];
             possibleHashFunctions = [];
         const byteLength = input.length / 2,
         const byteLength = input.length / 2,

+ 5 - 1
src/web/waiters/RecipeWaiter.mjs

@@ -396,7 +396,11 @@ class RecipeWaiter {
         const item = document.createElement("li");
         const item = document.createElement("li");
 
 
         item.classList.add("operation");
         item.classList.add("operation");
-        item.innerHTML = name;
+
+        if (this.app.operations[name] != null) {
+            item.innerHTML = name;
+        }
+
         this.buildRecipeOperation(item);
         this.buildRecipeOperation(item);
         document.getElementById("rec-list").appendChild(item);
         document.getElementById("rec-list").appendChild(item);