From e4c958bada7639150d637eea78b72cc5457b9245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20G=C3=B6ransson?= <david.goransson90@gmail.com>
Date: Fri, 17 Nov 2023 16:05:48 +0100
Subject: [PATCH] Add CVE supression

---
 .../mullvad/mullvadvpn/ui/fragment/AccountFragment.kt    | 1 -
 .../mullvadvpn/ui/fragment/ProblemReportFragment.kt      | 0
 .../mullvadvpn/viewmodel/ReportProblemViewModel.kt       | 5 ++---
 android/config/dependency-check-suppression.xml          | 9 +++++++++
 4 files changed, 11 insertions(+), 4 deletions(-)
 delete mode 100644 android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt
 delete mode 100644 android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ProblemReportFragment.kt

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt
deleted file mode 100644
index 8b137891791f..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ProblemReportFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ProblemReportFragment.kt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ReportProblemViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ReportProblemViewModel.kt
index 2dd70429d224..896355a43d20 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ReportProblemViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ReportProblemViewModel.kt
@@ -7,11 +7,9 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.constant.MINIMUM_LOADING_TIME_MILLIS
 import net.mullvad.mullvadvpn.dataproxy.MullvadProblemReport
@@ -37,6 +35,7 @@ sealed interface ReportProblemSideEffect {
     data class ShowConfirmNoEmail(val email: String, val description: String) :
         ReportProblemSideEffect
 }
+
 class ReportProblemViewModel(
     private val mullvadProblemReporter: MullvadProblemReport,
     private val problemReportRepository: ProblemReportRepository
diff --git a/android/config/dependency-check-suppression.xml b/android/config/dependency-check-suppression.xml
index 57e19a9d54b1..d2bb95dc9a85 100644
--- a/android/config/dependency-check-suppression.xml
+++ b/android/config/dependency-check-suppression.xml
@@ -51,4 +51,13 @@
         <packageUrl regex="true">^pkg:maven/com\.squareup\.okio/okio@.*$</packageUrl>
         <cve>CVE-2023-3635</cve>
     </suppress>
+    <suppress>
+        <notes><![CDATA[
+          This CVE only affect programs using loadXML and is derived from using ksp.
+          We do not use the loadXML, ksp is used to generate navigation paths in our code
+          and not for processesing any user input.
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/com\.google\.devtools\.ksp/symbol\-processing.*@.*$</packageUrl>
+        <cve>CVE-2018-1000840</cve>
+    </suppress>
 </suppressions>