mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Protected content: improved repeated password check

This commit is contained in:
M66B 2022-10-18 21:13:21 +02:00
parent d89b3edc73
commit 69d5c619a3
1 changed files with 108 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
app/src/main/java/eu/faircode/email/StyleHelper.java
View File

@ -19,7 +19,6 @@ package eu.faircode.email;
Copyright 2018-2022 by Marcel Bokhorst (M66B) Copyright 2018-2022 by Marcel Bokhorst (M66B)
*/ */
import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
@ -39,6 +38,7 @@ import android.text.SpannableStringBuilder;
import android.text.Spanned; import android.text.Spanned;
import android.text.TextPaint; import android.text.TextPaint;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.style.AlignmentSpan; import android.text.style.AlignmentSpan;
import android.text.style.BackgroundColorSpan; import android.text.style.BackgroundColorSpan;
import android.text.style.BulletSpan; import android.text.style.BulletSpan;
@ -593,7 +593,7 @@ public class StyleHelper {
} }
}); });
Dialog dialog = new AlertDialog.Builder(context) AlertDialog dialog = new AlertDialog.Builder(context)
.setView(dview) .setView(dview)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override @Override
@ -601,112 +601,102 @@ public class StyleHelper {
String password1 = etPassword1.getEditText().getText().toString(); String password1 = etPassword1.getEditText().getText().toString();
String password2 = etPassword2.getEditText().getText().toString(); String password2 = etPassword2.getEditText().getText().toString();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); int start = etBody.getSelectionStart();
boolean debug = prefs.getBoolean("debug", false); int end = etBody.getSelectionEnd();
boolean selection = (start >= 0 && start < end);
if (selection) {
Bundle args = new Bundle();
args.putCharSequence("text", edit.subSequence(start, end));
args.putString("password", password1);
args.putInt("start", start);
args.putInt("end", end);
if (TextUtils.isEmpty(password1) && !(debug || BuildConfig.DEBUG)) new SimpleTask<String>() {
ToastEx.makeText(context, R.string.title_setup_password_missing, Toast.LENGTH_LONG).show(); @Override
else { protected String onExecute(Context context, Bundle args) throws Throwable {
if (password1.equals(password2)) { Spanned text = (Spanned) args.getCharSequence("text");
int start = etBody.getSelectionStart(); String password = args.getString("password");
int end = etBody.getSelectionEnd();
boolean selection = (start >= 0 && start < end);
if (selection) {
Bundle args = new Bundle();
args.putCharSequence("text", edit.subSequence(start, end));
args.putString("password", password1);
args.putInt("start", start);
args.putInt("end", end);
new SimpleTask<String>() { Drawable d = ContextCompat.getDrawable(context, R.drawable.twotone_image_24);
@Override d.setTint(Color.GRAY);
protected String onExecute(Context context, Bundle args) throws Throwable { Bitmap bm = Bitmap.createBitmap(24, 24, Bitmap.Config.ARGB_8888);
Spanned text = (Spanned) args.getCharSequence("text"); Canvas c = new Canvas(bm);
String password = args.getString("password"); d.setBounds(0, 0, c.getWidth(), c.getHeight());
d.draw(c);
Drawable d = ContextCompat.getDrawable(context, R.drawable.twotone_image_24); ByteArrayOutputStream bos = new ByteArrayOutputStream();
d.setTint(Color.GRAY); bm.compress(Bitmap.CompressFormat.PNG, 100, bos);
Bitmap bm = Bitmap.createBitmap(24, 24, Bitmap.Config.ARGB_8888);
Canvas c = new Canvas(bm);
d.setBounds(0, 0, c.getWidth(), c.getHeight());
d.draw(c);
ByteArrayOutputStream bos = new ByteArrayOutputStream(); StringBuilder sb = new StringBuilder();
bm.compress(Bitmap.CompressFormat.PNG, 100, bos); sb.append("data:image/png;base64,");
sb.append(Base64.encodeToString(bos.toByteArray(), Base64.NO_WRAP));
StringBuilder sb = new StringBuilder(); String html = HtmlHelper.toHtml(text, context);
sb.append("data:image/png;base64,"); Document doc = JsoupEx.parse(html);
sb.append(Base64.encodeToString(bos.toByteArray(), Base64.NO_WRAP)); for (Element img : doc.select("img"))
img.attr("src", sb.toString());
html = doc.body().html();
String html = HtmlHelper.toHtml(text, context); if (html.length() > MAX_PROTECTED_TEXT)
Document doc = JsoupEx.parse(html); throw new IllegalArgumentException(context.getString(R.string.title_style_protect_size));
for (Element img : doc.select("img"))
img.attr("src", sb.toString());
html = doc.body().html();
if (html.length() > MAX_PROTECTED_TEXT) SecureRandom random = new SecureRandom();
throw new IllegalArgumentException(context.getString(R.string.title_style_protect_size));
SecureRandom random = new SecureRandom(); byte[] salt = new byte[16]; // 128 bits
random.nextBytes(salt);
byte[] salt = new byte[16]; // 128 bits byte[] iv = new byte[12]; // 96 bites
random.nextBytes(salt); random.nextBytes(iv);
byte[] iv = new byte[12]; // 96 bites // Iterations = 120,000; Keylength = 256 bits = 32 bytes
random.nextBytes(iv); PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 120000, 256);
// Iterations = 120,000; Keylength = 256 bits = 32 bytes SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512");
PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 120000, 256); SecretKey key = skf.generateSecret(spec);
SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512"); // Authentication tag length = 128 bits = 16 bytes
SecretKey key = skf.generateSecret(spec); GCMParameterSpec parameterSpec = new GCMParameterSpec(128, iv);
// Authentication tag length = 128 bits = 16 bytes final Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
GCMParameterSpec parameterSpec = new GCMParameterSpec(128, iv); cipher.init(Cipher.ENCRYPT_MODE, key, parameterSpec);
final Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding"); byte[] cipherText = cipher.doFinal(html.getBytes(StandardCharsets.UTF_8));
cipher.init(Cipher.ENCRYPT_MODE, key, parameterSpec);
byte[] cipherText = cipher.doFinal(html.getBytes(StandardCharsets.UTF_8)); ByteBuffer out = ByteBuffer.allocate(1 + salt.length + iv.length + cipherText.length);
out.put((byte) 1); // version
out.put(salt);
out.put(iv);
out.put(cipherText);
ByteBuffer out = ByteBuffer.allocate(1 + salt.length + iv.length + cipherText.length); String fragment = Base64.encodeToString(out.array(), Base64.URL_SAFE | Base64.NO_WRAP);
out.put((byte) 1); // version String url = "https://email.faircode.eu/decrypt/#" + fragment;
out.put(salt);
out.put(iv);
out.put(cipherText);
String fragment = Base64.encodeToString(out.array(), Base64.URL_SAFE | Base64.NO_WRAP); return url;
String url = "https://email.faircode.eu/decrypt/#" + fragment;
return url;
}
@Override
protected void onExecuted(Bundle args, String url) {
if (etBody.getSelectionStart() != start ||
etBody.getSelectionEnd() != end)
return;
String title = context.getString(R.string.title_decrypt);
edit.delete(start, end);
edit.insert(start, title);
edit.setSpan(new URLSpan(url), start, start + title.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setSelection(start + title.length());
}
@Override
protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalArgumentException)
ToastEx.makeText(context, ex.getMessage(), Toast.LENGTH_LONG).show();
else {
Log.e(ex);
ToastEx.makeText(context, ex.toString(), Toast.LENGTH_LONG).show();
}
}
}.execute(context, owner, args, "protect");
} }
} else
ToastEx.makeText(context, R.string.title_setup_password_different, Toast.LENGTH_LONG).show(); @Override
protected void onExecuted(Bundle args, String url) {
if (etBody.getSelectionStart() != start ||
etBody.getSelectionEnd() != end)
return;
String title = context.getString(R.string.title_decrypt);
edit.delete(start, end);
edit.insert(start, title);
edit.setSpan(new URLSpan(url), start, start + title.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setSelection(start + title.length());
}
@Override
protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalArgumentException)
ToastEx.makeText(context, ex.getMessage(), Toast.LENGTH_LONG).show();
else {
Log.e(ex);
ToastEx.makeText(context, ex.toString(), Toast.LENGTH_LONG).show();
}
}
}.execute(context, owner, args, "protect");
} }
} }
}) })
@ -717,6 +707,34 @@ public class StyleHelper {
// WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE // WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
dialog.show(); dialog.show();
Button btnOk = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
TextWatcher w = new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
// Do nothing
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
// Do nothing
}
@Override
public void afterTextChanged(Editable s) {
String p1 = etPassword1.getEditText().getText().toString();
String p2 = etPassword2.getEditText().getText().toString();
btnOk.setEnabled(!TextUtils.isEmpty(p1) && p1.equals(p2));
etPassword2.setHint(!TextUtils.isEmpty(p2) && !p2.equals(p1)
? R.string.title_setup_password_different
: R.string.title_setup_password_repeat);
}
};
etPassword1.getEditText().addTextChangedListener(w);
etPassword2.getEditText().addTextChangedListener(w);
w.afterTextChanged(null);
return true; return true;
} }