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

Add helper method to create valid dbus object path

Browse source
This commit is contained in:
AsamK 2023-06-02 21:29:58 +02:00 • committed by Adimarantis
parent 5ee4b90c01
commit 6e19ae0231
2 changed files with 63 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -138,6 +138,10 @@ public interface Signal extends DBusInterface {
DBusPath getDevice(long deviceId); DBusPath getDevice(long deviceId);
public DBusPath getIdentity(String number);
public List<StructIdentity> listIdentities();
List<StructDevice> listDevices() throws Error.Failure; List<StructDevice> listDevices() throws Error.Failure;
DBusPath getThisDevice(); DBusPath getThisDevice();
@ -581,16 +585,18 @@ public interface Signal extends DBusInterface {
} }
} }
@DBusProperty(name = "id", type = String.class, access = DBusProperty.Access.READ) @DBusProperty(name = "number", type = String.class, access = DBusProperty.Access.READ)
@DBusProperty(name = "uuid", type = String.class, access = DBusProperty.Access.READ)
@DBusProperty(name = "fingerprint", type = Byte[].class, access = DBusProperty.Access.READ) @DBusProperty(name = "fingerprint", type = Byte[].class, access = DBusProperty.Access.READ)
@DBusProperty(name = "safetyNumber", type = String.class, access = DBusProperty.Access.READ) @DBusProperty(name = "safetyNumber", type = String.class, access = DBusProperty.Access.READ)
@DBusProperty(name = "trustLevel", type = String.class, access = DBusProperty.Access.READ) @DBusProperty(name = "trustLevel", type = String.class, access = DBusProperty.Access.READ)
@DBusProperty(name = "addedDate", type = Integer.class, access = DBusProperty.Access.READ) @DBusProperty(name = "addedDate", type = Integer.class, access = DBusProperty.Access.READ)
@DBusProperty(name = "scannableSafetyNumber", type = Byte[].class, access = DBusProperty.Access.READ)
interface Identity extends DBusInterface, Properties { interface Identity extends DBusInterface, Properties {
void trust(String number) throws Error.Failure; void trust() throws Error.Failure;
void trustWithKey(String number,String safetyNumber) throws Error.Failure; void trustVerified(String safetyNumber) throws Error.Failure;
} }
interface Error { interface Error {

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

@ -11,7 +11,6 @@ import org.asamk.signal.manager.api.GroupLinkState;
import org.asamk.signal.manager.api.GroupNotFoundException; import org.asamk.signal.manager.api.GroupNotFoundException;
import org.asamk.signal.manager.api.GroupPermission; import org.asamk.signal.manager.api.GroupPermission;
import org.asamk.signal.manager.api.GroupSendingNotAllowedException; import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
import org.asamk.signal.manager.api.Identity;
import org.asamk.signal.manager.api.InactiveGroupLinkException; import org.asamk.signal.manager.api.InactiveGroupLinkException;
import org.asamk.signal.manager.api.InvalidDeviceLinkException; import org.asamk.signal.manager.api.InvalidDeviceLinkException;
import org.asamk.signal.manager.api.InvalidNumberException; import org.asamk.signal.manager.api.InvalidNumberException;
@ -31,6 +30,7 @@ import org.asamk.signal.manager.api.UnregisteredRecipientException;
import org.asamk.signal.manager.api.UpdateGroup; import org.asamk.signal.manager.api.UpdateGroup;
import org.asamk.signal.manager.api.UpdateProfile; import org.asamk.signal.manager.api.UpdateProfile;
import org.asamk.signal.manager.api.UserStatus; import org.asamk.signal.manager.api.UserStatus;
import org.asamk.signal.manager.api.IdentityVerificationCode;
import org.asamk.signal.util.SendMessageResultUtils; import org.asamk.signal.util.SendMessageResultUtils;
import org.freedesktop.dbus.DBusPath; import org.freedesktop.dbus.DBusPath;
import org.freedesktop.dbus.connections.impl.DBusConnection; import org.freedesktop.dbus.connections.impl.DBusConnection;
@ -51,7 +51,6 @@ import java.util.Base64;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
@ -60,9 +59,6 @@ import java.util.stream.Collectors;
import static org.asamk.signal.dbus.DbusUtils.makeValidObjectPathElement; import static org.asamk.signal.dbus.DbusUtils.makeValidObjectPathElement;
import org.asamk.signal.util.CommandUtil;
import org.asamk.signal.util.Hex;
public class DbusSignalImpl implements Signal { public class DbusSignalImpl implements Signal {
private final Manager m; private final Manager m;
@ -1047,17 +1043,13 @@ public class DbusSignalImpl implements Signal {
final var object = new DbusSignalIdentityImpl(i); final var object = new DbusSignalIdentityImpl(i);
exportObject(object); exportObject(object);
this.identities.add(new StructIdentity(new DBusPath(object.getObjectPath()), this.identities.add(new StructIdentity(new DBusPath(object.getObjectPath()),
i.recipient().getLegacyIdentifier(), emptyIfNull(i.recipient().getIdentifier()),
emptyIfNull(i.recipient().getIdentifier()))); i.recipient().getLegacyIdentifier()));
}); });
} }
private static String getIdentityObjectPath(String basePath, String id) { private static String getIdentityObjectPath(String basePath, String id) {
return basePath + "/Identities/" + return basePath + "/Identities/" + makeValidObjectPathElement(id);
id
.replace("+", "_")
.replace("/", "_")
.replace("=", "_");
} }
private void unExportIdentities() { private void unExportIdentities() {
@ -1065,19 +1057,37 @@ public class DbusSignalImpl implements Signal {
this.identities.clear(); this.identities.clear();
} }
@Override
public DBusPath getIdentity(String number) throws Error.Failure {
final var found = identities.stream()
.filter(identity -> identity.getName().equals(number))
.findFirst();
if (found.isEmpty()) {
throw new Error.Failure("Identity for " + number + " unkown");
}
return found.get().getObjectPath();
}
@Override
public List<StructIdentity> listIdentities() {
updateIdentities();
return this.identities;
}
public class DbusSignalIdentityImpl extends DbusProperties implements Signal.Identity { public class DbusSignalIdentityImpl extends DbusProperties implements Signal.Identity {
private final org.asamk.signal.manager.api.Identity identity; private final org.asamk.signal.manager.api.Identity identity;
//private final org.asamk.signal.manager.api.Recipient recipient;
//private final org.asamk.signal.manager.storage.recipients.Contact contact;
//private final List<org.asamk.signal.manager.api.Recipient> rlist;
public DbusSignalIdentityImpl(final org.asamk.signal.manager.api.Identity identity) { public DbusSignalIdentityImpl(final org.asamk.signal.manager.api.Identity identity) {
this.identity=identity; this.identity=identity;
super.addPropertiesHandler(new DbusInterfacePropertiesHandler("org.asamk.Signal.Identity", super.addPropertiesHandler(new DbusInterfacePropertiesHandler("org.asamk.Signal.Identity",
List.of(new DbusProperty<>("id", () -> identity.recipient().getLegacyIdentifier()), List.of(new DbusProperty<>("number", () -> identity.recipient().getLegacyIdentifier()),
new DbusProperty<>("uuid", () -> identity.recipient().getIdentifier()),
new DbusProperty<>("fingerprint", () -> identity.getFingerprint()), new DbusProperty<>("fingerprint", () -> identity.getFingerprint()),
new DbusProperty<>("safetyNumber", identity::safetyNumber), new DbusProperty<>("safetyNumber", identity::safetyNumber),
new DbusProperty<>("scannableSafetyNumber", identity::scannableSafetyNumber),
new DbusProperty<>("trustLevel", identity::trustLevel), new DbusProperty<>("trustLevel", identity::trustLevel),
new DbusProperty<>("addedDate", identity::dateAddedTimestamp) new DbusProperty<>("addedDate", identity::dateAddedTimestamp)
))); )));
@ -1089,74 +1099,39 @@ public class DbusSignalImpl implements Signal {
} }
@Override @Override
public void trust(String number) throws Error.Failure { public void trust() throws Error.Failure {
trustWithKey(number,null); 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.");
}
}; };
@Override @Override
public void trustWithKey(String number,String safetyNumber) throws Error.Failure { 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 { try {
var recipient = CommandUtil.getSingleRecipientIdentifier(number, m.getSelfNumber()); verificationCode = IdentityVerificationCode.parse(safetyNumber);
if (safetyNumber != null) {
safetyNumber = safetyNumber.replaceAll(" ", "");
if (safetyNumber.length() == 66) {
byte[] fingerprintBytes;
try {
fingerprintBytes = Hex.toByteArray(safetyNumber.toLowerCase(Locale.ROOT));
} catch (Exception e) { } catch (Exception e) {
throw new Error.Failure(
"Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
}
boolean res;
try {
res = m.trustIdentityVerified(recipient, fingerprintBytes);
} catch (UnregisteredRecipientException e) {
throw new Error.Failure("The user " + e.getSender().getIdentifier() + " is not registered.");
}
if (!res) {
throw new Error.Failure(
"Failed to set the trust for the fingerprint of this number, make sure the number and the fingerprint are correct.");
}
} else if (safetyNumber.length() == 60) {
boolean res;
try {
res = m.trustIdentityVerifiedSafetyNumber(recipient, safetyNumber);
} catch (UnregisteredRecipientException e) {
throw new Error.Failure("The user " + e.getSender().getIdentifier() + " is not registered.");
}
if (!res) {
throw new Error.Failure(
"Failed to set the trust for the safety number of this phone number, make sure the phone number and the safety number are correct.");
}
} else {
final byte[] scannableSafetyNumber;
try {
scannableSafetyNumber = Base64.getDecoder().decode(safetyNumber);
} catch (IllegalArgumentException e) {
throw new Error.Failure( throw new Error.Failure(
"Safety number has invalid format, either specify the old hex fingerprint or the new safety number"); "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
} }
boolean res;
try { try {
res = m.trustIdentityVerifiedSafetyNumber(recipient, scannableSafetyNumber); final var res = m.trustIdentityVerified(recipient, verificationCode);
} catch (UnregisteredRecipientException e) {
throw new Error.Failure("The user " + e.getSender().getIdentifier() + " is not registered.");
}
if (!res) { if (!res) {
throw new Error.Failure( throw new Error.Failure(
"Failed to set the trust for the safety number of this phone number, make sure the phone number and the safety number are correct."); "Failed to set the trust for this number, make sure the number and the fingerprint/safety number are correct.");
} }
} } catch (UnregisteredRecipientException e) {
} else { throw new Error.Failure("The user " + e.getSender().getIdentifier() + " is not registered.");
try {
m.trustIdentityAllKeys(recipient);
} catch (Exception e) {
throw new Error.Failure(
"Unregistered recipient");
}
}
} catch (Exception e) {
throw new Error.Failure(e.getMessage());
} }
} }
} }