[LFS] Started adding push support for LFS objects via HTTP

Author: JetpackDuba

build.gradle.kts

@@ -48,6 +48,7 @@ repositories {
 
 dependencies {
     val jgit = "7.1.0.202411261347-r"
+    val ktorVersion = "3.0.3"
 
     when {
         currentOs() == OS.LINUX && isLinuxAarch64 -> implementation(compose.desktop.linux_arm64)
@@ -60,6 +61,7 @@ dependencies {
     implementation(compose("org.jetbrains.compose.components:components-animatedimage"))
     implementation("org.eclipse.jgit:org.eclipse.jgit:$jgit")
     implementation("org.eclipse.jgit:org.eclipse.jgit.gpg.bc:$jgit")
+    implementation("org.eclipse.jgit:org.eclipse.jgit.lfs:$jgit")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
     implementation("com.google.dagger:dagger:2.48.1")
     ksp("com.google.dagger:dagger-compiler:2.48.1")
@@ -75,6 +77,11 @@ dependencies {
     implementation("org.slf4j:slf4j-reload4j:2.0.7")
     implementation("androidx.datastore:datastore-preferences-core:1.0.0")
     implementation("org.bouncycastle:bcpg-jdk18on:1.78.1")
+    implementation("io.ktor:ktor-client:$ktorVersion")
+    implementation("io.ktor:ktor-client-cio:$ktorVersion")
+    implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
+    implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
+    implementation("io.ktor:ktor-client-logging:$ktorVersion")
 }
 
 fun currentOs(): OS {

src/main/kotlin/com/jetpackduba/gitnuro/App.kt

@@ -28,6 +28,7 @@ import com.jetpackduba.gitnuro.extensions.toWindowPlacement
 import com.jetpackduba.gitnuro.git.AppGpgSigner
 import com.jetpackduba.gitnuro.keybindings.KeybindingOption
 import com.jetpackduba.gitnuro.keybindings.matchesBinding
+import com.jetpackduba.gitnuro.lfs.GLfsFactory
 import com.jetpackduba.gitnuro.logging.printError
 import com.jetpackduba.gitnuro.managers.AppStateManager
 import com.jetpackduba.gitnuro.managers.TempFilesManager
@@ -46,10 +47,12 @@ import com.jetpackduba.gitnuro.ui.components.TabInformation
 import com.jetpackduba.gitnuro.ui.context_menu.AppPopupMenu
 import com.jetpackduba.gitnuro.ui.dialogs.settings.ProxyType
 import kotlinx.coroutines.launch
+import org.eclipse.jgit.lfs.BuiltinLFS
 import org.eclipse.jgit.lib.GpgConfig
 import org.eclipse.jgit.lib.Signer
 import org.eclipse.jgit.lib.SignerFactory
 import org.eclipse.jgit.lib.Signers
+import org.eclipse.jgit.util.LfsFactory
 import java.io.File
 import java.io.FileOutputStream
 import java.net.Authenticator
@@ -85,6 +88,9 @@ class App {
     @Inject
     lateinit var signer: AppGpgSigner
 
+    @Inject
+    lateinit var gLfsFactory: GLfsFactory
+
     init {
         appComponent.inject(this)
     }
@@ -115,6 +121,7 @@ class App {
         }
 
         tabsManager.loadPersistedTabs()
+        gLfsFactory.register()
 
         if (dirToOpen != null)
             addDirTab(dirToOpen)

src/main/kotlin/com/jetpackduba/gitnuro/credentials/CredentialsStateManager.kt

@@ -18,22 +18,28 @@ class CredentialsStateManager @Inject constructor() {
     fun updateState(newCredentialsState: CredentialsState) {
         _credentialsState.value = newCredentialsState
     }
+
+    fun requestCredentials(credentialsRequest: CredentialsRequest) {
+        updateState(credentialsRequest)
+    }
 }
 
 sealed interface CredentialsState {
-    object None : CredentialsState
-    object CredentialsDenied : CredentialsState
+    data object None : CredentialsState
+    data object CredentialsDenied : CredentialsState
 }
 
 sealed interface CredentialsAccepted : CredentialsState {
     data class SshCredentialsAccepted(val password: String) : CredentialsAccepted
     data class GpgCredentialsAccepted(val password: String) : CredentialsAccepted
     data class HttpCredentialsAccepted(val user: String, val password: String) : CredentialsAccepted
+    data class LfsCredentialsAccepted(val user: String, val password: String) : CredentialsAccepted
 }
 
-sealed interface CredentialsRequested : CredentialsState {
-    object SshCredentialsRequested : CredentialsRequested
-    data class GpgCredentialsRequested(val isRetry: Boolean, val password: String) : CredentialsRequested
-    object HttpCredentialsRequested : CredentialsRequested
+sealed interface CredentialsRequest : CredentialsState {
+    data object SshCredentialsRequest : CredentialsRequest
+    data class GpgCredentialsRequest(val isRetry: Boolean, val password: String) : CredentialsRequest
+    data object HttpCredentialsRequest : CredentialsRequest
+    data object LfsCredentialsRequest : CredentialsRequest
 }
 

src/main/kotlin/com/jetpackduba/gitnuro/credentials/GpgCredentialsProvider.kt

@@ -48,7 +48,7 @@ class GpgCredentialsProvider @Inject constructor(
 
             // Request passphrase
             credentialsStateManager.updateState(
-                CredentialsRequested.GpgCredentialsRequested(
+                CredentialsRequest.GpgCredentialsRequest(
                     isRetry = isRetry,
                     // Use previously set credentials for cases where this method is invoked again (like when the passphrase is not correct)
                     password = credentialsSet?.second ?: ""
@@ -57,7 +57,7 @@ class GpgCredentialsProvider @Inject constructor(
 
             var credentials = credentialsStateManager.currentCredentialsState
 
-            while (credentials is CredentialsRequested.GpgCredentialsRequested) {
+            while (credentials is CredentialsRequest.GpgCredentialsRequest) {
                 credentials = credentialsStateManager.currentCredentialsState
             }
 

src/main/kotlin/com/jetpackduba/gitnuro/credentials/HttpCredentialsProvider.kt

@@ -157,9 +157,9 @@ class HttpCredentialsProvider @AssistedInject constructor(
     }
 
     private fun askForCredentials(): CredentialsState {
-        credentialsStateManager.updateState(CredentialsRequested.HttpCredentialsRequested)
+        credentialsStateManager.updateState(CredentialsRequest.HttpCredentialsRequest)
         var credentials = credentialsStateManager.currentCredentialsState
-        while (credentials is CredentialsRequested) {
+        while (credentials is CredentialsRequest) {
             credentials = credentialsStateManager.currentCredentialsState
         }
 

src/main/kotlin/com/jetpackduba/gitnuro/credentials/SshRemoteSession.kt

@@ -1,7 +1,6 @@
 package com.jetpackduba.gitnuro.credentials
 
 import Session
-import com.jetpackduba.gitnuro.exceptions.GitnuroException
 import com.jetpackduba.gitnuro.exceptions.SshException
 import com.jetpackduba.gitnuro.extensions.throwIfSshMessage
 import org.eclipse.jgit.transport.RemoteSession
@@ -45,10 +44,10 @@ class SshRemoteSession @Inject constructor(
         var result = session.publicKeyAuth("")
 
         if (result == 2) {//AuthStatus.DENIED) {
-            credentialsStateManager.updateState(CredentialsRequested.SshCredentialsRequested)
+            credentialsStateManager.updateState(CredentialsRequest.SshCredentialsRequest)
 
             var credentials = credentialsStateManager.currentCredentialsState
-            while (credentials is CredentialsRequested) {
+            while (credentials is CredentialsRequest) {
                 credentials = credentialsStateManager.currentCredentialsState
             }
 

src/main/kotlin/com/jetpackduba/gitnuro/di/modules/NetworkModule.kt

@@ -2,9 +2,14 @@ package com.jetpackduba.gitnuro.di.modules
 
 import com.jetpackduba.gitnuro.updates.UpdatesService
 import dagger.Provides
+import io.ktor.client.*
+import io.ktor.client.engine.cio.*
+import io.ktor.client.plugins.logging.*
 import retrofit2.Retrofit
 import retrofit2.converter.scalars.ScalarsConverterFactory
+import java.security.cert.X509Certificate
 import javax.inject.Inject
+import javax.net.ssl.X509TrustManager
 
 @dagger.Module
 class NetworkModule {
@@ -16,4 +21,27 @@ class NetworkModule {
             .build()
             .create(UpdatesService::class.java)
     }
+
+    @Provides
+    fun provideKtorHttpClient(): HttpClient {
+        val httpClient = HttpClient(CIO) {
+            install(Logging) {
+                logger = Logger.DEFAULT
+                level = LogLevel.ALL
+            }
+            engine {
+                https {
+                    trustManager = object : X509TrustManager {
+                        override fun checkClientTrusted(p0: Array<out X509Certificate>?, p1: String?) {}
+
+                        override fun checkServerTrusted(p0: Array<out X509Certificate>?, p1: String?) {}
+
+                        override fun getAcceptedIssuers(): Array<X509Certificate>? = null
+                    }
+                }
+            }
+        }
+
+        return httpClient
+    }
 }