Skip to content

Commit

Permalink
Merge pull request #45 from Ar3h/master
Browse files Browse the repository at this point in the history 
添加通过dnslog探测类
  • Loading branch information
@wh1t3p1g
wh1t3p1g authored Oct 14, 2023
2 parents b1ef4a6 + d72a4e1 commit 01ea810
Show file tree
Hide file tree
Showing 12 changed files with 506 additions and 44 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@

.DS_Store
*.ser
*Test.java
*Test.java
/lib/
187 changes: 148 additions & 39 deletions cli/src/main/java/ysomap/cli/Console.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,21 @@
import ysomap.common.annotation.Bullets;
import ysomap.common.annotation.Exploits;
import ysomap.common.annotation.Payloads;
import ysomap.common.annotation.Require;
import ysomap.common.exception.ArgumentsMissMatchException;
import ysomap.common.exception.BaseException;
import ysomap.common.exception.YsoClassNotFoundException;
import ysomap.common.exception.YsoFileNotFoundException;
import ysomap.common.util.ColorStyle;
import ysomap.common.util.Logger;
import ysomap.core.serializer.SerializerTypeCodes;

import java.io.File;
import java.io.IOException;
import java.lang.annotation.Annotation;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static org.jline.builtins.Completers.TreeCompleter.node;

