Merge branch 'master' into 3.0.0

Author: tomaswolf

pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>34</version>
+        <version>35</version>
     </parent>
 
     <groupId>org.apache.sshd</groupId>
@@ -89,7 +89,7 @@
         <maven.compiler.source>${javac.source}</maven.compiler.source>
         <ant.version>1.10.15</ant.version>
         <ant.build.javac.source>${javac.source}</ant.build.javac.source>
-        <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
+        <build-helper-maven-plugin.version>3.6.1</build-helper-maven-plugin.version>
 
         <javac.target>${javac.source}</javac.target>
         <required.java.version>[${javac.target},)</required.java.version>
@@ -98,9 +98,9 @@
         <ant.build.javac.target>${javac.target}</ant.build.javac.target>
 
         <groovy.version>4.0.17</groovy.version>
-        <bouncycastle.version>1.80</bouncycastle.version>
+        <bouncycastle.version>1.81</bouncycastle.version>
             <!-- NOTE: upgrading slf4j beyond this version causes
-            
+
             Execution verify-style of goal org.apache.maven.plugins:maven-checkstyle-plugin:3.1.2:check failed.: NullPointerException
             -->
         <slf4j.version>1.7.36</slf4j.version>
@@ -112,14 +112,13 @@
         <jgit.version>5.13.3.202401111512-r</jgit.version>
             <!-- mockito 5.0 requires Java 11. -->
         <mockito.version>4.11.0</mockito.version>
-        <bytebuddy.version>1.17.5</bytebuddy.version>
-        <testcontainers.version>1.21.0</testcontainers.version>
-        <grpc.version>1.73.0</grpc.version> <!-- Used only in tests -->
+        <testcontainers.version>1.21.3</testcontainers.version>
+        <grpc.version>1.74.0</grpc.version> <!-- Used only in tests -->
 
         <maven.archiver.version>3.6.3</maven.archiver.version>
         <plexus.archiver.version>4.10.0</plexus.archiver.version>
         <!-- See https://pmd.github.io/ for available latest version -->
-        <pmd.version>7.14.0</pmd.version>
+        <pmd.version>7.16.0</pmd.version>
         <japicmp.version>0.23.1</japicmp.version>
         <sshd.tests.timeout.factor>1.0</sshd.tests.timeout.factor>
         <sshd.tests.rerun.count>2</sshd.tests.rerun.count>
@@ -138,7 +137,7 @@
                 <format.formatter.action>validate</format.formatter.action>
             </properties>
         </profile>
-                
+
         <profile>
             <id>toolchains</id>
             <activation>
@@ -222,7 +221,7 @@
                     <plugin>
                         <groupId>org.owasp</groupId>
                         <artifactId>dependency-check-maven</artifactId>
-                        <version>12.1.1</version>
+                        <version>12.1.3</version>
                             <!-- see https://jeremylong.github.io/DependencyCheck/dependency-check-maven/configuration.html -->
                         <configuration>
                                 <!-- see https://github.com/jeremylong/DependencyCheck/issues/1394 -->
@@ -276,7 +275,7 @@
                            <dependency>
                                 <groupId>com.google.errorprone</groupId>
                                 <artifactId>error_prone_core</artifactId>
-                	            <version>2.38.0</version>
+                	            <version>2.41.0</version>
                             </dependency>
             		    </dependencies>
                     </plugin>
@@ -562,23 +561,6 @@
                 <version>2.27.2</version>
             </dependency>
 
-                <!-- Transitive dependencies by various 3rd party packages -->
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.19.0</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-                <version>3.2.2</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
@@ -599,30 +581,6 @@
                 <scope>import</scope>
             </dependency>
 
