panel fix

src/main/java/com/alterdekim/javabot/controller/DatabaseController.java

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.core.JacksonException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base32;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -103,8 +104,7 @@ public class DatabaseController {
     }
 
     private void saveAction(Map<String, String> params) {
-        String scriptBody = new String(HashUtils.decodeHexString(params.get("action_body_text")));
-
+        String scriptBody = new String(new Base32().decode(params.get("action_body_text")));
         String name_text = new String(HashUtils.decodeHexString(params.get("action_name_text")));
         TextDataVal t1 = textDataValService.save(new TextDataVal(name_text));
 

src/main/resources/static/javascript/base32.js

@@ -0,0 +1,251 @@
+;(function(){
+
+// This would be the place to edit if you want a different
+// Base32 implementation
+
+var alphabet = '0123456789abcdefghjkmnpqrtuvwxyz'
+var alias = { o:0, i:1, l:1, s:5 }
+
+/**
+ * Build a lookup table and memoize it
+ *
+ * Return an object that maps a character to its
+ * byte value.
+ */
+
+var lookup = function() {
+    var table = {}
+    // Invert 'alphabet'
+    for (var i = 0; i < alphabet.length; i++) {
+        table[alphabet[i]] = i
+    }
+    // Splice in 'alias'
+    for (var key in alias) {
+        if (!alias.hasOwnProperty(key)) continue
+        table[key] = table['' + alias[key]]
+    }
+    lookup = function() { return table }
+    return table
+}
+
+/**
+ * A streaming encoder
+ *
+ *     var encoder = new base32.Encoder()
+ *     var output1 = encoder.update(input1)
+ *     var output2 = encoder.update(input2)
+ *     var lastoutput = encode.update(lastinput, true)
+ */
+
+function Encoder() {
+    var skip = 0 // how many bits we will skip from the first byte
+    var bits = 0 // 5 high bits, carry from one byte to the next
+
+    this.output = ''
+
+    // Read one byte of input
+    // Should not really be used except by "update"
+    this.readByte = function(byte) {
+        // coerce the byte to an int
+        if (typeof byte == 'string') byte = byte.charCodeAt(0)
+
+        if (skip < 0) { // we have a carry from the previous byte
+            bits |= (byte >> (-skip))
+        } else { // no carry
+            bits = (byte << skip) & 248
+        }
+
+        if (skip > 3) {
+            // not enough data to produce a character, get us another one
+            skip -= 8
+            return 1
+        }
+
+        if (skip < 4) {
+            // produce a character
+            this.output += alphabet[bits >> 3]
+            skip += 5
+        }
+
+        return 0
+    }
+
+    // Flush any remaining bits left in the stream
+    this.finish = function(check) {
+        var output = this.output + (skip < 0 ? alphabet[bits >> 3] : '') + (check ? '$' : '')
+        this.output = ''
+        return output
+    }
+}
+
+/**
+ * Process additional input
+ *
+ * input: string of bytes to convert
+ * flush: boolean, should we flush any trailing bits left
+ *        in the stream
+ * returns: a string of characters representing 'input' in base32
+ */
+
+Encoder.prototype.update = function(input, flush) {
+    for (var i = 0; i < input.length; ) {
+        i += this.readByte(input[i])
+    }
+    // consume all output
+    var output = this.output
+    this.output = ''
+    if (flush) {
+      output += this.finish()
+    }
+    return output
+}
+
+// Functions analogously to Encoder
+
+function Decoder() {
+    var skip = 0 // how many bits we have from the previous character
+    var byte = 0 // current byte we're producing
+
+    this.output = ''
+
+    // Consume a character from the stream, store
+    // the output in this.output. As before, better
+    // to use update().
+    this.readChar = function(char) {
+        if (typeof char != 'string'){
+            if (typeof char == 'number') {
+                char = String.fromCharCode(char)
+            }
+        }
+        char = char.toLowerCase()
+        var val = lookup()[char]
+        if (typeof val == 'undefined') {
+            // character does not exist in our lookup table
+            return // skip silently. An alternative would be:
+            // throw Error('Could not find character "' + char + '" in lookup table.')
+        }
+        val <<= 3 // move to the high bits
+        byte |= val >>> skip
+        skip += 5
+        if (skip >= 8) {
+            // we have enough to preduce output
+            this.output += String.fromCharCode(byte)
+            skip -= 8
+            if (skip > 0) byte = (val << (5 - skip)) & 255
+            else byte = 0
+        }
+
+    }
+
+    this.finish = function(check) {
+        var output = this.output + (skip < 0 ? alphabet[bits >> 3] : '') + (check ? '$' : '')
+        this.output = ''
+        return output
+    }
+}
+
+Decoder.prototype.update = function(input, flush) {
+    for (var i = 0; i < input.length; i++) {
+        this.readChar(input[i])
+    }
+    var output = this.output
+    this.output = ''
+    if (flush) {
+      output += this.finish()
+    }
+    return output
+}
+
+/** Convenience functions
+ *
+ * These are the ones to use if you just have a string and
+ * want to convert it without dealing with streams and whatnot.
+ */
+
+// String of data goes in, Base32-encoded string comes out.
+function encode(input) {
+  var encoder = new Encoder()
+  var output = encoder.update(input, true)
+  return output
+}
+
+// Base32-encoded string goes in, decoded data comes out.
+function decode(input) {
+    var decoder = new Decoder()
+    var output = decoder.update(input, true)
+    return output
+}
+
+/**
+ * sha1 functions wrap the hash function from Node.js
+ *
+ * Several ways to use this:
+ *
+ *     var hash = base32.sha1('Hello World')
+ *     base32.sha1(process.stdin, function (err, data) {
+ *       if (err) return console.log("Something went wrong: " + err.message)
+ *       console.log("Your SHA1: " + data)
+ *     }
+ *     base32.sha1.file('/my/file/path', console.log)
+ */
+
+var crypto, fs
+function sha1(input, cb) {
+    if (typeof crypto == 'undefined') crypto = require('crypto')
+    var hash = crypto.createHash('sha1')
+    hash.digest = (function(digest) {
+        return function() {
+            return encode(digest.call(this, 'binary'))
+        }
+    })(hash.digest)
+    if (cb) { // streaming
+        if (typeof input == 'string' || Buffer.isBuffer(input)) {
+            try {
+                return cb(null, sha1(input))
+            } catch (err) {
+                return cb(err, null)
+            }
+        }
+        if (!typeof input.on == 'function') return cb({ message: "Not a stream!" })
+        input.on('data', function(chunk) { hash.update(chunk) })
+        input.on('end', function() { cb(null, hash.digest()) })
+        return
+    }
+
+    // non-streaming
+    if (input) {
+        return hash.update(input).digest()
+    }
+    return hash
+}
+sha1.file = function(filename, cb) {
+    if (filename == '-') {
+        process.stdin.resume()
+        return sha1(process.stdin, cb)
+    }
+    if (typeof fs == 'undefined') fs = require('fs')
+    return fs.stat(filename, function(err, stats) {
+        if (err) return cb(err, null)
+        if (stats.isDirectory()) return cb({ dir: true, message: "Is a directory" })
+        return sha1(require('fs').createReadStream(filename), cb)
+    })
+}
+
+var base32 = {
+    Decoder: Decoder,
+    Encoder: Encoder,
+    encode: encode,
+    decode: decode,
+    sha1: sha1
+}
+
+if (typeof window !== 'undefined') {
+  // we're in a browser - OMG!
+  window.base32 = base32
+}
+
+if (typeof module !== 'undefined' && module.exports) {
+  // nodejs/browserify
+  module.exports = base32
+}
+})();

src/main/resources/static/javascript/panel-script.js

@@ -8,14 +8,6 @@ function str_toHex(s) {
     return h;
 }
 
-function str_toHex_w(s) {
-    var h = '';
-    for (var i = 0; i < s.length; i++) {
-        h += s.charCodeAt(i).toString(16);
-    }
-    return h;
-}
-
 function grab_form() {
     let arr = [];
     $("form#entryForm :input").each(function() {
@@ -27,7 +19,7 @@ function grab_form() {
             var vv = str_toHex(input.val());
             query = input.attr('id') + "=" + vv;
          } else if(input.attr("id") == "action_body_text") {
-            var vv = str_toHex_w(input.val());
+            var vv = base32.encode(input.val());
             query = input.attr('id') + "=" + vv;
          } else {
             query = input.attr('id') + "=" + input.val();

src/main/resources/templates/panel.html

@@ -319,6 +319,7 @@
                     </div>
                 </div>
             </div>
+            <script src="/static/javascript/base32.js" type="text/javascript"></script>
             <script src="/static/javascript/panel-script.js" type="text/javascript"></script>
         </main>
         <div th:replace="~{fragments/footer :: div}"></div>