开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

_service:tar_scm:apache-sshd.spec Changed

@@ -1,15 +1,13 @@
 Epoch:               1
 Name:                apache-sshd
-Version:             2.2.0
-Release:             2
+Version:             2.9.2
+Release:             1
 Summary:             Apache SSHD
 License:             ASL 2.0 and ISC
 URL:                 http://mina.apache.org/sshd-project
 Source0:             https://archive.apache.org/dist/mina/sshd/%{version}/apache-sshd-%{version}-src.tar.gz
 Patch0:              0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch
-Patch1:              CVE-2021-30129-1.patch
-Patch2:              CVE-2021-30129-2.patch
-Patch3:              CVE-2021-30129-3.patch
+Patch1:              apache-sshd-javadoc.patch
 
 BuildRequires:       maven-local mvn(junit:junit) mvn(net.i2p.crypto:eddsa) mvn(org.apache.ant:ant)
 BuildRequires:       mvn(org.apache:apache:pom:) mvn(org.apache.felix:maven-bundle-plugin)
@@ -22,6 +20,7 @@
 BuildRequires:       mvn(org.bouncycastle:bcpg-jdk15on) mvn(org.bouncycastle:bcpkix-jdk15on)
 BuildRequires:       mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:       mvn(org.codehaus.plexus:plexus-archiver) mvn(org.slf4j:slf4j-api)
+BuildRequires:       mvn(org.slf4j:jcl-over-slf4j)
 BuildArch:           noarch
 %description
 Apache SSHD is a 100% pure java library to support the SSH protocols on both
@@ -36,10 +35,9 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix
 %pom_remove_dep :spring-framework-bom
+%pom_remove_dep :testcontainers-bom sshd-sftp sshd-core
 %pom_disable_module assembly
 %pom_disable_module sshd-mina
 %pom_disable_module sshd-netty
@@ -50,11 +48,13 @@
 %pom_disable_module sshd-cli
 %pom_disable_module sshd-openpgp
 %pom_remove_plugin :apache-rat-plugin
-%pom_remove_plugin :groovy-maven-plugin
+%pom_remove_plugin :gmavenplus-plugin
 %pom_remove_plugin :maven-checkstyle-plugin
 %pom_remove_plugin :maven-enforcer-plugin
 %pom_remove_plugin :maven-pmd-plugin
 %pom_remove_plugin :animal-sniffer-maven-plugin
+%pom_remove_plugin :impsort-maven-plugin
+%pom_remove_plugin :formatter-maven-plugin . sshd-core
 %pom_xpath_inject "pom:configuration/pom:instructions" "<_nouses>true</_nouses>" .
 
 %build
@@ -71,6 +71,9 @@
 %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt
 
 %changelog
+* Mon Nov 21 2022 liangqifeng <liangqifeng@ncti-gba.cn> - 1:2.9.2-1
+- Fix CVE-2022-45047
+	
 * Tue Aug 10 2021 yaoxin <yaoxin30@huawei.com> - 2.2.0-2
 - Fix CVE-2021-30129

_service:tar_scm:0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch Changed

@@ -14,9 +14,9 @@
 index 867ca88..7c29678 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -397,11 +397,6 @@
+@@ -428,11 +428,6 @@
                  <artifactId>mina-core</artifactId>
-                 <version>2.0.19</version>
+                 <version>2.0.23</version>
              </dependency>
 -            <dependency>
 -                <groupId>tomcat</groupId>
@@ -30,19 +30,19 @@
 index 6171c5c..73a43a7 100644
 --- a/sshd-core/pom.xml
 +++ b/sshd-core/pom.xml
-@@ -44,12 +44,6 @@
-             <version>${project.version}</version>
+@@ -43,12 +43,6 @@
          </dependency>
  
--        <dependency>
+         <dependency>
 -            <groupId>tomcat</groupId>
 -            <artifactId>tomcat-apr</artifactId>
 -            <optional>true</optional>
 -        </dependency>
 -
-         <dependency>
+-        <dependency>
              <groupId>org.bouncycastle</groupId>
              <artifactId>bcpg-jdk15on</artifactId>
+             <optional>true</optional>
 diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/local/ProxyAgentFactory.java b/sshd-core/src/main/java/org/apache/sshd/agent/local/ProxyAgentFactory.java
 index ab19539..5757e68 100644
 --- a/sshd-core/src/main/java/org/apache/sshd/agent/local/ProxyAgentFactory.java
@@ -54,24 +54,24 @@
 -import org.apache.sshd.agent.unix.AprLibrary;
 -import org.apache.sshd.agent.unix.UnixAgentFactory;
  import org.apache.sshd.common.FactoryManager;
- import org.apache.sshd.common.NamedFactory;
  import org.apache.sshd.common.PropertyResolver;
