Skip to content

Add support for SMB2 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sodevel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for SMB2 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ dependencies {
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.1")

implementation("org.codelibs:jcifs:1.3.18.3")
implementation("org.codelibs:jcifs:2.1.35")
implementation("org.jsoup:jsoup:1.14.3")
implementation("commons-io:commons-io:2.11.0")
implementation("io.pebbletemplates:pebble:3.1.5")
Expand Down
20 changes: 13 additions & 7 deletions src/main/kotlin/com/cognifide/gradle/common/file/transfer/smb/SmbFileTransfer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@ package com.cognifide.gradle.common.file.transfer.smb
import com.cognifide.gradle.common.CommonExtension
import com.cognifide.gradle.common.file.transfer.FileEntry
import com.cognifide.gradle.common.file.transfer.ProtocolFileTransfer
import jcifs.smb.NtlmPasswordAuthentication
import jcifs.config.PropertyConfiguration
import jcifs.context.BaseContext
import jcifs.smb.NtlmPasswordAuthenticator
import jcifs.smb.SmbFile
import org.apache.commons.lang3.StringUtils
import java.io.File
import java.util.Properties

@Suppress("TooGenericExceptionCaught")
class SmbFileTransfer(common: CommonExtension) : ProtocolFileTransfer(common) {
Expand Down Expand Up @@ -101,12 +104,15 @@ class SmbFileTransfer(common: CommonExtension) : ProtocolFileTransfer(common) {

fun file(dirUrl: String, fileName: String): SmbFile {
val dirUrlNormalized = StringUtils.appendIfMissing(dirUrl, "/")

return if (!user.orNull.isNullOrBlank() && !password.orNull.isNullOrBlank()) {
SmbFile(dirUrlNormalized, fileName, NtlmPasswordAuthentication(domain.orNull, user.get(), password.get()))
} else {
SmbFile(dirUrlNormalized, fileName)
}.apply { useCaches = false }
val properties = Properties()
val configuration = PropertyConfiguration(properties)
val context =
if (!user.orNull.isNullOrBlank() && !password.orNull.isNullOrBlank())
BaseContext(configuration).withCredentials(NtlmPasswordAuthenticator(domain.orNull, user.get(), password.get()))
else
BaseContext(configuration).withAnonymousCredentials()

return SmbFile(context.get(dirUrlNormalized), fileName).apply { useCaches = false }
}

fun dir(dirUrl: String): SmbFile = file(dirUrl, "").apply {
Expand Down