Skip to content

Show SSL error with incorrect validation settings #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martenrebane wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Show SSL error with incorrect validation settings #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/FileOpeningViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ import ee.ria.DigiDoc.domain.repository.fileopening.FileOpeningRepository
import ee.ria.DigiDoc.domain.repository.siva.SivaRepository
import ee.ria.DigiDoc.exceptions.EmptyFileException
import ee.ria.DigiDoc.libdigidoclib.SignedContainer
import ee.ria.DigiDoc.libdigidoclib.exceptions.SSLHandshakeException
import ee.ria.DigiDoc.libdigidoclib.init.Initialization
import ee.ria.DigiDoc.libdigidoclib.init.LibdigidocLibraryLoader
import ee.ria.DigiDoc.utilsLib.mimetype.MimeTypeResolver
Expand Down Expand Up @@ -759,6 +760,30 @@ class FileOpeningViewModelTest {
verify(errorStateObserver).onChanged(Pair(R.string.no_internet_connection, null))
}

@Test
fun fileOpeningViewModel_handleFiles_sslHandshakeException() =
runTest {
val uri: Uri = mock()
val uris = listOf(uri)
val exception = SSLHandshakeException(context)

val isSivaConfirmed = true

`when`(fileOpeningRepository.openOrCreateContainer(context, contentResolver, uris, isSivaConfirmed))
.thenThrow(exception)

viewModel.handleFiles(
context,
uris,
null,
isSivaConfirmed = isSivaConfirmed,
fileOpeningMethod = FileOpeningMethod.ALL,
)

verify(signedContainerObserver, atLeastOnce()).onChanged(null)
verify(errorStateObserver).onChanged(Pair(R.string.invalid_ssl_handshake, null))
}

