Fix: Correct SMB1 connection validation; now caches contexts/sessions only if connection succeeds, preventing invalid credentials from being stored

Author: Andrey

app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/holder/SMB1FileHolder.kt

@@ -84,7 +84,10 @@ class SMB1FileHolder(
 
     override suspend fun isValid(): Boolean = withContext(Dispatchers.IO) {
         try {
-            getSmbFile().exists()
+            val file = getSmbFile()
+            file.connect() // fuerza la conexión al servidor
+            file.list()    // opcional: lista el directorio para asegurarte que existe
+            true
         } catch (e: Exception) {
             false
         }

app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/smb/SMB1ConnectionManager.kt

@@ -28,17 +28,27 @@ object SMB1ConnectionManager {
         anonymous: Boolean
     ): CIFSContext {
         val key = "$host|$port|$share|${username ?: "anon"}|$anonymous"
-        return contexts[key] ?: run {
-            val baseContext = SingletonContext.getInstance() as BaseContext
-            val context = if (anonymous || username.isNullOrBlank()) {
-                baseContext.withAnonymousCredentials()
-            } else {
-                val auth = NtlmPasswordAuthenticator(domain ?: "", username, password)
-                baseContext.withCredentials(auth)
-            }
-            contexts[key] = context
-            context
+
+        contexts[key]?.let { return it }
+
+        val baseContext = SingletonContext.getInstance() as BaseContext
+        val context = if (anonymous || username.isNullOrBlank()) {
+            baseContext.withAnonymousCredentials()
+        } else {
+            val auth = NtlmPasswordAuthenticator(domain ?: "", username, password)
+            baseContext.withCredentials(auth)
         }
+
+        val testUrl = "smb://$host:$port/$share/"
+        try {
+            val file = SmbFile(testUrl, context)
+            file.connect()
+        } catch (e: Exception) {
+            throw RuntimeException("Unable to connect to SMB1 share: $testUrl", e)
+        }
+
+        contexts[key] = context
+        return context
     }
 
     fun getFile(

app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/smb/SMBConnectionManager.kt

@@ -9,25 +9,40 @@ object SMBConnectionManager {
 
     fun getSession(
         host: String,
-        port: Int = 445, // default smb port 445
+        port: Int = 445,
         username: String?,
         password: String?,
         domain: String?,
         anonymous: Boolean
     ): Session {
         val key = "$domain|$host|$port|${username ?: "anon"}"
-        return clients[key] ?: run {
-            val client = SMBClient()
-            val connection = client.connect(host, port)
-            val session = if (anonymous || username.isNullOrBlank()) {
+        clients[key]?.let { return it }
+
+        val client = SMBClient()
+        val connection = client.connect(host, port)
+        val session = try {
+            if (anonymous || username.isNullOrBlank()) {
                 connection.authenticate(null)
             } else {
                 connection.authenticate(
                     AuthenticationContext(username, password?.toCharArray(), domain)
                 )
             }
-            clients[key] = session
-            session
+        } catch (e: Exception) {
+            connection.close()
+            throw RuntimeException("Authentication failed for $username@$host:$port", e)
+        }
+
+        try {
+            val share = session.connectShare("IPC$") // share estándar que siempre existe
+            share.close()
+        } catch (e: Exception) {
+            session.logoff()
+            throw RuntimeException("Session could not access share. Bad credentials?", e)
         }
+
+        clients[key] = session
+        return session
     }
+
 }

app/src/main/java/com/raival/compose/file/explorer/screen/main/ui/AddSMBDriveDialog.kt

@@ -267,22 +267,14 @@ fun AddSMBDriveDialog(
                         modifier = Modifier.weight(1f),
                         onClick = {
                             CoroutineScope(Dispatchers.IO).launch {
-                                val port = portText.toIntOrNull() ?: 445
+                                val smb1Port = portText.toIntOrNull() ?: 139
+                                val smb2Port = portText.toIntOrNull() ?: 445
 
                                 val success = when (smbVersion) {
-                                    smb1Text -> mainActivityManager.addSmb1Drive(
-                                        host, port, username, password, anonymous, domain, context
-                                    )
-                                    smb2Text -> mainActivityManager.addSmbDrive(
-                                        host, port, username, password, anonymous, domain, context
-                                    )
-                                    else -> {
-                                        mainActivityManager.addSmbDrive(
-                                            host, port, username, password, anonymous, domain, context
-                                        ) || mainActivityManager.addSmb1Drive(
-                                            host, port, username, password, anonymous, domain, context
-                                        )
-                                    }
+                                    smb1Text -> mainActivityManager.addSmb1Drive(host, smb1Port, username, password, anonymous, domain, context)
+                                    smb2Text -> mainActivityManager.addSmbDrive(host, smb2Port, username, password, anonymous, domain, context)
+                                    else -> mainActivityManager.addSmbDrive(host, smb2Port, username, password, anonymous, domain, context)
+                                            || mainActivityManager.addSmb1Drive(host, smb1Port, username, password, anonymous, domain, context)
                                 }
 
                                 withContext(Dispatchers.Main) {