TheCreeperCow / CraftBukkit / 911bde181f1

Commits

md_5 authored 911bde181f1 17 Apr 2022

SPIGOT-6972: Root command nodes can leak to client

src/main/java/com/mojang/brigadier/tree/CommandNode.java

Modified

-+
+// Copyright (c) Microsoft Corporation. All rights reserved.
-+
+// Licensed under the MIT license.
-+
-4
+package com.mojang.brigadier.tree;
-5
-6
+// CHECKSTYLE:OFF
--
+import com.google.common.collect.ComparisonChain;
--
+import com.google.common.collect.Maps;
--
+import com.google.common.collect.Sets;
-7
+import com.mojang.brigadier.AmbiguityConsumer;
-8
+import com.mojang.brigadier.Command;
-9
+import com.mojang.brigadier.RedirectModifier;
-10
+import com.mojang.brigadier.StringReader;
-11
+import com.mojang.brigadier.builder.ArgumentBuilder;
-12
+import com.mojang.brigadier.context.CommandContext;
-13
+import com.mojang.brigadier.context.CommandContextBuilder;
-14
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
-15
+import com.mojang.brigadier.suggestion.Suggestions;
-16
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-17
-18
+import java.util.Collection;
-19
+import java.util.Collections;
-+
+import java.util.HashSet;
-21
+import java.util.LinkedHashMap;
-22
+import java.util.Map;
-23
+import java.util.Set;
-24
+import java.util.concurrent.CompletableFuture;
-25
+import java.util.function.Predicate;
--
+import java.util.stream.Collectors;
-26
-27
+import net.minecraft.commands.CommandListenerWrapper; // CraftBukkit
-28
-29
+public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
--
+    private Map<String, CommandNode<S>> children = Maps.newLinkedHashMap();
--
+    private Map<String, LiteralCommandNode<S>> literals = Maps.newLinkedHashMap();
--
+    private Map<String, ArgumentCommandNode<S, ?>> arguments = Maps.newLinkedHashMap();
-+
+    private final Map<String, CommandNode<S>> children = new LinkedHashMap<>();
-+
+    private final Map<String, LiteralCommandNode<S>> literals = new LinkedHashMap<>();
-+
+    private final Map<String, ArgumentCommandNode<S, ?>> arguments = new LinkedHashMap<>();
-33
+    private final Predicate<S> requirement;
-34
+    private final CommandNode<S> redirect;
-35
+    private final RedirectModifier<S> modifier;
-36
+    private final boolean forks;
-37
+    private Command<S> command;
-38
+    // CraftBukkit start
-39
+    public void removeCommand(String name) {
-40
+        children.remove(name);
-41
+        literals.remove(name);
-42
+        arguments.remove(name);
-100
+                child.addChild(grandchild);
-101
+            }
-102
+        } else {
-103
+            children.put(node.getName(), node);
-104
+            if (node instanceof LiteralCommandNode) {
-105
+                literals.put(node.getName(), (LiteralCommandNode<S>) node);
-106
+            } else if (node instanceof ArgumentCommandNode) {
-107
+                arguments.put(node.getName(), (ArgumentCommandNode<S, ?>) node);
-108
+            }
-109
+        }
--
--
+        children = children.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
-110
+    }
-111
-112
+    public void findAmbiguities(final AmbiguityConsumer<S> consumer) {
--
+        Set<String> matches = Sets.newHashSet();
-+
+        Set<String> matches = new HashSet<>();
-114
-115
+        for (final CommandNode<S> child : children.values()) {
-116
+            for (final CommandNode<S> sibling : children.values()) {
-117
+                if (child == sibling) {
-118
+                    continue;
-119
+                }
-120
-121
+                for (final String input : child.getExamples()) {
-122
+                    if (sibling.isValidInput(input)) {
-123
+                        matches.add(input);
-124
+                    }
-125
+                }
-126
-127
+                if (matches.size() > 0) {
-128
+                    consumer.ambiguous(this, child, sibling, matches);
--
+                    matches = Sets.newHashSet();
-+
+                    matches = new HashSet<>();
-130
+                }
-131
+            }
-132
-133
+            child.findAmbiguities(consumer);
-134
+        }
-135
+    }
-136
-137
+    protected abstract boolean isValidInput(final String input);
-138
-139
+    @Override
-184
+            } else {
-185
+                return arguments.values();
-186
+            }
-187
+        } else {
-188
+            return arguments.values();
-189
+        }
-190
+    }
-191
-192
+    @Override
-193
+    public int compareTo(final CommandNode<S> o) {
--
+        return ComparisonChain
--
+            .start()
--
+            .compareTrueFirst(this instanceof LiteralCommandNode, o instanceof LiteralCommandNode)
--
+            .compare(getSortedKey(), o.getSortedKey())
--
+            .result();
-+
+        if (this instanceof LiteralCommandNode == o instanceof LiteralCommandNode) {
-+
+            return getSortedKey().compareTo(o.getSortedKey());
-+
+        }
-+
-+
+        return (o instanceof LiteralCommandNode) ? 1 : -1;
-199
+    }
-200
-201
+    public boolean isFork() {
-202
+        return forks;
-203
+    }
-204
-205
+    public abstract Collection<String> getExamples();
-206
+}

CraftBukkit

Commits

Jira Issues

Add shortcut