Add AppSecurityService layer over CryptoManager

app/src/androidTest/java/app/notesr/NotesIntegrationTest.java → app/src/androidTest/java/app/notesr/activity/NotesIntegrationTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package app.notesr;
+package app.notesr.activity;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -20,8 +20,6 @@
 
 import app.notesr.core.security.crypto.AesCryptor;
 import app.notesr.core.security.crypto.AesGcmCryptor;
-import app.notesr.core.security.crypto.CryptoManager;
-import app.notesr.core.security.crypto.CryptoManagerProvider;
 import app.notesr.data.AppDatabase;
 import app.notesr.data.DatabaseProvider;
 import app.notesr.core.security.dto.CryptoSecrets;
@@ -31,6 +29,7 @@
 import app.notesr.service.file.FileService;
 import app.notesr.service.note.NoteService;
 import app.notesr.core.util.FilesUtilsAdapter;
+import app.notesr.service.security.AppSecurityService;
 import io.bloco.faker.Faker;
 
 import org.junit.Before;
@@ -58,14 +57,14 @@ public class NotesIntegrationTest {
     private Note testNote;
 
     @BeforeClass
-    public static void beforeAll() throws Exception {
+    public static void beforeAll() {
         context = ApplicationProvider.getApplicationContext();
 
         FilesUtilsAdapter filesUtils = new FilesUtils();
-        CryptoManager cryptoManager = CryptoManagerProvider.getInstance(context);
+        var appSecurityService = new AppSecurityService(context);
         CryptoSecrets cryptoSecrets = getTestSecrets();
 
-        cryptoManager.setSecrets(context, cryptoSecrets);
+        appSecurityService.setSecrets(cryptoSecrets);
 
         cryptor = new AesGcmCryptor(getSecretKeyFromSecrets(cryptoSecrets));
         db = DatabaseProvider.getInstance(context);

app/src/main/java/app/notesr/activity/ActivityBase.java

@@ -17,11 +17,12 @@
 import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsCompat;
 
-import app.notesr.core.security.crypto.CryptoManager;
-import app.notesr.core.security.crypto.CryptoManagerProvider;
+import app.notesr.service.security.AppSecurityService;
 
 public class ActivityBase extends AppCompatActivity {
 
+    private AppSecurityService appSecurityService;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -30,6 +31,8 @@ protected void onCreate(Bundle savedInstanceState) {
         int windowFlag = WindowManager.LayoutParams.FLAG_SECURE;
         getWindow().setFlags(windowFlag, windowFlag);
 
+        appSecurityService = new AppSecurityService(getApplicationContext());
+
         if (requiresSession() && !isSessionActive()) {
             restartApp();
         }
@@ -58,8 +61,7 @@ protected boolean requiresSession() {
     }
 
     private boolean isSessionActive() {
-        CryptoManager cryptoManager = CryptoManagerProvider.getInstance(getApplicationContext());
-        return cryptoManager.isConfigured();
+        return appSecurityService.isAuthConfigured();
     }
 
     private void restartApp() {

app/src/main/java/app/notesr/activity/MainActivity.java

@@ -13,15 +13,14 @@
 import java.util.function.Supplier;
 
 import app.notesr.R;
-import app.notesr.core.security.crypto.CryptoManager;
-import app.notesr.core.security.crypto.CryptoManagerProvider;
 import app.notesr.service.AndroidServiceBootstrapper;
 import app.notesr.service.AndroidServiceRegistry;
 import app.notesr.service.lifecycle.AppCloseAndroidService;
 import app.notesr.service.lifecycle.AppCloseAndroidServiceStarter;
 import app.notesr.activity.note.list.NotesListActivity;
 import app.notesr.activity.security.AuthActivity;
 import app.notesr.activity.security.KeyRecoveryActivity;
+import app.notesr.service.security.AppSecurityService;
 
 public final class MainActivity extends ActivityBase {
 
@@ -37,10 +36,10 @@ protected void onCreate(Bundle savedInstanceState) {
         new AndroidServiceBootstrapper(serviceRegistry)
                 .startServicesPreAuth(getApplicationContext());
 
-        var cryptoManager = CryptoManagerProvider.getInstance(getApplicationContext());
+        var appSecurityService = new AppSecurityService(getApplicationContext());
         var intentSuppliers = getIntentSuppliers(
                 getApplicationContext(),
-                cryptoManager,
+                appSecurityService,
                 fsaResolver
         );
 
@@ -58,22 +57,22 @@ protected boolean requiresSession() {
 
     private List<Supplier<Intent>> getIntentSuppliers(
             Context context,
-            CryptoManager cryptoManager,
+            AppSecurityService appSecurityService,
             FsaResolver fsaResolver
     ) {
         return List.of(
-                () -> cryptoManager.isBlocked(getApplicationContext())
+                () -> appSecurityService.isAppBlocked()
                         ? new Intent(context, KeyRecoveryActivity.class)
                         : null,
 
-                () -> !cryptoManager.isKeyExists(getApplicationContext())
+                () -> !appSecurityService.isKeyExists()
                         ? new Intent(context, StartActivity.class)
                         : null,
 
-                () -> !cryptoManager.isConfigured()
+                () -> !appSecurityService.isAuthConfigured()
                         ? new Intent(context, AuthActivity.class)
                         .putExtra(AuthActivity.EXTRA_MODE,
-                                AuthActivity.Mode.AUTHORIZATION.toString())
+                                AuthActivity.Mode.AUTHENTICATION.toString())
                         : null,
 
                 () -> {

app/src/main/java/app/notesr/activity/exporter/ExportActivity.java

@@ -32,8 +32,8 @@
 
 import app.notesr.R;
 import app.notesr.activity.ActivityBase;
+import app.notesr.core.security.crypto.AesCryptor;
 import app.notesr.core.security.crypto.AesCryptorFactory;
-import app.notesr.core.security.crypto.CryptoManagerProvider;
 import app.notesr.core.util.FileExifDataResolver;
 import app.notesr.core.util.FilesUtils;
 import app.notesr.data.DatabaseProvider;
@@ -44,6 +44,7 @@
 import app.notesr.service.file.FileService;
 import app.notesr.activity.note.list.NotesListActivity;
 import app.notesr.service.note.NoteService;
+import app.notesr.service.security.AppSecurityService;
 import app.notesr.util.VersionFetcherImpl;
 
 public final class ExportActivity extends ActivityBase {
@@ -75,8 +76,8 @@ protected void onCreate(Bundle savedInstanceState) {
         var context = getApplicationContext();
         var db = DatabaseProvider.getInstance(this);
 
-        var secrets = CryptoManagerProvider.getInstance(context).getSecrets();
-        var cryptor = AesCryptorFactory.createAesGcmCryptor(secrets);
+        AesCryptor cryptor = AesCryptorFactory.createAesGcmCryptor(
+                new AppSecurityService(context).getActualSecrets());
 
         noteService = new NoteService(db);
         fileService = new FileService(context, db, cryptor, new FilesUtils());

app/src/main/java/app/notesr/activity/file/FilesListActivity.java

@@ -32,15 +32,16 @@
 import app.notesr.activity.ActivityBase;
 import app.notesr.activity.DialogFactory;
 import app.notesr.activity.file.viewer.FileViewerActivityBase;
+import app.notesr.core.security.crypto.AesCryptor;
 import app.notesr.core.security.crypto.AesCryptorFactory;
 import app.notesr.core.security.exception.DecryptionFailedException;
 import app.notesr.data.DatabaseProvider;
 import app.notesr.service.file.FileService;
 import app.notesr.service.note.NoteService;
 import app.notesr.data.model.FileInfo;
 import app.notesr.data.model.Note;
-import app.notesr.core.security.crypto.CryptoManagerProvider;
 import app.notesr.core.util.FilesUtils;
+import app.notesr.service.security.AppSecurityService;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -81,8 +82,8 @@ protected void onCreate(Bundle savedInstanceState) {
         var context = getApplicationContext();
         var db = DatabaseProvider.getInstance(context);
 
-        var secrets = CryptoManagerProvider.getInstance(context).getSecrets();
-        var cryptor = AesCryptorFactory.createAesGcmCryptor(secrets);
+        AesCryptor cryptor = AesCryptorFactory.createAesGcmCryptor(
+                new AppSecurityService(context).getActualSecrets());
 
         fileService = new FileService(context, db, cryptor, new FilesUtils());
         noteService = new NoteService(db);

app/src/main/java/app/notesr/activity/file/viewer/FileViewerActivityBase.java

@@ -27,12 +27,13 @@
 import app.notesr.R;
 import app.notesr.activity.ActivityBase;
 import app.notesr.activity.file.helper.FileIOHelper;
+import app.notesr.core.security.crypto.AesCryptor;
 import app.notesr.core.security.crypto.AesCryptorFactory;
-import app.notesr.core.security.crypto.CryptoManagerProvider;
 import app.notesr.core.util.FilesUtils;
 import app.notesr.data.DatabaseProvider;
 import app.notesr.data.model.FileInfo;
 import app.notesr.service.file.FileService;
+import app.notesr.service.security.AppSecurityService;
 
 import java.io.File;
 import java.io.IOException;
@@ -61,8 +62,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         var context = getApplicationContext();
 
-        var secrets = CryptoManagerProvider.getInstance(context).getSecrets();
-        var cryptor = AesCryptorFactory.createAesGcmCryptor(secrets);
+        AesCryptor cryptor = AesCryptorFactory.createAesGcmCryptor(
+                new AppSecurityService(context).getActualSecrets());
 
         fileService = new FileService(
                 context,

app/src/main/java/app/notesr/activity/file/viewer/OpenImageActivity.java

@@ -8,6 +8,7 @@
 import static java.util.concurrent.Executors.newSingleThreadExecutor;
 
 import app.notesr.activity.DialogFactory;
+import app.notesr.core.security.crypto.AesCryptor;
 import app.notesr.core.security.crypto.AesCryptorFactory;
 import app.notesr.core.util.FilesUtils;
 
@@ -32,7 +33,7 @@
 import app.notesr.data.DatabaseProvider;
 import app.notesr.core.security.exception.DecryptionFailedException;
 import app.notesr.service.file.FileService;
-import app.notesr.core.security.crypto.CryptoManagerProvider;
+import app.notesr.service.security.AppSecurityService;
 
 public final class OpenImageActivity extends FileViewerActivityBase {
 
@@ -174,8 +175,8 @@ private FileService getFileService() {
         var context = getApplicationContext();
         var db = DatabaseProvider.getInstance(this);
 
-        var secrets = CryptoManagerProvider.getInstance(context).getSecrets();
-        var cryptor = AesCryptorFactory.createAesGcmCryptor(secrets);
+        AesCryptor cryptor = AesCryptorFactory.createAesGcmCryptor(
+                new AppSecurityService(context).getActualSecrets());
 
         var filesUtils = new FilesUtils();
 

app/src/main/java/app/notesr/activity/file/viewer/OpenVideoActivity.java

@@ -23,11 +23,11 @@
 import app.notesr.core.security.crypto.AesCryptor;
 import app.notesr.core.security.crypto.AesCryptorFactory;
 import app.notesr.core.security.crypto.AesGcmCryptor;
-import app.notesr.core.security.crypto.CryptoManagerProvider;
 import app.notesr.core.security.crypto.EncryptedMediaDataSourceFactory;
 import app.notesr.core.util.FilesUtils;
 import app.notesr.data.DatabaseProvider;
 import app.notesr.service.file.FileService;
+import app.notesr.service.security.AppSecurityService;
 
 import java.io.File;
 import java.util.stream.Collectors;
@@ -59,8 +59,8 @@ protected void onCreate(Bundle savedInstanceState) {
         var context = getApplicationContext();
         var db = DatabaseProvider.getInstance(context);
 
-        var secrets = CryptoManagerProvider.getInstance(context).getSecrets();
-        var cryptor = AesCryptorFactory.createAesGcmCryptor(secrets);
+        AesCryptor cryptor = AesCryptorFactory.createAesGcmCryptor(
+                new AppSecurityService(context).getActualSecrets());
 
         fileService = new FileService(context, db, cryptor, new FilesUtils());
         videoView = findViewById(R.id.video_view);

app/src/main/java/app/notesr/activity/note/editor/OpenNoteActivity.java

@@ -31,13 +31,14 @@
 import app.notesr.activity.ActivityBase;
 import app.notesr.activity.DialogFactory;
 import app.notesr.activity.file.FilesListActivity;
+import app.notesr.core.security.crypto.AesCryptor;
 import app.notesr.core.security.crypto.AesCryptorFactory;
 import app.notesr.data.DatabaseProvider;
 import app.notesr.service.file.FileService;
 import app.notesr.data.model.Note;
 import app.notesr.service.note.NoteService;
-import app.notesr.core.security.crypto.CryptoManagerProvider;
 import app.notesr.core.util.FilesUtils;
+import app.notesr.service.security.AppSecurityService;
 import io.noties.markwon.Markwon;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -95,8 +96,8 @@ protected void onCreate(Bundle savedInstanceState) {
         var context = getApplicationContext();
         var db = DatabaseProvider.getInstance(context);
 
-        var secrets = CryptoManagerProvider.getInstance(context).getSecrets();
-        var cryptor = AesCryptorFactory.createAesGcmCryptor(secrets);
+        AesCryptor cryptor = AesCryptorFactory.createAesGcmCryptor(
+                new AppSecurityService(context).getActualSecrets());
 
         noteService = new NoteService(db);
         fileService = new FileService(context, db, cryptor, new FilesUtils());

app/src/main/java/app/notesr/activity/note/list/NotesListActivity.java

@@ -40,12 +40,11 @@
 import app.notesr.activity.security.AuthActivity;
 import app.notesr.activity.security.GenerateNewKeyAction;
 import app.notesr.activity.security.LockAction;
-import app.notesr.core.security.crypto.CryptoManager;
-import app.notesr.core.security.crypto.CryptoManagerProvider;
 import app.notesr.data.AppDatabase;
 import app.notesr.data.DatabaseProvider;
 import app.notesr.data.model.Note;
 import app.notesr.service.note.NoteService;
+import app.notesr.service.security.AppSecurityService;
 
 import java.util.HashMap;
 import java.util.List;
@@ -74,10 +73,10 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_note_list);
         applyInsets(findViewById(R.id.main));
 
-        CryptoManager cryptoManager = CryptoManagerProvider.getInstance(getApplicationContext());
+        var appSecurityService = new AppSecurityService(getApplicationContext());
 
-        lockAction = new LockAction(this, cryptoManager);
-        generateNewKeyAction = new GenerateNewKeyAction(this, cryptoManager);
+        lockAction = new LockAction(this, appSecurityService);
+        generateNewKeyAction = new GenerateNewKeyAction(this, appSecurityService);
 
         noteEditorLauncher = registerForActivityResult(
                 new ActivityResultContracts.StartActivityForResult(), getOpenNoteResultCallback());

app/src/main/java/app/notesr/activity/security/AuthActivity.java

@@ -18,9 +18,8 @@
 
 import app.notesr.R;
 import app.notesr.activity.ActivityBase;
-import app.notesr.core.security.crypto.CryptoManager;
-import app.notesr.core.security.crypto.CryptoManagerProvider;
 import app.notesr.core.util.SecureStringBuilder;
+import app.notesr.service.security.AppSecurityService;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -32,7 +31,7 @@ public final class AuthActivity extends ActivityBase {
     @AllArgsConstructor
     @Getter
     public enum Mode {
-        AUTHORIZATION("authorization"),
+        AUTHENTICATION("authentication"),
         CREATE_PASSWORD("create_password"),
         CHANGE_PASSWORD("change_password"),
         KEY_RECOVERY("key_recovery");
@@ -57,8 +56,8 @@ protected void onCreate(Bundle savedInstanceState) {
         applyInsets(findViewById(R.id.main));
 
         String mode = getIntent().getStringExtra(EXTRA_MODE);
-        CryptoManager cryptoManager = CryptoManagerProvider.getInstance(getApplicationContext());
-        extension = new AuthActivityExtension(this, cryptoManager, passwordBuilder);
+        var appSecurityService = new AppSecurityService(getApplicationContext());
+        extension = new AuthActivityExtension(this, appSecurityService, passwordBuilder);
 
         try {
             currentMode = Mode.valueOf(mode);
@@ -86,7 +85,7 @@ private void configure() {
         Button changeLayoutButton = findViewById(R.id.changeKeyboardLayoutButton);
 
         switch (currentMode) {
-            case AUTHORIZATION -> {
+            case AUTHENTICATION -> {
                 topLabel.setText(R.string.enter_access_code);
                 disableBackButton(this);
             }
@@ -123,7 +122,7 @@ private void configure() {
 
         authButton.setOnClickListener(view -> {
             switch (currentMode) {
-                case AUTHORIZATION -> extension.authorize();
+                case AUTHENTICATION -> extension.authenticate();
                 case CREATE_PASSWORD -> extension.createPassword();
                 case KEY_RECOVERY -> extension.recoverKey();
                 case CHANGE_PASSWORD -> extension.changePassword();