Parker2991/ViaProxy
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaProxy.git synced 2024-11-14 19:15:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Removed old CLI interface

Browse source
This commit is contained in:
RaphiMC 2024-04-26 19:21:16 +02:00
parent 1d5095c2ab
commit 912bc9d6ee
No known key found for this signature in database
GPG key ID: 0F6BB0657A03AC94
3 changed files with 1 additions and 209 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/net/raphimc/viaproxy/ViaProxy.java
View file

@ -37,7 +37,6 @@ import net.lenni0451.reflect.Methods;
import net.raphimc.netminecraft.constants.MCPipeline; import net.raphimc.netminecraft.constants.MCPipeline;
import net.raphimc.netminecraft.netty.connection.NetServer; import net.raphimc.netminecraft.netty.connection.NetServer;
import net.raphimc.viaproxy.cli.ConsoleHandler; import net.raphimc.viaproxy.cli.ConsoleHandler;
import net.raphimc.viaproxy.cli.options.Options;
import net.raphimc.viaproxy.plugins.PluginManager; import net.raphimc.viaproxy.plugins.PluginManager;
import net.raphimc.viaproxy.plugins.events.Client2ProxyHandlerCreationEvent; import net.raphimc.viaproxy.plugins.events.Client2ProxyHandlerCreationEvent;
import net.raphimc.viaproxy.plugins.events.ProxyStartEvent; import net.raphimc.viaproxy.plugins.events.ProxyStartEvent;
@ -113,8 +112,7 @@ public class ViaProxy {
final boolean useUI = args.length == 0 && !GraphicsEnvironment.isHeadless(); final boolean useUI = args.length == 0 && !GraphicsEnvironment.isHeadless();
final boolean useConfig = args.length == 2 && args[0].equals("config"); final boolean useConfig = args.length == 2 && args[0].equals("config");
final boolean useCLI = args.length > 0 && args[0].equals("cli"); final boolean useCLI = args.length > 0 && args[0].equals("cli");
final boolean useLegacyCLI = args.length > 0 && args[0].startsWith("-"); if (!useUI && !useConfig && !useCLI) {
if (!useUI && !useConfig && !useCLI && !useLegacyCLI) {
String fileName = "ViaProxy.jar"; String fileName = "ViaProxy.jar";
try { try {
fileName = new File(ViaProxy.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getName(); fileName = new File(ViaProxy.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getName();
@ -217,8 +215,6 @@ public class ViaProxy {
final String[] cliArgs = new String[args.length - 1]; final String[] cliArgs = new String[args.length - 1];
System.arraycopy(args, 1, cliArgs, 0, cliArgs.length); System.arraycopy(args, 1, cliArgs, 0, cliArgs.length);
CONFIG.loadFromArguments(cliArgs); CONFIG.loadFromArguments(cliArgs);
} else if (useLegacyCLI) {
Options.parse(args);
} else if (firstStart) { } else if (firstStart) {
Logger.LOGGER.info("This is the first start of ViaProxy. Please configure the settings in the " + viaProxyConfigFile.getName() + " file and restart ViaProxy."); Logger.LOGGER.info("This is the first start of ViaProxy. Please configure the settings in the " + viaProxyConfigFile.getName() + " file and restart ViaProxy.");
System.exit(0); System.exit(0);

200
src/main/java/net/raphimc/viaproxy/cli/options/Options.java
View file

@ -1,200 +0,0 @@
/*
* This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy
* Copyright (C) 2021-2024 RK_01/RaphiMC and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.raphimc.viaproxy.cli.options;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import joptsimple.OptionException;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import joptsimple.OptionSpec;
import net.raphimc.viaproxy.ViaProxy;
import net.raphimc.viaproxy.cli.BetterHelpFormatter;
import net.raphimc.viaproxy.cli.ProtocolVersionConverter;
import net.raphimc.viaproxy.plugins.events.PostOptionsParseEvent;
import net.raphimc.viaproxy.plugins.events.PreOptionsParseEvent;
import net.raphimc.viaproxy.protocoltranslator.viaproxy.ViaProxyConfig;
import net.raphimc.viaproxy.saves.impl.accounts.Account;
import net.raphimc.viaproxy.util.AddressUtil;
import net.raphimc.viaproxy.util.logging.Logger;
import java.io.IOException;
import java.net.SocketAddress;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.List;
import static java.util.Arrays.asList;
@Deprecated(forRemoval = true)
public class Options {
public static SocketAddress BIND_ADDRESS;
public static SocketAddress CONNECT_ADDRESS;
public static ProtocolVersion PROTOCOL_VERSION;
public static boolean OPENAUTHMOD_AUTH;
public static boolean ONLINE_MODE;
public static boolean BETACRAFT_AUTH;
public static Account MC_ACCOUNT;
public static URI PROXY_URL;
public static boolean IGNORE_PACKET_TRANSLATION_ERRORS;
public static boolean ALLOW_BETA_PINGING;
public static boolean CHAT_SIGNING;
public static int COMPRESSION_THRESHOLD = 256;
public static boolean SRV_MODE;
public static boolean INTERNAL_SRV_MODE;
public static String RESOURCE_PACK_URL;
public static boolean SERVER_HAPROXY_PROTOCOL;
public static boolean LEGACY_CLIENT_PASSTHROUGH;
public static void parse(final String[] args) throws IOException {
Logger.LOGGER.fatal("===============================================================================================================");
Logger.LOGGER.fatal("You are using the old ViaProxy CLI which is deprecated and will be removed in the next version of ViaProxy. Please use the new CLI or config file instead. See the ViaProxy README on GitHub for more information.");
Logger.LOGGER.fatal("Waiting 10 seconds before continuing...");
Logger.LOGGER.fatal("===============================================================================================================");
try {
Thread.sleep(10000);
} catch (Throwable ignored) {
}
final OptionParser parser = new OptionParser();
final OptionSpec<Void> help = parser.acceptsAll(asList("help", "h", "?"), "Get a list of all arguments").forHelp();
final OptionSpec<String> bindAddress = parser.acceptsAll(asList("bind_address", "bind_ip", "ba"), "The address the proxy should bind to").withRequiredArg().ofType(String.class).defaultsTo("0.0.0.0:25568");
final OptionSpec<String> connectAddress = parser.acceptsAll(asList("connect_address", "target_ip", "ca", "a"), "The address of the target server").withRequiredArg().ofType(String.class).required();
final OptionSpec<ProtocolVersion> version = parser.acceptsAll(asList("version", "v"), "The version of the target server").withRequiredArg().withValuesConvertedBy(new ProtocolVersionConverter()).required();
final OptionSpec<Void> srvMode = parser.acceptsAll(asList("srv_mode", "srv", "s"), "Enable srv mode");
final OptionSpec<Void> iSrvMode = parser.acceptsAll(asList("internal_srv_mode", "isrv"), "Enable internal srv mode").availableUnless(srvMode);
final OptionSpec<Void> proxyOnlineMode = parser.acceptsAll(asList("online_mode", "om", "o"), "Enable proxy online mode");
final OptionSpec<Integer> compressionThreshold = parser.acceptsAll(asList("compression_threshold", "ct", "c"), "The threshold for packet compression").withRequiredArg().ofType(Integer.class).defaultsTo(COMPRESSION_THRESHOLD);
final OptionSpec<Void> openAuthModAuth = parser.acceptsAll(asList("openauthmod_auth", "oam_auth"), "Use OpenAuthMod for joining online mode servers");
final OptionSpec<Integer> guiAccountIndex = parser.acceptsAll(asList("gui_account_index", "gui_account"), "Use an account from the ViaProxy GUI for joining online mode servers (Specify -1 for instructions)").withRequiredArg().ofType(Integer.class);
final OptionSpec<Void> betaCraftAuth = parser.accepts("betacraft_auth", "Use BetaCraft authentication for classic servers");
final OptionSpec<String> resourcePackUrl = parser.acceptsAll(asList("resource_pack_url", "resource_pack", "rpu", "rp"), "URL of a resource pack which clients can optionally download").withRequiredArg().ofType(String.class);
final OptionSpec<String> proxyUrl = parser.acceptsAll(asList("proxy_url", "proxy"), "URL of a SOCKS(4/5)/HTTP(S) proxy which will be used for backend TCP connections").withRequiredArg().ofType(String.class);
final OptionSpec<Void> serverHaProxyProtocol = parser.acceptsAll(asList("server-haproxy-protocol", "server-haproxy"), "Send HAProxy protocol messages to the backend server");
final OptionSpec<Void> legacyClientPassthrough = parser.acceptsAll(asList("legacy_client_passthrough", "legacy_passthrough"), "Allow <= 1.6.4 clients to connect to the backend server (No protocol translation)");
final OptionSpec<Void> ignorePacketTranslationErrors = parser.acceptsAll(List.of("ignore-packet-translation-errors"), "Enabling this will prevent getting disconnected from the server when a packet translation error occurs and instead only print the error in the console. This may cause issues depending on the type of packet which failed to translate");
final OptionSpec<Void> allowBetaPinging = parser.acceptsAll(List.of("allow-beta-pinging"), "Enabling this will allow you to ping <= b1.7.3 servers. This may cause issues with servers that block too frequent connections");
ViaProxy.EVENT_MANAGER.call(new PreOptionsParseEvent(parser));
final OptionSet options;
try {
options = parser.parse(args);
if (options.has(help)) {
parser.formatHelpWith(new BetterHelpFormatter());
parser.printHelpOn(Logger.SYSOUT);
System.exit(1);
}
PROTOCOL_VERSION = options.valueOf(version);
BIND_ADDRESS = AddressUtil.parse(options.valueOf(bindAddress), null);
CONNECT_ADDRESS = AddressUtil.parse(options.valueOf(connectAddress), PROTOCOL_VERSION);
SRV_MODE = options.has(srvMode);
INTERNAL_SRV_MODE = options.has(iSrvMode);
OPENAUTHMOD_AUTH = options.has(openAuthModAuth);
ONLINE_MODE = options.has(proxyOnlineMode);
COMPRESSION_THRESHOLD = options.valueOf(compressionThreshold);
if (options.has(guiAccountIndex)) {
final List<Account> accounts = ViaProxy.getSaveManager().accountsSave.getAccounts();
final int index = options.valueOf(guiAccountIndex);
if (index < 0 || index >= accounts.size()) {
Logger.LOGGER.error("Invalid account index: " + index);
Logger.LOGGER.info("To use this feature you have to:");
Logger.LOGGER.info("1. Launch the ViaProxy GUI on your computer and add an account in the GUI");
Logger.LOGGER.info("2. Copy the 'saves.json' file from the directory of your ViaProxy GUI jar to the directory of the current ViaProxy CLI jar");
Logger.LOGGER.info("3. Specify the index of the account (See list below)");
Logger.LOGGER.info("=== Account list ===");
for (int i = 0; i < accounts.size(); i++) {
Logger.LOGGER.info(i + ": " + accounts.get(i).getDisplayString());
}
Logger.LOGGER.info("====================");
System.exit(1);
} else {
MC_ACCOUNT = accounts.get(index);
Logger.LOGGER.info("Using account: " + MC_ACCOUNT.getDisplayString() + " to join online mode servers");
}
}
BETACRAFT_AUTH = options.has(betaCraftAuth);
if (options.has(resourcePackUrl)) {
RESOURCE_PACK_URL = options.valueOf(resourcePackUrl);
}
if (options.has(proxyUrl)) {
try {
PROXY_URL = new URI(options.valueOf(proxyUrl));
} catch (URISyntaxException e) {
Logger.LOGGER.error("Invalid proxy url: " + options.valueOf(proxyUrl));
Logger.LOGGER.error("Proxy url format: type://address:port or type://username:password@address:port");
System.exit(1);
}
}
SERVER_HAPROXY_PROTOCOL = options.has(serverHaProxyProtocol);
LEGACY_CLIENT_PASSTHROUGH = options.has(legacyClientPassthrough);
IGNORE_PACKET_TRANSLATION_ERRORS = options.has(ignorePacketTranslationErrors);
ALLOW_BETA_PINGING = options.has(allowBetaPinging);
ViaProxy.EVENT_MANAGER.call(new PostOptionsParseEvent(options));
putToConfig(ViaProxy.getConfig());
} catch (OptionException e) {
Logger.LOGGER.error("Error parsing options: " + e.getMessage());
parser.formatHelpWith(new BetterHelpFormatter());
parser.printHelpOn(Logger.SYSOUT);
System.exit(1);
}
}
public static void putToConfig(final ViaProxyConfig config) {
config.setBindAddress(BIND_ADDRESS);
config.setTargetAddress(CONNECT_ADDRESS);
config.setTargetVersion(PROTOCOL_VERSION);
config.setProxyOnlineMode(ONLINE_MODE);
config.setBetacraftAuth(BETACRAFT_AUTH);
config.setAccount(MC_ACCOUNT);
config.setBackendProxyUrl(PROXY_URL);
config.setBackendHaProxy(SERVER_HAPROXY_PROTOCOL);
config.setChatSigning(CHAT_SIGNING);
config.setCompressionThreshold(COMPRESSION_THRESHOLD);
config.setResourcePackUrl(RESOURCE_PACK_URL);
config.setWildcardDomainHandling(SRV_MODE ? ViaProxyConfig.WildcardDomainHandling.PUBLIC : INTERNAL_SRV_MODE ? ViaProxyConfig.WildcardDomainHandling.INTERNAL : ViaProxyConfig.WildcardDomainHandling.NONE);
config.setAllowBetaPinging(ALLOW_BETA_PINGING);
config.setIgnoreProtocolTranslationErrors(IGNORE_PACKET_TRANSLATION_ERRORS);
config.setAllowLegacyClientPassthrough(LEGACY_CLIENT_PASSTHROUGH);
config.setAuthMethod(OPENAUTHMOD_AUTH ? ViaProxyConfig.AuthMethod.OPENAUTHMOD : ViaProxyConfig.AuthMethod.NONE);
}
public static void loadFromConfig(final ViaProxyConfig config) {
BIND_ADDRESS = config.getBindAddress();
CONNECT_ADDRESS = config.getTargetAddress();
PROTOCOL_VERSION = config.getTargetVersion();
ONLINE_MODE = config.isProxyOnlineMode();
BETACRAFT_AUTH = config.useBetacraftAuth();
MC_ACCOUNT = config.getAccount();
PROXY_URL = config.getBackendProxyUrl();
SERVER_HAPROXY_PROTOCOL = config.useBackendHaProxy();
CHAT_SIGNING = config.shouldSignChat();
COMPRESSION_THRESHOLD = config.getCompressionThreshold();
ALLOW_BETA_PINGING = config.shouldAllowBetaPinging();
IGNORE_PACKET_TRANSLATION_ERRORS = config.shouldIgnoreProtocolTranslationErrors();
LEGACY_CLIENT_PASSTHROUGH = config.shouldAllowLegacyClientPassthrough();
RESOURCE_PACK_URL = config.getResourcePackUrl();
SRV_MODE = config.getWildcardDomainHandling() == ViaProxyConfig.WildcardDomainHandling.PUBLIC;
INTERNAL_SRV_MODE = config.getWildcardDomainHandling() == ViaProxyConfig.WildcardDomainHandling.INTERNAL;
}
}

4
src/main/java/net/raphimc/viaproxy/protocoltranslator/viaproxy/ViaProxyConfig.java
View file

@ -27,7 +27,6 @@ import net.raphimc.viaproxy.ViaProxy;
import net.raphimc.viaproxy.cli.BetterHelpFormatter; import net.raphimc.viaproxy.cli.BetterHelpFormatter;
import net.raphimc.viaproxy.cli.HelpRequestedException; import net.raphimc.viaproxy.cli.HelpRequestedException;
import net.raphimc.viaproxy.cli.ProtocolVersionConverter; import net.raphimc.viaproxy.cli.ProtocolVersionConverter;
import net.raphimc.viaproxy.cli.options.Options;
import net.raphimc.viaproxy.plugins.events.PostOptionsParseEvent; import net.raphimc.viaproxy.plugins.events.PostOptionsParseEvent;
import net.raphimc.viaproxy.plugins.events.PreOptionsParseEvent; import net.raphimc.viaproxy.plugins.events.PreOptionsParseEvent;
import net.raphimc.viaproxy.protocoltranslator.ProtocolTranslator; import net.raphimc.viaproxy.protocoltranslator.ProtocolTranslator;
@ -132,7 +131,6 @@ public class ViaProxyConfig extends Config implements com.viaversion.viaversion.
this.allowLegacyClientPassthrough = this.getBoolean("allow-legacy-client-passthrough", this.allowLegacyClientPassthrough); this.allowLegacyClientPassthrough = this.getBoolean("allow-legacy-client-passthrough", this.allowLegacyClientPassthrough);
this.resourcePackUrl = this.getString("resource-pack-url", this.resourcePackUrl); this.resourcePackUrl = this.getString("resource-pack-url", this.resourcePackUrl);
this.wildcardDomainHandling = WildcardDomainHandling.byName(this.getString("wildcard-domain-handling", this.wildcardDomainHandling.name())); this.wildcardDomainHandling = WildcardDomainHandling.byName(this.getString("wildcard-domain-handling", this.wildcardDomainHandling.name()));
Options.loadFromConfig(this);
} }
public void loadFromArguments(final String[] args) throws IOException { public void loadFromArguments(final String[] args) throws IOException {
@ -159,7 +157,6 @@ public class ViaProxyConfig extends Config implements com.viaversion.viaversion.
this.resourcePackUrl = options.valueOf(this.optionResourcePackUrl); this.resourcePackUrl = options.valueOf(this.optionResourcePackUrl);
this.wildcardDomainHandling = options.valueOf(this.optionWildcardDomainHandling); this.wildcardDomainHandling = options.valueOf(this.optionWildcardDomainHandling);
ViaProxy.EVENT_MANAGER.call(new PostOptionsParseEvent(options)); ViaProxy.EVENT_MANAGER.call(new PostOptionsParseEvent(options));
Options.loadFromConfig(this);
return; return;
} catch (OptionException e) { } catch (OptionException e) {
Logger.LOGGER.error("Error parsing CLI options: " + e.getMessage()); Logger.LOGGER.error("Error parsing CLI options: " + e.getMessage());
@ -189,7 +186,6 @@ public class ViaProxyConfig extends Config implements com.viaversion.viaversion.
@Override @Override
public void set(String path, Object value) { public void set(String path, Object value) {
super.set(path, value); super.set(path, value);
Options.loadFromConfig(this);
} }
public SocketAddress getBindAddress() { public SocketAddress getBindAddress() {