@@ -0,0 +1,9 @@
|
||||
#
|
||||
# https://help.github.com/articles/dealing-with-line-endings/
|
||||
#
|
||||
# Linux start script should use lf
|
||||
/gradlew text eol=lf
|
||||
|
||||
# These are Windows script files and should use crlf
|
||||
*.bat text eol=crlf
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
# Automatically build the project and run any configured tests for every push
|
||||
# and submitted pull request. This can help catch issues that only occur on
|
||||
# certain platforms or Java versions, and provides a first line of defence
|
||||
# against bad commits.
|
||||
|
||||
name: build
|
||||
on: [pull_request, push]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: checkout repository
|
||||
uses: actions/checkout@v6
|
||||
- name: validate gradle wrapper
|
||||
uses: gradle/actions/wrapper-validation@v6
|
||||
- name: setup jdk
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
java-version: '25'
|
||||
distribution: 'microsoft'
|
||||
- name: make gradle wrapper executable
|
||||
run: chmod +x ./gradlew
|
||||
- name: build
|
||||
run: ./gradlew build
|
||||
- name: capture build artifacts
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: Artifacts
|
||||
path: build/libs/
|
||||
+42
@@ -0,0 +1,42 @@
|
||||
# gradle
|
||||
|
||||
.gradle/
|
||||
build/
|
||||
out/
|
||||
classes/
|
||||
|
||||
# eclipse
|
||||
|
||||
*.launch
|
||||
|
||||
# idea
|
||||
|
||||
.idea/
|
||||
*.iml
|
||||
*.ipr
|
||||
*.iws
|
||||
|
||||
# vscode
|
||||
|
||||
.settings/
|
||||
.vscode/
|
||||
bin/
|
||||
.classpath
|
||||
.project
|
||||
|
||||
# macos
|
||||
|
||||
*.DS_Store
|
||||
|
||||
# fabric
|
||||
|
||||
run/
|
||||
|
||||
# java
|
||||
|
||||
hs_err_*.log
|
||||
replay_*.log
|
||||
*.hprof
|
||||
*.jfr
|
||||
|
||||
docs/
|
||||
@@ -0,0 +1,121 @@
|
||||
Creative Commons Legal Code
|
||||
|
||||
CC0 1.0 Universal
|
||||
|
||||
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
|
||||
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
|
||||
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
|
||||
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
|
||||
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
|
||||
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
|
||||
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
|
||||
HEREUNDER.
|
||||
|
||||
Statement of Purpose
|
||||
|
||||
The laws of most jurisdictions throughout the world automatically confer
|
||||
exclusive Copyright and Related Rights (defined below) upon the creator
|
||||
and subsequent owner(s) (each and all, an "owner") of an original work of
|
||||
authorship and/or a database (each, a "Work").
|
||||
|
||||
Certain owners wish to permanently relinquish those rights to a Work for
|
||||
the purpose of contributing to a commons of creative, cultural and
|
||||
scientific works ("Commons") that the public can reliably and without fear
|
||||
of later claims of infringement build upon, modify, incorporate in other
|
||||
works, reuse and redistribute as freely as possible in any form whatsoever
|
||||
and for any purposes, including without limitation commercial purposes.
|
||||
These owners may contribute to the Commons to promote the ideal of a free
|
||||
culture and the further production of creative, cultural and scientific
|
||||
works, or to gain reputation or greater distribution for their Work in
|
||||
part through the use and efforts of others.
|
||||
|
||||
For these and/or other purposes and motivations, and without any
|
||||
expectation of additional consideration or compensation, the person
|
||||
associating CC0 with a Work (the "Affirmer"), to the extent that he or she
|
||||
is an owner of Copyright and Related Rights in the Work, voluntarily
|
||||
elects to apply CC0 to the Work and publicly distribute the Work under its
|
||||
terms, with knowledge of his or her Copyright and Related Rights in the
|
||||
Work and the meaning and intended legal effect of CC0 on those rights.
|
||||
|
||||
1. Copyright and Related Rights. A Work made available under CC0 may be
|
||||
protected by copyright and related or neighboring rights ("Copyright and
|
||||
Related Rights"). Copyright and Related Rights include, but are not
|
||||
limited to, the following:
|
||||
|
||||
i. the right to reproduce, adapt, distribute, perform, display,
|
||||
communicate, and translate a Work;
|
||||
ii. moral rights retained by the original author(s) and/or performer(s);
|
||||
iii. publicity and privacy rights pertaining to a person's image or
|
||||
likeness depicted in a Work;
|
||||
iv. rights protecting against unfair competition in regards to a Work,
|
||||
subject to the limitations in paragraph 4(a), below;
|
||||
v. rights protecting the extraction, dissemination, use and reuse of data
|
||||
in a Work;
|
||||
vi. database rights (such as those arising under Directive 96/9/EC of the
|
||||
European Parliament and of the Council of 11 March 1996 on the legal
|
||||
protection of databases, and under any national implementation
|
||||
thereof, including any amended or successor version of such
|
||||
directive); and
|
||||
vii. other similar, equivalent or corresponding rights throughout the
|
||||
world based on applicable law or treaty, and any national
|
||||
implementations thereof.
|
||||
|
||||
2. Waiver. To the greatest extent permitted by, but not in contravention
|
||||
of, applicable law, Affirmer hereby overtly, fully, permanently,
|
||||
irrevocably and unconditionally waives, abandons, and surrenders all of
|
||||
Affirmer's Copyright and Related Rights and associated claims and causes
|
||||
of action, whether now known or unknown (including existing as well as
|
||||
future claims and causes of action), in the Work (i) in all territories
|
||||
worldwide, (ii) for the maximum duration provided by applicable law or
|
||||
treaty (including future time extensions), (iii) in any current or future
|
||||
medium and for any number of copies, and (iv) for any purpose whatsoever,
|
||||
including without limitation commercial, advertising or promotional
|
||||
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
|
||||
member of the public at large and to the detriment of Affirmer's heirs and
|
||||
successors, fully intending that such Waiver shall not be subject to
|
||||
revocation, rescission, cancellation, termination, or any other legal or
|
||||
equitable action to disrupt the quiet enjoyment of the Work by the public
|
||||
as contemplated by Affirmer's express Statement of Purpose.
|
||||
|
||||
3. Public License Fallback. Should any part of the Waiver for any reason
|
||||
be judged legally invalid or ineffective under applicable law, then the
|
||||
Waiver shall be preserved to the maximum extent permitted taking into
|
||||
account Affirmer's express Statement of Purpose. In addition, to the
|
||||
extent the Waiver is so judged Affirmer hereby grants to each affected
|
||||
person a royalty-free, non transferable, non sublicensable, non exclusive,
|
||||
irrevocable and unconditional license to exercise Affirmer's Copyright and
|
||||
Related Rights in the Work (i) in all territories worldwide, (ii) for the
|
||||
maximum duration provided by applicable law or treaty (including future
|
||||
time extensions), (iii) in any current or future medium and for any number
|
||||
of copies, and (iv) for any purpose whatsoever, including without
|
||||
limitation commercial, advertising or promotional purposes (the
|
||||
"License"). The License shall be deemed effective as of the date CC0 was
|
||||
applied by Affirmer to the Work. Should any part of the License for any
|
||||
reason be judged legally invalid or ineffective under applicable law, such
|
||||
partial invalidity or ineffectiveness shall not invalidate the remainder
|
||||
of the License, and in such case Affirmer hereby affirms that he or she
|
||||
will not (i) exercise any of his or her remaining Copyright and Related
|
||||
Rights in the Work or (ii) assert any associated claims and causes of
|
||||
action with respect to the Work, in either case contrary to Affirmer's
|
||||
express Statement of Purpose.
|
||||
|
||||
4. Limitations and Disclaimers.
|
||||
|
||||
a. No trademark or patent rights held by Affirmer are waived, abandoned,
|
||||
surrendered, licensed or otherwise affected by this document.
|
||||
b. Affirmer offers the Work as-is and makes no representations or
|
||||
warranties of any kind concerning the Work, express, implied,
|
||||
statutory or otherwise, including without limitation warranties of
|
||||
title, merchantability, fitness for a particular purpose, non
|
||||
infringement, or the absence of latent or other defects, accuracy, or
|
||||
the present or absence of errors, whether or not discoverable, all to
|
||||
the greatest extent permissible under applicable law.
|
||||
c. Affirmer disclaims responsibility for clearing rights of other persons
|
||||
that may apply to the Work or any use thereof, including without
|
||||
limitation any person's Copyright and Related Rights in the Work.
|
||||
Further, Affirmer disclaims responsibility for obtaining any necessary
|
||||
consents, permissions or other rights required for any use of the
|
||||
Work.
|
||||
d. Affirmer understands and acknowledges that Creative Commons is not a
|
||||
party to this document and has no duty or obligation with respect to
|
||||
this CC0 or use of the Work.
|
||||
@@ -0,0 +1,26 @@
|
||||
# OAuth
|
||||
|
||||
For the auth service API and login flow requirements, see [Auth server requirements](docs/auth-server-requirements.md).
|
||||
|
||||
## Server configuration
|
||||
|
||||
The mod uses Cloth Config AutoConfig and creates `config/oauth.json` on first server startup. Install Cloth Config for Fabric on the server, then set the WebSocket URL, server ID, and per-server credential in that file:
|
||||
|
||||
```json
|
||||
{
|
||||
"websocketUrl": "wss://minecraft.csui.dev/api/v1/minecraft/ws",
|
||||
"serverId": "your-server-id",
|
||||
"serverCredential": "your-server-credential"
|
||||
}
|
||||
```
|
||||
|
||||
`ws://` URLs are also accepted for local development. They do not encrypt the connection, so use `wss://` for production.
|
||||
If the file was incomplete when the server started, `/login` reloads it and queues the request while the WebSocket connects. Check the server log for the exact config path and any missing fields.
|
||||
|
||||
## Setup
|
||||
|
||||
For setup instructions, please see the [Fabric Documentation page](https://docs.fabricmc.net/develop/getting-started/creating-a-project#setting-up) related to the IDE that you are using.
|
||||
|
||||
## License
|
||||
|
||||
This template is available under the CC0 license. Feel free to learn from it and incorporate it in your own projects.
|
||||
@@ -0,0 +1,85 @@
|
||||
plugins {
|
||||
id 'net.fabricmc.fabric-loom' version "${loom_version}"
|
||||
id 'maven-publish'
|
||||
}
|
||||
|
||||
repositories {
|
||||
maven { url = "https://maven.shedaniel.me/" }
|
||||
// Add repositories to retrieve artifacts from in here.
|
||||
// You should only use this when depending on other mods because
|
||||
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
|
||||
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
|
||||
// for more information about repositories.
|
||||
}
|
||||
|
||||
loom {
|
||||
splitEnvironmentSourceSets()
|
||||
|
||||
mods {
|
||||
"oauth" {
|
||||
sourceSet sourceSets.main
|
||||
sourceSet sourceSets.client
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
// To change the versions see the gradle.properties file
|
||||
minecraft "com.mojang:minecraft:${project.minecraft_version}"
|
||||
implementation "net.fabricmc:fabric-loader:${project.loader_version}"
|
||||
|
||||
// Fabric API. This is technically optional, but you probably want it anyway.
|
||||
implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
|
||||
implementation("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") {
|
||||
exclude(group: "net.fabricmc.fabric-api")
|
||||
}
|
||||
}
|
||||
|
||||
processResources {
|
||||
def version = project.version
|
||||
inputs.property "version", version
|
||||
|
||||
filesMatching("fabric.mod.json") {
|
||||
expand "version": version
|
||||
}
|
||||
}
|
||||
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
it.options.release = 25
|
||||
}
|
||||
|
||||
java {
|
||||
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
|
||||
// if it is present.
|
||||
// If you remove this line, sources will not be generated.
|
||||
withSourcesJar()
|
||||
|
||||
sourceCompatibility = JavaVersion.VERSION_25
|
||||
targetCompatibility = JavaVersion.VERSION_25
|
||||
}
|
||||
|
||||
jar {
|
||||
def projectName = project.name
|
||||
inputs.property "projectName", projectName
|
||||
|
||||
from("LICENSE") {
|
||||
rename { "${it}_$projectName"}
|
||||
}
|
||||
}
|
||||
|
||||
// configure the maven publication
|
||||
publishing {
|
||||
publications {
|
||||
create("mavenJava", MavenPublication) {
|
||||
from components.java
|
||||
}
|
||||
}
|
||||
|
||||
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
|
||||
repositories {
|
||||
// Add repositories to publish to here.
|
||||
// Notice: This block does NOT have the same function as the block in the top level.
|
||||
// The repositories here will be used for publishing your artifact, not for
|
||||
// retrieving dependencies.
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
# Done to increase the memory available to gradle.
|
||||
org.gradle.jvmargs=-Xmx1G
|
||||
org.gradle.parallel=true
|
||||
org.gradle.configuration-cache=true
|
||||
|
||||
# Fabric Properties
|
||||
# check these on https://fabricmc.net/develop
|
||||
minecraft_version=26.3
|
||||
loader_version=0.19.5
|
||||
loom_version=1.18-SNAPSHOT
|
||||
|
||||
# Mod Properties
|
||||
version=1.0.0
|
||||
group=com.fossy.oauth
|
||||
|
||||
# Dependencies
|
||||
fabric_api_version=0.161.0+26.3
|
||||
cloth_config_version=26.3.158
|
||||
Vendored
BIN
Binary file not shown.
+9
@@ -0,0 +1,9 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
|
||||
networkTimeout=10000
|
||||
retries=0
|
||||
retryBackOffMs=500
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
@@ -0,0 +1,248 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright © 2015 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# gradlew start up script for POSIX generated by Gradle.
|
||||
#
|
||||
# Important for running:
|
||||
#
|
||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||
# noncompliant, but you have some other compliant shell such as ksh or
|
||||
# bash, then to run this script, type that shell name before the whole
|
||||
# command line, like:
|
||||
#
|
||||
# ksh gradlew
|
||||
#
|
||||
# Busybox and similar reduced shells will NOT work, because this script
|
||||
# requires all of these POSIX shell features:
|
||||
# * functions;
|
||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||
# * compound commands having a testable exit status, especially «case»;
|
||||
# * various built-in commands including «command», «set», and «ulimit».
|
||||
#
|
||||
# Important for patching:
|
||||
#
|
||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||
#
|
||||
# The "traditional" practice of packing multiple parameters into a
|
||||
# space-separated string is a well documented source of bugs and security
|
||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||
# options in "$@", and eventually passing that to Java.
|
||||
#
|
||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||
# see the in-line comments for details.
|
||||
#
|
||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
|
||||
# Resolve links: $0 may be a link
|
||||
app_path=$0
|
||||
|
||||
# Need this for daisy-chained symlinks.
|
||||
while
|
||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||
[ -h "$app_path" ]
|
||||
do
|
||||
ls=$( ls -ld "$app_path" )
|
||||
link=${ls#*' -> '}
|
||||
case $link in #(
|
||||
/*) app_path=$link ;; #(
|
||||
*) app_path=$APP_HOME$link ;;
|
||||
esac
|
||||
done
|
||||
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
} >&2
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
} >&2
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "$( uname )" in #(
|
||||
CYGWIN* ) cygwin=true ;; #(
|
||||
Darwin* ) darwin=true ;; #(
|
||||
MSYS* | MINGW* ) msys=true ;; #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||
else
|
||||
JAVACMD=$JAVA_HOME/bin/java
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
if ! command -v java >/dev/null 2>&1
|
||||
then
|
||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command, stacking in reverse order:
|
||||
# * args from the command line
|
||||
# * the main class name
|
||||
# * -classpath
|
||||
# * -D...appname settings
|
||||
# * --module-path (only if needed)
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
for arg do
|
||||
if
|
||||
case $arg in #(
|
||||
-*) false ;; # don't mess with options #(
|
||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||
[ -e "$t" ] ;; #(
|
||||
*) false ;;
|
||||
esac
|
||||
then
|
||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||
fi
|
||||
# Roll the args list around exactly as many times as the number of
|
||||
# args, so each arg winds up back in the position where it started, but
|
||||
# possibly modified.
|
||||
#
|
||||
# NB: a `for` loop captures its iteration list before it begins, so
|
||||
# changing the positional parameters here affects neither the number of
|
||||
# iterations, nor the values presented in `arg`.
|
||||
shift # remove old arg
|
||||
set -- "$@" "$arg" # push replacement arg
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
if ! command -v xargs >/dev/null 2>&1
|
||||
then
|
||||
die "xargs is not available"
|
||||
fi
|
||||
|
||||
# Use "xargs" to parse quoted args.
|
||||
#
|
||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||
#
|
||||
# In Bash we could simply go:
|
||||
#
|
||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||
# set -- "${ARGS[@]}" "$@"
|
||||
#
|
||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||
# character that might be a shell metacharacter, then use eval to reverse
|
||||
# that process (while maintaining the separation between arguments), and wrap
|
||||
# the whole thing up as a single "set" statement.
|
||||
#
|
||||
# This will of course break if any of these variables contains a newline or
|
||||
# an unmatched quote.
|
||||
#
|
||||
|
||||
eval "set -- $(
|
||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||
xargs -n1 |
|
||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||
tr '\n' ' '
|
||||
)" '"$@"'
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
Vendored
+82
@@ -0,0 +1,82 @@
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem gradlew startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables, and ensure extensions are enabled
|
||||
setlocal EnableExtensions
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
@rem This is normally unused
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
"%COMSPEC%" /c exit 1
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
"%COMSPEC%" /c exit 1
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
|
||||
|
||||
@rem Execute gradlew
|
||||
@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
|
||||
@rem which allows us to clear the local environment before executing the java command
|
||||
endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
|
||||
|
||||
:exitWithErrorLevel
|
||||
@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
|
||||
"%COMSPEC%" /c exit %ERRORLEVEL%
|
||||
@@ -0,0 +1,13 @@
|
||||
pluginManagement {
|
||||
repositories {
|
||||
maven {
|
||||
name = 'Fabric'
|
||||
url = 'https://maven.fabricmc.net/'
|
||||
}
|
||||
mavenCentral()
|
||||
gradlePluginPortal()
|
||||
}
|
||||
}
|
||||
|
||||
// Should match your modid
|
||||
rootProject.name = 'oauth'
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.fossy.oauth.client;
|
||||
|
||||
import net.fabricmc.api.ClientModInitializer;
|
||||
|
||||
public class OAuthClient implements ClientModInitializer {
|
||||
@Override
|
||||
public void onInitializeClient() {
|
||||
// This entrypoint is suitable for setting up client-specific logic, such as rendering.
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.fossy.oauth.client.mixin;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(Minecraft.class)
|
||||
public class ExampleClientMixin {
|
||||
@Inject(at = @At("HEAD"), method = "run")
|
||||
private void init(CallbackInfo info) {
|
||||
// This code is injected into the start of Minecraft.run()V
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"required": true,
|
||||
"package": "com.fossy.oauth.client.mixin",
|
||||
"compatibilityLevel": "JAVA_25",
|
||||
"client": [
|
||||
"ExampleClientMixin"
|
||||
],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
},
|
||||
"overwrites": {
|
||||
"requireAnnotations": true
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,504 @@
|
||||
package com.fossy.oauth;
|
||||
|
||||
import java.net.URI;
|
||||
import java.net.http.HttpClient;
|
||||
import java.net.http.WebSocket;
|
||||
import java.net.http.WebSocketHandshakeException;
|
||||
import java.time.Duration;
|
||||
import java.util.ArrayList;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.ThreadLocalRandom;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParser;
|
||||
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.network.chat.ClickEvent;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
final class AuthServiceClient {
|
||||
private static final int MAX_MESSAGE_CHARS = 16 * 1024;
|
||||
private static volatile AuthServiceClient current;
|
||||
private final MinecraftServer server;
|
||||
private final AuthServiceConfig config;
|
||||
private final HttpClient httpClient = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(10)).build();
|
||||
private final ConcurrentHashMap<UUID, PendingLogin> pendingLogins = new ConcurrentHashMap<>();
|
||||
private final ConcurrentHashMap<String, PendingUnlink> pendingUnlinks = new ConcurrentHashMap<>();
|
||||
private final java.util.Set<String> pendingAcknowledgements = ConcurrentHashMap.newKeySet();
|
||||
private final AtomicBoolean reconnectScheduled = new AtomicBoolean();
|
||||
private final AtomicBoolean connecting = new AtomicBoolean();
|
||||
private volatile WebSocket socket;
|
||||
private volatile boolean ready;
|
||||
private volatile boolean stopped;
|
||||
private int reconnectAttempt;
|
||||
|
||||
private AuthServiceClient(MinecraftServer server, AuthServiceConfig config) {
|
||||
this.server = server;
|
||||
this.config = config;
|
||||
}
|
||||
|
||||
static void registerLifecycle() {
|
||||
ServerLifecycleEvents.SERVER_STARTED.register(server -> {
|
||||
AuthServiceConfig config = AuthServiceConfig.reload();
|
||||
current = new AuthServiceClient(server, config);
|
||||
if (config.isConfigured()) {
|
||||
current.connect();
|
||||
} else {
|
||||
OAuth.LOGGER.warn("Auth service config is incomplete at {}. Missing: {}",
|
||||
AuthServiceConfig.path(), config.missingSettings());
|
||||
}
|
||||
});
|
||||
ServerLifecycleEvents.SERVER_STOPPING.register(server -> {
|
||||
AuthServiceClient client = current;
|
||||
if (client != null && client.server == server) {
|
||||
current = null;
|
||||
client.stop();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
static void requestLogin(ServerPlayer player) {
|
||||
AuthServiceClient client = current;
|
||||
if (client == null || !client.config.isConfigured()) {
|
||||
AuthServiceConfig config = AuthServiceConfig.load();
|
||||
if (!config.isConfigured()) {
|
||||
player.sendSystemMessage(Component.literal("Login service config is incomplete. Ask an admin to check "
|
||||
+ AuthServiceConfig.path() + "."));
|
||||
return;
|
||||
}
|
||||
if (client != null) client.stop();
|
||||
client = new AuthServiceClient(player.level().getServer(), config);
|
||||
current = client;
|
||||
client.connect();
|
||||
}
|
||||
client.startLogin(player);
|
||||
}
|
||||
|
||||
static void cancelPlayerLogin(UUID playerId) {
|
||||
AuthServiceClient client = current;
|
||||
if (client != null) client.cancelLogin(playerId);
|
||||
}
|
||||
|
||||
static void requestUnlink(ServerPlayer player) {
|
||||
AuthServiceClient client = current;
|
||||
if (client == null || !client.config.isConfigured()) {
|
||||
player.sendSystemMessage(Component.literal("Login service is not configured. Contact the server administrator."));
|
||||
return;
|
||||
}
|
||||
client.startUnlink(player);
|
||||
}
|
||||
|
||||
private void connect() {
|
||||
if (stopped || socket != null || !connecting.compareAndSet(false, true)) return;
|
||||
try {
|
||||
URI endpoint = URI.create(config.websocketUrl);
|
||||
WebSocket.Listener listener = new Listener();
|
||||
httpClient.newWebSocketBuilder()
|
||||
.connectTimeout(Duration.ofSeconds(10))
|
||||
.header("Authorization", "Bearer " + config.serverCredential)
|
||||
.buildAsync(endpoint, listener)
|
||||
.whenComplete((webSocket, error) -> {
|
||||
connecting.set(false);
|
||||
if (error != null && !stopped) {
|
||||
OAuth.LOGGER.warn("Could not connect to auth WebSocket {}: {}", endpointLabel(), describe(error));
|
||||
scheduleReconnect();
|
||||
}
|
||||
});
|
||||
} catch (RuntimeException exception) {
|
||||
connecting.set(false);
|
||||
OAuth.LOGGER.error("Invalid auth service WebSocket configuration", exception);
|
||||
scheduleReconnect();
|
||||
}
|
||||
}
|
||||
|
||||
void startLogin(ServerPlayer player) {
|
||||
UUID playerId = player.getUUID();
|
||||
PendingLogin existing = pendingLogins.get(playerId);
|
||||
if (existing != null && existing.sessionId != null) {
|
||||
sendLoginLink(player, existing.loginUrl);
|
||||
return;
|
||||
}
|
||||
|
||||
PendingLogin pending = existing;
|
||||
if (pending == null) {
|
||||
pending = new PendingLogin(UUID.randomUUID().toString(), playerId, player.getGameProfile().name());
|
||||
pendingLogins.put(playerId, pending);
|
||||
}
|
||||
if (!ready || socket == null) {
|
||||
player.sendSystemMessage(Component.literal("Connecting to the login service. Your login request will continue when connected."));
|
||||
return;
|
||||
}
|
||||
player.sendSystemMessage(Component.literal("Requesting a login link..."));
|
||||
sendLoginStart(pending);
|
||||
}
|
||||
|
||||
void cancelLogin(UUID playerId) {
|
||||
PendingLogin pending = pendingLogins.remove(playerId);
|
||||
if (pending == null || pending.sessionId == null || !ready) return;
|
||||
JsonObject message = message("login_cancel", UUID.randomUUID().toString());
|
||||
message.addProperty("session_id", pending.sessionId);
|
||||
message.addProperty("minecraft_uuid", playerId.toString());
|
||||
send(message);
|
||||
}
|
||||
|
||||
private void startUnlink(ServerPlayer player) {
|
||||
if (!ready || socket == null) {
|
||||
player.sendSystemMessage(Component.literal("Login service is unavailable. Please try /unlink again shortly."));
|
||||
return;
|
||||
}
|
||||
if (pendingUnlinks.values().stream().anyMatch(pending -> pending.playerId.equals(player.getUUID()))) {
|
||||
player.sendSystemMessage(Component.literal("Your unlink request is already being processed."));
|
||||
return;
|
||||
}
|
||||
String requestId = UUID.randomUUID().toString();
|
||||
PendingUnlink pending = new PendingUnlink(requestId, player.getUUID());
|
||||
pendingUnlinks.put(requestId, pending);
|
||||
JsonObject request = message("unlink_account", requestId);
|
||||
request.addProperty("minecraft_uuid", player.getUUID().toString());
|
||||
request.addProperty("minecraft_name", player.getGameProfile().name());
|
||||
player.sendSystemMessage(Component.literal("Requesting account unlink..."));
|
||||
send(request);
|
||||
}
|
||||
|
||||
private void sendHello() {
|
||||
JsonObject hello = message("hello", UUID.randomUUID().toString());
|
||||
hello.addProperty("protocol_version", 1);
|
||||
hello.addProperty("server_id", config.serverId);
|
||||
JsonArray sessions = new JsonArray();
|
||||
for (PendingLogin pending : pendingLogins.values()) {
|
||||
if (pending.sessionId != null) sessions.add(pending.sessionId);
|
||||
}
|
||||
for (String sessionId : pendingAcknowledgements) sessions.add(sessionId);
|
||||
hello.add("pending_sessions", sessions);
|
||||
send(hello);
|
||||
}
|
||||
|
||||
private void sendLoginStart(PendingLogin pending) {
|
||||
JsonObject message = message("login_start", pending.requestId);
|
||||
JsonObject player = new JsonObject();
|
||||
player.addProperty("minecraft_uuid", pending.playerId.toString());
|
||||
player.addProperty("minecraft_name", pending.playerName);
|
||||
message.add("player", player);
|
||||
send(message);
|
||||
}
|
||||
|
||||
private JsonObject message(String type, String requestId) {
|
||||
JsonObject message = new JsonObject();
|
||||
message.addProperty("type", type);
|
||||
if (requestId != null) message.addProperty("request_id", requestId);
|
||||
return message;
|
||||
}
|
||||
|
||||
private void send(JsonObject message) {
|
||||
WebSocket current = socket;
|
||||
if (current == null || current.isOutputClosed()) return;
|
||||
String json = message.toString();
|
||||
if (json.length() > MAX_MESSAGE_CHARS) {
|
||||
OAuth.LOGGER.warn("Skipping oversized message to auth service");
|
||||
return;
|
||||
}
|
||||
current.sendText(json, true).whenComplete((ignored, error) -> {
|
||||
if (error != null && !stopped) onDisconnected(current, error);
|
||||
});
|
||||
}
|
||||
|
||||
private void handleMessage(WebSocket source, String text) {
|
||||
if (text.length() > MAX_MESSAGE_CHARS) {
|
||||
source.abort();
|
||||
return;
|
||||
}
|
||||
try {
|
||||
JsonObject message = JsonParser.parseString(text).getAsJsonObject();
|
||||
String type = string(message, "type");
|
||||
switch (type) {
|
||||
case "ready" -> {
|
||||
ready = true;
|
||||
reconnectAttempt = 0;
|
||||
for (PendingLogin pending : pendingLogins.values()) {
|
||||
if (pending.sessionId == null) sendLoginStart(pending);
|
||||
}
|
||||
}
|
||||
case "login_started" -> handleLoginStarted(message);
|
||||
case "login_result" -> handleLoginResult(message);
|
||||
case "unlink_result" -> handleUnlinkResult(message);
|
||||
case "error" -> handleError(message);
|
||||
case "login_cancelled" -> { }
|
||||
default -> OAuth.LOGGER.warn("Auth service sent unknown message type: {}", type);
|
||||
}
|
||||
} catch (RuntimeException exception) {
|
||||
OAuth.LOGGER.warn("Ignoring malformed message from auth service", exception);
|
||||
}
|
||||
}
|
||||
|
||||
private void handleLoginStarted(JsonObject message) {
|
||||
String requestId = string(message, "request_id");
|
||||
UUID playerId = UUID.fromString(string(message, "minecraft_uuid"));
|
||||
PendingLogin pending = pendingLogins.get(playerId);
|
||||
String sessionId = string(message, "session_id");
|
||||
String loginUrl = string(message, "login_url");
|
||||
if (pending == null || !pending.requestId.equals(requestId)) {
|
||||
cancelOrphanedSession(sessionId, playerId);
|
||||
return;
|
||||
}
|
||||
if (!isHttpsUrl(loginUrl)) {
|
||||
OAuth.LOGGER.warn("Auth service returned a non-HTTPS login URL");
|
||||
pendingLogins.remove(playerId, pending);
|
||||
notifyPlayer(playerId, "The login service returned an invalid link. Please try /login again.");
|
||||
return;
|
||||
}
|
||||
pending.sessionId = sessionId;
|
||||
pending.loginUrl = loginUrl;
|
||||
notifyPlayer(playerId, "Login link ready. Click the link in chat to continue.");
|
||||
notifyLink(playerId, loginUrl);
|
||||
}
|
||||
|
||||
private void handleLoginResult(JsonObject message) {
|
||||
String sessionId = string(message, "session_id");
|
||||
UUID playerId = UUID.fromString(string(message, "minecraft_uuid"));
|
||||
String status = string(message, "status");
|
||||
PendingLogin pending = pendingLogins.get(playerId);
|
||||
if (pending == null || pending.sessionId == null || !pending.sessionId.equals(sessionId)) {
|
||||
if (pendingAcknowledgements.contains(sessionId)) sendAcknowledgement(sessionId);
|
||||
return;
|
||||
}
|
||||
if ("approved".equals(status)) {
|
||||
pendingLogins.remove(playerId, pending);
|
||||
server.execute(() -> {
|
||||
if (server.getPlayerList().getPlayer(playerId) != null) {
|
||||
LoginGate.approve(playerId);
|
||||
ServerPlayer player = server.getPlayerList().getPlayer(playerId);
|
||||
player.sendSystemMessage(Component.literal("Login successful. You can now play."));
|
||||
}
|
||||
});
|
||||
} else if ("denied".equals(status) || "expired".equals(status)) {
|
||||
pendingLogins.remove(playerId, pending);
|
||||
notifyPlayer(playerId, "Login was " + status + ". Run /login to try again.");
|
||||
} else {
|
||||
OAuth.LOGGER.warn("Auth service sent an invalid login status");
|
||||
return;
|
||||
}
|
||||
pendingAcknowledgements.add(sessionId);
|
||||
sendAcknowledgement(sessionId);
|
||||
}
|
||||
|
||||
private void sendAcknowledgement(String sessionId) {
|
||||
JsonObject ack = message("login_result_ack", UUID.randomUUID().toString());
|
||||
ack.addProperty("session_id", sessionId);
|
||||
WebSocket currentSocket = socket;
|
||||
if (currentSocket == null || currentSocket.isOutputClosed()) return;
|
||||
currentSocket.sendText(ack.toString(), true).whenComplete((ignored, error) -> {
|
||||
if (error == null) pendingAcknowledgements.remove(sessionId);
|
||||
else if (!stopped) onDisconnected(currentSocket, error);
|
||||
});
|
||||
}
|
||||
|
||||
private void handleError(JsonObject message) {
|
||||
String requestId = string(message, "request_id");
|
||||
String code = string(message, "code");
|
||||
for (PendingLogin pending : new ArrayList<>(pendingLogins.values())) {
|
||||
if (pending.requestId.equals(requestId)) {
|
||||
pendingLogins.remove(pending.playerId, pending);
|
||||
notifyPlayer(pending.playerId, "Could not start login (" + code + "). Run /login to retry.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
PendingUnlink unlink = pendingUnlinks.remove(requestId);
|
||||
if (unlink != null) {
|
||||
notifyPlayer(unlink.playerId, "Could not unlink account (" + code + "). Your account was not changed.");
|
||||
}
|
||||
}
|
||||
|
||||
private void handleUnlinkResult(JsonObject message) {
|
||||
String requestId = string(message, "request_id");
|
||||
PendingUnlink pending = pendingUnlinks.remove(requestId);
|
||||
if (pending == null) return;
|
||||
UUID responsePlayerId;
|
||||
try {
|
||||
responsePlayerId = UUID.fromString(string(message, "minecraft_uuid"));
|
||||
} catch (RuntimeException exception) {
|
||||
pendingUnlinks.putIfAbsent(requestId, pending);
|
||||
OAuth.LOGGER.warn("Auth service returned an invalid unlink result");
|
||||
return;
|
||||
}
|
||||
if (!pending.playerId.equals(responsePlayerId)) {
|
||||
OAuth.LOGGER.warn("Auth service returned an unlink result for a different player");
|
||||
return;
|
||||
}
|
||||
String status = string(message, "status");
|
||||
if ("unlinked".equals(status)) {
|
||||
server.execute(() -> {
|
||||
ServerPlayer player = server.getPlayerList().getPlayer(pending.playerId);
|
||||
if (player != null) {
|
||||
player.connection.disconnect(Component.literal(
|
||||
"Your account has been unlinked. Re-enter the server and run /login to link your account again."));
|
||||
}
|
||||
});
|
||||
} else if ("not_linked".equals(status)) {
|
||||
notifyPlayer(pending.playerId, "This Minecraft account is not linked to an SSO account.");
|
||||
} else {
|
||||
OAuth.LOGGER.warn("Auth service returned an invalid unlink status");
|
||||
notifyPlayer(pending.playerId, "Could not confirm account unlink. Your account was not changed.");
|
||||
}
|
||||
}
|
||||
|
||||
private void cancelOrphanedSession(String sessionId, UUID playerId) {
|
||||
JsonObject cancel = message("login_cancel", UUID.randomUUID().toString());
|
||||
cancel.addProperty("session_id", sessionId);
|
||||
cancel.addProperty("minecraft_uuid", playerId.toString());
|
||||
send(cancel);
|
||||
}
|
||||
|
||||
private void notifyPlayer(UUID playerId, String text) {
|
||||
server.execute(() -> {
|
||||
ServerPlayer player = server.getPlayerList().getPlayer(playerId);
|
||||
if (player != null) player.sendSystemMessage(Component.literal(text));
|
||||
});
|
||||
}
|
||||
|
||||
private void notifyLink(UUID playerId, String url) {
|
||||
server.execute(() -> {
|
||||
ServerPlayer player = server.getPlayerList().getPlayer(playerId);
|
||||
if (player == null) return;
|
||||
Component link = Component.literal("Click here to log in")
|
||||
.withStyle(style -> style.withUnderlined(true)
|
||||
.withClickEvent(new ClickEvent.OpenUrl(URI.create(url))));
|
||||
player.sendSystemMessage(Component.literal("Open this link to log in: ").append(link));
|
||||
});
|
||||
}
|
||||
|
||||
private void sendLoginLink(ServerPlayer player, String url) {
|
||||
Component link = Component.literal("Click here to log in")
|
||||
.withStyle(style -> style.withUnderlined(true)
|
||||
.withClickEvent(new ClickEvent.OpenUrl(URI.create(url))));
|
||||
player.sendSystemMessage(Component.literal("Open this link to log in: ").append(link));
|
||||
}
|
||||
|
||||
private boolean isHttpsUrl(String value) {
|
||||
try {
|
||||
URI uri = URI.create(value);
|
||||
return "https".equalsIgnoreCase(uri.getScheme()) && uri.getHost() != null;
|
||||
} catch (IllegalArgumentException exception) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private String string(JsonObject object, String key) {
|
||||
JsonElement element = object.get(key);
|
||||
if (element == null || !element.isJsonPrimitive()) throw new IllegalArgumentException("Missing string field " + key);
|
||||
return element.getAsString();
|
||||
}
|
||||
|
||||
private void onDisconnected(WebSocket source, Throwable error) {
|
||||
if (socket == source) {
|
||||
socket = null;
|
||||
ready = false;
|
||||
connecting.set(false);
|
||||
if (!stopped) {
|
||||
OAuth.LOGGER.warn("Connection to auth WebSocket {} was lost: {}", endpointLabel(), describe(error));
|
||||
scheduleReconnect();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private String endpointLabel() {
|
||||
try {
|
||||
URI endpoint = URI.create(config.websocketUrl);
|
||||
String port = endpoint.getPort() < 0 ? "" : ":" + endpoint.getPort();
|
||||
String path = endpoint.getRawPath() == null ? "" : endpoint.getRawPath();
|
||||
return endpoint.getScheme() + "://" + endpoint.getHost() + port + path;
|
||||
} catch (RuntimeException exception) {
|
||||
return "<invalid endpoint>";
|
||||
}
|
||||
}
|
||||
|
||||
private String describe(Throwable error) {
|
||||
Throwable cause = error;
|
||||
while (cause.getCause() != null && cause.getCause() != cause) cause = cause.getCause();
|
||||
if (cause instanceof WebSocketHandshakeException handshake) {
|
||||
return "HTTP " + handshake.getResponse().statusCode() + " WebSocket handshake failure";
|
||||
}
|
||||
String message = cause.getMessage();
|
||||
return cause.getClass().getSimpleName() + (message == null || message.isBlank() ? "" : ": " + message);
|
||||
}
|
||||
|
||||
private void stop() {
|
||||
stopped = true;
|
||||
ready = false;
|
||||
WebSocket currentSocket = socket;
|
||||
socket = null;
|
||||
if (currentSocket != null) currentSocket.sendClose(WebSocket.NORMAL_CLOSURE, "server stopping");
|
||||
}
|
||||
|
||||
private void scheduleReconnect() {
|
||||
if (stopped || !reconnectScheduled.compareAndSet(false, true)) return;
|
||||
int exponent = Math.min(reconnectAttempt++, 6);
|
||||
long baseSeconds = Math.min(60, 1L << exponent);
|
||||
long delayMillis = (baseSeconds * 1000L) + ThreadLocalRandom.current().nextLong(250, 1251);
|
||||
CompletableFuture.delayedExecutor(delayMillis, java.util.concurrent.TimeUnit.MILLISECONDS).execute(() -> {
|
||||
reconnectScheduled.set(false);
|
||||
connect();
|
||||
});
|
||||
}
|
||||
|
||||
private class Listener implements WebSocket.Listener {
|
||||
private final StringBuilder text = new StringBuilder();
|
||||
|
||||
@Override
|
||||
public void onOpen(WebSocket webSocket) {
|
||||
connecting.set(false);
|
||||
socket = webSocket;
|
||||
ready = false;
|
||||
text.setLength(0);
|
||||
sendHello();
|
||||
webSocket.request(1);
|
||||
}
|
||||
|
||||
@Override
|
||||
public java.util.concurrent.CompletionStage<?> onText(WebSocket webSocket, CharSequence data, boolean last) {
|
||||
text.append(data);
|
||||
if (text.length() > MAX_MESSAGE_CHARS) {
|
||||
webSocket.abort();
|
||||
onDisconnected(webSocket, new IllegalStateException("Oversized message"));
|
||||
} else if (last) {
|
||||
String message = text.toString();
|
||||
text.setLength(0);
|
||||
handleMessage(webSocket, message);
|
||||
}
|
||||
webSocket.request(1);
|
||||
return CompletableFuture.completedFuture(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public java.util.concurrent.CompletionStage<?> onClose(WebSocket webSocket, int statusCode, String reason) {
|
||||
onDisconnected(webSocket, new IllegalStateException("WebSocket closed with status " + statusCode));
|
||||
return CompletableFuture.completedFuture(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(WebSocket webSocket, Throwable error) {
|
||||
onDisconnected(webSocket, error);
|
||||
}
|
||||
}
|
||||
|
||||
private static final class PendingLogin {
|
||||
private final String requestId;
|
||||
private final UUID playerId;
|
||||
private final String playerName;
|
||||
private volatile String sessionId;
|
||||
private volatile String loginUrl;
|
||||
|
||||
private PendingLogin(String requestId, UUID playerId, String playerName) {
|
||||
this.requestId = requestId;
|
||||
this.playerId = playerId;
|
||||
this.playerName = playerName;
|
||||
}
|
||||
}
|
||||
|
||||
private record PendingUnlink(String requestId, UUID playerId) { }
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
package com.fossy.oauth;
|
||||
|
||||
import java.net.URI;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import me.shedaniel.autoconfig.AutoConfig;
|
||||
import me.shedaniel.autoconfig.ConfigData;
|
||||
import me.shedaniel.autoconfig.annotation.Config;
|
||||
import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
|
||||
@Config(name = OAuth.MOD_ID)
|
||||
public final class AuthServiceConfig implements ConfigData {
|
||||
public String websocketUrl = "wss://minecraft.csui.dev/api/v1/minecraft/ws";
|
||||
public String serverId = "";
|
||||
public String serverCredential = "";
|
||||
|
||||
static void register() {
|
||||
AutoConfig.register(AuthServiceConfig.class, GsonConfigSerializer::new);
|
||||
}
|
||||
|
||||
static Path path() {
|
||||
return FabricLoader.getInstance().getConfigDir().resolve("oauth.json");
|
||||
}
|
||||
|
||||
static AuthServiceConfig load() {
|
||||
return AutoConfig.getConfigHolder(AuthServiceConfig.class).getConfig();
|
||||
}
|
||||
|
||||
static AuthServiceConfig reload() {
|
||||
AutoConfig.getConfigHolder(AuthServiceConfig.class).load();
|
||||
return load();
|
||||
}
|
||||
|
||||
boolean isConfigured() {
|
||||
return websocketUrl != null && isValidWebSocketUrl()
|
||||
&& serverId != null && !serverId.isBlank()
|
||||
&& serverCredential != null && !serverCredential.isBlank();
|
||||
}
|
||||
|
||||
String missingSettings() {
|
||||
List<String> missing = new ArrayList<>();
|
||||
if (websocketUrl == null || !isValidWebSocketUrl()) missing.add("websocketUrl (ws:// or wss:// URL)");
|
||||
if (serverId == null || serverId.isBlank()) missing.add("serverId");
|
||||
if (serverCredential == null || serverCredential.isBlank()) missing.add("serverCredential");
|
||||
return String.join(", ", missing);
|
||||
}
|
||||
|
||||
private boolean isValidWebSocketUrl() {
|
||||
try {
|
||||
URI endpoint = URI.create(websocketUrl);
|
||||
String scheme = endpoint.getScheme();
|
||||
return endpoint.getHost() != null && ("wss".equalsIgnoreCase(scheme) || "ws".equalsIgnoreCase(scheme));
|
||||
} catch (IllegalArgumentException exception) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,88 @@
|
||||
package com.fossy.oauth;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
|
||||
import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents;
|
||||
import net.fabricmc.fabric.api.event.player.AttackBlockCallback;
|
||||
import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents;
|
||||
import net.fabricmc.fabric.api.event.player.UseBlockCallback;
|
||||
import net.fabricmc.fabric.api.event.player.UseEntityCallback;
|
||||
import net.fabricmc.fabric.api.event.player.UseItemCallback;
|
||||
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
|
||||
import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
|
||||
|
||||
import net.minecraft.commands.Commands;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.world.InteractionResult;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
final class LoginGate {
|
||||
private static final Map<UUID, Vec3> LOCKED_POSITIONS = new HashMap<>();
|
||||
|
||||
private LoginGate() {}
|
||||
|
||||
static void register() {
|
||||
AuthServiceClient.registerLifecycle();
|
||||
|
||||
ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> {
|
||||
ServerPlayer player = handler.player;
|
||||
LOCKED_POSITIONS.put(player.getUUID(), player.position());
|
||||
player.sendSystemMessage(Component.literal("You must run /login and complete login to play."));
|
||||
});
|
||||
|
||||
ServerPlayConnectionEvents.DISCONNECT.register((handler, server) -> {
|
||||
LOCKED_POSITIONS.remove(handler.player.getUUID());
|
||||
AuthServiceClient.cancelPlayerLogin(handler.player.getUUID());
|
||||
});
|
||||
|
||||
ServerTickEvents.END_SERVER_TICK.register(server -> {
|
||||
for (ServerPlayer player : server.getPlayerList().getPlayers()) {
|
||||
Vec3 lockedPosition = LOCKED_POSITIONS.get(player.getUUID());
|
||||
if (lockedPosition != null && !player.position().equals(lockedPosition)) {
|
||||
player.teleportTo(lockedPosition.x, lockedPosition.y, lockedPosition.z);
|
||||
player.setDeltaMovement(Vec3.ZERO);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
ServerLivingEntityEvents.ALLOW_DAMAGE.register((entity, source, amount) ->
|
||||
!(entity instanceof ServerPlayer player && isLocked(player)));
|
||||
|
||||
AttackBlockCallback.EVENT.register((player, world, hand, pos, direction) ->
|
||||
isLocked(player) ? InteractionResult.FAIL : InteractionResult.PASS);
|
||||
PlayerBlockBreakEvents.BEFORE.register((world, player, pos, state, blockEntity) -> !isLocked(player));
|
||||
UseBlockCallback.EVENT.register((player, world, hand, hitResult) ->
|
||||
isLocked(player) ? InteractionResult.FAIL : InteractionResult.PASS);
|
||||
UseEntityCallback.EVENT.register((player, world, hand, entity, hitResult) ->
|
||||
isLocked(player) ? InteractionResult.FAIL : InteractionResult.PASS);
|
||||
UseItemCallback.EVENT.register((player, world, hand) ->
|
||||
isLocked(player) ? InteractionResult.FAIL : InteractionResult.PASS);
|
||||
|
||||
CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) ->
|
||||
{
|
||||
dispatcher.register(Commands.literal("login").executes(context -> {
|
||||
ServerPlayer player = context.getSource().getPlayerOrException();
|
||||
AuthServiceClient.requestLogin(player);
|
||||
return 1;
|
||||
}));
|
||||
dispatcher.register(Commands.literal("unlink").executes(context -> {
|
||||
ServerPlayer player = context.getSource().getPlayerOrException();
|
||||
AuthServiceClient.requestUnlink(player);
|
||||
return 1;
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
static void approve(UUID playerId) {
|
||||
LOCKED_POSITIONS.remove(playerId);
|
||||
}
|
||||
|
||||
private static boolean isLocked(net.minecraft.world.entity.player.Player player) {
|
||||
return player instanceof ServerPlayer serverPlayer && LOCKED_POSITIONS.containsKey(serverPlayer.getUUID());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.fossy.oauth;
|
||||
|
||||
import net.fabricmc.api.ModInitializer;
|
||||
|
||||
import net.minecraft.resources.Identifier;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class OAuth implements ModInitializer {
|
||||
public static final String MOD_ID = "oauth";
|
||||
|
||||
// This logger is used to write text to the console and the log file.
|
||||
// It is considered best practice to use your mod id as the logger's name.
|
||||
// That way, it's clear which mod wrote info, warnings, and errors.
|
||||
public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
|
||||
|
||||
@Override
|
||||
public void onInitialize() {
|
||||
AuthServiceConfig.register();
|
||||
LoginGate.register();
|
||||
}
|
||||
|
||||
|
||||
public static Identifier id(String path) {
|
||||
return Identifier.fromNamespaceAndPath(MOD_ID, path);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.fossy.oauth.mixin;
|
||||
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(MinecraftServer.class)
|
||||
public class ExampleMixin {
|
||||
@Inject(at = @At("HEAD"), method = "loadLevel")
|
||||
private void init(CallbackInfo info) {
|
||||
// This code is injected into the start of MinecraftServer.loadLevel()V
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 3.4 KiB |
@@ -0,0 +1,39 @@
|
||||
{
|
||||
"schemaVersion": 1,
|
||||
"id": "oauth",
|
||||
"version": "${version}",
|
||||
"name": "OAuth",
|
||||
"description": "This is an example description! Tell everyone what your mod is about!",
|
||||
"authors": [
|
||||
"Me!"
|
||||
],
|
||||
"contact": {
|
||||
"homepage": "https://fabricmc.net/",
|
||||
"sources": "https://github.com/FabricMC/fabric-example-mod"
|
||||
},
|
||||
"license": "CC0-1.0",
|
||||
"icon": "assets/oauth/icon.png",
|
||||
"environment": "*",
|
||||
"entrypoints": {
|
||||
"main": [
|
||||
"com.fossy.oauth.OAuth"
|
||||
],
|
||||
"client": [
|
||||
"com.fossy.oauth.client.OAuthClient"
|
||||
]
|
||||
},
|
||||
"mixins": [
|
||||
"oauth.mixins.json",
|
||||
{
|
||||
"config": "oauth.client.mixins.json",
|
||||
"environment": "client"
|
||||
}
|
||||
],
|
||||
"depends": {
|
||||
"fabricloader": ">=0.19.5",
|
||||
"minecraft": "~26.3",
|
||||
"java": ">=25",
|
||||
"fabric-api": "*",
|
||||
"cloth-config": ">=26.3.0"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"required": true,
|
||||
"package": "com.fossy.oauth.mixin",
|
||||
"compatibilityLevel": "JAVA_25",
|
||||
"mixins": [
|
||||
"ExampleMixin"
|
||||
],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
},
|
||||
"overwrites": {
|
||||
"requireAnnotations": true
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user