[mina-sshd] branch master updated: [SSHD-1047] Support for SSH jumps (#154)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git The following commit(s) were added to refs/heads/master by this push: new 204c0bc [SSHD-1047] Support for SSH jumps (#154) 204c0bc is described below commit 204c0bc48de5a32c43a3b201f8c739bb38f161f8 Author: Guillaume Nodet AuthorDate: Fri Jul 31 14:55:28 2020 +0200 [SSHD-1047] Support for SSH jumps (#154) --- CHANGES.md | 9 +- docs/proxies.md| 22 ++ .../org/apache/sshd/cli/client/ScpCommandMain.java | 2 +- .../apache/sshd/cli/client/SftpCommandMain.java| 2 +- .../sshd/cli/client/SshClientCliSupport.java | 33 ++- .../org/apache/sshd/cli/client/SshClientMain.java | 2 +- .../apache/sshd/cli/client/ChannelExecMain.java| 2 +- .../config/hosts/ConfigFileHostEntryResolver.java | 22 +- .../hosts/DefaultConfigFileHostEntryResolver.java | 11 +- .../sshd/client/config/hosts/HostConfigEntry.java | 58 +- .../config/hosts/HostConfigEntryResolver.java | 6 +- .../hosts/ConfigFileHostEntryResolverTest.java | 8 +- .../java/org/apache/sshd/client/SshClient.java | 226 +--- .../sshd/client/session/AbstractClientSession.java | 4 + .../sshd/client/session/ClientSessionCreator.java | 14 ++ .../simple/AbstractSimpleClientSessionCreator.java | 15 ++ .../sshd/client/simple/SimpleSessionClient.java| 20 ++ .../java/org/apache/sshd/client/ProxyTest.java | 228 ++--- .../config/hosts/HostConfigEntryResolverTest.java | 4 +- 19 files changed, 550 insertions(+), 138 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 6477914..fc54a85 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,16 +13,17 @@ ## Major code re-factoring * [SSHD-506](https://issues.apache.org/jira/browse/SSHD-506) Added support for AES-GCM ciphers. +* [SSHD-1004](https://issues.apache.org/jira/browse/SSHD-1004) Deprecate DES, RC4 and Blowfish ciphers from default setup. * [SSHD-1034](https://issues.apache.org/jira/browse/SSHD-1034) Rename `org.apache.sshd.common.ForwardingFilter` to `Forwarder`. * [SSHD-1035](https://issues.apache.org/jira/browse/SSHD-1035) Move property definitions to common locations. -* [SSHD-1038](https://issues.apache.org/jira/browse/SSHD-1035) Refactor packages from a module into a cleaner hierarchy. -* [SSHD-1004](https://issues.apache.org/jira/browse/SSHD-1035) Deprecate DES, RC4 and Blowfish ciphers from default setup. +* [SSHD-1038](https://issues.apache.org/jira/browse/SSHD-1038) Refactor packages from a module into a cleaner hierarchy. +* [SSHD-1047](https://issues.apache.org/jira/browse/SSHD-1047) Support for SSH jumps. ## Minor code helpers -* [SSHD-1040](https://issues.apache.org/jira/browse/SSHD-1040) Make server key available after KEX completed. * [SSHD-1030](https://issues.apache.org/jira/browse/SSHD-1030) Added a NoneFileSystemFactory implementation -* [SSHD-1042](https://issues.apache.org/jira/browse/SSHD-1030) Added more callbacks to SftpEventListener +* [SSHD-1042](https://issues.apache.org/jira/browse/SSHD-1042) Added more callbacks to SftpEventListener +* [SSHD-1040](https://issues.apache.org/jira/browse/SSHD-1040) Make server key available after KEX completed. ## Behavioral changes and enhancements diff --git a/docs/proxies.md b/docs/proxies.md new file mode 100644 index 000..4047179 --- /dev/null +++ b/docs/proxies.md @@ -0,0 +1,22 @@ +# Proxies + +## SSH Jumps + +The SSH client can be configured to use SSH jumps. A *jump host* (also known as a *jump server*) is an +intermediary host or an SSH gateway to a remote network, through which a connection can be made to another +host in a dissimilar security zone, for example a demilitarized zone (DMZ). It bridges two dissimilar +security zones and offers controlled access between them. + +Starting from SSHD 2.6.0, the *ProxyJump* host configuration entry is honored when using the `SshClient` +to connect to a host. The `SshClient` built by default reads the `~/.ssh/config` file. The various CLI clients +also honor the `-J` command line option to specify one or more jumps. + +In order to manually configure jumps, you need to build a `HostConfigEntry` with a `proxyJump` and use it +to connect to the server: +``` +ConnectFuture future = client.connect(new HostConfigEntry( +"", host, port, user, +proxyUser + "@" + proxyHost + ":" + proxyPort)); +``` + +The configuration options specified in the configuration file for the jump hosts are also honored. diff --git a/sshd-cli/src/main/java/org/apache/sshd/cli/client/ScpCommandMain.java b/sshd-cli/src/main/java/org/apache/sshd/cli/client/ScpCommandMain.java index a0a842b..a23eff5 100644 --- a/sshd-cli/src/main/java/org/apache/sshd/cli/client/ScpCommandMain.java +++ b/ssh
[mina-sshd] branch master updated: [SSHD-1048] Wrap instead of rethrow IOException in Future
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new ebc5fbd [SSHD-1048] Wrap instead of rethrow IOException in Future
ebc5fbd is described below
commit ebc5fbd8018045d12d7ba9bb511a29b3c045ed08
Author: Guillaume Nodet
AuthorDate: Fri Jul 31 14:56:24 2020 +0200
[SSHD-1048] Wrap instead of rethrow IOException in Future
---
CHANGES.md | 1 +
.../org/apache/sshd/common/future/AbstractSshFuture.java | 14 ++
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index fc54a85..1fe76d1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -32,3 +32,4 @@
* [SSHD-1032](https://issues.apache.org/jira/browse/SSHD-1032) Fix possible
ArrayIndexOutOfBoundsException in ChannelAsyncOutputStream.
* [SSHD-1033](https://issues.apache.org/jira/browse/SSHD-1033) Fix
simultaneous usage of dynamic and local port forwarding.
* [SSHD-1039](https://issues.apache.org/jira/browse/SSHD-1039) Fix support for
some basic options in ssh/sshd cli.
+* [SSHD-1048](https://issues.apache.org/jira/browse/SSHD-1048) Wrap instead of
rethrow IOException in Future.
diff --git
a/sshd-common/src/main/java/org/apache/sshd/common/future/AbstractSshFuture.java
b/sshd-common/src/main/java/org/apache/sshd/common/future/AbstractSshFuture.java
index 48ab284..a0188f1 100644
---
a/sshd-common/src/main/java/org/apache/sshd/common/future/AbstractSshFuture.java
+++
b/sshd-common/src/main/java/org/apache/sshd/common/future/AbstractSshFuture.java
@@ -92,12 +92,6 @@ public abstract class AbstractSshFuture
extends AbstractLog
*
*
*
- * If the result is an {@link IOException} then re-throw it
- *
- *
- *
- *
- *
* If the result is a {@link Throwable} then throw an {@link IOException}
whose cause is the original exception
*
*
@@ -131,13 +125,9 @@ public abstract class AbstractSshFuture extends AbstractLog
if (Throwable.class.isAssignableFrom(actualType)) {
Throwable t = GenericUtils.peelException((Throwable) value);
-if (t != value) {
-value = t;
-actualType = value.getClass();
-}
-if (IOException.class.isAssignableFrom(actualType)) {
-throw (IOException) value;
+if (t instanceof SshException) {
+throw new SshException(((SshException) t).getDisconnectCode(),
t.getMessage(), t);
}
Throwable cause = GenericUtils.resolveExceptionCause(t);
[mina-sshd] branch master updated: [SSHD-1026] Improve build reproductibility (#155)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new f5b2617 [SSHD-1026] Improve build reproductibility (#155)
f5b2617 is described below
commit f5b261742e4f4d2ecc0052f948e88af58bda2b3d
Author: Guillaume Nodet
AuthorDate: Fri Jul 31 23:48:10 2020 +0200
[SSHD-1026] Improve build reproductibility (#155)
---
CHANGES.md | 1 +
pom.xml| 10 --
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 1fe76d1..c2a876d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -28,6 +28,7 @@
## Behavioral changes and enhancements
* [SSHD-1020](https://issues.apache.org/jira/browse/SSHD-1020) SSH connections
getting closed abruptly with timeout exceptions.
+* [SSHD-1026](https://issues.apache.org/jira/browse/SSHD-1026) Improve build
reproductibility.
* [SSHD-1028](https://issues.apache.org/jira/browse/SSHD-1028) Fix
SSH_MSG_DISCONNECT: Too many concurrent connections.
* [SSHD-1032](https://issues.apache.org/jira/browse/SSHD-1032) Fix possible
ArrayIndexOutOfBoundsException in ChannelAsyncOutputStream.
* [SSHD-1033](https://issues.apache.org/jira/browse/SSHD-1033) Fix
simultaneous usage of dynamic and local port forwarding.
diff --git a/pom.xml b/pom.xml
index 568d491..9e7a114 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
org.apache
apache
-15
+23
org.apache.sshd
@@ -81,6 +81,7 @@
${project.basedir}
UTF-8
+
2020-01-01T00:00:00Z
@@ -121,11 +122,7 @@
2.22.2
3.5.0
-
-4.1.0
+4.2.0
6.25.0
@@ -1293,6 +1290,7 @@
true
true
+
${project.build.outputTimestamp}
svn commit: r40266 - in /release/mina/sshd: 2.5.0/ 2.5.1/
Author: gnodet Date: Wed Jul 1 16:41:23 2020 New Revision: 40266 Log: Apache Mina SSHD 2.5.1 release Added: release/mina/sshd/2.5.1/ release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz (with props) release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.asc release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha256 release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha512 release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip (with props) release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip.asc release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip.sha256 release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip.sha512 release/mina/sshd/2.5.1/apache-sshd-2.5.1.pom release/mina/sshd/2.5.1/apache-sshd-2.5.1.pom.asc release/mina/sshd/2.5.1/apache-sshd-2.5.1.pom.sha256 release/mina/sshd/2.5.1/apache-sshd-2.5.1.pom.sha512 release/mina/sshd/2.5.1/apache-sshd-2.5.1.tar.gz (with props) release/mina/sshd/2.5.1/apache-sshd-2.5.1.tar.gz.asc release/mina/sshd/2.5.1/apache-sshd-2.5.1.tar.gz.sha256 release/mina/sshd/2.5.1/apache-sshd-2.5.1.tar.gz.sha512 release/mina/sshd/2.5.1/apache-sshd-2.5.1.zip (with props) release/mina/sshd/2.5.1/apache-sshd-2.5.1.zip.asc release/mina/sshd/2.5.1/apache-sshd-2.5.1.zip.sha256 release/mina/sshd/2.5.1/apache-sshd-2.5.1.zip.sha512 Removed: release/mina/sshd/2.5.0/ Added: release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz == Binary file - no diff available. Propchange: release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz -- svn:mime-type = application/octet-stream Added: release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.asc == --- release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.asc (added) +++ release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.asc Wed Jul 1 16:41:23 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAl71vAYACgkQ7SN4zQmg +jN5o2w//Yj3Hny4V2exl1CXByylSPG6i9Xu9W1KpAvZnrSt80RP3+y0D8XKgSr/6 +MrVcoYSPhQMQCMWnm9T3ZrNKecWVnX8jpkjqQZHflOHwWSEITf2T4hkOxZWNBNIE +0TYFoRnnVNR5mqWA7CTZsdrDJ1epeQVmB3648ICibUHgCsJmy+78GsK4KeTKDsey +DvW7Px2PfCX5BTRe8vW3IPN5V2+CqQsYyeJXywf1+jy6gFclMKwXuHV2aKXhx1ej +YyVEGfBCK2HgL88nhTRxGjIGl0xxlIcvGTkRB/tGnkgtwzgwz+urQRAet5z0YGNQ +qpCvNOol7s65FtNtS7hQdbLWpgssmQHlJlVr7lr91Eytj2njlMwJRJonMmYWCC3l +QOi4UTOuiGJMQuImsYUb7XXnfYM8MrBTw3try591UIrob4MJOTMDwBWibK4iJkf0 +GloD+7ptZ6DPOFkMekldLh8Socy9BDTGg6WBi7pB97JBEx2e0jO5SXr63aE4PwnT +yKdkOVXXG6JDpKkw9/3mEEMeWf5EXqyloLA3fO8yhuWpfEhK/bTJf4Eawgp5AnMD +r/FFvp7ozFor8vE8tKoB+LD41GBXNbwbH4N1DZ4M6aIbTpxBqhBvbibNGwmVzHd+ +XLA6l7CRmUhLV0kq2+J4B9IXz+6KO1GHyBQire3mDIJpKAAEDys= +=J/L9 +-END PGP SIGNATURE- Added: release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha256 == --- release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha256 (added) +++ release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha256 Wed Jul 1 16:41:23 2020 @@ -0,0 +1,2 @@ +./apache-sshd-2.5.1-src.tar.gz: 29499E14 F8FD8729 42592E99 D8FBD0A8 5EADE64C +21D4C758 91304154 0C661F92 Added: release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha512 == --- release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha512 (added) +++ release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha512 Wed Jul 1 16:41:23 2020 @@ -0,0 +1,4 @@ +./apache-sshd-2.5.1-src.tar.gz: 7C88CDC0 92C764EF 13F2C41C 0B5290FC 77AD7B21 +2E6435E8 F6D7E02D 0D182CF2 9F9A7998 AACBBB70 +440B60B8 F675E12C D6995054 74B21977 B3169079 +3E3BE56C Added: release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip == Binary file - no diff available. Propchange: release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip -- svn:mime-type = application/octet-stream Added: release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip.asc == --- release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip.asc (added) +++ release/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip.asc Wed Jul 1 16:41:23 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAl71vAYACgkQ7SN4zQmg +jN5BHA/9G6I65bDILHZvmZJyv9ONYHqUDsjDyhw4OzVCLuagRVrTFCa/OJ2hpdtu +teHRPPnc3XRuKikD3iHufrMB6HWwOHA5w5cibeGu4/RMPRCOM7SOjCC/zHH/xGC0 +KA0oZRcGaAaP81l6rHz/wtj6PRRSNbB6na2W21+TlcxanB2VoIFZIoSTPAYJYsPZ
[mina-site] branch master updated: Update SSHD site for 2.5.1 release and
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-site.git The following commit(s) were added to refs/heads/master by this push: new 660be9a Update SSHD site for 2.5.1 release and 660be9a is described below commit 660be9a12b68546a862d1283b9883def33b623ee Author: Guillaume Nodet AuthorDate: Wed Jul 1 18:49:32 2020 +0200 Update SSHD site for 2.5.1 release and --- config.toml | 2 +- source/downloads-sshd.md | 14 +++--- source/sshd-project/download_2.5.1.md | 19 +++ source/sshd-project/downloads.md | 13 +++-- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/config.toml b/config.toml index 003a1aa..747122f 100644 --- a/config.toml +++ b/config.toml @@ -37,5 +37,5 @@ version_asyncweb = "2.0.0-SNAPSHOT" version_mina_2_0 = "2.0.21" version_mina_2_1 = "2.1.3" version_ftpserver = "1.1.1" -version_sshd = "2.5.0" +version_sshd = "2.5.1" version_vysper = "0.7" diff --git a/source/downloads-sshd.md b/source/downloads-sshd.md index e07ff32..c910c8d 100644 --- a/source/downloads-sshd.md +++ b/source/downloads-sshd.md @@ -4,15 +4,15 @@ title: Downloads # Latest SSHD Releases -The latest release is the SSHD 2.5.0 release. -Apache Mina SSHD 2.5.0 contains a number of [enhancements and bug-fixes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310849=12346915). +The latest release is the SSHD 2.5.1 release. +Apache Mina SSHD 2.5.1 contains a number of [enhancements and bug-fixes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310849=12348440). * Source distributions: -* [Apache Mina SSHD 2.5.0 Sources (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha1) -* [Apache Mina SSHD 2.5.0 Sources (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.sha1) +* [Apache Mina SSHD 2.5.1 Sources (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha1) +* [Apache Mina SSHD 2.5.1 Sources (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip.sha1) * Binary distributions: -* [Apache Mina SSHD 2.5.0 Binary (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.0/dist/apache-sshd-2.5.0.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0.tar.gz.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0.tar.gz.sha1) -* [Apache Mina SSHD 2.5.0 Binary (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.0/dist/apache-sshd-2.5.0.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0.zip.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0.zip.sha1) +* [Apache Mina SSHD 2.5.1 Binary (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.1/dist/apache-sshd-2.5.1.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.5.1/apache-sshd-2.5.1.tar.gz.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.1/apache-sshd-2.5.1.tar.gz.sha1) +* [Apache Mina SSHD 2.5.1 Binary (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.1/dist/apache-sshd-2.5.1.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.5.1/apache-sshd-2.5.1.zip.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.1/apache-sshd-2.5.1.zip.sha1) # Development snapshots @@ -48,4 +48,4 @@ You can [build](sshd-project/building.html) the latest version from [sources](ss * [SSHD 2.2.0](sshd-project/download_2.2.0.html) * [SSHD 2.3.0](sshd-project/download_2.3.0.html) * [SSHD 2.4.0](sshd-project/download_2.4.0.html) -* [SSHD 2.5.0](sshd-project/download_2.5.0.html) +* [SSHD 2.5.1](sshd-project/download_2.5.1.html) diff --git a/source/sshd-project/download_2.5.1.md b/source/sshd-project/download_2.5.1.md new file mode 100644 index 000..000e713 --- /dev/null +++ b/source/sshd-project/download_2.5.1.md @@ -0,0 +1,19 @@ +--- +type: sshd +title: Apache SSHD 2.5.1 Release +--- + +# Overview + +Apache Mina SSHD 2.5.1 contains a number of [enhancements and bug-fixes](https://issues.apache.org/j
svn commit: r40080 - /dev/mina/sshd/2.5.0/
Author: gnodet Date: Thu Jun 18 11:36:28 2020 New Revision: 40080 Log: Staging area for Apache Mina SSHD 2.5.0 Added: dev/mina/sshd/2.5.0/ dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz (with props) dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.asc dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha256 dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha512 dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip (with props) dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.asc dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.sha256 dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.sha512 dev/mina/sshd/2.5.0/apache-sshd-2.5.0.pom dev/mina/sshd/2.5.0/apache-sshd-2.5.0.pom.asc dev/mina/sshd/2.5.0/apache-sshd-2.5.0.pom.sha256 dev/mina/sshd/2.5.0/apache-sshd-2.5.0.pom.sha512 dev/mina/sshd/2.5.0/apache-sshd-2.5.0.tar.gz (with props) dev/mina/sshd/2.5.0/apache-sshd-2.5.0.tar.gz.asc dev/mina/sshd/2.5.0/apache-sshd-2.5.0.tar.gz.sha256 dev/mina/sshd/2.5.0/apache-sshd-2.5.0.tar.gz.sha512 dev/mina/sshd/2.5.0/apache-sshd-2.5.0.zip (with props) dev/mina/sshd/2.5.0/apache-sshd-2.5.0.zip.asc dev/mina/sshd/2.5.0/apache-sshd-2.5.0.zip.sha256 dev/mina/sshd/2.5.0/apache-sshd-2.5.0.zip.sha512 Added: dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz == Binary file - no diff available. Propchange: dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.asc == --- dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.asc (added) +++ dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.asc Thu Jun 18 11:36:28 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAl7rUFkACgkQ7SN4zQmg +jN4o4xAAmxaQYvawNmqGV+K+So7WGxGaYNMr04y7lIajqhGrU76euV4LOqECK+ZW +HtYj84Sm9npkDs0IdG03wD0yOiBFPjIrPw0n3HTPLhRNlAt8NGtdC6L1APPJDCJX +4EYUqi8vbFAefikjitg1Z5Q9dVF98yNZibzJafA3GqxaMWcwqCrGw1X4llUNlDf3 +n3ZMuORkdYMMvb6eGWT0ZQCU3RjZLQ1Z4ifnEbmPs3Xl+SBGcBCpukKmCemq7S1w +BufeFDeOVb1ZnOzwMr6SySP6Bf6lEVCRVhg8J1okj3QvPZi02R7N9eWAAZ+ZG4V9 +rrAvA7kj1lLYjSvJ+j/XRfc2QjNNgucOkxbvOGa0dW9ld2s41KyXVReC6u8tXWgv +/Q00eoSkC0qiWqMRMDunMwTn1tpa8wPh0Sco7tcqKRGpiTLXIPJYKzsxzTHfDTqB +mqlHFo82GMBnTqg+bUZIrBkIliK1oj9OBPAAZQia9eMcu4dquLZFrAy6ONQl496O +qQB724IrBAA44GiXhiDjyo5ZO+rhUQT8K5L6ZSDmwVTzS/M7L/pPwr8TceAHkQBl +u7HQOH98LCn88ev9f9Q4sHROygLIeWTKfOla4U/xukXknF83J0ImUpwwwlMZh8uw +9Hz9+RfysR+sxyzlLoK1ZmOS5I0+6Cb/5EWL0/SXHtHTbDVXmlE= +=qJ4E +-END PGP SIGNATURE- Added: dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha256 == --- dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha256 (added) +++ dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha256 Thu Jun 18 11:36:28 2020 @@ -0,0 +1,2 @@ +./apache-sshd-2.5.0-src.tar.gz: 36EA0617 CC735D2A 997FFE87 971A404E 2EF763D2 +6C32EC7B 3488FDC1 91C73C1B Added: dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha512 == --- dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha512 (added) +++ dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha512 Thu Jun 18 11:36:28 2020 @@ -0,0 +1,4 @@ +./apache-sshd-2.5.0-src.tar.gz: 3D48E953 B7D841E2 9814D6E6 F2E34FDD 8F1ABF52 +B29FC67B 81E85BB2 D696BF8E 696148E2 45554524 +A9DB62B3 4618B91C F078F554 C118AF87 51AF02A6 +3E95A7F7 Added: dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip == Binary file - no diff available. Propchange: dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip -- svn:mime-type = application/octet-stream Added: dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.asc == --- dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.asc (added) +++ dev/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.asc Thu Jun 18 11:36:28 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAl7rUGUACgkQ7SN4zQmg +jN5KLBAAhqbgW2ImltiZfu+CdMfeIEhL6LbH9/0H4GSasVVyUuirxkjxU6dPCG60 +AEoRosNGlYKFuWr5HnYF1u8ySCK6CG0Q0V89xB9kT3tbgRNSq7p9eDsFUapiTmK0 +LTynVajQYcY7sVW9p80aJrzj7pi67eWcXQrUGNKTl/3GjIkwLFsT87E6ORFBwn6U +HER5egKmkt+U8j90TDk4E9UhVTf3ouCN47EQNdFSnQzOF6C2bhz4+RSq+2gk5Tu7 +Tnu8wt7zAci87o1JG+pyszxyoM77CMjx9Mit4UpOOuq2BkDgVNwRXrOYn1Y4d0e+ +xdE77Gt/Fdhc8/EOqHefw0ZCNylwutFDqKWcGUwmqrFArWPK8OvMiWlnowATX/2H
[mina-sshd] branch master updated: [maven-release-plugin] prepare release sshd-2.5.1
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new cd2232d [maven-release-plugin] prepare release sshd-2.5.1
cd2232d is described below
commit cd2232d3848b02dc59f8448bfebbf1d40371295f
Author: Guillaume Nodet
AuthorDate: Fri Jun 26 10:32:01 2020 +0200
[maven-release-plugin] prepare release sshd-2.5.1
---
assembly/pom.xml | 2 +-
pom.xml | 4 ++--
sshd-cli/pom.xml | 2 +-
sshd-common/pom.xml | 2 +-
sshd-contrib/pom.xml | 2 +-
sshd-core/pom.xml| 2 +-
sshd-git/pom.xml | 2 +-
sshd-ldap/pom.xml| 2 +-
sshd-mina/pom.xml| 2 +-
sshd-netty/pom.xml | 2 +-
sshd-openpgp/pom.xml | 2 +-
sshd-osgi/pom.xml| 2 +-
sshd-putty/pom.xml | 2 +-
sshd-scp/pom.xml | 2 +-
sshd-sftp/pom.xml| 2 +-
sshd-spring-sftp/pom.xml | 2 +-
16 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index ecd3ab7..e1ec1d4 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.5.1-SNAPSHOT
+2.5.1
apache-sshd
diff --git a/pom.xml b/pom.xml
index 5aa8816..6f7bd7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.sshd
sshd
-2.5.1-SNAPSHOT
+2.5.1
Apache Mina SSHD
pom
2008
@@ -75,7 +75,7 @@
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
https://github.com/apache/mina-sshd/tree/${project.scm.tag}
-master
+sshd-2.5.1
diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml
index c8864a9..5d41d34 100644
--- a/sshd-cli/pom.xml
+++ b/sshd-cli/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.5.1-SNAPSHOT
+2.5.1
sshd-cli
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index a67bdec..0490f05 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.5.1-SNAPSHOT
+2.5.1
..
diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml
index 3b1f378..c9198b6 100644
--- a/sshd-contrib/pom.xml
+++ b/sshd-contrib/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.5.1-SNAPSHOT
+2.5.1
[mina-sshd] annotated tag sshd-2.5.1 created (now ec070e1)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to annotated tag sshd-2.5.1 in repository https://gitbox.apache.org/repos/asf/mina-sshd.git. at ec070e1 (tag) tagging cd2232d3848b02dc59f8448bfebbf1d40371295f (commit) replaces sshd-2.5.0 by Guillaume Nodet on Fri Jun 26 10:32:18 2020 +0200 - Log - [maven-release-plugin] copy for tag sshd-2.5.1 --- No new revisions were added by this update.
[mina-sshd] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new a5c8f32 [maven-release-plugin] prepare for next development iteration
a5c8f32 is described below
commit a5c8f32d78671c31ee488d0de8b851b2228da865
Author: Guillaume Nodet
AuthorDate: Fri Jun 26 10:32:24 2020 +0200
[maven-release-plugin] prepare for next development iteration
---
assembly/pom.xml | 2 +-
pom.xml | 4 ++--
sshd-cli/pom.xml | 2 +-
sshd-common/pom.xml | 2 +-
sshd-contrib/pom.xml | 2 +-
sshd-core/pom.xml| 2 +-
sshd-git/pom.xml | 2 +-
sshd-ldap/pom.xml| 2 +-
sshd-mina/pom.xml| 2 +-
sshd-netty/pom.xml | 2 +-
sshd-openpgp/pom.xml | 2 +-
sshd-osgi/pom.xml| 2 +-
sshd-putty/pom.xml | 2 +-
sshd-scp/pom.xml | 2 +-
sshd-sftp/pom.xml| 2 +-
sshd-spring-sftp/pom.xml | 2 +-
16 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index e1ec1d4..227b81c 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.5.1
+2.6.0-SNAPSHOT
apache-sshd
diff --git a/pom.xml b/pom.xml
index 6f7bd7d..f7dc2f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.sshd
sshd
-2.5.1
+2.6.0-SNAPSHOT
Apache Mina SSHD
pom
2008
@@ -75,7 +75,7 @@
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
https://github.com/apache/mina-sshd/tree/${project.scm.tag}
-sshd-2.5.1
+master
diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml
index 5d41d34..eec783b 100644
--- a/sshd-cli/pom.xml
+++ b/sshd-cli/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.5.1
+2.6.0-SNAPSHOT
sshd-cli
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index 0490f05..4b9a505 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.5.1
+2.6.0-SNAPSHOT
..
diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml
index c9198b6..a96abf4 100644
--- a/sshd-contrib/pom.xml
+++ b/sshd-contrib/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.5.1
+2.6.0-SNAPSHOT
svn commit: r40188 - in /dev/mina/sshd: 2.5.0/ 2.5.1/
Author: gnodet Date: Fri Jun 26 09:14:36 2020 New Revision: 40188 Log: Mina SSHD 2.5.1 staging repo Added: dev/mina/sshd/2.5.1/ dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz (with props) dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.asc dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha256 dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha512 dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip (with props) dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip.asc dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip.sha256 dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip.sha512 dev/mina/sshd/2.5.1/apache-sshd-2.5.1.pom dev/mina/sshd/2.5.1/apache-sshd-2.5.1.pom.asc dev/mina/sshd/2.5.1/apache-sshd-2.5.1.pom.sha256 dev/mina/sshd/2.5.1/apache-sshd-2.5.1.pom.sha512 dev/mina/sshd/2.5.1/apache-sshd-2.5.1.tar.gz (with props) dev/mina/sshd/2.5.1/apache-sshd-2.5.1.tar.gz.asc dev/mina/sshd/2.5.1/apache-sshd-2.5.1.tar.gz.sha256 dev/mina/sshd/2.5.1/apache-sshd-2.5.1.tar.gz.sha512 dev/mina/sshd/2.5.1/apache-sshd-2.5.1.zip (with props) dev/mina/sshd/2.5.1/apache-sshd-2.5.1.zip.asc dev/mina/sshd/2.5.1/apache-sshd-2.5.1.zip.sha256 dev/mina/sshd/2.5.1/apache-sshd-2.5.1.zip.sha512 Removed: dev/mina/sshd/2.5.0/ Added: dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz == Binary file - no diff available. Propchange: dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.asc == --- dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.asc (added) +++ dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.asc Fri Jun 26 09:14:36 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAl71vAYACgkQ7SN4zQmg +jN5o2w//Yj3Hny4V2exl1CXByylSPG6i9Xu9W1KpAvZnrSt80RP3+y0D8XKgSr/6 +MrVcoYSPhQMQCMWnm9T3ZrNKecWVnX8jpkjqQZHflOHwWSEITf2T4hkOxZWNBNIE +0TYFoRnnVNR5mqWA7CTZsdrDJ1epeQVmB3648ICibUHgCsJmy+78GsK4KeTKDsey +DvW7Px2PfCX5BTRe8vW3IPN5V2+CqQsYyeJXywf1+jy6gFclMKwXuHV2aKXhx1ej +YyVEGfBCK2HgL88nhTRxGjIGl0xxlIcvGTkRB/tGnkgtwzgwz+urQRAet5z0YGNQ +qpCvNOol7s65FtNtS7hQdbLWpgssmQHlJlVr7lr91Eytj2njlMwJRJonMmYWCC3l +QOi4UTOuiGJMQuImsYUb7XXnfYM8MrBTw3try591UIrob4MJOTMDwBWibK4iJkf0 +GloD+7ptZ6DPOFkMekldLh8Socy9BDTGg6WBi7pB97JBEx2e0jO5SXr63aE4PwnT +yKdkOVXXG6JDpKkw9/3mEEMeWf5EXqyloLA3fO8yhuWpfEhK/bTJf4Eawgp5AnMD +r/FFvp7ozFor8vE8tKoB+LD41GBXNbwbH4N1DZ4M6aIbTpxBqhBvbibNGwmVzHd+ +XLA6l7CRmUhLV0kq2+J4B9IXz+6KO1GHyBQire3mDIJpKAAEDys= +=J/L9 +-END PGP SIGNATURE- Added: dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha256 == --- dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha256 (added) +++ dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha256 Fri Jun 26 09:14:36 2020 @@ -0,0 +1,2 @@ +./apache-sshd-2.5.1-src.tar.gz: 29499E14 F8FD8729 42592E99 D8FBD0A8 5EADE64C +21D4C758 91304154 0C661F92 Added: dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha512 == --- dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha512 (added) +++ dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha512 Fri Jun 26 09:14:36 2020 @@ -0,0 +1,4 @@ +./apache-sshd-2.5.1-src.tar.gz: 7C88CDC0 92C764EF 13F2C41C 0B5290FC 77AD7B21 +2E6435E8 F6D7E02D 0D182CF2 9F9A7998 AACBBB70 +440B60B8 F675E12C D6995054 74B21977 B3169079 +3E3BE56C Added: dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip == Binary file - no diff available. Propchange: dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip -- svn:mime-type = application/octet-stream Added: dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip.asc == --- dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip.asc (added) +++ dev/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip.asc Fri Jun 26 09:14:36 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAl71vAYACgkQ7SN4zQmg +jN5BHA/9G6I65bDILHZvmZJyv9ONYHqUDsjDyhw4OzVCLuagRVrTFCa/OJ2hpdtu +teHRPPnc3XRuKikD3iHufrMB6HWwOHA5w5cibeGu4/RMPRCOM7SOjCC/zHH/xGC0 +KA0oZRcGaAaP81l6rHz/wtj6PRRSNbB6na2W21+TlcxanB2VoIFZIoSTPAYJYsPZ +AKhgwgYyElSaHKrox4DntcOA9MbZdMvKokF3BWFuIIJGMbif9hQJNngo1dvDMGAV +2GEfkoKa8skjcQAqqkqeeDJFY3/uiOqX1ZyvF11znB+Tvq+ByA8fv56XZUbv1Mwv +Ob/k4qwHsqxHJBRHncVHEyctzNMDngpkvGmbRKrV1hDWFC54HsRZeesgNmt70cNS +7G2
[mina-sshd] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 2459bc2 [maven-release-plugin] prepare for next development iteration
2459bc2 is described below
commit 2459bc2095ff94ef0df995f0f657e5ff4551fd52
Author: Guillaume Nodet
AuthorDate: Tue Jun 16 16:46:01 2020 +0200
[maven-release-plugin] prepare for next development iteration
---
assembly/pom.xml | 2 +-
pom.xml | 4 ++--
sshd-cli/pom.xml | 2 +-
sshd-common/pom.xml | 2 +-
sshd-contrib/pom.xml | 2 +-
sshd-core/pom.xml| 2 +-
sshd-git/pom.xml | 2 +-
sshd-ldap/pom.xml| 2 +-
sshd-mina/pom.xml| 2 +-
sshd-netty/pom.xml | 2 +-
sshd-openpgp/pom.xml | 2 +-
sshd-osgi/pom.xml| 2 +-
sshd-putty/pom.xml | 2 +-
sshd-scp/pom.xml | 2 +-
sshd-sftp/pom.xml| 2 +-
sshd-spring-sftp/pom.xml | 2 +-
16 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index cbe419a..ecd3ab7 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.5.0
+2.5.1-SNAPSHOT
apache-sshd
diff --git a/pom.xml b/pom.xml
index 177f939..e6fb74c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.sshd
sshd
-2.5.0
+2.5.1-SNAPSHOT
Apache Mina SSHD
pom
2008
@@ -75,7 +75,7 @@
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
https://github.com/apache/mina-sshd/tree/${project.scm.tag}
-sshd-2.5.0
+master
diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml
index 3224e5a..c8864a9 100644
--- a/sshd-cli/pom.xml
+++ b/sshd-cli/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.5.0
+2.5.1-SNAPSHOT
sshd-cli
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index 2f2de57..a67bdec 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.5.0
+2.5.1-SNAPSHOT
..
diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml
index 2df074d..3b1f378 100644
--- a/sshd-contrib/pom.xml
+++ b/sshd-contrib/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.5.0
+2.5.1-SNAPSHOT
[mina-sshd] annotated tag sshd-2.5.0 created (now 2a4b4e2)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to annotated tag sshd-2.5.0 in repository https://gitbox.apache.org/repos/asf/mina-sshd.git. at 2a4b4e2 (tag) tagging 1a1c3b17957a308e1260ad5aaecb12d64de34ff0 (commit) replaces sshd-2.4.0 by Guillaume Nodet on Tue Jun 16 16:45:55 2020 +0200 - Log - [maven-release-plugin] copy for tag sshd-2.5.0 --- No new revisions were added by this update.
[mina-sshd] branch master updated: [maven-release-plugin] prepare release sshd-2.5.0
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 1a1c3b1 [maven-release-plugin] prepare release sshd-2.5.0
1a1c3b1 is described below
commit 1a1c3b17957a308e1260ad5aaecb12d64de34ff0
Author: Guillaume Nodet
AuthorDate: Tue Jun 16 16:40:24 2020 +0200
[maven-release-plugin] prepare release sshd-2.5.0
---
assembly/pom.xml | 2 +-
pom.xml | 4 ++--
sshd-cli/pom.xml | 2 +-
sshd-common/pom.xml | 2 +-
sshd-contrib/pom.xml | 2 +-
sshd-core/pom.xml| 2 +-
sshd-git/pom.xml | 2 +-
sshd-ldap/pom.xml| 2 +-
sshd-mina/pom.xml| 2 +-
sshd-netty/pom.xml | 2 +-
sshd-openpgp/pom.xml | 2 +-
sshd-osgi/pom.xml| 2 +-
sshd-putty/pom.xml | 2 +-
sshd-scp/pom.xml | 2 +-
sshd-sftp/pom.xml| 2 +-
sshd-spring-sftp/pom.xml | 2 +-
16 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7fe39dd..cbe419a 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.4.1-SNAPSHOT
+2.5.0
apache-sshd
diff --git a/pom.xml b/pom.xml
index 537336a..177f939 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.sshd
sshd
-2.4.1-SNAPSHOT
+2.5.0
Apache Mina SSHD
pom
2008
@@ -75,7 +75,7 @@
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
https://github.com/apache/mina-sshd/tree/${project.scm.tag}
-master
+sshd-2.5.0
diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml
index be3df46..3224e5a 100644
--- a/sshd-cli/pom.xml
+++ b/sshd-cli/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.4.1-SNAPSHOT
+2.5.0
sshd-cli
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index 69c6001..2f2de57 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.4.1-SNAPSHOT
+2.5.0
..
diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml
index b79da4c..2df074d 100644
--- a/sshd-contrib/pom.xml
+++ b/sshd-contrib/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.4.1-SNAPSHOT
+2.5.0
svn commit: r40136 - /release/mina/KEYS
Author: gnodet Date: Mon Jun 22 15:09:21 2020 New Revision: 40136 Log: Add new key Modified: release/mina/KEYS Modified: release/mina/KEYS == --- release/mina/KEYS (original) +++ release/mina/KEYS Mon Jun 22 15:09:21 2020 @@ -329,3 +329,65 @@ r+H5qu2PO17BOUrvCwzF5mlvUVvAh+17LEwS4LHY eptjBPBdBR4D5FRolj2Pkckl0kIYtStFPYMGCUrF =1L5F -END PGP PUBLIC KEY BLOCK- +pub rsa4096 2020-06-18 [SC] + DC98 224C 6421 A7A5 BB87 F346 ED23 78CD 09A0 8CDE +uid [ultimate] Guillaume Nodet (CODE SIGNING KEY) +sig 3ED2378CD09A08CDE 2020-06-18 Guillaume Nodet (CODE SIGNING KEY) +sig ECDFEA3CB4493B94 2020-06-18 Guillaume Nodet +sub rsa4096 2020-06-18 [E] +sig ED2378CD09A08CDE 2020-06-18 Guillaume Nodet (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBF7rSgUBEADkkKuARh77nCyorv2LUBebe2i+23AjAN0gkI48HE9dVziQkF3G +LZwUJdgj4vBlkhETv6uMOqdhl06Pl59UYevQ3KGvK96ZNmcjjxBRpV6TkcvO0fcm +68pxPJoNoo+JMD6ppxlpLCgnu45EQCWPHKMJjDEV+rIgbqwtmp9pvG2kjR1KqPKK +VpKCCohTBQwYO/MHAAe5PaVf8e6dKMiJbJB2hAeiOv2zIyl0R1gSu7Qdx86n4Ys3 +LcFUt/Rw61dlLztuKX+ue9QJcPyVv0IZIMG3rKIGOi6enXLa2eQ/HCHQEOI8S2Kg +ZpDCulAzQIA6+6qlH92EsWr+scNQaQcz8WXOk6Ymy+7qqVbXbYn0pw854iIpZ4TM +HK5u6135WE/Owf0ssnUP1QEisGBz/lSOOCrQOTGTSX9X45dYOzxbTEGd21YU8fj/ +9HYC0jR++MOjWhnnWXQHJcG/vL2JRPYS9l08R1e6uj3DPs+XsyBt3PAwukBLj4YR +fVy5VZk5pUX7vy5Kr2QA5HmRAaRWd0UY+kwxm9/cOytGulTRGQE0DTesHdUZLkQU +qt3yH7gH29vkTmrNiTyTk641ByCTh8TUTPqaPnift+HvR3w94Xj/fBqaM7/GzoNF +Kmw/Z2s0B7lqfVTinEKW7OJDumE+SBIdrY2PRgAqb+nB/aUU/aSV/r7q8QARAQAB +tDVHdWlsbGF1bWUgTm9kZXQgKENPREUgU0lHTklORyBLRVkpIDxnbm9kZXRAZ21h +aWwuY29tPokCTgQTAQoAOBYhBNyYIkxkIaelu4fzRu0jeM0JoIzeBQJe60oFAhsD +BQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEO0jeM0JoIzeP+EP/1p6n+kwxWe/ +COznthJo64ylhzw+yrM/aLOf5MLYN4DglMWIT+bz4UlolNa0uiybMgwbiZUY3XuL +4s3jGixubroPy2cUEyvACemDdXIs3PZdvAMNhIDXikI1a4++87nFGBBDVOtoJlUv +8z5FAWGZ4gKFGcNuEsIjYj/5KyrM+U9g/5YfPtu7kfNFxd87jINSsKOODa3ziJCh +vX9ieCiFXtDZ79LPpRAr5H6OqxXzUwp0fRePh/UiGsK2zVgcZNQt3KdxU3+lkeAR +SPTaBm8eNCJUOE5/kMBWd2J/gOanMFnFoldM4oentyBffdKjTCxLscbJFsd+ABrn +ncoCETDiLLA3jfSVLydWzhaSs65T9DTnPszcFtsqJfOHvOJ1FfZy/apQO6Np/M8S +zuhVqdgeFpZKf1MzhgzSq5kykombICaChE0OiLphE7DMoz+ec6N61chNwm4AUJhD +z+hdFTavoWoTacN1QS/FoSSx567kDlaIKg5jcH0jGFynYSeTcy4VoyW3aDN6COtR +4FWsaQ1r7ffiQMoJj1GMcxmXv+YevVZm9h+8ZwUVagToysMOu4G1dHsTa6TAj1QK +dXbONtZhhrAXlQWFKORzJnZ3puKwPwHjBBGEdCLIpvzbCTRybFWJOVctwHsrxu8l +ANs3cCApa1ulT6EqGpiC0WHCUQ4AVxe8iF0EEBEKAB0WIQTqI9sTYNkClIHn8u/s +3+o8tEk7lAUCXutK3AAKCRDs3+o8tEk7lBxeAJ961NytOloqJMoMFThPZE4rh93x +jgCgnAZ7Qt33IkKo20XqSmO1blOgl+q5Ag0EXutKBQEQAME/JKyxLTnH8Isw+5jo +nU1YS0AcC7aDxGl4tiVKo9r/oVfq0+mdCxng89RPRn+7lUe4xWmdwt/eis/BLacW +ejb4+1dA/RliMhoPjwK5OnelXMBANJfckYP02jPhLlldQIyxKkUVUgpoDuuEGgYq +FGStSDyZaPoGxHJbNzt9sjwlx3rodU9HOfaIYJ8ZI+awD5DfVPMf4tiGP8/ZFss8 +qe181iF4pPmvlF/t8BNZR9nbMn4pBSWalD7cnOSP2wqEAJRLUAfI+J7Qb/9uK2Bu +uO4UEVFJvSXrSJ8EKtbcVUmf+rVp8lGc0t61y/m53ExIXfQLUITflg3+Atch4cF2 +Tck6EHc60gy3YMxikXIqqXkBc1slnW4c0Ia0lXsnW1yRDLekyGKi1SrotoAIpbRj +bceRr32aQ2GVwsIPGECK86F0cmQ0IIPAV/VWRph/o3u+7MWRjygpL85w6t9HR9xJ +WqPemOjykVEvFtvPfyTusV2XL0K/m3wxeEG/ZdLgbXgJot+UWEMhmbmflghvskQO +rgpfXXggCEN9FVWN1xENN0Y2yaikvOFvM4hVygy5XXmhWh39zT26IlStGJjzNJjL +83fo8JrW9UbAL5wy61U1hHiY+hCaV4GZtXCszSLqVnoan/LJszNYJSG9NFuUaYjC +QtbXhfcpsDejyo/qd5p/kz/bABEBAAGJAjYEGAEKACAWIQTcmCJMZCGnpbuH80bt +I3jNCaCM3gUCXutKBQIbDAAKCRDtI3jNCaCM3o3eD/0fLl5WSesWt1RbhR2xmMAQ +0AC4ldCxNnsR3BPd72tg4Gjx6O+HoZubjgwLGlY3HLGdM8FbX2nsieBUadkuJcBu +KpMe9cTZTYhjEdxKS+tndSPwScLaK02dI6xMRN77L4h2RS0VoYHc6evWUCS4DsUc +G654wtO8TnkzbMqz3eXaBKyClubRe1sr4HA4FkOqQI483Sngwlr6UTqG0JdbnC1n +GecpNl2gDxMAenl353szFDy7woFpxVsqbDNp3WWfLupakcpLpFjxZ0XC/VKadEpu +3n3cwvB/Dmpzpst4Fz4+2toeEXJdnk+aHjNT+T3Q2CsQF41zRCtsejgHMCRjUfUP +TvxsEGApwFUhY4cO6Inve/JcRTeTcjs6duD7Vf561w6cuj0G7ZUqEtXnJ4XxuZoH +Wp3fTd6RAduqbE2eCDpbKu1NqAweL73q7DNwV+n8C9lI9fiipyAlG+XlXfwREx0A +hpPlbKIRjjMYyLnJiPd3dLY72ktirp9N5EG7t8uMTkzJaZ4qXRLkFEw318XEHGmR +D0488CXWilYvNDXR0PuixKWrcIADu5kOIpF2tLzl/Id2plg5s2nEBe1KHQ576DEc +wsPhV4rB7bKX6TCh4/MrxJndwLtq3W3eeUEIRg+ZMcOhzUVZdQNbN84vE1Pvj1WS +x8r+e54Nkx1FPMjEyKsbPA== +=5N9u +-END PGP PUBLIC KEY BLOCK-
svn commit: r40134 - in /release/mina/sshd: 2.4.0/ 2.5.0/
Author: gnodet Date: Mon Jun 22 15:00:11 2020 New Revision: 40134 Log: Add Apache Mina SSHD 2.5.0 Release Added: release/mina/sshd/2.5.0/ release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz (with props) release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.asc release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha256 release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha512 release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip (with props) release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.asc release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.sha256 release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.sha512 release/mina/sshd/2.5.0/apache-sshd-2.5.0.pom release/mina/sshd/2.5.0/apache-sshd-2.5.0.pom.asc release/mina/sshd/2.5.0/apache-sshd-2.5.0.pom.sha256 release/mina/sshd/2.5.0/apache-sshd-2.5.0.pom.sha512 release/mina/sshd/2.5.0/apache-sshd-2.5.0.tar.gz (with props) release/mina/sshd/2.5.0/apache-sshd-2.5.0.tar.gz.asc release/mina/sshd/2.5.0/apache-sshd-2.5.0.tar.gz.sha256 release/mina/sshd/2.5.0/apache-sshd-2.5.0.tar.gz.sha512 release/mina/sshd/2.5.0/apache-sshd-2.5.0.zip (with props) release/mina/sshd/2.5.0/apache-sshd-2.5.0.zip.asc release/mina/sshd/2.5.0/apache-sshd-2.5.0.zip.sha256 release/mina/sshd/2.5.0/apache-sshd-2.5.0.zip.sha512 Removed: release/mina/sshd/2.4.0/ Added: release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz == Binary file - no diff available. Propchange: release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.asc == --- release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.asc (added) +++ release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.asc Mon Jun 22 15:00:11 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAl7rUFkACgkQ7SN4zQmg +jN4o4xAAmxaQYvawNmqGV+K+So7WGxGaYNMr04y7lIajqhGrU76euV4LOqECK+ZW +HtYj84Sm9npkDs0IdG03wD0yOiBFPjIrPw0n3HTPLhRNlAt8NGtdC6L1APPJDCJX +4EYUqi8vbFAefikjitg1Z5Q9dVF98yNZibzJafA3GqxaMWcwqCrGw1X4llUNlDf3 +n3ZMuORkdYMMvb6eGWT0ZQCU3RjZLQ1Z4ifnEbmPs3Xl+SBGcBCpukKmCemq7S1w +BufeFDeOVb1ZnOzwMr6SySP6Bf6lEVCRVhg8J1okj3QvPZi02R7N9eWAAZ+ZG4V9 +rrAvA7kj1lLYjSvJ+j/XRfc2QjNNgucOkxbvOGa0dW9ld2s41KyXVReC6u8tXWgv +/Q00eoSkC0qiWqMRMDunMwTn1tpa8wPh0Sco7tcqKRGpiTLXIPJYKzsxzTHfDTqB +mqlHFo82GMBnTqg+bUZIrBkIliK1oj9OBPAAZQia9eMcu4dquLZFrAy6ONQl496O +qQB724IrBAA44GiXhiDjyo5ZO+rhUQT8K5L6ZSDmwVTzS/M7L/pPwr8TceAHkQBl +u7HQOH98LCn88ev9f9Q4sHROygLIeWTKfOla4U/xukXknF83J0ImUpwwwlMZh8uw +9Hz9+RfysR+sxyzlLoK1ZmOS5I0+6Cb/5EWL0/SXHtHTbDVXmlE= +=qJ4E +-END PGP SIGNATURE- Added: release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha256 == --- release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha256 (added) +++ release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha256 Mon Jun 22 15:00:11 2020 @@ -0,0 +1,2 @@ +./apache-sshd-2.5.0-src.tar.gz: 36EA0617 CC735D2A 997FFE87 971A404E 2EF763D2 +6C32EC7B 3488FDC1 91C73C1B Added: release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha512 == --- release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha512 (added) +++ release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha512 Mon Jun 22 15:00:11 2020 @@ -0,0 +1,4 @@ +./apache-sshd-2.5.0-src.tar.gz: 3D48E953 B7D841E2 9814D6E6 F2E34FDD 8F1ABF52 +B29FC67B 81E85BB2 D696BF8E 696148E2 45554524 +A9DB62B3 4618B91C F078F554 C118AF87 51AF02A6 +3E95A7F7 Added: release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip == Binary file - no diff available. Propchange: release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip -- svn:mime-type = application/octet-stream Added: release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.asc == --- release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.asc (added) +++ release/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.asc Mon Jun 22 15:00:11 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAl7rUGUACgkQ7SN4zQmg +jN5KLBAAhqbgW2ImltiZfu+CdMfeIEhL6LbH9/0H4GSasVVyUuirxkjxU6dPCG60 +AEoRosNGlYKFuWr5HnYF1u8ySCK6CG0Q0V89xB9kT3tbgRNSq7p9eDsFUapiTmK0 +LTynVajQYcY7sVW9p80aJrzj7pi67eWcXQrUGNKTl/3GjIkwLFsT87E6ORFBwn6U +HER5egKmkt+U8j90TDk4E9UhVTf3ouCN47EQNdFSnQzOF6C2bhz4
[mina-site] branch master updated: Update SSHD site for 2.5.0 release and point to the correct location for various outdated docs
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-site.git The following commit(s) were added to refs/heads/master by this push: new 13508bf Update SSHD site for 2.5.0 release and point to the correct location for various outdated docs 13508bf is described below commit 13508bf299da69cac3d42741f9809c591e5b34c8 Author: Guillaume Nodet AuthorDate: Mon Jun 22 17:28:16 2020 +0200 Update SSHD site for 2.5.0 release and point to the correct location for various outdated docs --- source/downloads-sshd.md | 11 +++-- source/sshd-project/__index.md | 2 + source/sshd-project/configuring_security.md | 36 -- source/sshd-project/documentation.md | 13 + source/sshd-project/download_2.4.0.md| 22 + source/sshd-project/downloads.md | 11 +++-- source/sshd-project/embedding_ssh.md | 73 +--- source/sshd-project/faq.md | 2 +- source/sshd-project/features.md | 2 +- source/sshd-project/load_ssh_editor.md | 23 - source/sshd-project/required_dependencies.md | 15 -- source/sshd-project/sources.md | 2 +- source/sshd-project/tips.md | 24 - 13 files changed, 41 insertions(+), 195 deletions(-) diff --git a/source/downloads-sshd.md b/source/downloads-sshd.md index 8b76fac..ad132ed 100644 --- a/source/downloads-sshd.md +++ b/source/downloads-sshd.md @@ -4,14 +4,14 @@ title: Downloads # Latest SSHD Releases -The latest release is the SSHD 2.4.0 release. +The latest release is the SSHD 2.5.0 release. * Source distributions: -* [Apache Mina SSHD 2.4.0 Sources (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.4.0/apache-sshd-2.4.0-src.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.4.0/apache-sshd-2.4.0-src.tar.gz.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.4.0/apache-sshd-2.4.0-src.tar.gz.sha1) -* [Apache Mina SSHD 2.4.0 Sources (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.4.0/apache-sshd-2.4.0-src.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.4.0/apache-sshd-2.4.0-src.zip.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.4.0/apache-sshd-2.4.0-src.zip.sha1) +* [Apache Mina SSHD 2.5.0 Sources (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha1) +* [Apache Mina SSHD 2.5.0 Sources (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.sha1) * Binary distributions: -* [Apache Mina SSHD 2.4.0 Binary (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.4.0/dist/apache-sshd-2.4.0.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.4.0/apache-sshd-2.4.0.tar.gz.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.4.0/apache-sshd-2.4.0.tar.gz.sha1) -* [Apache Mina SSHD 2.4.0 Binary (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.4.0/dist/apache-sshd-2.4.0.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.4.0/apache-sshd-2.4.0.zip.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.4.0/apache-sshd-2.4.0.zip.sha1) +* [Apache Mina SSHD 2.5.0 Binary (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.0/dist/apache-sshd-2.5.0.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0.tar.gz.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0.tar.gz.sha1) +* [Apache Mina SSHD 2.5.0 Binary (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.0/dist/apache-sshd-2.5.0.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0.zip.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0.zip.sha1) # Development snapshots @@ -46,3 +46,4 @@ You can [build](sshd-project/building.html) the latest version from [sources](ss * [SSHD 2.1.0](sshd-project/download_2.1.0.html) * [SSHD 2.2.0](sshd-project/download_2.2.0.html) * [SSHD 2.3.0](sshd-project/download_2.3.0.html) +* [SSHD 2.4.0](sshd-project/download_2.4.0.html) diff --git a/source/sshd-project/__index.md b/source/sshd-project/__index.md index 06279e6..b4a211b 100644 --- a/source/sshd-project/__index.md +++ b/source/sshd-project/__index.md @@ -10,3 +10,5 @@ Apache SSHD is a 100% pure java library to support the SSH protocols on both the This library is based on [Apache MINA](http://mina.apache.org/), a scalable and high performance asynchronous IO library. SSHD does not really aim at being a replacement for the SSH client or SSH
[mina-site] branch master updated: Lastest sshd version is 2.5.0
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-site.git The following commit(s) were added to refs/heads/master by this push: new 559ec1b Lastest sshd version is 2.5.0 559ec1b is described below commit 559ec1b86e7868b901aefeb1787b1db5752b3fd4 Author: Guillaume Nodet AuthorDate: Mon Jun 22 17:38:07 2020 +0200 Lastest sshd version is 2.5.0 --- config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.toml b/config.toml index 6180e56..003a1aa 100644 --- a/config.toml +++ b/config.toml @@ -37,5 +37,5 @@ version_asyncweb = "2.0.0-SNAPSHOT" version_mina_2_0 = "2.0.21" version_mina_2_1 = "2.1.3" version_ftpserver = "1.1.1" -version_sshd = "2.4.0" +version_sshd = "2.5.0" version_vysper = "0.7"
[mina-site] branch master updated: Add links to 2.5.0 release notes
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-site.git The following commit(s) were added to refs/heads/master by this push: new f14d02b Add links to 2.5.0 release notes f14d02b is described below commit f14d02b8ebe6e52f9f5e04faac35f9673b852f99 Author: Guillaume Nodet AuthorDate: Mon Jun 22 17:44:39 2020 +0200 Add links to 2.5.0 release notes --- source/downloads-sshd.md | 2 ++ source/sshd-project/download_2.5.0.md | 19 +++ source/sshd-project/downloads.md | 2 ++ 3 files changed, 23 insertions(+) diff --git a/source/downloads-sshd.md b/source/downloads-sshd.md index ad132ed..e07ff32 100644 --- a/source/downloads-sshd.md +++ b/source/downloads-sshd.md @@ -5,6 +5,7 @@ title: Downloads # Latest SSHD Releases The latest release is the SSHD 2.5.0 release. +Apache Mina SSHD 2.5.0 contains a number of [enhancements and bug-fixes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310849=12346915). * Source distributions: * [Apache Mina SSHD 2.5.0 Sources (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha1) @@ -47,3 +48,4 @@ You can [build](sshd-project/building.html) the latest version from [sources](ss * [SSHD 2.2.0](sshd-project/download_2.2.0.html) * [SSHD 2.3.0](sshd-project/download_2.3.0.html) * [SSHD 2.4.0](sshd-project/download_2.4.0.html) +* [SSHD 2.5.0](sshd-project/download_2.5.0.html) diff --git a/source/sshd-project/download_2.5.0.md b/source/sshd-project/download_2.5.0.md new file mode 100644 index 000..6af3eef --- /dev/null +++ b/source/sshd-project/download_2.5.0.md @@ -0,0 +1,19 @@ +--- +type: sshd +title: Apache SSHD 2.5.0 Release +--- + +# Overview + +Apache Mina SSHD 2.5.0 contains a number of [enhancements and bug-fixes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310849=12346915). + +# Getting the Distributions + +* Source distributions: +* [Apache Mina SSHD 2.5.0 Sources (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha1) +* [Apache Mina SSHD 2.5.0 Sources (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0-src.zip.sha1) +* Binary distributions: +* [Apache Mina SSHD 2.5.0 Binary (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.0/apache-sshd-2.5.0.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0.tar.gz.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0.tar.gz.sha1) +* [Apache Mina SSHD 2.5.0 Binary (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.0/apache-sshd-2.5.0.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0.zip.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0.zip.sha1) + +Please report any feedback to [us...@mina.apache.org](mailto:us...@mina.apache.org). diff --git a/source/sshd-project/downloads.md b/source/sshd-project/downloads.md index f01a6ed..9faf007 100644 --- a/source/sshd-project/downloads.md +++ b/source/sshd-project/downloads.md @@ -6,6 +6,7 @@ title: SSHD Downloads # Latest SSHD Releases The latest release is the SSHD 2.5.0 release. +Apache Mina SSHD 2.5.0 contains a number of [enhancements and bug-fixes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310849=12346915). * Source distributions: * [Apache Mina SSHD 2.5.0 Sources (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.0/apache-sshd-2.5.0-src.tar.gz.sha1) @@ -48,3 +49,4 @@ You can [build](building.html) the latest version from [sources](sources.html). * [SSHD 2.2.0](download_2.2.0.html) * [SSHD 2.3.0](download_2.3.0.html) * [SSHD 2.4.0](download_2.4.0.html) +* [SSHD 2.5.0](download_2.5.0.html)
[mina-sshd] 04/04: [SSHD-1009] Fix users home on OSX and support for symlinks
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 1ffbbf2023f90ef8a6f8d63f70d810a7a3f43633
Author: Guillaume Nodet
AuthorDate: Mon Jun 8 10:05:34 2020 +0200
[SSHD-1009] Fix users home on OSX and support for symlinks
---
.../file/nativefs/NativeFileSystemFactory.java | 2 +-
.../java/org/apache/sshd/common/util/OsUtils.java | 52
.../org/apache/sshd/common/util/OsUtilsTest.java | 24 +++---
.../java/org/apache/sshd/server/scp/ScpShell.java | 56 --
4 files changed, 93 insertions(+), 41 deletions(-)
diff --git
a/sshd-common/src/main/java/org/apache/sshd/common/file/nativefs/NativeFileSystemFactory.java
b/sshd-common/src/main/java/org/apache/sshd/common/file/nativefs/NativeFileSystemFactory.java
index 784fc94..6d61105 100644
---
a/sshd-common/src/main/java/org/apache/sshd/common/file/nativefs/NativeFileSystemFactory.java
+++
b/sshd-common/src/main/java/org/apache/sshd/common/file/nativefs/NativeFileSystemFactory.java
@@ -41,7 +41,7 @@ import
org.apache.sshd.common.util.logging.AbstractLoggingBean;
* @author http://mina.apache.org;>Apache MINA Project
*/
public class NativeFileSystemFactory extends AbstractLoggingBean implements
FileSystemFactory {
-public static final String DEFAULT_USERS_HOME = OsUtils.isWin32() ?
"C:\\Users" : "/home";
+public static final String DEFAULT_USERS_HOME = OsUtils.isWin32() ?
"C:\\Users" : OsUtils.isOSX() ? "/Users" : "/home";
public static final NativeFileSystemFactory INSTANCE = new
NativeFileSystemFactory();
diff --git a/sshd-common/src/main/java/org/apache/sshd/common/util/OsUtils.java
b/sshd-common/src/main/java/org/apache/sshd/common/util/OsUtils.java
index 2f5d8f9..182afe0 100644
--- a/sshd-common/src/main/java/org/apache/sshd/common/util/OsUtils.java
+++ b/sshd-common/src/main/java/org/apache/sshd/common/util/OsUtils.java
@@ -60,7 +60,7 @@ public final class OsUtils {
private static final AtomicReference CURRENT_USER_HOLDER = new
AtomicReference<>(null);
private static final AtomicReference JAVA_VERSION_HOLDER =
new AtomicReference<>(null);
-private static final AtomicReference OS_TYPE_HOLDER = new
AtomicReference<>(null);
+private static final AtomicReference OS_TYPE_HOLDER = new
AtomicReference<>(null);
private OsUtils() {
throw new UnsupportedOperationException("No instance allowed");
@@ -70,42 +70,56 @@ public final class OsUtils {
* @return true if the host is a UNIX system (and not Windows).
*/
public static boolean isUNIX() {
-return !isWin32();
+return !isWin32() && !isOSX();
+}
+
+/**
+ * @return true if the host is a OSX (and not Windows or Unix).
+ */
+public static boolean isOSX() {
+return getOS().contains("mac");
}
/**
* @return true if the host is Windows (and not UNIX).
* @see#OS_TYPE_OVERRIDE_PROP
- * @see#setWin32(Boolean)
+ * @see#setOS(String)
*/
public static boolean isWin32() {
-Boolean typeValue;
+return getOS().contains("windows");
+}
+
+/**
+ * Can be used to enforce Win32 or Linux report from {@link #isWin32()},
{@link #isOSX()} or {@link #isUNIX()}
+ *
+ * @param os The value to set - if {@code null} then O/S type is
auto-detected
+ * @see #isWin32()
+ * @see #isOSX()
+ * @see #isUNIX()
+ */
+public static void setOS(String os) {
+synchronized (OS_TYPE_HOLDER) {
+OS_TYPE_HOLDER.set(os);
+}
+}
+
+/**
+ * Retrieve the OS
+ */
+private static String getOS() {
+String typeValue;
synchronized (OS_TYPE_HOLDER) {
typeValue = OS_TYPE_HOLDER.get();
if (typeValue != null) { // is it the 1st time
return typeValue;
}
-
String value = System.getProperty(OS_TYPE_OVERRIDE_PROP,
System.getProperty("os.name"));
-typeValue =
GenericUtils.trimToEmpty(value).toLowerCase().contains("windows");
+typeValue = GenericUtils.trimToEmpty(value).toLowerCase();
OS_TYPE_HOLDER.set(typeValue);
}
-
return typeValue;
}
-/**
- * Can be used to enforce Win32 or Linux report from {@link #isWin32()} or
{@link #isUNIX()}
- *
- * @param win32 The value to set - if {@code null} then O/S type is
auto-detected
- * @see #isWin32()
- */
-public static void setWin32(Boolean win32) {
-synchronized (OS_TYPE_HOLDER) {
-OS_TYPE_HOLDER.set(win32);
-}
-}
-
public static String resolveDefaultInteractiveShellCommand() {
return resolveDe
[mina-sshd] 03/04: [SSHD-1009] Fixed bugs in ScpShell to make it work on Windows
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit f8649545fd5a1e3e4a0e4efcc1d0aa6fcc4acc52
Author: Lyor Goldstein
AuthorDate: Fri Jun 5 11:54:03 2020 +0300
[SSHD-1009] Fixed bugs in ScpShell to make it work on Windows
---
.../apache/sshd/common/file/FileSystemAware.java | 18 +
.../apache/sshd/common/file/FileSystemFactory.java | 15 +-
.../file/nativefs/NativeFileSystemFactory.java | 30 +-
.../file/virtualfs/VirtualFileSystemFactory.java | 24 +-
.../apache/sshd/server/channel/ChannelSession.java | 2 +-
.../java/org/apache/sshd/server/scp/ScpShell.java | 614 ++---
.../sshd/client/subsystem/sftp/SftpTest.java | 14 +-
7 files changed, 491 insertions(+), 226 deletions(-)
diff --git
a/sshd-common/src/main/java/org/apache/sshd/common/file/FileSystemAware.java
b/sshd-common/src/main/java/org/apache/sshd/common/file/FileSystemAware.java
index 5393cde..65817af 100644
--- a/sshd-common/src/main/java/org/apache/sshd/common/file/FileSystemAware.java
+++ b/sshd-common/src/main/java/org/apache/sshd/common/file/FileSystemAware.java
@@ -18,8 +18,11 @@
*/
package org.apache.sshd.common.file;
+import java.io.IOException;
import java.nio.file.FileSystem;
+import org.apache.sshd.common.session.SessionContext;
+
/**
* Interface that can be implemented by a command to be able to access the
file system in which this command will be
* used.
@@ -27,6 +30,21 @@ import java.nio.file.FileSystem;
@FunctionalInterface
public interface FileSystemAware {
/**
+ * Sets the {@link FileSystemFactory} used to create the {@link
FileSystem} to be used by the session
+ *
+ * @param factory The factory instance
+ * @param session The {@link SessionContext}
+ * @throws IOException If failed to resolve/create the file system
+ * @see#setFileSystem(FileSystem)
+ */
+default void setFileSystemFactory(
+FileSystemFactory factory, SessionContext session)
+throws IOException {
+FileSystem fs = factory.createFileSystem(session);
+setFileSystem(fs);
+}
+
+/**
* Set the file system in which this shell will be executed.
*
* @param fileSystem the file system
diff --git
a/sshd-core/src/main/java/org/apache/sshd/common/file/FileSystemFactory.java
b/sshd-common/src/main/java/org/apache/sshd/common/file/FileSystemFactory.java
similarity index 71%
rename from
sshd-core/src/main/java/org/apache/sshd/common/file/FileSystemFactory.java
rename to
sshd-common/src/main/java/org/apache/sshd/common/file/FileSystemFactory.java
index d95f405..37cb2b3 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/file/FileSystemFactory.java
+++
b/sshd-common/src/main/java/org/apache/sshd/common/file/FileSystemFactory.java
@@ -21,23 +21,30 @@ package org.apache.sshd.common.file;
import java.io.IOException;
import java.nio.file.FileSystem;
+import java.nio.file.Path;
-import org.apache.sshd.common.session.Session;
+import org.apache.sshd.common.session.SessionContext;
/**
* Factory for file system implementations - it returns the file system for
user.
*
* @author http://mina.apache.org;>Apache MINA Project
*/
-@FunctionalInterface
public interface FileSystemFactory {
+/**
+ *
+ * @param session The session created for the user
+ * @return The recommended user home directory - {@code null}
if none
+ * @throws IOException If failed to resolve user's home directory
+ */
+Path getUserHomeDir(SessionContext session) throws IOException;
/**
* Create user specific file system.
*
* @param session The session created for the user
* @return The current {@link FileSystem} for the provided
session
- * @throws IOException if the filesystem can not be created
+ * @throws IOException if the file system can not be created
*/
-FileSystem createFileSystem(Session session) throws IOException;
+FileSystem createFileSystem(SessionContext session) throws IOException;
}
diff --git
a/sshd-core/src/main/java/org/apache/sshd/common/file/nativefs/NativeFileSystemFactory.java
b/sshd-common/src/main/java/org/apache/sshd/common/file/nativefs/NativeFileSystemFactory.java
similarity index 78%
rename from
sshd-core/src/main/java/org/apache/sshd/common/file/nativefs/NativeFileSystemFactory.java
rename to
sshd-common/src/main/java/org/apache/sshd/common/file/nativefs/NativeFileSystemFactory.java
index 2343851..784fc94 100644
---
a/sshd-core/src/main/java/org/apache/sshd/common/file/nativefs/NativeFileSystemFactory.java
+++
b/sshd-common/src/main/java/org/apache/sshd/common/file/nativefs/NativeFileSystemFactory.java
@@ -23,12 +23,15 @@ import java.io.IOException;
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
imp
[mina-sshd] branch master updated (45f84aa -> 1ffbbf2)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git.
from 45f84aa [SSHD-1003] Use asynchronous streams when forwarding ports
new ebaafd1 [SSHD-1009] Document the usage of ScpShell for WinSCP
new 79b8452 [SSHD-1009] Added CLI capability to specify SCP as the
ShellFactory
new f864954 [SSHD-1009] Fixed bugs in ScpShell to make it work on Windows
new 1ffbbf2 [SSHD-1009] Fix users home on OSX and support for symlinks
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docs/scp.md| 25 +
.../sshd/cli/server/SshServerCliSupport.java | 23 +
.../org/apache/sshd/cli/server/SshServerMain.java | 18 +-
.../org/apache/sshd/cli/server/SshFsMounter.java | 13 +-
.../apache/sshd/common/file/FileSystemAware.java | 18 +
.../apache/sshd/common/file/FileSystemFactory.java | 15 +-
.../file/nativefs/NativeFileSystemFactory.java | 30 +-
.../file/virtualfs/VirtualFileSystemFactory.java | 24 +-
.../java/org/apache/sshd/common/util/OsUtils.java | 52 +-
.../org/apache/sshd/common/util/OsUtilsTest.java | 24 +-
.../apache/sshd/server/channel/ChannelSession.java | 2 +-
.../java/org/apache/sshd/server/scp/ScpShell.java | 656 ++---
.../sshd/client/subsystem/sftp/SftpTest.java | 14 +-
13 files changed, 651 insertions(+), 263 deletions(-)
rename {sshd-core =>
sshd-common}/src/main/java/org/apache/sshd/common/file/FileSystemFactory.java
(71%)
rename {sshd-core =>
sshd-common}/src/main/java/org/apache/sshd/common/file/nativefs/NativeFileSystemFactory.java
(78%)
rename {sshd-core =>
sshd-common}/src/main/java/org/apache/sshd/common/file/virtualfs/VirtualFileSystemFactory.java
(87%)
[mina-sshd] 02/04: [SSHD-1009] Added CLI capability to specify SCP as the ShellFactory
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 79b845277fdaa9715fa0d9de4bc436c8fca3cdac
Author: Lyor Goldstein
AuthorDate: Fri Jun 5 11:44:18 2020 +0300
[SSHD-1009] Added CLI capability to specify SCP as the ShellFactory
---
.../sshd/cli/server/SshServerCliSupport.java | 23 ++
.../org/apache/sshd/cli/server/SshServerMain.java | 18 ++---
.../org/apache/sshd/cli/server/SshFsMounter.java | 13 +++-
3 files changed, 50 insertions(+), 4 deletions(-)
diff --git
a/sshd-cli/src/main/java/org/apache/sshd/cli/server/SshServerCliSupport.java
b/sshd-cli/src/main/java/org/apache/sshd/cli/server/SshServerCliSupport.java
index b1a613c..5057ac9 100644
--- a/sshd-cli/src/main/java/org/apache/sshd/cli/server/SshServerCliSupport.java
+++ b/sshd-cli/src/main/java/org/apache/sshd/cli/server/SshServerCliSupport.java
@@ -59,6 +59,7 @@ import
org.apache.sshd.server.config.SshServerConfigFileReader;
import org.apache.sshd.server.forward.ForwardingFilter;
import org.apache.sshd.server.keyprovider.AbstractGeneratorHostKeyProvider;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
+import org.apache.sshd.server.scp.ScpCommandFactory;
import org.apache.sshd.server.shell.InteractiveProcessShellFactory;
import org.apache.sshd.server.shell.ShellFactory;
import org.apache.sshd.server.subsystem.SubsystemFactory;
@@ -232,6 +233,24 @@ public abstract class SshServerCliSupport extends
CliSupport {
return factory;
}
+/**
+ * Attempts to examine the {@link #SHELL_FACTORY_OPTION} configuration.
+ *
+ * If missing/empty then returns the {@link
#DEFAULT_SHELL_FACTORY}.
+ *
+ * If {@link PropertyResolverUtils#isNoneValue(String) NONE} then
returns {@code null}
+ *
+ * If {@link ScpCommandFactory#SCP_FACTORY_NAME SCP} then returns a
{@link ScpCommandFactory}
+ *
+ * Otherwise, assumes this is a fully qualified class path of a {@link
ShellFactory} implementation and attempts
+ * to load and instantiate it using a public no-args constructor
+ *
+ *
+ * @param stderrThe STDERR stream for errors
+ * @param options The available options - assuming defaults if {@code
null}
+ * @return The resolved {@link ShellFactory}
+ * @throws Exception If failed to resolve
+ */
public static ShellFactory resolveShellFactory(PrintStream stderr,
PropertyResolver options) throws Exception {
String factory = (options == null) ? null :
options.getString(SHELL_FACTORY_OPTION);
if (GenericUtils.isEmpty(factory)) {
@@ -242,6 +261,10 @@ public abstract class SshServerCliSupport extends
CliSupport {
return null;
}
+if (ScpCommandFactory.SCP_FACTORY_NAME.equalsIgnoreCase(factory)) {
+return new ScpCommandFactory();
+}
+
ClassLoader cl =
ThreadUtils.resolveDefaultClassLoader(ShellFactory.class);
try {
Class clazz = cl.loadClass(factory);
diff --git
a/sshd-cli/src/main/java/org/apache/sshd/cli/server/SshServerMain.java
b/sshd-cli/src/main/java/org/apache/sshd/cli/server/SshServerMain.java
index 9361ee6..a6e6e51 100644
--- a/sshd-cli/src/main/java/org/apache/sshd/cli/server/SshServerMain.java
+++ b/sshd-cli/src/main/java/org/apache/sshd/cli/server/SshServerMain.java
@@ -40,6 +40,7 @@ import org.apache.sshd.common.keyprovider.KeyPairProvider;
import org.apache.sshd.common.util.GenericUtils;
import org.apache.sshd.server.SshServer;
import org.apache.sshd.server.auth.pubkey.AcceptAllPublickeyAuthenticator;
+import org.apache.sshd.server.command.CommandFactory;
import org.apache.sshd.server.config.SshServerConfigFileReader;
import org.apache.sshd.server.config.keys.ServerIdentity;
import org.apache.sshd.server.keyprovider.AbstractGeneratorHostKeyProvider;
@@ -205,9 +206,7 @@ public class SshServerMain extends SshServerCliSupport {
sshd.setPublickeyAuthenticator(AcceptAllPublickeyAuthenticator.INSTANCE);
setupUserAuthFactories(sshd, resolver);
setupServerForwarding(sshd, level, System.out, System.err, resolver);
-sshd.setCommandFactory(new ScpCommandFactory.Builder()
-.withDelegate(ProcessShellCommandFactory.INSTANCE)
-.build());
+setupCommandFactory(sshd, shellFactory);
List subsystems = resolveServerSubsystems(sshd,
level, System.out, System.err, resolver);
if (GenericUtils.isNotEmpty(subsystems)) {
@@ -220,4 +219,17 @@ public class SshServerMain extends SshServerCliSupport {
Thread.sleep(Long.MAX_VALUE);
System.err.println("Exiting after a very (very very) long time");
}
+
+private static CommandFactory setupCommandFactory(SshServer sshd,
ShellFactory shellFactory) {
+ScpCommandFactory
[mina-sshd] 01/04: [SSHD-1009] Document the usage of ScpShell for WinSCP
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git commit ebaafd109cb1cf2ffbb43d2316e22e0261637dd6 Author: Lyor Goldstein AuthorDate: Fri Jun 5 11:42:57 2020 +0300 [SSHD-1009] Document the usage of ScpShell for WinSCP --- docs/scp.md | 25 + 1 file changed, 25 insertions(+) diff --git a/docs/scp.md b/docs/scp.md index 54007b4..7670438 100644 --- a/docs/scp.md +++ b/docs/scp.md @@ -146,3 +146,28 @@ sshd.setCommandFactory(factory); The `ScpCommandFactory` allows users to attach an `ScpFileOpener` and/or `ScpTransferEventListener` having the same behavior as the client - i.e., monitoring and intervention on the accessed local files. Furthermore, the factory can also be configured with a custom executor service for executing the requested copy commands as well as controlling the internal buffer sizes used to copy files. + +### The SCP "shell" + +Some SCP clients (e.g. [WinSCP](https://winscp.net/)) open a shell connection even if configured to use pure SCP in order to retrieve information +about the remote server's files and potentially navigate through them. In other words, SCP is only used as the **transfer** protocol, but +the application relies on "out-of-band" information (shell in this case) in order to provide the user with the available files list on the +remote server. + +Due to various considerations, some users might not want or be able to provide a full blown shell interface on the server side. For this +purpose SSHD provides an `ScpShell` class that provides a good enough implementation of the **limited** command types that an SCP client +is likely to require. For this purpose, the `ScpCommandFactory` also implements `ShellFactory` which spawns the limited `ScpShell` support. + + +```java + +ScpCommandFactory factory = new ScpCommandFactory.Builder() +.with(...) +.with(...) +.build() +; +sshd.setCommandFactory(factory); +sshd.setShellFactory(factory); +``` + +**Note:** a similar result can be achieved if activating SSHD from the command line by specifying `-o ShellFactory=scp`
[mina-sshd] 01/01: [SSHD-1009] SSHD SCP does not work with WinSCP
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 3f4238d28c7842354080752a8e460fdf8fa48ccb
Author: Guillaume Nodet
AuthorDate: Wed Jun 3 21:58:57 2020 +0200
[SSHD-1009] SSHD SCP does not work with WinSCP
---
.../apache/sshd/server/scp/InputStreamReader.java | 329
.../apache/sshd/server/scp/ScpCommandFactory.java | 19 +-
.../java/org/apache/sshd/server/scp/ScpShell.java | 597 +
.../java/org/apache/sshd/client/scp/ScpTest.java | 4 +-
4 files changed, 945 insertions(+), 4 deletions(-)
diff --git
a/sshd-scp/src/main/java/org/apache/sshd/server/scp/InputStreamReader.java
b/sshd-scp/src/main/java/org/apache/sshd/server/scp/InputStreamReader.java
new file mode 100644
index 000..0f742a6
--- /dev/null
+++ b/sshd-scp/src/main/java/org/apache/sshd/server/scp/InputStreamReader.java
@@ -0,0 +1,329 @@
+/*
+ * 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.
+ */
+/*
+ * Copyright (c) 2002-2016, the original author or authors.
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package org.apache.sshd.server.scp;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CoderResult;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.MalformedInputException;
+import java.nio.charset.UnmappableCharacterException;
+
+/**
+ *
+ * NOTE for SSHD: the default InputStreamReader that comes from the JRE
+ * usually read more bytes than needed from the input stream, which
+ * is not usable in a character per character model used in the terminal.
+ * We thus use the harmony code which only reads the minimal number of bytes.
+ */
+
+/**
+ * A class for turning a byte stream into a character stream. Data read from
the source input stream is converted into
+ * characters by either a default or a provided character converter. The
default encoding is taken from the
+ * "file.encoding" system property. {@code InputStreamReader} contains a
buffer of bytes read from the source stream and
+ * converts these into characters as needed. The buffer size is 8K.
+ *
+ * @see OutputStreamWriter
+ */
+public class InputStreamReader extends Reader {
+
+private static final int BUFFER_SIZE = 4;
+
+CharsetDecoder decoder;
+
+ByteBuffer bytes = ByteBuffer.allocate(BUFFER_SIZE);
+
+char pending = (char) -1;
+
+private InputStream in;
+
+private boolean endOfInput;
+
+/**
+ * Constructs a new {@code InputStreamReader} on the {@link InputStream}
{@code in}. This constructor sets the
+ * character converter to the encoding specified in the "file.encoding"
property and falls back to ISO 8859_1
+ * (ISO-Latin-1) if the property doesn't exist.
+ *
+ * @param in the input stream from which to read characters.
+ */
+public InputStreamReader(InputStream in) {
+super(in);
+this.in = in;
+decoder = Charset.defaultCharset().newDecoder().onMalformedInput(
+CodingErrorAction.REPLACE).onUnmappableCharacter(
+CodingErrorAction.REPLACE);
+bytes.limit(0);
+}
+
+/**
+ * Constructs a new InputStreamReader on the InputStream {@code in}. The
character converter that is used to decode
+ * bytes into characters is identified by name by {@code enc}. If the
encoding cannot be found, an
+ * UnsupportedEncodingException error is thrown.
+ *
+ * @param in the InputStream from which to read
characters.
+ * @param enc identifies the character converter
to use.
+ * @throws NullPointerException if {@code enc} is {@code null}.
+ * @throws Unsu
[mina-sshd] branch master updated (e6955ba -> 3f4238d)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git. discard e6955ba Fix rat discard 5174788 [SSHD-1009] SSHD SCP does not work with WinSCP new 3f4238d [SSHD-1009] SSHD SCP does not work with WinSCP This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e6955ba) \ N -- N -- N refs/heads/master (3f4238d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/sshd/server/scp/InputStreamReader.java | 155 - .../java/org/apache/sshd/server/scp/ScpShell.java | 103 +++--- 2 files changed, 116 insertions(+), 142 deletions(-)
[mina-sshd] branch master updated: Fix rat
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git The following commit(s) were added to refs/heads/master by this push: new e6955ba Fix rat e6955ba is described below commit e6955bab8ffd4bb1397dfcf0abca5ee97613d6e3 Author: Guillaume Nodet AuthorDate: Wed Jun 3 23:41:06 2020 +0200 Fix rat --- .../org/apache/sshd/server/scp/InputStreamReader.java | 18 ++ 1 file changed, 18 insertions(+) diff --git a/sshd-scp/src/main/java/org/apache/sshd/server/scp/InputStreamReader.java b/sshd-scp/src/main/java/org/apache/sshd/server/scp/InputStreamReader.java index cff78e9..b893e2b 100644 --- a/sshd-scp/src/main/java/org/apache/sshd/server/scp/InputStreamReader.java +++ b/sshd-scp/src/main/java/org/apache/sshd/server/scp/InputStreamReader.java @@ -1,4 +1,22 @@ /* + * 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. + */ +/* * Copyright (c) 2002-2016, the original author or authors. * * This software is distributable under the BSD license. See the terms of the
[mina-sshd] branch master updated (3f4238d -> 449c2a5)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git. discard 3f4238d [SSHD-1009] SSHD SCP does not work with WinSCP new 449c2a5 [SSHD-1009] SSHD SCP does not work with WinSCP This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3f4238d) \ N -- N -- N refs/heads/master (449c2a5) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../test/java/org/apache/sshd/server/scp/ScpCommandFactoryTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[mina-sshd] 01/01: [SSHD-1009] SSHD SCP does not work with WinSCP
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 449c2a56cbfef7c1f7abbb441bcce4ab3116dc65
Author: Guillaume Nodet
AuthorDate: Wed Jun 3 21:58:57 2020 +0200
[SSHD-1009] SSHD SCP does not work with WinSCP
---
.../apache/sshd/server/scp/InputStreamReader.java | 329
.../apache/sshd/server/scp/ScpCommandFactory.java | 19 +-
.../java/org/apache/sshd/server/scp/ScpShell.java | 597 +
.../java/org/apache/sshd/client/scp/ScpTest.java | 4 +-
.../sshd/server/scp/ScpCommandFactoryTest.java | 4 +-
5 files changed, 947 insertions(+), 6 deletions(-)
diff --git
a/sshd-scp/src/main/java/org/apache/sshd/server/scp/InputStreamReader.java
b/sshd-scp/src/main/java/org/apache/sshd/server/scp/InputStreamReader.java
new file mode 100644
index 000..0f742a6
--- /dev/null
+++ b/sshd-scp/src/main/java/org/apache/sshd/server/scp/InputStreamReader.java
@@ -0,0 +1,329 @@
+/*
+ * 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.
+ */
+/*
+ * Copyright (c) 2002-2016, the original author or authors.
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package org.apache.sshd.server.scp;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CoderResult;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.MalformedInputException;
+import java.nio.charset.UnmappableCharacterException;
+
+/**
+ *
+ * NOTE for SSHD: the default InputStreamReader that comes from the JRE
+ * usually read more bytes than needed from the input stream, which
+ * is not usable in a character per character model used in the terminal.
+ * We thus use the harmony code which only reads the minimal number of bytes.
+ */
+
+/**
+ * A class for turning a byte stream into a character stream. Data read from
the source input stream is converted into
+ * characters by either a default or a provided character converter. The
default encoding is taken from the
+ * "file.encoding" system property. {@code InputStreamReader} contains a
buffer of bytes read from the source stream and
+ * converts these into characters as needed. The buffer size is 8K.
+ *
+ * @see OutputStreamWriter
+ */
+public class InputStreamReader extends Reader {
+
+private static final int BUFFER_SIZE = 4;
+
+CharsetDecoder decoder;
+
+ByteBuffer bytes = ByteBuffer.allocate(BUFFER_SIZE);
+
+char pending = (char) -1;
+
+private InputStream in;
+
+private boolean endOfInput;
+
+/**
+ * Constructs a new {@code InputStreamReader} on the {@link InputStream}
{@code in}. This constructor sets the
+ * character converter to the encoding specified in the "file.encoding"
property and falls back to ISO 8859_1
+ * (ISO-Latin-1) if the property doesn't exist.
+ *
+ * @param in the input stream from which to read characters.
+ */
+public InputStreamReader(InputStream in) {
+super(in);
+this.in = in;
+decoder = Charset.defaultCharset().newDecoder().onMalformedInput(
+CodingErrorAction.REPLACE).onUnmappableCharacter(
+CodingErrorAction.REPLACE);
+bytes.limit(0);
+}
+
+/**
+ * Constructs a new InputStreamReader on the InputStream {@code in}. The
character converter that is used to decode
+ * bytes into characters is identified by name by {@code enc}. If the
encoding cannot be found, an
+ * UnsupportedEncodingException error is thrown.
+ *
+ * @param in the InputStream from which to read
characters.
+ * @param enc identifies the character converter
to use.
+ * @throws NullPointerExcepti
[mina-sshd] branch master updated: [SSHD-1009] SSHD SCP does not work with WinSCP
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 5174788 [SSHD-1009] SSHD SCP does not work with WinSCP
5174788 is described below
commit 51747885f9f4fa5ccffb4f29e573c6c0f363eadc
Author: Guillaume Nodet
AuthorDate: Wed Jun 3 21:58:57 2020 +0200
[SSHD-1009] SSHD SCP does not work with WinSCP
---
.../apache/sshd/server/scp/InputStreamReader.java | 346
.../apache/sshd/server/scp/ScpCommandFactory.java | 19 +-
.../java/org/apache/sshd/server/scp/ScpShell.java | 588 +
.../java/org/apache/sshd/client/scp/ScpTest.java | 4 +-
4 files changed, 953 insertions(+), 4 deletions(-)
diff --git
a/sshd-scp/src/main/java/org/apache/sshd/server/scp/InputStreamReader.java
b/sshd-scp/src/main/java/org/apache/sshd/server/scp/InputStreamReader.java
new file mode 100644
index 000..cff78e9
--- /dev/null
+++ b/sshd-scp/src/main/java/org/apache/sshd/server/scp/InputStreamReader.java
@@ -0,0 +1,346 @@
+/*
+ * Copyright (c) 2002-2016, the original author or authors.
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package org.apache.sshd.server.scp;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CoderResult;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.MalformedInputException;
+import java.nio.charset.UnmappableCharacterException;
+
+
+/**
+ *
+ * NOTE for SSHD: the default InputStreamReader that comes from the JRE
+ * usually read more bytes than needed from the input stream, which
+ * is not usable in a character per character model used in the terminal.
+ * We thus use the harmony code which only reads the minimal number of bytes.
+ */
+
+/**
+ * A class for turning a byte stream into a character stream. Data read from
the
+ * source input stream is converted into characters by either a default or a
+ * provided character converter. The default encoding is taken from the
+ * "file.encoding" system property. {@code InputStreamReader} contains a buffer
+ * of bytes read from the source stream and converts these into characters as
+ * needed. The buffer size is 8K.
+ *
+ * @see OutputStreamWriter
+ */
+public class InputStreamReader extends Reader {
+private InputStream in;
+
+private static final int BUFFER_SIZE = 4;
+
+private boolean endOfInput = false;
+
+CharsetDecoder decoder;
+
+ByteBuffer bytes = ByteBuffer.allocate(BUFFER_SIZE);
+
+char pending = (char) -1;
+
+/**
+ * Constructs a new {@code InputStreamReader} on the {@link InputStream}
+ * {@code in}. This constructor sets the character converter to the
encoding
+ * specified in the "file.encoding" property and falls back to ISO 8859_1
+ * (ISO-Latin-1) if the property doesn't exist.
+ *
+ * @param in
+ *the input stream from which to read characters.
+ */
+public InputStreamReader(InputStream in) {
+super(in);
+this.in = in;
+decoder = Charset.defaultCharset().newDecoder().onMalformedInput(
+CodingErrorAction.REPLACE).onUnmappableCharacter(
+CodingErrorAction.REPLACE);
+bytes.limit(0);
+}
+
+/**
+ * Constructs a new InputStreamReader on the InputStream {@code in}. The
+ * character converter that is used to decode bytes into characters is
+ * identified by name by {@code enc}. If the encoding cannot be found, an
+ * UnsupportedEncodingException error is thrown.
+ *
+ * @param in
+ *the InputStream from which to read characters.
+ * @param enc
+ *identifies the character converter to use.
+ * @throws NullPointerException
+ * if {@code enc} is {@code null}.
+ * @throws UnsupportedEncodingException
+ * if the encoding specified by {@code enc} cannot be found.
+ */
+public InputStreamReader(InputStream in, final String enc)
+throws UnsupportedEncodingException {
+super(in);
+if (enc == null) {
+throw new NullPointerException();
+}
+this.in = in;
+try {
+decoder = Charset.forName(enc).newDecoder().onMalformedInput(
+CodingErrorAction.REPLACE).onUnmappableCharacter(
+CodingErrorAction.REPLACE);
+} catch (IllegalArgumentException e) {
+throw (Unsuppor
[mina-sshd] branch master updated: fixed the typo which caused 32 bytes to be reserved instead of 4
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new a029229 fixed the typo which caused 32 bytes to be reserved instead
of 4
a029229 is described below
commit a029229309d88215a1f7fb6e3edb7fe4feff1385
Author: Chetan Narsude
AuthorDate: Mon May 11 13:47:42 2020 -0700
fixed the typo which caused 32 bytes to be reserved instead of 4
---
.../main/java/org/apache/sshd/common/util/buffer/ByteArrayBuffer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/sshd-common/src/main/java/org/apache/sshd/common/util/buffer/ByteArrayBuffer.java
b/sshd-common/src/main/java/org/apache/sshd/common/util/buffer/ByteArrayBuffer.java
index 5de36a6..3c087b7 100644
---
a/sshd-common/src/main/java/org/apache/sshd/common/util/buffer/ByteArrayBuffer.java
+++
b/sshd-common/src/main/java/org/apache/sshd/common/util/buffer/ByteArrayBuffer.java
@@ -217,7 +217,7 @@ public class ByteArrayBuffer extends Buffer {
@Override
public void putBuffer(ByteBuffer buffer) {
int required = buffer.remaining();
-ensureCapacity(required + Integer.SIZE);
+ensureCapacity(required + Integer.BYTES);
putInt(required);
buffer.get(data, wpos, required);
wpos += required;
[mina-sshd] branch master updated (a029229 -> 449c2a5)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git. omit a029229 fixed the typo which caused 32 bytes to be reserved instead of 4 This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/master (449c2a5) \ O -- O -- O (a029229) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../main/java/org/apache/sshd/common/util/buffer/ByteArrayBuffer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[mina-sshd] branch master updated: [SSHD-1003] Use asynchronous streams when forwarding ports
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 45f84aa [SSHD-1003] Use asynchronous streams when forwarding ports
45f84aa is described below
commit 45f84aab59b2e11d72942cffe9d810e37ab64959
Author: Guillaume Nodet
AuthorDate: Thu Jun 4 10:15:54 2020 +0200
[SSHD-1003] Use asynchronous streams when forwarding ports
---
.../apache/sshd/common/io/nio2/Nio2Session.java| 1 -
.../sshd/server/forward/TcpipServerChannel.java| 47 +-
2 files changed, 20 insertions(+), 28 deletions(-)
diff --git
a/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java
b/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java
index 1d5fc45..d595e90 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java
@@ -368,7 +368,6 @@ public class Nio2Session extends AbstractCloseable
implements IoSession {
log.debug("handleReadCycleCompletion({}) Socket has been
disconnected (result={}), closing IoSession now",
this, result);
}
-close(true);
}
} catch (Throwable exc) {
completionHandler.failed(exc, attachment);
diff --git
a/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpipServerChannel.java
b/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpipServerChannel.java
index 6ec0629..aa07126 100644
---
a/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpipServerChannel.java
+++
b/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpipServerChannel.java
@@ -19,7 +19,6 @@
package org.apache.sshd.server.forward;
import java.io.IOException;
-import java.io.OutputStream;
import java.net.ConnectException;
import java.net.SocketAddress;
import java.util.Collections;
@@ -31,9 +30,10 @@ import org.apache.sshd.common.Closeable;
import org.apache.sshd.common.FactoryManager;
import org.apache.sshd.common.RuntimeSshException;
import org.apache.sshd.common.SshConstants;
+import org.apache.sshd.common.channel.BufferedIoOutputStream;
import org.apache.sshd.common.channel.Channel;
+import org.apache.sshd.common.channel.ChannelAsyncOutputStream;
import org.apache.sshd.common.channel.ChannelFactory;
-import org.apache.sshd.common.channel.ChannelOutputStream;
import org.apache.sshd.common.channel.Window;
import org.apache.sshd.common.channel.exception.SshChannelOpenException;
import org.apache.sshd.common.forward.ForwardingTunnelEndpointsProvider;
@@ -41,6 +41,7 @@ import org.apache.sshd.common.future.CloseFuture;
import org.apache.sshd.common.io.IoConnectFuture;
import org.apache.sshd.common.io.IoConnector;
import org.apache.sshd.common.io.IoHandler;
+import org.apache.sshd.common.io.IoOutputStream;
import org.apache.sshd.common.io.IoServiceFactory;
import org.apache.sshd.common.io.IoSession;
import org.apache.sshd.common.session.Session;
@@ -95,7 +96,7 @@ public class TcpipServerChannel extends AbstractServerChannel
implements Forward
private final ForwardingFilter.Type type;
private IoConnector connector;
private IoSession ioSession;
-private OutputStream out;
+private IoOutputStream out;
private SshdSocketAddress tunnelEntrance;
private SshdSocketAddress tunnelExit;
private SshdSocketAddress originatorAddress;
@@ -196,9 +197,19 @@ public class TcpipServerChannel extends
AbstractServerChannel implements Forward
throw new RuntimeSshException(e);
}
-// TODO: revisit for better threading. Use async io ?
-out = new ChannelOutputStream(
-this, getRemoteWindow(), log,
SshConstants.SSH_MSG_CHANNEL_DATA, true);
+out = new BufferedIoOutputStream(
+"tcpip channel", new ChannelAsyncOutputStream(this,
SshConstants.SSH_MSG_CHANNEL_DATA) {
+@SuppressWarnings("synthetic-access")
+@Override
+protected CloseFuture doCloseGracefully() {
+try {
+sendEof();
+} catch (IOException e) {
+session.exceptionCaught(e);
+}
+return super.doCloseGracefully();
+}
+});
IoHandler handler = new IoHandler() {
@Override
@SuppressWarnings("synthetic-access")
@@ -208,10 +219,9 @@ public class TcpipServerChannel extends
AbstractServerChannel implements Forward
log.debug("doInit({}) Ignoring write to channel in
CLOSING state", TcpipServerChannel.this);
}
[mina-sshd] branch master updated: Add a test exercising the connection through an ssh proxy (#150)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new f219a3a Add a test exercising the connection through an ssh proxy
(#150)
f219a3a is described below
commit f219a3ace53825f284d75bd223ca321dca45babb
Author: Guillaume Nodet
AuthorDate: Fri Jul 24 11:11:57 2020 +0200
Add a test exercising the connection through an ssh proxy (#150)
---
.../java/org/apache/sshd/client/ProxyTest.java | 117 +
1 file changed, 117 insertions(+)
diff --git a/sshd-core/src/test/java/org/apache/sshd/client/ProxyTest.java
b/sshd-core/src/test/java/org/apache/sshd/client/ProxyTest.java
new file mode 100644
index 000..82902e9
--- /dev/null
+++ b/sshd-core/src/test/java/org/apache/sshd/client/ProxyTest.java
@@ -0,0 +1,117 @@
+/*
+ * 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.client;
+
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.sshd.client.session.ClientSession;
+import org.apache.sshd.client.session.forward.ExplicitPortForwardingTracker;
+import org.apache.sshd.common.util.io.IoUtils;
+import org.apache.sshd.common.util.net.SshdSocketAddress;
+import org.apache.sshd.server.SshServer;
+import org.apache.sshd.server.forward.AcceptAllForwardingFilter;
+import org.apache.sshd.util.test.BaseTestSupport;
+import org.apache.sshd.util.test.CommandExecutionHelper;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+/**
+ * @author mailto:d...@mina.apache.org;>Apache MINA SSHD Project
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class ProxyTest extends BaseTestSupport {
+
+public ProxyTest() {
+super();
+}
+
+@Test
+public void testProxy() throws Exception {
+try (SshServer server = setupTestServer();
+ SshServer proxy = setupTestServer();
+ SshClient client = setupTestClient()) {
+
+server.start();
+proxy.start();
+client.start();
+
+String command = "ls -la";
+String result;
+try (ClientSession session = createSession(
+client,
+"localhost", server.getPort(), "user1", "user1",
+"localhost", proxy.getPort(), "user2", "user2")) {
+ByteArrayOutputStream out = new ByteArrayOutputStream();
+ByteArrayOutputStream errors = new ByteArrayOutputStream();
+session.executeRemoteCommand(command, out, errors,
StandardCharsets.UTF_8);
+result = out.toString();
+}
+assertEquals(command, result);
+}
+}
+
+@SuppressWarnings("checkstyle:ParameterNumber")
+protected ClientSession createSession(
+SshClient client,
+String host, int port, String user, String password,
+String proxyHost, int proxyPort, String proxyUser, String
proxyPassword)
+throws java.io.IOException {
+ClientSession session;
+if (proxyHost != null) {
+ClientSession proxySession = client.connect(proxyUser, proxyHost,
proxyPort)
+.verify(CONNECT_TIMEOUT).getSession();
+proxySession.addPasswordIdentity(proxyPassword);
+proxySession.auth().verify(AUTH_TIMEOUT);
+SshdSocketAddress address = new SshdSocketAddress(host, port);
+ExplicitPortForwardingTracker tracker =
proxySession.createLocalPortForwardingTracker(
+SshdSocketAddress.LOCALHOST_ADDRESS, address);
+SshdSocketAddress bound = tracker.getBoundAddress();
+session = client.connect(user, bound.getHostName(),
bound.getPort())
+.verify(CONNECT_TIMEOUT).getSession();
+session.addCloseFutureListener(f -> IoUtils.closeQuietly(tracker));
+
[mina-sshd] branch master updated: [SSHD-1034] Rename o.a.sshd.common.ForwardingFilter to Forwarder
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new b7c004f [SSHD-1034] Rename o.a.sshd.common.ForwardingFilter to
Forwarder
b7c004f is described below
commit b7c004f542116e2b5ae1462adfca1aa0b52154fa
Author: Guillaume Nodet
AuthorDate: Wed Jul 15 22:07:27 2020 +0200
[SSHD-1034] Rename o.a.sshd.common.ForwardingFilter to Forwarder
---
CHANGES.md | 4 +--
.../sshd/client/session/AbstractClientSession.java | 30 -
.../java/org/apache/sshd/common/BaseBuilder.java | 8 ++---
.../org/apache/sshd/common/FactoryManager.java | 6 ++--
...ForwardingFilter.java => DefaultForwarder.java} | 8 ++---
.../common/forward/DefaultForwarderFactory.java| 8 ++---
.../{ForwardingFilter.java => Forwarder.java} | 2 +-
...ingFilterFactory.java => ForwarderFactory.java} | 6 ++--
.../common/helpers/AbstractFactoryManager.java | 8 ++---
.../sshd/common/session/ConnectionService.java | 6 ++--
.../session/helpers/AbstractConnectionService.java | 16 -
.../sshd/common/session/helpers/SessionHelper.java | 38 +++---
.../sshd/server/forward/TcpipServerChannel.java| 5 +--
.../server/global/CancelTcpipForwardHandler.java | 4 +--
.../sshd/server/global/TcpipForwardHandler.java| 4 +--
.../sshd/common/forward/PortForwardingTest.java| 14
.../forward}/ForwardingFilterTest.java | 6 +---
17 files changed, 85 insertions(+), 88 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index ee205d3..8840a8a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,12 +8,12 @@
# [Version 2.5.0 to 2.5.1](./docs/changes/2.5.1.md)
-# [Version 2.5.1 to 2.6.0](./docs/changes/2.6.0.md)
-
# Planned for next version
## Major code re-factoring
+* [SSHD-1034](https://issues.apache.org/jira/browse/SSHD-1034) Rename
{{org.apache.sshd.common.ForwardingFilter}} to {{Forwarder}}.
+
## Minor code helpers
## Behavioral changes and enhancements
diff --git
a/sshd-core/src/main/java/org/apache/sshd/client/session/AbstractClientSession.java
b/sshd-core/src/main/java/org/apache/sshd/client/session/AbstractClientSession.java
index a2c7825..d92e3c1 100644
---
a/sshd-core/src/main/java/org/apache/sshd/client/session/AbstractClientSession.java
+++
b/sshd-core/src/main/java/org/apache/sshd/client/session/AbstractClientSession.java
@@ -52,7 +52,7 @@ import org.apache.sshd.common.cipher.BuiltinCiphers;
import org.apache.sshd.common.cipher.CipherNone;
import org.apache.sshd.common.config.keys.KeyUtils;
import org.apache.sshd.common.config.keys.OpenSshCertificate;
-import org.apache.sshd.common.forward.ForwardingFilter;
+import org.apache.sshd.common.forward.Forwarder;
import org.apache.sshd.common.future.DefaultKeyExchangeFuture;
import org.apache.sshd.common.future.KeyExchangeFuture;
import org.apache.sshd.common.io.IoSession;
@@ -370,45 +370,45 @@ public abstract class AbstractClientSession extends
AbstractSession implements C
@Override
public SshdSocketAddress startLocalPortForwarding(SshdSocketAddress local,
SshdSocketAddress remote)
throws IOException {
-ForwardingFilter filter = getForwardingFilter();
-return filter.startLocalPortForwarding(local, remote);
+Forwarder forwarder = getForwarder();
+return forwarder.startLocalPortForwarding(local, remote);
}
@Override
public void stopLocalPortForwarding(SshdSocketAddress local) throws
IOException {
-ForwardingFilter filter = getForwardingFilter();
-filter.stopLocalPortForwarding(local);
+Forwarder forwarder = getForwarder();
+forwarder.stopLocalPortForwarding(local);
}
@Override
public SshdSocketAddress startRemotePortForwarding(SshdSocketAddress
remote, SshdSocketAddress local)
throws IOException {
-ForwardingFilter filter = getForwardingFilter();
-return filter.startRemotePortForwarding(remote, local);
+Forwarder forwarder = getForwarder();
+return forwarder.startRemotePortForwarding(remote, local);
}
@Override
public void stopRemotePortForwarding(SshdSocketAddress remote) throws
IOException {
-ForwardingFilter filter = getForwardingFilter();
-filter.stopRemotePortForwarding(remote);
+Forwarder forwarder = getForwarder();
+forwarder.stopRemotePortForwarding(remote);
}
@Override
public SshdSocketAddress startDynamicPortForwarding(SshdSocketAddress
local) throws IOException {
-ForwardingFilter filter = getForwardingFilter();
-return filter.startDynamicPortForwarding(local);
+Forwarder forwarder = getForwarder();
+return forwarder.startDynamicPortForwarding(local);
}
[mina-sshd] branch master updated: [SSHD-1041] Avoid overlapping test source (#149)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new fb64ae5 [SSHD-1041] Avoid overlapping test source (#149)
fb64ae5 is described below
commit fb64ae592a454d7b065a433f318c89b3e9a6c608
Author: Guillaume Nodet
AuthorDate: Mon Jul 27 17:59:49 2020 +0200
[SSHD-1041] Avoid overlapping test source (#149)
---
.../sshd/util/test/CommonTestSupportUtils.java | 7 +++-
.../apache/sshd/util/test/JUnitTestSupport.java| 12 ++
sshd-core/pom.xml | 24 ++-
.../java/org/apache/sshd/WindowAdjustTest.java | 6 +--
sshd-mina/pom.xml | 48 ++
sshd-netty/pom.xml | 38 ++---
6 files changed, 50 insertions(+), 85 deletions(-)
diff --git
a/sshd-common/src/test/java/org/apache/sshd/util/test/CommonTestSupportUtils.java
b/sshd-common/src/test/java/org/apache/sshd/util/test/CommonTestSupportUtils.java
index d39e76c..6f352af 100644
---
a/sshd-common/src/test/java/org/apache/sshd/util/test/CommonTestSupportUtils.java
+++
b/sshd-common/src/test/java/org/apache/sshd/util/test/CommonTestSupportUtils.java
@@ -314,7 +314,12 @@ public final class CommonTestSupportUtils {
* @see #detectTargetFolder(Path)
*/
public static Path detectTargetFolder(Class anchor) {
-return detectTargetFolder(getClassContainerLocationPath(anchor));
+Path path = detectTargetFolder(getClassContainerLocationPath(anchor));
+if (path == null) {
+String basedir = System.getProperty("basedir");
+path = detectTargetFolder(Paths.get(basedir, "target"));
+}
+return path;
}
/**
diff --git
a/sshd-common/src/test/java/org/apache/sshd/util/test/JUnitTestSupport.java
b/sshd-common/src/test/java/org/apache/sshd/util/test/JUnitTestSupport.java
index aede6de..cd71bc2 100644
--- a/sshd-common/src/test/java/org/apache/sshd/util/test/JUnitTestSupport.java
+++ b/sshd-common/src/test/java/org/apache/sshd/util/test/JUnitTestSupport.java
@@ -22,12 +22,9 @@ package org.apache.sshd.util.test;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.net.URL;
import java.nio.file.Files;
import java.nio.file.LinkOption;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.security.Key;
import java.security.KeyPair;
import java.security.interfaces.DSAParams;
@@ -201,12 +198,9 @@ public abstract class JUnitTestSupport extends Assert {
}
protected Path getTestResourcesFolder() {
-try {
-URL url = getClass().getResource(getClass().getSimpleName() +
".class");
-return Paths.get(url.toURI()).getParent();
-} catch (URISyntaxException e) {
-throw new RuntimeException(e);
-}
+Path target = detectTargetFolder();
+String pkgFolder = getClass().getPackage().getName().replace('.',
File.separatorChar);
+return target.resolve("test-classes").resolve(pkgFolder);
}
protected Path getClassResourcesFolder(String resType /* test or main */) {
diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml
index d6fc476..fa3b5f6 100644
--- a/sshd-core/pom.xml
+++ b/sshd-core/pom.xml
@@ -59,14 +59,14 @@
true
-
+
net.i2p.crypto
eddsa
true
-
+
org.apache.sshd
sshd-common
@@ -153,6 +153,7 @@
maven-jar-plugin
+small-test-jar
test-jar
@@ -166,6 +167,25 @@
org.apache.maven.plugins
+maven-jar-plugin
+
+
+big-test-jar
+
+test-jar
+
+
+reusable-tests
+
${project.build.finalName}-reusable
+
+
org/apache/sshd/util/test/**/*
+
+
+
+
+
+
+org.apache.maven.plugins
maven-surefire-plugin
true
diff --git a/sshd-core/src/test/java/org/apache/sshd/WindowAdjustTest.java
b/sshd-core/src/test/java/org/apache/sshd/WindowAdjustTest.java
index ffc0603..98afcb8 100644
--- a/sshd-core/src/test/java/org/apache/sshd/W
[mina-sshd] branch master updated: Improve ProxyTest example
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 848edb1 Improve ProxyTest example
848edb1 is described below
commit 848edb18f6e2a8dd3cfc50c9ca993a15fcbcebf2
Author: Guillaume Nodet
AuthorDate: Mon Jul 27 20:15:51 2020 +0200
Improve ProxyTest example
---
.../java/org/apache/sshd/client/ProxyTest.java | 39 +++---
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/sshd-core/src/test/java/org/apache/sshd/client/ProxyTest.java
b/sshd-core/src/test/java/org/apache/sshd/client/ProxyTest.java
index 82902e9..1500729 100644
--- a/sshd-core/src/test/java/org/apache/sshd/client/ProxyTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/client/ProxyTest.java
@@ -40,6 +40,8 @@ import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class ProxyTest extends BaseTestSupport {
+private ClientSession proxySession;
+
public ProxyTest() {
super();
}
@@ -50,8 +52,21 @@ public class ProxyTest extends BaseTestSupport {
SshServer proxy = setupTestServer();
SshClient client = setupTestClient()) {
+// setup server with an echo command
+server.setCommandFactory((session, command) -> new
CommandExecutionHelper(command) {
+@Override
+protected boolean handleCommandLine(String command) throws
Exception {
+OutputStream stdout = getOutputStream();
+stdout.write(command.getBytes(StandardCharsets.US_ASCII));
+stdout.flush();
+return false;
+}
+});
server.start();
+// setup proxy with a forwarding filter to allow the local port
forwarding
+proxy.setForwardingFilter(AcceptAllForwardingFilter.INSTANCE);
proxy.start();
+// setup client
client.start();
String command = "ls -la";
@@ -66,6 +81,8 @@ public class ProxyTest extends BaseTestSupport {
result = out.toString();
}
assertEquals(command, result);
+// make sure the proxy session is closed / closing
+assertTrue(proxySession == null || proxySession.isClosing() ||
proxySession.isClosed());
}
}
@@ -77,7 +94,7 @@ public class ProxyTest extends BaseTestSupport {
throws java.io.IOException {
ClientSession session;
if (proxyHost != null) {
-ClientSession proxySession = client.connect(proxyUser, proxyHost,
proxyPort)
+proxySession = client.connect(proxyUser, proxyHost, proxyPort)
.verify(CONNECT_TIMEOUT).getSession();
proxySession.addPasswordIdentity(proxyPassword);
proxySession.auth().verify(AUTH_TIMEOUT);
@@ -87,7 +104,7 @@ public class ProxyTest extends BaseTestSupport {
SshdSocketAddress bound = tracker.getBoundAddress();
session = client.connect(user, bound.getHostName(),
bound.getPort())
.verify(CONNECT_TIMEOUT).getSession();
-session.addCloseFutureListener(f -> IoUtils.closeQuietly(tracker));
+session.addCloseFutureListener(f -> IoUtils.closeQuietly(tracker,
proxySession));
} else {
session = client.connect(user, host,
port).verify(CONNECT_TIMEOUT).getSession();
}
@@ -96,22 +113,4 @@ public class ProxyTest extends BaseTestSupport {
return session;
}
-@Override
-protected SshServer setupTestServer() {
-SshServer sshd = super.setupTestServer();
-// setup forwarding filter to allow the local port forwarding
-sshd.setForwardingFilter(AcceptAllForwardingFilter.INSTANCE);
-// setup an echo command
-sshd.setCommandFactory((session, command) -> new
CommandExecutionHelper(command) {
-@Override
-protected boolean handleCommandLine(String command) throws
Exception {
-OutputStream stdout = getOutputStream();
-stdout.write(command.getBytes(StandardCharsets.US_ASCII));
-stdout.flush();
-return false;
-}
-});
-return sshd;
-}
-
}
[mina-sshd] branch master updated: [SSHD-1032] Fix possible ArrayIndexOutOfBoundsException in ChannelAsyncOutputStream
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 735d9ba [SSHD-1032] Fix possible ArrayIndexOutOfBoundsException in
ChannelAsyncOutputStream
735d9ba is described below
commit 735d9ba17d19fb8e40995b367b4ec35066713954
Author: Guillaume Nodet
AuthorDate: Wed Jul 22 17:45:24 2020 +0200
[SSHD-1032] Fix possible ArrayIndexOutOfBoundsException in
ChannelAsyncOutputStream
---
CHANGES.md | 1 +
.../sshd/common/channel/ChannelAsyncOutputStream.java| 16 +---
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 8678205..929dde1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -24,5 +24,6 @@
* [SSHD-1020](https://issues.apache.org/jira/browse/SSHD-1020) SSH connections
getting closed abruptly with timeout exceptions.
* [SSHD-1028](https://issues.apache.org/jira/browse/SSHD-1028) Fix
SSH_MSG_DISCONNECT: Too many concurrent connections.
+* [SSHD-1032](https://issues.apache.org/jira/browse/SSHD-1032) Fix possible
ArrayIndexOutOfBoundsException in ChannelAsyncOutputStream.
* [SSHD-1033](https://issues.apache.org/jira/browse/SSHD-1033) Fix
simultaneous usage of dynamic and local port forwarding.
* [SSHD-1039](https://issues.apache.org/jira/browse/SSHD-1039) Fix support for
some basic options in ssh/sshd cli.
diff --git
a/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelAsyncOutputStream.java
b/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelAsyncOutputStream.java
index beda4c9..3fc49c4 100644
---
a/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelAsyncOutputStream.java
+++
b/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelAsyncOutputStream.java
@@ -108,11 +108,13 @@ public class ChannelAsyncOutputStream extends
AbstractCloseable implements IoOut
Channel channel = getChannel();
Window remoteWindow = channel.getRemoteWindow();
long length;
-if (total > remoteWindow.getSize()) {
+long remoteWindowSize = remoteWindow.getSize();
+long packetSize = remoteWindow.getPacketSize();
+if (total > remoteWindowSize) {
// if we have a big message and there is enough space, send
the next chunk
-if (remoteWindow.getSize() >= remoteWindow.getPacketSize()) {
+if (remoteWindowSize >= packetSize) {
// send the first chunk as we have enough space in the
window
-length = remoteWindow.getPacketSize();
+length = packetSize;
} else {
// do not chunk when the window is smaller than the packet
size
length = 0;
@@ -122,16 +124,16 @@ public class ChannelAsyncOutputStream extends
AbstractCloseable implements IoOut
pendingWrite.set(f);
if (log.isTraceEnabled()) {
log.trace("doWriteIfPossible({})[resume={}] waiting
for window space {}",
-this, resume, remoteWindow.getSize());
+this, resume, remoteWindowSize);
}
}
-} else if (total > remoteWindow.getPacketSize()) {
+} else if (total > packetSize) {
if (buffer.rpos() > 0) {
// do a defensive copy in case the user reuses the buffer
IoWriteFutureImpl f = new
IoWriteFutureImpl(future.getId(), new ByteArrayBuffer(buffer.getCompactData()));
f.addListener(w -> future.setValue(w.getException() !=
null ? w.getException() : w.isWritten()));
pendingWrite.set(f);
-length = remoteWindow.getPacketSize();
+length = packetSize;
if (log.isTraceEnabled()) {
log.trace("doWriteIfPossible({})[resume={}] attempting
to write {} out of {}",
this, resume, length, total);
@@ -139,7 +141,7 @@ public class ChannelAsyncOutputStream extends
AbstractCloseable implements IoOut
doWriteIfPossible(resume);
return;
} else {
-length = remoteWindow.getPacketSize();
+length = packetSize;
}
} else {
length = total;
[mina-sshd] branch master updated: [SSHD-1020] SSH connections getting closed abruptly with timeout exceptions
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 14bbd54 [SSHD-1020] SSH connections getting closed abruptly with
timeout exceptions
14bbd54 is described below
commit 14bbd54a5a3030b15916dd7af95fb98cf3a4ad94
Author: Guillaume Nodet
AuthorDate: Wed Jul 22 17:43:00 2020 +0200
[SSHD-1020] SSH connections getting closed abruptly with timeout exceptions
---
CHANGES.md | 1 +
.../org/apache/sshd/client/session/ClientConnectionService.java| 2 +-
.../src/main/java/org/apache/sshd/core/CoreModuleProperties.java | 4 ++--
sshd-netty/pom.xml | 7 ---
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 4e8967d..8678205 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,7 @@
## Behavioral changes and enhancements
+* [SSHD-1020](https://issues.apache.org/jira/browse/SSHD-1020) SSH connections
getting closed abruptly with timeout exceptions.
* [SSHD-1028](https://issues.apache.org/jira/browse/SSHD-1028) Fix
SSH_MSG_DISCONNECT: Too many concurrent connections.
* [SSHD-1033](https://issues.apache.org/jira/browse/SSHD-1033) Fix
simultaneous usage of dynamic and local port forwarding.
* [SSHD-1039](https://issues.apache.org/jira/browse/SSHD-1039) Fix support for
some basic options in ssh/sshd cli.
diff --git
a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionService.java
b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionService.java
index a32f80a..ab27200 100644
---
a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionService.java
+++
b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionService.java
@@ -125,7 +125,7 @@ public class ClientConnectionService
buf.putBoolean(withReply);
if (withReply) {
-Buffer reply = session.request(heartbeatRequest, buf,
heartbeatReplyMaxWait.toMillis(), TimeUnit.MILLISECONDS);
+Buffer reply = session.request(heartbeatRequest, buf,
heartbeatReplyMaxWait);
if (reply != null) {
if (log.isTraceEnabled()) {
log.trace("sendHeartBeat({}) received reply size={}
for request={}",
diff --git
a/sshd-core/src/main/java/org/apache/sshd/core/CoreModuleProperties.java
b/sshd-core/src/main/java/org/apache/sshd/core/CoreModuleProperties.java
index 9e9b2d2..f51f1a1 100644
--- a/sshd-core/src/main/java/org/apache/sshd/core/CoreModuleProperties.java
+++ b/sshd-core/src/main/java/org/apache/sshd/core/CoreModuleProperties.java
@@ -144,7 +144,7 @@ public final class CoreModuleProperties {
* for the reply. If non-positive then no reply is expected (nor
requested).
*/
public static final Property HEARTBEAT_REPLY_WAIT
-= Property.durationSec("heartbeat-reply-wait", Duration.ZERO);
+= Property.durationSec("heartbeat-reply-wait",
Duration.ofMinutes(5));
/**
* Whether to ignore invalid identities files when pre-initializing the
client session
@@ -275,7 +275,7 @@ public final class CoreModuleProperties {
* Key used to retrieve the value of the socket read timeout for NIO2
session implementation - in milliseconds.
*/
public static final Property NIO2_READ_TIMEOUT
-= Property.duration("nio2-read-timeout",
IDLE_TIMEOUT.getRequiredDefault().plus(Duration.ofSeconds(15L)));
+= Property.duration("nio2-read-timeout", Duration.ZERO);
/**
* Minimum NIO2 write wait timeout for a single outgoing packet - in
milliseconds
diff --git a/sshd-netty/pom.xml b/sshd-netty/pom.xml
index 50f492c..3c9595e 100644
--- a/sshd-netty/pom.xml
+++ b/sshd-netty/pom.xml
@@ -188,13 +188,13 @@
true
${project.build.directory}/surefire-reports-netty
-
+
**/*LoadTest.java
**/PortForwarding*Test.java
**/ProxyTest.java
**/Nio2ServiceTest.java
-
+
**/ClientDeadlockTest.java
**/AsyncAuthInteractiveTest.java
**/ApacheServer*Test.java
@@ -203,8 +203,9 @@
**/BuiltinIoServiceFactoryFactoriesTest.java
**/ConcurrentConnectionTest.java
**/SignatureFactoriesTest.java
+**/Sshd1033Test.java
-
+
org.apache.sshd.util.test.NoIoTestCase
[mina-sshd] branch master updated (2aadde9 -> d426fb0)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git. from 2aadde9 [SSHD-1004] Deprecate DES, RC4 and Blowfish ciphers from default setup add 1dc57f0 Use Map.merge add c0f45ec Fix wrong test id add d426fb0 Fix typo No new revisions were added by this update. Summary of changes: .../main/java/org/apache/sshd/cli/client/SshClientCliSupport.java | 7 +-- .../apache/sshd/client/config/hosts/KnownHostHashValueTest.java| 2 +- .../main/java/org/apache/sshd/common/forward/DefaultForwarder.java | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-)
[mina-sshd] annotated tag sshd-2.6.0 created (now e78e373)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to annotated tag sshd-2.6.0 in repository https://gitbox.apache.org/repos/asf/mina-sshd.git. at e78e373 (tag) tagging a0bbdf9d37fb7a453d4354e93c9e6c02c013a85d (commit) replaces sshd-2.5.1 by Guillaume Nodet on Mon Dec 7 17:53:15 2020 +0100 - Log - [maven-release-plugin] copy for tag sshd-2.6.0 --- No new revisions were added by this update.
[mina-sshd] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 22f24ba [maven-release-plugin] prepare for next development iteration
22f24ba is described below
commit 22f24bacf24aeb2c9d355a78ff425fb21e306f41
Author: Guillaume Nodet
AuthorDate: Mon Dec 7 17:53:21 2020 +0100
[maven-release-plugin] prepare for next development iteration
---
assembly/pom.xml | 2 +-
pom.xml | 4 ++--
sshd-cli/pom.xml | 2 +-
sshd-common/pom.xml | 2 +-
sshd-contrib/pom.xml | 2 +-
sshd-core/pom.xml| 2 +-
sshd-git/pom.xml | 2 +-
sshd-ldap/pom.xml| 2 +-
sshd-mina/pom.xml| 2 +-
sshd-netty/pom.xml | 2 +-
sshd-openpgp/pom.xml | 2 +-
sshd-osgi/pom.xml| 2 +-
sshd-putty/pom.xml | 2 +-
sshd-scp/pom.xml | 2 +-
sshd-sftp/pom.xml| 2 +-
sshd-spring-sftp/pom.xml | 2 +-
16 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 847c7cf..7d28953 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.6.0
+2.6.1-SNAPSHOT
apache-sshd
diff --git a/pom.xml b/pom.xml
index 8716930..7256aba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.sshd
sshd
-2.6.0
+2.6.1-SNAPSHOT
Apache Mina SSHD
pom
2008
@@ -75,7 +75,7 @@
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
https://github.com/apache/mina-sshd/tree/${project.scm.tag}
-sshd-2.6.0
+master
diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml
index aa04d43..61fbf82 100644
--- a/sshd-cli/pom.xml
+++ b/sshd-cli/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.6.0
+2.6.1-SNAPSHOT
sshd-cli
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index fb64293..42e46af 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.6.0
+2.6.1-SNAPSHOT
..
diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml
index 6029964..6563c53 100644
--- a/sshd-contrib/pom.xml
+++ b/sshd-contrib/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.6.0
+2.6.1-SNAPSHOT
[mina-sshd] branch master updated: [maven-release-plugin] prepare release sshd-2.6.0
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new a0bbdf9 [maven-release-plugin] prepare release sshd-2.6.0
a0bbdf9 is described below
commit a0bbdf9d37fb7a453d4354e93c9e6c02c013a85d
Author: Guillaume Nodet
AuthorDate: Mon Dec 7 17:52:59 2020 +0100
[maven-release-plugin] prepare release sshd-2.6.0
---
assembly/pom.xml | 2 +-
pom.xml | 4 ++--
sshd-cli/pom.xml | 2 +-
sshd-common/pom.xml | 2 +-
sshd-contrib/pom.xml | 2 +-
sshd-core/pom.xml| 2 +-
sshd-git/pom.xml | 2 +-
sshd-ldap/pom.xml| 2 +-
sshd-mina/pom.xml| 2 +-
sshd-netty/pom.xml | 2 +-
sshd-openpgp/pom.xml | 2 +-
sshd-osgi/pom.xml| 2 +-
sshd-putty/pom.xml | 2 +-
sshd-scp/pom.xml | 2 +-
sshd-sftp/pom.xml| 2 +-
sshd-spring-sftp/pom.xml | 2 +-
16 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 979efc0..847c7cf 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.6.0-SNAPSHOT
+2.6.0
apache-sshd
diff --git a/pom.xml b/pom.xml
index c8503cb..8716930 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.sshd
sshd
-2.6.0-SNAPSHOT
+2.6.0
Apache Mina SSHD
pom
2008
@@ -75,7 +75,7 @@
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
https://github.com/apache/mina-sshd/tree/${project.scm.tag}
-master
+sshd-2.6.0
diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml
index eec783b..aa04d43 100644
--- a/sshd-cli/pom.xml
+++ b/sshd-cli/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.6.0-SNAPSHOT
+2.6.0
sshd-cli
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index f9211ff..fb64293 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.6.0-SNAPSHOT
+2.6.0
..
diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml
index a96abf4..6029964 100644
--- a/sshd-contrib/pom.xml
+++ b/sshd-contrib/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.6.0-SNAPSHOT
+2.6.0
svn commit: r44876 - in /dev/mina/sshd: 2.5.1/ 2.6.0/
Author: gnodet Date: Mon Dec 7 20:23:11 2020 New Revision: 44876 Log: Upload SSHD 2.6.0 candidate release Added: dev/mina/sshd/2.6.0/ dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz (with props) dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.asc dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha256 dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha512 dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip (with props) dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.asc dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.sha256 dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.sha512 dev/mina/sshd/2.6.0/apache-sshd-2.6.0.pom dev/mina/sshd/2.6.0/apache-sshd-2.6.0.pom.asc dev/mina/sshd/2.6.0/apache-sshd-2.6.0.pom.sha256 dev/mina/sshd/2.6.0/apache-sshd-2.6.0.pom.sha512 dev/mina/sshd/2.6.0/apache-sshd-2.6.0.tar.gz (with props) dev/mina/sshd/2.6.0/apache-sshd-2.6.0.tar.gz.asc dev/mina/sshd/2.6.0/apache-sshd-2.6.0.tar.gz.sha256 dev/mina/sshd/2.6.0/apache-sshd-2.6.0.tar.gz.sha512 dev/mina/sshd/2.6.0/apache-sshd-2.6.0.zip (with props) dev/mina/sshd/2.6.0/apache-sshd-2.6.0.zip.asc dev/mina/sshd/2.6.0/apache-sshd-2.6.0.zip.sha256 dev/mina/sshd/2.6.0/apache-sshd-2.6.0.zip.sha512 Removed: dev/mina/sshd/2.5.1/ Added: dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz == Binary file - no diff available. Propchange: dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.asc == --- dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.asc (added) +++ dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.asc Mon Dec 7 20:23:11 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAl/OjoEACgkQ7SN4zQmg +jN5dJA/6AvhfJfMItpbRrAfZnT44SpCfDZBNMXrKnh/umvcyGLDKEeGT/wmNtPEI +msWCKlfTOArjHd1g4NURRaAlUzlZM62HMVa4GHbTNpQnMubi4raU0uIBwZIyD9Pi +9QGwXuqYlZOJjr36qRVBw/Rr6qzAUVXDEkCBsbqnD/LSGW3XqaRCuFVhig1cePWn +srEJcrSaQDxL1FsPh+4lCoWPYQodcPu07CIYNLHi2U4kCqwFpidRFciyAs39M90W +9ynjU7ED46PunVeuCGsXAj+6YhdzcxAhmEN3d4cE1cEOsLmzvR6F5uKHbQc3RKbq +2tcVTmrDN0sgxJ7DxWJO60tPhlBuHPSDt9xQW3KkSgMHYMv8GsOO2qAxc1ltCwJZ +YLJCAHUGpFxVpJ8nU1hJBORBBpkO3xjWPUOd+HKqpl90NnQZKaxswLURMjWRnUfk +VvoC0AWJHMP9Yqi38qc2YGAcrSXU5DeOyx2GT4gd/Ej2RCtZGu+hbud+9z+TN4rj +L5vLptWz7CvUceqye1vXzkuqCOqE+ntTxekXZzyKOCl4BsaPeUgapVYDBhjZao8g +h/EzabgzMdHR5EO/KLU9qVJxNsdT1MOY18pOm3vFuoK1xXENGS5jbO0oYYReYfu2 +XzrfgdMr4tQaX1jwso3jf08R6dWAsxhLbHq+RE6LUl9ZhKp5CxI= +=Hn+y +-END PGP SIGNATURE- Added: dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha256 == --- dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha256 (added) +++ dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha256 Mon Dec 7 20:23:11 2020 @@ -0,0 +1,2 @@ +./apache-sshd-2.6.0-src.tar.gz: AEBB3A72 98A688D6 0EBA9521 4DCB3E9E B28A524E +AE2DE89C 30DB405B B43FBC30 Added: dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha512 == --- dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha512 (added) +++ dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha512 Mon Dec 7 20:23:11 2020 @@ -0,0 +1,4 @@ +./apache-sshd-2.6.0-src.tar.gz: C970237B BB95E338 333F482E 96B70A3F B7CADE0D +6E97BAFC 94A19399 F910B6A9 67421CD3 E166EDE0 +E93801AF BC158D40 15250A17 9333BCC6 C365510A +48F478B3 Added: dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip == Binary file - no diff available. Propchange: dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip -- svn:mime-type = application/octet-stream Added: dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.asc == --- dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.asc (added) +++ dev/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.asc Mon Dec 7 20:23:11 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAl/OjoEACgkQ7SN4zQmg +jN7Npg/8C6+l410+zBsT3i+1LxpOLsi9zMK1tXRtjCmvIBlxs21P0sqQC4DfZvsI +Qb2sPalVQ6bYitm4ZlsQt1YWg+gAvSV02A6yw2THZGB60dKWCTf3BK6PYuNRttKF +POjl0gxayutLBcbY1EfLoi+Au4aX6QGgF21TCdPO4M+SCaHrMDaGazTMs0in39w3 +yo6W9eUEcqqBU/aAxHxQKzAquKc6+TCHSJyYhnzWMOkXiq9+Rtr4EC8/AyD+wa7G +zuj0iTHP1POFgrfn/2jVyEYQ7Fq2xOByhi5k4R3NEUO9s0z6BSQvHhqHhltISCpv +8zEvZkaKwAIe0zli+8dVeUok0j7Sv8eukw71sQGn2YezK19niiU7N4SeN9bROFeI
[mina-sshd] branch master updated: Prepare for next version
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git The following commit(s) were added to refs/heads/master by this push: new 975dae1 Prepare for next version 975dae1 is described below commit 975dae12af7feb40a68060a636521a67eb1bf8ee Author: Guillaume Nodet AuthorDate: Mon Dec 7 21:28:12 2020 +0100 Prepare for next version --- CHANGES.md | 52 ++--- CHANGES.md => docs/changes/2.6.0.md | 12 + 2 files changed, 3 insertions(+), 61 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 12357d2..c51a3ca 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,60 +8,12 @@ # [Version 2.5.0 to 2.5.1](./docs/changes/2.5.1.md) +# [Version 2.5.1 to 2.6.0](./docs/changes/2.6.0.md) + # Planned for next version ## Major code re-factoring -* `SshServerMain` uses by default an ECDSA key instead of an RSA one. This can be overridden either by `-key-type / -key-size` -or `-key-file` command line option. -* [SSHD-1034](https://issues.apache.org/jira/browse/SSHD-1034) Rename `org.apache.sshd.common.ForwardingFilter` to `Forwarder`. -* [SSHD-1035](https://issues.apache.org/jira/browse/SSHD-1035) Move property definitions to common locations. -* [SSHD-1038](https://issues.apache.org/jira/browse/SSHD-1038) Refactor packages from a module into a cleaner hierarchy. -* [SSHD-1080](https://issues.apache.org/jira/browse/SSHD-1080) Rework the PacketWriter to split according to the various semantics -* [SSHD-1084](https://issues.apache.org/jira/browse/SSHD-1084) Revert the usage of asynchronous streams when forwarding ports. - ## Minor code helpers -* [SSHD-1004](https://issues.apache.org/jira/browse/SSHD-1004) Using a more constant time MAC validation to minimize timing side channel information leak. -* [SSHD-1030](https://issues.apache.org/jira/browse/SSHD-1030) Added a NoneFileSystemFactory implementation -* [SSHD-1042](https://issues.apache.org/jira/browse/SSHD-1042) Added more callbacks to SftpEventListener -* [SSHD-1040](https://issues.apache.org/jira/browse/SSHD-1040) Make server key available after KEX completed. -* [SSHD-1060](https://issues.apache.org/jira/browse/SSHD-1060) Do not store logger level in fields. -* [SSHD-1064](https://issues.apache.org/jira/browse/SSHD-1064) Fixed `ClientSession#executeRemoteCommand` handling of STDERR in case of exception to behave according to its documentation -* [SSHD-1076](https://issues.apache.org/jira/browse/SSHD-1076) Break down `ClientUserAuthService#auth` method into several to allow for flexible override -* [SSHD-1077](https://issues.apache.org/jira/browse/SSHD-1077) Added command line option to request specific SFTP version in `SftpCommandMain` -* [SSHD-1079](https://issues.apache.org/jira/browse/SSHD-1079) Experimental async mode on the local port forwarder -* [SSHD-1086](https://issues.apache.org/jira/browse/SSHD-1086) Added SFTP aware directory scanning helper classes -* [SSHD-1089](https://issues.apache.org/jira/browse/SSHD-1089) Added wrappers for one-time single session usage of SFTP/SCP clients -* Propagate SCP file transfer ACK data to ScpTransferListener before validating it. - ## Behavioral changes and enhancements - -* [SSHD-506](https://issues.apache.org/jira/browse/SSHD-506) Added support for AES-GCM ciphers. -* [SSHD-954](https://issues.apache.org/jira/browse/SSHD-954) Improve validation of DH public key values. -* [SSHD-1004](https://issues.apache.org/jira/browse/SSHD-1004) Deprecate DES, RC4 and Blowfish ciphers from default setup. -* [SSHD-1004](https://issues.apache.org/jira/browse/SSHD-1004) Deprecate SHA-1 based key exchanges and signatures from default setup. -* [SSHD-1004](https://issues.apache.org/jira/browse/SSHD-1004) Deprecate MD5-based and truncated HMAC algorithms from default setup. -* [SSHD-1005](https://issues.apache.org/jira/browse/SSHD-1005) Added support for SCP remote-to-remote file transfer -* [SSHD-1020](https://issues.apache.org/jira/browse/SSHD-1020) SSH connections getting closed abruptly with timeout exceptions. -* [SSHD-1026](https://issues.apache.org/jira/browse/SSHD-1026) Improve build reproductibility. -* [SSHD-1028](https://issues.apache.org/jira/browse/SSHD-1028) Fix SSH_MSG_DISCONNECT: Too many concurrent connections. -* [SSHD-1032](https://issues.apache.org/jira/browse/SSHD-1032) Fix possible ArrayIndexOutOfBoundsException in ChannelAsyncOutputStream. -* [SSHD-1033](https://issues.apache.org/jira/browse/SSHD-1033) Fix simultaneous usage of dynamic and local port forwarding. -* [SSHD-1039](https://issues.apache.org/jira/browse/SSHD-1039) Fix support for some basic options in ssh/sshd cli. -* [SSHD-1047](https://issues.apache.org/jira/browse/SSHD-1047) Support for SSH jumps. -* [SSHD-1048](https://issues.apache.org/jira/browse/SSHD-1048) Wrap instead of rethrow IOException in Future. -* [S
[mina-sshd] branch master updated: Update 2.5.0.md
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git The following commit(s) were added to refs/heads/master by this push: new 4a3a14f Update 2.5.0.md 4a3a14f is described below commit 4a3a14f50ef90449e1b9dd5bb18407c4b23d1ba3 Author: Guillaume Nodet AuthorDate: Wed Nov 25 09:55:19 2020 +0100 Update 2.5.0.md --- docs/changes/2.5.0.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/changes/2.5.0.md b/docs/changes/2.5.0.md index cd85eca..cc3f172 100644 --- a/docs/changes/2.5.0.md +++ b/docs/changes/2.5.0.md @@ -20,6 +20,9 @@ as when session is re-negotiated) * `ScpCommandFactory` is also a `ShellFactory` that can be used to provide a minimalistic shell that is good enough for *WinSCP*. +* Rework SFTP streams so that the client asks and receives as much data as possible - see +[SSHD-979](https://issues.apache.org/jira/browse/SSHD-979). + ## Minor code helpers * Handling of debug/ignore/unimplemented messages has been split into `handleXXX` and `doInvokeXXXMsgHandler` methods
[mina-site] branch master updated: Add SSHD 2.6.0
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-site.git The following commit(s) were added to refs/heads/master by this push: new 4ec2fc3 Add SSHD 2.6.0 4ec2fc3 is described below commit 4ec2fc32c570a936fc5ebaad5aba6fb3b80f1d53 Author: Guillaume Nodet AuthorDate: Mon Jan 4 11:07:11 2021 +0100 Add SSHD 2.6.0 --- config.toml | 2 +- source/downloads-sshd.md | 13 +++-- source/sshd-project/download_2.5.0.md | 8 source/sshd-project/download_2.5.1.md | 8 source/sshd-project/download_2.6.0.md | 19 +++ source/sshd-project/downloads.md | 13 +++-- 6 files changed, 42 insertions(+), 21 deletions(-) diff --git a/config.toml b/config.toml index 747122f..e9b1525 100644 --- a/config.toml +++ b/config.toml @@ -37,5 +37,5 @@ version_asyncweb = "2.0.0-SNAPSHOT" version_mina_2_0 = "2.0.21" version_mina_2_1 = "2.1.3" version_ftpserver = "1.1.1" -version_sshd = "2.5.1" +version_sshd = "2.6.0" version_vysper = "0.7" diff --git a/source/downloads-sshd.md b/source/downloads-sshd.md index c910c8d..984fdb7 100644 --- a/source/downloads-sshd.md +++ b/source/downloads-sshd.md @@ -4,15 +4,15 @@ title: Downloads # Latest SSHD Releases -The latest release is the SSHD 2.5.1 release. -Apache Mina SSHD 2.5.1 contains a number of [enhancements and bug-fixes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310849=12348440). +The latest release is the SSHD 2.6.0 release. +Apache Mina SSHD 2.6.0 contains a number of [enhancements and bug-fixes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310849=12348366). * Source distributions: -* [Apache Mina SSHD 2.5.1 Sources (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.1/apache-sshd-2.5.1-src.tar.gz.sha1) -* [Apache Mina SSHD 2.5.1 Sources (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.1/apache-sshd-2.5.1-src.zip.sha1) +* [Apache Mina SSHD 2.6.0 Sources (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha512) +* [Apache Mina SSHD 2.6.0 Sources (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.sha512) * Binary distributions: -* [Apache Mina SSHD 2.5.1 Binary (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.1/dist/apache-sshd-2.5.1.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.5.1/apache-sshd-2.5.1.tar.gz.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.1/apache-sshd-2.5.1.tar.gz.sha1) -* [Apache Mina SSHD 2.5.1 Binary (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.5.1/dist/apache-sshd-2.5.1.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.5.1/apache-sshd-2.5.1.zip.asc) [SHA](https://www.apache.org/dist/mina/sshd/2.5.1/apache-sshd-2.5.1.zip.sha1) +* [Apache Mina SSHD 2.6.0 Binary (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.6.0/apache-sshd-2.6.0.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0.tar.gz.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0.tar.gz.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0.tar.gz.sha512) +* [Apache Mina SSHD 2.6.0 Binary (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.6.0/apache-sshd-2.6.0.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0.zip.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0.zip.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0.zip.sha512) # Development snapshots @@ -49,3 +49,4 @@ You can [build](sshd-project/building.html) the latest version from [sources](ss * [SSHD 2.3.0](sshd-project/download_2.3.0.html) * [SSHD 2.4.0](sshd-project/download_2.4.0.html) * [SSHD 2.5.1](sshd-project/download_2.5.1.html) +* [SSHD 2.6.0](sshd-project/download_2.6.0.html) diff --git a/source/s
svn commit: r45164 - in /release/mina/sshd: 2.5.1/ 2.6.0/
Author: gnodet Date: Mon Jan 4 09:17:46 2021 New Revision: 45164 Log: Add SSHD 2.6.0 release Added: release/mina/sshd/2.6.0/ release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz (with props) release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.asc release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha256 release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha512 release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip (with props) release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.asc release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.sha256 release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.sha512 release/mina/sshd/2.6.0/apache-sshd-2.6.0.pom release/mina/sshd/2.6.0/apache-sshd-2.6.0.pom.asc release/mina/sshd/2.6.0/apache-sshd-2.6.0.pom.sha256 release/mina/sshd/2.6.0/apache-sshd-2.6.0.pom.sha512 release/mina/sshd/2.6.0/apache-sshd-2.6.0.tar.gz (with props) release/mina/sshd/2.6.0/apache-sshd-2.6.0.tar.gz.asc release/mina/sshd/2.6.0/apache-sshd-2.6.0.tar.gz.sha256 release/mina/sshd/2.6.0/apache-sshd-2.6.0.tar.gz.sha512 release/mina/sshd/2.6.0/apache-sshd-2.6.0.zip (with props) release/mina/sshd/2.6.0/apache-sshd-2.6.0.zip.asc release/mina/sshd/2.6.0/apache-sshd-2.6.0.zip.sha256 release/mina/sshd/2.6.0/apache-sshd-2.6.0.zip.sha512 Removed: release/mina/sshd/2.5.1/ Added: release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz == Binary file - no diff available. Propchange: release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.asc == --- release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.asc (added) +++ release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.asc Mon Jan 4 09:17:46 2021 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAl/y3P8ACgkQ7SN4zQmg +jN5PdxAAoU/MqLybWn3qnXSx4pPdYOGOcbNSjlIWb4/+h+Ex12l3NYtX3VmovEWK +mdzoxQh4LlFS/9r1qUA6GdkH0h9/pkVsfb2TkTxtt2mBmXs7irsLOmqZUyQiFdRc +N9FFX+SUKVWPKiWrnmCDMGPDXB7JVS5OStYrFfP+wMmxPwgmLxYF+AwYeG8tA4/h +ixkADNMMxNlOfzIGbcAYtRBjNMoPAxdvT1/3zHcwRooWDMvNWDFCos0kqwlgHiEy +B98B/yTnkOqA4P+vXQsMPw2BzvdRps2UHyOobhH3L4+j9TsV00GkEdAKsW3vb1h0 +f1xScaCtd+D7KFVIDj49Md4CCYbu5TrP5ZtUMRqgGBZRwokk18IU1nT2rLM4NEeZ +zyypU3CYn6o41AuUqo8QjSy8LVZTIYBP9XmIGfBybMezy2FMWenobIrGujEgnn2Z +Tuq6XRUhoT4dJoUq2LnD3N/Qba1Vt6BQO1PuLp9VqtCu8MGLEZlw5vRciauuJsFI +OErJQ/qBXMVvjqOzZbS2IWIHnvOS/vQDAhiX65dx/bniosThvSPDkepxdm9Ny8M1 +CeVo/xCjwow3pSi3omeTcKxtu4UMBzCZ9o1C8tc5HqKMV04mi9oz42M+BY6iS4iE +5CLEeK1WXvtcY42IeY1ZmyJ6xcSARQaAyboe119rbFt5gtNkZxM= +=4WP5 +-END PGP SIGNATURE- Added: release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha256 == --- release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha256 (added) +++ release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha256 Mon Jan 4 09:17:46 2021 @@ -0,0 +1,2 @@ +./apache-sshd-2.6.0-src.tar.gz: AEBB3A72 98A688D6 0EBA9521 4DCB3E9E B28A524E +AE2DE89C 30DB405B B43FBC30 Added: release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha512 == --- release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha512 (added) +++ release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha512 Mon Jan 4 09:17:46 2021 @@ -0,0 +1,4 @@ +./apache-sshd-2.6.0-src.tar.gz: C970237B BB95E338 333F482E 96B70A3F B7CADE0D +6E97BAFC 94A19399 F910B6A9 67421CD3 E166EDE0 +E93801AF BC158D40 15250A17 9333BCC6 C365510A +48F478B3 Added: release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip == Binary file - no diff available. Propchange: release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip -- svn:mime-type = application/octet-stream Added: release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.asc == --- release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.asc (added) +++ release/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.asc Mon Jan 4 09:17:46 2021 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAl/y3P8ACgkQ7SN4zQmg +jN4HYA//SLPc+UTvhn2InAsQVjXEUQESJA5w05IIW0u0GDVmAaxTkjOlF+Ohc9We +LFGiZ7oM5vJfsW/cwrkyGAer9mdB58NQguY5PanaRw8ZMeKDAkThfqBfjaA8VxO6 ++FPMywgByMvBrbdjNneyOk/qEVlL5ab/swehmwXH5kmftue9QGRW4m8maetHcG+D +MQ884lZFfiwPAzlodmdyXbAQOve25R5/l9t2wsxCOV8mKrVtYh+hgODvlJHZi/Gs
[mina-sshd] branch master updated: [SSHD-1181] Fix sftp file downloads when using the server uses the EOF indicator
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 3db721d [SSHD-1181] Fix sftp file downloads when using the server
uses the EOF indicator
3db721d is described below
commit 3db721d9a109d9aa80b3a662c43b57458acd99e4
Author: Guillaume Nodet
AuthorDate: Mon Jun 14 09:02:45 2021 +0200
[SSHD-1181] Fix sftp file downloads when using the server uses the EOF
indicator
* Use a single method for the read logic in SftpInputStreamAsync
* Add a small file test
* Add infrastructure to be able to send the eof indicator
* Correctly support the eof indicator in all cases, fixes sshd-1181
---
.../sshd/sftp/client/impl/AbstractSftpClient.java | 10 --
.../sftp/client/impl/SftpInputStreamAsync.java | 127 +
.../sftp/server/AbstractSftpSubsystemHelper.java | 15 ++-
.../org/apache/sshd/sftp/server/FileHandle.java| 15 ++-
.../org/apache/sshd/sftp/server/SftpSubsystem.java | 5 +-
.../java/org/apache/sshd/sftp/client/SftpTest.java | 13 +++
6 files changed, 96 insertions(+), 89 deletions(-)
diff --git
a/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/impl/AbstractSftpClient.java
b/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/impl/AbstractSftpClient.java
index 89df6f5..0d29b51 100644
---
a/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/impl/AbstractSftpClient.java
+++
b/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/impl/AbstractSftpClient.java
@@ -772,9 +772,6 @@ public abstract class AbstractSftpClient extends
AbstractSubsystemClient impleme
@Override
public int read(Handle handle, long fileOffset, byte[] dst, int dstOffset,
int len, AtomicReference eofSignalled)
throws IOException {
-if (eofSignalled != null) {
-eofSignalled.set(null);
-}
if (!isOpen()) {
throw new IOException("read(" + handle + "/" + fileOffset + ")[" +
dstOffset + "/" + len + "] client is closed");
}
@@ -790,9 +787,6 @@ public abstract class AbstractSftpClient extends
AbstractSubsystemClient impleme
protected int checkData(
int cmd, Buffer request, int dstOffset, byte[] dst,
AtomicReference eofSignalled)
throws IOException {
-if (eofSignalled != null) {
-eofSignalled.set(null);
-}
int reqId = send(cmd, request);
Buffer response = receive(reqId);
return checkDataResponse(cmd, response, dstOffset, dst, eofSignalled);
@@ -801,10 +795,6 @@ public abstract class AbstractSftpClient extends
AbstractSubsystemClient impleme
protected int checkDataResponse(
int cmd, Buffer buffer, int dstoff, byte[] dst,
AtomicReference eofSignalled)
throws IOException {
-if (eofSignalled != null) {
-eofSignalled.set(null);
-}
-
int length = buffer.getInt();
int type = buffer.getUByte();
int id = buffer.getInt();
diff --git
a/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/impl/SftpInputStreamAsync.java
b/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/impl/SftpInputStreamAsync.java
index eeddb4a..6721c74 100644
---
a/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/impl/SftpInputStreamAsync.java
+++
b/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/impl/SftpInputStreamAsync.java
@@ -26,6 +26,7 @@ import java.util.Collection;
import java.util.Deque;
import java.util.LinkedList;
import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.sshd.common.SshConstants;
@@ -125,60 +126,30 @@ public class SftpInputStreamAsync extends
InputStreamWithChannel implements Sftp
throw new IOException("read(" + getPath() + ") stream closed");
}
-int idx = off;
-while ((len > 0) && (!eofIndicator)) {
-if (hasNoData()) {
-fillData();
-if (eofIndicator && (hasNoData())) {
-break;
-}
-sendRequests();
-} else {
-int nb = Math.min(buffer.available(), len);
-buffer.getRawBytes(b, off, nb);
-off += nb;
-len -= nb;
-clientOffset += nb;
-}
-}
-
-int res = off - idx;
-if ((res == 0) && eofIndicator) {
+AtomicInteger offset = new AtomicInteger(off);
+int res = (int) doRead(len, buf -> {
+int l = buf.available();
+buf.getRawBytes(b, offset.getAndAdd(l), l);
+});
+if (res == 0 && eofIndicator) {
res = -1;
svn commit: r47614 - in /dev/mina/sshd: 2.6.0/ 2.7.0/
Author: gnodet
Date: Mon May 10 19:52:23 2021
New Revision: 47614
Log:
Add sshd 2.7.0 release for vote
Added:
dev/mina/sshd/2.7.0/
dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz (with props)
dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.asc
dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip (with props)
dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.asc
dev/mina/sshd/2.7.0/apache-sshd-2.7.0.pom
dev/mina/sshd/2.7.0/apache-sshd-2.7.0.pom.asc
dev/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz (with props)
dev/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.asc
dev/mina/sshd/2.7.0/apache-sshd-2.7.0.zip (with props)
dev/mina/sshd/2.7.0/apache-sshd-2.7.0.zip.asc
Removed:
dev/mina/sshd/2.6.0/
Added: dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz
==
Binary file - no diff available.
Propchange: dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz
--
svn:mime-type = application/octet-stream
Added: dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.asc
==
--- dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.asc (added)
+++ dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.asc Mon May 10 19:52:23
2021
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAmCZUNIACgkQ7SN4zQmg
+jN78lQ/+JzMbCWhrK677RSZR+RXu+X3rlfICwD1qVEHfYsO4kLcNJ3QzKs10WeBx
+Lo5ezLEpN1e8oHbf42ubuEFalxmxrmHvGTaIepxy7YCe2izACnzLUJmf/qaOHPnj
+tx9X6oHGlWuNiHP2quYWWdu5vI25fYZfu2bI+ylg/pR2W6a/QzpQgGxJv+aZytlQ
+3jOSqh+Qw9RjyV4nku0VjLf4DJ2xjtbVh/08sXu2e+OhaLisHj3EgeXNa9tgtHZS
+AjtFZ5qzTRrw2sU8LapzlYXQSGka9V/P/dGhQ4qKNgqcdqLFFjBd27EyfHaQoGhX
+ePPxzsIgyY9/X9H08q3Ko5VTkXjcP0e2erMVLphOz7glNBcv4pi5ZtnmLVUA+QLq
+9yty7ycaAecZWlFBvJqt6OG9TXymaMESswk1n2L9RpbgcNk4yBVsb+Lja3FFYpTo
+w8I/BTvwjiW8wNdjSmteDtoRD1psWi/8IeeH31FOuyEmh7nludsnpea0y4XO8XOA
+UEph9a7Qlt2n1pkJmpeB5hr2Y5kjfxUNcmQe8ymoyK5dQ3Zsn8TEBG1Kjro1/eYS
+GC7VhdOAZpu4Du7SW+g0oXAxSf9UFUbkKDaLal19QHchky8sEzN7u5zrxtLkeyOw
+q9iJRe30EknFJ53s0llDOFaH9kTtRpJuu2E+RL0tePvLJxv37/0=
+=C7um
+-END PGP SIGNATURE-
Added: dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip
==
Binary file - no diff available.
Propchange: dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip
--
svn:mime-type = application/octet-stream
Added: dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.asc
==
--- dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.asc (added)
+++ dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.asc Mon May 10 19:52:23 2021
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAmCZUNIACgkQ7SN4zQmg
+jN5inhAAyK3wB/l7TakUTDih5lwFIJH9/Ejh5wQfu6VjyhBrqn8eUh9djQQreHl1
+ZV5Q/rwqo/ySjhDYYfFnoK3y/1EfBjpE2FAACDqtlJVf8f6nKDEPiqYAT6GtPrhY
+u+x3O0YovXTq/s2pxsyhzlDmIJv3LmIfJZX9l4yJrBBHKKYhTvjlig9JbckLNSRo
+M+lFZpHKGhCvIV0u5+OqzmXqzO4QW7xoOG5ClOfAJnNNMJZ/CGSlshp2bEnqJ/3R
+oLIcvJT92jQ+2Lh112Zfp1wLYmqjl3NRIKFq4YHeuuAKTvkUhoGblMnsWZYsY6Dp
+g77b9mFY5Z4MoIyQ2LhHW1U55dNohVSXC842dqenkWSnoQng3u4GU7JE7wEER5n+
+AIjruMBTB/XrLJBmUjNwwK9nDgxEz7Z7ew71ScLHzC/0bMzQzluT50iPv1POkijo
+aeCaRZlZr5xvsTwoNnLI0ufqPrmhTm5ahkY7JZw/34FtscmYQjNa7OEbpA6tA6C4
+LubVD0MAcMWqvS9rwQF1Xb23EPv20k9V1ZwaIxet6GfzxFLkKg0NIgN2IwmjwdzI
+p3XRyV9UjYiRJlC6f14Vm6+n2BNirL68WHrh4g0aPR8viR/bE5C+hjVGcdO12C00
+L1PFRO+crGdzw2m18ZfBSUafyDTWvNJq6pEGsYmYPTwyJprSS+Y=
+=achX
+-END PGP SIGNATURE-
Added: dev/mina/sshd/2.7.0/apache-sshd-2.7.0.pom
==
--- dev/mina/sshd/2.7.0/apache-sshd-2.7.0.pom (added)
+++ dev/mina/sshd/2.7.0/apache-sshd-2.7.0.pom Mon May 10 19:52:23 2021
@@ -0,0 +1,210 @@
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0
https://maven.apache.org/maven-v4_0_0.xsd;>
+
+
+4.0.0
+
+
+org.apache.sshd
+sshd
+2.7.0
+
+
+apache-sshd
+Apache Mina SSHD :: Assembly
+pom
+
+
+${project.basedir}/..
+
+
+
+
+org.apache.sshd
+sshd-common
+${project.version}
+
+
+org.apache.sshd
+sshd-core
+${project.version}
+
+
+org.apache.sshd
+sshd-scp
+${project.version}
+
+
+org.apache.sshd
+sshd-sftp
+${project.version}
+
+
+org.apache.sshd
+sshd-cli
+${project.version}
+
+
+
+org.apache.sshd
+
[mina-sshd] branch master updated (db7cbdc -> 4dad0d7)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git. from db7cbdc [SSHD-1158] Don't send channel EOF after having received channel CLOSE add 4dad0d7 [SSHD-1145] Deprecate ReflectionUtils#isClassAvailable and use ThreadUtils#resolveDefaultClass in SecurityProviderRegistrars (#189) No new revisions were added by this update. Summary of changes: .../java/org/apache/sshd/common/util/ReflectionUtils.java | 9 + .../BouncyCastleSecurityProviderRegistrar.java| 5 ++--- .../security/eddsa/EdDSASecurityProviderRegistrar.java| 5 ++--- .../org/apache/sshd/common/util/threads/ThreadUtils.java | 15 +++ 4 files changed, 28 insertions(+), 6 deletions(-)
[mina-sshd] branch master updated (4dad0d7 -> 9a724be)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git. from 4dad0d7 [SSHD-1145] Deprecate ReflectionUtils#isClassAvailable and use ThreadUtils#resolveDefaultClass in SecurityProviderRegistrars (#189) add 9a724be [SSHD-525] Server side implementation of posix-ren...@openssh.com No new revisions were added by this update. Summary of changes: CHANGES.md | 2 +- .../sftp/server/AbstractSftpSubsystemHelper.java | 24 - .../openssh/helpers/OpenSSHExtensionsTest.java | 41 ++ 3 files changed, 65 insertions(+), 2 deletions(-)
[mina-sshd] branch master updated: [maven-release-plugin] prepare release sshd-2.7.0
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 09d14bf [maven-release-plugin] prepare release sshd-2.7.0
09d14bf is described below
commit 09d14bf6adf5b75b59cb182a1c8de612e6a756ec
Author: Guillaume Nodet
AuthorDate: Mon May 10 17:11:28 2021 +0200
[maven-release-plugin] prepare release sshd-2.7.0
---
assembly/pom.xml | 2 +-
pom.xml | 12 ++--
sshd-cli/pom.xml | 2 +-
sshd-common/pom.xml | 2 +-
sshd-contrib/pom.xml | 2 +-
sshd-core/pom.xml| 2 +-
sshd-git/pom.xml | 2 +-
sshd-ldap/pom.xml| 2 +-
sshd-mina/pom.xml| 2 +-
sshd-netty/pom.xml | 2 +-
sshd-openpgp/pom.xml | 2 +-
sshd-osgi/pom.xml| 2 +-
sshd-putty/pom.xml | 2 +-
sshd-scp/pom.xml | 2 +-
sshd-sftp/pom.xml| 2 +-
sshd-spring-sftp/pom.xml | 2 +-
16 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index f1ded23..3b1469f 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.6.1-SNAPSHOT
+2.7.0
apache-sshd
diff --git a/pom.xml b/pom.xml
index 0c38bc6..e84083f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.sshd
sshd
-2.6.1-SNAPSHOT
+2.7.0
Apache Mina SSHD
pom
2008
@@ -75,7 +75,7 @@
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
https://github.com/apache/mina-sshd/tree/${project.scm.tag}
-master
+sshd-2.7.0
@@ -745,22 +745,22 @@
org.apache.maven.scm
maven-scm-api
->${scm.plugin.version}
+${scm.plugin.version}
org.apache.maven.scm
maven-scm-provider-gitexe
->${scm.plugin.version}
+${scm.plugin.version}
org.apache.maven.scm
maven-scm-provider-svn-commons
->${scm.plugin.version}
+${scm.plugin.version}
org.apache.maven.scm
maven-scm-provider-svnexe
->${scm.plugin.version}
+${scm.plugin.version}
diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml
index c5b890c..7b83e43 100644
--- a/sshd-cli/pom.xml
+++ b/sshd-cli/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.6.1-SNAPSHOT
+2.7.0
sshd-cli
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index 6c8cd8c..a6299b7 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.6.1-SNAPSHOT
+2.7.0
..
diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml
index bb37464..d23ef1d 100644
--- a/sshd-contrib/pom.xml
+++ b/sshd-contrib/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.6.1-SNAPSHOT
+2.7.0
[mina-sshd] annotated tag sshd-2.7.0 created (now 063b74e)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to annotated tag sshd-2.7.0 in repository https://gitbox.apache.org/repos/asf/mina-sshd.git. at 063b74e (tag) tagging 09d14bf6adf5b75b59cb182a1c8de612e6a756ec (commit) replaces sshd-2.6.0 by Guillaume Nodet on Mon May 10 17:11:41 2021 +0200 - Log - [maven-release-plugin] copy for tag sshd-2.7.0 --- No new revisions were added by this update.
[mina-sshd] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 3601ce8 [maven-release-plugin] prepare for next development iteration
3601ce8 is described below
commit 3601ce8f6db3fe107aea480681f9e2ac98b8bfd7
Author: Guillaume Nodet
AuthorDate: Mon May 10 17:11:46 2021 +0200
[maven-release-plugin] prepare for next development iteration
---
assembly/pom.xml | 2 +-
pom.xml | 4 ++--
sshd-cli/pom.xml | 2 +-
sshd-common/pom.xml | 2 +-
sshd-contrib/pom.xml | 2 +-
sshd-core/pom.xml| 2 +-
sshd-git/pom.xml | 2 +-
sshd-ldap/pom.xml| 2 +-
sshd-mina/pom.xml| 2 +-
sshd-netty/pom.xml | 2 +-
sshd-openpgp/pom.xml | 2 +-
sshd-osgi/pom.xml| 2 +-
sshd-putty/pom.xml | 2 +-
sshd-scp/pom.xml | 2 +-
sshd-sftp/pom.xml| 2 +-
sshd-spring-sftp/pom.xml | 2 +-
16 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 3b1469f..1fe1237 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.7.0
+2.7.1-SNAPSHOT
apache-sshd
diff --git a/pom.xml b/pom.xml
index e84083f..e29a7f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.sshd
sshd
-2.7.0
+2.7.1-SNAPSHOT
Apache Mina SSHD
pom
2008
@@ -75,7 +75,7 @@
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
https://github.com/apache/mina-sshd/tree/${project.scm.tag}
-sshd-2.7.0
+master
diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml
index 7b83e43..50fd663 100644
--- a/sshd-cli/pom.xml
+++ b/sshd-cli/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.7.0
+2.7.1-SNAPSHOT
sshd-cli
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index a6299b7..2829224 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.7.0
+2.7.1-SNAPSHOT
..
diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml
index d23ef1d..4c2a1f8 100644
--- a/sshd-contrib/pom.xml
+++ b/sshd-contrib/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.7.0
+2.7.1-SNAPSHOT
svn commit: r47640 - /dev/mina/sshd/2.7.0/
Author: gnodet Date: Tue May 11 14:20:01 2021 New Revision: 47640 Log: Update candidate release Modified: dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.asc dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.asc dev/mina/sshd/2.7.0/apache-sshd-2.7.0.pom.asc dev/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz dev/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.asc dev/mina/sshd/2.7.0/apache-sshd-2.7.0.zip dev/mina/sshd/2.7.0/apache-sshd-2.7.0.zip.asc Modified: dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz == Binary files - no diff available. Modified: dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.asc == --- dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.asc (original) +++ dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.asc Tue May 11 14:20:01 2021 @@ -1,16 +1,16 @@ -BEGIN PGP SIGNATURE- -iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAmCZUNIACgkQ7SN4zQmg -jN78lQ/+JzMbCWhrK677RSZR+RXu+X3rlfICwD1qVEHfYsO4kLcNJ3QzKs10WeBx -Lo5ezLEpN1e8oHbf42ubuEFalxmxrmHvGTaIepxy7YCe2izACnzLUJmf/qaOHPnj -tx9X6oHGlWuNiHP2quYWWdu5vI25fYZfu2bI+ylg/pR2W6a/QzpQgGxJv+aZytlQ -3jOSqh+Qw9RjyV4nku0VjLf4DJ2xjtbVh/08sXu2e+OhaLisHj3EgeXNa9tgtHZS -AjtFZ5qzTRrw2sU8LapzlYXQSGka9V/P/dGhQ4qKNgqcdqLFFjBd27EyfHaQoGhX -ePPxzsIgyY9/X9H08q3Ko5VTkXjcP0e2erMVLphOz7glNBcv4pi5ZtnmLVUA+QLq -9yty7ycaAecZWlFBvJqt6OG9TXymaMESswk1n2L9RpbgcNk4yBVsb+Lja3FFYpTo -w8I/BTvwjiW8wNdjSmteDtoRD1psWi/8IeeH31FOuyEmh7nludsnpea0y4XO8XOA -UEph9a7Qlt2n1pkJmpeB5hr2Y5kjfxUNcmQe8ymoyK5dQ3Zsn8TEBG1Kjro1/eYS -GC7VhdOAZpu4Du7SW+g0oXAxSf9UFUbkKDaLal19QHchky8sEzN7u5zrxtLkeyOw -q9iJRe30EknFJ53s0llDOFaH9kTtRpJuu2E+RL0tePvLJxv37/0= -=C7um +iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAmCajJkACgkQ7SN4zQmg +jN7iyhAArcD1GM3n2wQnbFPrBDH7I5ntKKCkGrq0Hf/rjX3MA/VgWoYNr/Eo90gc +sUYLf7DoOJloa0ld6+xhx6YwD6WL3Rl3N40cnmjNjuWLjkyBF3MJEhZUJP8YC0JZ +hUA24b/A7PmnummHWZecX0VdIcf76AxsZXrdEzX77GdcXhFJdUIIUZr976nljCAI +gyB841F8rrW5sISJ74/x+ndgHCbdi/KGx7hUYxVk7ums3rfXNf6cbKGMtTYvrDow +y3PmiZev4xChTXVd7zepacLowty5Sd5anGUdkPQGAn0YwXgTHTnFXH4S8WvJlds+ +3QmdazWk1fdoZMcVm15eODAekoz2pqEktHs/E1P2JcOMYgRzyi2fRwjr/V3yrR0a +iLd9q8RCzYQfutlON0p/2dMdeaGt9JWO8TeKCW4X7ihmIGnsTlKNCNflAkJ83c/9 +foTv/u4FUwWHMQRxDT+8KiK0d8DmtAWwQvn2uPxEWjDHEGRUMjBcgsdbrNLCajVU +v9Ki399SJ1UmWZDEh07muZQ4ARyfPpfdlnhZ5HKQJCe5wxhxswYxO9eIpDBYX/4e +9r2wyvbVTjlmSU669I/wUoo/Ptz0tz9bvcsQwS8bCW0wZGq6zhPvMMLpwNIOZQrS +FdEfi7MnbPARx3glUtPDy44Sfo/bhBEA3qVxlHCqMFleRVlBmQk= +=0iF2 -END PGP SIGNATURE- Modified: dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip == Binary files - no diff available. Modified: dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.asc == --- dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.asc (original) +++ dev/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.asc Tue May 11 14:20:01 2021 @@ -1,16 +1,16 @@ -BEGIN PGP SIGNATURE- -iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAmCZUNIACgkQ7SN4zQmg -jN5inhAAyK3wB/l7TakUTDih5lwFIJH9/Ejh5wQfu6VjyhBrqn8eUh9djQQreHl1 -ZV5Q/rwqo/ySjhDYYfFnoK3y/1EfBjpE2FAACDqtlJVf8f6nKDEPiqYAT6GtPrhY -u+x3O0YovXTq/s2pxsyhzlDmIJv3LmIfJZX9l4yJrBBHKKYhTvjlig9JbckLNSRo -M+lFZpHKGhCvIV0u5+OqzmXqzO4QW7xoOG5ClOfAJnNNMJZ/CGSlshp2bEnqJ/3R -oLIcvJT92jQ+2Lh112Zfp1wLYmqjl3NRIKFq4YHeuuAKTvkUhoGblMnsWZYsY6Dp -g77b9mFY5Z4MoIyQ2LhHW1U55dNohVSXC842dqenkWSnoQng3u4GU7JE7wEER5n+ -AIjruMBTB/XrLJBmUjNwwK9nDgxEz7Z7ew71ScLHzC/0bMzQzluT50iPv1POkijo -aeCaRZlZr5xvsTwoNnLI0ufqPrmhTm5ahkY7JZw/34FtscmYQjNa7OEbpA6tA6C4 -LubVD0MAcMWqvS9rwQF1Xb23EPv20k9V1ZwaIxet6GfzxFLkKg0NIgN2IwmjwdzI -p3XRyV9UjYiRJlC6f14Vm6+n2BNirL68WHrh4g0aPR8viR/bE5C+hjVGcdO12C00 -L1PFRO+crGdzw2m18ZfBSUafyDTWvNJq6pEGsYmYPTwyJprSS+Y= -=achX +iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAmCajJoACgkQ7SN4zQmg +jN5sLhAA2xZn7Kqrg7J5apE832p5aykO9maCGDpBc0XLS8G/6PkRklmHr4Lq/EtD +mkExxI5qlyVxQw2SsfyhscbC8AegqMh1ctpxE3L4Jwc2ZVfAoeP/tdn4EpGLIM5s +xcCU1xttBiSUljioDNwAKiP9KqzSfniVORG+5kZq/ztBOE2CWcgvLLO9G5FcKEcz +CWHdbH8oJK4COFhm8l+0oukAcYL5HRR8vMN6SLqC66ucB3mEej3w1EW+7nYvSz3d +lmp3ED7kaFli7HtCjQCfWyRzuTrutzAL3xmgoTi04DC5OOrisO16Tz3ZUk/2+urq +iv5DYEDBHLtqMyhkrR/lSxdekPPBQ8UFidabNS/781Pexy/4Nr4bSs0SEScHY1ip +qIypHM04GS+taB//XuSdZFHbKm0H6ITZl2HNtYUe804ARFyGur94q3PU5co5ta+T +5/tUErnd4RQTbLzBUWjNSowXFO0ye6eBQ9RicKxy+JQYlR0fXtMBVormppHla83G +nVbPFD/s2os7UTIsZEiQ3lf1PM2yAIljuqg+cmtgN5tZiI/p8VUEhMLd/HnasFOa +HUdx8Yyb5KRmanjer72uIpKO9OA3QcIMPsQ/fEwDSrqK0kFh5BxyJjvKevbx6Z2/ +Vnw9H6HEUwE5PGj9lVHZQuiHoZvNgOqtw5nAouVDc4CTWXaHYBA= +=+ZA/ -END PGP SIGNATURE- Modified: dev/mina/sshd/2.7.0/apache-sshd-2.7.0.pom.asc == --- dev/mina/sshd/2.7.0/apache-sshd-2.7.0.pom.asc (original
[mina-sshd] 01/01: Add changelog for 2.7.0
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git commit c5500e9da63b8d756ac46cf70ff260ded8ec9e23 Author: Guillaume Nodet AuthorDate: Tue May 11 15:42:06 2021 +0200 Add changelog for 2.7.0 --- docs/changes/2.7.0.md | 51 +++ 1 file changed, 51 insertions(+) diff --git a/docs/changes/2.7.0.md b/docs/changes/2.7.0.md new file mode 100644 index 000..a0164af --- /dev/null +++ b/docs/changes/2.7.0.md @@ -0,0 +1,51 @@ +# Introduced in 2.7.0 + +## Major code re-factoring + +* [SSHD-1133](https://issues.apache.org/jira/browse/SSHD-1133) Re-factored locations and names of `ServerSession` and server-side `ChannelSession` related classes +* Moved some helper methods and classes to more natural locations + +## Potential compatibility issues + +## Minor code helpers + +* [SSHD-525](https://issues.apache.org/jira/browse/SSHD-525) Added support for SFTP `posix-ren...@openssh.com` + extension](http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL?rev=1.28=text/x-cvsweb-markup) - see section 3.3 +* [SSHD-1083](https://issues.apache.org/jira/browse/SSHD-1083) Relaxed required `Nio2Connector/Acceptor` required constructor arguments +* [SSHD-1085](https://issues.apache.org/jira/browse/SSHD-1085) Added `CliLogger` + more verbosity on `SshClientMain` +* [SSHD-1109](https://issues.apache.org/jira/browse/SSHD-1109) Route tests JUL logging via SLF4JBridgeHandler +* [SSHD-1109](https://issues.apache.org/jira/browse/SSHD-1109) Provide full slf4j logger capabilities to CliLogger + use it in all CLI classes +* [SSHD-1110](https://issues.apache.org/jira/browse/SSHD-1110) Replace `Class#newInstance()` calls with `Class#getDefaultConstructor().newInstance()` +* [SSHD-](https://issues.apache.org/jira/browse/SSHD-) Fixed SshClientCliSupport compression option detection +* [SSHD-1116](https://issues.apache.org/jira/browse/SSHD-1116) Provide SessionContext argument to HostKeyIdentityProvider#loadHostKeys +* [SSHD-1116](https://issues.apache.org/jira/browse/SSHD-1116) Provide SessionContext argument to PasswordIdentityProvider#loadPasswords +* [SSHD-1116](https://issues.apache.org/jira/browse/SSHD-1116) Provide SessionContext argument to AuthenticationIdentitiesProvider#loadIdentities +* [SSHD-1125](https://issues.apache.org/jira/browse/SSHD-1125) Added option to require immediate close of channel in command `ExitCallback` invocation +* [SSHD-1127](https://issues.apache.org/jira/browse/SSHD-1127) Consolidated `SftpSubsystem` support implementations into `SftpSubsystemConfigurator` +* [SSHD-1148](https://issues.apache.org/jira/browse/SSHD-1148) Generate a unique thread name for each `SftpSubsystem` instance + +## Behavioral changes and enhancements + +* [SSHD-1085](https://issues.apache.org/jira/browse/SSHD-1085) Added more notifications related to channel state change for detecting channel closing or closed earlier. +* [SSHD-1091](https://issues.apache.org/jira/browse/SSHD-1091) Renamed `sshd-contrib` top-level package in order to align naming convention. +* [SSHD-1097](https://issues.apache.org/jira/browse/SSHD-1097) Added more `SessionListener` callbacks related to the initial version and key exchange +* [SSHD-1097](https://issues.apache.org/jira/browse/SSHD-1097) Added more capability to send peer identification via `ReservedSessionMessagesHandler` +* [SSHD-1097](https://issues.apache.org/jira/browse/SSHD-1097) Implemented [endless tarpit](https://nullprogram.com/blog/2019/03/22/) example in sshd-contrib +* [SSHD-1109](https://issues.apache.org/jira/browse/SSHD-1109) Replace log4j with logback as the slf4j logger implementation for tests +* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added callbacks for client-side password authentication progress +* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added callbacks for client-side public key authentication progress +* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added callbacks for client-side host-based authentication progress +* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added capability for interactive password authentication participation via UserInteraction +* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added capability for interactive key based authentication participation via UserInteraction +* [SSHD-1123](https://issues.apache.org/jira/browse/SSHD-1123) Add option to chunk data in ChannelAsyncOutputStream if window size is smaller than packet size +* [SSHD-1125](https://issues.apache.org/jira/browse/SSHD-1125) Added mechanism to throttle pending write requests in BufferedIoOutputStream +* [SSHD-1127](https://issues.apache.org/jira/browse/SSHD-1127) Added capability to register a custom receiver for SFTP STDERR channel raw or stream data +* [SSHD-1132](https
[mina-sshd] branch master updated (9bcd686 -> c5500e9)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git. omit 9bcd686 Add changelog for 2.7.0 omit 3601ce8 [maven-release-plugin] prepare for next development iteration omit 09d14bf [maven-release-plugin] prepare release sshd-2.7.0 new c5500e9 Add changelog for 2.7.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9bcd686) \ N -- N -- N refs/heads/master (c5500e9) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: assembly/pom.xml | 2 +- pom.xml | 10 +- sshd-cli/pom.xml | 2 +- sshd-common/pom.xml | 2 +- sshd-contrib/pom.xml | 2 +- sshd-core/pom.xml| 2 +- sshd-git/pom.xml | 2 +- sshd-ldap/pom.xml| 2 +- sshd-mina/pom.xml| 2 +- sshd-netty/pom.xml | 2 +- sshd-openpgp/pom.xml | 2 +- sshd-osgi/pom.xml| 2 +- sshd-putty/pom.xml | 2 +- sshd-scp/pom.xml | 2 +- sshd-sftp/pom.xml| 2 +- sshd-spring-sftp/pom.xml | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-)
[mina-sshd] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 4ab8c06 [maven-release-plugin] prepare for next development iteration
4ab8c06 is described below
commit 4ab8c060b6cc7237629dc84d2523d297a852474a
Author: Guillaume Nodet
AuthorDate: Tue May 11 15:54:44 2021 +0200
[maven-release-plugin] prepare for next development iteration
---
assembly/pom.xml | 2 +-
pom.xml | 4 ++--
sshd-cli/pom.xml | 2 +-
sshd-common/pom.xml | 2 +-
sshd-contrib/pom.xml | 2 +-
sshd-core/pom.xml| 2 +-
sshd-git/pom.xml | 2 +-
sshd-ldap/pom.xml| 2 +-
sshd-mina/pom.xml| 2 +-
sshd-netty/pom.xml | 2 +-
sshd-openpgp/pom.xml | 2 +-
sshd-osgi/pom.xml| 2 +-
sshd-putty/pom.xml | 2 +-
sshd-scp/pom.xml | 2 +-
sshd-sftp/pom.xml| 2 +-
sshd-spring-sftp/pom.xml | 2 +-
16 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 3b1469f..1fe1237 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.7.0
+2.7.1-SNAPSHOT
apache-sshd
diff --git a/pom.xml b/pom.xml
index e84083f..e29a7f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.sshd
sshd
-2.7.0
+2.7.1-SNAPSHOT
Apache Mina SSHD
pom
2008
@@ -75,7 +75,7 @@
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
https://github.com/apache/mina-sshd/tree/${project.scm.tag}
-sshd-2.7.0
+master
diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml
index 7b83e43..50fd663 100644
--- a/sshd-cli/pom.xml
+++ b/sshd-cli/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.7.0
+2.7.1-SNAPSHOT
sshd-cli
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index a6299b7..2829224 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.7.0
+2.7.1-SNAPSHOT
..
diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml
index d23ef1d..4c2a1f8 100644
--- a/sshd-contrib/pom.xml
+++ b/sshd-contrib/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.7.0
+2.7.1-SNAPSHOT
[mina-sshd] annotated tag sshd-2.7.0 created (now 3e3a588)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to annotated tag sshd-2.7.0 in repository https://gitbox.apache.org/repos/asf/mina-sshd.git. at 3e3a588 (tag) tagging 2772c7c8f6afb8c53546ca803501f52118bd0491 (commit) replaces sshd-2.6.0 by Guillaume Nodet on Tue May 11 15:54:39 2021 +0200 - Log - [maven-release-plugin] copy for tag sshd-2.7.0 --- No new revisions were added by this update.
[mina-sshd] branch master updated: [maven-release-plugin] prepare release sshd-2.7.0
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 2772c7c [maven-release-plugin] prepare release sshd-2.7.0
2772c7c is described below
commit 2772c7c8f6afb8c53546ca803501f52118bd0491
Author: Guillaume Nodet
AuthorDate: Tue May 11 15:54:35 2021 +0200
[maven-release-plugin] prepare release sshd-2.7.0
---
assembly/pom.xml | 2 +-
pom.xml | 12 ++--
sshd-cli/pom.xml | 2 +-
sshd-common/pom.xml | 2 +-
sshd-contrib/pom.xml | 2 +-
sshd-core/pom.xml| 2 +-
sshd-git/pom.xml | 2 +-
sshd-ldap/pom.xml| 2 +-
sshd-mina/pom.xml| 2 +-
sshd-netty/pom.xml | 2 +-
sshd-openpgp/pom.xml | 2 +-
sshd-osgi/pom.xml| 2 +-
sshd-putty/pom.xml | 2 +-
sshd-scp/pom.xml | 2 +-
sshd-sftp/pom.xml| 2 +-
sshd-spring-sftp/pom.xml | 2 +-
16 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index f1ded23..3b1469f 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.6.1-SNAPSHOT
+2.7.0
apache-sshd
diff --git a/pom.xml b/pom.xml
index 0c38bc6..e84083f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.sshd
sshd
-2.6.1-SNAPSHOT
+2.7.0
Apache Mina SSHD
pom
2008
@@ -75,7 +75,7 @@
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
https://github.com/apache/mina-sshd/tree/${project.scm.tag}
-master
+sshd-2.7.0
@@ -745,22 +745,22 @@
org.apache.maven.scm
maven-scm-api
->${scm.plugin.version}
+${scm.plugin.version}
org.apache.maven.scm
maven-scm-provider-gitexe
->${scm.plugin.version}
+${scm.plugin.version}
org.apache.maven.scm
maven-scm-provider-svn-commons
->${scm.plugin.version}
+${scm.plugin.version}
org.apache.maven.scm
maven-scm-provider-svnexe
->${scm.plugin.version}
+${scm.plugin.version}
diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml
index c5b890c..7b83e43 100644
--- a/sshd-cli/pom.xml
+++ b/sshd-cli/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.6.1-SNAPSHOT
+2.7.0
sshd-cli
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index 6c8cd8c..a6299b7 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.6.1-SNAPSHOT
+2.7.0
..
diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml
index bb37464..d23ef1d 100644
--- a/sshd-contrib/pom.xml
+++ b/sshd-contrib/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.6.1-SNAPSHOT
+2.7.0
[mina-sshd] branch master updated: Add changelog for 2.7.0
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git The following commit(s) were added to refs/heads/master by this push: new 9d346a9 Add changelog for 2.7.0 9d346a9 is described below commit 9d346a99fc39dfddb034912577df6b77036fdd72 Author: Guillaume Nodet AuthorDate: Mon May 10 20:41:07 2021 +0200 Add changelog for 2.7.0 --- docs/changes/2.7.0.md | 51 +++ 1 file changed, 51 insertions(+) diff --git a/docs/changes/2.7.0.md b/docs/changes/2.7.0.md new file mode 100644 index 000..705bcbf --- /dev/null +++ b/docs/changes/2.7.0.md @@ -0,0 +1,51 @@ +# Introduced in 2.6.0 + +## Major code re-factoring + +* [SSHD-1133](https://issues.apache.org/jira/browse/SSHD-1133) Re-factored locations and names of `ServerSession` and server-side `ChannelSession` related classes +* Moved some helper methods and classes to more natural locations + +## Potential compatibility issues + +## Minor code helpers + +* [SSHD-525](https://issues.apache.org/jira/browse/SSHD-525) Added support for SFTP `posix-ren...@openssh.com` + extension](http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL?rev=1.28=text/x-cvsweb-markup) - see section 3.3 +* [SSHD-1083](https://issues.apache.org/jira/browse/SSHD-1083) Relaxed required `Nio2Connector/Acceptor` required constructor arguments +* [SSHD-1085](https://issues.apache.org/jira/browse/SSHD-1085) Added `CliLogger` + more verbosity on `SshClientMain` +* [SSHD-1109](https://issues.apache.org/jira/browse/SSHD-1109) Route tests JUL logging via SLF4JBridgeHandler +* [SSHD-1109](https://issues.apache.org/jira/browse/SSHD-1109) Provide full slf4j logger capabilities to CliLogger + use it in all CLI classes +* [SSHD-1110](https://issues.apache.org/jira/browse/SSHD-1110) Replace `Class#newInstance()` calls with `Class#getDefaultConstructor().newInstance()` +* [SSHD-](https://issues.apache.org/jira/browse/SSHD-) Fixed SshClientCliSupport compression option detection +* [SSHD-1116](https://issues.apache.org/jira/browse/SSHD-1116) Provide SessionContext argument to HostKeyIdentityProvider#loadHostKeys +* [SSHD-1116](https://issues.apache.org/jira/browse/SSHD-1116) Provide SessionContext argument to PasswordIdentityProvider#loadPasswords +* [SSHD-1116](https://issues.apache.org/jira/browse/SSHD-1116) Provide SessionContext argument to AuthenticationIdentitiesProvider#loadIdentities +* [SSHD-1125](https://issues.apache.org/jira/browse/SSHD-1125) Added option to require immediate close of channel in command `ExitCallback` invocation +* [SSHD-1127](https://issues.apache.org/jira/browse/SSHD-1127) Consolidated `SftpSubsystem` support implementations into `SftpSubsystemConfigurator` +* [SSHD-1148](https://issues.apache.org/jira/browse/SSHD-1148) Generate a unique thread name for each `SftpSubsystem` instance + +## Behavioral changes and enhancements + +* [SSHD-1085](https://issues.apache.org/jira/browse/SSHD-1085) Added more notifications related to channel state change for detecting channel closing or closed earlier. +* [SSHD-1091](https://issues.apache.org/jira/browse/SSHD-1091) Renamed `sshd-contrib` top-level package in order to align naming convention. +* [SSHD-1097](https://issues.apache.org/jira/browse/SSHD-1097) Added more `SessionListener` callbacks related to the initial version and key exchange +* [SSHD-1097](https://issues.apache.org/jira/browse/SSHD-1097) Added more capability to send peer identification via `ReservedSessionMessagesHandler` +* [SSHD-1097](https://issues.apache.org/jira/browse/SSHD-1097) Implemented [endless tarpit](https://nullprogram.com/blog/2019/03/22/) example in sshd-contrib +* [SSHD-1109](https://issues.apache.org/jira/browse/SSHD-1109) Replace log4j with logback as the slf4j logger implementation for tests +* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added callbacks for client-side password authentication progress +* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added callbacks for client-side public key authentication progress +* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added callbacks for client-side host-based authentication progress +* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added capability for interactive password authentication participation via UserInteraction +* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added capability for interactive key based authentication participation via UserInteraction +* [SSHD-1123](https://issues.apache.org/jira/browse/SSHD-1123) Add option to chunk data in ChannelAsyncOutputStream if window size is smaller than packet size +* [SSHD-1125](https://issues.apache.org/jira/browse/SSHD-1125) Added mechanism to throttle pending write requests in BufferedIoOutputStream +* [SSHD-1127](https://issues.apache.org/jira
[mina-sshd] 01/01: Add changelog for 2.7.0
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git commit 9bcd6865e9cf8cd77fbd969a9202e520c6377904 Author: Guillaume Nodet AuthorDate: Mon May 10 20:41:07 2021 +0200 Add changelog for 2.7.0 --- docs/changes/2.7.0.md | 51 +++ 1 file changed, 51 insertions(+) diff --git a/docs/changes/2.7.0.md b/docs/changes/2.7.0.md new file mode 100644 index 000..a0164af --- /dev/null +++ b/docs/changes/2.7.0.md @@ -0,0 +1,51 @@ +# Introduced in 2.7.0 + +## Major code re-factoring + +* [SSHD-1133](https://issues.apache.org/jira/browse/SSHD-1133) Re-factored locations and names of `ServerSession` and server-side `ChannelSession` related classes +* Moved some helper methods and classes to more natural locations + +## Potential compatibility issues + +## Minor code helpers + +* [SSHD-525](https://issues.apache.org/jira/browse/SSHD-525) Added support for SFTP `posix-ren...@openssh.com` + extension](http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL?rev=1.28=text/x-cvsweb-markup) - see section 3.3 +* [SSHD-1083](https://issues.apache.org/jira/browse/SSHD-1083) Relaxed required `Nio2Connector/Acceptor` required constructor arguments +* [SSHD-1085](https://issues.apache.org/jira/browse/SSHD-1085) Added `CliLogger` + more verbosity on `SshClientMain` +* [SSHD-1109](https://issues.apache.org/jira/browse/SSHD-1109) Route tests JUL logging via SLF4JBridgeHandler +* [SSHD-1109](https://issues.apache.org/jira/browse/SSHD-1109) Provide full slf4j logger capabilities to CliLogger + use it in all CLI classes +* [SSHD-1110](https://issues.apache.org/jira/browse/SSHD-1110) Replace `Class#newInstance()` calls with `Class#getDefaultConstructor().newInstance()` +* [SSHD-](https://issues.apache.org/jira/browse/SSHD-) Fixed SshClientCliSupport compression option detection +* [SSHD-1116](https://issues.apache.org/jira/browse/SSHD-1116) Provide SessionContext argument to HostKeyIdentityProvider#loadHostKeys +* [SSHD-1116](https://issues.apache.org/jira/browse/SSHD-1116) Provide SessionContext argument to PasswordIdentityProvider#loadPasswords +* [SSHD-1116](https://issues.apache.org/jira/browse/SSHD-1116) Provide SessionContext argument to AuthenticationIdentitiesProvider#loadIdentities +* [SSHD-1125](https://issues.apache.org/jira/browse/SSHD-1125) Added option to require immediate close of channel in command `ExitCallback` invocation +* [SSHD-1127](https://issues.apache.org/jira/browse/SSHD-1127) Consolidated `SftpSubsystem` support implementations into `SftpSubsystemConfigurator` +* [SSHD-1148](https://issues.apache.org/jira/browse/SSHD-1148) Generate a unique thread name for each `SftpSubsystem` instance + +## Behavioral changes and enhancements + +* [SSHD-1085](https://issues.apache.org/jira/browse/SSHD-1085) Added more notifications related to channel state change for detecting channel closing or closed earlier. +* [SSHD-1091](https://issues.apache.org/jira/browse/SSHD-1091) Renamed `sshd-contrib` top-level package in order to align naming convention. +* [SSHD-1097](https://issues.apache.org/jira/browse/SSHD-1097) Added more `SessionListener` callbacks related to the initial version and key exchange +* [SSHD-1097](https://issues.apache.org/jira/browse/SSHD-1097) Added more capability to send peer identification via `ReservedSessionMessagesHandler` +* [SSHD-1097](https://issues.apache.org/jira/browse/SSHD-1097) Implemented [endless tarpit](https://nullprogram.com/blog/2019/03/22/) example in sshd-contrib +* [SSHD-1109](https://issues.apache.org/jira/browse/SSHD-1109) Replace log4j with logback as the slf4j logger implementation for tests +* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added callbacks for client-side password authentication progress +* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added callbacks for client-side public key authentication progress +* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added callbacks for client-side host-based authentication progress +* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added capability for interactive password authentication participation via UserInteraction +* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added capability for interactive key based authentication participation via UserInteraction +* [SSHD-1123](https://issues.apache.org/jira/browse/SSHD-1123) Add option to chunk data in ChannelAsyncOutputStream if window size is smaller than packet size +* [SSHD-1125](https://issues.apache.org/jira/browse/SSHD-1125) Added mechanism to throttle pending write requests in BufferedIoOutputStream +* [SSHD-1127](https://issues.apache.org/jira/browse/SSHD-1127) Added capability to register a custom receiver for SFTP STDERR channel raw or stream data +* [SSHD-1132](https
[mina-sshd] branch master updated (9d346a9 -> 9bcd686)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git. discard 9d346a9 Add changelog for 2.7.0 new 9bcd686 Add changelog for 2.7.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9d346a9) \ N -- N -- N refs/heads/master (9bcd686) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: docs/changes/2.7.0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[mina-sshd] branch master updated: Update changelog
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git The following commit(s) were added to refs/heads/master by this push: new 7ca63e9 Update changelog 7ca63e9 is described below commit 7ca63e9cd7712643ffcccb07cace945dfd6d878b Author: Guillaume Nodet AuthorDate: Mon May 31 16:48:43 2021 +0200 Update changelog --- CHANGES.md | 49 - 1 file changed, 8 insertions(+), 41 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index b2d5345..ce9fc83 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,54 +10,21 @@ # [Version 2.5.1 to 2.6.0](./docs/changes/2.6.0.md) +# [Version 2.6.0 to 2.7.0](./docs/changes/2.7.0.md) + # Planned for next version ## Major code re-factoring -* [SSHD-1133](https://issues.apache.org/jira/browse/SSHD-1133) Re-factored locations and names of `ServerSession` and server-side `ChannelSession` related classes -* Moved some helper methods and classes to more natural locations - ## Potential compatibility issues ## Minor code helpers -* [SSHD-525](https://issues.apache.org/jira/browse/SSHD-525) Added support for SFTP `posix-ren...@openssh.com` - extension](http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL?rev=1.28=text/x-cvsweb-markup) - see section 3.3 -* [SSHD-1083](https://issues.apache.org/jira/browse/SSHD-1083) Relaxed required `Nio2Connector/Acceptor` required constructor arguments -* [SSHD-1085](https://issues.apache.org/jira/browse/SSHD-1085) Added `CliLogger` + more verbosity on `SshClientMain` -* [SSHD-1109](https://issues.apache.org/jira/browse/SSHD-1109) Route tests JUL logging via SLF4JBridgeHandler -* [SSHD-1109](https://issues.apache.org/jira/browse/SSHD-1109) Provide full slf4j logger capabilities to CliLogger + use it in all CLI classes -* [SSHD-1110](https://issues.apache.org/jira/browse/SSHD-1110) Replace `Class#newInstance()` calls with `Class#getDefaultConstructor().newInstance()` -* [SSHD-](https://issues.apache.org/jira/browse/SSHD-) Fixed SshClientCliSupport compression option detection -* [SSHD-1116](https://issues.apache.org/jira/browse/SSHD-1116) Provide SessionContext argument to HostKeyIdentityProvider#loadHostKeys -* [SSHD-1116](https://issues.apache.org/jira/browse/SSHD-1116) Provide SessionContext argument to PasswordIdentityProvider#loadPasswords -* [SSHD-1116](https://issues.apache.org/jira/browse/SSHD-1116) Provide SessionContext argument to AuthenticationIdentitiesProvider#loadIdentities -* [SSHD-1125](https://issues.apache.org/jira/browse/SSHD-1125) Added option to require immediate close of channel in command `ExitCallback` invocation -* [SSHD-1127](https://issues.apache.org/jira/browse/SSHD-1127) Consolidated `SftpSubsystem` support implementations into `SftpSubsystemConfigurator` -* [SSHD-1148](https://issues.apache.org/jira/browse/SSHD-1148) Generate a unique thread name for each `SftpSubsystem` instance - ## Behavioral changes and enhancements -* [SSHD-1085](https://issues.apache.org/jira/browse/SSHD-1085) Added more notifications related to channel state change for detecting channel closing or closed earlier. -* [SSHD-1091](https://issues.apache.org/jira/browse/SSHD-1091) Renamed `sshd-contrib` top-level package in order to align naming convention. -* [SSHD-1097](https://issues.apache.org/jira/browse/SSHD-1097) Added more `SessionListener` callbacks related to the initial version and key exchange -* [SSHD-1097](https://issues.apache.org/jira/browse/SSHD-1097) Added more capability to send peer identification via `ReservedSessionMessagesHandler` -* [SSHD-1097](https://issues.apache.org/jira/browse/SSHD-1097) Implemented [endless tarpit](https://nullprogram.com/blog/2019/03/22/) example in sshd-contrib -* [SSHD-1109](https://issues.apache.org/jira/browse/SSHD-1109) Replace log4j with logback as the slf4j logger implementation for tests -* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added callbacks for client-side password authentication progress -* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added callbacks for client-side public key authentication progress -* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added callbacks for client-side host-based authentication progress -* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added capability for interactive password authentication participation via UserInteraction -* [SSHD-1114](https://issues.apache.org/jira/browse/SSHD-1114) Added capability for interactive key based authentication participation via UserInteraction -* [SSHD-1123](https://issues.apache.org/jira/browse/SSHD-1123) Add option to chunk data in ChannelAsyncOutputStream if window size is smaller than packet size -* [SSHD-1125](https://issues.apache.org/jira/browse/SSHD-1125) Added mechanism to throttle pending write requests
svn commit: r47940 - /release/mina/KEYS
Author: gnodet Date: Thu May 27 18:52:14 2021 New Revision: 47940 Log: Add new signing key Modified: release/mina/KEYS Modified: release/mina/KEYS == --- release/mina/KEYS (original) +++ release/mina/KEYS Thu May 27 18:52:14 2021 @@ -391,3 +391,61 @@ wsPhV4rB7bKX6TCh4/MrxJndwLtq3W3eeUEIRg+Z x8r+e54Nkx1FPMjEyKsbPA== =5N9u -END PGP PUBLIC KEY BLOCK- +pub rsa4096 2009-12-18 [SC] + 21FE F21E 20A5 1258 772B 5CF2 76A9 EA6E 51FB C17B +uid [ unknown] Guillaume Nodet (CODE SIGNING KEY) +sig 376A9EA6E51FBC17B 2009-12-18 Guillaume Nodet (CODE SIGNING KEY) +sub rsa4096 2009-12-18 [E] +sig 76A9EA6E51FBC17B 2009-12-18 Guillaume Nodet (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBEsriDgBEAClr/1HFRy1PapZlBeNk/OigVa1QPGayq9gph1HpVKzG6FtPZbC ++DBLXpDNtpy9Jr3A/dLzLmZU125CjduYykRvKnYQhXL4/MR7Jvhxb9holbOkhNBy +aIpbihoZzpuIEAa4NcIk4JR3c+B1l9HRAU9KPWUKhOSUO5QEbJ1SMgfjYGye7V5u +28tsoMZmJ1khy0sJeP4v0CZBQZ4Dtbgeqpzbafdcth8rzH8O9g/FA0DdUbgDDxWM +ee0T1gei/D69ZRKFycYnt+9woejeQ1z6ougr9u/DWlIW2Z9z2yH9YG7JsZB7goHo +4Jm0q5QRJQ2J9HwnqJgwRx4McZsOnIRQJVA4s6sCu4O44gPbPfYBJPdenLPC8bKE +4iFoqngTxB9hHdGmBWCxaArxKok3Fnaa1EtmhNRtEXh6wcfa+msa7sGJSRA88qOK +w1BAL8f850T9wCK2j5OR3UcEAyuqLz+9+zEQa1EJ+ts02IxxeFP5NqUtEmyLvx32 +iDiOwedX1inQEvP/GaXMBLM/X/Cxk+K+EWZ5HawuvUlI8Z64q/l0ZKeukjwIAms8 +/dR3/RYVBm+ufjgJQcuJ3POVucJrAeUKgQroOMCwFZRsmabDMID0akFmUJ0oheUq +aO100cDVHgoUjuRNMQaGqx38KCPGFIx90AmnrPisRzpAcSECRwx2EUeVqwARAQAB +tDZHdWlsbGF1bWUgTm9kZXQgKENPREUgU0lHTklORyBLRVkpIDxnbm9kZXRAYXBh +Y2hlLm9yZz6JAjcEEwEKACEFAksriDgCGwMFCwkIBwMFFQoJCAsFFgIDAQACHgEC +F4AACgkQdqnqblH7wXt4tQ/+KZnKjRCFdy0qXvj562CUM5Sw+8v4RFvJXdHTua/L +DhpYkWmfp/ISpCXBIC0Oq1CKysu0WaDrEuB/n8MSKs1yHpxlhUpo+z9/gyvird7g +gyQQr2m83G/OCW3DY+eLYwEtON9+m6kfqd2S6ZiFCRxJ5E3KS4QqJEuEm5VKgCW6 +kjLUNgJa7xxeappDb27VbpLTcDSLSRU5qk2WlpAgtafuUnEsPRnJSm1I7tO1yIf5 +8s3+lEWmTmJy+fHfch2bMFTPToiJqkEE+aUlYN9k9t8tFJVrSY9kXU96cNc2YPBQ +V3ziTF6X0zwnH4s5gY+eAT7VQUwwqDOA8RzeXmEICXtmQoX5ITpUvcmKGTrdu2MB +bWAEdwbfXn7HwFQMqWlyT+Pil4HAy/Tp5lolS+ZMVyFqXSygKnBPmw1zDEHx2DFP +Yty7h3QOHwrU4UAElE6K1lzMDYyvAh53HRn4Kl8JbVrD2Wf/jvKGa/6iOAc1zcEz +ApT7ELIlLKHdrkty97lEj16EkmdYqBEIIzLeNObM+I0/I6gAvfG8O5zQ5OjnfPlU +CpHjat6+CBOk2p89YeLqsiUKKDyjvMr18hDny8vD6BmYVV/f+bKTjogRKzLB0+gN +XIUvJE4izKJrqJTnQSBif//dJ5DKFz0cPjv3eP3Q4S8Nv7/7Wp9+AUkSDQ+365Ku +goW5Ag0ESyuIOAEQALI4kEoqBEx2tHo+f5wkfN/ekQBuv7C3NMPY3yhpSd6+Bv6m +ssAaC4Ezt0AuPivEVbxariVNv9rhL9YFfShJMTPyZjByMH/Xhw9k89ABZdOOW1Io +nWIn3lhXnsOZN8wfIdDde1QDJIvcauiJOmg9AMKUnt4KZ7F0wQjDSDBYZETJKnQH +TQM3pFUEjuueBvuRLPXgTcPIkJ/gQXhAksRKsB0ECc2S5+MIf6at1UA4Y0i8vHjd +utbkoA1B5t/TR+v23GUyXAEHu7w+0KtXg/iFePNfU+EYdfvVYXM2EtmYsHMohZJj +H9u+zcZ/war4ggPRS+b7CysyH/xK+3+6sd5hz70hKpTS33vLyXv4bDPyKr4pHJ2a +eUoT4a1zIxJkpbsQvfu7xljfyLQRA6g+fCVHpSbMrVXR/TEiYZUrD5dAUw62f5zX +vyQd8t/i0RhJoZcqNghhsn8nJkSfohhqTbtC7MQnESrCnSO+3B4DWZXSM7DMh4LB +XgiWGdwSHgeJLwKQKdSTCBlfez18s68VX3/Couzn8e0m+XqAwnrUy59IgtcmHQT+ +4RFSBVSbX8AQI/oEM/2V6qWpiJaDaBHWqimjrdIco8gdq60uZBLJg0z3dmp/Ydbe +GlGAmIYwbIkkL40i7ItEPoc9OeJiX8DwhGStVfwgIVJU1KCtLkyCr5TTKzcvABEB +AAGJAh8EGAEKAAkFAksriDgCGwwACgkQdqnqblH7wXuIWhAAnxy2xSPTpi8Iyo7a +FASS3+o33MQpe6Tgl36qjQPrOmdfgQiCTAvqYSIAa6rltIRQ+IY87UgLxYaPlkyi +HY93qghVj5O4unPGv3c5SXpyE8AqN9HvngC7V453JVkdtn6aVYTaZ3zqcLD7ReuL +IUoltLAbWJ6Vl3JY3sjs89U0YX+isJksmo0kqIe6fwwccDRB/jlOqgXjUfN2pngk +nv28sDUtVJKFxYqHg+Sz6PJz+xW4i7jB3gptWqrBrFEeuAyM7PvOLRQqiOYzdGqv +a7u42eH48nOXwEEGLp1a/Z4BGHmT3Qd3S2DulfAxmXf+nePTpueugzKRJo7bSAeI +J+QhuhfCYLz2MsFbP5Y4zeEQQNjaLHyAcOuNDVqCYvm4+mVaCBmMB93/IgqBjjby +AMR/1CrNXuQJj4e8yQ2WgJ7ib+0epqT0hlKjiMmNCSvkpKkznVPr+a6154Ii7skf +xROgM+9kKKcfE5AvV6KAeiWmGdCtw/+hQOrrhp+6mrYxOgx/iO16Xa5T7sapnmQS +ij9VV+fE0skmm10w43N+uS9S/hZTfgRvNhLJkErXEowhgcNjOCVcJIxRAD3E1ijB +D7LvwqXByGpy2TeVdHVEuKDLTlOSjXHkS/CpdpIqtLzg3ej7LD7jC6p+CJsJZnGd +gpuNIhyLmiswcAoXc4WAfuA7nsE= +=cQ2P +-END PGP PUBLIC KEY BLOCK-
[mina-site] branch master updated: Add SSHD 2.7.0 release
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-site.git The following commit(s) were added to refs/heads/master by this push: new 26091f1 Add SSHD 2.7.0 release 26091f1 is described below commit 26091f1493f1084c0e492365bb1b6de0b00732fb Author: Guillaume Nodet AuthorDate: Mon May 31 11:00:16 2021 +0200 Add SSHD 2.7.0 release --- config.toml | 2 +- source/downloads-sshd.md | 16 +--- source/sshd-project/download_2.7.0.md | 19 +++ source/sshd-project/downloads.md | 16 +--- 4 files changed, 38 insertions(+), 15 deletions(-) diff --git a/config.toml b/config.toml index e9b1525..03d659c 100644 --- a/config.toml +++ b/config.toml @@ -37,5 +37,5 @@ version_asyncweb = "2.0.0-SNAPSHOT" version_mina_2_0 = "2.0.21" version_mina_2_1 = "2.1.3" version_ftpserver = "1.1.1" -version_sshd = "2.6.0" +version_sshd = "2.7.0" version_vysper = "0.7" diff --git a/source/downloads-sshd.md b/source/downloads-sshd.md index 984fdb7..27fcd61 100644 --- a/source/downloads-sshd.md +++ b/source/downloads-sshd.md @@ -4,15 +4,15 @@ title: Downloads # Latest SSHD Releases -The latest release is the SSHD 2.6.0 release. -Apache Mina SSHD 2.6.0 contains a number of [enhancements and bug-fixes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310849=12348366). - +The latest release is the SSHD 2.7.0 release. +Apache Mina SSHD 2.7.0 contains a number of [enhancements and bug-fixes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310849=12349400). + * Source distributions: -* [Apache Mina SSHD 2.6.0 Sources (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0-src.tar.gz.sha512) -* [Apache Mina SSHD 2.6.0 Sources (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0-src.zip.sha512) +* [Apache Mina SSHD 2.7.0 Sources (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.sha512) +* [Apache Mina SSHD 2.7.0 Sources (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.sha512) * Binary distributions: -* [Apache Mina SSHD 2.6.0 Binary (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.6.0/apache-sshd-2.6.0.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0.tar.gz.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0.tar.gz.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0.tar.gz.sha512) -* [Apache Mina SSHD 2.6.0 Binary (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.6.0/apache-sshd-2.6.0.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0.zip.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0.zip.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.6.0/apache-sshd-2.6.0.zip.sha512) +* [Apache Mina SSHD 2.7.0 Binary (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.sha512) +* [Apache Mina SSHD 2.7.0 Binary (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.7.0/apache-sshd-2.7.0.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0.zip.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0.zip.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0.zip.sha512) # Development snapshots @@ -50,3 +50,5 @@ You can [build](sshd
svn commit: r48018 - in /release/mina/sshd: 2.6.0/ 2.7.0/
Author: gnodet
Date: Mon May 31 08:35:21 2021
New Revision: 48018
Log:
Apache Mina SSHD 2.7.0 release
Added:
release/mina/sshd/2.7.0/
release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz (with props)
release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.asc
release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip (with props)
release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.asc
release/mina/sshd/2.7.0/apache-sshd-2.7.0.pom
release/mina/sshd/2.7.0/apache-sshd-2.7.0.pom.asc
release/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz (with props)
release/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.asc
release/mina/sshd/2.7.0/apache-sshd-2.7.0.zip (with props)
release/mina/sshd/2.7.0/apache-sshd-2.7.0.zip.asc
Removed:
release/mina/sshd/2.6.0/
Added: release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz
==
Binary file - no diff available.
Propchange: release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz
--
svn:mime-type = application/octet-stream
Added: release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.asc
==
--- release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.asc (added)
+++ release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.asc Mon May 31
08:35:21 2021
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAmCajJkACgkQ7SN4zQmg
+jN7iyhAArcD1GM3n2wQnbFPrBDH7I5ntKKCkGrq0Hf/rjX3MA/VgWoYNr/Eo90gc
+sUYLf7DoOJloa0ld6+xhx6YwD6WL3Rl3N40cnmjNjuWLjkyBF3MJEhZUJP8YC0JZ
+hUA24b/A7PmnummHWZecX0VdIcf76AxsZXrdEzX77GdcXhFJdUIIUZr976nljCAI
+gyB841F8rrW5sISJ74/x+ndgHCbdi/KGx7hUYxVk7ums3rfXNf6cbKGMtTYvrDow
+y3PmiZev4xChTXVd7zepacLowty5Sd5anGUdkPQGAn0YwXgTHTnFXH4S8WvJlds+
+3QmdazWk1fdoZMcVm15eODAekoz2pqEktHs/E1P2JcOMYgRzyi2fRwjr/V3yrR0a
+iLd9q8RCzYQfutlON0p/2dMdeaGt9JWO8TeKCW4X7ihmIGnsTlKNCNflAkJ83c/9
+foTv/u4FUwWHMQRxDT+8KiK0d8DmtAWwQvn2uPxEWjDHEGRUMjBcgsdbrNLCajVU
+v9Ki399SJ1UmWZDEh07muZQ4ARyfPpfdlnhZ5HKQJCe5wxhxswYxO9eIpDBYX/4e
+9r2wyvbVTjlmSU669I/wUoo/Ptz0tz9bvcsQwS8bCW0wZGq6zhPvMMLpwNIOZQrS
+FdEfi7MnbPARx3glUtPDy44Sfo/bhBEA3qVxlHCqMFleRVlBmQk=
+=0iF2
+-END PGP SIGNATURE-
Added: release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip
==
Binary file - no diff available.
Propchange: release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip
--
svn:mime-type = application/octet-stream
Added: release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.asc
==
--- release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.asc (added)
+++ release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.asc Mon May 31 08:35:21
2021
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAmCajJoACgkQ7SN4zQmg
+jN5sLhAA2xZn7Kqrg7J5apE832p5aykO9maCGDpBc0XLS8G/6PkRklmHr4Lq/EtD
+mkExxI5qlyVxQw2SsfyhscbC8AegqMh1ctpxE3L4Jwc2ZVfAoeP/tdn4EpGLIM5s
+xcCU1xttBiSUljioDNwAKiP9KqzSfniVORG+5kZq/ztBOE2CWcgvLLO9G5FcKEcz
+CWHdbH8oJK4COFhm8l+0oukAcYL5HRR8vMN6SLqC66ucB3mEej3w1EW+7nYvSz3d
+lmp3ED7kaFli7HtCjQCfWyRzuTrutzAL3xmgoTi04DC5OOrisO16Tz3ZUk/2+urq
+iv5DYEDBHLtqMyhkrR/lSxdekPPBQ8UFidabNS/781Pexy/4Nr4bSs0SEScHY1ip
+qIypHM04GS+taB//XuSdZFHbKm0H6ITZl2HNtYUe804ARFyGur94q3PU5co5ta+T
+5/tUErnd4RQTbLzBUWjNSowXFO0ye6eBQ9RicKxy+JQYlR0fXtMBVormppHla83G
+nVbPFD/s2os7UTIsZEiQ3lf1PM2yAIljuqg+cmtgN5tZiI/p8VUEhMLd/HnasFOa
+HUdx8Yyb5KRmanjer72uIpKO9OA3QcIMPsQ/fEwDSrqK0kFh5BxyJjvKevbx6Z2/
+Vnw9H6HEUwE5PGj9lVHZQuiHoZvNgOqtw5nAouVDc4CTWXaHYBA=
+=+ZA/
+-END PGP SIGNATURE-
Added: release/mina/sshd/2.7.0/apache-sshd-2.7.0.pom
==
--- release/mina/sshd/2.7.0/apache-sshd-2.7.0.pom (added)
+++ release/mina/sshd/2.7.0/apache-sshd-2.7.0.pom Mon May 31 08:35:21 2021
@@ -0,0 +1,210 @@
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0
https://maven.apache.org/maven-v4_0_0.xsd;>
+
+
+4.0.0
+
+
+org.apache.sshd
+sshd
+2.7.0
+
+
+apache-sshd
+Apache Mina SSHD :: Assembly
+pom
+
+
+${project.basedir}/..
+
+
+
+
+org.apache.sshd
+sshd-common
+${project.version}
+
+
+org.apache.sshd
+sshd-core
+${project.version}
+
+
+org.apache.sshd
+sshd-scp
+${project.version}
+
+
+org.apache.sshd
+sshd-sftp
+${project.version}
+
+
+org.apache.sshd
+
svn commit: r48019 - /release/mina/sshd/2.7.0/
Author: gnodet Date: Mon May 31 08:54:31 2021 New Revision: 48019 Log: Apache Mina SSHD 2.7.0 release (add sha checksums) Added: release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.sha256 release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.sha512 release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.sha256 release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.sha512 release/mina/sshd/2.7.0/apache-sshd-2.7.0.pom.sha256 release/mina/sshd/2.7.0/apache-sshd-2.7.0.pom.sha512 release/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.sha256 release/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.sha512 release/mina/sshd/2.7.0/apache-sshd-2.7.0.zip.sha256 release/mina/sshd/2.7.0/apache-sshd-2.7.0.zip.sha512 Added: release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.sha256 == --- release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.sha256 (added) +++ release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.sha256 Mon May 31 08:54:31 2021 @@ -0,0 +1,2 @@ +./apache-sshd-2.7.0-src.tar.gz: FE3F9CA7 2930FD4B 01E2969F 32F7D2AE DD9B364F +D42CA124 CC3384BD 23DE7007 Added: release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.sha512 == --- release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.sha512 (added) +++ release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.sha512 Mon May 31 08:54:31 2021 @@ -0,0 +1,4 @@ +./apache-sshd-2.7.0-src.tar.gz: AF40B898 0DE7EFD8 10261C06 EA552E04 31C4E116 +B9C3E6EC 267DC724 A38A99A9 4ED47089 F8248365 +89D1C51E D0E2C3CF A6054D86 AAFB613A A268E1B6 +3373DD8C Added: release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.sha256 == --- release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.sha256 (added) +++ release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.sha256 Mon May 31 08:54:31 2021 @@ -0,0 +1,2 @@ +./apache-sshd-2.7.0-src.zip: 95F6D15E 813E0D3F 48008EE1 A45CA9FB 5AC41BAF + 00E292D6 B53C906F BD5D47D9 Added: release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.sha512 == --- release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.sha512 (added) +++ release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.sha512 Mon May 31 08:54:31 2021 @@ -0,0 +1,4 @@ +./apache-sshd-2.7.0-src.zip: BF82CA36 0539C3AF 16E39547 700F9F4A 2F593261 + D9A3BABF 73A43BF4 3965068C F18B2E60 AF8DF7C2 + BECD42CD 31BC277B 4121F616 732EEDB8 74552F33 + 2B154C8A Added: release/mina/sshd/2.7.0/apache-sshd-2.7.0.pom.sha256 == --- release/mina/sshd/2.7.0/apache-sshd-2.7.0.pom.sha256 (added) +++ release/mina/sshd/2.7.0/apache-sshd-2.7.0.pom.sha256 Mon May 31 08:54:31 2021 @@ -0,0 +1,2 @@ +./apache-sshd-2.7.0.pom: 014E07D2 26BCEB77 DD9B5FEC 638F1DAC 3D9A5006 C65EDF91 + 093C4E97 66C9BD2F Added: release/mina/sshd/2.7.0/apache-sshd-2.7.0.pom.sha512 == --- release/mina/sshd/2.7.0/apache-sshd-2.7.0.pom.sha512 (added) +++ release/mina/sshd/2.7.0/apache-sshd-2.7.0.pom.sha512 Mon May 31 08:54:31 2021 @@ -0,0 +1,3 @@ +./apache-sshd-2.7.0.pom: C62C93C1 58E65B7D BE58B223 59691FD5 4295E7A3 A6837E35 + F0FFBAB6 E686E8A0 334EA5DA E95B2FF4 D8E64013 8A1A2A31 + F9BD381D 78D2D2AF 48A76139 D71F257B Added: release/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.sha256 == --- release/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.sha256 (added) +++ release/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.sha256 Mon May 31 08:54:31 2021 @@ -0,0 +1,2 @@ +./apache-sshd-2.7.0.tar.gz: 6BCBAECC 1BD86882 5734A5C3 56F8FA0F 9BD208FF +C44ADE82 2F173285 B8CF24FA Added: release/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.sha512 == --- release/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.sha512 (added) +++ release/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.sha512 Mon May 31 08:54:31 2021 @@ -0,0 +1,4 @@ +./apache-sshd-2.7.0.tar.gz: 5AC29B43 471DFDD9 92EF70FA 3BE4E8AE 9E217FBE +F6CFB88F A548E951 5165374F F178B95C 6A1927A9 +A6A27C37 7A94D02B C35EC771 5E5C1938 9EB1566C +50B02A80 Added: release/mina/sshd/2.7.0/apache-sshd-2.7.0.zip.sha256 == --- release/mina/sshd/2.7.0/apache-sshd-2.7.0.zip.sha256 (added
[mina-site] branch master updated: Added Jenkinsfile to put deployment configuration in version control
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-site.git
The following commit(s) were added to refs/heads/master by this push:
new ccfe74e Added Jenkinsfile to put deployment configuration in version
control
new fc04f53 Merge pull request #4 from rlenferink/add-jenkinsfile
ccfe74e is described below
commit ccfe74ed7673b163defadea442b0d9971e9d7be6
Author: Roy Lenferink
AuthorDate: Mon Jul 20 19:09:52 2020 +0200
Added Jenkinsfile to put deployment configuration in version control
---
Jenkinsfile | 112
1 file changed, 112 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..bd87e57
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,112 @@
+#!groovy
+/*
+ * 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
+ *
+ * https://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.
+ */
+
+pipeline {
+agent {
+//
https://cwiki.apache.org/confluence/display/INFRA/Jenkins+node+labels
+label 'git-websites'
+}
+
+environment {
+HUGO_VERSION = '0.63.2'
+DEPLOY_BRANCH = 'asf-site'
+}
+
+stages {
+stage('Prepare') {
+steps {
+script {
+// Capture last commit hash for final commit message
+env.LAST_SHA = sh(script:'git log -n 1
--pretty=format:\'%H\'', returnStdout: true).trim()
+
+// Setup Hugo
+env.HUGO_DIR = sh(script:'mktemp -d', returnStdout:
true).trim()
+sh """
+mkdir -p ${env.HUGO_DIR}/bin
+cd ${env.HUGO_DIR}
+wget --no-verbose -O hugo.tar.gz
https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz
+tar xfzv hugo.tar.gz
+mv hugo ${env.HUGO_DIR}/bin/
+"""
+
+// Setup directory structure for generated content
+env.TMP_DIR = sh(script:'mktemp -d', returnStdout:
true).trim()
+env.OUT_DIR = "${env.TMP_DIR}/content"
+sh "mkdir -p ${env.OUT_DIR}"
+
+}
+}
+}
+stage('Build') {
+steps {
+script {
+withEnv(["PATH+HUGO=${env.HUGO_DIR}/bin"]) {
+sh "hugo --destination ${env.OUT_DIR}"
+}
+}
+}
+}
+stage('Deploy') {
+when {
+anyOf {
+branch 'master'
+}
+}
+steps {
+script {
+// Checkout branch with generated content
+sh """
+git checkout ${DEPLOY_BRANCH}
+git pull origin ${DEPLOY_BRANCH}
+"""
+
+// Remove the content of the target branch and replace it
with the content of the temp folder
+sh """
+rm -rf ${WORKSPACE}/content
+git rm -r --cached content/*
+mkdir -p ${WORKSPACE}/content
+cp -rT ${env.TMP_DIR}/* ${WORKSPACE}/content
+"""
+
+// Commit the changes to the target branch
+env.COMMIT_MESSAGE = "Updated site from ${BRANCH_NAME}
(${env.LAST_SHA})"
+sh """
+git add -A
+git commit -m "${env.COMMIT_MESSAGE}" | true
+"""
+
+// Push the generated content for deployment
+sh "git push -u origin ${DEPLOY_BRANCH}"
+
[mina-sshd] branch master updated: Make sure the project is built using with JDK 8 during releases
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new d156443 Make sure the project is built using with JDK 8 during
releases
d156443 is described below
commit d15644325e254ec1bedb9cd4e5aa4a6a3adb63d9
Author: Guillaume Nodet
AuthorDate: Wed May 19 15:03:02 2021 +0200
Make sure the project is built using with JDK 8 during releases
---
pom.xml | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b879dc7..a92f5ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,7 @@
${javac.source}
3.2.0
+[${javac.target},)
${javac.source}
${javac.target}
${javac.target}
@@ -130,6 +131,13 @@
+release
+
+[1.8,1.9)
+
+
+
+
ci
4.0
@@ -1256,7 +1264,7 @@
[${min.required.maven.version},)
-[${javac.target},)
+${required.java.version}
true
[mina-sshd] branch master updated: [SSHD-1152] Some warnings are never logged
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new ea57983 [SSHD-1152] Some warnings are never logged
ea57983 is described below
commit ea57983ca77717f22170db40b3048e005719e4fd
Author: Guillaume Nodet
AuthorDate: Mon Mar 29 13:28:13 2021 +0200
[SSHD-1152] Some warnings are never logged
---
.../main/java/org/apache/sshd/common/util/logging/LoggingUtils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/sshd-common/src/main/java/org/apache/sshd/common/util/logging/LoggingUtils.java
b/sshd-common/src/main/java/org/apache/sshd/common/util/logging/LoggingUtils.java
index 13acb4d..8ca82a8 100644
---
a/sshd-common/src/main/java/org/apache/sshd/common/util/logging/LoggingUtils.java
+++
b/sshd-common/src/main/java/org/apache/sshd/common/util/logging/LoggingUtils.java
@@ -614,7 +614,7 @@ public final class LoggingUtils {
public static void warn(Logger log, String message, Object o1, Object o2,
Object o3, Object o4, Throwable t) {
if (log.isDebugEnabled() && (t != null)) {
log.warn(message, o1, o2, o3, o4, t);
-} else if (log.isDebugEnabled()) {
+} else {
log.warn(message, o1, o2, o3, o4);
}
}
@@ -689,7 +689,7 @@ public final class LoggingUtils {
public static void error(Logger log, String message, Object o1, Object o2,
Object o3, Object o4, Throwable t) {
if (log.isDebugEnabled() && (t != null)) {
log.error(message, o1, o2, o3, o4, t);
-} else if (log.isDebugEnabled()) {
+} else {
log.error(message, o1, o2, o3, o4);
}
}
[mina-sshd] branch master updated: [SSHD-1146] Add missing Import-Package header in sshd-osgi
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 898939d [SSHD-1146] Add missing Import-Package header in sshd-osgi
898939d is described below
commit 898939dfd53c2e31bd97c20a4cdee872b8d357f8
Author: Guillaume Nodet
AuthorDate: Wed Mar 17 13:55:32 2021 +0100
[SSHD-1146] Add missing Import-Package header in sshd-osgi
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ed5263d..20258d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1421,7 +1421,7 @@
-
org.apache.sshd*;version="[$(version;==;${sshd.osgi.version.clean}),$(version;=+;${sshd.osgi.version.clean}))"
+
org.apache.sshd*;version="[$(version;==;${sshd.osgi.version.clean}),$(version;=+;${sshd.osgi.version.clean}))",*
*;-noimport:=true
pom
[mina-sshd] branch master updated: [SSHD-1213] Update tarLongFileMode to use POSIX
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 22ba19b [SSHD-1213] Update tarLongFileMode to use POSIX
22ba19b is described below
commit 22ba19bddf9692fe6fc9ed06c3b09e26b7225545
Author: Roberto Oliveira
AuthorDate: Wed Sep 15 11:05:52 2021 +0200
[SSHD-1213] Update tarLongFileMode to use POSIX
---
assembly/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 1fe1237..30d3daa 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -151,7 +151,7 @@
${project.artifactId}-${project.version}
false
-gnu
+posix
@@ -178,7 +178,7 @@
src/main/descriptors/unix-src.xml
-gnu
+posix
[mina-sshd] branch master updated: Fix notice year, update plugins
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 80e57cf Fix notice year, update plugins
80e57cf is described below
commit 80e57cfaa7bc0d36deecf19b2fc7c12e18427593
Author: Guillaume Nodet
AuthorDate: Mon Nov 29 10:51:43 2021 +0100
Fix notice year, update plugins
---
NOTICE-bin.txt| 2 +-
NOTICE.txt| 2 +-
pom.xml | 63 ++-
sshd-core/pom.xml | 3 +++
sshd-git/pom.xml | 12 +++
sshd-scp/pom.xml | 2 ++
sshd-sftp/pom.xml | 2 ++
7 files changed, 55 insertions(+), 31 deletions(-)
diff --git a/NOTICE-bin.txt b/NOTICE-bin.txt
index ed34e30..6a60f4a 100644
--- a/NOTICE-bin.txt
+++ b/NOTICE-bin.txt
@@ -1,5 +1,5 @@
Apache MINA SSHD
-Copyright 2008-2018 The Apache Software Foundation
+Copyright 2008-2021 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/NOTICE.txt b/NOTICE.txt
index 9b3ec4e..3e91f69 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
Apache MINA SSHD
-Copyright 2008-2018 The Apache Software Foundation
+Copyright 2008-2021 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/pom.xml b/pom.xml
index a3610a5..edf2a86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
${project.basedir}
UTF-8
-
2020-01-01T00:00:00Z
+
2021-01-01T00:00:00Z
@@ -780,7 +780,7 @@
org.apache.maven.plugins
maven-release-plugin
-2.5.3
+3.0.0-M4
true
@@ -788,7 +788,7 @@
org.apache.maven.plugins
maven-gpg-plugin
-1.6
+3.0.1
org.apache.maven.plugins
@@ -824,12 +824,12 @@
org.apache.maven.plugins
maven-install-plugin
-2.5.2
+3.0.0-M1
org.apache.maven.plugins
maven-javadoc-plugin
-3.2.0
+3.3.1
-Xdoclint:-missing
${project.build.sourceEncoding}
@@ -854,7 +854,7 @@
org.codehaus.gmavenplus
gmavenplus-plugin
-1.12.1
+1.13.0
@@ -1022,7 +1022,7 @@
org.apache.maven.plugins
maven-pmd-plugin
- 3.14.0
+ 3.15.0
${javac.target}
true
@@ -1068,7 +1068,7 @@
org.apache.maven.plugins
maven-dependency-plugin
-3.1.2
+3.2.0
org.codehaus.plexus
@@ -1103,7 +1103,7 @@
net.revelc.code.formatter
formatter-maven-plugin
-2.14.0
+2.17.0
true
true
@@ -1116,7 +1116,7 @@
net.revelc.code
impsort-maven-plugin
-1.6.0
+1.6.2
LF
java.,javax.,org.w3c.,org.xml.,junit.
@@ -1125,6 +1125,11 @@
java.,javax.,org.w3c.,org.xml.,junit.
+
+org.codehaus.mojo
+build-helper-maven-plugin
+${build-helper-maven-plugin.version}
+
@@ -1251,30 +1256,30 @@
org.apache.maven.plugins
maven-enforcer-plugin
-3.0.0-M3
+3.0.0
-enforce-versions
+enforce-maven-version
enforce
+
+
+
+
${min.required.maven.version
[mina-sshd] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new cfd6d6f [maven-release-plugin] prepare for next development iteration
cfd6d6f is described below
commit cfd6d6f4f55b29a4e4cfa85051a841ae326cd492
Author: Guillaume Nodet
AuthorDate: Mon Nov 29 15:47:57 2021 +0100
[maven-release-plugin] prepare for next development iteration
---
assembly/pom.xml | 2 +-
pom.xml | 4 ++--
sshd-cli/pom.xml | 2 +-
sshd-common/pom.xml | 2 +-
sshd-contrib/pom.xml | 2 +-
sshd-core/pom.xml| 2 +-
sshd-git/pom.xml | 2 +-
sshd-ldap/pom.xml| 2 +-
sshd-mina/pom.xml| 2 +-
sshd-netty/pom.xml | 2 +-
sshd-openpgp/pom.xml | 2 +-
sshd-osgi/pom.xml| 2 +-
sshd-putty/pom.xml | 2 +-
sshd-scp/pom.xml | 2 +-
sshd-sftp/pom.xml| 2 +-
sshd-spring-sftp/pom.xml | 2 +-
16 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index d115f34..66d3c39 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.8.0
+2.9.0-SNAPSHOT
apache-sshd
diff --git a/pom.xml b/pom.xml
index 91425da..e74b31a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.sshd
sshd
-2.8.0
+2.9.0-SNAPSHOT
Apache Mina SSHD
pom
2008
@@ -81,7 +81,7 @@
${project.basedir}
UTF-8
-
2021-11-29T12:41:31Z
+
2021-11-29T14:47:57Z
diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml
index f05148d..d2d099b 100644
--- a/sshd-cli/pom.xml
+++ b/sshd-cli/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.8.0
+2.9.0-SNAPSHOT
sshd-cli
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index b532734..68d8e9e 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.8.0
+2.9.0-SNAPSHOT
..
diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml
index 2af6379..f23d65d 100644
--- a/sshd-contrib/pom.xml
+++ b/sshd-contrib/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.8.0
+2.9.0-SNAPSHOT
[mina-sshd] branch master updated: [maven-release-plugin] prepare release sshd-2.8.0
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git The following commit(s) were added to refs/heads/master by this push: new c3d18fb [maven-release-plugin] prepare release sshd-2.8.0 c3d18fb is described below commit c3d18fbea0a5b2f4ce7f20599ab307c84591df1c Author: Guillaume Nodet AuthorDate: Mon Nov 29 15:47:39 2021 +0100 [maven-release-plugin] prepare release sshd-2.8.0 --- assembly/pom.xml | 2 +- pom.xml | 12 +--- sshd-cli/pom.xml | 2 +- sshd-common/pom.xml | 2 +- sshd-contrib/pom.xml | 2 +- sshd-core/pom.xml| 2 +- sshd-git/pom.xml | 2 +- sshd-ldap/pom.xml| 2 +- sshd-mina/pom.xml| 2 +- sshd-netty/pom.xml | 2 +- sshd-openpgp/pom.xml | 2 +- sshd-osgi/pom.xml| 2 +- sshd-putty/pom.xml | 2 +- sshd-scp/pom.xml | 2 +- sshd-sftp/pom.xml| 2 +- sshd-spring-sftp/pom.xml | 2 +- 16 files changed, 20 insertions(+), 22 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 30d3daa..d115f34 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -22,7 +22,7 @@ org.apache.sshd sshd -2.7.1-SNAPSHOT +2.8.0 apache-sshd diff --git a/pom.xml b/pom.xml index edf2a86..91425da 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,4 @@ -http://maven.apache.org/POM/4.0.0; -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> @@ -1103,7 +1101,7 @@ net.revelc.code.formatter formatter-maven-plugin -2.17.0 +2.16.0 true true diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml index 50fd663..f05148d 100644 --- a/sshd-cli/pom.xml +++ b/sshd-cli/pom.xml @@ -22,7 +22,7 @@ org.apache.sshd sshd -2.7.1-SNAPSHOT +2.8.0 sshd-cli diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml index 2829224..b532734 100644 --- a/sshd-common/pom.xml +++ b/sshd-common/pom.xml @@ -22,7 +22,7 @@ org.apache.sshd sshd -2.7.1-SNAPSHOT +2.8.0 .. diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml index 4c2a1f8..2af6379 100644 --- a/sshd-contrib/pom.xml +++ b/sshd-contrib/pom.xml @@ -22,7 +22,7 @@ org.apache.sshd sshd -2.7.1-SNAPSHOT +2.8.0
[mina-sshd] annotated tag sshd-2.8.0 created (now bde8962)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to annotated tag sshd-2.8.0 in repository https://gitbox.apache.org/repos/asf/mina-sshd.git. at bde8962 (tag) tagging c3d18fbea0a5b2f4ce7f20599ab307c84591df1c (commit) replaces sshd-2.7.0 by Guillaume Nodet on Mon Nov 29 15:47:53 2021 +0100 - Log - [maven-release-plugin] copy for tag sshd-2.8.0 --- No new revisions were added by this update.
[mina-site] branch master updated: Add SSHD 2.8.0 release
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-site.git The following commit(s) were added to refs/heads/master by this push: new 0fa9adc Add SSHD 2.8.0 release 0fa9adc is described below commit 0fa9adcd963644b9ae455efeea78678367687669 Author: Guillaume Nodet AuthorDate: Wed Dec 8 07:37:08 2021 +0100 Add SSHD 2.8.0 release --- config.toml | 2 +- source/downloads-sshd.md | 13 +++-- source/sshd-project/download_2.8.0.md | 19 +++ source/sshd-project/downloads.md | 13 +++-- 4 files changed, 34 insertions(+), 13 deletions(-) diff --git a/config.toml b/config.toml index 3d08b7d..c07c669 100644 --- a/config.toml +++ b/config.toml @@ -37,5 +37,5 @@ version_asyncweb = "2.0.0-SNAPSHOT" version_mina_2_0 = "2.0.22" version_mina_2_1 = "2.1.5" version_ftpserver = "1.1.1" -version_sshd = "2.7.0" +version_sshd = "2.8.0" version_vysper = "0.7" diff --git a/source/downloads-sshd.md b/source/downloads-sshd.md index 27fcd61..9459d20 100644 --- a/source/downloads-sshd.md +++ b/source/downloads-sshd.md @@ -4,15 +4,15 @@ title: Downloads # Latest SSHD Releases -The latest release is the SSHD 2.7.0 release. -Apache Mina SSHD 2.7.0 contains a number of [enhancements and bug-fixes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310849=12349400). +The latest release is the SSHD 2.8.0 release. +Apache Mina SSHD 2.8.0 contains a number of [enhancements and bug-fixes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310849=12350169). * Source distributions: -* [Apache Mina SSHD 2.7.0 Sources (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.sha512) -* [Apache Mina SSHD 2.7.0 Sources (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.sha512) +* [Apache Mina SSHD 2.8.0 Sources (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz.sha512) +* [Apache Mina SSHD 2.8.0 Sources (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.8.0/apache-sshd-2.8.0-src.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.8.0/apache-sshd-2.8.0-src.zip.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.8.0/apache-sshd-2.8.0-src.zip.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.8.0/apache-sshd-2.8.0-src.zip.sha512) * Binary distributions: -* [Apache Mina SSHD 2.7.0 Binary (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.sha512) -* [Apache Mina SSHD 2.7.0 Binary (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.7.0/apache-sshd-2.7.0.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0.zip.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0.zip.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.7.0/apache-sshd-2.7.0.zip.sha512) +* [Apache Mina SSHD 2.8.0 Binary (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.8.0/apache-sshd-2.8.0.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.8.0/apache-sshd-2.8.0.tar.gz.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.8.0/apache-sshd-2.8.0.tar.gz.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.8.0/apache-sshd-2.8.0.tar.gz.sha512) +* [Apache Mina SSHD 2.8.0 Binary (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.8.0/apache-sshd-2.8.0.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.8.0/apache-sshd-2.8.0.zip.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.8.0/apache-sshd-2.8.0.zip.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.8.0/apache-sshd-2.8.0.zip.sha512) # Development snapshots @@ -51,4 +51,5 @@ You can [build](sshd-proje
svn commit: r51184 - in /release/mina/sshd: 2.7.0/ 2.8.0/
Author: gnodet Date: Fri Dec 3 13:24:33 2021 New Revision: 51184 Log: Apache Mina SSHD 2.8.0 release Added: release/mina/sshd/2.8.0/ release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz (with props) release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz.asc release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz.md5 release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz.sha1 release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz.sha256 release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz.sha512 release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.zip (with props) release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.zip.asc release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.zip.md5 release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.zip.sha1 release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.zip.sha256 release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.zip.sha512 release/mina/sshd/2.8.0/apache-sshd-2.8.0.pom release/mina/sshd/2.8.0/apache-sshd-2.8.0.pom.asc release/mina/sshd/2.8.0/apache-sshd-2.8.0.pom.md5 release/mina/sshd/2.8.0/apache-sshd-2.8.0.pom.sha1 release/mina/sshd/2.8.0/apache-sshd-2.8.0.pom.sha256 release/mina/sshd/2.8.0/apache-sshd-2.8.0.pom.sha512 release/mina/sshd/2.8.0/apache-sshd-2.8.0.tar.gz (with props) release/mina/sshd/2.8.0/apache-sshd-2.8.0.tar.gz.asc release/mina/sshd/2.8.0/apache-sshd-2.8.0.tar.gz.md5 release/mina/sshd/2.8.0/apache-sshd-2.8.0.tar.gz.sha1 release/mina/sshd/2.8.0/apache-sshd-2.8.0.tar.gz.sha256 release/mina/sshd/2.8.0/apache-sshd-2.8.0.tar.gz.sha512 release/mina/sshd/2.8.0/apache-sshd-2.8.0.zip (with props) release/mina/sshd/2.8.0/apache-sshd-2.8.0.zip.asc release/mina/sshd/2.8.0/apache-sshd-2.8.0.zip.md5 release/mina/sshd/2.8.0/apache-sshd-2.8.0.zip.sha1 release/mina/sshd/2.8.0/apache-sshd-2.8.0.zip.sha256 release/mina/sshd/2.8.0/apache-sshd-2.8.0.zip.sha512 Removed: release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.asc release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.sha256 release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.tar.gz.sha512 release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.asc release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.sha256 release/mina/sshd/2.7.0/apache-sshd-2.7.0-src.zip.sha512 release/mina/sshd/2.7.0/apache-sshd-2.7.0.pom release/mina/sshd/2.7.0/apache-sshd-2.7.0.pom.asc release/mina/sshd/2.7.0/apache-sshd-2.7.0.pom.sha256 release/mina/sshd/2.7.0/apache-sshd-2.7.0.pom.sha512 release/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz release/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.asc release/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.sha256 release/mina/sshd/2.7.0/apache-sshd-2.7.0.tar.gz.sha512 release/mina/sshd/2.7.0/apache-sshd-2.7.0.zip release/mina/sshd/2.7.0/apache-sshd-2.7.0.zip.asc release/mina/sshd/2.7.0/apache-sshd-2.7.0.zip.sha256 release/mina/sshd/2.7.0/apache-sshd-2.7.0.zip.sha512 Added: release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz == Binary file - no diff available. Propchange: release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz.asc == --- release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz.asc (added) +++ release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz.asc Fri Dec 3 13:24:33 2021 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAmGk7esACgkQ7SN4zQmg +jN6hjA//b8pF+uaxMaZSPb9NxSFlfG2bfQpodFU7+pW2zpS2tkJW9Nr8lb9Nx2FR +6xGtIVb4avB2QXHJq9WJkEMeJYBWUNxI9Sww3QUrhKZXl0AgzCmhUhI8qn75my5Y +2tZZElosgtx8WhzLT9tugaKiMH6Z47dgTKz166D9ij1EUcDAEmxzIsslWCmEsfc/ +ycTrsXiqkXPeJf37OEXoTfGa8Zmb0tNuV/Ft1fHu5Z7O53JlSA26FDps9CvcXYn5 +vw7JdTkgn4wqohdNySsGGtR+9i39BYBxpkUoqx0Lmki+loEMFck7Psig6jHZ78fD +srTn27WbMuzc4tkBd7RDLpimnHr+GdO9OuuckUIwh0guv4aySfFuE3B7oZNvsC/h +shjGSw5xQ54HQuT+kFRsbPJHHAkz+JaTkBuuhlcQHZQnJfYttSk/I93nSrs9fIZx +Ori1WG7d53gj6zu1JkkWGPDf4RKNo/xGwDITZVHmCrwtaej01mxsGOv/X1TpP8Mj +I26cRsn8slSSnZ+HjVIvEV2DMHWzNc01whdKzZmeRB4oEfhMKQMvH9LGfVCal82j +i/zsQjpsQ7UF8qFpvWEnZ+m9MuwrwWrYXGcm7ULGmA83fhJnSJemB76/BIguSjv9 +7v5CbjcogFM3jnfwJXAHY08BG+RGPoVroAlyjs2gnP+clXJad3c= +=2t7Y +-END PGP SIGNATURE- Added: release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz.md5 == --- release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz.md5 (added) +++ release/mina/sshd/2.8.0/apache-sshd-2.8.0-src.tar.gz.md5 Fri Dec 3 13:24:33 2021 @@ -0,0 +1 @@ +7f79675e10fd85120570427c5f037977 \ No newline at end of file Added: release
[mina-sshd] branch master updated: Remove direct sftp URI instantiation example
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new df0febe Remove direct sftp URI instantiation example
df0febe is described below
commit df0febe9931b8b42360c844aedfc71514ce13d55
Author: Guillaume Nodet
AuthorDate: Mon Jan 24 22:16:02 2022 +0100
Remove direct sftp URI instantiation example
This only works if the file system has been created earlier..., see
SSHD-1238
---
docs/sftp.md | 7 ---
1 file changed, 7 deletions(-)
diff --git a/docs/sftp.md b/docs/sftp.md
index 224f7bf..b17c090 100644
--- a/docs/sftp.md
+++ b/docs/sftp.md
@@ -259,13 +259,6 @@ standard
[java.nio](https://docs.oracle.com/javase/8/docs/api/java/nio/package-f
system.
```java
-// Direct URI
-Path remotePath = Paths.get(new
URI("sftp://user:password@host/some/remote/path;));
-// Releasing the file-system once no longer necessary
-try (FileSystem fs = remotePath.getFileSystem()) {
-... work with the remote path...
-}
-
// "Mounting" a file system
URI uri = SftpFileSystemProvider.createFileSystemURI(host, port, username,
password);
try (FileSystem fs = FileSystems.newFileSystem(uri, Collections.emptyMap())) {
[mina-sshd] branch sshd-2.9.x updated: Must override dependency to build on Maven 3.9.x
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch sshd-2.9.x in repository https://gitbox.apache.org/repos/asf/mina-sshd.git The following commit(s) were added to refs/heads/sshd-2.9.x by this push: new 241693e6c Must override dependency to build on Maven 3.9.x 241693e6c is described below commit 241693e6cb3c3b4f7e177d38bc3ca5103deea5df Author: Gary Gregory AuthorDate: Thu Mar 23 16:06:51 2023 -0400 Must override dependency to build on Maven 3.9.x Even though not declared, see MNG-6965, MNG-7744. --- docs/changes/2.9.3.md | 1 + pom.xml | 8 2 files changed, 9 insertions(+) diff --git a/docs/changes/2.9.3.md b/docs/changes/2.9.3.md index 50a9d919c..f17d024f5 100644 --- a/docs/changes/2.9.3.md +++ b/docs/changes/2.9.3.md @@ -4,6 +4,7 @@ * [CVE-2023-35887](http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-35887) / [SSHD-1324](https://issues.apache.org/jira/browse/SSHD-1324) Rooted file system can leak informations * Fix reproducible builds issue +* Support building with Maven 3.9.x ## Major code re-factoring diff --git a/pom.xml b/pom.xml index 677ed62e2..7a2a3b33f 100644 --- a/pom.xml +++ b/pom.xml @@ -1141,6 +1141,14 @@ net.revelc.code impsort-maven-plugin 1.6.2 + + + +org.codehaus.plexus +plexus-utils +3.0.24 + + LF java.,javax.,org.w3c.,org.xml.,junit.
[mina-sshd] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 76ae2bdba [maven-release-plugin] prepare for next development iteration
76ae2bdba is described below
commit 76ae2bdba6b9e0129b43d90df5773f7888c59b7d
Author: Guillaume Nodet
AuthorDate: Thu Oct 12 14:19:38 2023 +0200
[maven-release-plugin] prepare for next development iteration
---
assembly/pom.xml | 2 +-
pom.xml | 6 +++---
sshd-cli/pom.xml | 2 +-
sshd-common/pom.xml | 2 +-
sshd-contrib/pom.xml | 2 +-
sshd-core/pom.xml| 2 +-
sshd-git/pom.xml | 2 +-
sshd-ldap/pom.xml| 2 +-
sshd-mina/pom.xml| 2 +-
sshd-netty/pom.xml | 2 +-
sshd-openpgp/pom.xml | 2 +-
sshd-osgi/pom.xml| 2 +-
sshd-putty/pom.xml | 2 +-
sshd-scp/pom.xml | 2 +-
sshd-sftp/pom.xml| 2 +-
sshd-spring-sftp/pom.xml | 2 +-
16 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 9b5ea4b38..fcb2cec1b 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.11.0
+2.11.1-SNAPSHOT
apache-sshd
diff --git a/pom.xml b/pom.xml
index 14084f3ca..e768a71bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.sshd
sshd
-2.11.0
+2.11.1-SNAPSHOT
Apache Mina SSHD
pom
2008
@@ -75,13 +75,13 @@
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
https://github.com/apache/mina-sshd/tree/${project.scm.tag}
-sshd-2.11.0
+sshd-2.10.0
${project.basedir}
UTF-8
-
2023-10-12T11:58:57Z
+
2023-10-12T12:19:38Z
diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml
index 258538117..8db962465 100644
--- a/sshd-cli/pom.xml
+++ b/sshd-cli/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.11.0
+2.11.1-SNAPSHOT
sshd-cli
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index a008faa27..87bbdd24b 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.11.0
+2.11.1-SNAPSHOT
..
diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml
index ee8b87553..5e2b3b205 100644
--- a/sshd-contrib/pom.xml
+++ b/sshd-contrib/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.11.0
+2.11.1-SNAPSHOT
[mina-sshd] branch master updated: [maven-release-plugin] prepare release sshd-2.11.0
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new d65128ccb [maven-release-plugin] prepare release sshd-2.11.0
d65128ccb is described below
commit d65128ccb1c76bbafbe187edbc611d6baf6a24e6
Author: Guillaume Nodet
AuthorDate: Thu Oct 12 14:19:23 2023 +0200
[maven-release-plugin] prepare release sshd-2.11.0
---
assembly/pom.xml | 2 +-
pom.xml | 6 +++---
sshd-cli/pom.xml | 2 +-
sshd-common/pom.xml | 2 +-
sshd-contrib/pom.xml | 2 +-
sshd-core/pom.xml| 2 +-
sshd-git/pom.xml | 2 +-
sshd-ldap/pom.xml| 2 +-
sshd-mina/pom.xml| 2 +-
sshd-netty/pom.xml | 2 +-
sshd-openpgp/pom.xml | 2 +-
sshd-osgi/pom.xml| 5 ++---
sshd-putty/pom.xml | 2 +-
sshd-scp/pom.xml | 2 +-
sshd-sftp/pom.xml| 2 +-
sshd-spring-sftp/pom.xml | 2 +-
16 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 4a7f4fb39..9b5ea4b38 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.11.0-SNAPSHOT
+2.11.0
apache-sshd
diff --git a/pom.xml b/pom.xml
index 2426b9842..14084f3ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.sshd
sshd
-2.11.0-SNAPSHOT
+2.11.0
Apache Mina SSHD
pom
2008
@@ -75,13 +75,13 @@
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
https://github.com/apache/mina-sshd/tree/${project.scm.tag}
-sshd-2.10.0
+sshd-2.11.0
${project.basedir}
UTF-8
-
2023-05-10T06:55:13Z
+
2023-10-12T11:58:57Z
diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml
index c5650b00c..258538117 100644
--- a/sshd-cli/pom.xml
+++ b/sshd-cli/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.11.0-SNAPSHOT
+2.11.0
sshd-cli
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index 3064f6d54..a008faa27 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.11.0-SNAPSHOT
+2.11.0
..
diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml
index 16d612c51..ee8b87553 100644
--- a/sshd-contrib/pom.xml
+++ b/sshd-contrib/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.11.0-SNAPSHOT
+2.11.0
[mina-sshd] annotated tag sshd-2.11.0 created (now 218a7d360)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to annotated tag sshd-2.11.0 in repository https://gitbox.apache.org/repos/asf/mina-sshd.git at 218a7d360 (tag) tagging d65128ccb1c76bbafbe187edbc611d6baf6a24e6 (commit) replaces sshd-2.10.0 by Guillaume Nodet on Thu Oct 12 14:19:34 2023 +0200 - Log - [maven-release-plugin] copy for tag sshd-2.11.0 --- No new revisions were added by this update.
svn commit: r64497 - in /dev/mina/sshd: 2.11.0/ 2.9.3/
Author: gnodet Date: Thu Oct 12 14:31:50 2023 New Revision: 64497 Log: Add Mina SSHD 2.9.3 and 2.11.0 candidate releases Added: dev/mina/sshd/2.11.0/ dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz (with props) dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.asc dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.sha256 dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.sha512 dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.zip (with props) dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.zip.asc dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.zip.sha256 dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.zip.sha512 dev/mina/sshd/2.11.0/apache-sshd-2.11.0.pom dev/mina/sshd/2.11.0/apache-sshd-2.11.0.pom.asc dev/mina/sshd/2.11.0/apache-sshd-2.11.0.pom.sha256 dev/mina/sshd/2.11.0/apache-sshd-2.11.0.pom.sha512 dev/mina/sshd/2.11.0/apache-sshd-2.11.0.tar.gz (with props) dev/mina/sshd/2.11.0/apache-sshd-2.11.0.tar.gz.asc dev/mina/sshd/2.11.0/apache-sshd-2.11.0.tar.gz.sha256 dev/mina/sshd/2.11.0/apache-sshd-2.11.0.tar.gz.sha512 dev/mina/sshd/2.11.0/apache-sshd-2.11.0.zip (with props) dev/mina/sshd/2.11.0/apache-sshd-2.11.0.zip.asc dev/mina/sshd/2.11.0/apache-sshd-2.11.0.zip.sha256 dev/mina/sshd/2.11.0/apache-sshd-2.11.0.zip.sha512 dev/mina/sshd/2.9.3/ dev/mina/sshd/2.9.3/apache-sshd-2.9.3-src.tar.gz (with props) dev/mina/sshd/2.9.3/apache-sshd-2.9.3-src.tar.gz.asc dev/mina/sshd/2.9.3/apache-sshd-2.9.3-src.tar.gz.sha256 dev/mina/sshd/2.9.3/apache-sshd-2.9.3-src.tar.gz.sha512 dev/mina/sshd/2.9.3/apache-sshd-2.9.3-src.zip (with props) dev/mina/sshd/2.9.3/apache-sshd-2.9.3-src.zip.asc dev/mina/sshd/2.9.3/apache-sshd-2.9.3-src.zip.sha256 dev/mina/sshd/2.9.3/apache-sshd-2.9.3-src.zip.sha512 dev/mina/sshd/2.9.3/apache-sshd-2.9.3.pom dev/mina/sshd/2.9.3/apache-sshd-2.9.3.pom.asc dev/mina/sshd/2.9.3/apache-sshd-2.9.3.pom.sha256 dev/mina/sshd/2.9.3/apache-sshd-2.9.3.pom.sha512 dev/mina/sshd/2.9.3/apache-sshd-2.9.3.tar.gz (with props) dev/mina/sshd/2.9.3/apache-sshd-2.9.3.tar.gz.asc dev/mina/sshd/2.9.3/apache-sshd-2.9.3.tar.gz.sha256 dev/mina/sshd/2.9.3/apache-sshd-2.9.3.tar.gz.sha512 dev/mina/sshd/2.9.3/apache-sshd-2.9.3.zip (with props) dev/mina/sshd/2.9.3/apache-sshd-2.9.3.zip.asc dev/mina/sshd/2.9.3/apache-sshd-2.9.3.zip.sha256 dev/mina/sshd/2.9.3/apache-sshd-2.9.3.zip.sha512 Added: dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz == Binary file - no diff available. Propchange: dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.asc == --- dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.asc (added) +++ dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.asc Thu Oct 12 14:31:50 2023 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- + +iHUEABYKAB0WIQQHP3qTRXVvO0DNuZ5scKO3WZxXNgUCZSfwkQAKCRBscKO3WZxX +NkCvAP9rcJW6T/am4NSuRM4IVwKYAdzNjQKc7wG6M2vrrAdTDwD/RvAzIS270aMX +GIEqMQ1vp3TocxBSK75qTcfUYpL18QE= +=+cZw +-END PGP SIGNATURE- Added: dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.sha256 == --- dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.sha256 (added) +++ dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.sha256 Thu Oct 12 14:31:50 2023 @@ -0,0 +1 @@ +e81fd07e953e6a9e790387fb9db80e1eac506707fce40543e44a0a671c1721b4 Added: dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.sha512 == --- dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.sha512 (added) +++ dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.sha512 Thu Oct 12 14:31:50 2023 @@ -0,0 +1 @@ +f396fa8502bc254a0cbbf172f650726db0e80d30a4532ac1fa4b9c8ee32bed1c18db4c491ae2959f59a078dde7e194f5807d290687a6126555e9a945af37f1dd Added: dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.zip == Binary file - no diff available. Propchange: dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.zip -- svn:mime-type = application/octet-stream Added: dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.zip.asc == --- dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.zip.asc (added) +++ dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.zip.asc Thu Oct 12 14:31:50 2023 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- + +iHUEABYKAB0WIQQHP3qTRXVvO0DNuZ5scKO3WZxXNgUCZSfwkQAKCRBscKO3WZxX +NiwIAP44laMefG
[mina-sshd] annotated tag sshd-2.9.3 created (now 9ab56f596)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to annotated tag sshd-2.9.3 in repository https://gitbox.apache.org/repos/asf/mina-sshd.git at 9ab56f596 (tag) tagging a377173417abd8d20541d73d97d739d440d895dc (commit) replaces sshd-2.9.2 by Guillaume Nodet on Thu Oct 12 13:19:52 2023 +0200 - Log - [maven-release-plugin] copy for tag sshd-2.9.3 --- No new revisions were added by this update.
[mina-sshd] branch sshd-2.9.x updated: [maven-release-plugin] prepare release sshd-2.9.3
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch sshd-2.9.x
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/sshd-2.9.x by this push:
new a37717341 [maven-release-plugin] prepare release sshd-2.9.3
a37717341 is described below
commit a377173417abd8d20541d73d97d739d440d895dc
Author: Guillaume Nodet
AuthorDate: Thu Oct 12 13:19:48 2023 +0200
[maven-release-plugin] prepare release sshd-2.9.3
---
assembly/pom.xml | 2 +-
pom.xml | 6 +++---
sshd-cli/pom.xml | 2 +-
sshd-common/pom.xml | 2 +-
sshd-contrib/pom.xml | 2 +-
sshd-core/pom.xml| 2 +-
sshd-git/pom.xml | 2 +-
sshd-ldap/pom.xml| 2 +-
sshd-mina/pom.xml| 2 +-
sshd-netty/pom.xml | 2 +-
sshd-openpgp/pom.xml | 2 +-
sshd-osgi/pom.xml| 5 ++---
sshd-putty/pom.xml | 2 +-
sshd-scp/pom.xml | 2 +-
sshd-sftp/pom.xml| 2 +-
sshd-spring-sftp/pom.xml | 2 +-
16 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 796550137..225fe434d 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.9.3-SNAPSHOT
+2.9.3
apache-sshd
diff --git a/pom.xml b/pom.xml
index 7a2a3b33f..611f395ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.sshd
sshd
-2.9.3-SNAPSHOT
+2.9.3
Apache Mina SSHD
pom
2008
@@ -75,13 +75,13 @@
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
https://github.com/apache/mina-sshd/tree/${project.scm.tag}
-sshd-2.9.2
+sshd-2.9.3
${project.basedir}
UTF-8
-
2022-11-09T14:17:46Z
+
2023-10-12T10:49:26Z
diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml
index dbe0378ed..df5bf8c98 100644
--- a/sshd-cli/pom.xml
+++ b/sshd-cli/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.9.3-SNAPSHOT
+2.9.3
sshd-cli
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index 0c20efb69..583516648 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.9.3-SNAPSHOT
+2.9.3
..
diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml
index 0e9efd49e..cdf895d61 100644
--- a/sshd-contrib/pom.xml
+++ b/sshd-contrib/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.9.3-SNAPSHOT
+2.9.3
[mina-sshd] branch sshd-2.9.x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch sshd-2.9.x
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/sshd-2.9.x by this push:
new fd9653827 [maven-release-plugin] prepare for next development iteration
fd9653827 is described below
commit fd9653827a5fb54b510bd2a4cd0acf3ada3e4e1e
Author: Guillaume Nodet
AuthorDate: Thu Oct 12 13:19:56 2023 +0200
[maven-release-plugin] prepare for next development iteration
---
assembly/pom.xml | 2 +-
pom.xml | 4 ++--
sshd-cli/pom.xml | 2 +-
sshd-common/pom.xml | 2 +-
sshd-contrib/pom.xml | 2 +-
sshd-core/pom.xml| 2 +-
sshd-git/pom.xml | 2 +-
sshd-ldap/pom.xml| 2 +-
sshd-mina/pom.xml| 2 +-
sshd-netty/pom.xml | 2 +-
sshd-openpgp/pom.xml | 2 +-
sshd-osgi/pom.xml| 2 +-
sshd-putty/pom.xml | 2 +-
sshd-scp/pom.xml | 2 +-
sshd-sftp/pom.xml| 2 +-
sshd-spring-sftp/pom.xml | 2 +-
16 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 225fe434d..570014533 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.9.3
+2.9.4-SNAPSHOT
apache-sshd
diff --git a/pom.xml b/pom.xml
index 611f395ea..b4d627591 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.sshd
sshd
-2.9.3
+2.9.4-SNAPSHOT
Apache Mina SSHD
pom
2008
@@ -81,7 +81,7 @@
${project.basedir}
UTF-8
-
2023-10-12T10:49:26Z
+
2023-10-12T11:19:56Z
diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml
index df5bf8c98..2386e9c1f 100644
--- a/sshd-cli/pom.xml
+++ b/sshd-cli/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.9.3
+2.9.4-SNAPSHOT
sshd-cli
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index 583516648..4b8a55f28 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.9.3
+2.9.4-SNAPSHOT
..
diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml
index cdf895d61..d90c3c16e 100644
--- a/sshd-contrib/pom.xml
+++ b/sshd-contrib/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.9.3
+2.9.4-SNAPSHOT
[mina-sshd] branch master updated: Prepare 2.11.0 release
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git The following commit(s) were added to refs/heads/master by this push: new ed832247e Prepare 2.11.0 release ed832247e is described below commit ed832247ecca98fb5ca4bd1cb754c099bb5a7ea6 Author: Guillaume Nodet AuthorDate: Thu Oct 12 13:58:07 2023 +0200 Prepare 2.11.0 release --- CHANGES.md | 79 +--- CHANGES.md => docs/changes/2.11.0.md | 30 ++ 2 files changed, 5 insertions(+), 104 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 268cd9e8e..180d1de8e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,94 +22,19 @@ # [Version 2.9.2 to 2.10.0](./docs/changes/2.10.0.md) +# [Version 2.10.0 to 2.11.0](./docs/changes/2.11.0.md) + # Planned for next version ## Bug Fixes -* [GH-328](https://github.com/apache/mina-sshd/issues/328) Added configurable timeout(s) to `DefaultSftpClient`. -* [GH-370](https://github.com/apache/mina-sshd/issues/370) Also compare file keys in `ModifiableFileWatcher`. -* [GH-371](https://github.com/apache/mina-sshd/issues/371) Fix channel pool in `SftpFileSystem`. -* [GH-383](https://github.com/apache/mina-sshd/issues/383) Use correct default `OpenOption`s in `SftpFileSystemProvider.newFileChannel()`. -* [GH-384](https://github.com/apache/mina-sshd/issues/384) Use correct lock modes for SFTP `FileChannel.lock()`. -* [GH-388](https://github.com/apache/mina-sshd/issues/388) `ScpClient`: support issuing commands to a server that uses a non-UTF-8 locale. -* [GH-398](https://github.com/apache/mina-sshd/issues/398) `SftpInputStreamAsync`: fix reporting EOF on zero-length reads. -* [GH-403](https://github.com/apache/mina-sshd/issues/403) Work-around a bug in WS_FTP <= 12.9 SFTP clients. -* [GH-407](https://github.com/apache/mina-sshd/issues/407) (Regression in 2.10.0) SFTP performance fix: override `FilterOutputStream.write(byte[], int, int)`. -* [GH-410](https://github.com/apache/mina-sshd/issues/410) Fix a race condition to ensure `SSH_MSG_CHANNEL_EOF` is always sent before `SSH_MSG_CHANNEL_CLOSE`. -* [GH-414](https://github.com/apache/mina-sshd/issues/414) Fix error handling while flushing queued packets at end of KEX. -* [GH-420](https://github.com/apache/mina-sshd/issues/420) Fix wrong log level on closing an `Nio2Session`. - -* [SSHD-789](https://issues.apache.org/jira/browse/SSHD-789) Fix detection of Android O/S from system properties. -* [SSHD-1259](https://issues.apache.org/jira/browse/SSHD-1259) Consider all applicable host keys from the known_hosts files. -* [SSHD-1310](https://issues.apache.org/jira/browse/SSHD-1310) `SftpFileSystem`: do not close user session. -* [SSHD-1327](https://issues.apache.org/jira/browse/SSHD-1327) `ChannelAsyncOutputStream`: remove write future when done. -* [SSHD-1332](https://issues.apache.org/jira/browse/SSHD-1332) (Regression in 2.10.0) Resolve ~ in IdentityFile file names in `HostConfigEntry`. - ## New Features -* [SSHD-1330](https://issues.apache.org/jira/browse/SSHD-1330) Use `KeepAliveHandler` global request instance in client as well -* [GH-356](https://github.com/apache/mina-sshd/issues/356) Publish snapshot maven artifacts to the [Apache Snapshots](https://repository.apache.org/content/repositories/snapshots) maven repository. -* Bundle _sshd-contrib_ has support classes for the [HAProxy protocol V2](https://www.haproxy.org/download/2.7/doc/proxy-protocol.txt). - # Behavioral changes and enhancements -### SFTP file handle size - -Previous versions of Apache MINA sshd used SFTP file handles that were twice -as large as configured via `SftpModuleProperties.FILE_HANDLE_SIZE`. The reason for -this was that the file handle bytes were stringified, representing each byte -as two hex characters. This stringified file handle was then send over the wire. -If `SftpModuleProperties.FILE_HANDLE_SIZE` was configured as 16, the actual file -handle size was thus 32 bytes. - -This has been fixed in this version. - -Additionally, the default setting for the size of file handles has been changed -from 16 to 4 bytes. OpenSSH also uses 4-byte SFTP file handles. Using the same -size not only means that there is a little more space left in SSH packets for -actual data transfer, it also completely avoids the WS_FTP bug mentioned in -[GH-403](https://github.com/apache/mina-sshd/issues/403). - ## Potential compatibility issues -### `KeepAliveHandler` global request handler moved from server to common global requests package - -Was previously only on server-side - now also for client (see [SSHD-1330](https://issues.apache.org/jira/browse/SSHD-1330)). -This should be fully backward compatible since most servers do not send this request. However, if users have somehow added this -handler to the client side independently, the code should be re-ex
svn commit: r64634 - /dev/mina/sshd/2.11.0/ /release/mina/sshd/2.11.0/
Author: gnodet Date: Fri Oct 20 08:17:15 2023 New Revision: 64634 Log: Publish Mina SSHD 2.11.0 Added: release/mina/sshd/2.11.0/ - copied from r64633, dev/mina/sshd/2.11.0/ Removed: dev/mina/sshd/2.11.0/
[mina-site] branch master updated: Update website with SSHD 2.9.3 and 2.11.0 releases
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-site.git The following commit(s) were added to refs/heads/master by this push: new 9131a6309 Update website with SSHD 2.9.3 and 2.11.0 releases 9131a6309 is described below commit 9131a63093f59b50738641b89afc62c79f5b123b Author: Guillaume Nodet AuthorDate: Fri Oct 20 10:51:45 2023 +0200 Update website with SSHD 2.9.3 and 2.11.0 releases --- config.toml| 2 +- source/downloads-sshd.md | 18 ++ source/sshd-project/download_2.11.0.md | 21 + source/sshd-project/download_2.9.3.md | 23 +++ source/sshd-project/downloads.md | 18 ++ 5 files changed, 65 insertions(+), 17 deletions(-) diff --git a/config.toml b/config.toml index 65a69f38f..310438f8a 100644 --- a/config.toml +++ b/config.toml @@ -45,5 +45,5 @@ version_mina_2_1 = "2.1.8" version_mina_2_2 = "2.2.3" version_ftpserver_1_1 = "1.1.4" version_ftpserver_1_2 = "1.2.0" -version_sshd = "2.10.0" +version_sshd = "2.11.0" version_vysper = "0.7" diff --git a/source/downloads-sshd.md b/source/downloads-sshd.md index d84e4ed97..cf8c48a2d 100644 --- a/source/downloads-sshd.md +++ b/source/downloads-sshd.md @@ -4,17 +4,17 @@ title: Downloads # Latest SSHD Release -The latest release is the SSHD 2.10.0 release. -Apache Mina SSHD 2.10.0 contains a number of enhancements and bug-fixes. See the lists at the -[Apache issue tracker](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310849=12353091) -and at the [GitHub issue tracker](https://github.com/apache/mina-sshd/issues?q=milestone%3A2.10). +The latest release is the SSHD 2.11.0 release. +Apache Mina SSHD 2.11.0 contains a number of enhancements and bug-fixes. See the lists at the +[Apache issue tracker](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310849=12353699) +and at the [GitHub issue tracker](https://github.com/apache/mina-sshd/issues?q=milestone%3A2.11.0). * Source distributions: -* [Apache Mina SSHD 2.10.0 Sources (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.10.0/apache-sshd-2.10.0-src.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.10.0/apache-sshd-2.10.0-src.tar.gz.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.10.0/apache-sshd-2.10.0-src.tar.gz.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.10.0/apache-sshd-2.10.0-src.tar.gz.sha512) -* [Apache Mina SSHD 2.10.0 Sources (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.10.0/apache-sshd-2.10.0-src.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.10.0/apache-sshd-2.10.0-src.zip.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.10.0/apache-sshd-2.10.0-src.zip.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.10.0/apache-sshd-2.10.0-src.zip.sha512) +* [Apache Mina SSHD 2.11.0 Sources (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.asc) [SHA512](https://www.apache.org/dist/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.sha512) +* [Apache Mina SSHD 2.11.0 Sources (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.11.0/apache-sshd-2.11.0-src.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.11.0/apache-sshd-2.11.0-src.zip.asc) [SHA512](https://www.apache.org/dist/mina/sshd/2.11.0/apache-sshd-2.11.0-src.zip.sha512) * Binary distributions: -* [Apache Mina SSHD 2.10.0 Binary (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.10.0/apache-sshd-2.10.0.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.10.0/apache-sshd-2.10.0.tar.gz.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.10.0/apache-sshd-2.10.0.tar.gz.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.10.0/apache-sshd-2.10.0.tar.gz.sha512) -* [Apache Mina SSHD 2.10.0 Binary (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.10.0/apache-sshd-2.10.0.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.10.0/apache-sshd-2.10.0.zip.asc) [SHA256](https://www.apache.org/dist/mina/sshd/2.10.0/apache-sshd-2.10.0.zip.sha256) [SHA512](https://www.apache.org/dist/mina/sshd/2.10.0/apache-sshd-2.10.0.zip.sha512) +* [Apache Mina SSHD 2.11.0 Binary (.tar.gz)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.11.0/apache-sshd-2.11.0.tar.gz) [PGP](https://www.apache.org/dist/mina/sshd/2.11.0/apache-sshd-2.11.0.tar.gz.asc) [SHA512](https://www.apache.org/dist/mina/sshd/2.11.0/apache-sshd-2.11.0.tar.gz.sha512) +* [Apache Mina SSHD 2.11.0 Binary (.zip)](https://www.apache.org/dyn/closer.lua/mina/sshd/2.11.0/apache-sshd-2.11.0.zip) [PGP](https://www.apache.org/dist/mina/sshd/2.11.0/apache-sshd-2.11.0.zip.asc) [S
svn commit: r64633 - /dev/mina/sshd/2.9.3/ /release/mina/sshd/2.9.3/
Author: gnodet Date: Fri Oct 20 08:16:36 2023 New Revision: 64633 Log: Publish Mina SSHD 2.9.3 Added: release/mina/sshd/2.9.3/ - copied from r64632, dev/mina/sshd/2.9.3/ Removed: dev/mina/sshd/2.9.3/
svn commit: r64529 - in /dev/mina/sshd: 2.11.0/ 2.9.3/
Author: gnodet Date: Sat Oct 14 16:47:18 2023 New Revision: 64529 Log: Remove sha256 and fix sha512 for sshd 2.9.3 and 2.11.0 releases Removed: dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.sha256 dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.zip.sha256 dev/mina/sshd/2.11.0/apache-sshd-2.11.0.pom.sha256 dev/mina/sshd/2.11.0/apache-sshd-2.11.0.tar.gz.sha256 dev/mina/sshd/2.11.0/apache-sshd-2.11.0.zip.sha256 dev/mina/sshd/2.9.3/apache-sshd-2.9.3-src.tar.gz.sha256 dev/mina/sshd/2.9.3/apache-sshd-2.9.3-src.zip.sha256 dev/mina/sshd/2.9.3/apache-sshd-2.9.3.pom.sha256 dev/mina/sshd/2.9.3/apache-sshd-2.9.3.tar.gz.sha256 dev/mina/sshd/2.9.3/apache-sshd-2.9.3.zip.sha256 Modified: dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.sha512 dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.zip.sha512 dev/mina/sshd/2.11.0/apache-sshd-2.11.0.pom.sha512 dev/mina/sshd/2.11.0/apache-sshd-2.11.0.tar.gz.sha512 dev/mina/sshd/2.11.0/apache-sshd-2.11.0.zip.sha512 dev/mina/sshd/2.9.3/apache-sshd-2.9.3-src.tar.gz.sha512 dev/mina/sshd/2.9.3/apache-sshd-2.9.3-src.zip.sha512 dev/mina/sshd/2.9.3/apache-sshd-2.9.3.pom.sha512 dev/mina/sshd/2.9.3/apache-sshd-2.9.3.tar.gz.sha512 dev/mina/sshd/2.9.3/apache-sshd-2.9.3.zip.sha512 Modified: dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.sha512 == --- dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.sha512 (original) +++ dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.tar.gz.sha512 Sat Oct 14 16:47:18 2023 @@ -1 +1,4 @@ -f396fa8502bc254a0cbbf172f650726db0e80d30a4532ac1fa4b9c8ee32bed1c18db4c491ae2959f59a078dde7e194f5807d290687a6126555e9a945af37f1dd +./apache-sshd-2.11.0-src.tar.gz: F396FA85 02BC254A 0CBBF172 F650726D B0E80D30 + A4532AC1 FA4B9C8E E32BED1C 18DB4C49 1AE2959F + 59A078DD E7E194F5 807D2906 87A61265 55E9A945 + AF37F1DD Modified: dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.zip.sha512 == --- dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.zip.sha512 (original) +++ dev/mina/sshd/2.11.0/apache-sshd-2.11.0-src.zip.sha512 Sat Oct 14 16:47:18 2023 @@ -1 +1,4 @@ -53dbbf7e4335abd9719ddac87dd1181329a0efa195b868a9e779c699fa3e06dc53e39647d09d17791256b0b100a12e4265d1e68ddbd77659459150ec4d92bbfc +./apache-sshd-2.11.0-src.zip: 53DBBF7E 4335ABD9 719DDAC8 7DD11813 29A0EFA1 + 95B868A9 E779C699 FA3E06DC 53E39647 D09D1779 + 1256B0B1 00A12E42 65D1E68D DBD77659 459150EC + 4D92BBFC Modified: dev/mina/sshd/2.11.0/apache-sshd-2.11.0.pom.sha512 == --- dev/mina/sshd/2.11.0/apache-sshd-2.11.0.pom.sha512 (original) +++ dev/mina/sshd/2.11.0/apache-sshd-2.11.0.pom.sha512 Sat Oct 14 16:47:18 2023 @@ -1 +1,3 @@ -ac589622afb78d9dd27599e8e2fe77c60d9089ac195026a1833ea6af514edde7be7ef6478a3be03b1d72b2da7d0526051f8519881e4aee13dd3489869d65a0f7 +./apache-sshd-2.11.0.pom: AC589622 AFB78D9D D27599E8 E2FE77C6 0D9089AC 195026A1 + 833EA6AF 514EDDE7 BE7EF647 8A3BE03B 1D72B2DA 7D052605 + 1F851988 1E4AEE13 DD348986 9D65A0F7 Modified: dev/mina/sshd/2.11.0/apache-sshd-2.11.0.tar.gz.sha512 == --- dev/mina/sshd/2.11.0/apache-sshd-2.11.0.tar.gz.sha512 (original) +++ dev/mina/sshd/2.11.0/apache-sshd-2.11.0.tar.gz.sha512 Sat Oct 14 16:47:18 2023 @@ -1 +1,4 @@ -30b473c65e7cd01318e57c06e778ee9ee91ce9836c4d781ca720d782a2751c0f69d801269adb91a3a1fbaa12f569cd5316bbcddc935b471f3e6e91d886d9612f +./apache-sshd-2.11.0.tar.gz: 30B473C6 5E7CD013 18E57C06 E778EE9E E91CE983 + 6C4D781C A720D782 A2751C0F 69D80126 9ADB91A3 + A1FBAA12 F569CD53 16BBCDDC 935B471F 3E6E91D8 + 86D9612F Modified: dev/mina/sshd/2.11.0/apache-sshd-2.11.0.zip.sha512 == --- dev/mina/sshd/2.11.0/apache-sshd-2.11.0.zip.sha512 (original) +++ dev/mina/sshd/2.11.0/apache-sshd-2.11.0.zip.sha512 Sat Oct 14 16:47:18 2023 @@ -1 +1,3 @@ -1cd8e3f53534e31ec06d40f9bdc49ffc3c64d3c07a4a111ddcafd755ccf3ffc299f6a0871c5b86ac70f1554379e0ee5817ca10e6254fa366860b53a0979bac9e +./apache-sshd-2.11.0.zip: 1CD8E3F5 3534E31E C06D40F9 BDC49FFC 3C64D3C0 7A4A111D + DCAFD755 CCF3FFC2 99F6A087 1C5B86AC 70F15543 79E0EE58 + 17CA10E6 254FA366 860B53A0 979BAC9E Modified: dev/mina/sshd/2.9.3/apache-sshd-2.9.3-src.tar.gz.sha512 == --- dev/mina/sshd/2.9.3/apache-sshd-2.9.3-src.tar.gz.sha512 (original) +++ dev/mina/sshd/2.9.3
[mina-sshd] branch sshd-2.9.x created (now f98e2ed7c)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch sshd-2.9.x in repository https://gitbox.apache.org/repos/asf/mina-sshd.git at f98e2ed7c Update changelog for 2.9.3 release This branch includes the following new commits: new 237a9ba4e fix Reproducible Builds issue new c20739b43 [SSHD-1234] Rooted file system can leak informations new f98e2ed7c Update changelog for 2.9.3 release The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[mina-sshd] 01/03: fix Reproducible Builds issue
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch sshd-2.9.x
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 237a9ba4e289f59f52cebab8e999b164a4b446fa
Author: Hervé Boutemy
AuthorDate: Sun May 21 10:30:59 2023 +0200
fix Reproducible Builds issue
---
sshd-osgi/pom.xml | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/sshd-osgi/pom.xml b/sshd-osgi/pom.xml
index feb3716aa..61fb8f522 100644
--- a/sshd-osgi/pom.xml
+++ b/sshd-osgi/pom.xml
@@ -123,13 +123,18 @@
-#Created by Apache Maven ${maven.version}
+#Created by Apache Maven with Maven Antrun Plugin
version=${project.version}
groupId=${project.groupId}
artifactId=${project.artifactId}
+
+Manifest-Version: 1.0
+Created-By: Maven Antrun Plugin
+
-
+
[mina-sshd] 03/03: Update changelog for 2.9.3 release
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch sshd-2.9.x in repository https://gitbox.apache.org/repos/asf/mina-sshd.git commit f98e2ed7c829a0a0ac7a37a381bb79ca69eaa431 Author: Guillaume Nodet AuthorDate: Tue Oct 10 07:48:35 2023 +0200 Update changelog for 2.9.3 release --- CHANGES.md| 2 ++ docs/changes/2.9.3.md | 15 +++ 2 files changed, 17 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 58dd8edb9..6a4c252a3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -20,6 +20,8 @@ # [Version 2.9.1 to 2.9.2](./docs/changes/2.9.2.md) +# [Version 2.9.2 to 2.9.3](./docs/changes/2.9.3.md) + # Planned for next version ## Bug fixes diff --git a/docs/changes/2.9.3.md b/docs/changes/2.9.3.md new file mode 100644 index 0..50a9d919c --- /dev/null +++ b/docs/changes/2.9.3.md @@ -0,0 +1,15 @@ +# Introduced in 2.9.3 + +## Bug fixes + +* [CVE-2023-35887](http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-35887) / [SSHD-1324](https://issues.apache.org/jira/browse/SSHD-1324) Rooted file system can leak informations +* Fix reproducible builds issue + +## Major code re-factoring + +## Potential compatibility issues + +## Minor code helpers + +## Behavioral changes and enhancements +
[mina-sshd] 02/03: [SSHD-1234] Rooted file system can leak informations
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch sshd-2.9.x
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit c20739b43aab0f7bf2ccad982a6cb37b9d5a8a0b
Author: Guillaume Nodet
AuthorDate: Tue May 9 15:17:26 2023 +0200
[SSHD-1234] Rooted file system can leak informations
---
.../common/file/root/RootedDirectoryStream.java| 63 +++
.../sshd/common/file/root/RootedFileSystem.java| 5 +
.../common/file/root/RootedFileSystemProvider.java | 327 +-
.../common/file/root/RootedFileSystemUtils.java| 55 +++
.../file/root/RootedSecureDirectoryStream.java | 92
.../sshd/common/file/util/BaseFileSystem.java | 23 +-
.../org/apache/sshd/common/util/io/IoUtils.java| 160 ++-
.../file/root/RootedFileSystemProviderTest.java| 469 -
.../apache/sshd/common/util/io/IoUtilsTest.java| 48 +++
.../sshd/util/test/CommonTestSupportUtils.java | 4 +-
.../sftp/client/fs/SftpFileSystemProvider.java | 4 +-
.../sftp/server/AbstractSftpSubsystemHelper.java | 101 +++--
.../sshd/sftp/server/SftpFileSystemAccessor.java | 94 -
.../org/apache/sshd/sftp/server/SftpSubsystem.java | 8 +-
.../java/org/apache/sshd/sftp/client/SftpTest.java | 7 +-
.../apache/sshd/sftp/client/SftpVersionsTest.java | 12 +-
16 files changed, 1203 insertions(+), 269 deletions(-)
diff --git
a/sshd-common/src/main/java/org/apache/sshd/common/file/root/RootedDirectoryStream.java
b/sshd-common/src/main/java/org/apache/sshd/common/file/root/RootedDirectoryStream.java
new file mode 100644
index 0..dde9e748d
--- /dev/null
+++
b/sshd-common/src/main/java/org/apache/sshd/common/file/root/RootedDirectoryStream.java
@@ -0,0 +1,63 @@
+/*
+ * 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.file.root;
+
+import java.io.IOException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Path;
+import java.util.Iterator;
+
+/**
+ * secure directory stream proxy for a {@link RootedFileSystem}
+ *
+ * @author mailto:d...@mina.apache.org;>Apache MINA SSHD Project
+ */
+public class RootedDirectoryStream implements DirectoryStream {
+protected final RootedFileSystem rfs;
+protected final DirectoryStream delegate;
+
+public RootedDirectoryStream(RootedFileSystem rfs, DirectoryStream
delegate) {
+this.rfs = rfs;
+this.delegate = delegate;
+}
+
+@Override
+public Iterator iterator() {
+return root(rfs, delegate.iterator());
+}
+
+@Override
+public void close() throws IOException {
+delegate.close();
+}
+
+protected Iterator root(RootedFileSystem rfs, Iterator iter) {
+return new Iterator() {
+@Override
+public boolean hasNext() {
+return iter.hasNext();
+}
+
+@Override
+public Path next() {
+return rfs.provider().root(rfs, iter.next());
+}
+};
+}
+}
diff --git
a/sshd-common/src/main/java/org/apache/sshd/common/file/root/RootedFileSystem.java
b/sshd-common/src/main/java/org/apache/sshd/common/file/root/RootedFileSystem.java
index 1b9a71ca1..efd0b134d 100644
---
a/sshd-common/src/main/java/org/apache/sshd/common/file/root/RootedFileSystem.java
+++
b/sshd-common/src/main/java/org/apache/sshd/common/file/root/RootedFileSystem.java
@@ -94,6 +94,11 @@ public class RootedFileSystem extends
BaseFileSystem {
return rootFs.getFileStores();
}
+@Override
+protected boolean hostFsHasWindowsSeparator() {
+return "\\".equals(getRoot().getFileSystem().getSeparator());
+}
+
@Override
public String toString() {
return rootPath.toString();
diff --git
a/sshd-common/src/main/java/org/apache/sshd/common/file/root/RootedFileSystemProvider.java
b/sshd-common/src/main/java/org/apache/sshd/common/file/root/RootedFileSystemProvider.java
index 0855c7751..9922582b1 100644
---
a/sshd-common/src/main/java/org/apache/sshd/common/file/root/RootedFileSystemProvider.java
+++
b/sshd-common/src/main/java/org/apache/sshd/common/file/r
[mina-sshd] branch master updated: [maven-release-plugin] prepare release sshd-2.9.0
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git The following commit(s) were added to refs/heads/master by this push: new e946067ab [maven-release-plugin] prepare release sshd-2.9.0 e946067ab is described below commit e946067ab3b6f66326c117bfeb88f755a55c4a13 Author: Guillaume Nodet AuthorDate: Mon Jul 11 15:14:02 2022 +0200 [maven-release-plugin] prepare release sshd-2.9.0 --- assembly/pom.xml | 2 +- pom.xml | 10 -- sshd-cli/pom.xml | 2 +- sshd-common/pom.xml | 2 +- sshd-contrib/pom.xml | 2 +- sshd-core/pom.xml| 2 +- sshd-git/pom.xml | 2 +- sshd-ldap/pom.xml| 2 +- sshd-mina/pom.xml| 2 +- sshd-netty/pom.xml | 2 +- sshd-openpgp/pom.xml | 2 +- sshd-osgi/pom.xml| 2 +- sshd-putty/pom.xml | 2 +- sshd-scp/pom.xml | 2 +- sshd-sftp/pom.xml| 2 +- sshd-spring-sftp/pom.xml | 2 +- 16 files changed, 19 insertions(+), 21 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 66d3c39c9..3e583e433 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -22,7 +22,7 @@ org.apache.sshd sshd -2.9.0-SNAPSHOT +2.9.0 apache-sshd diff --git a/pom.xml b/pom.xml index c2d1c8629..cb21506f0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,4 @@ -http://maven.apache.org/POM/4.0.0; -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml index cb5d62b96..65753742b 100644 --- a/sshd-cli/pom.xml +++ b/sshd-cli/pom.xml @@ -22,7 +22,7 @@ org.apache.sshd sshd -2.9.0-SNAPSHOT +2.9.0 sshd-cli diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml index 68d8e9ef7..b54c93415 100644 --- a/sshd-common/pom.xml +++ b/sshd-common/pom.xml @@ -22,7 +22,7 @@ org.apache.sshd sshd -2.9.0-SNAPSHOT +2.9.0 .. diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml index f23d65d36..a1dec0a66 100644 --- a/sshd-contrib/pom.xml +++ b/sshd-contrib/pom.xml @@ -22,7 +22,7 @@ org.apache.sshd sshd -2.9.0-SNAPSHOT +2.9.0
[mina-sshd] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 95ce6bf2e [maven-release-plugin] prepare for next development iteration
95ce6bf2e is described below
commit 95ce6bf2e85125247173be2a8ef0662246f0405b
Author: Guillaume Nodet
AuthorDate: Mon Jul 11 15:14:16 2022 +0200
[maven-release-plugin] prepare for next development iteration
---
assembly/pom.xml | 2 +-
pom.xml | 6 +++---
sshd-cli/pom.xml | 2 +-
sshd-common/pom.xml | 2 +-
sshd-contrib/pom.xml | 2 +-
sshd-core/pom.xml| 2 +-
sshd-git/pom.xml | 2 +-
sshd-ldap/pom.xml| 2 +-
sshd-mina/pom.xml| 2 +-
sshd-netty/pom.xml | 2 +-
sshd-openpgp/pom.xml | 2 +-
sshd-osgi/pom.xml| 2 +-
sshd-putty/pom.xml | 2 +-
sshd-scp/pom.xml | 2 +-
sshd-sftp/pom.xml| 2 +-
sshd-spring-sftp/pom.xml | 2 +-
16 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 3e583e433..700f52756 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.9.0
+2.9.1-SNAPSHOT
apache-sshd
diff --git a/pom.xml b/pom.xml
index cb21506f0..2020effea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.sshd
sshd
-2.9.0
+2.9.1-SNAPSHOT
Apache Mina SSHD
pom
2008
@@ -75,13 +75,13 @@
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
scm:git:https://gitbox.apache.org/repos/asf/mina-sshd.git
https://github.com/apache/mina-sshd/tree/${project.scm.tag}
-sshd-2.9.0
+sshd-2.8.0
${project.basedir}
UTF-8
-
2022-07-11T13:10:27Z
+
2022-07-11T13:14:16Z
diff --git a/sshd-cli/pom.xml b/sshd-cli/pom.xml
index 65753742b..96f379a82 100644
--- a/sshd-cli/pom.xml
+++ b/sshd-cli/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.9.0
+2.9.1-SNAPSHOT
sshd-cli
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index b54c93415..5ef3e2563 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.9.0
+2.9.1-SNAPSHOT
..
diff --git a/sshd-contrib/pom.xml b/sshd-contrib/pom.xml
index a1dec0a66..968a3a5fc 100644
--- a/sshd-contrib/pom.xml
+++ b/sshd-contrib/pom.xml
@@ -22,7 +22,7 @@
org.apache.sshd
sshd
-2.9.0
+2.9.1-SNAPSHOT
[mina-sshd] annotated tag sshd-2.9.0 created (now 8394ee236)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to annotated tag sshd-2.9.0 in repository https://gitbox.apache.org/repos/asf/mina-sshd.git at 8394ee236 (tag) tagging e946067ab3b6f66326c117bfeb88f755a55c4a13 (commit) replaces sshd-2.8.0 by Guillaume Nodet on Mon Jul 11 15:14:12 2022 +0200 - Log - [maven-release-plugin] copy for tag sshd-2.9.0 --- No new revisions were added by this update.
