Streamlined a load of auth error issues

Author: kruthers

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "com.kruthers"
-version = "2.2.1"
+version = "2.3.0"
 description = "Allows you to ingrate github support into your datapack folder in game"
 
 repositories {
@@ -32,11 +32,9 @@ dependencies {
 tasks {
     shadowJar {
         archiveClassifier.set("")
-
         minimize {
-            exclude(dependency("org.eclipse.jgit:org.eclipse.jgit:.*"))
+            exclude(dependency("org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:*"))
         }
-        minimize()
     }
     build {
         dependsOn(shadowJar)

src/main/kotlin/com/kruthers/datapackmanager/actions/Clone.kt

@@ -52,6 +52,10 @@ class Clone(private val sender: CommandSender, private val plugin: DatapackManag
                 sender.sendMessage(parse("<red>Failed to clone from github, invalid link given, check the console for more details."))
                 log.warning("Failed to complete clone, an invalid remove exception occurred: \n${e.message}")
                 return
+            } catch (e: NotSshRemote) {
+                sender.sendMessage(parse("<red>Failed to clone from github, invalid link: The provided git remote is not a ssh clone remote. These start with git@ not https://"))
+                log.warning("Failed to complete clone, the provided remote was no an ssh remove")
+                return
             } catch (e: Exception) {
                 sender.sendMessage(parse("<red>Failed to clone from github, a unknown Exception occurred, check the console for more details."))
                 log.warning("Failed to complete clone, an unknown exception occurred: \n${e.stackTraceToString()}")

src/main/kotlin/com/kruthers/datapackmanager/actions/Pull.kt

@@ -15,7 +15,6 @@ import org.eclipse.jgit.api.ResetCommand
 import org.eclipse.jgit.lib.Repository
 import org.eclipse.jgit.lib.SubmoduleConfig
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder
-import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider
 import java.io.File
 import java.util.logging.Logger
 
@@ -84,11 +83,4 @@ class Pull(private val sender: CommandSender, private val plugin: DatapackManage
 
         this.runTaskAsynchronously(plugin)
     }
-
-    override fun triggerWithAuth(auth: UsernamePasswordCredentialsProvider) {
-        command.setCredentialsProvider(auth)
-        this.runTaskAsynchronously(plugin)
-
-        super.triggerWithAuth(auth)
-    }
 }

src/main/kotlin/com/kruthers/datapackmanager/commands/GitCommand.kt

@@ -8,6 +8,8 @@ import com.kruthers.datapackmanager.utils.AuthType
 import com.kruthers.datapackmanager.utils.MultipleAuthType
 import com.kruthers.datapackmanager.utils.NoActionFound
 import com.kruthers.datapackmanager.utils.parse
+import net.kyori.adventure.text.Component
+import net.kyori.adventure.text.format.NamedTextColor
 import org.bukkit.command.CommandSender
 
 class GitCommand(pl: DatapackManager) {
@@ -17,8 +19,12 @@ class GitCommand(pl: DatapackManager) {
     @CommandDescription("Pull data from the github")
     @CommandPermission("datapackmanager.git")
     fun onGitPullCommand(sender: CommandSender, @Flag("force", description = "Will force from master", aliases = ["f"]) force: Boolean) {
-        val command = Pull(sender, this.plugin, force)
-        command.trigger()
+        try {
+            val command = Pull(sender, this.plugin, force)
+            command.trigger()
+        } catch (err: Exception) {
+            sender.sendMessage(Component.text("Failed to pull from github: \n${err.message}", NamedTextColor.RED))
+        }
     }
 
     @CommandMethod("git clone <repo> [branch]")
@@ -55,14 +61,16 @@ class GitCommand(pl: DatapackManager) {
     @CommandDescription("Confirm a github action")
     @CommandPermission("datapackmanager.git")
     fun onGitConfirmCommand(sender: CommandSender) {
-        if (DatapackManager.confirmation.containsKey(sender)) {
-            val action = DatapackManager.confirmation[sender]
-            action!!.trigger()
-
+        try {
+            if (DatapackManager.confirmation.containsKey(sender)) {
+                DatapackManager.confirmation[sender]!!.trigger()
+            } else {
+                throw NoActionFound()
+            }
+        } catch (err: Exception) {
+            sender.sendMessage(Component.text(err.message!!, NamedTextColor.RED))
+        } finally {
             DatapackManager.confirmation.remove(sender)
-
-        } else {
-            throw NoActionFound()
         }
     }
 }

src/main/kotlin/com/kruthers/datapackmanager/utils/AuthUtils.kt

@@ -5,37 +5,44 @@ import com.jcraft.jsch.Session
 import com.kruthers.datapackmanager.DatapackManager
 import org.bukkit.configuration.file.FileConfiguration
 import org.eclipse.jgit.api.TransportConfigCallback
-import org.eclipse.jgit.transport.*
+import org.eclipse.jgit.transport.SshTransport
+import org.eclipse.jgit.transport.Transport
+import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider
 import org.eclipse.jgit.transport.ssh.jsch.JschConfigSessionFactory
 import org.eclipse.jgit.transport.ssh.jsch.OpenSshConfig
 import org.eclipse.jgit.util.FS
 
+
 class SshCallback(plugin: DatapackManager): TransportConfigCallback {
-    val config: FileConfiguration = plugin.config
-    val passphase: String = config.getString("auth.ssh.password") ?: ""
+    private val config: FileConfiguration = plugin.config
+    private val passphrase: String = config.getString("auth.ssh.password") ?: ""
+    private val key = "${plugin.dataFolder}/key.txt"
 
-    val sshSessionFactory: SshSessionFactory = object : JschConfigSessionFactory() {
+    private class SshFactory(private val key: String, private val passphrase: String): JschConfigSessionFactory() {
         override fun configure(hc: OpenSshConfig.Host?, session: Session?) {
             session?.setConfig("StrictHostKeyChecking","no")
             super.configure(hc, session)
         }
 
         override fun createDefaultJSch(fs: FS?): JSch {
             val jSch: JSch = super.createDefaultJSch(fs)
-            jSch.addIdentity("${plugin.dataFolder}/key.txt",passphase)
+            jSch.addIdentity(key ,passphrase)
 
             return jSch
         }
     }
 
-    override fun configure(p0: Transport?) {
-        if (p0 is SshTransport) {
-            val sshTransport: SshTransport = p0
-            sshTransport.sshSessionFactory = sshSessionFactory
-        }
+        /**
+     * Add any additional transport-specific configuration required.
+     *
+     * @param transport
+     * a [org.eclipse.jgit.transport.Transport] object.
+     */
+    override fun configure(transport: Transport?) {
+        if (transport is SshTransport) {
+            transport.setSshSessionFactory(SshFactory(key, passphrase))
+        } else throw NotSshRemote()
     }
-
-
 }
 
 fun getUsernamePasswordAuth(plugin: DatapackManager): UsernamePasswordCredentialsProvider {
@@ -48,3 +55,4 @@ fun getTokenAuth(plugin: DatapackManager): UsernamePasswordCredentialsProvider {
     val token: String = plugin.config.getString("auth.token.token")?: "token"
     return UsernamePasswordCredentialsProvider(token,"")
 }
+

src/main/kotlin/com/kruthers/datapackmanager/utils/Errors.kt

@@ -1,4 +1,7 @@
 package com.kruthers.datapackmanager.utils
 
-class MultipleAuthType: Error("Multiple methods of authentication provided, provide only one")
-class NoActionFound: Error ("No action found await your confirmation")
+class MultipleAuthType: Exception("Multiple methods of authentication provided, provide only one")
+class NoActionFound: Exception("No action found await your confirmation")
+
+class NotSshRemote: Exception("Unable to close using ssh, the provided git remote is not a ssh clone remote. These " +
+        "start with git@ not https://")