diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..db8e76a4 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,39 @@ +name: Plugin Build + +on: + workflow_dispatch: + push: + pull_request: + branches: + - master + +jobs: + build: + if: ${{ !contains(github.event.head_commit.message, '[skip]') }} + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Cache Gradle Packages + uses: actions/cache@v4 + with: + key: ${{ runner.os }}-Build-Cache + path: | + ~/.gradle/caches + ~/.gradle/wrapper + - name: Validate Gradle Wrapper + uses: gradle/actions/wrapper-validation@v3 + - name: Setup Java + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 21 + - name: Make Gradle Wrapper Executable + run: chmod +x ./gradlew + - name: Build + run: ./gradlew clean build + - name: Capture Build Artifacts + uses: actions/upload-artifact@v4 + with: + name: Artifacts + path: outs/ diff --git a/.gitignore b/.gitignore index 63ea4bd9..97923035 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ +.gradle +.idea +build +outs + ### Java files ### *.class MANIFEST.MF diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..4c1487d8 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,188 @@ +plugins { + `java-library` + `maven-publish` + id("com.github.johnrengelman.shadow") version "8.1.1" +} + +description = "Fork of the first authentication plugin for the Bukkit API!" + +java { + withSourcesJar() + sourceCompatibility = JavaVersion.VERSION_1_8 +} + +tasks.withType { + options.encoding = "UTF-8" +} + +repositories { + mavenCentral() + mavenLocal() + // PaperMC + maven("https://papermc.io/repo/repository/maven-public/") + maven("https://repo.opencollab.dev/main/") + maven("https://repo.opencollab.dev/maven-snapshots/") + maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") + maven("https://repository.apache.org/content/repositories/snapshots/") + maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") + maven("https://repo.codemc.io/repository/maven-public/") + maven("https://repo.essentialsx.net/releases/") + maven("https://repo.dmulloy2.net/nexus/repository/releases/") + maven("https://repo.dmulloy2.net/nexus/repository/snapshots/") + maven("https://repo.onarandombox.com/content/repositories/multiverse/") + maven("https://repo.onarandombox.com/content/repositories/multiverse-snapshots/") + maven("https://nexuslite.gcnt.net/repos/other/") + maven("https://jitpack.io/") + maven("https://repo.maven.apache.org/maven2/") +} + +dependencies { + // Spigot API, https://www.spigotmc.org/ + compileOnly("org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT") + // Java Libraries + compileOnly("org.geysermc.floodgate:api:2.2.2-SNAPSHOT") + // Jalu Injector + implementation("ch.jalu:injector:1.0") + // String comparison library. Used for dynamic help system. + implementation("net.ricecode:string-similarity:1.0.0") + // MaxMind GEO IP with our modifications to use GSON in replacement of the big Jackson dependency + // GSON is already included and therefore it reduces the file size in comparison to the original version + implementation("com.maxmind.db:maxmind-db-gson:2.0.3") { + exclude("com.google.code.gson", "gson") + } + // Library for tar archives + implementation("javatar:javatar:2.5") + // Java Email Library + implementation("org.apache.commons:commons-email:1.6-SNAPSHOT") + // Log4J Logger (required by the console filter) + compileOnly("org.apache.logging.log4j:log4j-core:2.20.0") // Log4J version bundled in 1.12.2 + // Libby + implementation("com.alessiodp.libby:libby-bukkit:2.0.0-SNAPSHOT") + // Database Connection Pool + implementation("com.zaxxer:HikariCP:4.0.3" /* Latest java 8 release */) { + exclude("org.slf4j", "slf4j-api") + } + // HikariCP Logger + implementation("org.slf4j:slf4j-simple:1.7.36") // We can't update to 2.x as long as we use HikariCP for java 8 + // PBKDF2 implementation + implementation("de.rtner:PBKDF2:1.1.4") + // MySQL connector, shaded into the legacy jar + implementation("com.mysql:mysql-connector-j:8.4.0") + implementation("org.mariadb.jdbc:mariadb-java-client:3.3.3") + // Argon2 implementation + implementation("de.mkammerer:argon2-jvm-nolibs:2.11") + // TOTP client + implementation("com.warrenstrange:googleauth:1.5.0") + // Keep in sync with spigot 1.19 + implementation("com.google.guava:guava:33.2.1-jre") { + exclude("org.checkerframework", "checker-qual") + } + implementation("com.google.code.gson:gson:2.10.1") + // ConfigMe + implementation("ch.jalu:configme:1.3.1") { + exclude("org.yaml", "snakeyaml") + } + // bStats metrics + implementation("org.bstats:bstats-bukkit:3.0.2") + // ProtocolLib + compileOnly("com.comphenix.protocol:ProtocolLib:5.1.0") + // Adventure API + implementation("net.kyori:adventure-text-minimessage:4.17.0") + implementation("net.kyori:adventure-platform-bukkit:4.3.2") + implementation("net.kyori:adventure-text-serializer-gson:4.17.0") + // LuckPerms plugin + compileOnly("net.luckperms:api:5.4") + // PermissionsEx plugin + compileOnly("ru.tehkode:PermissionsEx:1.23.5-SNAPSHOT") + // Dependencies used by HAProxy feature +// implementation("io.netty:netty-codec-haproxy:4.1.104.Final") +// compileOnly("commons-validator:commons-validator:1.8.0") + // zPermissions plugin + compileOnly("org.tyrannyofheaven.bukkit:zPermissions:1.4.3-SNAPSHOT") { + exclude("org.avaje", "ebean") + } + // Vault, https://dev.bukkit.org/bukkit-plugins/vault/ + compileOnly("net.milkbowl.vault:VaultAPI:1.7") + // Multi World plugin, https://www.spigotmc.org/resources/multiverse-core.390/ + compileOnly("com.onarandombox.multiversecore:Multiverse-Core:4.3.1") + // EssentialsX plugin + compileOnly("net.essentialsx:EssentialsX:2.20.1") + // BCrypt implementation + implementation("at.favre.lib:bcrypt:0.10.2") + // XAuth, another authentication plugin, required by the database converter + compileOnly("de.luricos.bukkit:xAuth:2.6.1-SNAPSHOT") + implementation("ch.jalu:datasourcecolumns:0.1.1-SNAPSHOT") + implementation("org.postgresql:postgresql:42.7.3") { + exclude("org.checkerframework", "checker-qual") + } + // Required to mock the LuckPerms API + testImplementation("org.checkerframework:checker-qual:3.40.0") + // Universal Scheduler + implementation("com.github.Anon8281:UniversalScheduler:0.1.6") + // JDBC drivers for datasource integration tests + testImplementation("org.xerial:sqlite-jdbc:3.46.0.0") + compileOnly("com.h2database:h2:2.2.224") +} + +tasks { + build { dependsOn(shadowJar) } + // ShadowJar Config + shadowJar { + // Options + archiveAppendix.set("") + archiveClassifier.set("") + destinationDirectory.set(file("$rootDir/outs")) + // Libraries Relocate + relocate("org.apache.http", "fr.xephi.authme.libs.org.apache.http") + relocate("org.apache.commons", "fr.xephi.authme.libs.org.apache.commons") + relocate("waffle", "fr.xephi.authme.libs.waffle") + relocate("com.github.benmanes.caffeine", "fr.xephi.authme.libs.com.github.benmanes.caffeine") + relocate("com.google.common", "fr.xephi.authme.libs.com.google.common") + relocate("com.google.thirdparty", "fr.xephi.authme.libs.com.google.thirdparty") + relocate("com.google.j2objc", "fr.xephi.authme.libs.com.google.j2objc") + relocate("com.google.errorprone", "fr.xephi.authme.libs.com.google.errorprone") + relocate("com.google.gson", "fr.xephi.authme.libs.com.google.gson") + relocate("org.apache.http", "fr.xephi.authme.libs.org.apache.http") + relocate("org.apache.commons", "fr.xephi.authme.libs.org.apache.commons") + relocate("waffle", "fr.xephi.authme.libs.waffle") + relocate("com.github.benmanes.caffeine", "fr.xephi.authme.libs.com.github.benmanes.caffeine") + relocate("ch.jalu", "fr.xephi.authme.libs.ch.jalu") + relocate("com.zaxxer.hikari", "fr.xephi.authme.libs.com.zaxxer.hikari") + relocate("org.slf4j", "fr.xephi.authme.libs.org.slf4j") + relocate("com.maxmind.db", "fr.xephi.authme.libs.com.maxmind.db") + relocate("com.ice.tar", "fr.xephi.authme.libs.com.icetar.tar") + relocate("net.ricecode.similarity", "fr.xephi.authme.libs.ricecode.net.ricecode.similarity") + relocate("de.rtner", "fr.xephi.authme.libs.de.rtner") + relocate("org.picketbox", "fr.xephi.authme.libs.org.picketbox") + relocate("org.jboss.crypto", "fr.xephi.authme.libs.org.jboss.crypto") + relocate("org.jboss.security", "fr.xephi.authme.libs.org.jboss.security") + relocate("de.mkammerer", "fr.xephi.authme.libs.de.mkammerer") + relocate("com.warrenstrange", "fr.xephi.authme.libs.com.warrenstrange") + relocate("javax.inject", "fr.xephi.authme.libs.javax.inject") + relocate("at.favre.lib", "fr.xephi.authme.libs.at.favre.lib") + relocate("org.postgresql", "fr.xephi.authme.libs.org.postgresql") + // bStats metrics class + relocate("org.bstats", "fr.xephi.authme.libs.org.bstats") + relocate("org.mariadb.jdbc", "fr.xephi.authme.libs.org.mariadb.jdbc") + relocate( + "com.github.Anon8281.universalScheduler", + "fr.xephi.authme.libs.com.github.Anon8281.universalScheduler" + ) + relocate("com.mysql", "fr.xephi.authme.libs.com.mysql") + relocate("com.google.protobuf", "fr.xephi.authme.libs.com.google.protobuf") + relocate("io.netty", "fr.xephi.authme.libs.io.netty") + relocate("org.apache.commons.validator", "fr.xephi.authme.libs.org.apache.commons.validator") + relocate("com.alessiodp.libby", "fr.xephi.authme.libs.com.alessiodp.libby") + relocate("net.kyori.adventure", "fr.xephi.authme.libs.net.kyori.adventure") + relocate("net.kyori.examination", "fr.xephi.authme.libs.net.kyori.examination") + relocate("net.kyori.option", "fr.xephi.authme.libs.net.kyori.option") + } +} + +publishing { + publications { + create("maven") { + from(components["java"]) + } + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..95a9328a --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +group=fr.xephi +version=5.6.0-FORK-b50 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..e6441136 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..a4413138 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..b740cf13 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 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. +# + +############################################################################## +# +# Gradle 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 Gradle +# +# 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/HEAD/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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || 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 + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# 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" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + 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, 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" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..25da30db --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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 + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +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 + +goto fail + +: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 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..bfc72a3c --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "authme"