Merge pull request #128 from amosproj/dev

Release-merge

Deliverables/sprint-06/feature-board.tsv

@@ -0,0 +1,54 @@
+Title	URL	Assignees	Status	Estimated size	Real size
+Identify Running State	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/75		Awaiting Review	3	
+EPIC:  analyze unix domain sockets	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/80	BenediktZinn, der-whity, ffranzgitHub, fhilgers, luca-dot-sh, Mr-Kanister	Awaiting Review	5	
+Unix Domain Socket: Daemon Collector	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/113	BenediktZinn, ffranzgitHub, fhilgers	Awaiting Review	2	
+Unix Domain Socket: Configuration	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/112	ffranzgitHub, Mr-Kanister	Awaiting Review	2	
+Unix Domain Socket: Frontend	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/114	luca-dot-sh	Awaiting Review	3	
+Unix Domain Socket: Ebpf	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/111	der-whity	Awaiting Review	2	
+Plaintext architecture document	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/34	fhilgers, Mr-Kanister	Awaiting Review	3	
+EPIC: uprobe	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/19		Sprint Backlog	8	
+Define metric for the visualisation screen	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/46		Sprint Backlog	3	
+internal: implement client library and export to kotlin for load and list programs	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/60	BenediktZinn, fhilgers	Feature Archive	2	1
+Display running processes in UI	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/73	luca-dot-sh	Feature Archive	2	2
+User eBPF programm Selection	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/41	ffranzgitHub, fhilgers, Mr-Kanister	Feature Archive	5	-1
+internal: define kotlin interface for frontend loading and listing programs	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/58	fhilgers	Feature Archive	1	1
+internal: implement loading/unloading of ebpf functions in daemon	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/77	der-whity, ffranzgitHub, Mr-Kanister	Feature Archive	2	3
+Retrieve running processes List	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/72	Mr-Kanister	Feature Archive	3	3
+Home Screen and Navigation Drawer	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/43	luca-dot-sh	Feature Archive	2	3
+EBPF Program extension 	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/54	der-whity	Feature Archive	3	3
+Bugfix: Manage Sbom generation through nix	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/55	Mr-Kanister	Feature Archive	1	1
+Communcation between Android side and Rust side	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/42	fhilgers	Feature Archive	5	5
+scope(ebpf) unix domain socket traffic analysis (research)	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/22	fhilgers	Feature Archive	5	3
+Create a prototype for the visualisation screen	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/47	luca-dot-sh	Feature Archive	3	3
+internal: implement frontend load and list programs	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/62	luca-dot-sh	Feature Archive	2	2
+internal: implement test cli client load and list programs	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/59	BenediktZinn, ffranzgitHub, Mr-Kanister	Feature Archive	3	2
+Preparation of CI	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/6	fhilgers	Feature Archive	3	3
+scope(ui) find timeseries visualization library (research)	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/21	clabrous, luca-dot-sh	Feature Archive	2	2
+Generation of sboms doesn't include kotlin	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/39		Feature Archive	1	1
+Manage Sbom generation through nix	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/30	Mr-Kanister	Feature Archive	2	1
+scope(daemon) get information about android processes to list/find/search them (research)	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/20	der-whity, ffranzgitHub	Feature Archive	3	1
+License and Copyright Agreement	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/18	fhilgers	Feature Archive	2	2
+Preperation of Kotlin	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/7	clabrous, luca-dot-sh	Feature Archive	3	3
+Docker Container	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/11	fhilgers	Feature Archive	3	3
+scope(build) aarch64 als target	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/23	fhilgers	Feature Archive	1	1
+scope(build) android 13 instead of 15	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/24	fhilgers	Feature Archive	1	1
+Team Decision	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/8	BenediktZinn, clabrous, der-whity, ffranzgitHub, fhilgers, luca-dot-sh, Mr-Kanister	Feature Archive	1	1
+architecture document	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/10	fhilgers	Feature Archive	3	5
+bill of materials	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/9	BenediktZinn, der-whity, Mr-Kanister	Feature Archive	3	3
+Brain Storming Architecture	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/3		Feature Archive	3	1
+Define the time intervals / time delay between each data point	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/45		Product Backlog		
+UI Filter for System and User Applications	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/76		Product Backlog		
+Distinguish between System vs. User Applications	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/74		Product Backlog	3	
+Display Installed Applications in UI	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/25		Product Backlog	-1	
+Brain Storming eBPF Use Cases	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/1		Product Backlog	2	
+Uprobe Analysis: Setup	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/115		Product Backlog		
+Uprobe Analysis: Finding Symbols from shared libraries	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/116		Product Backlog		
+Uprobe Analysis: Finding Symbols from Dex/Oat	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/117		Product Backlog		
+Uprobe Analysis: Setup ebpf uprobes	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/118		Product Backlog		
+Uprobe Analysis: Collect Uprobe events	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/119		Product Backlog		
+Uprobe Analysis: Config	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/120		Product Backlog		
+Uprobe Analysis: Frontend Show Symbols	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/121		Product Backlog		
+Uprobe Analysis: Frontend Show Uprobe Events	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/122		Product Backlog		
+Refactor: Collection of events in Daemon	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/123		Product Backlog		
+Refactor: Configuration API	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/124		Product Backlog		
+Create kprobe to Track Blocking vfs_write Call	https://github.com/amosproj/amos2024ws03-android-zero-instrumentation/issues/88	der-whity	Feature Archive	3	3

