commit b51ee93e87e80388fb43918175b9134e04fd5b5a Author: vanitasvitae Date: Mon Jun 19 20:14:44 2017 +0200 Initial commit diff --git a/de.vanitasvitae.homemadeomemo/.gitignore b/de.vanitasvitae.homemadeomemo/.gitignore new file mode 100644 index 0000000..1ad3004 --- /dev/null +++ b/de.vanitasvitae.homemadeomemo/.gitignore @@ -0,0 +1,21 @@ +# IntelliJ +.idea +*.iml +*.ipr +*.iws + +# Mac OS X +.DS_Store + +.classpath +.project +.settings +.gradle +gradle.properties + +build/ + +target/ +.metadata + +path/ diff --git a/de.vanitasvitae.homemadeomemo/build.gradle b/de.vanitasvitae.homemadeomemo/build.gradle new file mode 100644 index 0000000..ececc53 --- /dev/null +++ b/de.vanitasvitae.homemadeomemo/build.gradle @@ -0,0 +1,33 @@ +apply plugin: 'java' +apply plugin: 'idea' + +repositories { + mavenCentral() + maven { + url 'https://oss.sonatype.org/content/repositories/snapshots' + } +} + +ext { + smackVersion="4.2.1-SNAPSHOT" +} + +dependencies { + compile "org.igniterealtime.smack:smack-java7:$smackVersion" + compile "org.igniterealtime.smack:smack-omemo-signal:$smackVersion" + compile "org.igniterealtime.smack:smack-resolver-dnsjava:$smackVersion" + compile "org.igniterealtime.smack:smack-tcp:$smackVersion" +} + +//Pack dependencies into the jar +jar { + from(configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }) { + exclude "META-INF/*.SF" + exclude "META-INF/LICENSE" + } + manifest { + attributes( + 'Main-Class': 'Messenger' + ) + } +} diff --git a/de.vanitasvitae.homemadeomemo/gradle/wrapper/gradle-wrapper.jar b/de.vanitasvitae.homemadeomemo/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a6290bb Binary files /dev/null and b/de.vanitasvitae.homemadeomemo/gradle/wrapper/gradle-wrapper.jar differ diff --git a/de.vanitasvitae.homemadeomemo/gradle/wrapper/gradle-wrapper.properties b/de.vanitasvitae.homemadeomemo/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..221a6e7 --- /dev/null +++ b/de.vanitasvitae.homemadeomemo/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Jun 19 19:53:47 CEST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip diff --git a/de.vanitasvitae.homemadeomemo/gradlew b/de.vanitasvitae.homemadeomemo/gradlew new file mode 100755 index 0000000..4453cce --- /dev/null +++ b/de.vanitasvitae.homemadeomemo/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/de.vanitasvitae.homemadeomemo/gradlew.bat b/de.vanitasvitae.homemadeomemo/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/de.vanitasvitae.homemadeomemo/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/de.vanitasvitae.homemadeomemo/settings.gradle b/de.vanitasvitae.homemadeomemo/settings.gradle new file mode 100644 index 0000000..f8b7672 --- /dev/null +++ b/de.vanitasvitae.homemadeomemo/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'de.vanitasvitae.homemadeomemo' + diff --git a/de.vanitasvitae.homemadeomemo/src/main/java/Messenger.java b/de.vanitasvitae.homemadeomemo/src/main/java/Messenger.java new file mode 100644 index 0000000..c5bac5d --- /dev/null +++ b/de.vanitasvitae.homemadeomemo/src/main/java/Messenger.java @@ -0,0 +1,153 @@ +import java.io.File; +import java.util.HashMap; +import java.util.Scanner; + +import org.jivesoftware.smack.AbstractXMPPConnection; +import org.jivesoftware.smack.chat2.ChatManager; +import org.jivesoftware.smack.packet.Message; +import org.jivesoftware.smack.tcp.XMPPTCPConnection; +import org.jivesoftware.smackx.omemo.OmemoConfiguration; +import org.jivesoftware.smackx.omemo.OmemoFingerprint; +import org.jivesoftware.smackx.omemo.OmemoManager; +import org.jivesoftware.smackx.omemo.OmemoService; +import org.jivesoftware.smackx.omemo.exceptions.CannotEstablishOmemoSessionException; +import org.jivesoftware.smackx.omemo.exceptions.UndecidedOmemoIdentityException; +import org.jivesoftware.smackx.omemo.internal.CipherAndAuthTag; +import org.jivesoftware.smackx.omemo.internal.OmemoDevice; +import org.jivesoftware.smackx.omemo.internal.OmemoMessageInformation; +import org.jivesoftware.smackx.omemo.listener.OmemoMessageListener; +import org.jivesoftware.smackx.omemo.signal.SignalOmemoService; +import org.jivesoftware.smackx.omemo.util.OmemoKeyUtil; +import org.jxmpp.jid.BareJid; +import org.jxmpp.jid.EntityBareJid; +import org.jxmpp.jid.impl.JidCreate; +import org.whispersystems.libsignal.IdentityKey; + +public class Messenger { + + private AbstractXMPPConnection connection; + private OmemoManager omemoManager; + private static Scanner scanner; + + public static void main(String[] args) throws Exception { + String username = args[0]; + String password = args[1]; + Messenger messenger = new Messenger(username, password); + + scanner = new Scanner(System.in); + while(true) { + String input = scanner.nextLine(); + + if (input.startsWith("/quit")) { + break; + } + if (input.isEmpty()) { + continue; + } + messenger.handleInput(input); + } + } + + public Messenger(String username, String password) throws Exception { + connection = new XMPPTCPConnection(username, password); + connection = connection.connect(); + connection.login(); + + SignalOmemoService.acknowledgeLicense(); + SignalOmemoService.setup(); + OmemoConfiguration.setFileBasedOmemoStoreDefaultPath(new File("path")); + omemoManager = OmemoManager.getInstanceFor(connection); + omemoManager.addOmemoMessageListener(new OmemoMessageListener() { + @Override + public void onOmemoMessageReceived(String decryptedBody, Message encryptedMessage, + Message wrappingMessage, OmemoMessageInformation omemoInformation) { + IdentityKey senderKey = (IdentityKey) omemoInformation.getSenderIdentityKey().getIdentityKey(); + OmemoService service = + (OmemoService) OmemoService.getInstance(); + OmemoFingerprint fingerprint = service.getOmemoStoreBackend().keyUtil().getFingerprint(senderKey); + boolean trusted = omemoManager.isTrustedOmemoIdentity(omemoInformation.getSenderDevice(), + fingerprint); + System.out.println("(O) " + trusted + " " + encryptedMessage.getFrom() + ": " + decryptedBody); + } + + @Override + public void onOmemoKeyTransportReceived(CipherAndAuthTag cipherAndAuthTag, Message message, Message wrappingMessage, OmemoMessageInformation omemoInformation) { + } + }); + + ChatManager.getInstanceFor(connection).addIncomingListener( + (from, message, chat) -> System.out.println(from.asBareJid() + ": " + message) + ); + omemoManager.initialize(); + System.out.println("Ready to chat"); + } + + private void handleInput(String input) throws Exception { + String[] split = input.split(" "); + String command = split[0]; + + switch (command) { + case "/say": + if (split.length > 2) { + String recipient = split[1]; + EntityBareJid recipientJid = JidCreate.entityBareFrom(recipient); + + StringBuilder message = new StringBuilder(split[2]); + for (int i=3; i 2) { + String recipient = split[1]; + EntityBareJid recipientJid = JidCreate.entityBareFrom(recipient); + + StringBuilder message = new StringBuilder(); + for (int i=2; i fingerprints = + omemoManager.getActiveFingerprints(contact); + + //Let user decide + for (OmemoDevice d : fingerprints.keySet()) { + System.out.println("Trust (1), or distrust (2)?"); + System.out.println(OmemoKeyUtil.prettyFingerprint(fingerprints.get(d))); + int decision = Integer.parseInt(scanner.nextLine()); + if (decision == 1) { + omemoManager.trustOmemoIdentity(d, fingerprints.get(d)); + } else { + omemoManager.distrustOmemoIdentity(d, fingerprints.get(d)); + } + } + } + break; + } + } +}