-                <!-- Referenced indirectly by Bytebuddy -->
-            <dependency>
-                <groupId>com.google.code.findbugs</groupId>
-                <artifactId>jsr305</artifactId>
-                <version>3.0.2</version>
-            </dependency>
-
-                <!-- Used by mockito -->
-            <dependency>
-                <groupId>net.bytebuddy</groupId>
-                <artifactId>byte-buddy</artifactId>
-                <version>${bytebuddy.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>net.bytebuddy</groupId>
-                <artifactId>byte-buddy-agent</artifactId>
-                <version>${bytebuddy.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>net.sf.jpam</groupId>
-                <artifactId>jpam</artifactId>
-                <version>1.1</version>
-            </dependency>
             <dependency>
                 <groupId>commons-httpclient</groupId>
                 <artifactId>commons-httpclient</artifactId>
@@ -703,7 +661,7 @@
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter</artifactId>
-                <version>5.13.3</version>
+                <version>5.13.4</version>
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
@@ -1059,7 +1017,7 @@
                 <plugin>
                     <groupId>net.revelc.code.formatter</groupId>
                     <artifactId>formatter-maven-plugin</artifactId>
-                    <version>2.26.0</version>
+                    <version>2.27.0</version>
                     <configuration>
                         <skipXmlFormatting>true</skipXmlFormatting>
                         <skipHtmlFormatting>true</skipHtmlFormatting>
@@ -1403,7 +1361,7 @@
             </plugin>
         </plugins>
     </build>
-    
+
     <distributionManagement>
         <site>
             <id>github</id>

sshd-core/src/main/java/org/apache/sshd/client/channel/AbstractClientChannel.java

@@ -27,7 +27,6 @@
 import java.util.EnumSet;
 import java.util.Objects;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -262,6 +261,7 @@ public Set<ClientChannelEvent> waitFor(Collection<ClientChannelEvent> mask, long
                 if (timeout > 0L) {
                     long now = System.currentTimeMillis();
                     long usedTime = now - startTime;
+                    remWait = timeout - usedTime;
                     if ((usedTime >= timeout) || (remWait <= 0L)) {
                         if (traceEnabled) {
                             log.trace("waitFor({}) call timeout {}/{} for mask={}: {}",
@@ -290,14 +290,6 @@ public Set<ClientChannelEvent> waitFor(Collection<ClientChannelEvent> mask, long
                     if (traceEnabled) {
                         log.trace("waitFor({}) lock notified on channel after {} nanos", this, nanoDuration);
                     }
-
-                    if (timeout > 0L) {
-                        long waitDuration = TimeUnit.MILLISECONDS.convert(nanoDuration, TimeUnit.NANOSECONDS);
-                        if (waitDuration <= 0L) {
-                            waitDuration = 123L;
-                        }
-                        remWait -= waitDuration;
-                    }
                 } catch (InterruptedException e) {
                     long nanoEnd = System.nanoTime();
                     long nanoDuration = nanoEnd - nanoStart;

sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java

@@ -28,7 +28,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -261,6 +260,7 @@ public Set<ClientSessionEvent> waitFor(Collection<ClientSessionEvent> mask, long
                 if (timeout > 0L) {
                     long now = System.currentTimeMillis();
                     long usedTime = now - startTime;
+                    remWait = timeout - usedTime;
                     if ((usedTime >= timeout) || (remWait <= 0L)) {
                         if (traceEnabled) {
                             log.trace("waitFor({}) call timeout {}/{} for mask={}: {}",
@@ -289,14 +289,6 @@ public Set<ClientSessionEvent> waitFor(Collection<ClientSessionEvent> mask, long
                     if (traceEnabled) {
                         log.trace("waitFor({}) Lock notified after {} nanos", this, nanoDuration);
                     }
-
-                    if (timeout > 0L) {
-                        long waitDuration = TimeUnit.MILLISECONDS.convert(nanoDuration, TimeUnit.NANOSECONDS);
-                        if (waitDuration <= 0L) {
-                            waitDuration = 123L;
-                        }
-                        remWait -= waitDuration;
-                    }
                 } catch (InterruptedException e) {
                     long nanoEnd = System.nanoTime();
                     long nanoDuration = nanoEnd - nanoStart;

sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwarder.java

@@ -746,31 +746,23 @@ protected InetSocketAddress doBind(SshdSocketAddress address, IoAcceptor accepto
             throws IOException {
         // TODO find a better way to determine the resulting bind address - what if multi-threaded calls...
         Collection<SocketAddress> before = acceptor.getBoundAddresses();
-        try {
-            InetSocketAddress bindAddress = address.toInetSocketAddress();
-            acceptor.bind(bindAddress);
+        InetSocketAddress bindAddress = address.toInetSocketAddress();
+        acceptor.bind(bindAddress);
 
-            Collection<SocketAddress> after = acceptor.getBoundAddresses();
-            if (GenericUtils.size(after) > 0) {
-                after.removeAll(before);
-            }
-            if (GenericUtils.isEmpty(after)) {
-                throw new IOException("Error binding to " + address + "[" + bindAddress + "]: no local addresses bound");
-            }
-
-            if (after.size() > 1) {
-                throw new IOException("Multiple local addresses have been bound for " + address + "[" + bindAddress + "]");
-            }
+        Collection<SocketAddress> after = acceptor.getBoundAddresses();
+        if (GenericUtils.size(after) > 0) {
+            after.removeAll(before);
+        }
+        if (GenericUtils.isEmpty(after)) {
+            throw new IOException("Error binding to " + address + "[" + bindAddress + "]: no local addresses bound");
+        }
 
-            InetSocketAddress boundAddress = (InetSocketAddress) GenericUtils.head(after);
-            return boundAddress;
-        } catch (IOException bindErr) {
-            Collection<SocketAddress> after = acceptor.getBoundAddresses();
-            if (GenericUtils.isEmpty(after)) {
-                close();
-            }
-            throw bindErr;
+        if (after.size() > 1) {
+            throw new IOException("Multiple local addresses have been bound for " + address + "[" + bindAddress + "]");
         }
+
+        InetSocketAddress boundAddress = (InetSocketAddress) GenericUtils.head(after);
+        return boundAddress;
     }
 
     @Override

sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingTest.java

@@ -71,6 +71,7 @@
 import org.apache.sshd.common.session.ConnectionService;
 import org.apache.sshd.common.util.GenericUtils;
 import org.apache.sshd.common.util.MapEntryUtils.NavigableMapBuilder;
+import org.apache.sshd.common.util.OsUtils;
 import org.apache.sshd.common.util.ProxyUtils;
 import org.apache.sshd.common.util.buffer.ByteArrayBuffer;
 import org.apache.sshd.common.util.io.IoUtils;
@@ -699,6 +700,27 @@ void localForwardingNativeReuse() throws Exception {
         }
     }
 
+    @Test // GH-754 : forwarder should _not_ be closed after bind error
+    void localForwardingNativeError() throws Exception {
+        Assumptions.assumeFalse(OsUtils.isWin32(), "Privileged port can be bound on Windows");
+        try (ClientSession session = createNativeSession(null)) {
+            // Use a privileged port to provoke an exception
+            SshdSocketAddress local = new SshdSocketAddress(TEST_LOCALHOST, 22);
+            SshdSocketAddress remote = new SshdSocketAddress(TEST_LOCALHOST, echoPort);
+            try {
+                SshdSocketAddress bound = session.startLocalPortForwarding(local, remote);
+                // If we get here, we have a problem
+                session.stopLocalPortForwarding(bound);
+                fail("Expected an exception (privileged port)");
+            } catch (IOException e) {
+                local = new SshdSocketAddress("", 0);
+                SshdSocketAddress bound = session.startLocalPortForwarding(local, remote);
+                assertNotNull(bound);
+                session.stopLocalPortForwarding(bound);
+            }
+        }
+    }
+
     @Test
     void localForwardingNativeBigPayload() throws Exception {
         try (ClientSession session = createNativeSession(null)) {

sshd-git/src/main/java/org/apache/sshd/git/pack/GitPackCommand.java

@@ -82,27 +82,27 @@ public void run() {
 
             Path rootDir = resolveRootDirectory(command, args);
             RepositoryCache.FileKey key = RepositoryCache.FileKey.lenient(rootDir.toFile(), FS.DETECTED);
-            Repository db = key.open(true /* must exist */);
-            String subCommand = args[0];
-            if (RemoteConfig.DEFAULT_UPLOAD_PACK.equals(subCommand)) {
-                UploadPack uploadPack = new UploadPack(db);
-                packConfiguration.configureUploadPack(getSession(), uploadPack);
-                Environment environment = getEnvironment();
-                Map<String, String> envVars = environment.getEnv();
-                String protocol = MapEntryUtils.isEmpty(envVars)
-                        ? null : envVars.get(GitProtocolConstants.PROTOCOL_ENVIRONMENT_VARIABLE);
-                if (GenericUtils.isNotBlank(protocol)) {
-                    uploadPack.setExtraParameters(Collections.singleton(protocol));
+            try (Repository db = key.open(true /* must exist */)) {
+                String subCommand = args[0];
+                if (RemoteConfig.DEFAULT_UPLOAD_PACK.equals(subCommand)) {
+                    UploadPack uploadPack = new UploadPack(db);
+                    packConfiguration.configureUploadPack(getSession(), uploadPack);
+                    Environment environment = getEnvironment();
+                    Map<String, String> envVars = environment.getEnv();
+                    String protocol = MapEntryUtils.isEmpty(envVars)
+                            ? null : envVars.get(GitProtocolConstants.PROTOCOL_ENVIRONMENT_VARIABLE);
+                    if (GenericUtils.isNotBlank(protocol)) {
+                        uploadPack.setExtraParameters(Collections.singleton(protocol));
+                    }
+                    uploadPack.upload(getInputStream(), getOutputStream(), getErrorStream());
+                } else if (RemoteConfig.DEFAULT_RECEIVE_PACK.equals(subCommand)) {
+                    ReceivePack receivePack = new ReceivePack(db);
+                    packConfiguration.configureReceivePack(getSession(), receivePack);
+                    receivePack.receive(getInputStream(), getOutputStream(), getErrorStream());
+                } else {
+                    throw new IllegalArgumentException("Unknown git command: " + command);
                 }
-                uploadPack.upload(getInputStream(), getOutputStream(), getErrorStream());
-            } else if (RemoteConfig.DEFAULT_RECEIVE_PACK.equals(subCommand)) {
-                ReceivePack receivePack = new ReceivePack(db);
-                packConfiguration.configureReceivePack(getSession(), receivePack);
-                receivePack.receive(getInputStream(), getOutputStream(), getErrorStream());
-            } else {
-                throw new IllegalArgumentException("Unknown git command: " + command);
             }
-
             onExit(0);
         } catch (Throwable t) {
             onExit(-1, t.getClass().getSimpleName());