Upstream
/
SubServers-2
mirror of https://github.com/ME1312/SubServers-2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add some escapes for use in SubServers.Host commands

This commit is contained in:
ME1312 2018-06-25 20:51:14 -04:00
parent 483ae51cd5
commit 959e444aea
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
20 changed files with 171 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
PULL_REQUEST_TEMPLATE.md → .github/PULL_REQUEST_TEMPLATE.md vendored
View File

BIN
Artifacts/SubServers.Bungee.jar
View File

Binary file not shown.

BIN
Artifacts/SubServers.Client.Bukkit.jar
View File

Binary file not shown.

BIN
Artifacts/SubServers.Host.jar
View File

Binary file not shown.

BIN
Artifacts/SubServers.Sync.jar
View File

Binary file not shown.

BIN
Javadoc/SubServers.Bungee.jar
View File

Binary file not shown.

BIN
Javadoc/SubServers.Client.Bukkit.jar
View File

Binary file not shown.

BIN
Javadoc/SubServers.Host.jar
View File

Binary file not shown.

BIN
Javadoc/SubServers.Sync.jar
View File

Binary file not shown.

BIN
SubServers.Bungee/src.jar
View File

Binary file not shown.

2
SubServers.Bungee/src/META-INF/MANIFEST.MF
View File

@ -2,4 +2,4 @@ Manifest-Version: 1.0
Class-Path: BungeeCord.jar Waterfall.jar Class-Path: BungeeCord.jar Waterfall.jar
Main-Class: net.ME1312.SubServers.Bungee.Launch Main-Class: net.ME1312.SubServers.Bungee.Launch
Implementation-Title: SubServers.Bungee Implementation-Title: SubServers.Bungee
Specification-Title: 18w26d Specification-Title: 18w26n

BIN
SubServers.Client/Bukkit/src.jar
View File

Binary file not shown.

2
SubServers.Client/Bukkit/src/META-INF/MANIFEST.MF
View File

@ -1,3 +1,3 @@
Manifest-Version: 1.0 Manifest-Version: 1.0
Implementation-Title: SubServers.Client.Bukkit Implementation-Title: SubServers.Client.Bukkit
Specification-Title: 18w26d Specification-Title: 18w26n

6
SubServers.Client/Bukkit/src/plugin.yml
View File

@ -7,13 +7,13 @@ website: 'http://www.ME1312.net/'
commands: commands:
subservers: subservers:
description: 'The SubServers Command' description: 'The SubServers Command'
usage: /subservers help usage: 'An exception may have occurred while running this command'
subserver: subserver:
description: 'The SubServers Command' description: 'The SubServers Command'
usage: /subserver help usage: 'An exception may have occurred while running this command'
sub: sub:
description: 'The SubServers Command' description: 'The SubServers Command'
usage: /sub help usage: 'An exception may have occurred while running this command'
permissions: permissions:
subservers.*: subservers.*:
description: 'Grants Access to to Everything in SubServers.Client' description: 'Grants Access to to Everything in SubServers.Client'

BIN
SubServers.Host/src.jar
View File

Binary file not shown.

2
SubServers.Host/src/META-INF/MANIFEST.MF
View File

@ -1,4 +1,4 @@
Manifest-Version: 1.0 Manifest-Version: 1.0
Main-Class: net.ME1312.SubServers.Host.ExHost Main-Class: net.ME1312.SubServers.Host.ExHost
Implementation-Title: SubServers.Host Implementation-Title: SubServers.Host
Specification-Title: 18w26d Specification-Title: 18w26n

117
SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java
View File

