...
 
Commits (2)
......@@ -40,7 +40,6 @@ dependencies {
compile 'com.kohlschutter.junixsocket:junixsocket-native-common:2.3.2'
compile 'org.apache.logging.log4j:log4j-api:2.13.3'
compile 'org.apache.logging.log4j:log4j-core:2.13.3'
compile 'io.sentry:sentry-log4j2:1.7.30'
compile 'org.slf4j:slf4j-nop:1.8.0-beta4'
compile 'info.picocli:picocli:4.3.2'
testCompile 'org.junit.jupiter:junit-jupiter-api:5.3.1'
......
......@@ -17,35 +17,26 @@
package io.finn.signald;
import io.finn.signald.BuildConfig;
import java.io.File;
import java.io.IOException;
import java.net.Socket;
import java.nio.file.Files;
import java.security.Security;
import java.util.concurrent.ConcurrentHashMap;
import io.finn.signald.storage.AccountData;
import org.newsclub.net.unix.AFUNIXServerSocket;
import org.newsclub.net.unix.AFUNIXSocketAddress;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.config.Configurator;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.asamk.signal.util.SecurityProvider;
import io.sentry.Sentry;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.newsclub.net.unix.AFUNIXServerSocket;
import org.newsclub.net.unix.AFUNIXSocketAddress;
import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider;
import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider;
import java.io.File;
import java.io.IOException;
import java.net.Socket;
import java.nio.file.Files;
import java.security.Security;
import java.util.concurrent.ConcurrentHashMap;
@Command(name=BuildConfig.NAME, mixinStandardHelpOptions=true, version=BuildConfig.NAME + " " + BuildConfig.VERSION)
......@@ -75,11 +66,6 @@ public class Main implements Runnable {
logger.debug("Starting " + BuildConfig.NAME + " " + BuildConfig.VERSION);
try {
Sentry.init();
Sentry.getContext().addExtra("release", BuildConfig.VERSION);
Sentry.getContext().addExtra("signal_url", BuildConfig.SIGNAL_URL);
Sentry.getContext().addExtra("signal_cdn_url", BuildConfig.SIGNAL_CDN_URL);
// Workaround for BKS truststore
Security.insertProviderAt(new SecurityProvider(), 1);
Security.addProvider(new BouncyCastleProvider());
......
......@@ -17,6 +17,7 @@
package io.finn.signald.clientprotocol.v1;
import org.asamk.signal.util.Hex;
import org.whispersystems.signalservice.api.messages.SendMessageResult;
public class JsonSendMessageResult {
......@@ -32,7 +33,7 @@ public class JsonSendMessageResult {
networkFailure = result.isNetworkFailure();
unregisteredFailure = result.isUnregisteredFailure();
if(result.getIdentityFailure() != null) {
identityFailure = result.getIdentityFailure().getIdentityKey().getFingerprint();
identityFailure = Hex.toStringCondensed(result.getIdentityFailure().getIdentityKey().serialize()).trim();
}
}
}
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" packages="org.apache.logging.log4j.core,io.sentry.log4j2">
<configuration status="warn">
<appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
</Console>
<Sentry name="Sentry" />
</appenders>
<loggers>
<root level="INFO">
<appender-ref ref="Console" />
<!-- Note that the Sentry logging threshold is overridden to the WARN level -->
<appender-ref ref="Sentry" level="WARN" />
</root>
</loggers>
</configuration>
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" packages="org.apache.logging.log4j.core,io.sentry.log4j2">
<configuration status="warn">
<appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
</Console>
<Sentry name="Sentry" />
</appenders>
<loggers>
<root level="DEBUG">
<appender-ref ref="Console" />
<!-- Note that the Sentry logging threshold is overridden to the WARN level -->
<appender-ref ref="Sentry" level="WARN" />
</root>
</loggers>
</configuration>