X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/9f5b55fa7e2ef893cbb841d75c9fe9589f57942d..ab250030619b2b470d62ce60f462d9b43f5bbab2:/src/main/java/cli/Manager.java diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java index 2398f3bc..846e0dc9 100644 --- a/src/main/java/cli/Manager.java +++ b/src/main/java/cli/Manager.java @@ -18,10 +18,7 @@ package cli; import org.apache.commons.io.IOUtils; import org.json.JSONObject; -import org.whispersystems.libaxolotl.IdentityKeyPair; -import org.whispersystems.libaxolotl.InvalidKeyException; -import org.whispersystems.libaxolotl.InvalidKeyIdException; -import org.whispersystems.libaxolotl.InvalidVersionException; +import org.whispersystems.libaxolotl.*; import org.whispersystems.libaxolotl.ecc.Curve; import org.whispersystems.libaxolotl.ecc.ECKeyPair; import org.whispersystems.libaxolotl.state.PreKeyRecord; @@ -34,10 +31,13 @@ import org.whispersystems.textsecure.api.TextSecureMessagePipe; import org.whispersystems.textsecure.api.TextSecureMessageReceiver; import org.whispersystems.textsecure.api.TextSecureMessageSender; import org.whispersystems.textsecure.api.crypto.TextSecureCipher; +import org.whispersystems.textsecure.api.messages.TextSecureAttachmentPointer; import org.whispersystems.textsecure.api.messages.TextSecureContent; +import org.whispersystems.textsecure.api.messages.TextSecureDataMessage; import org.whispersystems.textsecure.api.messages.TextSecureEnvelope; import org.whispersystems.textsecure.api.push.TextSecureAddress; import org.whispersystems.textsecure.api.push.TrustStore; +import org.whispersystems.textsecure.api.push.exceptions.EncapsulatedExceptions; import org.whispersystems.textsecure.api.util.InvalidNumberException; import org.whispersystems.textsecure.api.util.PhoneNumberFormatter; @@ -47,11 +47,17 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -public class Manager { +class Manager { private final static String URL = "https://textsecure-service.whispersystems.org"; private final static TrustStore TRUST_STORE = new WhisperTrustStore(); + public final static String PROJECT_NAME = Manager.class.getPackage().getImplementationTitle(); + public final static String PROJECT_VERSION = Manager.class.getPackage().getImplementationVersion(); + private final static String USER_AGENT = PROJECT_NAME + " " + PROJECT_VERSION; + private final static String settingsPath = System.getProperty("user.home") + "/.config/textsecure"; + private final static String dataPath = settingsPath + "/data"; + private final static String attachmentsPath = settingsPath + "/attachments"; private String username; private String password; @@ -62,24 +68,20 @@ public class Manager { private boolean registered = false; private JsonAxolotlStore axolotlStore; - TextSecureAccountManager accountManager; + private TextSecureAccountManager accountManager; public Manager(String username) { this.username = username; } - private String getFileName() { - String path = settingsPath + "/data"; - new File(path).mkdirs(); - return path + "/" + username; + public String getFileName() { + new File(dataPath).mkdirs(); + return dataPath + "/" + username; } public boolean userExists() { File f = new File(getFileName()); - if (!f.exists() || f.isDirectory()) { - return false; - } - return true; + return !(!f.exists() || f.isDirectory()); } public boolean userHasKeys() { @@ -105,7 +107,7 @@ public class Manager { } axolotlStore = new JsonAxolotlStore(in.getJSONObject("axolotlStore")); registered = in.getBoolean("registered"); - accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password); + accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password, USER_AGENT); } public void save() { @@ -122,8 +124,7 @@ public class Manager { writer.flush(); writer.close(); } catch (Exception e) { - System.out.println("Saving file error: " + e.getMessage()); - return; + System.err.println("Saving file error: " + e.getMessage()); } } @@ -141,7 +142,7 @@ public class Manager { public void register(boolean voiceVerication) throws IOException { password = Util.getSecret(18); - accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password); + accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password, USER_AGENT); if (voiceVerication) accountManager.requestVoiceVerificationCode(); @@ -204,7 +205,7 @@ public class Manager { public void verifyAccount(String verificationCode) throws IOException { verificationCode = verificationCode.replace("-", ""); signalingKey = Util.getSecret(52); - accountManager.verifyAccount(verificationCode, signalingKey, false, axolotlStore.getLocalRegistrationId()); + accountManager.verifyAccountWithCode(verificationCode, signalingKey, axolotlStore.getLocalRegistrationId(), false); //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID))); registered = true; @@ -218,9 +219,11 @@ public class Manager { accountManager.setPreKeys(axolotlStore.getIdentityKeyPair().getPublicKey(), lastResortKey, signedPreKeyRecord, oneTimePreKeys); } - public TextSecureMessageSender getMessageSender() { - return new TextSecureMessageSender(URL, TRUST_STORE, username, password, - axolotlStore, Optional.absent()); + public void sendMessage(List recipients, TextSecureDataMessage message) + throws IOException, EncapsulatedExceptions { + TextSecureMessageSender messageSender = new TextSecureMessageSender(URL, TRUST_STORE, username, password, + axolotlStore, USER_AGENT, Optional.absent()); + messageSender.sendMessage(recipients, message); } public TextSecureContent decryptMessage(TextSecureEnvelope envelope) { @@ -243,7 +246,7 @@ public class Manager { } public void receiveMessages(int timeoutSeconds, boolean returnOnTimeout, ReceiveMessageHandler handler) throws IOException { - TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey); + final TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey, USER_AGENT); TextSecureMessagePipe messagePipe = null; try { @@ -258,7 +261,7 @@ public class Manager { if (returnOnTimeout) return; } catch (InvalidVersionException e) { - System.out.println("Ignoring error: " + e.getMessage()); + System.err.println("Ignoring error: " + e.getMessage()); } save(); } @@ -268,12 +271,59 @@ public class Manager { } } - public String canonicalizeNumber(String number) throws InvalidNumberException { + public File retrieveAttachment(TextSecureAttachmentPointer pointer) throws IOException, InvalidMessageException { + final TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey, USER_AGENT); + + File tmpFile = File.createTempFile("ts_attach_" + pointer.getId(), ".tmp"); + InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile); + + new File(attachmentsPath).mkdirs(); + File outputFile = new File(attachmentsPath + "/" + pointer.getId()); + OutputStream output = null; + try { + output = new FileOutputStream(outputFile); + byte[] buffer = new byte[4096]; + int read; + + while ((read = input.read(buffer)) != -1) { + output.write(buffer, 0, read); + } + } catch (FileNotFoundException e) { + e.printStackTrace(); + return null; + } finally { + if (output != null) { + output.close(); + output = null; + } + if (!tmpFile.delete()) { + System.err.println("Failed to delete temp file: " + tmpFile); + } + } + if (pointer.getPreview().isPresent()) { + File previewFile = new File(outputFile + ".preview"); + try { + output = new FileOutputStream(previewFile); + byte[] preview = pointer.getPreview().get(); + output.write(preview, 0, preview.length); + } catch (FileNotFoundException e) { + e.printStackTrace(); + return null; + } finally { + if (output != null) { + output.close(); + } + } + } + return outputFile; + } + + private String canonicalizeNumber(String number) throws InvalidNumberException { String localNumber = username; return PhoneNumberFormatter.formatNumber(number, localNumber); } - protected TextSecureAddress getPushAddress(String number) throws InvalidNumberException { + TextSecureAddress getPushAddress(String number) throws InvalidNumberException { String e164number = canonicalizeNumber(number); return new TextSecureAddress(e164number); }