import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
import org.whispersystems.signalservice.api.messages.*;
import org.whispersystems.signalservice.api.messages.multidevice.*;
+import org.whispersystems.signalservice.api.push.ContactTokenDetails;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.push.TrustStore;
import org.whispersystems.signalservice.api.push.exceptions.*;
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.nio.file.Files;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import static java.nio.file.attribute.PosixFilePermission.*;
+
class Manager implements Signal {
private final static String URL = "https://textsecure-service.whispersystems.org";
private final static TrustStore TRUST_STORE = new WhisperTrustStore();
}
public String getFileName() {
- new File(dataPath).mkdirs();
return dataPath + "/" + username;
}
+ private static void createPrivateDirectories(String path) throws IOException {
+ final Path file = new File(path).toPath();
+ try {
+ Set<PosixFilePermission> perms = EnumSet.of(OWNER_READ, OWNER_WRITE, OWNER_EXECUTE);
+ Files.createDirectories(file, PosixFilePermissions.asFileAttribute(perms));
+ } catch (UnsupportedOperationException e) {
+ Files.createDirectories(file);
+ }
+ }
+
+ private static void createPrivateFile(String path) throws IOException {
+ final Path file = new File(path).toPath();
+ try {
+ Set<PosixFilePermission> perms = EnumSet.of(OWNER_READ, OWNER_WRITE);
+ Files.createFile(file, PosixFilePermissions.asFileAttribute(perms));
+ } catch (UnsupportedOperationException e) {
+ Files.createFile(file);
+ }
+ }
+
public boolean userExists() {
if (username == null) {
return false;
if (fileChannel != null)
return;
+ createPrivateDirectories(dataPath);
+ if (!new File(getFileName()).exists()) {
+ createPrivateFile(getFileName());
+ }
fileChannel = new RandomAccessFile(new File(getFileName()), "rw").getChannel();
lock = fileChannel.tryLock();
if (lock == null) {
File attachmentFile = getAttachmentFile(g.getAvatarId());
if (!avatarFile.exists() && attachmentFile.exists()) {
try {
- new File(avatarsPath).mkdirs();
+ createPrivateDirectories(avatarsPath);
Files.copy(attachmentFile.toPath(), avatarFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
} catch (Exception e) {
// Ignore
return Optional.of(createAttachment(file));
}
+ private GroupInfo getGroupForSending(byte[] groupId) throws GroupNotFoundException, NotAGroupMemberException {
+ GroupInfo g = groupStore.getGroup(groupId);
+ if (g == null) {
+ throw new GroupNotFoundException(groupId);
+ }
+ for (String member : g.members) {
+ if (member.equals(this.username)) {
+ return g;
+ }
+ }
+ throw new NotAGroupMemberException(groupId, g.name);
+ }
+
@Override
public void sendGroupMessage(String messageText, List<String> attachments,
byte[] groupId)
}
SignalServiceDataMessage message = messageBuilder.build();
- GroupInfo g = groupStore.getGroup(groupId);
- if (g == null) {
- throw new GroupNotFoundException(groupId);
- }
+ final GroupInfo g = getGroupForSending(groupId);
// Don't send group message to ourself
final List<String> membersSend = new ArrayList<>(g.members);
.asGroupMessage(group)
.build();
- final GroupInfo g = groupStore.getGroup(groupId);
- if (g == null) {
- throw new GroupNotFoundException(groupId);
- }
+ final GroupInfo g = getGroupForSending(groupId);
g.members.remove(this.username);
groupStore.updateGroup(g);
sendMessage(message, g.members);
}
+ private static String join(CharSequence separator, Iterable<? extends CharSequence> list) {
+ StringBuilder buf = new StringBuilder();
+ for (CharSequence str : list) {
+ if (buf.length() > 0) {
+ buf.append(separator);
+ }
+ buf.append(str);
+ }
+
+ return buf.toString();
+ }
+
public byte[] sendUpdateGroupMessage(byte[] groupId, String name, Collection<String> members, String avatarFile) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {
GroupInfo g;
if (groupId == null) {
g = new GroupInfo(Util.getSecretBytes(16));
g.members.add(username);
} else {
- g = groupStore.getGroup(groupId);
- if (g == null) {
- throw new GroupNotFoundException(groupId);
- }
+ g = getGroupForSending(groupId);
}
if (name != null) {
}
if (members != null) {
+ Set<String> newMembers = new HashSet<>();
for (String member : members) {
try {
- g.members.add(canonicalizeNumber(member));
+ member = canonicalizeNumber(member);
} catch (InvalidNumberException e) {
System.err.println("Failed to add member \"" + member + "\" to group: " + e.getMessage());
System.err.println("Aborting…");
System.exit(1);
}
+ if (g.members.contains(member)) {
+ continue;
+ }
+ newMembers.add(member);
+ g.members.add(member);
+ }
+ final List<ContactTokenDetails> contacts = accountManager.getContacts(newMembers);
+ if (contacts.size() != newMembers.size()) {
+ // Some of the new members are not registered on Signal
+ for (ContactTokenDetails contact : contacts) {
+ newMembers.remove(contact.getNumber());
+ }
+ System.err.println("Failed to add members " + join(", ", newMembers) + " to group: Not registered on Signal");
+ System.err.println("Aborting…");
+ System.exit(1);
}
}
File aFile = getGroupAvatarFile(g.groupId);
if (avatarFile != null) {
- new File(avatarsPath).mkdirs();
+ createPrivateDirectories(avatarsPath);
Files.copy(Paths.get(avatarFile), aFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
}
if (aFile.exists()) {
}
private File retrieveContactAvatarAttachment(SignalServiceAttachment attachment, String number) throws IOException, InvalidMessageException {
- new File(avatarsPath).mkdirs();
+ createPrivateDirectories(avatarsPath);
if (attachment.isPointer()) {
SignalServiceAttachmentPointer pointer = attachment.asPointer();
return retrieveAttachment(pointer, getContactAvatarFile(number), false);
}
private File retrieveGroupAvatarAttachment(SignalServiceAttachment attachment, byte[] groupId) throws IOException, InvalidMessageException {
- new File(avatarsPath).mkdirs();
+ createPrivateDirectories(avatarsPath);
if (attachment.isPointer()) {
SignalServiceAttachmentPointer pointer = attachment.asPointer();
return retrieveAttachment(pointer, getGroupAvatarFile(groupId), false);
}
private File retrieveAttachment(SignalServiceAttachmentPointer pointer) throws IOException, InvalidMessageException {
- new File(attachmentsPath).mkdirs();
+ createPrivateDirectories(attachmentsPath);
return retrieveAttachment(pointer, getAttachmentFile(pointer.getId()), true);
}
git.nmode.ca / signal-cli / blobdiff
