Azimkin/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Bleeding] Fixed naughty plugins crashing server.

Browse Source
This commit is contained in:
Wesley Wolfe 2012-03-01 09:19:23 -06:00 committed by EvilSeph
parent 3c93c1643d
commit b61d208c3c
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
View File

@ -197,7 +197,7 @@ public final class PluginDescriptionFile {
throw new InvalidDescriptionException(ex, "main is of wrong type"); throw new InvalidDescriptionException(ex, "main is of wrong type");
} }
if (map.containsKey("commands")) { if (map.get("commands") != null) {
ImmutableMap.Builder<String, Map<String, Object>> commandsBuilder = ImmutableMap.<String, Map<String, Object>>builder(); ImmutableMap.Builder<String, Map<String, Object>> commandsBuilder = ImmutableMap.<String, Map<String, Object>>builder();
try { try {
for (Map.Entry<?, ?> command : ((Map<?, ?>) map.get("commands")).entrySet()) { for (Map.Entry<?, ?> command : ((Map<?, ?>) map.get("commands")).entrySet()) {
@ -210,7 +210,7 @@ public final class PluginDescriptionFile {
commandSubList.add(commandSubListItem); commandSubList.add(commandSubListItem);
} }
commandBuilder.put(commandEntry.getKey().toString(), commandSubList.build()); commandBuilder.put(commandEntry.getKey().toString(), commandSubList.build());
} else { } else if (commandEntry.getValue() != null) {
commandBuilder.put(commandEntry.getKey().toString(), commandEntry.getValue()); commandBuilder.put(commandEntry.getKey().toString(), commandEntry.getValue());
} }
} }
@ -218,15 +218,17 @@ public final class PluginDescriptionFile {
} }
} catch (ClassCastException ex) { } catch (ClassCastException ex) {
throw new InvalidDescriptionException(ex, "commands are of wrong type"); throw new InvalidDescriptionException(ex, "commands are of wrong type");
} catch (NullPointerException ex) {
throw new InvalidDescriptionException(ex, "commands are not properly defined");
} }
commands = commandsBuilder.build(); commands = commandsBuilder.build();
} }
if (map.containsKey("class-loader-of")) { if (map.get("class-loader-of") != null) {
classLoaderOf = map.get("class-loader-of").toString(); classLoaderOf = map.get("class-loader-of").toString();
} }
if (map.containsKey("depend")) { if (map.get("depend") != null) {
ImmutableList.Builder<String> dependBuilder = ImmutableList.<String>builder(); ImmutableList.Builder<String> dependBuilder = ImmutableList.<String>builder();
try { try {
for (Object dependency : (Iterable<?>) map.get("depend")) { for (Object dependency : (Iterable<?>) map.get("depend")) {
@ -234,11 +236,13 @@ public final class PluginDescriptionFile {
} }
} catch (ClassCastException ex) { } catch (ClassCastException ex) {
throw new InvalidDescriptionException(ex, "depend is of wrong type"); throw new InvalidDescriptionException(ex, "depend is of wrong type");
} catch (NullPointerException e) {
throw new InvalidDescriptionException(e, "invalid dependency format");
} }
depend = dependBuilder.build(); depend = dependBuilder.build();
} }
if (map.containsKey("softdepend")) { if (map.get("softdepend") != null) {
ImmutableList.Builder<String> softDependBuilder = ImmutableList.<String>builder(); ImmutableList.Builder<String> softDependBuilder = ImmutableList.<String>builder();
try { try {
for (Object dependency : (Iterable<?>) map.get("softdepend")) { for (Object dependency : (Iterable<?>) map.get("softdepend")) {
@ -246,11 +250,13 @@ public final class PluginDescriptionFile {
} }
} catch (ClassCastException ex) { } catch (ClassCastException ex) {
throw new InvalidDescriptionException(ex, "softdepend is of wrong type"); throw new InvalidDescriptionException(ex, "softdepend is of wrong type");
} catch (NullPointerException ex) {
throw new InvalidDescriptionException(ex, "invalid soft-dependency format");
} }
softDepend = softDependBuilder.build(); softDepend = softDependBuilder.build();
} }
if (map.containsKey("database")) { if (map.get("database") != null) {
try { try {
database = (Boolean) map.get("database"); database = (Boolean) map.get("database");
} catch (ClassCastException ex) { } catch (ClassCastException ex) {
@ -258,15 +264,15 @@ public final class PluginDescriptionFile {
} }
} }
if (map.containsKey("website")) { if (map.get("website") != null) {
website = map.get("website").toString(); website = map.get("website").toString();
} }
if (map.containsKey("description")) { if (map.get("description") != null) {
description = map.get("description").toString(); description = map.get("description").toString();
} }
if (map.containsKey("load")) { if (map.get("load") != null) {
try { try {
order = PluginLoadOrder.valueOf(((String) map.get("load")).toUpperCase().replaceAll("\\W", "")); order = PluginLoadOrder.valueOf(((String) map.get("load")).toUpperCase().replaceAll("\\W", ""));
} catch (ClassCastException ex) { } catch (ClassCastException ex) {
@ -276,9 +282,9 @@ public final class PluginDescriptionFile {
} }
} }
if (map.containsKey("authors")) { if (map.get("authors") != null) {
ImmutableList.Builder<String> authorsBuilder = ImmutableList.<String>builder(); ImmutableList.Builder<String> authorsBuilder = ImmutableList.<String>builder();
if (map.containsKey("author")) { if (map.get("author") != null) {
authorsBuilder.add(map.get("author").toString()); authorsBuilder.add(map.get("author").toString());
} }
try { try {
@ -287,15 +293,17 @@ public final class PluginDescriptionFile {
} }
} catch (ClassCastException ex) { } catch (ClassCastException ex) {
throw new InvalidDescriptionException(ex, "authors are of wrong type"); throw new InvalidDescriptionException(ex, "authors are of wrong type");
} catch (NullPointerException ex) {
throw new InvalidDescriptionException(ex, "authors are improperly defined");
} }
authors = authorsBuilder.build(); authors = authorsBuilder.build();
} else if (map.containsKey("author")) { } else if (map.get("author") != null) {
authors = ImmutableList.of(map.get("author").toString()); authors = ImmutableList.of(map.get("author").toString());
} else { } else {
authors = ImmutableList.<String>of(); authors = ImmutableList.<String>of();
} }
if (map.containsKey("default-permission")) { if (map.get("default-permission") != null) {
try { try {
defaultPerm = PermissionDefault.getByName(map.get("default-permission").toString()); defaultPerm = PermissionDefault.getByName(map.get("default-permission").toString());
} catch (ClassCastException ex) { } catch (ClassCastException ex) {
@ -305,18 +313,21 @@ public final class PluginDescriptionFile {
} }
} }
if (map.containsKey("permissions")) { if (map.get("permissions") != null) {
try { try {
Map<?, ?> perms = (Map<?, ?>) map.get("permissions"); Map<?, ?> perms = (Map<?, ?>) map.get("permissions");
permissions = ImmutableList.copyOf(Permission.loadPermissions(perms, "Permission node '%s' in plugin description file for " + getFullName() + " is invalid", defaultPerm)); permissions = ImmutableList.copyOf(Permission.loadPermissions(perms, "Permission node '%s' in plugin description file for " + getFullName() + " is invalid", defaultPerm));
} catch (ClassCastException ex) { } catch (ClassCastException ex) {
throw new InvalidDescriptionException(ex, "permissions are of wrong type"); throw new InvalidDescriptionException(ex, "permissions are of wrong type");
} catch (NullPointerException ex) {
throw new InvalidDescriptionException(ex, "permissions are not properly defined");
} }
} else { } else {
permissions = ImmutableList.<Permission>of(); permissions = ImmutableList.<Permission>of();
} }
if (map.containsKey("prefix")) {
if (map.get("prefix") != null) {
prefix = map.get("prefix").toString(); prefix = map.get("prefix").toString();
} }
} }