Update libsignal-service-java

[signal-cli] / src / main / java / org / asamk / signal / commands / DaemonCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index ee9368f87fb521096ed0004c2bc8aaa0b83b9f8d..e4a14f4ac975445694a5f67f236277d155b33daf 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -5,29 +5,38 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.DbusConfig;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.DbusConfig;

-import org.asamk.signal.DbusReceiveMessageHandler;
-import org.asamk.signal.JsonReceiveMessageHandler;
-import org.asamk.signal.JsonWriter;

 import org.asamk.signal.OutputType;
 import org.asamk.signal.OutputType;

-import org.asamk.signal.OutputWriter;
-import org.asamk.signal.PlainTextWriter;

 import org.asamk.signal.ReceiveMessageHandler;
 import org.asamk.signal.ReceiveMessageHandler;

+import org.asamk.signal.Shutdown;

 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.CommandException;

-import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
-import org.asamk.signal.dbus.DbusSignalControlImpl;
-import org.asamk.signal.dbus.DbusSignalImpl;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.dbus.DbusHandler;
+import org.asamk.signal.http.HttpServerHandler;
+import org.asamk.signal.json.JsonReceiveMessageHandler;
+import org.asamk.signal.jsonrpc.SocketHandler;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

-import org.freedesktop.dbus.connections.impl.DBusConnection;
-import org.freedesktop.dbus.exceptions.DBusException;
+import org.asamk.signal.manager.MultiAccountManager;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
+import org.asamk.signal.util.IOUtils;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

+import java.io.File;

 import java.io.IOException;
 import java.io.IOException;

+import java.net.InetSocketAddress;
+import java.net.UnixDomainSocketAddress;
+import java.nio.channels.Channel;
+import java.nio.channels.ServerSocketChannel;
+import java.util.ArrayList;

 import java.util.List;
 
 import java.util.List;
 

