You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tw...@apache.org on 2025/10/11 16:07:00 UTC
(mina-sshd) branch master updated (f675ca2e7 -> 1bf013c88)
This is an automated email from the ASF dual-hosted git repository.
twolf pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
omit f675ca2e7 [releng] Exclude spring-integration from dependabot updates
omit f1cf41202 Use more appropriate disconnect reason codes
new 023729c80 Use more appropriate disconnect reason codes
new 1bf013c88 [releng] Exclude spring-integration from dependabot updates
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 (f675ca2e7)
\
N -- N -- N refs/heads/master (1bf013c88)
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 2 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:
.../main/java/org/apache/sshd/server/session/ServerUserAuthService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(mina-sshd) 02/02: [releng] Exclude spring-integration from dependabot updates
Posted by tw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
twolf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 1bf013c886beb4513f06735fa393ab357e32404a
Author: Thomas Wolf <tw...@apache.org>
AuthorDate: Sat Oct 11 17:56:45 2025 +0200
[releng] Exclude spring-integration from dependabot updates
Spring 6 needs Java 17+.
---
.github/dependabot.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 8ea443414..84361bf88 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -27,6 +27,8 @@ updates:
versions: [">= 6.0.0"]
- dependency-name: "org.springframework:spring-framework-bom"
versions: [">= 6.0.0"]
+ - dependency-name: "org.springframework.integration:spring-integration-bom"
+ versions: [">= 6.0.0"]
- dependency-name: "org.eclipse.jgit:*"
versions: [ ">= 6.0.0" ]
- dependency-name: "org.mockito:*"
(mina-sshd) 01/02: Use more appropriate disconnect reason codes
Posted by tw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
twolf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 023729c80be3a95f363a07d58e2de6c719dbcbe9
Author: Thomas Wolf <tw...@apache.org>
AuthorDate: Sat Oct 11 17:46:06 2025 +0200
Use more appropriate disconnect reason codes
In too many places the general SSH2_DISCONNECT_PROTOCOL_ERROR was used,
which gives a potentially misleading message to the client. Use other
error reason codes that enable transporting custom messages. (With
"protocol error" or "mac error" we always send a fixed message because
of CVE-2008-1561.)
---
.../java/org/apache/sshd/server/session/AbstractServerSession.java | 2 +-
.../java/org/apache/sshd/server/session/ServerUserAuthService.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java b/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java
index b7970aae5..25108ce7e 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java
@@ -354,7 +354,7 @@ public abstract class AbstractServerSession extends AbstractSession implements S
}
// TODO: can services be initiated by the server-side ?
- disconnect(SshConstants.SSH2_DISCONNECT_PROTOCOL_ERROR,
+ disconnect(SshConstants.SSH2_DISCONNECT_SERVICE_NOT_AVAILABLE,
"Unsupported packet: SSH_MSG_SERVICE_ACCEPT for " + serviceName);
}
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerUserAuthService.java b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerUserAuthService.java
index 06b44d593..de51b0a77 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerUserAuthService.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerUserAuthService.java
@@ -268,7 +268,7 @@ public class ServerUserAuthService extends AbstractCloseable implements Service,
}
if (disconnectSession) {
- session.disconnect(SshConstants.SSH2_DISCONNECT_PROTOCOL_ERROR,
+ session.disconnect(SshConstants.SSH2_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE,
"Too many authentication failures: " + nbAuthRequests);
return false;
}
@@ -294,9 +294,9 @@ public class ServerUserAuthService extends AbstractCloseable implements Service,
}
if (disconnectSession) {
- session.disconnect(SshConstants.SSH2_DISCONNECT_PROTOCOL_ERROR,
+ session.disconnect(SshConstants.SSH2_DISCONNECT_ILLEGAL_USER_NAME,
"Change of username or service is not allowed (" + this.authUserName + ", " + this.authService + ")"
- + " -> (" + username + ", " + service + ")");
+ + " -> (" + username + ", " + service + ")");
} else {
if (debugEnabled) {
log.debug(