marko/jPasswordObfuscator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement new API

Browse Source
This commit is contained in:
Marko Zivanovic
2015-03-12 12:30:39 +01:00
parent 258a3a7b31
commit 7ad028c966
12 changed files with 253 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jPasswordObfuscator-bin/pom.xml
+7 -1
View File
@@ -58,7 +58,13 @@
<dependency>
<groupId>rs.in.zivanovic</groupId>
<artifactId>j-password-obfuscator</artifactId>
<version>1.0.0</version>
<version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
<scope>test</scope>
</dependency>
</dependencies>
jPasswordObfuscator-bin/src/main/java/rs/in/zivanovic/obfuscator/Main.java
+13 -23
View File
@@ -23,41 +23,31 @@
*/
package rs.in.zivanovic.obfuscator;
import com.beust.jcommander.JCommander;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.Callable;
/**
* Main entry point.
* Obfuscator command line utility main class.
*/
public class Main {
private Main() {
}
/**
* Entry point.
*
* @param args command line arguments
*/
public static void main(String[] args) {
JCommander jc = new JCommander();
Map<String, Runnable> commands = new HashMap<>();
Map<String, String[]> aliases = new HashMap<>();
commands.put("o", new ObfuscateCommand());
aliases.put("o", new String[]{"ob", "obfuscate"});
commands.put("d", new DeObfuscateCommand());
aliases.put("d", new String[]{"deob", "deobfuscate"});
for (Entry<String, Runnable> e : commands.entrySet()) {
String[] a = aliases.get(e.getKey());
jc.addCommand(e.getKey(), e.getValue(), a);
}
try {
jc.parse(args);
if (commands.keySet().contains(jc.getParsedCommand())) {
Runnable r = commands.get(jc.getParsedCommand());
r.run();
ParsedCommandLine pcl = new ParsedCommandLine(args);
Callable<String> command = pcl.getCommand();
if (command == null) {
System.out.println(pcl.getHelpText());
} else {
jc.usage();
System.out.println(command.call());
}
} catch (RuntimeException ex) {
} catch (Exception ex) {
System.err.println("ERROR: " + ex.getMessage());
}
}
jPasswordObfuscator-bin/src/main/java/rs/in/zivanovic/obfuscator/ObfuscateCommand.java
+6 -8
View File
@@ -26,14 +26,14 @@ package rs.in.zivanovic.obfuscator;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.common.base.Joiner;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.concurrent.Callable;
/**
* Implementation of the obfuscate command.
*/
@Parameters(commandDescription = "Obfuscate sensitive data")
public class ObfuscateCommand implements Runnable {
public class ObfuscateCommand implements Callable<String> {
@Parameter(names = {"-k", "--key"}, description = "Master key to use for obfuscation", required = true)
private String masterKey;
@@ -43,14 +43,12 @@ public class ObfuscateCommand implements Runnable {
private int version = 1;
@Parameter(description = "data to obfuscate", required = true)
private List<String> data;
private List<String> params;
@Override
public void run() {
JPasswordObfuscator jpo = new JPasswordObfuscator();
byte[] dataBytes = Joiner.on(' ').join(data).getBytes(StandardCharsets.UTF_8);
String s = jpo.obfuscate(masterKey.toCharArray(), dataBytes, version);
System.out.println(s);
public String call() {
String data = Joiner.on(' ').join(params);
return new Obfuscated(masterKey.toCharArray(), data, version).toString();
}
}
jPasswordObfuscator-bin/src/main/java/rs/in/zivanovic/obfuscator/ParsedCommandLine.java
+94
View File
@@ -0,0 +1,94 @@
/*
* The MIT License
*
* Copyright 2015 Marko Zivanovic <marko@zivanovic.in.rs>.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package rs.in.zivanovic.obfuscator;
import com.beust.jcommander.JCommander;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Callable;
/**
* Wrapper around command line arguments that performs parsing and returns callable that executes required command.
*/
public class ParsedCommandLine {
private static final Map<String, Callable<String>> COMMANDS = new HashMap<>();
private static final Map<String, String[]> ALIASES = new HashMap<>();
private final Callable<String> command;
private final StringBuilder usage = new StringBuilder();
static {
COMMANDS.put("o", new ObfuscateCommand());
ALIASES.put("o", new String[]{"ob", "obfuscate"});
COMMANDS.put("u", new UnobfuscateCommand());
ALIASES.put("u", new String[]{"unob", "unobfuscate"});
}
/**
* Parse command line arguments and prepare command to execute and usage help text.
*
* @param args command line arguments to parse
*/
public ParsedCommandLine(String[] args) {
JCommander jc = new JCommander();
addCommands(jc);
jc.usage(usage);
this.command = parse(jc, args);
}
/**
* Get the command to execute.
*
* @return command to execute
*/
public Callable<String> getCommand() {
return command;
}
/**
* Get usage help text.
*
* @return usage help text
*/
public String getHelpText() {
return usage.toString();
}
private void addCommands(JCommander jc) {
for (Map.Entry<String, Callable<String>> e : COMMANDS.entrySet()) {
String[] a = ALIASES.get(e.getKey());
jc.addCommand(e.getKey(), e.getValue(), a);
}
}
private Callable<String> parse(JCommander jc, String[] args) {
Callable ret = null;
jc.parse(args);
if (COMMANDS.keySet().contains(jc.getParsedCommand())) {
ret = COMMANDS.get(jc.getParsedCommand());
}
return ret;
}
}
jPasswordObfuscator-bin/src/main/java/rs/in/zivanovic/obfuscator/DeObfuscateCommand.java → jPasswordObfuscator-bin/src/main/java/rs/in/zivanovic/obfuscator/UnobfuscateCommand.java
+10 -12
View File
@@ -26,27 +26,25 @@ package rs.in.zivanovic.obfuscator;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.common.base.Joiner;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.concurrent.Callable;
/**
* Implementation of the de-obfuscate command.
* Implementation of the un-obfuscate command.
*/
@Parameters(commandDescription = "De-obfuscate sensitive data")
public class DeObfuscateCommand implements Runnable {
@Parameters(commandDescription = "Un-obfuscate sensitive data")
public class UnobfuscateCommand implements Callable<String> {
@Parameter(names = {"-k", "--key"}, description = "Master key to use for de-obfuscation", required = true)
@Parameter(names = {"-k", "--key"}, description = "Master key to use for un-obfuscation", required = true)
private String masterKey;
@Parameter(description = "obfuscated string to de-obfuscate", required = true)
private List<String> data;
@Parameter(description = "obfuscated string to un-obfuscate", required = true)
private List<String> params;
@Override
public void run() {
JPasswordObfuscator jpo = new JPasswordObfuscator();
String obfuscated = Joiner.on(' ').skipNulls().join(data);
byte[] deObfuscated = jpo.deObfuscate(masterKey.toCharArray(), obfuscated);
System.out.println(new String(deObfuscated, StandardCharsets.UTF_8));
public String call() {
String obfuscated = Joiner.on(' ').skipNulls().join(params);
return new Unobfuscated(masterKey.toCharArray(), obfuscated).asString();
}
}
jPasswordObfuscator-bin/src/test/java/rs/in/zivanovic/obfuscator/ObfuscateCommandTest.java
+52
View File
@@ -0,0 +1,52 @@
/*
* The MIT License
*
* Copyright 2015 Marko Zivanovic <marko@zivanovic.in.rs>.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package rs.in.zivanovic.obfuscator;
import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
import java.util.concurrent.Callable;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import org.junit.Test;
/**
* Obfuscator command-line utility unit tests.
*/
public class ObfuscateCommandTest {
private String run(String args) throws Exception {
Iterable<String> a = Splitter.on(' ').split(args);
ParsedCommandLine pcl = new ParsedCommandLine(Iterables.toArray(a, String.class));
Callable<String> c = pcl.getCommand();
return c.call();
}
@Test
public void testObfuscateUnobfuscate() throws Exception {
String o = run("o -k test test");
String d = run("u -k test " + o);
assertThat("test", equalTo(d));
}
}