Expand Down Expand Up @@ -109,6 +113,9 @@ public void dispatch(List<String> words) throws Exception {
case "list":
list();
break;
case "search":
search();
break;
case "show":
show();
break;
Expand Down Expand Up @@ -178,7 +185,7 @@ public Class<?> getClassFromLoadedClasses(String type, String name) throws Argum
} else if ("bullet".equals(type)) {
metaData = bullets.get(name);
} else {
throw new ArgumentsMissMatchException("use [payload/exploit] [name]");
throw new ArgumentsMissMatchException("use {exploit/payload/bullet} <name>");
}
if(metaData != null){
return metaData.getClazz();
Expand Down Expand Up @@ -215,6 +222,12 @@ public Completer makeCompleters(){
node("exploits","payloads","bullets")
)
);
Completer searchCompleter = new Completers.TreeCompleter(
node("search",
node("exploits", "payloads", "bullets")

)
);
Completer showCompleter = new Completers.TreeCompleter(
node("show",
node("options", "payloads", "bullets")
Expand Down Expand Up @@ -246,7 +259,7 @@ public Completer makeCompleters(){

Completer commonCompleter = new Completers.TreeCompleter(
node("help","exit","run","sessions","kill","stop","script"));
return new AggregateCompleter(useCompleter, listCompleter, showCompleter, setCompleter, sessionCompleter,commonCompleter);
return new AggregateCompleter(useCompleter, listCompleter, searchCompleter, showCompleter, setCompleter, sessionCompleter,commonCompleter);
}

public Set<String> getAllParams(){
Expand All @@ -272,27 +285,56 @@ public Session newSession(boolean toSessions){
//===============================================================
// handle commands
public void use() throws Exception {
if(args.size() == 2){
String type = args.get(0);
Class<?> clazz = getClassFromLoadedClasses(type, args.get(1));

if(clazz == null){
throw new YsoClassNotFoundException(type, args.get(1));
String type = null;
String clazzString = null;
Class<?> clazz = null;
if (args.size() == 1) { // 可直接使用 use xxx 来调用所有的exploit、payload、bullet
clazzString = args.get(0);
type = "exploit";
clazz = getClassFromLoadedClasses(type, clazzString);

if (clazz == null) {
type = "payload";
clazz = getClassFromLoadedClasses(type, clazzString);
}

if("exploit".equals(type)){
Logger.success("Create a new session.");
curSession = newSession(true);
}else if("payload".equals(type) && (curSession == null || !curSession.isExploit())){
Logger.success("Create a new session.");
curSession = newSession(true);

if (clazz == null) {
type = "bullet";
clazz = getClassFromLoadedClasses(type, clazzString);
}

curSession.create(type, clazz);
curSession.getStatus().addPrompt(type, args.get(1));
}else{
throw new ArgumentsMissMatchException("use [payload/exploit] [name]");

} else if (args.size() == 2) { // 保留原来的方式，use {exploit/payload/bullet} xxx
type = args.get(0);
clazzString = args.get(1);
clazz = getClassFromLoadedClasses(type, clazzString);
} else {
throw new ArgumentsMissMatchException("use {payload/exploit/bullet} <name> or use <name>");
}

if (clazz == null) {
throw new YsoClassNotFoundException(type, clazzString);
}

if ("exploit".equals(type)) {
Logger.success("Create a new session.");
curSession = newSession(true);
} else if ("payload".equals(type) && (curSession == null || !curSession.isExploit())) {
Logger.success("Create a new session.");
curSession = newSession(true);
}

curSession.create(type, clazz);
curSession.getStatus().addPrompt(type, clazzString);

if ("exploit".equals(type)){
Printer.printCandidates("payloads", clazz, false, null); // use exploit 后自动打印可用 payloads
autoSetPayloadOrBullet("payload", clazz); // 自动调用 payload
} else if ("payload".equals(type)) {
Printer.printCandidates("bullets", clazz, false, null); // use payload 后自动打印可用 bullets
autoSetPayloadOrBullet("bullet", clazz); // 自动调用 bullet
}


}

public void set() throws Exception {
Expand All @@ -304,23 +346,67 @@ public void set() throws Exception {
}

public void list() throws ArgumentsMissMatchException {
if(args.size() == 1){
if (args.size() == 0) {
Printer.printExploitsInfo(exploits.values());
Printer.printPayloadsInfo(payloads.values());
Printer.printBulletsInfo(bullets.values());
return;
} else if (args.size() == 1) {
String type = args.get(0);
switch(type){
switch (type) {
case "exploit":
case "exploits":
Printer.printExploitsInfo(exploits.values());
return;
case "payload":
case "payloads":
Printer.printPayloadsInfo(payloads.values());
return;
case "bullet":
case "bullets":
Printer.printBulletsInfo(bullets.values());
return;
}
}
throw new ArgumentsMissMatchException("list [payloads/exploits/bullets]");
throw new ArgumentsMissMatchException("list {payloads/exploits/bullets}");
}


public void search() throws ArgumentsMissMatchException {
String tips = "search <keyword>\n"+
"search {payload/exploit/bullet} <keyword>\n";
if (args.size() == 1) { // list keyword 全局搜索
String keyword = args.get(0);
if ("-h".equals(keyword) || "help".equals(keyword)){
Logger.normal(tips);
return;
}
Printer.printExploitsInfo(getFilterList(exploits, keyword));
Printer.printPayloadsInfo(getFilterList(payloads, keyword));
Printer.printBulletsInfo(getFilterList(bullets, keyword));
return;
} else if (args.size() == 2) { // search exploit/payload/bullet <keyword>
String type = args.get(0);
String keyword = args.get(1);

switch (type) {
case "exploit":
case "exploits":
Printer.printExploitsInfo(getFilterList(exploits, keyword));
return;
case "payload":
case "payloads":
Printer.printPayloadsInfo(getFilterList(payloads, keyword));
return;
case "bullet":
case "bullets":
Printer.printBulletsInfo(getFilterList(bullets, keyword));
return;
}
}

throw new ArgumentsMissMatchException(tips);
}

public void show() throws ArgumentsMissMatchException {
if(args.size() == 1){
String type = args.get(0);
Expand Down Expand Up @@ -402,23 +488,46 @@ public void script() throws Exception {
throw new ArgumentsMissMatchException("script /path/to/script");
}
}

public void help(){
String usage = "help print this message\n" +
"list <type> list exploits, bullets and payloads\n" +
"use <type> <name> choose a exploit/payload/bullet\n" +
"set <key> <value> set exploit/bullet's arguments\n" +
"run run current session\n" +
"show <type> show payload/bullet/exploit details\n" +
"clear clear current sessions\n" +
"session [c|i] recover to a session or create a new session\n" +
"sessions print current running exploit sessions\n" +
"stop stop current session\n" +
"kill [uuid|all] kill sessions, like 'kill uuid' or 'kill all'\n" +
"exit exit ysomap\n";

public void help() {
String usage =
"help print this message\n" +
"list [type] list exploits, bullets and payloads\n" +
"use <type> <name> choose a exploit/payload/bullet\n" +
"set <key> <value> set exploit/bullet's arguments\n" +
"run run current session\n" +
"exploit same as the run command\n" +
"search search exploit/payload/bullet/ keyword\n" +
"show <type> show payload/bullet/exploit details\n" +
"clear clear current sessions\n" +
"session {c|i} recover to a session or create a new session\n" +
"sessions print current running exploit sessions\n" +
"stop stop current session\n" +
"kill {uuid|all} kill sessions, like 'kill uuid' or 'kill all'\n" +
"exit exit ysomap\n";
System.out.println(usage);
}


// 如果可选项仅有一个，那么自动设置payload或bullet
public void autoSetPayloadOrBullet(String type, Class clazz) throws Exception {
List<String> candidates = Arrays.asList(Require.Utils.getRequiresFromClass(clazz));
if (candidates.size() == 1 && !candidates.get(0).equalsIgnoreCase("*") && !candidates.get(0).equalsIgnoreCase("all gadgets") && !candidates.get(0).equals("")) {
Logger.normal(String.format("Auto set %s [%s]", type, ColorStyle.makeWordRedAndBoldAndUnderline(candidates.get(0))));
List<String> list = new ArrayList<>();
list.add(type);
list.add(candidates.get(0));
args = list;
use();
}
}

// 过滤筛选
public Set<MetaData> getFilterList(Map<String, MetaData> type, String keyword) {
Stream<MetaData> metaDataStream = type.values().parallelStream().filter(x -> x.getSimpleName().toLowerCase().contains(keyword.toLowerCase()));
Set<MetaData> filteredList = metaDataStream.collect(Collectors.toSet());
return filteredList;
}

public void setArgs(List<String> args) {
this.args = args;
}
Expand Down
20 changes: 16 additions & 4 deletions cli/src/main/java/ysomap/cli/utils/Printer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,10 @@ public static void printSettings(Class<?> clazz, HashMap<String, Object> setting
}

public static void printExploitsInfo(Collection<MetaData> data){
Logger.success("List all exploits!");
if (data.size() == 0){
Logger.warn("Not found exploit");
return;
}
AsciiTable at = new AsciiTable();
at.addRule();
at.addRow("Exploit", "Author", "Require", "Details");
Expand All @@ -124,10 +127,14 @@ public static void printExploitsInfo(Collection<MetaData> data){
cwc.add(30);
cwc.add(80);
printTable(at, cwc);
Logger.success("List all exploits!");
}

public static void printPayloadsInfo(Collection<MetaData> data){
Logger.success("List all payloads!");
if (data.size() == 0){
Logger.warn("Not found payload");
return;
}
AsciiTable at = new AsciiTable();
at.addRule();
at.addRow("Payloads", "Author", "Targets", "Dependencies");
Expand All @@ -142,10 +149,14 @@ public static void printPayloadsInfo(Collection<MetaData> data){
at.addRule();
}
printTable(at, new CWC_LongestLine());
Logger.success("List all payloads!");
}

public static void printBulletsInfo(Collection<MetaData> data){
Logger.success("List all bullets!");
if (data.size() == 0){
Logger.warn("Not Found Bullet");
return;
}
AsciiTable at = new AsciiTable();
at.addRule();
at.addRow("Bullet", "Targets", "Dependencies", "Details");
Expand All @@ -159,13 +170,14 @@ public static void printBulletsInfo(Collection<MetaData> data){
at.addRule();
}
printTable(at, new CWC_LongestLine());
Logger.success("List all bullets!");
}

public static void printTable(AsciiTable at, AT_ColumnWidthCalculator cwc){
at.setTextAlignment(TextAlignment.LEFT);
at.getRenderer().setCWC(cwc);
at.getContext().setGrid(A8_Grids.lineDobuleTripple());
System.out.println(at.render());
Logger.success("print current table done!");
// Logger.success("print current table done!");
}
}
Loading

0 comments on commit 01ea810

Please sign in to comment.