@ -35,6 +35,8 @@ import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import java.util.jar.JarFile; import java.util.jar.JarFile;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** /**
* SubServers.Host Main Class * SubServers.Host Main Class
@ -253,7 +255,7 @@ public final class ExHost {
Object obj = clazz.getConstructor().newInstance(); Object obj = clazz.getConstructor().newInstance();
try { try {
SubPluginInfo plugin = new SubPluginInfo(this, obj, clazz.getAnnotation(SubPlugin.class).name(), new Version(clazz.getAnnotation(SubPlugin.class).version()), SubPluginInfo plugin = new SubPluginInfo(this, obj, clazz.getAnnotation(SubPlugin.class).name(), Version.fromString(clazz.getAnnotation(SubPlugin.class).version()),
Arrays.asList(clazz.getAnnotation(SubPlugin.class).authors()), (clazz.getAnnotation(SubPlugin.class).description().length() > 0)?clazz.getAnnotation(SubPlugin.class).description():null, Arrays.asList(clazz.getAnnotation(SubPlugin.class).authors()), (clazz.getAnnotation(SubPlugin.class).description().length() > 0)?clazz.getAnnotation(SubPlugin.class).description():null,
(clazz.getAnnotation(SubPlugin.class).website().length() > 0)?new URL(clazz.getAnnotation(SubPlugin.class).website()):null, Arrays.asList(clazz.getAnnotation(SubPlugin.class).loadBefore()), (clazz.getAnnotation(SubPlugin.class).website().length() > 0)?new URL(clazz.getAnnotation(SubPlugin.class).website()):null, Arrays.asList(clazz.getAnnotation(SubPlugin.class).loadBefore()),
Arrays.asList(clazz.getAnnotation(SubPlugin.class).dependencies()), Arrays.asList(clazz.getAnnotation(SubPlugin.class).softDependencies())); Arrays.asList(clazz.getAnnotation(SubPlugin.class).dependencies()), Arrays.asList(clazz.getAnnotation(SubPlugin.class).softDependencies()));
@ -336,7 +338,18 @@ public final class ExHost {
api.plugins.put(plugin.getName().toLowerCase(), plugin); api.plugins.put(plugin.getName().toLowerCase(), plugin);
api.plugins.put(plugin.getName().toLowerCase(), plugin); api.plugins.put(plugin.getName().toLowerCase(), plugin);
loaded.add(plugin.getName().toLowerCase()); loaded.add(plugin.getName().toLowerCase());
log.info.println("Loaded " + plugin.getName() + " v" + plugin.getVersion().toString() + " by " + plugin.getAuthors().toString().substring(1, plugin.getAuthors().toString().length() - 1)); String a = "";
int ai = 0;
for (String author : plugin.getAuthors()) {
ai++;
if (ai > 1) {
if (plugin.getAuthors().size() > 2) a += ", ";
else if (plugin.getAuthors().size() == 2) a += ' ';
if (ai == plugin.getAuthors().size()) a += "and ";
}
a += author;
}
log.info.println("Loaded " + plugin.getName() + " v" + plugin.getVersion().toString() + " by " + a);
i++; i++;
} catch (Throwable e) { } catch (Throwable e) {
plugin.setEnabled(false); plugin.setEnabled(false);
@ -446,30 +459,112 @@ public final class ExHost {
} }
private void loop() throws Exception { private void loop() throws Exception {
String umsg; String line;
ready = true; ready = true;
while (ready && (umsg = jline.readLine(">")) != null) { while (ready && (line = jline.readLine(">")) != null) {
if (!ready || umsg.equals("")) continue; if (!ready || line.replaceAll("\\s", "").length() == 0) continue;
final CommandPreProcessEvent event; final CommandPreProcessEvent event;
api.executeEvent(event = new CommandPreProcessEvent(this, umsg)); api.executeEvent(event = new CommandPreProcessEvent(this, line));
if (!event.isCancelled()) { if (!event.isCancelled()) {
final String cmd = (umsg.startsWith("/"))?((umsg.contains(" ")?umsg.split(" "):new String[]{umsg})[0].substring(1)):((umsg.contains(" ")?umsg.split(" "):new String[]{umsg})[0]); LinkedList<String> args = new LinkedList<String>();
if (api.commands.keySet().contains(cmd.toLowerCase())) { Matcher parser = Pattern.compile("(?:^|\\s+)(\"(?:\\\\\"|[^\"])+\"?|(?:\\\\\\s|[^\\s])+)").matcher(line);
ArrayList<String> args = new ArrayList<String>(); while (parser.find()) {
args.addAll(Arrays.asList(umsg.contains(" ") ? umsg.split(" ") : new String[]{umsg})); String arg = parser.group(1);
if (arg.startsWith("\"")) arg = arg.substring(1, arg.length() - ((arg.endsWith("\""))?1:0));
arg = unescapeCommand(arg);
args.add(arg);
}
String cmd = args.get(0);
args.remove(0);
if (cmd.startsWith("/")) cmd = cmd.substring(1);
if (args.size() >= 1 &&
((cmd.equalsIgnoreCase("sub") && !api.commands.keySet().contains("sub")) ||
(cmd.equalsIgnoreCase("subserver") && !api.commands.keySet().contains("subserver")) ||
(cmd.equalsIgnoreCase("subservers") && !api.commands.keySet().contains("subservers")))) {
cmd = args.get(0);
args.remove(0); args.remove(0);
}
if (api.commands.keySet().contains(cmd.toLowerCase())) {
try { try {
api.commands.get(cmd.toLowerCase()).command(cmd, args.toArray(new String[args.size()])); api.commands.get(cmd.toLowerCase()).command(cmd, args.toArray(new String[args.size()]));
} catch (Exception e) { } catch (Exception e) {
log.error.println(new InvocationTargetException(e, "Uncaught exception while running command")); log.error.println(new InvocationTargetException(e, "Uncaught exception while running command"));
} }
} else { } else {
log.message.println("Unknown Command - " + umsg); String s = cmd.replace("\\", "\\\\").replace("\n", "\\n").replace("\"", "\\\"").replace(" ", "\\ ");
for (String arg : args) {
s += ' ' + arg.replace("\\", "\\\\").replace("\n", "\\n").replace("\"", "\\\"").replace(" ", "\\ ");
}
log.message.println("Unknown Command - " + s);
} }
jline.getOutput().write("\b \b"); jline.getOutput().write("\b \b");
} }
} }
} }
/**
* Parse escapes in a command
*
* @param str String
* @return Unescaped String
*/
private String unescapeCommand(String str) {
StringBuilder sb = new StringBuilder(str.length());
for (int i = 0; i < str.length(); i++) {
char ch = str.charAt(i);
if (ch == '\\') {
char nextChar = (i == str.length() - 1) ? '\\' : str
.charAt(i + 1);
// Octal escape?
if (nextChar >= '0' && nextChar <= '7') {
String code = "" + nextChar;
i++;
if ((i < str.length() - 1) && str.charAt(i + 1) >= '0'
&& str.charAt(i + 1) <= '7') {
code += str.charAt(i + 1);
i++;
if ((i < str.length() - 1) && str.charAt(i + 1) >= '0'
&& str.charAt(i + 1) <= '7') {
code += str.charAt(i + 1);
i++;
}
}
sb.append((char) Integer.parseInt(code, 8));
continue;
}
switch (nextChar) {
case '\\':
ch = '\\';
break;
case 'n':
ch = '\n';
break;
case '\"':
ch = '\"';
break;
case ' ':
ch = ' ';
break;
// Hex Unicode: u????
case 'u':
if (i >= str.length() - 5) {
ch = 'u';
break;
}
int code = Integer.parseInt(
"" + str.charAt(i + 2) + str.charAt(i + 3)
+ str.charAt(i + 4) + str.charAt(i + 5), 16);
sb.append(Character.toChars(code));
i += 5;
continue;
}
i++;
}
sb.append(ch);
}
return sb.toString();
}
private void loadDefaults() { private void loadDefaults() {
SubCommand.load(this); SubCommand.load(this);

92
SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java
View File

@ -28,42 +28,66 @@ public class SubCommand {
new Command(null) { new Command(null) {
@Override @Override
public void command(String handle, String[] args) { public void command(String handle, String[] args) {
if (args.length == 0) { if (args.length == 0 || host.api.plugins.get(args[0].toLowerCase()) != null) {
host.log.message.println( host.log.message.println(
"These are the platforms and versions that are running SubServers.Host:", "These are the platforms and versions that are running " + ((args.length == 0)?"SubServers.Host":host.api.plugins.get(args[0].toLowerCase()).getName()) +":",
" " + System.getProperty("os.name") + ' ' + System.getProperty("os.version") + ',', " " + System.getProperty("os.name") + ' ' + System.getProperty("os.version") + ',',
" Java " + System.getProperty("java.version") + ',', " Java " + System.getProperty("java.version") + ',',
" SubServers.Host v" + host.version.toExtendedString(), " SubServers.Host v" + host.version.toExtendedString() + ((args.length == 0)?"":","));
""); if (args.length == 0) {
new Thread(() -> { host.log.message.println("");
try { new Thread(() -> {
Document updxml = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(Util.readAll(new BufferedReader(new InputStreamReader(new URL("https://src.me1312.net/maven/net/ME1312/SubServers/SubServers.Host/maven-metadata.xml").openStream(), Charset.forName("UTF-8"))))))); try {
Document updxml = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(Util.readAll(new BufferedReader(new InputStreamReader(new URL("https://src.me1312.net/maven/net/ME1312/SubServers/SubServers.Host/maven-metadata.xml").openStream(), Charset.forName("UTF-8")))))));
NodeList updnodeList = updxml.getElementsByTagName("version"); NodeList updnodeList = updxml.getElementsByTagName("version");
Version updversion = host.version; Version updversion = host.version;
int updcount = 0; int updcount = 0;
for (int i = 0; i < updnodeList.getLength(); i++) { for (int i = 0; i < updnodeList.getLength(); i++) {
Node node = updnodeList.item(i); Node node = updnodeList.item(i);
if (node.getNodeType() == Node.ELEMENT_NODE) { if (node.getNodeType() == Node.ELEMENT_NODE) {
if (!node.getTextContent().startsWith("-") && !node.getTextContent().equals(host.version.toString()) && Version.fromString(node.getTextContent()).compareTo(updversion) > 0) { if (!node.getTextContent().startsWith("-") && !node.getTextContent().equals(host.version.toString()) && Version.fromString(node.getTextContent()).compareTo(updversion) > 0) {
updversion = Version.fromString(node.getTextContent()); updversion = Version.fromString(node.getTextContent());
updcount++; updcount++;
}
} }
} }
if (updcount == 0) {
host.log.message.println("You are on the latest version.");
} else {
host.log.message.println("SubServers.Host v" + updversion + " is available. You are " + updcount + " version" + ((updcount == 1)?"":"s") + " behind.");
}
} catch (Exception e) {}
}).start();
} else {
SubPluginInfo plugin = host.api.plugins.get(args[0].toLowerCase());
String title = " " + plugin.getName() + " v" + plugin.getVersion().toExtendedString();
String subtitle = " by ";
int i = 0;
for (String author : plugin.getAuthors()) {
i++;
if (i > 1) {
if (plugin.getAuthors().size() > 2) subtitle += ", ";
else if (plugin.getAuthors().size() == 2) subtitle += ' ';
if (i == plugin.getAuthors().size()) subtitle += "and ";
} }
if (updcount == 0) { subtitle += author;
host.log.message.println("You are on the latest version.");
} else {
host.log.message.println("SubServers.Host v" + updversion + " is available. You are " + updcount + " version" + ((updcount == 1)?"":"s") + " behind.");
}
} catch (Exception e) {
} }
}).start(); if (plugin.getWebsite() != null) {
} else if (host.api.plugins.get(args[0].toLowerCase()) != null) { if (title.length() > subtitle.length() + 5 + plugin.getWebsite().toString().length()) {
SubPluginInfo plugin = host.api.plugins.get(args[0].toLowerCase()); i = subtitle.length();
host.log.message.println(plugin.getName() + " v" + plugin.getVersion() + " by " + plugin.getAuthors().toString().substring(1, plugin.getAuthors().toString().length() - 1)); while (i < title.length() - plugin.getWebsite().toString().length() - 2) {
if (plugin.getWebsite() != null) host.log.message.println(plugin.getWebsite().toString()); i++;
if (plugin.getDescription() != null) host.log.message.println("", plugin.getDescription()); subtitle += ' ';
}
} else {
subtitle += " - ";
}
subtitle += plugin.getWebsite().toString();
}
host.log.message.println(title, subtitle);
if (plugin.getDescription() != null) host.log.message.println("", plugin.getDescription());
}
} else { } else {
host.log.message.println("There is no plugin with that name"); host.log.message.println("There is no plugin with that name");
} }
@ -202,7 +226,7 @@ public class SubCommand {
} }
})); }));
} else { } else {
host.log.message.println("Usage: " + handle + " <SubServer>"); host.log.message.println("Usage: /" + handle + " <SubServer>");
} }
} }
}.usage("<SubServer>").description("Gets information about a SubServer").help( }.usage("<SubServer>").description("Gets information about a SubServer").help(
@ -251,7 +275,7 @@ public class SubCommand {
} }
})); }));
} else { } else {
host.log.message.println("Usage: " + handle + " <SubServer>"); host.log.message.println("Usage: /" + handle + " <SubServer>");
} }
} }
}.usage("<SubServer>").description("Starts a SubServer").help( }.usage("<SubServer>").description("Starts a SubServer").help(
@ -290,7 +314,7 @@ public class SubCommand {
} }
})); }));
} else { } else {
host.log.message.println("Usage: " + handle + " <SubServer>"); host.log.message.println("Usage: /" + handle + " <SubServer>");
} }
} }
}.usage("<SubServer>").description("Stops a SubServer").help( }.usage("<SubServer>").description("Stops a SubServer").help(
@ -330,7 +354,7 @@ public class SubCommand {
} }
})); }));
} else { } else {
host.log.message.println("Usage: " + handle + " <SubServer>"); host.log.message.println("Usage: /" + handle + " <SubServer>");
} }
} }
}.usage("<SubServer>").description("Terminates a SubServer").help( }.usage("<SubServer>").description("Terminates a SubServer").help(
@ -379,7 +403,7 @@ public class SubCommand {
} }
})); }));
} else { } else {
host.log.message.println("Usage: " + handle + " <SubServer> <Command> [Args...]"); host.log.message.println("Usage: /" + handle + " <SubServer> <Command> [Args...]");
} }
} }
}.usage("<SubServer>", "<Command>", "[Args...]").description("Sends a Command to a SubServer").help( }.usage("<SubServer>", "<Command>", "[Args...]").description("Sends a Command to a SubServer").help(
@ -431,7 +455,7 @@ public class SubCommand {
})); }));
} }
} else { } else {
host.log.message.println("Usage: " + handle + " <Name> <Host> <Template> <Version> <Port>"); host.log.message.println("Usage: /" + handle + " <Name> <Host> <Template> <Version> <Port>");
} }
} }
}.usage("<Name>", "<Host>", "<Template>", "<Version>", "<Port>").description("Creates a SubServer").help( }.usage("<Name>", "<Host>", "<Template>", "<Version>", "<Port>").description("Creates a SubServer").help(

BIN
SubServers.Sync/src.jar
View File

Binary file not shown.

2
SubServers.Sync/src/META-INF/MANIFEST.MF
View File

@ -2,4 +2,4 @@ Manifest-Version: 1.0
Class-Path: BungeeCord.jar Waterfall.jar Class-Path: BungeeCord.jar Waterfall.jar
Main-Class: net.ME1312.SubServers.Sync.Launch Main-Class: net.ME1312.SubServers.Sync.Launch
Implementation-Title: SubServers.Sync Implementation-Title: SubServers.Sync
Specification-Title: 18w26d Specification-Title: 18w26n