[feature/remove-security-crypto] Security Crypto 라이브러리 제거 (#730)

* [feature/remove-security-crypto] Turn off EncryptedSharedPreferences * [feature/remove-secutiry-crypto] Refactor config modules * Remove legacy tests * Spotless Apply * Update profiles * Remove security crypto dependencies * [skip ci] Update profiles
sopt-makers · Jun 8, 2024 · 3c0b1c4 · 3c0b1c4
1 parent d00fd98
commit 3c0b1c4
Show file tree

Hide file tree

Showing 20 changed files with 53 additions and 4,011 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -137,7 +137,6 @@ dependencies {
     implementation(platform(libs.compose.bom))
     implementation(libs.bundles.compose)
     implementation(libs.startup)
-    implementation(libs.security)
     implementation(libs.swipe.refresh.layout)
 
     implementation(libs.inappupdate)

diff --git a/app/src/release/generated/baselineProfiles/baseline-prof.txt b/app/src/release/generated/baselineProfiles/baseline-prof.txt
diff --git a/app/src/release/generated/baselineProfiles/startup-prof.txt b/app/src/release/generated/baselineProfiles/startup-prof.txt
diff --git a/app/src/test/java/org/sopt/official/datastore/SoptDataStoreTest.kt b/app/src/test/java/org/sopt/official/datastore/SoptDataStoreTest.kt
diff --git a/app/src/test/java/org/sopt/official/datastore/fake/FakeAESKeyGenerator.kt b/app/src/test/java/org/sopt/official/datastore/fake/FakeAESKeyGenerator.kt
diff --git a/app/src/test/java/org/sopt/official/datastore/fake/FakeAndroidKeyStore.kt b/app/src/test/java/org/sopt/official/datastore/fake/FakeAndroidKeyStore.kt
diff --git a/app/src/test/java/org/sopt/official/datastore/fake/FakeKeyStore.kt b/app/src/test/java/org/sopt/official/datastore/fake/FakeKeyStore.kt
diff --git a/core/common/src/main/java/org/sopt/official/common/file/SharedPreferences.kt b/core/common/src/main/java/org/sopt/official/common/file/SharedPreferences.kt
@@ -0,0 +1,7 @@
+package org.sopt.official.common.file
+
+import android.content.Context
+import android.content.SharedPreferences
+
+fun createSharedPreference(fileName: String, context: Context): SharedPreferences =
+    context.getSharedPreferences(fileName, Context.MODE_PRIVATE)
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -34,7 +34,6 @@ android {
 
 dependencies {
     implementation(projects.core.common)
-    implementation(libs.security)
     implementation(platform(libs.okhttp.bom))
     implementation(libs.okhttp.logging.interceptor)
     implementation(libs.process.phoenix)

diff --git a/...opt/official/network/di/SecurityModule.kt → ...pt/official/network/di/DataStoreModule.kt b/...opt/official/network/di/SecurityModule.kt → ...pt/official/network/di/DataStoreModule.kt
@@ -24,25 +24,16 @@
  */
 package org.sopt.official.network.di
 
-import android.content.Context
-import androidx.security.crypto.MasterKey
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
 import org.sopt.official.common.di.LocalStore
+import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-object SecurityModule {
-    @Provides
-    @Singleton
-    fun provideMasterKey(@ApplicationContext context: Context): MasterKey = MasterKey.Builder(context)
-        .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
-        .build()
-
+object DataStoreModule {
     @Provides
     @Singleton
     @LocalStore

diff --git a/core/network/src/main/java/org/sopt/official/network/persistence/SoptDataStore.kt b/core/network/src/main/java/org/sopt/official/network/persistence/SoptDataStore.kt
@@ -26,64 +26,18 @@ package org.sopt.official.network.persistence
 
 import android.content.Context
 import androidx.core.content.edit
-import androidx.security.crypto.EncryptedSharedPreferences
-import androidx.security.crypto.MasterKey
 import dagger.hilt.android.qualifiers.ApplicationContext
-import java.security.KeyStore
 import javax.inject.Inject
 import javax.inject.Singleton
-import org.sopt.official.common.BuildConfig
 import org.sopt.official.common.di.LocalStore
-import timber.log.Timber
+import org.sopt.official.common.file.createSharedPreference
 
 @Singleton
 class SoptDataStore @Inject constructor(
     @ApplicationContext private val context: Context,
     @LocalStore private val fileName: String,
-    masterKey: MasterKey,
 ) {
-    private val store = try {
-        createSharedPreference(
-            !BuildConfig.DEBUG,
-            fileName,
-            masterKey
-        )
-    } catch (e: Exception) {
-        Timber.e(e)
-        deleteMasterKeyEntry()
-        deleteEncryptedPreference()
-        createSharedPreference(
-            !BuildConfig.DEBUG,
-            fileName,
-            masterKey
-        )
-    }
-
-    private fun createSharedPreference(isEncrypted: Boolean, fileName: String, masterKey: MasterKey) = if (isEncrypted) {
-        EncryptedSharedPreferences.create(
-            context,
-            fileName,
-            masterKey,
-            EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
-            EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
-        )
-    } else {
-        context.getSharedPreferences(DEBUG_FILE_NAME, Context.MODE_PRIVATE)
-    }
-
-    /**
-     * androidx.security.crypto.MasterKeys.ANDROID_KEYSTORE 참고
-     */
-    private fun deleteMasterKeyEntry() {
-        KeyStore.getInstance(ANDROID_KEY_STORE).apply {
-            load(null)
-            deleteEntry(KEY_ALIAS_AUTH)
-        }
-    }
-
-    private fun deleteEncryptedPreference() {
-        context.deleteSharedPreferences("sampleKey")
-    }
+    private val store = createSharedPreference(fileName, context)
 
     fun clear() {
         store.edit(true) {

diff --git a/data/poke/build.gradle.kts b/data/poke/build.gradle.kts
@@ -41,5 +41,4 @@ dependencies {
     implementation(platform(libs.okhttp.bom))
     implementation(libs.bundles.okhttp)
 
-    implementation(libs.security)
 }