webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-09-07 14:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement Dbus commands

Browse source 
* String link()
* String link(String newDeviceName)
* void register(String number, boolean voiceVerification)
* void registerWithCaptcha(String number, boolean voiceVerification, String captcha)
* void verify(String number, String verificationCode)
* void verifyWithPin(String number, String verificationCode, String pin)

make dataPath and serviceEnvironment public from App class

make USER_AGENT ("signal-cli") public from BaseConfig class

add timeout error handling to finishDeviceLink method

update DBus documentation
This commit is contained in:
John Freed 2021-08-15 18:09:06 +02:00
parent 661d78e4a8
commit 2e7f4c7085
9 changed files with 149 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/org/asamk/Signal.java
View file

@ -1,6 +1,6 @@
package org.asamk;
import org.asamk.Signal.Error;
import org.asamk.SignalControl;
import org.asamk.signal.manager.AvatarStore;
import org.asamk.signal.manager.groups.GroupId;
import org.freedesktop.dbus.exceptions.DBusException;
@ -132,6 +132,22 @@ public interface Signal extends DBusInterface {
String getObjectPath();
String link() throws Error.Failure;
String link(String newDeviceName) throws Error.Failure;
void register(
String number, boolean voiceVerification
) throws Error.Failure, Error.InvalidNumber, SignalControl.Error.RequiresCaptcha;
void registerWithCaptcha(
final String number, final boolean voiceVerification, final String captcha
) throws Error.Failure, Error.InvalidNumber, SignalControl.Error.RequiresCaptcha;
void verify(String number, String verificationCode) throws Error.Failure, Error.InvalidNumber;
void verifyWithPin(String number, String verificationCode, String pin) throws Error.Failure, Error.InvalidNumber;
List<String> listNumbers();
List<String> listDevices() throws Error.Failure;

20
src/main/java/org/asamk/SignalControl.java
View file

@ -12,25 +12,7 @@ import java.util.List;
*/
public interface SignalControl extends DBusInterface {
void register(
String number, boolean voiceVerification
) throws Error.Failure, Error.InvalidNumber, Error.RequiresCaptcha;
void registerWithCaptcha(
String number, boolean voiceVerification, String captcha
) throws Error.Failure, Error.InvalidNumber, Error.RequiresCaptcha;
void verify(String number, String verificationCode) throws Error.Failure, Error.InvalidNumber;
void verifyWithPin(String number, String verificationCode, String pin) throws Error.Failure, Error.InvalidNumber;
String link(String newDeviceName) throws Error.Failure;
String version();
List<DBusPath> listAccounts();
String getObjectPath();
List<DBusPath> listAccounts();
interface Error {

16
src/main/java/org/asamk/signal/App.java
View file

@ -43,6 +43,8 @@ public class App {
private final static Logger logger = LoggerFactory.getLogger(App.class);
private final Namespace ns;
public static File dataPath;
public static ServiceEnvironment serviceEnvironment;
static ArgumentParser buildArgumentParser() {
var parser = ArgumentParsers.newFor("signal-cli", VERSION_0_9_0_DEFAULT_SETTINGS)
@ -85,8 +87,14 @@ public class App {
return parser;
}
public App(final Namespace ns) {
public App(
final Namespace ns,
File dataPath,
ServiceEnvironment serviceEnvironment
) {
this.ns = ns;
this.dataPath = dataPath;
this.serviceEnvironment = serviceEnvironment;
}
public void init() throws CommandException {
@ -105,7 +113,7 @@ public class App {
throw new UserErrorException("Command doesn't support output type " + outputType.toString());
}
var username = ns.getString("username");
String username = ns.getString("username");
final var useDbus = ns.getBoolean("dbus");
final var useDbusSystem = ns.getBoolean("dbus-system");
@ -115,7 +123,7 @@ public class App {
return;
}
final File dataPath;
// final File dataPath;
var config = ns.getString("config");
if (config != null) {
dataPath = new File(config);
@ -124,7 +132,7 @@ public class App {
}
final var serviceEnvironmentCli = ns.<ServiceEnvironmentCli>get("service-environment");
final var serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE
serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE
? ServiceEnvironment.LIVE
: ServiceEnvironment.SANDBOX;

2
src/main/java/org/asamk/signal/BaseConfig.java
View file

@ -5,7 +5,7 @@ public class BaseConfig {
public final static String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
public final static String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
final static String USER_AGENT = PROJECT_NAME == null ? "signal-cli" : PROJECT_NAME + " " + PROJECT_VERSION;
public final static String USER_AGENT = PROJECT_NAME == null ? "signal-cli" : PROJECT_NAME + " " + PROJECT_VERSION;
private BaseConfig() {
}

6
src/main/java/org/asamk/signal/Main.java
View file

@ -27,9 +27,11 @@ 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.LibSignalLogger;
import org.asamk.signal.manager.config.ServiceEnvironment;
import org.asamk.signal.util.SecurityProvider;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import java.io.File;
import java.security.Security;
public class Main {
@ -45,10 +47,12 @@ public class Main {
var parser = App.buildArgumentParser();
var ns = parser.parseArgsOrFail(args);
File dataPath = null;
ServiceEnvironment serviceEnvironment = null;
int status = 0;
try {
new App(ns).init();
new App(ns, dataPath, serviceEnvironment).init();
} catch (CommandException e) {
System.err.println(e.getMessage());
status = getStatusForError(e);

71
src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
View file

@ -1,13 +1,17 @@
package org.asamk.signal.dbus;
import org.asamk.SignalControl;
import org.asamk.signal.App;
import org.asamk.signal.BaseConfig;
import org.asamk.signal.DbusConfig;
import org.asamk.signal.commands.SignalCreator;
import org.asamk.signal.manager.Manager;
import org.asamk.signal.manager.PathConfig;
import org.asamk.signal.manager.ProvisioningManager;
import org.asamk.signal.manager.RegistrationManager;
import org.asamk.signal.manager.UserAlreadyExists;
import org.asamk.signal.manager.config.ServiceConfig;
import org.asamk.signal.manager.config.ServiceEnvironment;
import org.freedesktop.dbus.DBusPath;
import org.whispersystems.libsignal.util.Pair;
import org.whispersystems.signalservice.api.KeyBackupServicePinException;
@ -15,6 +19,7 @@ import org.whispersystems.signalservice.api.KeyBackupSystemNoDataException;
import org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException;
import java.io.IOException;
import java.lang.System.Logger;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
@ -24,12 +29,12 @@ import java.util.stream.Collectors;
public class DbusSignalControlImpl implements org.asamk.SignalControl {
private final SignalCreator c;
private final Function<Manager, Thread> newManagerRunner;
private static SignalCreator c;
private static Function<Manager, Thread> newManagerRunner;
private final List<Pair<Manager, Thread>> receiveThreads = new ArrayList<>();
private final Object stopTrigger = new Object();
private final String objectPath;
private static List<Pair<Manager, Thread>> receiveThreads = new ArrayList<>();
private static Object stopTrigger = new Object();
private static String objectPath;
public DbusSignalControlImpl(
final SignalCreator c, final Function<Manager, Thread> newManagerRunner, final String objectPath
@ -39,7 +44,7 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
this.objectPath = objectPath;
}
public void addManager(Manager m) {
public static void addManager(Manager m) {
var thread = newManagerRunner.apply(m);
if (thread == null) {
return;
@ -78,30 +83,39 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
}
}
/*
@Override
public boolean isRemote() {
return false;
}
*/
@Override
public String getObjectPath() {
return objectPath;
}
@Override
public void register(
public static void register(
final String number, final boolean voiceVerification
) throws Error.Failure, Error.InvalidNumber {
) {
registerWithCaptcha(number, voiceVerification, null);
}
@Override
public void registerWithCaptcha(
public static void registerWithCaptcha(
final String number, final boolean voiceVerification, final String captcha
) throws Error.Failure, Error.InvalidNumber {
try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {
) {
RegistrationManager registrationManager = null;
try {
registrationManager =
RegistrationManager.init(number, App.dataPath, App.serviceEnvironment, BaseConfig.USER_AGENT);
registrationManager.register(voiceVerification, captcha);
System.out.println("registered");
} catch (CaptchaRequiredException e) {
try {
registrationManager.close();
} catch (IOException f) {
throw new SignalControl.Error.Failure(f.getClass().getSimpleName() + " " + f.getMessage());
}
String message = captcha == null ? "Captcha required for verification." : "Invalid captcha given.";
throw new SignalControl.Error.RequiresCaptcha(message);
} catch (IOException e) {
@ -109,16 +123,16 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
}
}
@Override
public void verify(final String number, final String verificationCode) throws Error.Failure, Error.InvalidNumber {
public static void verify(final String number, final String verificationCode) {
verifyWithPin(number, verificationCode, null);
}
@Override
public void verifyWithPin(
final String number, final String verificationCode, final String pin
) throws Error.Failure, Error.InvalidNumber {
try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {
public static void verifyWithPin(final String number, final String verificationCode, final String pin)
{
RegistrationManager registrationManager = null;
try {
registrationManager =
RegistrationManager.init(number, App.dataPath, App.serviceEnvironment, BaseConfig.USER_AGENT);
final Manager manager = registrationManager.verifyAccount(verificationCode, pin);
addManager(manager);
} catch (IOException | KeyBackupSystemNoDataException | KeyBackupServicePinException e) {
@ -126,17 +140,20 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
}
}
@Override
public String link(final String newDeviceName) throws Error.Failure {
public static String link() {
return link("cli");
}
public static String link(final String newDeviceName) {
try {
final ProvisioningManager provisioningManager = c.getNewProvisioningManager();
final ProvisioningManager provisioningManager =
ProvisioningManager.init(App.dataPath, App.serviceEnvironment, BaseConfig.USER_AGENT);
final URI deviceLinkUri = provisioningManager.getDeviceLinkUri();
new Thread(() -> {
try {
final Manager manager = provisioningManager.finishDeviceLink(newDeviceName);
Manager manager = provisioningManager.finishDeviceLink(newDeviceName);
addManager(manager);
} catch (IOException | TimeoutException | UserAlreadyExists e) {
e.printStackTrace();
}
}).start();
return deviceLinkUri.toString();
@ -145,11 +162,11 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
}
}
@Override
public String version() {
public static String version() {
return BaseConfig.PROJECT_VERSION;
}
@Override
public List<DBusPath> listAccounts() {
synchronized (receiveThreads) {

96
src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
View file

@ -1,6 +1,8 @@
package org.asamk.signal.dbus;
import org.asamk.Signal;
import org.asamk.SignalControl;
import org.asamk.SignalControl.Error;
import org.asamk.signal.BaseConfig;
import org.asamk.signal.OutputWriter;
import org.asamk.signal.PlainTextWriter;
@ -250,7 +252,7 @@ public class DbusSignalImpl implements Signal {
@Override
public long sendNoteToSelfMessage(
final String message, final List<String> attachments
) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
) {
try {
final var results = m.sendSelfMessage(message, attachments);
checkSendMessageResult(results.first(), results.second());
@ -528,61 +530,6 @@ public class DbusSignalImpl implements Signal {
return Base64.getEncoder().encodeToString(groupId);
}
/*
GroupLinkState getGroupLinkState(String value) throws UserErrorException {
if (value == null) {
return null;
}
switch (value) {
case "enabled":
return GroupLinkState.ENABLED;
case "enabled-with-approval":
case "enabledWithApproval":
return GroupLinkState.ENABLED_WITH_APPROVAL;
case "disabled":
return GroupLinkState.DISABLED;
default:
throw new UserErrorException("Invalid group link state: " + value);
}
}
GroupPermission getGroupPermission(String value) throws UserErrorException {
if (value == null) {
return null;
}
switch (value) {
case "every-member":
case "everyMember":
return GroupPermission.EVERY_MEMBER;
case "only-admins":
case "onlyAdmins":
return GroupPermission.ONLY_ADMINS;
default:
throw new UserErrorException("Invalid group permission: " + value);
}
}
*/
/*
*
*
public Pair<Long, List<SendMessageResult>> updateGroup(
GroupId groupId,
String name,
String description,
List<String> addMembers,
List<String> removeMembers,
List<String> addAdmins,
List<String> removeAdmins,
boolean resetGroupLink,
GroupLinkState groupLinkState,
GroupPermission addMemberPermission,
GroupPermission editDetailsPermission,
File avatarFile,
Integer expirationTimer
*/
@Override
public String updateGroup(
String base64GroupId,
@ -737,9 +684,44 @@ Integer expirationTimer
// future interface changes
@Override
public String version() {
return BaseConfig.PROJECT_VERSION;
return DbusSignalControlImpl.version();
}
@Override
public String link() {
return DbusSignalControlImpl.link();
}
@Override
public String link(String newDeviceName) {
return DbusSignalControlImpl.link(newDeviceName);
}
@Override
public void register(
String number, boolean voiceVerification
) {
DbusSignalControlImpl.register(number, voiceVerification);
}
@Override
public void registerWithCaptcha(
String number, boolean voiceVerification, String captcha
) {
DbusSignalControlImpl.registerWithCaptcha(number, voiceVerification, captcha);
}
@Override
public void verify(String number, String verificationCode) {
DbusSignalControlImpl.verify(number, verificationCode);
}
@Override
public void verifyWithPin(String number, String verificationCode, String pin) {
DbusSignalControlImpl.verifyWithPin(number, verificationCode, pin);
}
// Create a unique list of Numbers from Identities and Contacts to really get
// all numbers the system knows
@Override