Prevent adding inheritances to globalgroups. These are permissions

collections, not player groups.
This commit is contained in:
ElgarL 2012-02-25 09:22:54 +00:00
parent 9c68cbae72
commit fa49fc91d2
3 changed files with 56 additions and 30 deletions

View file

@ -144,3 +144,4 @@ v 1.9:
- A command of '/manload' with no world arguments now performs a full reload of GM. - A command of '/manload' with no world arguments now performs a full reload of GM.
- Update for Bukkit R5 compatability. - Update for Bukkit R5 compatability.
- Removed BukkitPermsOverride as this is now the default with bukkit handling child nodes. - Removed BukkitPermsOverride as this is now the default with bukkit handling child nodes.
- Prevent adding inheritances to globalgroups. These are permissions collections, not player groups.

View file

@ -1019,6 +1019,11 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Group 2 does not exists!"); sender.sendMessage(ChatColor.RED + "Group 2 does not exists!");
return false; return false;
} }
if (auxGroup.isGlobal()) {
sender.sendMessage(ChatColor.RED + "GlobalGroups do NOT support inheritance.");
return false;
}
// VALIDANDO PERMISSAO // VALIDANDO PERMISSAO
if (permissionHandler.searchGroupInInheritance(auxGroup, auxGroup2.getName(), null)) { if (permissionHandler.searchGroupInInheritance(auxGroup, auxGroup2.getName(), null)) {
sender.sendMessage(ChatColor.RED + "Group " + auxGroup.getName() + " already inherits " + auxGroup2.getName() + " (might not be directly)"); sender.sendMessage(ChatColor.RED + "Group " + auxGroup.getName() + " already inherits " + auxGroup2.getName() + " (might not be directly)");
@ -1052,6 +1057,11 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Group 2 does not exists!"); sender.sendMessage(ChatColor.RED + "Group 2 does not exists!");
return false; return false;
} }
if (auxGroup.isGlobal()) {
sender.sendMessage(ChatColor.RED + "GlobalGroups do NOT support inheritance.");
return false;
}
// VALIDANDO PERMISSAO // VALIDANDO PERMISSAO
if (!permissionHandler.searchGroupInInheritance(auxGroup, auxGroup2.getName(), null)) { if (!permissionHandler.searchGroupInInheritance(auxGroup, auxGroup2.getName(), null)) {
sender.sendMessage(ChatColor.RED + "Group " + auxGroup.getName() + " does not inherits " + auxGroup2.getName() + "."); sender.sendMessage(ChatColor.RED + "Group " + auxGroup.getName() + " does not inherits " + auxGroup2.getName() + ".");

View file

@ -49,6 +49,15 @@ public class Group extends DataUnit implements Cloneable {
super(name); super(name);
} }
/**
* Is this a GlobalGroup
*
* @return
*/
public boolean isGlobal() {
return (getDataSource() == null);
}
/** /**
* Clone this group * Clone this group
* @return a clone of this group * @return a clone of this group
@ -57,7 +66,7 @@ public class Group extends DataUnit implements Cloneable {
public Group clone() { public Group clone() {
Group clone; Group clone;
if (getDataSource() == null) { if (isGlobal()) {
clone = new Group(this.getName()); clone = new Group(this.getName());
} else { } else {
clone = new Group(getDataSource(), this.getName()); clone = new Group(getDataSource(), this.getName());
@ -85,7 +94,7 @@ public class Group extends DataUnit implements Cloneable {
Group clone = dataSource.createGroup(this.getName()); Group clone = dataSource.createGroup(this.getName());
// Don't add inheritance for GlobalGroups // Don't add inheritance for GlobalGroups
if (getDataSource() != null) { if (!isGlobal()) {
clone.inherits = new ArrayList<String>(this.getInherits()); clone.inherits = new ArrayList<String>(this.getInherits());
} }
for (String perm : this.getPermissionList()) { for (String perm : this.getPermissionList()) {
@ -110,6 +119,7 @@ public class Group extends DataUnit implements Cloneable {
* @param inherit the inherits to set * @param inherit the inherits to set
*/ */
public void addInherits(Group inherit) { public void addInherits(Group inherit) {
if (!isGlobal()) {
if (!this.getDataSource().groupExists(inherit.getName())) { if (!this.getDataSource().groupExists(inherit.getName())) {
getDataSource().addGroup(inherit); getDataSource().addGroup(inherit);
} }
@ -122,14 +132,17 @@ public class Group extends DataUnit implements Cloneable {
GroupManagerEventHandler.callEvent(this, Action.GROUP_INHERITANCE_CHANGED); GroupManagerEventHandler.callEvent(this, Action.GROUP_INHERITANCE_CHANGED);
} }
} }
}
public boolean removeInherits(String inherit) { public boolean removeInherits(String inherit) {
if (!isGlobal()) {
if (this.inherits.contains(inherit.toLowerCase())) { if (this.inherits.contains(inherit.toLowerCase())) {
this.inherits.remove(inherit.toLowerCase()); this.inherits.remove(inherit.toLowerCase());
flagAsChanged(); flagAsChanged();
GroupManagerEventHandler.callEvent(this, Action.GROUP_INHERITANCE_CHANGED); GroupManagerEventHandler.callEvent(this, Action.GROUP_INHERITANCE_CHANGED);
return true; return true;
} }
}
return false; return false;
} }
@ -145,6 +158,7 @@ public class Group extends DataUnit implements Cloneable {
* @param varList * @param varList
*/ */
public void setVariables(Map<String, Object> varList) { public void setVariables(Map<String, Object> varList) {
if (!isGlobal()) {
GroupVariables temp = new GroupVariables(this, varList); GroupVariables temp = new GroupVariables(this, varList);
variables.clearVars(); variables.clearVars();
for (String key : temp.getVarKeyList()) { for (String key : temp.getVarKeyList()) {
@ -156,4 +170,5 @@ public class Group extends DataUnit implements Cloneable {
GroupManagerEventHandler.callEvent(this, Action.GROUP_INFO_CHANGED); GroupManagerEventHandler.callEvent(this, Action.GROUP_INFO_CHANGED);
} }
} }
}
} }