Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-09-14 23:07:46 +02:00
Code Issues Projects Releases Wiki Activity

Fix not clearing user's permissions, and issue with unsetting permissions

Browse Source
This commit is contained in:
Luck 2016-08-29 12:53:05 +01:00
parent f5995c0afa
commit d5bc1cdf5d
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
5 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/me/lucko/luckperms/core/PermissionHolder.java
View File

@ -423,7 +423,7 @@ public abstract class PermissionHolder {
* @throws ObjectLacksException if the holder doesn't have this node already
*/
public void unsetPermission(Node node) throws ObjectLacksException {
if (hasPermission(node, false) == Tristate.FALSE) {
if (hasPermission(node, false) != Tristate.TRUE) {
throw new ObjectLacksException();
}

7
common/src/main/java/me/lucko/luckperms/storage/methods/FlatfileDatastore.java
View File

@ -228,6 +228,13 @@ public class FlatfileDatastore extends Datastore {
@Override
public boolean saveUser(User user) {
File userFile = new File(usersDir, user.getUuid().toString() + ".json");
if (!plugin.getUserManager().shouldSave(user)) {
if (userFile.exists()) {
userFile.delete();
}
return true;
}
if (!userFile.exists()) {
try {
userFile.createNewFile();

6
common/src/main/java/me/lucko/luckperms/storage/methods/MongoDBDatastore.java
View File

@ -169,7 +169,11 @@ public class MongoDBDatastore extends Datastore {
@Override
public boolean saveUser(User user) {
if (!plugin.getUserManager().shouldSave(user)) {
return true;
boolean success = call(() -> {
MongoCollection<Document> c = database.getCollection("users");
return c.deleteOne(new Document("_id", user.getUuid())).wasAcknowledged();
}, false);
return success;
}
boolean success = call(() -> {

13
common/src/main/java/me/lucko/luckperms/storage/methods/SQLDatastore.java
View File

@ -55,7 +55,8 @@ abstract class SQLDatastore extends Datastore {
private static final String USER_SELECT = "SELECT * FROM lp_users WHERE uuid=?";
private static final String USER_SELECT_ALL = "SELECT uuid FROM lp_users";
private static final String USER_UPDATE = "UPDATE lp_users SET name=?, primary_group = ?, perms=? WHERE uuid=?";
private static final String USER_DELETE = "DELETE FROM lp_users WHERE perms=?";
private static final String USER_DELETE = "DELETE FROM lp_users WHERE uuid=?";
private static final String USER_DELETE_ALL = "DELETE FROM lp_users WHERE perms=?";
private static final String GROUP_INSERT = "INSERT INTO lp_groups VALUES(?, ?)";
private static final String GROUP_SELECT = "SELECT perms FROM lp_groups WHERE name=?";
@ -189,7 +190,13 @@ abstract class SQLDatastore extends Datastore {
@Override
public boolean saveUser(User user) {
if (!plugin.getUserManager().shouldSave(user)) {
return true;
boolean success = runQuery(new QueryPS(USER_DELETE) {
@Override
void onRun(PreparedStatement preparedStatement) throws SQLException {
preparedStatement.setString(1, user.getUuid().toString());
}
});
return success;
}
boolean success = runQuery(new QueryRS(USER_SELECT) {
@ -234,7 +241,7 @@ abstract class SQLDatastore extends Datastore {
@Override
public boolean cleanupUsers() {
boolean success = runQuery(new QueryPS(USER_DELETE) {
boolean success = runQuery(new QueryPS(USER_DELETE_ALL) {
@Override
void onRun(PreparedStatement preparedStatement) throws SQLException {
preparedStatement.setString(1, "{\"group.default\":true}");

10
common/src/main/java/me/lucko/luckperms/users/UserManager.java
View File

@ -61,10 +61,12 @@ public abstract class UserManager extends AbstractManager<UUID, User> {
@Override
public void copy(User from, User to) {
to.setNodes(from.getNodes());
to.setPrimaryGroup(from.getPrimaryGroup());
giveDefaultIfNeeded(to, true);
to.refreshPermissions();
if (from.getPrimaryGroup() != null) {
// This isn't just a black user. we shouldn't override in that case.
to.setNodes(from.getNodes());
to.setPrimaryGroup(from.getPrimaryGroup());
to.refreshPermissions();
}
}
/**