+ /** Creates an instance of the MemorizingTrustManager class that falls back to a custom TrustManager.
+ *
* You need to supply the application context. This has to be one of:
- * - Application
- * - Activity
- * - Service
- *
+ * - Application
+ * - Activity
+ * - Service
+ *
* The context is used for file management, to display the dialog /
* notification and for obtaining translated strings.
*
- * @param m Context for the application.
+ * @param m Context for the application.
* @param defaultTrustManager Delegate trust management to this TM. If null, the user must accept every certificate.
*/
public MemorizingTrustManager(Context m, X509TrustManager defaultTrustManager) {
@@ -145,14 +144,13 @@ public class MemorizingTrustManager {
this.defaultTrustManager = defaultTrustManager;
}
- /**
- * Creates an instance of the MemorizingTrustManager class using the system X509TrustManager.
- *
+ /** Creates an instance of the MemorizingTrustManager class using the system X509TrustManager.
+ *
* You need to supply the application context. This has to be one of:
- * - Application
- * - Activity
- * - Service
- *
+ * - Application
+ * - Activity
+ * - Service
+ *
* The context is used for file management, to display the dialog /
* notification and for obtaining translated strings.
*
@@ -167,22 +165,21 @@ public class MemorizingTrustManager {
void init(Context m) {
master = m;
masterHandler = new Handler(m.getMainLooper());
- notificationManager = (NotificationManager) master.getSystemService(Context.NOTIFICATION_SERVICE);
+ notificationManager = (NotificationManager)master.getSystemService(Context.NOTIFICATION_SERVICE);
Application app;
if (m instanceof Application) {
- app = (Application) m;
+ app = (Application)m;
} else if (m instanceof Service) {
- app = ((Service) m).getApplication();
+ app = ((Service)m).getApplication();
} else if (m instanceof Activity) {
- app = ((Activity) m).getApplication();
- } else
- throw new ClassCastException("MemorizingTrustManager context must be either Activity or Service!");
+ app = ((Activity)m).getApplication();
+ } else throw new ClassCastException("MemorizingTrustManager context must be either Activity or Service!");
File dir = app.getDir(KEYSTORE_DIR, Context.MODE_PRIVATE);
keyStoreFile = new File(dir + File.separator + KEYSTORE_FILE);
- poshCacheDir = app.getFilesDir().getAbsolutePath() + "/posh_cache/";
+ poshCacheDir = app.getFilesDir().getAbsolutePath()+"/posh_cache/";
appKeyStore = loadAppKeyStore();
}
@@ -190,11 +187,11 @@ public class MemorizingTrustManager {
/**
* Binds an Activity to the MTM for displaying the query dialog.
- *
+ *
* This is useful if your connection is run from a service that is
* triggered by user interaction -- in such cases the activity is
* visible and the user tends to ignore the service notification.
- *
+ *
* You should never have a hidden activity bound to MTM! Use this
* function in onResume() and @see unbindDisplayActivity in onPause().
*
@@ -206,7 +203,7 @@ public class MemorizingTrustManager {
/**
* Removes an Activity from the MTM display stack.
- *
+ *
* Always call this function when the Activity added with
* {@link #bindDisplayActivity(Activity)} is hidden.
*
@@ -220,11 +217,11 @@ public class MemorizingTrustManager {
/**
* Changes the path for the KeyStore file.
- *
+ *
* The actual filename relative to the app's directory will be
* app_dirname/filename.
*
- * @param dirname directory to store the KeyStore.
+ * @param dirname directory to store the KeyStore.
* @param filename file name for the KeyStore.
*/
public static void setKeyStoreFile(String dirname, String filename) {
@@ -250,6 +247,7 @@ public class MemorizingTrustManager {
* Get a certificate for a given alias.
*
* @param alias the certificate's alias as returned by {@link #getCertificates()}.
+ *
* @return the certificate associated with the alias or null if none found.
*/
public Certificate getCertificate(String alias) {
@@ -263,15 +261,15 @@ public class MemorizingTrustManager {
/**
* Removes the given certificate from MTMs key store.
- *
+ *
*
* WARNING: this does not immediately invalidate the certificate. It is
* well possible that (a) data is transmitted over still existing connections or
* (b) new connections are created using TLS renegotiation, without a new cert
* check.
*
- *
* @param alias the certificate's alias as returned by {@link #getCertificates()}.
+ *
* @throws KeyStoreException if the certificate could not be deleted.
*/
public void deleteCertificate(String alias) throws KeyStoreException {
@@ -281,27 +279,28 @@ public class MemorizingTrustManager {
/**
* Creates a new hostname verifier supporting user interaction.
- *
+ *
*
This method creates a new {@link HostnameVerifier} that is bound to
* the given instance of {@link MemorizingTrustManager}, and leverages an
* existing {@link HostnameVerifier}. The returned verifier performs the
* following steps, returning as soon as one of them succeeds:
- *
- *
- * - Success, if the wrapped defaultVerifier accepts the certificate.
- * - Success, if the server certificate is stored in the keystore under the given hostname.
- * - Ask the user and return accordingly.
- * - Failure on exception.
- *
+ *
+ *
+ * - Success, if the wrapped defaultVerifier accepts the certificate.
+ * - Success, if the server certificate is stored in the keystore under the given hostname.
+ * - Ask the user and return accordingly.
+ * - Failure on exception.
+ *
*
* @param defaultVerifier the {@link HostnameVerifier} that should perform the actual check
* @return a new hostname verifier using the MTM's key store
+ *
* @throws IllegalArgumentException if the defaultVerifier parameter is null
*/
public DomainHostnameVerifier wrapHostnameVerifier(final HostnameVerifier defaultVerifier, final boolean interactive) {
- if (defaultVerifier == null) {
+ if (defaultVerifier == null)
throw new IllegalArgumentException("The default verifier may not be null");
- }
+
return new MemorizingHostnameVerifier(defaultVerifier, interactive);
}
@@ -311,7 +310,7 @@ public class MemorizingTrustManager {
tmf.init(ks);
for (TrustManager t : tmf.getTrustManagers()) {
if (t instanceof X509TrustManager) {
- return (X509TrustManager) t;
+ return (X509TrustManager)t;
}
}
} catch (Exception e) {
@@ -397,7 +396,8 @@ public class MemorizingTrustManager {
}
public void checkCertTrusted(X509Certificate[] chain, String authType, String domain, boolean isServer, boolean interactive)
- throws CertificateException {
+ throws CertificateException
+ {
LOGGER.log(Level.FINE, "checkCertTrusted(" + chain + ", " + authType + ", " + isServer + ")");
try {
LOGGER.log(Level.FINE, "checkCertTrusted: trying appTrustManager");
@@ -427,10 +427,10 @@ public class MemorizingTrustManager {
} catch (CertificateException e) {
boolean trustSystemCAs = !PreferenceManager.getDefaultSharedPreferences(master).getBoolean("dont_trust_system_cas", false);
if (domain != null && isServer && trustSystemCAs && !isIp(domain)) {
- String hash = getBase64Hash(chain[0], "SHA-256");
+ String hash = getBase64Hash(chain[0],"SHA-256");
List fingerprints = getPoshFingerprints(domain);
if (hash != null && fingerprints.contains(hash)) {
- Log.d("mtm", "trusted cert fingerprint of " + domain + " via posh");
+ Log.d("mtm","trusted cert fingerprint of "+domain+" via posh");
return;
}
}
@@ -454,11 +454,11 @@ public class MemorizingTrustManager {
}
private List getPoshFingerprintsFromServer(String domain) {
- return getPoshFingerprintsFromServer(domain, "https://" + domain + "/.well-known/posh/xmpp-client.json", -1, true);
+ return getPoshFingerprintsFromServer(domain, "https://"+domain+"/.well-known/posh/xmpp-client.json",-1,true);
}
private List getPoshFingerprintsFromServer(String domain, String url, int maxTtl, boolean followUrl) {
- Log.d("mtm", "downloading json for " + domain + " from " + url);
+ Log.d("mtm","downloading json for "+domain+" from "+url);
try {
List results = new ArrayList<>();
HttpsURLConnection connection = (HttpsURLConnection) new URL(url).openConnection();
@@ -477,7 +477,7 @@ public class MemorizingTrustManager {
return new ArrayList<>();
}
if (maxTtl >= 0) {
- expires = Math.min(maxTtl, expires);
+ expires = Math.min(maxTtl,expires);
}
String redirect;
try {
@@ -489,23 +489,23 @@ public class MemorizingTrustManager {
return getPoshFingerprintsFromServer(domain, redirect, expires, false);
}
JSONArray fingerprints = jsonObject.getJSONArray("fingerprints");
- for (int i = 0; i < fingerprints.length(); i++) {
+ for(int i = 0; i < fingerprints.length(); i++) {
JSONObject fingerprint = fingerprints.getJSONObject(i);
String sha256 = fingerprint.getString("sha-256");
if (sha256 != null) {
results.add(sha256);
}
}
- writeFingerprintsToCache(domain, results, 1000L * expires + System.currentTimeMillis());
+ writeFingerprintsToCache(domain, results,1000L * expires+System.currentTimeMillis());
return results;
} catch (Exception e) {
- Log.d("mtm", "error fetching posh " + e.getMessage());
+ Log.d("mtm","error fetching posh "+e.getMessage());
return new ArrayList<>();
}
}
private File getPoshCacheFile(String domain) {
- return new File(poshCacheDir + domain + ".json");
+ return new File(poshCacheDir+domain+".json");
}
private void writeFingerprintsToCache(String domain, List results, long expires) {
@@ -514,8 +514,8 @@ public class MemorizingTrustManager {
try {
file.createNewFile();
JSONObject jsonObject = new JSONObject();
- jsonObject.put("expires", expires);
- jsonObject.put("fingerprints", new JSONArray(results));
+ jsonObject.put("expires",expires);
+ jsonObject.put("fingerprints",new JSONArray(results));
FileOutputStream outputStream = new FileOutputStream(file);
outputStream.write(jsonObject.toString().getBytes());
outputStream.flush();
@@ -534,7 +534,7 @@ public class MemorizingTrustManager {
String line = buf.readLine();
StringBuilder sb = new StringBuilder();
- while (line != null) {
+ while(line != null){
sb.append(line).append("\n");
line = buf.readLine();
}
@@ -546,11 +546,11 @@ public class MemorizingTrustManager {
file.delete();
return null;
} else {
- Log.d("mtm", "posh fingerprints expire in " + (expiresIn / 1000) + "s");
+ Log.d("mtm","posh fingerprints expire in "+(expiresIn/1000)+"s");
}
List result = new ArrayList<>();
JSONArray jsonArray = jsonObject.getJSONArray("fingerprints");
- for (int i = 0; i < jsonArray.length(); ++i) {
+ for(int i = 0; i < jsonArray.length(); ++i) {
result.add(jsonArray.getString(i));
}
return result;
@@ -581,7 +581,7 @@ public class MemorizingTrustManager {
return null;
}
md.update(certificate.getEncoded());
- return Base64.encodeToString(md.digest(), Base64.NO_WRAP);
+ return Base64.encodeToString(md.digest(),Base64.NO_WRAP);
}
private X509Certificate[] getAcceptedIssuers() {
@@ -591,7 +591,7 @@ public class MemorizingTrustManager {
private int createDecisionId(MTMDecision d) {
int myId;
- synchronized (openDecisions) {
+ synchronized(openDecisions) {
myId = decisionId;
openDecisions.put(myId, d);
decisionId += 1;
@@ -676,7 +676,7 @@ public class MemorizingTrustManager {
Object name = altName.get(1);
if (name instanceof String) {
si.append("[");
- si.append((Integer) altName.get(0));
+ si.append((Integer)altName.get(0));
si.append("] ");
si.append(name);
si.append("\n");
@@ -695,7 +695,6 @@ public class MemorizingTrustManager {
certDetails(si, cert);
return si.toString();
}
-
/**
* Returns the top-most entry of the activity stack.
*
@@ -706,7 +705,7 @@ public class MemorizingTrustManager {
}
int interact(final String message, final int titleId) {
- /* prepare the MTMDecision blocker object */
+ /* prepare the MTMDecision blocker object */
MTMDecision choice = new MTMDecision();
final int myId = createDecisionId(choice);
@@ -731,9 +730,7 @@ public class MemorizingTrustManager {
LOGGER.log(Level.FINE, "openDecisions: " + openDecisions + ", waiting on " + myId);
try {
- synchronized (choice) {
- choice.wait();
- }
+ synchronized(choice) { choice.wait(); }
} catch (InterruptedException e) {
LOGGER.log(Level.FINER, "InterruptedException", e);
}
@@ -742,7 +739,8 @@ public class MemorizingTrustManager {
}
void interactCert(final X509Certificate[] chain, String authType, CertificateException cause)
- throws CertificateException {
+ throws CertificateException
+ {
switch (interact(certChainMessage(chain, cause), R.string.mtm_accept_cert)) {
case MTMDecision.DECISION_ALWAYS:
storeCert(chain[0]); // only store the server cert, not the whole chain
@@ -753,7 +751,8 @@ public class MemorizingTrustManager {
}
}
- boolean interactHostname(X509Certificate cert, String hostname) {
+ boolean interactHostname(X509Certificate cert, String hostname)
+ {
switch (interact(hostNameMessage(cert, hostname), R.string.mtm_accept_servername)) {
case MTMDecision.DECISION_ALWAYS:
storeCert(hostname, cert);
@@ -764,9 +763,9 @@ public class MemorizingTrustManager {
}
}
- protected static void interactResult(int decisionId, int choice) {
+ public static void interactResult(int decisionId, int choice) {
MTMDecision d;
- synchronized (openDecisions) {
+ synchronized(openDecisions) {
d = openDecisions.get(decisionId);
openDecisions.remove(decisionId);
}
@@ -774,7 +773,7 @@ public class MemorizingTrustManager {
LOGGER.log(Level.SEVERE, "interactResult: aborting due to stale decision reference!");
return;
}
- synchronized (d) {
+ synchronized(d) {
d.state = choice;
d.notify();
}
@@ -794,7 +793,7 @@ public class MemorizingTrustManager {
LOGGER.log(Level.FINE, "hostname verifier for " + domain + ", trying default verifier first");
// if the default verifier accepts the hostname, we are done
if (defaultVerifier instanceof DomainHostnameVerifier) {
- if (((DomainHostnameVerifier) defaultVerifier).verify(domain, hostname, session)) {
+ if (((DomainHostnameVerifier) defaultVerifier).verify(domain,hostname, session)) {
return true;
}
} else {
@@ -803,9 +802,10 @@ public class MemorizingTrustManager {
}
}
+
// otherwise, we check if the hostname is an alias for this cert in our keystore
try {
- X509Certificate cert = (X509Certificate) session.getPeerCertificates()[0];
+ X509Certificate cert = (X509Certificate)session.getPeerCertificates()[0];
//Log.d(TAG, "cert: " + cert);
if (cert.equals(appKeyStore.getCertificate(domain.toLowerCase(Locale.US)))) {
LOGGER.log(Level.FINE, "certificate for " + domain + " is in our keystore. accepting.");
@@ -826,10 +826,11 @@ public class MemorizingTrustManager {
@Override
public boolean verify(String domain, SSLSession sslSession) {
- return verify(domain, null, sslSession);
+ return verify(domain,null,sslSession);
}
}
+
public X509TrustManager getNonInteractive(String domain) {
return new NonInteractiveMemorizingTrustManager(domain);
}
@@ -895,4 +896,4 @@ public class MemorizingTrustManager {
return MemorizingTrustManager.this.getAcceptedIssuers();
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index d26114b47..2c2f0b2d4 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -70,7 +70,6 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-import de.duenndns.ssl.MemorizingTrustManager;
import de.pixart.messenger.BuildConfig;
import de.pixart.messenger.Config;
import de.pixart.messenger.R;
diff --git a/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java b/src/main/java/de/pixart/messenger/ui/MemorizingActivity.java
similarity index 80%
rename from libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java
rename to src/main/java/de/pixart/messenger/ui/MemorizingActivity.java
index 29b192093..8172e6f9c 100644
--- a/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/MemorizingActivity.java
@@ -21,11 +21,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-package de.duenndns.ssl;
+package de.pixart.messenger.ui;
-
-import android.app.Activity;
-import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnClickListener;
@@ -33,15 +30,20 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
import java.util.logging.Level;
import java.util.logging.Logger;
-public class MemorizingActivity extends Activity
- implements OnClickListener, OnCancelListener {
+import de.pixart.messenger.R;
+import de.pixart.messenger.entities.MTMDecision;
+import de.pixart.messenger.services.MemorizingTrustManager;
+
+public class MemorizingActivity extends AppCompatActivity implements OnClickListener,OnCancelListener {
- public static final String THEME = "theme";
private final static Logger LOGGER = Logger.getLogger(MemorizingActivity.class.getName());
+
int decisionId;
AlertDialog dialog;
@@ -49,7 +51,7 @@ public class MemorizingActivity extends Activity
@Override
public void onCreate(Bundle savedInstanceState) {
LOGGER.log(Level.FINE, "onCreate");
-// setTheme(findTheme());
+ //setTheme(findTheme());
super.onCreate(savedInstanceState);
}
@@ -63,9 +65,9 @@ public class MemorizingActivity extends Activity
LOGGER.log(Level.FINE, "onResume with " + i.getExtras() + " decId=" + decisionId + " data: " + i.getData());
dialog = new AlertDialog.Builder(this).setTitle(titleId)
.setMessage(cert)
- .setPositiveButton(R.string.mtm_decision_always, this)
- .setNeutralButton(R.string.mtm_decision_once, this)
- .setNegativeButton(R.string.mtm_decision_abort, this)
+ .setPositiveButton(R.string.always, this)
+ .setNeutralButton(R.string.once, this)
+ .setNegativeButton(R.string.cancel, this)
.setOnCancelListener(this)
.create();
dialog.show();
@@ -84,12 +86,14 @@ public class MemorizingActivity extends Activity
finish();
}
-// protected int findTheme() {
-// return getPreferences().getString(THEME, getResources().getString(R.string.theme)).equals("dark") ? R.style.ConversationsTheme_Dark : R.style.ConversationsTheme;
-// }
+ protected int findTheme() {
+ return 0;
+ //return getPreferences().getString(SettingsActivity.THEME, getResources().getString(R.string.theme)).equals("dark") ? R.style.ConversationsTheme_Dark : R.style.ConversationsTheme;
+ }
protected SharedPreferences getPreferences() {
- return PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+ return PreferenceManager
+ .getDefaultSharedPreferences(getApplicationContext());
}
// react on AlertDialog button press
@@ -112,4 +116,4 @@ public class MemorizingActivity extends Activity
public void onCancel(DialogInterface dialog) {
sendDecision(MTMDecision.DECISION_ABORT);
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
index b8dac78c0..1b744314e 100644
--- a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
@@ -29,7 +29,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import de.duenndns.ssl.MemorizingTrustManager;
+import de.pixart.messenger.services.MemorizingTrustManager;
import de.pixart.messenger.Config;
import de.pixart.messenger.R;
import de.pixart.messenger.entities.Account;
diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
index 6bd4904bf..1025c5f1d 100644
--- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
+++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
@@ -50,8 +50,8 @@ import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.X509KeyManager;
import javax.net.ssl.X509TrustManager;
-import de.duenndns.ssl.DomainHostnameVerifier;
-import de.duenndns.ssl.MemorizingTrustManager;
+import de.pixart.messenger.crypto.DomainHostnameVerifier;
+import de.pixart.messenger.services.MemorizingTrustManager;
import de.pixart.messenger.Config;
import de.pixart.messenger.crypto.XmppDomainVerifier;
import de.pixart.messenger.crypto.axolotl.AxolotlService;
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 16fe709ee..00d99e8bb 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -763,4 +763,14 @@
To keep receiving notifications, even when the screen is turned off, you need to add Pix-Art Messenger to the list of protected apps.
Enable multiple accounts
You want to use multiple accounts, so you have to set a password for daily backups.
+ Accept Unknown Certificate?
+ The server certificate is not signed by a known Certificate Authority.
+ The server certificate is expired.
+ Accept Mismatching Server Name?
+ Server could not authenticate as \"%s\". The certificate is only valid for:
+ Do you want to connect anyway?
+ Certificate details:
+ Certificate Verification
+ Once
+ Theme