import org.asamk.signal.BaseConfig;
import org.asamk.signal.manager.Manager;
import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.CaptchaRejectedException;
+import org.asamk.signal.manager.api.DeviceLimitExceededException;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupLinkState;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.IdentityVerificationCode;
import org.asamk.signal.manager.api.InactiveGroupLinkException;
import org.asamk.signal.manager.api.InvalidDeviceLinkException;
import org.asamk.signal.manager.api.InvalidNumberException;
import org.asamk.signal.manager.api.InvalidStickerException;
+import org.asamk.signal.manager.api.LastGroupAdminException;
import org.asamk.signal.manager.api.Message;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
import org.asamk.signal.manager.api.NotPrimaryDeviceException;
import org.asamk.signal.manager.api.PendingAdminApprovalException;
+import org.asamk.signal.manager.api.RateLimitException;
import org.asamk.signal.manager.api.RecipientAddress;
import org.asamk.signal.manager.api.RecipientIdentifier;
import org.asamk.signal.manager.api.SendMessageResult;
import org.asamk.signal.manager.api.UpdateGroup;
import org.asamk.signal.manager.api.UpdateProfile;
import org.asamk.signal.manager.api.UserStatus;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupLinkState;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupPermission;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.LastGroupAdminException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.util.DateUtils;
import org.asamk.signal.util.SendMessageResultUtils;
import org.freedesktop.dbus.DBusPath;
import org.freedesktop.dbus.connections.impl.DBusConnection;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
+import java.util.UUID;
import java.util.stream.Collectors;
-public class DbusSignalImpl implements Signal {
+import static org.asamk.signal.dbus.DbusUtils.makeValidObjectPathElement;
+
+public class DbusSignalImpl implements Signal, AutoCloseable {
private final Manager m;
private final DBusConnection connection;
private DBusPath thisDevice;
private final List<StructDevice> devices = new ArrayList<>();
private final List<StructGroup> groups = new ArrayList<>();
+ private final List<StructIdentity> identities = new ArrayList<>();
private DbusReceiveMessageHandler dbusMessageHandler;
private int subscriberCount;
- private final static Logger logger = LoggerFactory.getLogger(DbusSignalImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(DbusSignalImpl.class);
public DbusSignalImpl(
- final Manager m, DBusConnection connection, final String objectPath, final boolean noReceiveOnStart
+ final Manager m,
+ DBusConnection connection,
+ final String objectPath,
+ final boolean noReceiveOnStart
) {
this.m = m;
this.connection = connection;
updateDevices();
updateGroups();
updateConfiguration();
+ updateIdentities();
}
+ @Override
public void close() {
if (dbusMessageHandler != null) {
m.removeReceiveHandler(dbusMessageHandler);
unExportDevices();
unExportGroups();
unExportConfiguration();
+ unExportIdentities();
connection.unExportObject(this.objectPath);
}
m.submitRateLimitRecaptchaChallenge(challenge, captcha);
} catch (IOException e) {
throw new Error.Failure("Submit challenge error: " + e.getMessage());
+ } catch (CaptchaRejectedException e) {
+ throw new Error.Failure(
+ "Captcha rejected, it may be outdated, already used or solved from a different IP address.");
}
-
}
@Override
@Override
public void addDevice(String uri) {
try {
- m.addDeviceLink(new URI(uri));
- } catch (IOException | InvalidDeviceLinkException e) {
+ var deviceLinkUrl = DeviceLinkUrl.parseDeviceLinkUri(new URI(uri));
+ m.addDeviceLink(deviceLinkUrl);
+ } catch (IOException | InvalidDeviceLinkException | DeviceLimitExceededException e) {
throw new Error.Failure(e.getClass().getSimpleName() + " Add device link failed. " + e.getMessage());
+ } catch (NotPrimaryDeviceException e) {
+ throw new Error.Failure("This command doesn't work on linked devices.");
} catch (URISyntaxException e) {
throw new Error.InvalidUri(e.getClass().getSimpleName()
+ " Device link uri has invalid format: "
}
@Override
- public long sendMessage(final String message, final List<String> attachments, final List<String> recipients) {
+ public long sendMessage(final String messageText, final List<String> attachments, final List<String> recipients) {
try {
- final var results = m.sendMessage(new Message(message,
- attachments,
- List.of(),
- Optional.empty(),
- Optional.empty(),
- List.of(),
- Optional.empty()),
- getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
- .map(RecipientIdentifier.class::cast)
- .collect(Collectors.toSet()));
+ final var message = new Message(messageText,
+ attachments,
+ false,
+ List.of(),
+ Optional.empty(),
+ Optional.empty(),
+ List.of(),
+ Optional.empty(),
+ List.of());
+ final var recipientIdentifiers = getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
+ .map(RecipientIdentifier.class::cast)
+ .collect(Collectors.toSet());
+ final var results = m.sendMessage(message, recipientIdentifiers, false);
checkSendMessageResults(results);
return results.timestamp();
}
@Override
- public long sendRemoteDeleteMessage(
- final long targetSentTimestamp, final String recipient
- ) {
+ public long sendRemoteDeleteMessage(final long targetSentTimestamp, final String recipient) {
return sendRemoteDeleteMessage(targetSentTimestamp, List.of(recipient));
}
@Override
- public long sendRemoteDeleteMessage(
- final long targetSentTimestamp, final List<String> recipients
- ) {
+ public long sendRemoteDeleteMessage(final long targetSentTimestamp, final List<String> recipients) {
try {
final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
@Override
public long sendPaymentNotification(
- final byte[] receipt, final String note, final String recipient
+ final byte[] receipt,
+ final String note,
+ final String recipient
) throws Error.Failure {
try {
final var results = m.sendPaymentNotificationMessage(receipt,
@Override
public void sendTyping(
- final String recipient, final boolean stop
+ final String recipient,
+ final boolean stop
) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
try {
final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
@Override
public void sendReadReceipt(
- final String recipient, final List<Long> messageIds
+ final String recipient,
+ final List<Long> messageIds
) throws Error.Failure, Error.UntrustedIdentity {
- try {
- final var results = m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()),
- messageIds);
- checkSendMessageResults(results);
- } catch (IOException e) {
- throw new Error.Failure(e.getMessage());
- }
+ final var results = m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()), messageIds);
+ checkSendMessageResults(results);
}
@Override
public void sendViewedReceipt(
- final String recipient, final List<Long> messageIds
+ final String recipient,
+ final List<Long> messageIds
) throws Error.Failure, Error.UntrustedIdentity {
- try {
- final var results = m.sendViewedReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()),
- messageIds);
- checkSendMessageResults(results);
- } catch (IOException e) {
- throw new Error.Failure(e.getMessage());
- }
+ final var results = m.sendViewedReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()), messageIds);
+ checkSendMessageResults(results);
}
@Override
@Override
public long sendNoteToSelfMessage(
- final String message, final List<String> attachments
+ final String messageText,
+ final List<String> attachments
) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
try {
- final var results = m.sendMessage(new Message(message,
+ final var message = new Message(messageText,
attachments,
+ false,
List.of(),
Optional.empty(),
Optional.empty(),
List.of(),
- Optional.empty()), Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
+ Optional.empty(),
+ List.of());
+ final var results = m.sendMessage(message, Set.of(RecipientIdentifier.NoteToSelf.INSTANCE), false);
checkSendMessageResults(results);
return results.timestamp();
} catch (AttachmentInvalidException e) {
}
@Override
- public long sendGroupMessage(final String message, final List<String> attachments, final byte[] groupId) {
+ public long sendGroupMessage(final String messageText, final List<String> attachments, final byte[] groupId) {
try {
- var results = m.sendMessage(new Message(message,
+ final var message = new Message(messageText,
attachments,
+ false,
List.of(),
Optional.empty(),
Optional.empty(),
List.of(),
- Optional.empty()), Set.of(getGroupRecipientIdentifier(groupId)));
+ Optional.empty(),
+ List.of());
+ var results = m.sendMessage(message, Set.of(getGroupRecipientIdentifier(groupId)), false);
checkSendMessageResults(results);
return results.timestamp();
} catch (IOException | InvalidStickerException e) {
@Override
public void sendGroupTyping(
- final byte[] groupId, final boolean stop
+ final byte[] groupId,
+ final boolean stop
) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
try {
final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
}
@Override
- public long sendGroupRemoteDeleteMessage(
- final long targetSentTimestamp, final byte[] groupId
- ) {
+ public long sendGroupRemoteDeleteMessage(final long targetSentTimestamp, final byte[] groupId) {
try {
final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
Set.of(getGroupRecipientIdentifier(groupId)));
@Override
public void setContactName(final String number, final String name) {
try {
- m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name, "");
+ m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name, "", null, null, null);
} catch (NotPrimaryDeviceException e) {
throw new Error.Failure("This command doesn't work on linked devices.");
- } catch (IOException e) {
- throw new Error.Failure("Contact is not registered.");
} catch (UnregisteredRecipientException e) {
throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
}
}
@Override
+ @Deprecated
public void setGroupBlocked(final byte[] groupId, final boolean blocked) {
try {
m.setGroupsBlocked(List.of(getGroupId(groupId)), blocked);
}
@Override
+ @Deprecated
public List<byte[]> getGroupIds() {
var groups = m.getGroups();
return groups.stream().map(g -> g.groupId().serialize()).toList();
}
@Override
+ @Deprecated
public String getGroupName(final byte[] groupId) {
var group = m.getGroup(getGroupId(groupId));
if (group == null || group.title() == null) {
}
@Override
+ @Deprecated
public List<String> getGroupMembers(final byte[] groupId) {
var group = m.getGroup(getGroupId(groupId));
if (group == null) {
@Override
public byte[] createGroup(
- final String name, final List<String> members, final String avatar
+ final String name,
+ final List<String> members,
+ final String avatar
) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber {
- return updateGroup(new byte[0], name, members, avatar);
+ return updateGroupInternal(new byte[0], name, members, avatar);
}
@Override
+ @Deprecated
public byte[] updateGroup(byte[] groupId, String name, List<String> members, String avatar) {
+ return updateGroupInternal(groupId, name, members, avatar);
+ }
+
+ public byte[] updateGroupInternal(byte[] groupId, String name, List<String> members, String avatar) {
try {
groupId = nullIfEmpty(groupId);
name = nullIfEmpty(name);
avatar = nullIfEmpty(avatar);
final var memberIdentifiers = getSingleRecipientIdentifiers(members, m.getSelfNumber());
if (groupId == null) {
- final var results = m.createGroup(name, memberIdentifiers, avatar == null ? null : new File(avatar));
+ final var results = m.createGroup(name, memberIdentifiers, avatar);
updateGroups();
checkGroupSendMessageResults(results.second().timestamp(), results.second().results());
return results.first().serialize();
UpdateGroup.newBuilder()
.withName(name)
.withMembers(memberIdentifiers)
- .withAvatarFile(avatar == null ? null : new File(avatar))
+ .withAvatarFile(avatar)
.build());
if (results != null) {
checkGroupSendMessageResults(results.timestamp(), results.results());
}
@Override
+ @Deprecated
public boolean isRegistered() {
return true;
}
@Override
public boolean isRegistered(String number) {
var result = isRegistered(List.of(number));
- return result.get(0);
+ return result.getFirst();
}
@Override
registered = m.getUserStatus(new HashSet<>(numbers));
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
+ } catch (RateLimitException e) {
+ throw new Error.Failure(e.getMessage()
+ + ", retry at "
+ + DateUtils.formatTimestamp(e.getNextAttemptTimestamp()));
}
return numbers.stream().map(number -> registered.get(number).uuid() != null).toList();
about = nullIfEmpty(about);
aboutEmoji = nullIfEmpty(aboutEmoji);
avatarPath = nullIfEmpty(avatarPath);
- File avatarFile = removeAvatar || avatarPath == null ? null : new File(avatarPath);
+ final var avatarFile = removeAvatar || avatarPath == null ? null : avatarPath;
m.updateProfile(UpdateProfile.newBuilder()
.withGivenName(givenName)
.withFamilyName(familyName)
}
@Override
+ @Deprecated
public void quitGroup(final byte[] groupId) {
var group = getGroupId(groupId);
try {
}
@Override
+ @Deprecated
public boolean isGroupBlocked(final byte[] groupId) {
var group = m.getGroup(getGroupId(groupId));
if (group == null) {
}
@Override
+ @Deprecated
public boolean isMember(final byte[] groupId) {
var group = m.getGroup(getGroupId(groupId));
if (group == null) {
}
private static void checkGroupSendMessageResults(
- long timestamp, Collection<SendMessageResult> results
+ long timestamp,
+ Collection<SendMessageResult> results
) throws DBusExecutionException {
if (results.size() == 1) {
checkSendMessageResult(timestamp, results.stream().findFirst().get());
}
var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results);
- if (errors.size() == 0 || errors.size() < results.size()) {
+ if (errors.isEmpty() || errors.size() < results.size()) {
return;
}
}
private static Set<RecipientIdentifier.Single> getSingleRecipientIdentifiers(
- final Collection<String> recipientStrings, final String localNumber
+ final Collection<String> recipientStrings,
+ final String localNumber
) throws DBusExecutionException {
final var identifiers = new HashSet<RecipientIdentifier.Single>();
for (var recipientString : recipientStrings) {
}
private static RecipientIdentifier.Single getSingleRecipientIdentifier(
- final String recipientString, final String localNumber
+ final String recipientString,
+ final String localNumber
) throws DBusExecutionException {
try {
return RecipientIdentifier.Single.fromString(recipientString, localNumber);
}
private static String getGroupObjectPath(String basePath, byte[] groupId) {
- return basePath + "/Groups/" + Base64.getEncoder()
- .encodeToString(groupId)
- .replace("+", "_")
- .replace("/", "_")
- .replace("=", "_");
+ return basePath + "/Groups/" + makeValidObjectPathElement(Base64.getEncoder().encodeToString(groupId));
}
private void updateGroups() {
connection.exportObject(object);
logger.debug("Exported dbus object: " + object.getObjectPath());
} catch (DBusException e) {
- e.printStackTrace();
+ logger.warn("Failed to export dbus object (" + object.getObjectPath() + "): " + e.getMessage());
+ }
+ }
+
+ private void updateIdentities() {
+ List<org.asamk.signal.manager.api.Identity> identities;
+ identities = m.getIdentities();
+
+ unExportIdentities();
+
+ identities.forEach(i -> {
+ final var object = new DbusSignalIdentityImpl(i);
+ exportObject(object);
+ this.identities.add(new StructIdentity(new DBusPath(object.getObjectPath()),
+ i.recipient().uuid().map(UUID::toString).orElse(""),
+ i.recipient().number().orElse("")));
+ });
+ }
+
+ private static String getIdentityObjectPath(String basePath, String id) {
+ return basePath + "/Identities/" + makeValidObjectPathElement(id);
+ }
+
+ private void unExportIdentities() {
+ this.identities.stream()
+ .map(StructIdentity::getObjectPath)
+ .map(DBusPath::getPath)
+ .forEach(connection::unExportObject);
+ this.identities.clear();
+ }
+
+ @Override
+ public DBusPath getIdentity(String number) throws Error.Failure {
+ final var found = identities.stream()
+ .filter(identity -> identity.getNumber().equals(number) || identity.getUuid().equals(number))
+ .findFirst();
+
+ if (found.isEmpty()) {
+ throw new Error.Failure("Identity for " + number + " unknown");
+ }
+ return found.get().getObjectPath();
+ }
+
+ @Override
+ public List<StructIdentity> listIdentities() {
+ updateIdentities();
+ return this.identities;
+ }
+
+ public class DbusSignalIdentityImpl extends DbusProperties implements Signal.Identity {
+
+ private final org.asamk.signal.manager.api.Identity identity;
+
+ public DbusSignalIdentityImpl(final org.asamk.signal.manager.api.Identity identity) {
+ this.identity = identity;
+ super.addPropertiesHandler(new DbusInterfacePropertiesHandler("org.asamk.Signal.Identity",
+ List.of(new DbusProperty<>("Number", () -> identity.recipient().number().orElse("")),
+ new DbusProperty<>("Uuid",
+ () -> identity.recipient().uuid().map(UUID::toString).orElse("")),
+ new DbusProperty<>("Fingerprint", identity::fingerprint),
+ new DbusProperty<>("SafetyNumber", identity::safetyNumber),
+ new DbusProperty<>("ScannableSafetyNumber", identity::scannableSafetyNumber),
+ new DbusProperty<>("TrustLevel", identity::trustLevel),
+ new DbusProperty<>("AddedDate", identity::dateAddedTimestamp))));
+ }
+
+ @Override
+ public String getObjectPath() {
+ return getIdentityObjectPath(objectPath,
+ identity.recipient().getLegacyIdentifier() + "_" + identity.recipient().getIdentifier());
+ }
+
+ @Override
+ public void trust() throws Error.Failure {
+ var recipient = RecipientIdentifier.Single.fromAddress(identity.recipient());
+ try {
+ m.trustIdentityAllKeys(recipient);
+ } catch (UnregisteredRecipientException e) {
+ throw new Error.Failure("The user " + e.getSender().getIdentifier() + " is not registered.");
+ }
+ updateIdentities();
+ }
+
+ @Override
+ public void trustVerified(String safetyNumber) throws Error.Failure {
+ var recipient = RecipientIdentifier.Single.fromAddress(identity.recipient());
+
+ if (safetyNumber == null) {
+ throw new Error.Failure("You need to specify a fingerprint/safety number");
+ }
+ final IdentityVerificationCode verificationCode;
+ try {
+ verificationCode = IdentityVerificationCode.parse(safetyNumber);
+ } catch (Exception e) {
+ throw new Error.Failure(
+ "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
+ }
+
+ try {
+ final var res = m.trustIdentityVerified(recipient, verificationCode);
+ if (!res) {
+ throw new Error.Failure(
+ "Failed to set the trust for this number, make sure the number and the fingerprint/safety number are correct.");
+ }
+ } catch (UnregisteredRecipientException e) {
+ throw new Error.Failure("The user " + e.getSender().getIdentifier() + " is not registered.");
+ }
+ updateIdentities();
}
}
try {
m.removeLinkedDevices(device.id());
updateDevices();
+ } catch (NotPrimaryDeviceException e) {
+ throw new Error.Failure("This command doesn't work on linked devices.");
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
}
throw new Error.Failure("Only the name of this device can be changed");
}
try {
- m.updateAccountAttributes(name);
+ m.updateAccountAttributes(name, null, null, null);
// update device list
updateDevices();
} catch (IOException e) {
public class DbusSignalConfigurationImpl extends DbusProperties implements Signal.Configuration {
- public DbusSignalConfigurationImpl(
- ) {
+ public DbusSignalConfigurationImpl() {
super.addPropertiesHandler(new DbusInterfacePropertiesHandler("org.asamk.Signal.Configuration",
List.of(new DbusProperty<>("ReadReceipts", this::getReadReceipts, this::setReadReceipts),
new DbusProperty<>("UnidentifiedDeliveryIndicators",
Optional.ofNullable(unidentifiedDeliveryIndicators),
Optional.ofNullable(typingIndicators),
Optional.ofNullable(linkPreviews)));
- } catch (IOException e) {
- throw new Error.Failure("UpdateAccount error: " + e.getMessage());
} catch (NotPrimaryDeviceException e) {
throw new Error.Failure("This command doesn't work on linked devices.");
}
public void quitGroup() throws Error.Failure {
try {
m.quitGroup(groupId, Set.of());
- } catch (GroupNotFoundException | NotAGroupMemberException e) {
+ } catch (GroupNotFoundException e) {
throw new Error.GroupNotFound(e.getMessage());
+ } catch (NotAGroupMemberException e) {
+ throw new Error.NotAGroupMember(e.getMessage());
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
} catch (LastGroupAdminException e) {
}
private void setGroupAvatar(final String avatar) {
- updateGroup(UpdateGroup.newBuilder().withAvatarFile(new File(avatar)).build());
+ updateGroup(UpdateGroup.newBuilder().withAvatarFile(avatar).build());
}
private void setMessageExpirationTime(final int expirationTime) {
git.nmode.ca / signal-cli / blobdiff
