LFS: Improved verify and headers passing

Author: JetpackDuba

src/main/kotlin/com/jetpackduba/gitnuro/lfs/GLfsFactory.kt

@@ -298,7 +298,7 @@ class GLfsPrePushHook(
 //                    val credentials = credentialsStateManager.requestLfsCredentials()
 
                     lfsObjects.value.objects.forEach { obj ->
-                        val uploadUrl = obj.actions.upload?.href
+                        val uploadUrl = obj.actions?.upload?.href
 
                         if (uploadUrl != null) {
                             lfsRepository.uploadObject(

src/main/kotlin/com/jetpackduba/gitnuro/lfs/LfsNetworkDataSource.kt

@@ -2,6 +2,7 @@ package com.jetpackduba.gitnuro.lfs
 
 import com.jetpackduba.gitnuro.Result
 import com.jetpackduba.gitnuro.models.lfs.LfsObject
+import com.jetpackduba.gitnuro.models.lfs.LfsObjectBatch
 import com.jetpackduba.gitnuro.models.lfs.LfsObjects
 import com.jetpackduba.gitnuro.models.lfs.LfsPrepareUploadObjectBatch
 import io.ktor.client.*
@@ -68,7 +69,7 @@ class LfsNetworkDataSource @Inject constructor(
         remoteUrl: String,
         lfsPrepareUploadObjectBatch: LfsPrepareUploadObjectBatch,
         username: String?,
-        password: String?
+        password: String?,
     ): Result<LfsObjects, LfsError> {
         val response = client.post("${remoteUrl.removeSuffix("/")}/objects/batch") {
             this.headers {
@@ -125,29 +126,20 @@ class LfsNetworkDataSource @Inject constructor(
         password: String?,
     ) {
         val response = client.put(uploadUrl) {
-            if (username != null && password != null) {
-                val objHeaders = lfsObject.actions.upload?.header
-
-                if (objHeaders.isNullOrEmpty()) {
-                    basicAuth(username, password)
-                } else {
-                    for (header in objHeaders.entries) {
-                        header(header.key, header.value)
-                    }
-                }
-
+            val objHeaders = lfsObject.actions?.upload?.header.orEmpty()
 
-//                if (authorization != null) {
-//
-//                    bearerAuth(authorization)
-//                } else {
-//                    basicAuth(username, password)
-//                }
+            for (header in objHeaders.entries) {
+                header(header.key, header.value)
             }
 
             this.headers {
-                this["Accept"] = "application/vnd.git-lfs"
-                this["Content-Length"] = size.toString()
+                if (username != null && password != null && !headers.contains("Authorization")) {
+                    basicAuth(username, password)
+                }
+
+                if (!this.contains("Accept")) {
+                    this["Accept"] = "application/vnd.git-lfs"
+                }
             }
 
             setBody(file.readChannel())
@@ -159,26 +151,33 @@ class LfsNetworkDataSource @Inject constructor(
     }
 
     override suspend fun verify(lfsObject: LfsObject, username: String?, password: String?) {
-        val response = client.post(lfsObject.actions.verify!!.href) {
-            if (username != null && password != null) {
-                val objHeaders = lfsObject.actions.verify?.header
+        val verify = lfsObject.actions?.verify
 
-                if (objHeaders.isNullOrEmpty()) {
-                    basicAuth(username, password)
-                } else {
-                    for (header in objHeaders.entries) {
-                        header(header.key, header.value)
+        if (verify != null) {
+            val response = client.post(verify.href) {
+                val objHeaders = verify.header.orEmpty()
+
+                for (header in objHeaders.entries) {
+                    header(header.key, header.value)
+                }
+
+                this.headers {
+                    if (username != null && password != null && !headers.contains("Authorization")) {
+                        basicAuth(username, password)
+                    }
+
+                    if (!this.contains("Accept")) {
+                        this["Accept"] = "application/vnd.git-lfs"
                     }
                 }
-            }
 
-            this.headers {
-                this["Accept"] = "application/vnd.git-lfs"
+                val body = LfsObjectBatch(lfsObject.oid, lfsObject.size)
+                setBody(json.encodeToString(body))
             }
-        }
 
-        if (response.status != HttpStatusCode.OK) {
-            throw Exception("Verify status is ${response.status} instead of HTTP OK 200")
+            if (response.status != HttpStatusCode.OK) {
+                throw Exception("Verify status is ${response.status} instead of HTTP OK 200")
+            }
         }
     }
 

src/main/kotlin/com/jetpackduba/gitnuro/lfs/LfsRepository.kt

@@ -73,8 +73,8 @@ fun createLfsPrepareUploadObjectBatch(
         transfers = listOf(
             "basic",
             // TODO Add support for standalone files and SSH once they are stable https://github.com/git-lfs/git-lfs/blob/main/docs/api/README.md
-            //"lfs-standalone-file",
-            //"ssh",
+            "lfs-standalone-file",
+            "ssh",
         ),
         ref = LfsRef(branch),
         hashAlgo = algo,

src/main/kotlin/com/jetpackduba/gitnuro/lfs/LfsSmudgeFilter.kt

@@ -139,7 +139,7 @@ class LfsSmudgeFilter(
         for (lfsObject in lfsObjects.objects) {
             var requiresAuth: Boolean
 
-            val downloadUrl = lfsObject.actions.download?.href ?: continue
+            val downloadUrl = lfsObject.actions?.download?.href ?: continue
 
             do {
                 val newLfsObjects = lfsRepository.downloadObject(

src/main/kotlin/com/jetpackduba/gitnuro/models/lfs/LfsObjects.kt

@@ -12,8 +12,8 @@ data class LfsObjects(
 @Serializable
 data class LfsObject(
     @SerialName("oid") var oid: String,
-    @SerialName("size") var size: Int,
-    @SerialName("actions") var actions: Actions,
+    @SerialName("size") var size: Long,
+    @SerialName("actions") var actions: Actions? = null,
 )
 
 @Serializable
@@ -29,9 +29,3 @@ data class RemoteObjectAccessInfo(
     @SerialName("header") var header: Map<String, String>? = null,
     @SerialName("expires_at") var expiresAt: String? = null,
 )
-
-//@Serializable
-//data class Header(
-//    @SerialName("Accept") var accept: String? = null,
-//    @SerialName("Authorization") var authorization: String? = null,
-//)