bartek/esa-tool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2: Add --plugins options

Browse Source
This commit is contained in:
Bartłomiej Pluta
2019-03-30 10:44:19 +01:00
parent 5b90131e02
commit c24d2f3e53
2 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/bartek/esa/cli/model/CliArgsOptions.java
View File

@@ -3,15 +3,17 @@ package com.bartek.esa.cli.model;
import lombok.Builder;
import lombok.Data;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import static java.util.Collections.emptySet;
@Data
@Builder
public class CliArgsOptions {
private String sourceAnalysisDirectory;
private String apkAuditFile;
private List<String> excludes;
private Set<String> excludes;
private Set<String> plugins;
public boolean isSourceAnalysis() {
return sourceAnalysisDirectory != null;
@@ -25,7 +27,8 @@ public class CliArgsOptions {
return CliArgsOptions.builder()
.sourceAnalysisDirectory(null)
.apkAuditFile(null)
.excludes(Collections.emptyList())
.excludes(emptySet())
.plugins(emptySet())
.build();
}
}

56
src/main/java/com/bartek/esa/cli/parser/CliArgsParser.java
View File

@@ -4,45 +4,52 @@ import com.bartek.esa.cli.model.CliArgsOptions;
import org.apache.commons.cli.*;
import javax.inject.Inject;
import java.util.HashSet;
import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
import static java.util.Collections.emptySet;
public class CliArgsParser {
private static final String SRC_OPT = "src";
private static final String APK_OPT = "apk";
private static final String EXCLUDE_OPT = "exclude";
private static final String HELP_OPT = "help";
private static final String PLUGINS_OPT = "plugins";
@Inject
public CliArgsParser() {}
public CliArgsOptions parse(String[] args) {
try {
CommandLine command = new DefaultParser().parse(prepareOptions(), args);
if (command.hasOption(HELP_OPT)) {
printHelp();
return CliArgsOptions.empty();
}
boolean isNeitherAuditNorAnalysis = !command.hasOption(SRC_OPT) && !command.hasOption(APK_OPT);
if (isNeitherAuditNorAnalysis) {
printHelp();
return CliArgsOptions.empty();
}
return CliArgsOptions.builder()
.sourceAnalysisDirectory(command.hasOption(SRC_OPT) ? command.getOptionValue(SRC_OPT) : null)
.apkAuditFile(command.hasOption(APK_OPT) ? command.getOptionValue(APK_OPT) : null)
.excludes(command.hasOption(EXCLUDE_OPT) ? asList(command.getOptionValues(EXCLUDE_OPT)) : emptyList())
.build();
return tryToParse(args);
} catch (ParseException e) {
printHelp();
return CliArgsOptions.empty();
}
}
private CliArgsOptions tryToParse(String[] args) throws ParseException {
CommandLine command = new DefaultParser().parse(prepareOptions(), args);
if (command.hasOption(HELP_OPT)) {
printHelp();
return CliArgsOptions.empty();
}
boolean isNeitherAuditNorAnalysis = !command.hasOption(SRC_OPT) && !command.hasOption(APK_OPT);
if (isNeitherAuditNorAnalysis) {
printHelp();
return CliArgsOptions.empty();
}
return CliArgsOptions.builder()
.sourceAnalysisDirectory(command.hasOption(SRC_OPT) ? command.getOptionValue(SRC_OPT) : null)
.apkAuditFile(command.hasOption(APK_OPT) ? command.getOptionValue(APK_OPT) : null)
.plugins(command.hasOption(PLUGINS_OPT) ? new HashSet<>(asList(command.getOptionValues(PLUGINS_OPT))) : emptySet())
.excludes(command.hasOption(EXCLUDE_OPT) ? new HashSet<>(asList(command.getOptionValues(EXCLUDE_OPT))) : emptySet())
.build();
}
private void printHelp() {
HelpFormatter formatter = new HelpFormatter();
formatter.printHelp("esa", prepareOptions(), true);
@@ -53,6 +60,7 @@ public class CliArgsParser {
options.addOption(source());
options.addOption(apk());
options.addOption(exclude());
options.addOption(plugins());
options.addOption(help());
return options;
}
@@ -87,8 +95,16 @@ public class CliArgsParser {
private Option help() {
return Option.builder()
.longOpt(HELP_OPT)
.argName("h")
.desc("print this help")
.build();
}
private Option plugins() {
return Option.builder()
.longOpt(PLUGINS_OPT)
.argName("CODES")
.numberOfArgs(Option.UNLIMITED_VALUES)
.desc("use only selected security checks for audit/analysis")
.build();
}
}