Added decrypt command and l flag

Author: JanHolger

src/main/java/org/javawebstack/framework/WebApplication.java

@@ -109,6 +109,7 @@ public WebApplication(){
         commandSystem.addCommand("crypt", new MultiCommand()
                 .add("generate", new CryptGenerateCommand())
                 .add("encrypt", new CryptEncryptCommand())
+                .add("decrypt", new CryptDecryptCommand())
                 .add("hash", new CryptHashCommand())
         );
     }

src/main/java/org/javawebstack/framework/command/CryptDecryptCommand.java

@@ -0,0 +1,26 @@
+package org.javawebstack.framework.command;
+
+import org.javawebstack.command.Command;
+import org.javawebstack.command.CommandResult;
+import org.javawebstack.command.CommandSystem;
+import org.javawebstack.framework.util.Crypt;
+import org.javawebstack.injector.Inject;
+
+import java.util.List;
+import java.util.Map;
+
+public class CryptDecryptCommand implements Command {
+
+    @Inject
+    Crypt crypt;
+
+    public CommandResult execute(CommandSystem commandSystem, List<String> args, Map<String, List<String>> params) {
+        if(params.containsKey("l")){
+            System.out.println(crypt.decryptLaravel(args.size() > 0 ? args.get(0) : ""));
+            return CommandResult.success();
+        }
+        System.out.println(crypt.decryptString(args.size() > 0 ? args.get(0) : ""));
+        return CommandResult.success();
+    }
+
+}

src/main/java/org/javawebstack/framework/command/CryptEncryptCommand.java

@@ -15,7 +15,11 @@ public class CryptEncryptCommand implements Command {
     Crypt crypt;
 
     public CommandResult execute(CommandSystem commandSystem, List<String> args, Map<String, List<String>> params) {
-        System.out.println(crypt.hash(args.size() > 0 ? args.get(0) : ""));
+        if(params.containsKey("l")){
+            System.out.println(crypt.encryptLaravel(args.size() > 0 ? args.get(0) : ""));
+            return CommandResult.success();
+        }
+        System.out.println(crypt.encrypt(args.size() > 0 ? args.get(0) : ""));
         return CommandResult.success();
     }
 

src/main/java/org/javawebstack/framework/util/Crypt.java

@@ -27,7 +27,7 @@ public static String generateKey(int length){
             KeyGenerator keyGen = KeyGenerator.getInstance("AES");
             keyGen.init(length);
             SecretKey secretKey = keyGen.generateKey();
-            return new String(secretKey.getEncoded(), StandardCharsets.UTF_8);
+            return new String(Base64.getEncoder().encode(secretKey.getEncoded()), StandardCharsets.UTF_8);
         } catch (NoSuchAlgorithmException e) {
             throw new SecurityException(e.getMessage());
         }
@@ -36,7 +36,7 @@ public static String generateKey(int length){
     private final byte[] key;
 
     public Crypt(String key){
-        this.key = key.getBytes(StandardCharsets.UTF_8);
+        this.key = Base64.getDecoder().decode(key.getBytes(StandardCharsets.UTF_8));
     }
 
     public String hash(String data){