-@@ -53,9 +51,7 @@ public class ProxyAgentFactory implements SshAgentFactory {
+ import org.apache.sshd.common.channel.ChannelFactory;
+@@ -51,9 +49,7 @@ public class ProxyAgentFactory implements SshAgentFactory {
  
      @Override
-     public List<NamedFactory<Channel>> getChannelForwardingFactories(FactoryManager manager) {
+     public List<ChannelFactory> getChannelForwardingFactories(FactoryManager manager) {
 -        return isPreferredUnixAgent(manager)
--            ? UnixAgentFactory.DEFAULT_FORWARDING_CHANNELS
--            : LocalAgentFactory.DEFAULT_FORWARDING_CHANNELS;
+-                ? UnixAgentFactory.DEFAULT_FORWARDING_CHANNELS
+-                : LocalAgentFactory.DEFAULT_FORWARDING_CHANNELS;
 +        return LocalAgentFactory.DEFAULT_FORWARDING_CHANNELS;
      }
  
      @Override
-@@ -106,16 +102,6 @@ public class ProxyAgentFactory implements SshAgentFactory {
+@@ -104,16 +100,6 @@ public class ProxyAgentFactory implements SshAgentFactory {
      }
  
      public static boolean isPreferredUnixAgent(PropertyResolver resolver) {
--        if (PropertyResolverUtils.getBooleanProperty(resolver, PREFER_UNIX_AGENT, OsUtils.isUNIX())) {
+-        if (CoreModuleProperties.PREFER_UNIX_AGENT.getRequired(resolver)) {
 -            try {
 -                if (AprLibrary.getInstance() != null) {
 -                    return true;
@@ -103,5 +103,3 @@
      <build>
 -- 
 2.20.1
-
-

_service:tar_scm:CVE-2021-30129-1.patch Deleted

@@ -1,1116 +0,0 @@
-From 68c780f2e746eedb714ff6e17c6815fbffddeff6 Mon Sep 17 00:00:00 2001
-From: Guillaume Nodet <gnodet@gmail.com>
-Date: Fri, 17 Jul 2020 11:33:21 +0200
-Subject: PATCH 1/1 SSHD-1035 Move property definitions tocommon locations
-
----
- .../java/org/apache/sshd/common/Property.java | 408 +++++++++++
- .../sshd/core/CoreModuleProperties.java       | 681 ++++++++++++++++++
- 2 files changed, 1089 insertions(+)
- create mode 100644 sshd-common/src/main/java/org/apache/sshd/common/Property.java
- create mode 100644 sshd-core/src/main/java/org/apache/sshd/core/CoreModuleProperties.java
-
-diff --git a/sshd-common/src/main/java/org/apache/sshd/common/Property.java b/sshd-common/src/main/java/org/apache/sshd/common/Property.java
-new file mode 100644
-index 0000000..f5ad335
---- /dev/null
-+++ b/sshd-common/src/main/java/org/apache/sshd/common/Property.java
-@@ -0,0 +1,408 @@
-+/*
-+ * Licensed to the Apache Software Foundation (ASF) under one
-+ * or more contributor license agreements. See the NOTICE file
-+ * distributed with this work for additional information
-+ * regarding copyright ownership. The ASF licenses this file
-+ * to you under the Apache License, Version 2.0 (the
-+ * "License"); you may not use this file except in compliance
-+ * with the License. You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing,
-+ * software distributed under the License is distributed on an
-+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-+ * KIND, either express or implied. See the License for the
-+ * specific language governing permissions and limitations
-+ * under the License.
-+ */
-+package org.apache.sshd.common;
-+
-+import java.nio.charset.Charset;
-+import java.time.Duration;
-+import java.util.Arrays;
-+import java.util.Objects;
-+import java.util.Optional;
-+import java.util.function.Consumer;
-+
-+/**
-+ * Property definition.
-+ *
-+ * @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
-+ */
-+public interface Property<T> {
-+
-+    static Property<String> string(String name) {
-+        return new StringProperty(name);
-+    }
-+
-+    static Property<String> string(String name, String def) {
-+        return new StringProperty(name, def);
-+    }
-+
-+    static Property<Boolean> bool(String name) {
-+        return new BooleanProperty(name);
-+    }
-+
-+    static Property<Boolean> bool(String name, boolean def) {
-+        return new BooleanProperty(name, def);
-+    }
-+
-+    static Property<Integer> integer(String name) {
-+        return new IntProperty(name);
-+    }
-+
-+    static Property<Integer> integer(String name, int def) {
-+        return new IntProperty(name, def);
-+    }
-+
-+    // CHECKSTYLE:OFF
-+    static Property<Long> long_(String name) {
-+        return new LongProperty(name);
-+    }
-+
-+    static Property<Long> long_(String name, long def) {
-+        return new LongProperty(name, def);
-+    }
-+
-+    static <T extends Enum<T>> Property<T> enum_(String name, Class<T> type) {
-+        return new EnumProperty<>(name, type);
-+    }
-+
-+    static <T extends Enum<T>> Property<T> enum_(String name, Class<T> type, T def) {
-+        return new EnumProperty<>(name, type, def);
-+    }
-+    // CHECKSTYLE:ON
-+
-+    static Property<Duration> duration(String name) {
-+        return new DurationProperty(name);
-+    }
-+
-+    static Property<Duration> duration(String name, Duration def) {
-+        return new DurationProperty(name, def);
-+    }
-+
-+    static Property<Duration> durationSec(String name) {
-+        return new DurationInSecondsProperty(name);
-+    }
-+
-+    static Property<Duration> durationSec(String name, Duration def) {
-+        return new DurationInSecondsProperty(name, def);
-+    }
-+
-+    static Property<Charset> charset(String name) {
-+        return new CharsetProperty(name);
-+    }
-+
-+    static Property<Charset> charset(String name, Charset def) {
-+        return new CharsetProperty(name, def);
-+    }
-+
-+    static Property<Object> object(String name) {
-+        return new ObjectProperty(name);
-+    }
-+
-+    static Property<Object> object(String name, Object def) {
-+        return new ObjectProperty(name, def);
-+    }
-+
-+    static <T> Property<T> validating(Property<T> prop, Consumer<T> validator) {
-+        return new Validating<>(prop, validator);
-+    }
-+
-+    abstract class BaseProperty<T> implements Property<T> {
-+
-+        private final String name;
-+        private final T defaultValue;
-+
-+        public BaseProperty(String name) {
-+            this(name, null);
-+        }
-+
-+        public BaseProperty(String name, T defaultValue) {
-+            this.name = Objects.requireNonNull(name, "No name provided");
-+            this.defaultValue = defaultValue;
-+        }
-+
-+        @Override
-+        public String getName() {
-+            return name;
-+        }
-+
-+        @Override
-+        public Optional<T> getDefault() {
-+            return Optional.ofNullable(defaultValue);
-+        }
-+
-+        @Override
-+        public T getRequiredDefault() {
-+            return getDefault().get();
-+        }
-+
-+        @Override
-+        public Optional<T> get(PropertyResolver resolver) {
-+            Object propValue = PropertyResolverUtils.resolvePropertyValue(resolver, name);
-+            return propValue != null ? Optional.of(fromStorage(propValue)) : getDefault();
-+        }
-+
-+        @Override
-+        public T getRequired(PropertyResolver resolver) {
-+            return get(resolver).get();
-+        }
-+
-+        @Override
-+        public T getOrNull(PropertyResolver resolver) {
-+            return get(resolver).orElse(null);
-+        }
-+
-+        @Override
-+        public void set(PropertyResolver resolver, T value) {
-+            PropertyResolverUtils.updateProperty(resolver, name, toStorage(value));
-+        }
-+
-+        @Override
-+        public void remove(PropertyResolver resolver) {
-+            PropertyResolverUtils.updateProperty(resolver, name, null);
-+        }
-+
-+        protected Object toStorage(T value) {
-+            return value;
-+        }
-+
-+        protected abstract T fromStorage(Object value);
-+
-+        @Override
-+        public String toString() {
-+            return "Property" + name + "";
-+        }
-+    }
-+
-+    class DurationProperty extends BaseProperty<Duration> {
-+

_service:tar_scm:CVE-2021-30129-2.patch Deleted

@@ -1,161 +0,0 @@
-From 5b5bd1dcfa0c2fc250e079e1ebcd643b51f735eb Mon Sep 17 00:00:00 2001
-From: Lyor Goldstein <lgoldstein@apache.org>
-Date: Fri, 26 Feb 2021 06:54:43 +0200
-Subject: PATCH SSHD-1125 Added option to require immediate close of
- channel in command ExitCallback invocation
-
----
- .../org/apache/sshd/server/ExitCallback.java  | 27 +++++++++++++++++--
- .../sshd/server/channel/ChannelSession.java   | 10 +++----
- .../sshd/util/test/BogusExitCallback.java     | 12 ++++++---
- .../server/subsystem/sftp/SftpSubsystem.java  |  6 +++--
- 4 files changed, 43 insertions(+), 12 deletions(-)
-
-diff --git a/sshd-core/src/main/java/org/apache/sshd/server/ExitCallback.java b/sshd-core/src/main/java/org/apache/sshd/server/ExitCallback.java
-index dfa55be..eb1bca1 100644
---- a/sshd-core/src/main/java/org/apache/sshd/server/ExitCallback.java
-+++ b/sshd-core/src/main/java/org/apache/sshd/server/ExitCallback.java
-@@ -30,7 +30,17 @@ public interface ExitCallback {
-      * @param exitValue the exit value
-      */
-     default void onExit(int exitValue) {
--        onExit(exitValue, "");
-+        onExit(exitValue, false);
-+    }
-+
-+    /**
-+     * Informs the SSH server that the shell has exited
-+     *
-+     * @param exitValue        the exit value
-+     * @param closeImmediately whether to also terminate the channel immediately or do a graceful close.
-+     */
-+    default void onExit(int exitValue, boolean closeImmediately) {
-+        onExit(exitValue, "", closeImmediately);
-     }
- 
-     /**
-@@ -39,5 +49,18 @@ public interface ExitCallback {
-      * @param exitValue   the exit value
-      * @param exitMessage exit value description
-      */
--    void onExit(int exitValue, String exitMessage);
-+    default void onExit(int exitValue, String exitMessage) {
-+        onExit(exitValue, exitMessage, false);
-+    }
-+
-+    /**
-+     *
-+     * Informs the SSH client/server that the shell has exited
-+     *
-+     * @param exitValue        the exit value
-+     * @param exitMessage      exit value description
-+     * @param closeImmediately whether to also terminate the channel immediately or do a graceful close.
-+     */
-+    void onExit(int exitValue, String exitMessage, boolean closeImmediately);
-+
- }
-diff --git a/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java b/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
-index e54e0e4..484b4f0 100644
---- a/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
-+++ b/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
-@@ -684,9 +684,9 @@ public class ChannelSession extends AbstractServerChannel {
-             tempBuffer = null;
-             doWriteData(buffer.array(), buffer.rpos(), buffer.available());
-         }
--        command.setExitCallback((exitValue, exitMessage) -> {
-+        command.setExitCallback((exitValue, exitMessage, closeImmediately) -> {
-             try {
--                closeShell(exitValue);
-+                closeShell(exitValue, closeImmediately);
-                 if (log.isDebugEnabled()) {
-                     log.debug("onExit({}) code={} message='{}' shell closed", ChannelSession.this, exitValue, exitMessage);
-                 }
-@@ -798,9 +798,9 @@ public class ChannelSession extends AbstractServerChannel {
-         return env;
-     }
- 
--    protected void closeShell(int exitValue) throws IOException {
-+    protected void closeShell(int exitValue, boolean closeImmediately) throws IOException {
-         if (log.isDebugEnabled()) {
--            log.debug("closeShell({}) exit code={}", this, exitValue);
-+            log.debug("closeShell({}) exit code={}, immediate={}", this, exitValue, closeImmediately);
-         }
- 
-         if (!isClosing()) {
-@@ -810,7 +810,7 @@ public class ChannelSession extends AbstractServerChannel {
-             sendEof();
-             sendExitStatus(exitValue);
-             commandExitFuture.setClosed();
--            close(false);
-+            close(closeImmediately);
-         } else {
-             commandExitFuture.setClosed();
-         }
-diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/BogusExitCallback.java b/sshd-core/src/test/java/org/apache/sshd/util/test/BogusExitCallback.java
-index a4f1ff6..9de602a 100644
---- a/sshd-core/src/test/java/org/apache/sshd/util/test/BogusExitCallback.java
-+++ b/sshd-core/src/test/java/org/apache/sshd/util/test/BogusExitCallback.java
-@@ -25,21 +25,23 @@ public class BogusExitCallback implements ExitCallback {
-     private boolean exited;
-     private int exitValue;
-     private String exitMessage;
-+    private boolean closeImmediately;
- 
-     public BogusExitCallback() {
-         super();
-     }
- 
-     @Override
--    public void onExit(int exitValue) {
--        onExit(exitValue, String.valueOf(exitValue));
-+    public void onExit(int exitValue, boolean closeImmediately) {
-+        onExit(exitValue, String.valueOf(exitValue), closeImmediately);
-     }
- 
-     @Override
--    public void onExit(int exitValue, String exitMessage) {
-+    public void onExit(int exitValue, String exitMessage, boolean closeImmediately) {
-         this.exited = true;
-         this.exitValue = exitValue;
-         this.exitMessage = exitMessage;
-+        this.closeImmediately = closeImmediately;
-     }
- 
-     public boolean isExited() {
-@@ -53,4 +55,8 @@ public class BogusExitCallback implements ExitCallback {
-     public String getExitMessage() {
-         return exitMessage;
-     }
-+
-+    public boolean isCloseImmediately() {
-+        return closeImmediately;
-+    }
- }
-diff --git a/sshd-sftp/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java b/sshd-sftp/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java
-index 66a0ced..c18b55e 100644
---- a/sshd-sftp/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java
-+++ b/sshd-sftp/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java
-@@ -299,6 +299,7 @@ public class SftpSubsystem
- 
-     @Override
-     public void run() {
-+        int exitCode = 0;
-         try {
-             while (true) {
-                 Buffer buffer = requests.take();
-@@ -318,10 +319,11 @@ public class SftpSubsystem
-                 if (log.isDebugEnabled()) {
-                     log.debug("run(" + session + ") caught exception details", t);
-                 }
-+		exitCode = -1;
-             }
-         } finally {
-             closeAllHandles();
--            callback.onExit(0);
-+	    callback.onExit(exitCode, exitCode != 0);
-         }
-     }
- 
--- 
-2.27.0
-

_service:tar_scm:CVE-2021-30129-3.patch Deleted

@@ -1,408 +0,0 @@
-From f9b2f236e6a663011b50bd7e9a41ec90e6b94831 Mon Sep 17 00:00:00 2001
-From: Lyor Goldstein <lgoldstein@apache.org>
-Date: Thu, 25 Feb 2021 21:05:49 +0200
-Subject: PATCH SSHD-1125 Added mechanism to throttle pending write
- requests in BufferedIoOutputStream
-
----
- .../channel/BufferedIoOutputStream.java       | 187 ++++++++++++++++--
- .../SshChannelBufferedOutputException.java    |  41 ++++
- .../sshd/core/CoreModuleProperties.java       |  19 ++
- .../sshd/util/test/AsyncEchoShellFactory.java |  13 +-
- .../server/subsystem/sftp/SftpSubsystem.java  |   3 +-
- 5 files changed, 243 insertions(+), 20 deletions(-)
- create mode 100644 sshd-core/src/main/java/org/apache/sshd/common/channel/exception/SshChannelBufferedOutputException.java
-
-diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java
-index 1cb75aa..c95a449 100644
---- a/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java
-+++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java
-@@ -20,29 +20,55 @@ package org.apache.sshd.common.channel;
- 
- import java.io.EOFException;
- import java.io.IOException;
-+import java.time.Duration;
-+import java.util.Objects;
- import java.util.Queue;
- import java.util.concurrent.ConcurrentLinkedQueue;
-+import java.util.concurrent.atomic.AtomicInteger;
-+import java.util.concurrent.atomic.AtomicLong;
- import java.util.concurrent.atomic.AtomicReference;
- 
- import org.apache.sshd.common.Closeable;
-+import org.apache.sshd.common.PropertyResolver;
-+import org.apache.sshd.common.channel.exception.SshChannelBufferedOutputException;
- import org.apache.sshd.common.future.SshFutureListener;
- import org.apache.sshd.common.io.IoOutputStream;
- import org.apache.sshd.common.io.IoWriteFuture;
-+import org.apache.sshd.common.util.GenericUtils;
-+import org.apache.sshd.common.util.ValidateUtils;
- import org.apache.sshd.common.util.buffer.Buffer;
- import org.apache.sshd.common.util.closeable.AbstractInnerCloseable;
-+import org.apache.sshd.core.CoreModuleProperties;
- 
- /**
-  * An {@link IoOutputStream} capable of queuing write requests
-  */
- public class BufferedIoOutputStream extends AbstractInnerCloseable implements IoOutputStream {
-+    protected final Object id;
-+    protected final int channelId;
-+    protected final int maxPendingBytesCount;
-+    protected final Duration maxWaitForPendingWrites;
-     protected final IoOutputStream out;
-+    protected final AtomicInteger pendingBytesCount = new AtomicInteger();
-+    protected final AtomicLong writtenBytesCount = new AtomicLong();
-     protected final Queue<IoWriteFutureImpl> writes = new ConcurrentLinkedQueue<>();
-     protected final AtomicReference<IoWriteFutureImpl> currentWrite = new AtomicReference<>();
--    protected final Object id;
-+    protected final AtomicReference<SshChannelBufferedOutputException> pendingException = new AtomicReference<>();
- 
--    public BufferedIoOutputStream(Object id, IoOutputStream out) {
--        this.out = out;
--        this.id = id;
-+    public BufferedIoOutputStream(Object id, int channelId, IoOutputStream out, PropertyResolver resolver) {
-+        this(id, channelId, out, CoreModuleProperties.BUFFERED_IO_OUTPUT_MAX_PENDING_WRITE_SIZE.getRequired(resolver),
-+             CoreModuleProperties.BUFFERED_IO_OUTPUT_MAX_PENDING_WRITE_WAIT.getRequired(resolver));
-+    }
-+
-+    public BufferedIoOutputStream(
-+                                  Object id, int channelId, IoOutputStream out, int maxPendingBytesCount,
-+				  Duration maxWaitForPendingWrites) {
-+        this.id = Objects.requireNonNull(id, "No stream identifier provided");
-+	this.channelId = channelId;
-+	this.out = Objects.requireNonNull(out, "No delegate output stream provided");
-+	this.maxPendingBytesCount = maxPendingBytesCount;
-+	ValidateUtils.checkTrue(maxPendingBytesCount > 0, "Invalid max. pending bytes count: %d", maxPendingBytesCount);
-+	this.maxWaitForPendingWrites = Objects.requireNonNull(maxWaitForPendingWrites, "No max. pending time value provided");
-     }
- 
-     public Object getId() {
-@@ -52,26 +78,114 @@ public class BufferedIoOutputStream extends AbstractInnerCloseable implements Io
-     @Override
-     public IoWriteFuture writePacket(Buffer buffer) throws IOException {
-         if (isClosing()) {
--            throw new EOFException("Closed");
-+            throw new EOFException("Closed/ing - state=" + state);
-         }
- 
-+	waitForAvailableWriteSpace(buffer.available());
-+
-         IoWriteFutureImpl future = new IoWriteFutureImpl(getId(), buffer);
-         writes.add(future);
-         startWriting();
-         return future;
-     }
- 
-+    protected void waitForAvailableWriteSpace(int requiredSize) throws IOException {
-+        /*
-+	 * NOTE: this code allows a single pending write to give this mechanism "the slip" and
-+	 * exit the loop "unscathed" even though there is a pending exception. However, the goal
-+	 * here is to avoid an OOM by having an unlimited accumulation of pending write requests
-+	 * due to fact that the peer is not consuming the sent data. Please note that the pending
-+	 * exception is "sticky" - i.e., the next write attempt will fail. This also means that if
-+	 * the write request that "got away" was the last one by chance and it was consumed by the
-+	 * peer there will be no exception thrown - which is also fine since as mentioned the goal
-+	 * is not to enforce a strict limit on the pending bytes size but rather on the accumulation
-+	 * of the pending write requests.
-+	 *
-+	 * We could have counted pending requests rather than bytes. However, we also want to avoid
-+	 * having a large amount of data pending consumption by the peer as well. This code strikes
-+	 * such a balance by allowing a single pending request to exceed the limit, but at the same
-+	 * time prevents too many bytes from pending by having a bunch of pending requests that while
-+	 * below the imposed number limit may cumulatively represent a lot of pending bytes.
-+	 */
-+
-+        long expireTime = System.currentTimeMillis() + maxWaitForPendingWrites.toMillis();
-+	synchronized (pendingBytesCount) {
-+            for (int count = pendingBytesCount.get();
-+                 /*
-+		  * The (count > 0) condition is put in place to allow a single pending
-+		  * write to exceed the maxPendingBytesCount as long as there are no
-+		  * other pending ones.
-+		  */
-+                 (count > 0)
-+                         // Not already over the limit or about to be over it
-+			 && ((count + requiredSize) > maxPendingBytesCount)
-+			 // No pending exception signaled
-+			 && (pendingException.get() == null);
-+                 count = pendingBytesCount.get()) {
-+                long remTime = expireTime - System.currentTimeMillis();
-+		if (remTime <= 0L) {
-+                    pendingException.compareAndSet(null,
-+                            new SshChannelBufferedOutputException(
-+                                    channelId,
-+				    "Max. pending write timeout expired after " + writtenBytesCount + " bytes"));
-+                    throw pendingException.get();
-+                }
-+
-+                try {
-+                    pendingBytesCount.wait(remTime);
-+		} catch (InterruptedException e) {
-+                    pendingException.compareAndSet(null,
-+                            new SshChannelBufferedOutputException(
-+                                    channelId,
-+				    "Waiting for pending writes interrupted after " + writtenBytesCount + " bytes"));
-+                    throw pendingException.get();
-+                }
-+            }
-+
-+	    IOException e = pendingException.get();
-+	    if (e != null) {
-+                throw e;
-+            }
-+
-+	    pendingBytesCount.addAndGet(requiredSize);
-+        }
-+    }
-+
-     protected void startWriting() throws IOException {
-         IoWriteFutureImpl future = writes.peek();
-+	// No more pending requests
-         if (future == null) {
-             return;
-         }
- 
-+	// Don't try to write any further if pending exception signaled
-+	Throwable pendingError = pendingException.get();
-+	if (pendingError != null) {
-+            log.error("startWriting({}){} propagate to {} write requests pending error={}{}",
-+                    getId(), out, writes.size(), getClass().getSimpleName(), pendingError.getMessage());
-+
-+	    IoWriteFutureImpl currentFuture = currentWrite.getAndSet(null);
-+	    for (IoWriteFutureImpl pendingWrite : writes) {
-+                // Checking reference by design
-+		if (GenericUtils.isSameReference(pendingWrite, currentFuture)) {
-+                    continue;   // will be taken care of when its listener is eventually called
-+                }
-+
-+		future.setValue(pendingError);
-+            }
-+
-+	    writes.clear();
-+	    return;
-+        }
-+
-+	// Cannot honor this request yet since other pending one incomplete
-         if (!currentWrite.compareAndSet(null, future)) {
-             return;
-         }
- 
--        out.writePacket(future.getBuffer()).addListener(new SshFutureListener<IoWriteFuture>() {
-+	Buffer buffer = future.getBuffer();
-+	int bufferSize = buffer.available();
-+        out.writePacket(buffer).addListener(new SshFutureListener<IoWriteFuture>() {
-             @Override
-             public void operationComplete(IoWriteFuture f) {
-                 if (f.isWritten()) {
-@@ -79,32 +193,71 @@ public class BufferedIoOutputStream extends AbstractInnerCloseable implements Io
-                 } else {
-                     future.setValue(f.getException());

_service:tar_scm:apache-sshd-javadoc.patch Added

@@ -0,0 +1,241 @@
+--- apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/client/auth/password/PasswordIdentityProvider.java	2022-11-16 09:50:02.519293210 +0100
++++ apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/client/auth/password/PasswordIdentityProvider.java	2022-11-16 10:29:30.819501234 +0100
+@@ -36,7 +36,7 @@
+ public interface PasswordIdentityProvider {
+ 
+     /**
+-     * An &quot;empty&quot implementation of {@link PasswordIdentityProvider} that returns an empty group of passwords
++     * An &quot;empty&quot; implementation of {@link PasswordIdentityProvider} that returns an empty group of passwords
+      */
+     PasswordIdentityProvider EMPTY_PASSWORDS_PROVIDER = new PasswordIdentityProvider() {
+         @Override
+--- apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/config/keys/KeyUtils.java	2022-11-16 09:50:02.523293237 +0100
++++ apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/config/keys/KeyUtils.java	2022-11-16 10:21:06.704044979 +0100
+@@ -754,7 +754,7 @@
+      * @param  expected The expected fingerprint if {@code null} or empty then returns a failure with the default
+      *                  fingerprint.
+      * @param  key      the {@link PublicKey} - if {@code null} then returns null.
+-     * @return          SimpleImmutableEntry<Boolean, String> - key is success indicator, value is actual fingerprint,
++     * @return          SimpleImmutableEntry&lt;Boolean, String&gt; - key is success indicator, value is actual fingerprint,
+      *                  {@code null} if no key.
+      * @see             #getDefaultFingerPrintFactory()
+      * @see             #checkFingerPrint(String, Factory, PublicKey)
+@@ -768,7 +768,7 @@
+      *                  fingerprint.
+      * @param  f        The {@link Factory} to be used to generate the default {@link Digest} for the key
+      * @param  key      the {@link PublicKey} - if {@code null} then returns null.
+-     * @return          SimpleImmutableEntry<Boolean, String> - key is success indicator, value is actual fingerprint,
++     * @return          SimpleImmutableEntry&lt;Boolean, String&gt; - key is success indicator, value is actual fingerprint,
+      *                  {@code null} if no key.
+      */
+     public static SimpleImmutableEntry<Boolean, String> checkFingerPrint(
+@@ -781,7 +781,7 @@
+      *                  fingerprint.
+      * @param  d        The {@link Digest} to be used to generate the default fingerprint for the key
+      * @param  key      the {@link PublicKey} - if {@code null} then returns null.
+-     * @return          SimpleImmutableEntry<Boolean, String> - key is success indicator, value is actual fingerprint,
++     * @return          SimpleImmutableEntry&lt;Boolean, String&gt; - key is success indicator, value is actual fingerprint,
+      *                  {@code null} if no key.
+      */
+     public static SimpleImmutableEntry<Boolean, String> checkFingerPrint(String expected, Digest d, PublicKey key) {
+--- apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParser.java	2022-11-16 09:50:02.523293237 +0100
++++ apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParser.java	2022-11-16 10:27:11.094543153 +0100
+@@ -63,9 +63,7 @@
+ import org.apache.sshd.common.util.security.SecurityUtils;
+ 
+ /**
+- * Basic support for <A HREF=
+- * "http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL.key?rev=1.1&content-type=text/x-cvsweb-markup">OpenSSH
+- * key file(s)</A>
++ * Basic support for <A HREF="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL.key?rev=1.1&amp;content-type=text/x-cvsweb-markup">OpenSSH key file(s)</A>
+  *
+  * @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
+  */
+--- apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/buffer/keys/BufferPublicKeyParser.java	2022-11-16 09:50:02.531293291 +0100
++++ apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/buffer/keys/BufferPublicKeyParser.java	2022-11-16 10:07:03.290271908 +0100
+@@ -64,13 +64,13 @@
+                     SkED25519BufferPublicKeyParser.INSTANCE));
+ 
+     /**
+-     * @param  keyType The key type - e.g., &quot;ssh-rsa&quot, &quot;ssh-dss&quot;
++     * @param  keyType The key type - e.g., &quot;ssh-rsa&quot;, &quot;ssh-dss&quot;
+      * @return         {@code true} if this key type is supported by the parser
+      */
+     boolean isKeyTypeSupported(String keyType);
+ 
+     /**
+-     * @param  keyType                  The key type - e.g., &quot;ssh-rsa&quot, &quot;ssh-dss&quot;
++     * @param  keyType                  The key type - e.g., &quot;ssh-rsa&quot;, &quot;ssh-dss&quot;
+      * @param  buffer                   The {@link Buffer} containing the encoded raw public key
+      * @return                          The decoded {@link PublicKey}
+      * @throws GeneralSecurityException If failed to generate the key
+--- apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/GenericUtils.java	2022-11-16 09:50:02.527293266 +0100
++++ apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/GenericUtils.java	2022-11-16 10:17:14.006452121 +0100
+@@ -112,10 +112,11 @@
+      * @param  with String to replace with
+      * @param  max  maximum number of values to replace, or <code>-1</code> if no maximum
+      * @return      the text with any replacements processed
+-     * @author      Arnout J. Kuiper <a href="mailto:ajkuiper@wxs.nl">ajkuiper@wxs.nl</a>
+-     * @author      Magesh Umasankar
+-     * @author      <a href="mailto:bruce@callenish.com">Bruce Atherton</a>
+-     * @author      <a href="mailto:levylambert@tiscali-dsl.de">Antoine Levy-Lambert</a>
++     *
++     * author      Arnout J. Kuiper <a href="mailto:ajkuiper@wxs.nl">ajkuiper@wxs.nl</a>
++     * author      Magesh Umasankar
++     * author      <a href="mailto:bruce@callenish.com">Bruce Atherton</a>
++     * author      <a href="mailto:levylambert@tiscali-dsl.de">Antoine Levy-Lambert</a>
+      */
+     @SuppressWarnings("PMD.AssignmentInOperand")
+     public static String replace(String text, String repl, String with, int max) {
+--- apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/io/der/DERWriter.java	2022-11-16 09:50:02.531293291 +0100
++++ apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/io/der/DERWriter.java	2022-11-16 10:09:10.435142161 +0100
+@@ -76,7 +76,7 @@
+     }
+ 
+     /**
+-     * The integer is always considered to be positive, so if the first byte is < 0, we pad with a zero to make it
++     * The integer is always considered to be positive, so if the first byte is &lt; 0, we pad with a zero to make it
+      * positive
+      *
+      * @param  bytes       {@link BigInteger} bytes
+@@ -87,7 +87,7 @@
+     }
+ 
+     /**
+-     * The integer is always considered to be positive, so if the first byte is < 0, we pad with a zero to make it
++     * The integer is always considered to be positive, so if the first byte is &lt; 0, we pad with a zero to make it
+      * positive
+      *
+      * @param  bytes       {@link BigInteger} bytes
+--- apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/OsUtils.java	2022-11-16 09:50:02.527293266 +0100
++++ apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/OsUtils.java	2022-11-16 10:28:23.527039819 +0100
+@@ -165,7 +165,7 @@
+     }
+ 
+     /**
+-     * Remove {@code Windows} domain and/or group prefix as well as &quot;(User);&quot suffix
++     * Remove {@code Windows} domain and/or group prefix as well as &quot;(User);&quot; suffix
+      *
+      * @param  user The original username - ignored if {@code null}/empty
+      * @return      The canonical user - unchanged if {@code Unix} O/S
+--- apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/security/SecurityUtils.java	2022-11-16 09:50:02.535293319 +0100
++++ apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/security/SecurityUtils.java	2022-11-16 10:31:13.564205742 +0100
+@@ -119,7 +119,7 @@
+     /**
+      * The min. key size value used for testing whether Diffie-Hellman Group Exchange is supported or not. According to
+      * <A HREF="https://tools.ietf.org/html/rfc4419">RFC 4419</A> section 3: &quot;Servers and clients SHOULD support
+-     * groups with a modulus length of k bits, where 1024 <= k <= 8192&quot;. </code>
++     * groups with a modulus length of k bits, where 1024 &lt;= k &lt;= 8192&quot;. </code>
+      *
+      * <B>Note: this has been amended by <A HREF="https://tools.ietf.org/html/rfc8270">RFC 8270</A>
+      */
+--- apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/client/session/ClientProxyConnector.java	2022-11-16 09:50:02.571293565 +0100
++++ apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/client/session/ClientProxyConnector.java	2022-11-16 10:28:51.175229400 +0100
+@@ -23,8 +23,8 @@
+ 
+ /**
+  * Provides a way to implement proxied connections where some metadata about the client is sent <U>before</U> the actual
+- * SSH protocol is executed - e.g., the <A HREF=@http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt">PROXY
+- * protocol</A>. The implementor should use the {@code IoSession#write(Buffer)} method to send any packets with the
++ * SSH protocol is executed - e.g., the <A HREF="http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt">PROXY protocol</A>. 
++ * The implementor should use the {@code IoSession#write(Buffer)} method to send any packets with the
+  * meta-data.
+  *
+  * @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
+--- apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/BaseBuilder.java	2022-11-16 09:50:02.575293593 +0100
++++ apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/BaseBuilder.java	2022-11-16 10:04:31.529233186 +0100
+@@ -67,7 +67,7 @@
+ 
+     /**
+      * The default {@link BuiltinCiphers} setup in order of preference as specified by
+-     * <A HREF="https://www.freebsd.org/cgi/man.cgi?query=ssh_config&sektion=5">ssh_config(5)</A>
++     * <A HREF="https://www.freebsd.org/cgi/man.cgi?query=ssh_config&amp;sektion=5">ssh_config(5)</A>
+      */
+     public static final List<BuiltinCiphers> DEFAULT_CIPHERS_PREFERENCE = Collections.unmodifiableList(
+             Arrays.asList(
+@@ -83,7 +83,7 @@
+ 
+     /**
+      * The default {@link BuiltinDHFactories} setup in order of preference as specified by
+-     * <A HREF="https://www.freebsd.org/cgi/man.cgi?query=ssh_config&sektion=5"> ssh_config(5)</A>
++     * <A HREF="https://www.freebsd.org/cgi/man.cgi?query=ssh_config&amp;sektion=5"> ssh_config(5)</A>
+      */
+     public static final List<BuiltinDHFactories> DEFAULT_KEX_PREFERENCE = Collections.unmodifiableList(
+             Arrays.asList(
+@@ -104,7 +104,7 @@
+ 
+     /**
+      * The default {@link BuiltinMacs} setup in order of preference as specified by
+-     * <A HREF="https://www.freebsd.org/cgi/man.cgi?query=ssh_config&sektion=5"> ssh_config(5)</A>
++     * <A HREF="https://www.freebsd.org/cgi/man.cgi?query=ssh_config&amp;sektion=5"> ssh_config(5)</A>
+      */
+     public static final List<BuiltinMacs> DEFAULT_MAC_PREFERENCE = Collections.unmodifiableList(
+             Arrays.asList(
+--- apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/channel/LocalWindow.java	2022-11-16 09:50:02.575293593 +0100
++++ apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/channel/LocalWindow.java	2022-11-16 10:22:11.968492069 +0100
+@@ -51,8 +51,6 @@
+     /**
+      * Initializes the {@link LocalWindow} with the packet and window sizes from the {@code resolver}.
+      *
+-     * @param size       the initial window size
+-     * @param packetSize the peer's advertised maximum packet size
+      * @param resolver   {@PropertyResolver} to access properties
+      */
+     public void init(PropertyResolver resolver) {
+--- apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/KeyExchangeMessageHandler.java	2022-11-16 09:50:02.579293619 +0100
++++ apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/KeyExchangeMessageHandler.java	2022-11-16 10:49:31.567743605 +0100
+@@ -46,7 +46,7 @@
+ /**
+  * Manages SSH message sending during a key exchange. RFC 4253 specifies that during a key exchange, no high-level
+  * messages are to be sent, but a receiver must be able to deal with messages "in flight" until the peer's
+- * {@link SshConstants#SSH_MSG_KEX_INIT} message is received.
++ * {@link SshConstants#SSH_MSG_KEXINIT} message is received.
+  * <p>
+  * Apache MINA sshd queues up high-level messages that threads try to send while a key exchange is ongoing, and sends
+  * them once the key exchange is done. Sending queued messages may make the peer re-trigger a new key exchange, in which
+@@ -154,7 +154,7 @@
+     }
+ 
+     /**

_service Changed

_service:tar_scm:apache-sshd-2.2.0-src.tar.gz Deleted

_service:tar_scm:apache-sshd-2.9.2-src.tar.gz Added