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.ArgumentParserException;
import net.sourceforge.argparse4j.inf.Namespace;
import org.asamk.signal.commands.exceptions.CommandException;
import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.RateLimitErrorException;
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.Manager;
+import org.asamk.signal.logging.LogConfigurator;
+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;
public class Main {
installSecurityProviderWorkaround();
// Configuring the logger needs to happen before any logger is initialized
- final var verboseLevel = getVerboseLevel(args);
- configureLogging(verboseLevel);
+
+ final var nsLog = parseArgs(args);
+ final var verboseLevel = nsLog == null ? 0 : nsLog.getInt("verbose");
+ final var logFile = nsLog == null ? null : nsLog.<File>get("log-file");
+ final var scrubLog = nsLog != null && nsLog.getBoolean("scrub-log");
+ configureLogging(verboseLevel, logFile, scrubLog);
var parser = App.buildArgumentParser();
Security.addProvider(new BouncyCastleProvider());
}
- private static int getVerboseLevel(String[] args) {
- var parser = ArgumentParsers.newFor("signal-cli").build().defaultHelp(false);
- parser.addArgument("--verbose").action(Arguments.count());
+ private static Namespace parseArgs(String[] args) {
+ 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);
+ parser.addArgument("--scrub-log").action(Arguments.storeTrue());
- Namespace ns;
try {
- ns = parser.parseKnownArgs(args, null);
+ return parser.parseKnownArgs(args, null);
} catch (ArgumentParserException e) {
- return 0;
+ return null;
}
-
- return ns.getInt("verbose");
}
- private static void configureLogging(final int verboseLevel) {
- final var defaultLogLevel = verboseLevel > 1 ? "trace" : verboseLevel > 0 ? "debug" : "info";
- System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", defaultLogLevel);
+ private static void configureLogging(final int verboseLevel, final File logFile, final boolean scrubLog) {
+ LogConfigurator.setVerboseLevel(verboseLevel);
+ LogConfigurator.setLogFile(logFile);
+ LogConfigurator.setScrubSensitiveInformation(scrubLog);
+
if (verboseLevel > 0) {
- 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");
java.util.logging.Logger.getLogger("")
.setLevel(verboseLevel > 2 ? java.util.logging.Level.FINEST : java.util.logging.Level.INFO);
- Manager.initLogger();
- } else {
- System.setProperty("org.slf4j.simpleLogger.showThreadName", "false");
- System.setProperty("org.slf4j.simpleLogger.showShortLogName", "true");
- System.setProperty("org.slf4j.simpleLogger.showDateTime", "false");
+ ManagerLogger.initLogger();
}
SLF4JBridgeHandler.removeHandlersForRootLogger();
SLF4JBridgeHandler.install();
}
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;
- }
+ return switch (e) {
+ case UserErrorException userErrorException -> 1;
+ case UnexpectedErrorException unexpectedErrorException -> 2;
+ case IOErrorException ioErrorException -> 3;
+ case UntrustedKeyErrorException untrustedKeyErrorException -> 4;
+ case RateLimitErrorException rateLimitErrorException -> 5;
+ case null, default -> 2;
+ };
}
}