From 6f137ca1aae54ce2b7b24e9e0c2e8ea5ecedcf36 Mon Sep 17 00:00:00 2001 From: Lime <59763878+code-lime@users.noreply.github.com> Date: Fri, 13 Mar 2026 03:03:18 +0300 Subject: [PATCH] Add support for gametag in `OPS`, `MEMBERS` and `VISITORS` (#610) --- README.md | 7 ++++++- bedrock-entry.sh | 34 +++++++++++++++++++++++++++++----- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 417ea4c..89f044e 100644 --- a/README.md +++ b/README.md @@ -172,10 +172,15 @@ in the "LAN Games" part of the "Friends" tab, such as: ## Permissions -The Bedrock Dedicated Server requires permissions be defined with XUIDs. There are various tools to look these up online, such as [MCProfile](https://mcprofile.io/). A player's XUID is also printed to the log when a player joins. +The Bedrock Dedicated Server requires permissions be defined with XUIDs or Xbox GamerTag. Each of `OPS`, `MEMBERS`, and `VISITORS` accepts a comma-separated list of identifiers. For each entry you can use: + +- **XUID** — a 16+ digit number (e.g. `2535453759792258`). You can look these up with tools like [MCProfile](https://mcprofile.io/); the XUID is also printed in the server log when a player joins. +- **Xbox gamertag** — if the value is not a long numeric XUID, it is treated as a gamertag and resolved to an XUID at startup via the [MCProfile API](https://mcprofile.io/api/v1/bedrock/gamertag). This allows using names instead of numbers. There are 3 levels of permissions and 3 options to configure each group: +You can mix XUIDs and gamertags in the same list. The API base URL used for resolving gamertags can be overridden with `RESOLVE_XUID_API_URL` (default: `https://mcprofile.io/api/v1/bedrock/gamertag`). + - `OPS` is used to define operators on the server. ```shell -e OPS="1234567890,0987654321" diff --git a/bedrock-entry.sh b/bedrock-entry.sh index 56a211b..f512588 100755 --- a/bedrock-entry.sh +++ b/bedrock-entry.sh @@ -6,6 +6,7 @@ set -eo pipefail : "${PREVIEW:=false}" : "${DOWNLOAD_LINKS_URL:=https://net.web.minecraft-services.net/api/v1.0/download/links}" : "${DOWNLOAD_SECONDARY_LINKS_URL:=https://net-secondary.web.minecraft-services.net/api/v1.0/download/links}" +: "${RESOLVE_XUID_API_URL:=https://mcprofile.io/api/v1/bedrock/gamertag}" : "${USE_BOX64:=true}" : "${DEBUG_CURL:=false}" : "${FORCE_PACK_COPY:=false}" @@ -28,6 +29,29 @@ function logError() { echo "ERROR $msg" >&2 } +function resolveXuid() { + local value="${1?}" + + if [[ $value =~ ^[0-9]+$ ]] && ((10#$value >= 10**15)); then + echo "$value" + return + fi + + local encoded=$(jq -sRr @uri <<< "$value") + local xuid=$(curl "${debugCurlArgs[@]}" -fsSL -A "itzg/minecraft-bedrock-server" "$RESOLVE_XUID_API_URL/$encoded" 2>/dev/null | jq -r '.xuid // empty') + + echo "${xuid:-$value}" +} + +function resolvePermissionXuids() { + local list="$1" perm="$2" + IFS=',' read -ra a <<< "$list" + + for v in "${a[@]}"; do + resolveXuid "$v" | jq -R --arg p "$perm" '{permission:$p,xuid:.}' + done +} + function replaceVersionInUrl() { local original_url="${1?}" local new_version="${2?}" @@ -324,11 +348,11 @@ fi if [[ -n "$OPS" || -n "$MEMBERS" || -n "$VISITORS" ]]; then echo "Updating permissions" - jq -n --arg ops "$OPS" --arg members "$MEMBERS" --arg visitors "$VISITORS" '[ - [$ops | split(",") | map({permission: "operator", xuid:.})], - [$members | split(",") | map({permission: "member", xuid:.})], - [$visitors | split(",") | map({permission: "visitor", xuid:.})] - ]| flatten' > permissions.json + { + resolvePermissionXuids "$OPS" operator + resolvePermissionXuids "$MEMBERS" member + resolvePermissionXuids "$VISITORS" visitor + } | jq -s '.' > permissions.json fi if [[ -n "$ALLOW_LIST_USERS" || -n "$WHITE_LIST_USERS" ]]; then