Deliverables/sprint-06/imp-squared-backlog.tsv

@@ -0,0 +1,25 @@
+Title	Assignees	Status
+Note: All of the Items have a more detailed description pls. click them to see. (this is not an item)		Todo
+Tech: Streamline testing proces		Todo
+Team: Completing Task Quicker (earlier PR)		Todo
+Team: Rotating the deliverable creation		Todo
+Tech: Split Backlog Items (PR and Creation)		Todo
+Team: Assist in creating team processes (Sinatra Doctrine, this is ongoing)		In Progress
+Team: Load balancing inside the dev team		In Progress
+Team: Making sure all tasks in a sprint are being finished		In Progress
+Tech: Repository coordination		In Progress
+Team collaboration (between dev and po)		Done
+Gain Independence from the IP		Done
+Lifting the collective mood		Done
+Creating a Template for backlog item suggestions by the IP		Done
+Solving dissatisfaction among the team		Done
+Focus on IP (and PO relations)		Done
+Ensuring that everyone has work to do		Done
+Backlog Item creation procedure		Done
+Helping Coordinate the team meeting		Done
+Helping to set up the first IP meeting		Done
+Supporting team in understanding the amos workflow (e.g importance of the team meeting)		Done
+Creating Sub-Teams to streamline development		Done
+Establishing a continuouse release cycle with the team		Done
+Improving time management in the Team meeting		Done
+Ensuring a continuous backlog items flow		Done

frontend/README.md

@@ -12,8 +12,8 @@ SPDX-License-Identifier: MIT
 The resulting APKs for release/debug build types can then be found under `frontend/app/build/outputs/apk`.
 
 ### Installing the app:
-`./gradlew installRealBackendDebug` or `./gradlew iRBD` for installing a version with a **real** backend <br/>
-`./gradlew installMockBackendDebug` or `./gradlew iMBD` for installing a version with a **mocked** backend <br/>
+`./gradlew installRealDebug` or `./gradlew iRD` for installing a version with a **real** backend <br/>
+`./gradlew installMockDebug` or `./gradlew iMD` for installing a version with a **mocked** backend <br/>
 
 ### Generating the report for the bill of materials (BOM)
 To generate a BOM of all *release runtime dependencies*, the following Gradle task can be run: <br/>

frontend/app/build.gradle.kts

@@ -71,14 +71,15 @@ android {
         }
     }
 
