Skip to content

Commit 489e5fd

Browse files
committed
[SSHD-1237] Don't warn about keep-alive channel requests
OpenSSH server sends keep-alive requests as channel requests if a channel is open. Do not log a warning about such requests, simply send back a failure reply. OpenSSH just expects any reply, whether success or failure.
1 parent 62e6bfe commit 489e5fd

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CHANGES.md

+3
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
* [PR-476](https://github.com/apache/mina-sshd/pull/476) Fix Android detection
4343
* [PR-486](https://github.com/apache/mina-sshd/pull/486) Add missing `equals` and `hashCode` to U2F key classes
4444

45+
46+
* [SSHD-1237](https://issues.apache.org/jira/browse/SSHD-1237) Don't warn about keep-alive channel requests
47+
4548
## New Features
4649

4750
## Behavioral changes and enhancements

sshd-core/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,9 @@ protected void handleChannelRequest(String req, boolean wantReply, Buffer buffer
337337
protected void handleUnknownChannelRequest(String req, boolean wantReply, Buffer buffer) throws IOException {
338338
RequestHandler.Result r = handleInternalRequest(req, wantReply, buffer);
339339
if ((r == null) || RequestHandler.Result.Unsupported.equals(r)) {
340-
log.warn("handleUnknownChannelRequest({}) Unknown channel request: {}[want-reply={}]", this, req,
341-
wantReply);
340+
if (!req.startsWith("keepalive@") && !req.startsWith("keep-alive@")) {
341+
log.warn("handleUnknownChannelRequest({}) Unknown channel request: {}[want-reply={}]", this, req, wantReply);
342+
}
342343
sendResponse(buffer, req, RequestHandler.Result.Unsupported, wantReply);
343344
} else {
344345
sendResponse(buffer, req, r, wantReply);

0 commit comments

Comments
 (0)