From 5fbb80f16a70698a7611c7e4ed5036fb4fbf96f6 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Wed, 9 Dec 2020 10:38:22 +0000
Subject: [PATCH] Ensure meta keys are always lowercase, and fix 'similar'
 comparison case sensitivity (#2760)

---
 .../common/bulkupdate/comparison/StandardComparison.java  | 3 +--
 .../me/lucko/luckperms/common/node/types/Inheritance.java | 8 +++-----
 .../java/me/lucko/luckperms/common/node/types/Meta.java   | 6 ++----
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparison/StandardComparison.java b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparison/StandardComparison.java
index f634caab0..3152515e1 100644
--- a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparison/StandardComparison.java
+++ b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparison/StandardComparison.java
@@ -100,14 +100,13 @@ public enum StandardComparison implements Comparison {
     }
 
     static Pattern compilePatternForLikeSyntax(String expression) {
-        expression = expression.toLowerCase();
         expression = expression.replace(".", "\\.");
 
         // convert from SQL LIKE syntax to regex
         expression = expression.replace(WILDCARD_ONE, ".");
         expression = expression.replace(WILDCARD, ".*");
 
-        return Pattern.compile(expression);
+        return Pattern.compile(expression, Pattern.CASE_INSENSITIVE);
     }
 
 }
diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/Inheritance.java b/common/src/main/java/me/lucko/luckperms/common/node/types/Inheritance.java
index df6aacd70..6bf1c09ce 100644
--- a/common/src/main/java/me/lucko/luckperms/common/node/types/Inheritance.java
+++ b/common/src/main/java/me/lucko/luckperms/common/node/types/Inheritance.java
@@ -27,12 +27,10 @@ package me.lucko.luckperms.common.node.types;
 
 import me.lucko.luckperms.common.node.AbstractNode;
 import me.lucko.luckperms.common.node.AbstractNodeBuilder;
-
 import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.model.group.Group;
 import net.luckperms.api.node.metadata.NodeMetadataKey;
 import net.luckperms.api.node.types.InheritanceNode;
-
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -44,7 +42,7 @@ public class Inheritance extends AbstractNode<InheritanceNode, InheritanceNode.B
     private static final String NODE_MARKER = NODE_KEY + ".";
 
     public static String key(String groupName) {
-        return NODE_MARKER + groupName;
+        return NODE_MARKER + groupName.toLowerCase();
     }
 
     public static Builder builder() {
@@ -59,7 +57,7 @@ public class Inheritance extends AbstractNode<InheritanceNode, InheritanceNode.B
 
     public Inheritance(String groupName, boolean value, long expireAt, ImmutableContextSet contexts, Map<NodeMetadataKey<?>, Object> metadata) {
         super(key(groupName), value, expireAt, contexts, metadata);
-        this.groupName = groupName;
+        this.groupName = groupName.toLowerCase();
     }
 
     @Override
@@ -96,7 +94,7 @@ public class Inheritance extends AbstractNode<InheritanceNode, InheritanceNode.B
 
         @Override
         public @NonNull Builder group(@NonNull String group) {
-            this.groupName = Objects.requireNonNull(group, "group").toLowerCase();
+            this.groupName = Objects.requireNonNull(group, "group");
             return this;
         }
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/Meta.java b/common/src/main/java/me/lucko/luckperms/common/node/types/Meta.java
index 1d7c6264c..cfebd298b 100644
--- a/common/src/main/java/me/lucko/luckperms/common/node/types/Meta.java
+++ b/common/src/main/java/me/lucko/luckperms/common/node/types/Meta.java
@@ -28,11 +28,9 @@ package me.lucko.luckperms.common.node.types;
 import me.lucko.luckperms.common.node.AbstractNode;
 import me.lucko.luckperms.common.node.AbstractNodeBuilder;
 import me.lucko.luckperms.common.node.factory.Delimiters;
-
 import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.node.metadata.NodeMetadataKey;
 import net.luckperms.api.node.types.MetaNode;
-
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -45,7 +43,7 @@ public class Meta extends AbstractNode<MetaNode, MetaNode.Builder> implements Me
     private static final String NODE_MARKER = NODE_KEY + ".";
 
     public static String key(String key, String value) {
-        return NODE_MARKER + Delimiters.escapeCharacters(key) + AbstractNode.NODE_SEPARATOR + Delimiters.escapeCharacters(value);
+        return NODE_MARKER + Delimiters.escapeCharacters(key).toLowerCase() + AbstractNode.NODE_SEPARATOR + Delimiters.escapeCharacters(value);
     }
 
     public static Builder builder() {
@@ -61,7 +59,7 @@ public class Meta extends AbstractNode<MetaNode, MetaNode.Builder> implements Me
 
     public Meta(String metaKey, String metaValue, boolean value, long expireAt, ImmutableContextSet contexts, Map<NodeMetadataKey<?>, Object> metadata) {
         super(key(metaKey, metaValue), value, expireAt, contexts, metadata);
-        this.metaKey = metaKey;
+        this.metaKey = metaKey.toLowerCase();
         this.metaValue = metaValue;
     }