-public class DaemonCommand implements MultiLocalCommand {
+import static org.asamk.signal.util.CommandUtil.getReceiveConfig;

 
 

-    private final static Logger logger = LoggerFactory.getLogger(DaemonCommand.class);
+public class DaemonCommand implements MultiLocalCommand, LocalCommand {
+
+    private static final Logger logger = LoggerFactory.getLogger(DaemonCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {


@@ -36,13 +45,44 @@ public class DaemonCommand implements MultiLocalCommand {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {

-        subparser.help("Run in daemon mode and provide an experimental dbus interface.");
-        subparser.addArgument("--system")
+        final var defaultSocketPath = new File(new File(IOUtils.getRuntimeDir(), "signal-cli"), "socket");
+        subparser.help("Run in daemon mode and provide a JSON-RPC or an experimental dbus interface.");
+        subparser.addArgument("--dbus").action(Arguments.storeTrue()).help("Expose a DBus interface on the user bus.");
+        subparser.addArgument("--dbus-system", "--system")

                 .action(Arguments.storeTrue())
                 .action(Arguments.storeTrue())

-                .help("Use DBus system bus instead of user bus.");
+                .help("Expose a DBus interface on the system bus.");
+        subparser.addArgument("--bus-name")
+                .setDefault(DbusConfig.getBusname())
+                .help("Specify the D-Bus bus name to connect to.");
+        subparser.addArgument("--socket")
+                .nargs("?")
+                .type(File.class)
+                .setConst(defaultSocketPath)
+                .help("Expose a JSON-RPC interface on a UNIX socket (default $XDG_RUNTIME_DIR/signal-cli/socket).");
+        subparser.addArgument("--tcp")
+                .nargs("?")
+                .setConst("localhost:7583")
+                .help("Expose a JSON-RPC interface on a TCP socket (default localhost:7583).");
+        subparser.addArgument("--http")
+                .nargs("?")
+                .setConst("localhost:8080")
+                .help("Expose a JSON-RPC interface as http endpoint (default localhost:8080).");
+        subparser.addArgument("--no-receive-stdout")
+                .help("Don’t print received messages to stdout.")
+                .action(Arguments.storeTrue());
+        subparser.addArgument("--receive-mode")
+                .help("Specify when to start receiving messages.")
+                .type(Arguments.enumStringType(ReceiveMode.class))
+                .setDefault(ReceiveMode.ON_START);

         subparser.addArgument("--ignore-attachments")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("--ignore-attachments")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());

+        subparser.addArgument("--ignore-stories")
+                .help("Don’t receive story messages from the server.")
+                .action(Arguments.storeTrue());
+        subparser.addArgument("--send-read-receipts")
+                .help("Send read receipts for all incoming data messages (in addition to the default delivery receipts)")
+                .action(Arguments.storeTrue());

     }
 
     @Override
     }
 
     @Override


@@ -54,93 +94,220 @@ public class DaemonCommand implements MultiLocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {

-        boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
-        m.setIgnoreAttachments(ignoreAttachments);
+        Shutdown.installHandler();
+        logger.info("Starting daemon in single-account mode for " + m.getSelfNumber());
+        final var noReceiveStdOut = Boolean.TRUE.equals(ns.getBoolean("no-receive-stdout"));
+        final var receiveMode = ns.<ReceiveMode>get("receive-mode");
+        final var receiveConfig = getReceiveConfig(ns);

 
 

-        DBusConnection.DBusBusType busType;
-        if (Boolean.TRUE.equals(ns.getBoolean("system"))) {
-            busType = DBusConnection.DBusBusType.SYSTEM;
-        } else {
-            busType = DBusConnection.DBusBusType.SESSION;
-        }
+        m.setReceiveConfig(receiveConfig);
+        addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);

 
 

-        try (var conn = DBusConnection.getConnection(busType)) {
-            var objectPath = DbusConfig.getObjectPath();
-            var t = run(conn, objectPath, m, outputWriter);
+        try (final var daemonHandler = new SingleAccountDaemonHandler(m, receiveMode)) {
+            setup(ns, daemonHandler);

 
 

-            conn.requestBusName(DbusConfig.getBusname());
-            logger.info("DBus daemon running in single-user mode for " + m.getSelfNumber());
+            m.addClosedListener(Shutdown::triggerShutdown);

 
             try {
 
             try {

-                t.join();
-                synchronized (this) {
-                    wait();
-                }
+                Shutdown.waitForShutdown();

             } catch (InterruptedException ignored) {
             }
             } catch (InterruptedException ignored) {
             }

-        } catch (DBusException | IOException e) {
-            logger.error("Dbus command failed", e);
-            throw new UnexpectedErrorException("Dbus command failed", e);

         }
     }
 
     @Override
     public void handleCommand(
         }
     }
 
     @Override
     public void handleCommand(

-            final Namespace ns, final List<Manager> managers, final SignalCreator c, final OutputWriter outputWriter
+            final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter

     ) throws CommandException {
     ) throws CommandException {

-        boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
+        Shutdown.installHandler();
+        logger.info("Starting daemon in multi-account mode");
+        final var noReceiveStdOut = Boolean.TRUE.equals(ns.getBoolean("no-receive-stdout"));
+        final var receiveMode = ns.<ReceiveMode>get("receive-mode");
+        final var receiveConfig = getReceiveConfig(ns);
+        c.getManagers().forEach(m -> {
+            m.setReceiveConfig(receiveConfig);
+            addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
+        });
+        c.addOnManagerAddedHandler(m -> {
+            m.setReceiveConfig(receiveConfig);
+            addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
+        });

 
 

-        DBusConnection.DBusBusType busType;
-        if (Boolean.TRUE.equals(ns.getBoolean("system"))) {
-            busType = DBusConnection.DBusBusType.SYSTEM;
-        } else {
-            busType = DBusConnection.DBusBusType.SESSION;
-        }
+        try (final var daemonHandler = new MultiAccountDaemonHandler(c, receiveMode)) {
+            setup(ns, daemonHandler);

 
 

-        try (var conn = DBusConnection.getConnection(busType)) {
-            final var signalControl = new DbusSignalControlImpl(c, m -> {
-                m.setIgnoreAttachments(ignoreAttachments);
+            synchronized (this) {

                 try {
                 try {

-                    final var objectPath = DbusConfig.getObjectPath(m.getSelfNumber());
-                    return run(conn, objectPath, m, outputWriter);
-                } catch (DBusException e) {
-                    logger.error("Failed to export object", e);
-                    return null;
+                    Shutdown.waitForShutdown();
+                } catch (InterruptedException ignored) {

                 }
                 }

-            }, DbusConfig.getObjectPath());
-            conn.exportObject(signalControl);
+            }
+        }
+    }

 
 

-            for (var m : managers) {
-                signalControl.addManager(m);
+    private static void setup(final Namespace ns, final DaemonHandler daemonHandler) throws CommandException {
+        final Channel inheritedChannel;
+        try {
+            if (System.inheritedChannel() instanceof ServerSocketChannel serverChannel) {
+                inheritedChannel = serverChannel;
+                logger.info("Using inherited socket: " + serverChannel.getLocalAddress());
+                daemonHandler.runSocket(serverChannel);
+            } else {
+                inheritedChannel = null;

             }
             }

+        } catch (IOException e) {
+            throw new IOErrorException("Failed to use inherited socket", e);
+        }
+
+        final var socketFile = ns.<File>get("socket");
+        if (socketFile != null) {
+            final var address = UnixDomainSocketAddress.of(socketFile.toPath());
+            final var serverChannel = IOUtils.bindSocket(address);
+            daemonHandler.runSocket(serverChannel);
+        }
+
+        final var tcpAddress = ns.getString("tcp");
+        if (tcpAddress != null) {
+            final var address = IOUtils.parseInetSocketAddress(tcpAddress);
+            final var serverChannel = IOUtils.bindSocket(address);
+            daemonHandler.runSocket(serverChannel);
+        }

 
 

-            conn.requestBusName(DbusConfig.getBusname());
-            logger.info("DBus daemon running in mulit-account mode");
+        final var httpAddress = ns.getString("http");
+        if (httpAddress != null) {
+            final var address = IOUtils.parseInetSocketAddress(httpAddress);
+            daemonHandler.runHttp(address);
+        }
+
+        final var isDbusSystem = Boolean.TRUE.equals(ns.getBoolean("dbus-system"));
+        if (isDbusSystem) {
+            final var busName = ns.getString("bus-name");
+            daemonHandler.runDbus(true, busName);
+        }
+
+        final var isDbusSession = Boolean.TRUE.equals(ns.getBoolean("dbus"));
+        if (isDbusSession) {
+            final var busName = ns.getString("bus-name");
+            daemonHandler.runDbus(false, busName);
+        }

 
 

-            signalControl.run();
-        } catch (DBusException | IOException e) {
-            logger.error("Dbus command failed", e);
-            throw new UnexpectedErrorException("Dbus command failed", e);
+        if (!isDbusSystem
+                && !isDbusSession
+                && socketFile == null
+                && tcpAddress == null
+                && httpAddress == null
+                && inheritedChannel == null) {
+            logger.warn(
+                    "Running daemon command without explicit mode is deprecated. Use --dbus to use the dbus interface.");
+            daemonHandler.runDbus(false, DbusConfig.getBusname());

         }
     }
 
         }
     }
 

-    private Thread run(
-            DBusConnection conn, String objectPath, Manager m, OutputWriter outputWriter
-    ) throws DBusException {
-        final var signal = new DbusSignalImpl(m, conn, objectPath);
-        conn.exportObject(signal);
-        final var initThread = new Thread(signal::initObjects);
-        initThread.start();
+    private void addDefaultReceiveHandler(Manager m, OutputWriter outputWriter, final boolean isWeakListener) {
+        final var handler = switch (outputWriter) {
+            case PlainTextWriter writer -> new ReceiveMessageHandler(m, writer);
+            case JsonWriter writer -> new JsonReceiveMessageHandler(m, writer);
+            case null -> Manager.ReceiveMessageHandler.EMPTY;
+        };
+        m.addReceiveHandler(handler, isWeakListener);
+    }
+
+    private static abstract class DaemonHandler implements AutoCloseable {

 
 

-        logger.debug("Exported dbus object: " + objectPath);
+        protected final ReceiveMode receiveMode;
+        protected final List<AutoCloseable> closeables = new ArrayList<>();

 
 

-        final var handler = outputWriter instanceof JsonWriter ? new JsonReceiveMessageHandler(m,
-                (JsonWriter) outputWriter) : new ReceiveMessageHandler(m, (PlainTextWriter) outputWriter);
-        m.addReceiveHandler(handler);
+        protected DaemonHandler(final ReceiveMode receiveMode) {
+            this.receiveMode = receiveMode;
+        }

 
 

-        final var dbusMessageHandler = new DbusReceiveMessageHandler(m, conn, objectPath);
-        m.addReceiveHandler(dbusMessageHandler);
+        public abstract void runSocket(ServerSocketChannel serverChannel) throws CommandException;

 
 

-        return initThread;
+        public abstract void runDbus(boolean isDbusSystem, final String busname) throws CommandException;
+
+        public abstract void runHttp(InetSocketAddress address) throws CommandException;
+
+        protected final void runSocket(final SocketHandler socketHandler) {
+            socketHandler.init();
+            this.closeables.add(socketHandler);
+        }
+
+        protected final void runDbus(
+                DbusHandler dbusHandler
+        ) throws CommandException {
+            dbusHandler.init();
+            this.closeables.add(dbusHandler);
+        }
+
+        protected final void runHttp(final HttpServerHandler handler) throws CommandException {
+            try {
+                handler.init();
+            } catch (IOException ex) {
+                throw new IOErrorException("Failed to initialize HTTP Server", ex);
+            }
+            this.closeables.add(handler);
+        }
+
+        @Override
+        public void close() {
+            for (final var closeable : new ArrayList<>(this.closeables)) {
+                try {
+                    closeable.close();
+                } catch (Exception e) {
+                    logger.warn("Failed to close daemon handler", e);
+                }
+            }
+            this.closeables.clear();
+        }
+    }
+
+    private static final class SingleAccountDaemonHandler extends DaemonHandler {
+
+        private final Manager m;
+
+        public SingleAccountDaemonHandler(final Manager m, final ReceiveMode receiveMode) {
+            super(receiveMode);
+            this.m = m;
+        }
+
+        @Override
+        public void runSocket(final ServerSocketChannel serverChannel) {
+            runSocket(new SocketHandler(serverChannel, m, receiveMode == ReceiveMode.MANUAL));
+        }
+
+        @Override
+        public void runDbus(final boolean isDbusSystem, final String busname) throws CommandException {
+            runDbus(new DbusHandler(isDbusSystem, busname, m, receiveMode != ReceiveMode.ON_START));
+        }
+
+        @Override
+        public void runHttp(InetSocketAddress address) throws CommandException {
+            runHttp(new HttpServerHandler(address, m));
+        }
+    }
+
+    private static final class MultiAccountDaemonHandler extends DaemonHandler {
+
+        private final MultiAccountManager c;
+
+        public MultiAccountDaemonHandler(final MultiAccountManager c, final ReceiveMode receiveMode) {
+            super(receiveMode);
+            this.c = c;
+        }
+
+        @Override
+        public void runSocket(final ServerSocketChannel serverChannel) {
+            runSocket(new SocketHandler(serverChannel, c, receiveMode == ReceiveMode.MANUAL));
+        }
+
+        @Override
+        public void runDbus(final boolean isDbusSystem, final String busname) throws CommandException {
+            runDbus(new DbusHandler(isDbusSystem, busname, c, receiveMode != ReceiveMode.ON_START));
+        }
+
+        @Override
+        public void runHttp(final InetSocketAddress address) throws CommandException {
+            runHttp(new HttpServerHandler(address, c));
+        }

     }
 }
     }
 }