luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-14 22:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Support plain text databases

Browse source
This commit is contained in:
Alexander Bakker 2017-08-06 21:45:27 +02:00
parent 722ea50b68
commit 3e2bb5b0b3
12 changed files with 160 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -30,13 +30,13 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:recyclerview-v7:25.0.0'
compile 'com.android.support:recyclerview-v7:25.0.0'
compile 'com.android.support:appcompat-v7:25.0.0'
compile 'com.android.support:design:25.0.0'
compile 'agency.tango.android:material-intro-screen:0.0.3'
compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
compile 'me.dm7.barcodescanner:zxing:1.9'
compile 'com.android.support:cardview-v7:25.0.0'
compile 'com.android.support:recyclerview-v7:25.0.0'
compile 'com.android.support:support-v4:25.0.0'
compile 'com.yarolegovich:lovely-dialog:1.0.4'
compile 'com.mattprecious.swirl:swirl:1.0.0'

38
app/src/main/java/me/impy/aegis/CustomAuthenticatedSlide.java
View file

@ -1,5 +1,6 @@
package me.impy.aegis;
import android.content.Intent;
import android.os.Bundle;
import android.text.Editable;
import android.view.LayoutInflater;
@ -22,6 +23,7 @@ import me.impy.aegis.crypto.slots.PasswordSlot;
import me.impy.aegis.crypto.slots.Slot;
public class CustomAuthenticatedSlide extends SlideFragment {
private int cryptType;
private EditText textPassword;
private EditText textPasswordConfirm;
@ -33,6 +35,29 @@ public class CustomAuthenticatedSlide extends SlideFragment {
return view;
}
@Override
public void setUserVisibleHint(boolean isVisibleToUser) {
super.setUserVisibleHint(isVisibleToUser);
if (!isVisibleToUser) {
return;
}
Intent intent = getActivity().getIntent();
cryptType = intent.getIntExtra("cryptType", 1337);
switch(cryptType) {
case CustomAuthenticationSlide.CRYPT_TYPE_NONE:
break;
case CustomAuthenticationSlide.CRYPT_TYPE_PASS:
break;
case CustomAuthenticationSlide.CRYPT_TYPE_FINGER:
break;
default:
throw new RuntimeException();
}
}
@Override
public int backgroundColor() {
return R.color.colorHeaderSuccess;
@ -45,12 +70,21 @@ public class CustomAuthenticatedSlide extends SlideFragment {
@Override
public boolean canMoveFurther() {
switch(cryptType) {
case CustomAuthenticationSlide.CRYPT_TYPE_NONE:
return true;
case CustomAuthenticationSlide.CRYPT_TYPE_PASS:
char[] password = getEditTextChars(textPassword);
char[] passwordConfirm = getEditTextChars(textPasswordConfirm);
boolean equal = password.length != 0 && Arrays.equals(password, passwordConfirm);
CryptoUtils.zero(password);
CryptoUtils.zero(passwordConfirm);
return equal;
case CustomAuthenticationSlide.CRYPT_TYPE_FINGER:
return false;
default:
throw new RuntimeException();
}
}
@Override
@ -58,6 +92,10 @@ public class CustomAuthenticatedSlide extends SlideFragment {
return "Passwords should be equal and non-empty";
}
public int getCryptType() {
return cryptType;
}
public Cipher getCipher(PasswordSlot slot, int mode)
throws InvalidKeySpecException, NoSuchAlgorithmException,
InvalidKeyException, NoSuchPaddingException {

56
app/src/main/java/me/impy/aegis/CustomAuthenticationSlide.java
View file

@ -1,35 +1,77 @@
package me.impy.aegis;
import android.Manifest;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.IdRes;
import android.support.v4.app.ActivityCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
import android.widget.Toast;
import agency.tango.materialintroscreen.SlideFragment;
public class CustomAuthenticationSlide extends SlideFragment {
public static final int CRYPT_TYPE_NONE = 0;
public static final int CRYPT_TYPE_PASS = 1;
public static final int CRYPT_TYPE_FINGER = 2;
private RadioGroup buttonGroup;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
final View view = inflater.inflate(R.layout.fragment_authentication_slide, container, false);
buttonGroup = (RadioGroup) view.findViewById(R.id.rg_authenticationMethod);
final Context context = getContext();
RadioButton button = (RadioButton) view.findViewById(R.id.rb_fingerprint);
button.setOnClickListener(new View.OnClickListener() {
buttonGroup = (RadioGroup) view.findViewById(R.id.rg_authenticationMethod);
buttonGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override
public void onClick(View v) {
if (canMoveFurther()) {
buttonGroup.clearCheck();
Toast.makeText(CustomAuthenticationSlide.this.getActivity(), "Fingerprint is not supported yet", Toast.LENGTH_SHORT).show();
public void onCheckedChanged(RadioGroup group, @IdRes int checkedId) {
if (checkedId == -1) {
return;
}
int id;
switch (checkedId) {
case R.id.rb_none:
id = CRYPT_TYPE_NONE;
break;
case R.id.rb_password:
id = CRYPT_TYPE_PASS;
break;
case R.id.rb_fingerprint:
id = CRYPT_TYPE_FINGER;
// TODO: remove this
group.clearCheck();
Toast.makeText(context, "Fingerprint is not supported yet", Toast.LENGTH_SHORT).show();
break;
default:
throw new RuntimeException();
}
Intent intent = getActivity().getIntent();
intent.putExtra("cryptType", id);
}
});
// only show the fingerprint option if the api version is new enough, permission is granted and a scanner is found
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
FingerprintManager fingerprintManager = (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
if (ActivityCompat.checkSelfPermission(context, Manifest.permission.USE_FINGERPRINT) == PackageManager.PERMISSION_GRANTED && fingerprintManager.isHardwareDetected()) {
RadioButton button = (RadioButton) view.findViewById(R.id.rb_fingerprint);
TextView text = (TextView) view.findViewById(R.id.text_rb_fingerprint);
button.setVisibility(View.VISIBLE);
text.setVisibility(View.VISIBLE);
}
}
return view;
}

33
app/src/main/java/me/impy/aegis/IntroActivity.java
View file

@ -32,6 +32,7 @@ public class IntroActivity extends MaterialIntroActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
hideBackButton();
addSlide(new SlideFragmentBuilder()
.backgroundColor(R.color.colorPrimary)
@ -84,11 +85,21 @@ public class IntroActivity extends MaterialIntroActivity {
Database database = new Database();
DatabaseFile databaseFile = new DatabaseFile();
MasterKey masterKey;
try {
// generate the master key
masterKey = MasterKey.generate();
int cryptType = authenticatedSlide.getCryptType();
// generate the master key
MasterKey masterKey = null;
if (cryptType != CustomAuthenticationSlide.CRYPT_TYPE_NONE) {
try {
masterKey = MasterKey.generate();
} catch (Exception e) {
setException(e);
return;
}
}
if (cryptType != CustomAuthenticationSlide.CRYPT_TYPE_NONE) {
try {
// encrypt the master key with a key derived from the user's password
// and add it to the list of slots
SlotCollection slots = databaseFile.getSlots();
@ -96,12 +107,26 @@ public class IntroActivity extends MaterialIntroActivity {
Cipher cipher = authenticatedSlide.getCipher(slot, Cipher.ENCRYPT_MODE);
masterKey.encryptSlot(slot, cipher);
slots.add(slot);
} catch (Exception e) {
setException(e);
return;
}
}
if (cryptType != CustomAuthenticationSlide.CRYPT_TYPE_FINGER) {
// TODO
}
// finally, save the database
try {
byte[] bytes = database.serialize();
if (cryptType == CustomAuthenticationSlide.CRYPT_TYPE_NONE) {
databaseFile.setContent(bytes);
} else {
CryptResult result = masterKey.encrypt(bytes);
databaseFile.setContent(result.Data);
databaseFile.setCryptParameters(result.Parameters);
}
databaseFile.save(getApplicationContext());
} catch (Exception e) {
setException(e);

2
app/src/main/java/me/impy/aegis/MainActivity.java
View file

@ -84,6 +84,8 @@ public class MainActivity extends AppCompatActivity {
Intent intent = new Intent(this, AuthActivity.class);
intent.putExtra("slots", db.getFile().getSlots());
startActivityForResult(intent, CODE_DECRYPT);
} else {
loadKeyProfiles();
}
}

4
app/src/main/java/me/impy/aegis/db/DatabaseManager.java
View file

@ -40,9 +40,13 @@ public class DatabaseManager {
public void save() throws Exception {
assertDecrypted();
byte[] bytes = _db.serialize();
if (!_file.isEncrypted()) {
_file.setContent(bytes);
} else {
CryptResult result = _key.encrypt(bytes);
_file.setContent(result.Data);
_file.setCryptParameters(result.Parameters);
}
_file.save(_context);
}

1
app/src/main/res/layout/activity_auth.xml
View file

@ -18,7 +18,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="24sp"
android:textColor="@color/primary_text_inverted"
android:id="@+id/textView2" />
<LinearLayout
android:orientation="vertical"

76
app/src/main/res/layout/fingerprint_dialog_backup.xml
View file

@ -1,76 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/backup_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="16dp"
android:paddingBottom="8dp">
<FrameLayout
android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/password_description"
android:id="@+id/password_description"
android:textColor="?android:attr/textColorSecondary" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/new_fingerprint_enrolled_description"
android:id="@+id/new_fingerprint_enrolled_description"
android:visibility="gone"
android:textColor="?android:attr/textColorSecondary" />
</FrameLayout>
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:ems="10"
android:hint="@string/password"
android:imeOptions="actionGo"
android:id="@+id/password"
android:layout_below="@+id/description"
android:layout_marginTop="16dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_alignParentStart="true" />
<CheckBox
android:id="@+id/use_fingerprint_in_future_check"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/password"
android:layout_alignParentStart="true"
android:layout_marginTop="16dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:checked="true"
android:visibility="gone"
android:text="@string/use_fingerprint_in_future" />
</RelativeLayout>

63
app/src/main/res/layout/fingerprint_dialog_container.xml
View file

@ -1,63 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<include layout="@layout/fingerprint_dialog_content" />
<include
layout="@layout/fingerprint_dialog_backup"
android:visibility="gone" />
</FrameLayout>
<LinearLayout
android:id="@+id/buttonPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:gravity="bottom"
style="?android:attr/buttonBarStyle">
<Space
android:id="@+id/spacer"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"
android:visibility="invisible" />
<Button
android:id="@+id/cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<Button
android:id="@+id/second_dialog_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
</LinearLayout>

56
app/src/main/res/layout/fingerprint_dialog_content.xml
View file

@ -1,56 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fingerprint_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="8dp"
android:paddingStart="24dp"
android:paddingEnd="24dp"
android:paddingTop="16dp">
<TextView
android:id="@+id/fingerprint_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:text="@string/fingerprint_description"
android:textColor="?android:attr/textColorSecondary"/>
<ImageView
android:id="@+id/fingerprint_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_below="@+id/fingerprint_description"
android:layout_marginTop="20dp"
android:src="@drawable/ic_fp_40px" />
<TextView
android:id="@+id/fingerprint_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/fingerprint_icon"
android:layout_alignTop="@+id/fingerprint_icon"
android:layout_marginStart="16dp"
android:layout_toEndOf="@+id/fingerprint_icon"
android:gravity="center_vertical"
android:text="@string/fingerprint_hint"
android:textColor="@color/hint_color" />
</RelativeLayout>

11
app/src/main/res/layout/fragment_authentication_slide.xml
View file

@ -39,7 +39,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:id="@+id/radioButton"
android:id="@+id/rb_none"
android:text="@string/authentication_method_none"/>
<TextView
@ -64,23 +64,24 @@
android:layout_height="wrap_content"
android:layout_marginTop="-5dp"
android:textColor="@color/secondary_text_inverted"
android:layout_marginStart="32dp"
/>
android:layout_marginStart="32dp"/>
<RadioButton
android:text="@string/authentication_method_fingerprint"
android:layout_width="match_parent"
android:textSize="16sp"
android:layout_height="wrap_content"
android:id="@+id/rb_fingerprint"/>
android:id="@+id/rb_fingerprint"
android:visibility="invisible"/>
<TextView
android:id="@+id/text_rb_fingerprint"
android:text="@string/authentication_method_fingerprint_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-5dp"
android:textColor="@color/secondary_text_inverted"
android:layout_marginStart="32dp"
/>
android:visibility="invisible"/>
</RadioGroup>

36
app/src/main/res/values/strings.xml
View file

@ -8,36 +8,17 @@
<string name="pref_issuers">Show the issuer</string>
<string name="pref_issuers_description">Enable this to show the issuer next to the profile name</string>
<string name="cancel">Cancel</string>
<string name="use_password">Use password</string>
<string name="sign_in">Sign in</string>
<string name="ok">Ok</string>
<string name="password">Password</string>
<string name="fingerprint_description">Confirm fingerprint to continue</string>
<string name="fingerprint_hint">Touch sensor</string>
<string name="password_description">Enter your store password to continue</string>
<string name="purchase">Purchase</string>
<string name="purchase_not_invalidated">Purchase not invalidated</string>
<string name="purchase_button_not_invalidated_description">
You can proceed to purchase with this button \n even if a new fingerprint is enrolled
</string>
<string name="fingerprint_not_recognized">Fingerprint not recognized. Try again</string>
<string name="fingerprint_success">Fingerprint recognized</string>
<string name="item_title">White Mesh Pluto Backpack</string>
<string name="item_price">$62.68</string>
<string name="item_description">Mesh backpack in white. Black textile trim throughout.</string>
<string name="purchase_done">Purchase successful</string>
<string name="new_fingerprint_enrolled_description">A new fingerprint was added to this device, so your password is required.</string>
<string name="use_fingerprint_in_future">Use fingerprint in the future</string>
<string name="use_fingerprint_to_authenticate_title">Use fingerprint to authenticate</string>
<string name="use_fingerprint_to_authenticate_key">use_fingerprint_to_authenticate_key</string>
<string name="choose_authentication_method">Authentication</string>
<string name="choose_authentication_method">Encryption</string>
<string name="authentication_method_none">None</string>
<string name="authentication_method_none_description">This provides no security at all, use at your own risk</string>
<string name="authentication_method_none_description">The database will be stored in plain text</string>
<string name="authentication_method_password">Password</string>
<string name="authentication_method_password_description">This allows you to use a password in order to open the app</string>
<string name="authentication_method_fingerprint">Fingerprint</string>
<string name="authentication_method_fingerprint_description">This allows you to use the fingerprints registered on this device to open the app</string>
<string name="authentication_method_password_description">The database will be encrypted with a key derived from a password</string>
<string name="authentication_method_fingerprint">Password &amp; Fingerprint</string>
<string name="authentication_method_fingerprint_description">In addition to a password, fingerprints registered on this device can be used to decrypt the database</string>
<string name="authentication_method_set_password">Password</string>
<string name="authentication_enter_password">Enter your password</string>
<string name="authentication">Open the database</string>
@ -47,6 +28,9 @@
<string-array name="authentication_methods">
<item>None</item>
<item>Password</item>
<item>Fingerprint</item>
<item>Password &amp; Fingerprint</item>
</string-array>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources>