Merge pull request #16636 from iterate-ch/bugfix/GH-16135

Update dependency
iterate-ch · Dec 13, 2024 · 987426e · 987426e
2 parents 4285fdc + 1f1231c
commit 987426e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/defaults/src/main/resources/default.properties b/defaults/src/main/resources/default.properties
@@ -544,10 +544,13 @@ nextcloud.root.webdav.user=remote.php/dav/{0}/{1}
 nextcloud.root.ocs=ocs/v1.php
 
 smb.domain.default=WORKGROUP
+smb.ntlm.workstation=
 # Enable distributed filesystem path resolver
 smb.dfs.enable=true
 # Requires that messages from the server are signed
 smb.signing.required=false
+# Sign messages to the server
+smb.signing.enable=true
 smb.encrypt.enable=false
 smb.socket.timeout=0
 smb.protocol.negotiate.enable=true

diff --git a/smb/pom.xml b/smb/pom.xml
@@ -23,7 +23,7 @@
     <artifactId>smb</artifactId>
     <packaging>jar</packaging>
     <properties>
-        <smbj.version>0.13.0</smbj.version>
+        <smbj.version>0.14.0</smbj.version>
         <testcontainers.version>1.20.4</testcontainers.version>
     </properties>
     <dependencies>

diff --git a/smb/src/main/java/ch/cyberduck/core/smb/SMBSession.java b/smb/src/main/java/ch/cyberduck/core/smb/SMBSession.java
@@ -21,7 +21,6 @@
 import ch.cyberduck.core.Host;
 import ch.cyberduck.core.HostKeyCallback;
 import ch.cyberduck.core.ListService;
-import ch.cyberduck.core.LocaleFactory;
 import ch.cyberduck.core.LoginCallback;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.PathContainerService;
@@ -228,12 +227,14 @@ public SMBSession(final Host h) {
     protected Connection connect(final ProxyFinder proxy, final HostKeyCallback key, final LoginCallback prompt, final CancelCallback cancel) throws BackgroundException {
         try {
             final SMBClient client = new SMBClient(SmbConfig.builder()
+                    .withWorkStationName(new HostPreferences(host).getProperty("smb.ntlm.workstation"))
                     .withSocketFactory(new ProxySocketFactory(host))
                     .withTimeout(ConnectionTimeoutFactory.get(new HostPreferences(host)).getTimeout(), TimeUnit.SECONDS)
                     .withSoTimeout(new HostPreferences(host).getLong("smb.socket.timeout"), TimeUnit.SECONDS)
                     .withAuthenticators(new NtlmAuthenticator.Factory())
                     .withDfsEnabled(new HostPreferences(host).getBoolean("smb.dfs.enable"))
                     .withEncryptData(new HostPreferences(host).getBoolean("smb.encrypt.enable"))
+                    .withSigningEnabled(new HostPreferences(host).getBoolean("smb.signing.enable"))
                     .withSigningRequired(new HostPreferences(host).getBoolean("smb.signing.required"))
                     .withRandomProvider(SecureRandomProviderFactory.get().provide())
                     .withMultiProtocolNegotiate(new HostPreferences(host).getBoolean("smb.protocol.negotiate.enable"))