-    flavorDimensions += "environment"
+    // Flavors and build types needs to match the library
+    flavorDimensions += "version"
     productFlavors {
-        create("realBackend") {
-            dimension = "environment"
+        create("real") {
+            dimension = "version"
         }
-        create("mockedBackend") {
-            dimension = "environment"
-            versionNameSuffix = ".mocked"  // Optional
+        create("mock") {
+            dimension = "version"
+            versionNameSuffix = ".mock"  // Optional
         }
     }
 }
@@ -99,6 +100,7 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
+    implementation(libs.accompanist.drawablepainter)
 
     implementation(project(":client"))
 

frontend/app/src/main/AndroidManifest.xml

@@ -9,6 +9,10 @@ SPDX-License-Identifier: MIT
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <!-- not a problem since we are not publishing to Play Store -->
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
+
     <application
         android:name=".ZiofaApplication"
         android:allowBackup="true"

frontend/app/src/main/java/de/amosproj3/ziofa/ZiofaApplication.kt

@@ -5,12 +5,16 @@
 package de.amosproj3.ziofa
 
 import android.app.Application
+import android.content.Context
+import android.content.pm.PackageManager
 import de.amosproj3.ziofa.api.ConfigurationAccess
+import de.amosproj3.ziofa.api.DataStreamProvider
 import de.amosproj3.ziofa.api.ProcessListAccess
 import de.amosproj3.ziofa.bl.ConfigurationManager
+import de.amosproj3.ziofa.bl.DataStreamManager
+import de.amosproj3.ziofa.bl.PackageInformationProvider
 import de.amosproj3.ziofa.client.ClientFactory
 import de.amosproj3.ziofa.client.RustClientFactory
-import de.amosproj3.ziofa.client.mocks.MockClientFactory
 import de.amosproj3.ziofa.ui.configuration.ConfigurationViewModel
 import de.amosproj3.ziofa.ui.processes.ProcessesViewModel
 import de.amosproj3.ziofa.ui.visualization.VisualizationViewModel
@@ -25,18 +29,19 @@ import timber.log.Timber
 class ZiofaApplication : Application() {
 
     val appModule = module {
-        single<ClientFactory> {
-            if (BuildConfig.FLAVOR == "mockedBackend") {
-                MockClientFactory()
-            } else {
-                RustClientFactory("http://[::1]:50051")
-            }
-        }
+        single<PackageManager> { get<Context>().packageManager }
+        single<PackageInformationProvider> { PackageInformationProvider(get()) }
+        single<ClientFactory> { RustClientFactory("http://[::1]:50051") }
+        single<DataStreamProvider> { DataStreamManager(get()) }
         single { ConfigurationManager(clientFactory = get()) } binds
             arrayOf(ConfigurationAccess::class, ProcessListAccess::class)
         viewModel { ConfigurationViewModel(configurationAccess = get()) }
-        viewModel { ProcessesViewModel(processListAccess = get()) }
-        viewModel { VisualizationViewModel(clientFactory = get()) }
+        viewModel {
+            ProcessesViewModel(processListAccess = get(), packageInformationProvider = get())
+        }
+        viewModel {
+            VisualizationViewModel(configurationManager = get(), dataStreamProvider = get())
+        }
     }
 
     override fun onCreate() {

frontend/app/src/main/java/de/amosproj3/ziofa/api/ConfigurationUpdate.kt

@@ -7,9 +7,9 @@ package de.amosproj3.ziofa.api
 import uniffi.shared.Configuration
 
 sealed class ConfigurationUpdate {
-    data class OK(val configuration: Configuration) : ConfigurationUpdate()
+    data class Valid(val configuration: Configuration) : ConfigurationUpdate()
 
-    data class NOK(val error: Throwable) : ConfigurationUpdate()
+    data class Invalid(val error: Throwable) : ConfigurationUpdate()
 
-    data object UNKNOWN : ConfigurationUpdate()
+    data object Unknown : ConfigurationUpdate()
 }

frontend/app/src/main/java/de/amosproj3/ziofa/api/DataStreamProvider.kt

@@ -0,0 +1,15 @@
+// SPDX-FileCopyrightText: 2024 Luca Bretting <[email protected]>
+//
+// SPDX-License-Identifier: MIT
+
+package de.amosproj3.ziofa.api
+
+import kotlinx.coroutines.flow.Flow
+
+interface DataStreamProvider {
+    suspend fun counter(ebpfProgramName: String): Flow<UInt>
+
+    suspend fun vfsWriteEvents(pids: List<UInt>): Flow<WriteEvent.VfsWriteEvent>
+
+    suspend fun sendMessageEvents(pids: List<UInt>): Flow<WriteEvent.SendMessageEvent>
+}

frontend/app/src/main/java/de/amosproj3/ziofa/api/InstalledPackageInfo.kt

@@ -0,0 +1,9 @@
+// SPDX-FileCopyrightText: 2024 Luca Bretting <[email protected]>
+//
+// SPDX-License-Identifier: MIT
+
+package de.amosproj3.ziofa.api
+
+import android.graphics.drawable.Drawable
+
+data class InstalledPackageInfo(val displayName: String, val icon: Drawable)

frontend/app/src/main/java/de/amosproj3/ziofa/api/WriteEvent.kt

@@ -0,0 +1,28 @@
+// SPDX-FileCopyrightText: 2024 Luca Bretting <[email protected]>
+//
+// SPDX-License-Identifier: MIT
+
+package de.amosproj3.ziofa.api
+
+sealed class WriteEvent(
+    val fileDescriptor: ULong,
+    val processId: UInt,
+    val startTimestamp: ULong,
+    val durationOrSize: ULong,
+) {
+
+    data class VfsWriteEvent(
+        val fd: ULong,
+        val pid: UInt,
+        val size: ULong,
+        val timestampMillis: ULong, // unix time
+    ) : WriteEvent(fd, pid, timestampMillis, size)
+
+    data class SendMessageEvent(
+        val fd: ULong,
+        val pid: UInt,
+        val tid: UInt,
+        val beginTimestamp: ULong,
+        val durationMicros: ULong,
+    ) : WriteEvent(fd, pid, beginTimestamp, durationMicros)
+}

frontend/app/src/main/java/de/amosproj3/ziofa/bl/ConfigurationManager.kt

@@ -1,3 +1,4 @@
+// SPDX-FileCopyrightText: 2024 Felix Hilgers <[email protected]>
 // SPDX-FileCopyrightText: 2024 Luca Bretting <[email protected]>
 //
 // SPDX-License-Identifier: MIT
@@ -28,7 +29,7 @@ class ConfigurationManager(val clientFactory: ClientFactory) :
 
     override val processesList = MutableStateFlow<List<Process>>(listOf())
     override val configuration: MutableStateFlow<ConfigurationUpdate> =
-        MutableStateFlow(ConfigurationUpdate.UNKNOWN)
+        MutableStateFlow(ConfigurationUpdate.Unknown)
 
     override fun submitConfiguration(configuration: Configuration) {
         coroutineScope.launch {
@@ -45,7 +46,7 @@ class ConfigurationManager(val clientFactory: ClientFactory) :
                 initializeConfigurationState()
                 startProcessListUpdates()
             } catch (e: ClientException) {
-                configuration.update { ConfigurationUpdate.NOK(e) }
+                configuration.update { ConfigurationUpdate.Invalid(e) }
             }
         }
     }
@@ -56,10 +57,12 @@ class ConfigurationManager(val clientFactory: ClientFactory) :
                 client!!.getConfiguration()
             } catch (e: ClientException) {
                 // TODO this should be handled on the backend
-                client!!.setConfiguration(Configuration(listOf()))
+                client!!.setConfiguration(
+                    Configuration(vfsWrite = null, sysSendmsg = null, uprobes = listOf())
+                )
                 client!!.getConfiguration()
             }
-        configuration.update { ConfigurationUpdate.OK(initializedConfiguration) }
+        configuration.update { ConfigurationUpdate.Valid(initializedConfiguration) }
     }
 
     private suspend fun startProcessListUpdates() {
@@ -73,11 +76,11 @@ class ConfigurationManager(val clientFactory: ClientFactory) :
     private suspend fun getAndUpdateConfiguration() {
         configuration.update {
             try {
-                (client?.getConfiguration()?.let { ConfigurationUpdate.OK(it) }
-                        ?: ConfigurationUpdate.UNKNOWN)
+                (client?.getConfiguration()?.let { ConfigurationUpdate.Valid(it) }
+                        ?: ConfigurationUpdate.Unknown)
                     .also { Timber.i("Received config $it") }
             } catch (e: Exception) {
-                ConfigurationUpdate.NOK(e)
+                ConfigurationUpdate.Invalid(e)
             }
         }
     }