X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/b31e97dd2d344dc1d5cf928ed6bdb978cff1faa4..2e8e81a926acd1e18829e280fbf5161cb0947ccc:/src/main/java/org/asamk/signal/Main.java diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java index 45945c02..3da4fbcb 100644 --- a/src/main/java/org/asamk/signal/Main.java +++ b/src/main/java/org/asamk/signal/Main.java @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2021 AsamK and contributors + Copyright (C) 2015-2022 AsamK 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 @@ -17,50 +17,56 @@ package org.asamk.signal; import net.sourceforge.argparse4j.ArgumentParsers; +import net.sourceforge.argparse4j.DefaultSettings; import net.sourceforge.argparse4j.impl.Arguments; -import net.sourceforge.argparse4j.inf.ArgumentParser; import net.sourceforge.argparse4j.inf.ArgumentParserException; -import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup; import net.sourceforge.argparse4j.inf.Namespace; -import net.sourceforge.argparse4j.inf.Subparser; -import net.sourceforge.argparse4j.inf.Subparsers; -import org.asamk.signal.commands.Command; -import org.asamk.signal.commands.Commands; -import org.asamk.signal.manager.LibSignalLogger; +import org.asamk.signal.commands.exceptions.CommandException; +import org.asamk.signal.commands.exceptions.IOErrorException; +import org.asamk.signal.commands.exceptions.UnexpectedErrorException; +import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException; +import org.asamk.signal.commands.exceptions.UserErrorException; +import org.asamk.signal.manager.ManagerLogger; import org.asamk.signal.util.SecurityProvider; import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.slf4j.bridge.SLF4JBridgeHandler; +import java.io.File; import java.security.Security; -import java.util.Map; public class Main { public static void main(String[] args) { + // enable unlimited strength crypto via Policy, supported on relevant JREs + Security.setProperty("crypto.policy", "unlimited"); installSecurityProviderWorkaround(); // Configuring the logger needs to happen before any logger is initialized - if (isVerbose(args)) { - System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "debug"); - System.setProperty("org.slf4j.simpleLogger.showThreadName", "true"); - System.setProperty("org.slf4j.simpleLogger.showShortLogName", "false"); - System.setProperty("org.slf4j.simpleLogger.showDateTime", "true"); - System.setProperty("org.slf4j.simpleLogger.dateTimeFormat", "yyyy-MM-dd'T'HH:mm:ss.SSSXX"); - LibSignalLogger.initLogger(); - } else { - System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "info"); - System.setProperty("org.slf4j.simpleLogger.showThreadName", "false"); - System.setProperty("org.slf4j.simpleLogger.showShortLogName", "true"); - System.setProperty("org.slf4j.simpleLogger.showDateTime", "false"); - } - Namespace ns = parseArgs(args); - if (ns == null) { - System.exit(2); - } + final var nsLog = parseArgs(args); + final var verboseLevel = nsLog == null ? 0 : nsLog.getInt("verbose"); + final var logFile = nsLog == null ? null : nsLog.get("log-file"); + configureLogging(verboseLevel, logFile); + + var parser = App.buildArgumentParser(); - int res = new Cli(ns).init(); - System.exit(res); + var ns = parser.parseArgsOrFail(args); + + int status = 0; + try { + new App(ns).init(); + } catch (CommandException e) { + System.err.println(e.getMessage()); + if (verboseLevel > 0 && e.getCause() != null) { + e.getCause().printStackTrace(); + } + status = getStatusForError(e); + } catch (Throwable e) { + e.printStackTrace(); + status = 2; + } + System.exit(status); } private static void installSecurityProviderWorkaround() { @@ -69,76 +75,45 @@ public class Main { Security.addProvider(new BouncyCastleProvider()); } - private static boolean isVerbose(String[] args) { - ArgumentParser parser = buildBaseArgumentParser(); - - Namespace ns; - try { - ns = parser.parseKnownArgs(args, null); - } catch (ArgumentParserException e) { - return false; - } - - return ns.getBoolean("verbose"); - } - private static Namespace parseArgs(String[] args) { - ArgumentParser parser = buildArgumentParser(); + var parser = ArgumentParsers.newFor("signal-cli", DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS) + .includeArgumentNamesAsKeysInResult(true) + .build() + .defaultHelp(false); + parser.addArgument("-v", "--verbose").action(Arguments.count()); + parser.addArgument("--log-file").type(File.class); - Namespace ns; try { - ns = parser.parseArgs(args); + return parser.parseKnownArgs(args, null); } catch (ArgumentParserException e) { - parser.handleError(e); return null; } - - return ns; } - private static ArgumentParser buildArgumentParser() { - ArgumentParser parser = buildBaseArgumentParser(); - - Subparsers subparsers = parser.addSubparsers() - .title("subcommands") - .dest("command") - .description("valid subcommands") - .help("additional help"); + private static void configureLogging(final int verboseLevel, final File logFile) { + LogConfigurator.setVerboseLevel(verboseLevel); + LogConfigurator.setLogFile(logFile); - final Map commands = Commands.getCommands(); - for (Map.Entry entry : commands.entrySet()) { - Subparser subparser = subparsers.addParser(entry.getKey()); - entry.getValue().attachToSubparser(subparser); + if (verboseLevel > 0) { + java.util.logging.Logger.getLogger("") + .setLevel(verboseLevel > 2 ? java.util.logging.Level.FINEST : java.util.logging.Level.INFO); + ManagerLogger.initLogger(); } - - return parser; + SLF4JBridgeHandler.removeHandlersForRootLogger(); + SLF4JBridgeHandler.install(); } - private static ArgumentParser buildBaseArgumentParser() { - ArgumentParser parser = ArgumentParsers.newFor("signal-cli") - .build() - .defaultHelp(true) - .description("Commandline interface for Signal.") - .version(BaseConfig.PROJECT_NAME + " " + BaseConfig.PROJECT_VERSION); - - parser.addArgument("-v", "--version").help("Show package version.").action(Arguments.version()); - parser.addArgument("--verbose") - .help("Raise log level and include lib signal logs.") - .action(Arguments.storeTrue()); - parser.addArgument("--config") - .help("Set the path, where to store the config (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli)."); - - parser.addArgument("-u", "--username").help("Specify your phone number, that will be used for verification."); - - MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup(); - mut.addArgument("--dbus").help("Make request via user dbus.").action(Arguments.storeTrue()); - mut.addArgument("--dbus-system").help("Make request via system dbus.").action(Arguments.storeTrue()); - - parser.addArgument("-o", "--output") - .help("Choose to output in plain text or JSON") - .choices("plain-text", "json") - .setDefault("plain-text"); - - return parser; + private static int getStatusForError(final CommandException e) { + if (e instanceof UserErrorException) { + return 1; + } else if (e instanceof UnexpectedErrorException) { + return 2; + } else if (e instanceof IOErrorException) { + return 3; + } else if (e instanceof UntrustedKeyErrorException) { + return 4; + } else { + return 2; + } } }