@Test
fun fileOpeningViewModel_handleFiles_failWhenNullContainer() =
runTest {
Expand Down
146 changes: 108 additions & 38 deletions app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/shared/SharedSettingsViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@

package ee.ria.DigiDoc.viewmodel.shared

import android.content.ContentResolver
import android.content.Context
import android.net.Uri
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
import androidx.documentfile.provider.DocumentFile
import androidx.test.platform.app.InstrumentationRegistry
import com.google.gson.Gson
import ee.ria.DigiDoc.R
import ee.ria.DigiDoc.common.Constant.DIR_CRYPTO_CERT
import ee.ria.DigiDoc.common.Constant.DIR_SIVA_CERT
import ee.ria.DigiDoc.common.Constant.DIR_TSA_CERT
import ee.ria.DigiDoc.common.Constant.Defaults.DEFAULT_UUID_VALUE
import ee.ria.DigiDoc.common.testfiles.asset.AssetFile
Expand All @@ -52,7 +52,6 @@ import ee.ria.libdigidocpp.DigiDocConf
import kotlinx.coroutines.runBlocking
import okhttp3.mockwebserver.MockResponse
import okhttp3.mockwebserver.MockWebServer
import org.apache.commons.io.FileUtils
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNotNull
Expand All @@ -68,7 +67,6 @@ import org.mockito.MockitoAnnotations
import org.mockito.junit.MockitoJUnitRunner
import org.mockito.kotlin.mock
import java.io.File
import java.io.InputStream
import java.nio.charset.Charset
import java.nio.file.Files
import java.util.TimeZone
Expand All @@ -81,9 +79,6 @@ class SharedSettingsViewModelTest {
@get:Rule
val mockWebServer = MockWebServer()

@Mock
lateinit var contentResolver: ContentResolver

@Mock
lateinit var configurationRepository: ConfigurationRepository

Expand Down Expand Up @@ -145,7 +140,7 @@ class SharedSettingsViewModelTest {
viewModel =
SharedSettingsViewModel(
context = context,
contentResolver = contentResolver,
contentResolver = context.contentResolver,
dataStore = dataStore,
configurationRepository = configurationRepository,
initialization = initialization,
Expand All @@ -162,14 +157,9 @@ class SharedSettingsViewModelTest {

@Test
fun sharedSettingsViewModel_resetToDefaultSettings_success() {
val file =
AssetFile.getResourceFileAsFile(
context,
"siva.cer",
ee.ria.DigiDoc.common.R.raw.siva,
)
val uri = Uri.fromFile(file)
saveTsaCert(uri)
val tsaCertFile = writeCertFile(DIR_TSA_CERT, "tsaCert")
dataStore.setTSACertName(tsaCertFile.name)

viewModel.resetToDefaultSettings()

// resetSigningSettings
Expand All @@ -180,6 +170,7 @@ class SharedSettingsViewModelTest {
assertFalse(dataStore.getIsTsaCertificateViewVisible())

assertEquals("", dataStore.getTSACertName())
assertFalse(tsaCertFile.exists())

// resetRightsSettings
assertTrue(dataStore.getSettingsOpenAllFileTypes())
Expand Down Expand Up @@ -207,6 +198,39 @@ class SharedSettingsViewModelTest {
assertFalse(dataStore.getSettingsDefaultLTA())
}

@Test
fun sharedSettingsViewModel_resetToDefaultSettings_deletesSivaCertificateFile() {
val certFile = writeCertFile(DIR_SIVA_CERT, "sivaCert")
dataStore.setSettingsSivaCertName(certFile.name)

viewModel.resetToDefaultSettings()

assertFalse(certFile.exists())
assertEquals("", dataStore.getSettingsSivaCertName())
}

@Test
fun sharedSettingsViewModel_resetToDefaultSettings_deletesTsaCertificateFile() {
val certFile = writeCertFile(DIR_TSA_CERT, "tsaCert")
dataStore.setTSACertName(certFile.name)

viewModel.resetToDefaultSettings()

assertFalse(certFile.exists())
assertEquals("", dataStore.getTSACertName())
}

@Test
fun sharedSettingsViewModel_resetToDefaultSettings_deletesCryptoCertificateFile() {
val certFile = writeCertFile(DIR_CRYPTO_CERT, "cryptoCert")
dataStore.setCryptoCertName(certFile.name)

viewModel.resetToDefaultSettings()

assertFalse(certFile.exists())
assertEquals("", dataStore.getCryptoCertName())
}

@Test
fun sharedSettingsViewModel_saveProxySettings_savesManualProxySettings() {
dataStore.setProxySetting(ProxySetting.MANUAL_PROXY)
Expand Down Expand Up @@ -343,7 +367,9 @@ class SharedSettingsViewModelTest {

val uri = Uri.fromFile(file)
viewModel.handleSivaFile(uri)

assertEquals("sivaCert", dataStore.getSettingsSivaCertName())
assertTrue(File(File(context.filesDir, DIR_SIVA_CERT), "sivaCert").exists())
}

@Test(expected = Test.None::class)
Expand All @@ -364,7 +390,9 @@ class SharedSettingsViewModelTest {

val uri = Uri.fromFile(file)
viewModel.handleTsaFile(uri)

assertEquals("tsaCert", dataStore.getTSACertName())
assertTrue(File(File(context.filesDir, DIR_TSA_CERT), "tsaCert").exists())
}

@Test(expected = Test.None::class)
Expand All @@ -374,6 +402,60 @@ class SharedSettingsViewModelTest {
viewModel.handleTsaFile(uri)
}

@Test
fun sharedSettingsViewModel_handleSivaFile_deletesPreviouslyAddedCertificateFile() {
val previousCertFile = writeCertFile(DIR_SIVA_CERT, "previousSivaCert")
dataStore.setSettingsSivaCertName(previousCertFile.name)
val file =
AssetFile.getResourceFileAsFile(
context,
"siva.cer",
ee.ria.DigiDoc.common.R.raw.siva,
)
val uri = Uri.fromFile(file)
viewModel.handleSivaFile(uri)

assertFalse(previousCertFile.exists())
assertEquals("sivaCert", dataStore.getSettingsSivaCertName())
assertTrue(File(File(context.filesDir, DIR_SIVA_CERT), "sivaCert").exists())
}

@Test
fun sharedSettingsViewModel_handleTsaFile_deletesPreviouslyAddedCertificateFile() {
val previousCertFile = writeCertFile(DIR_TSA_CERT, "previousTsaCert")
dataStore.setTSACertName(previousCertFile.name)
val file =
AssetFile.getResourceFileAsFile(
context,
"siva.cer",
ee.ria.DigiDoc.common.R.raw.siva,
)
val uri = Uri.fromFile(file)
viewModel.handleTsaFile(uri)

assertFalse(previousCertFile.exists())
assertEquals("tsaCert", dataStore.getTSACertName())
assertTrue(File(File(context.filesDir, DIR_TSA_CERT), "tsaCert").exists())
}

@Test
fun sharedSettingsViewModel_handleCryptoCertFile_deletesPreviouslyAddedCertificateFile() {
val previousCertFile = writeCertFile(DIR_CRYPTO_CERT, "previousCryptoCert")
dataStore.setCryptoCertName(previousCertFile.name)
val file =
AssetFile.getResourceFileAsFile(
context,
"siva.cer",
ee.ria.DigiDoc.common.R.raw.siva,
)
val uri = Uri.fromFile(file)
viewModel.handleCryptoCertFile(uri)

assertFalse(previousCertFile.exists())
assertEquals("cryptoCert", dataStore.getCryptoCertName())
assertTrue(File(File(context.filesDir, DIR_CRYPTO_CERT), "cryptoCert").exists())
}

@Test
fun sharedSettingsViewModel_checkConnection_savesManualProxySettings() {
mockWebServer.enqueue(MockResponse().setResponseCode(407))
Expand Down Expand Up @@ -458,28 +540,16 @@ class SharedSettingsViewModelTest {
return tempFile
}

private fun saveTsaCert(uri: Uri) {
try {
val initialStream: InputStream? = contentResolver.openInputStream(uri)
val documentFile = DocumentFile.fromSingleUri(context, uri)
if (documentFile != null) {
val tsaCertFolder = File(context.filesDir, DIR_TSA_CERT)
if (!tsaCertFolder.exists()) {
tsaCertFolder.mkdirs()
}

var fileName = documentFile.name
if (fileName.isNullOrEmpty()) {
fileName = "tsaCert"
}
val tsaFile = File(tsaCertFolder, fileName)

FileUtils.copyInputStreamToFile(initialStream, tsaFile)

dataStore.setTSACertName(tsaFile.name)
}
} catch (_: Exception) {
// Do nothing
private fun writeCertFile(
certFolder: String,
fileName: String,
): File {
val folder = File(context.filesDir, certFolder)
if (!folder.exists()) {
folder.mkdirs()
}
val certFile = File(folder, fileName)
Files.write(certFile.toPath(), "cert".toByteArray(Charset.defaultCharset()))
return certFile
}
}
4 changes: 4 additions & 0 deletions app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/CryptoFileOpeningViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import ee.ria.DigiDoc.cryptolib.CryptoContainer
import ee.ria.DigiDoc.domain.repository.fileopening.FileOpeningRepository
import ee.ria.DigiDoc.exceptions.EmptyFileException
import ee.ria.DigiDoc.exceptions.FileAlreadyExistsException
import ee.ria.DigiDoc.libdigidoclib.exceptions.SSLHandshakeException
import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil.Companion.debugLog
import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil.Companion.errorLog
import ee.ria.DigiDoc.viewmodel.shared.SharedContainerViewModel
Expand Down Expand Up @@ -195,6 +196,9 @@ class CryptoFileOpeningViewModel
is NoInternetConnectionException -> {
_errorState.postValue(Pair(R.string.no_internet_connection, null))
}
is SSLHandshakeException -> {
_errorState.postValue(Pair(R.string.invalid_ssl_handshake, null))
}
is IOException -> {
val message = e.message ?: ""
if (message.startsWith("Failed to create connection with host") ||
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/FileOpeningViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import ee.ria.DigiDoc.domain.repository.siva.SivaRepository
import ee.ria.DigiDoc.exceptions.EmptyFileException
import ee.ria.DigiDoc.exceptions.FileAlreadyExistsException
import ee.ria.DigiDoc.libdigidoclib.SignedContainer
import ee.ria.DigiDoc.libdigidoclib.exceptions.SSLHandshakeException
import ee.ria.DigiDoc.utilsLib.extensions.isCryptoContainer
import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil.Companion.debugLog
import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil.Companion.errorLog
Expand Down Expand Up @@ -272,6 +273,9 @@ class FileOpeningViewModel
is NoInternetConnectionException -> {
_errorState.postValue(Pair(R.string.no_internet_connection, null))
}
is SSLHandshakeException -> {
_errorState.postValue(Pair(R.string.invalid_ssl_handshake, null))
}
is IOException -> {
val message = e.message ?: ""
if (message.startsWith("Failed to create connection with host") ||
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/RecentDocumentsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import ee.ria.DigiDoc.cryptolib.CDOC2Settings
import ee.ria.DigiDoc.cryptolib.CryptoContainer
import ee.ria.DigiDoc.domain.repository.siva.SivaRepository
import ee.ria.DigiDoc.libdigidoclib.SignedContainer
import ee.ria.DigiDoc.libdigidoclib.exceptions.SSLHandshakeException
import ee.ria.DigiDoc.utilsLib.container.ContainerUtil
import ee.ria.DigiDoc.utilsLib.extensions.isCades
import ee.ria.DigiDoc.utilsLib.extensions.isCryptoContainer
Expand Down Expand Up @@ -172,6 +173,10 @@ class RecentDocumentsViewModel
errorMessage = R.string.no_internet_connection
}

if (ex is SSLHandshakeException) {
errorMessage = R.string.invalid_ssl_handshake
}

_errorState.postValue(errorMessage)
}
}
Expand Down
Loading
Loading