Commander1024
51f835c22f
- Enforce exact service and channel names with bounded failure parsing - Add hash-pinned offline notice assembly and regression coverage - Record advisory dispositions, provenance, integration evidence, and remaining gates
70 lines
2.2 KiB
Diff
70 lines
2.2 KiB
Diff
From 0317c40fc131fab952d291d43c56c7b7ce5f4303 Mon Sep 17 00:00:00 2001
|
|
From: Yosuke Shimizu <yosuke@wolfssl.com>
|
|
Date: Wed, 15 Apr 2026 13:37:21 +0900
|
|
Subject: [PATCH] Fix DoChannelOpen() and Add regress test
|
|
|
|
---
|
|
src/internal.c | 6 ++++++
|
|
tests/regress.c | 24 ++++++++++++++++++++++++
|
|
2 files changed, 30 insertions(+)
|
|
|
|
diff --git a/src/internal.c b/src/internal.c
|
|
index 1202d132e..a0df29600 100644
|
|
--- a/src/internal.c
|
|
+++ b/src/internal.c
|
|
@@ -8739,6 +8739,12 @@ static int DoChannelOpen(WOLFSSH* ssh,
|
|
ssh->fwdCbCtx, NULL, newChannel->channel);
|
|
}
|
|
}
|
|
+ else {
|
|
+ WLOG(WS_LOG_WARN, "No forward callback set for direct-tcpip channel,"
|
|
+ " failing channel open");
|
|
+ fail_reason = OPEN_ADMINISTRATIVELY_PROHIBITED;
|
|
+ ret = WS_ERROR;
|
|
+ }
|
|
}
|
|
#endif /* WOLFSSH_FWD */
|
|
if (ret == WS_SUCCESS) {
|
|
diff --git a/tests/regress.c b/tests/regress.c
|
|
index 321151b8d..bfc719315 100644
|
|
--- a/tests/regress.c
|
|
+++ b/tests/regress.c
|
|
@@ -1184,6 +1184,29 @@ static void TestDirectTcpipRejectSendsOpenFail(void)
|
|
|
|
FreeChannelOpenHarness(&harness);
|
|
}
|
|
+
|
|
+static void TestDirectTcpipNoFwdCbSendsOpenFail(void)
|
|
+{
|
|
+ ChannelOpenHarness harness;
|
|
+ byte extra[128];
|
|
+ byte in[192];
|
|
+ word32 extraSz;
|
|
+ word32 inSz;
|
|
+ int ret;
|
|
+
|
|
+ extraSz = BuildDirectTcpipExtra("127.0.0.1", 8080, "127.0.0.1", 2222,
|
|
+ extra, sizeof(extra));
|
|
+ inSz = BuildChannelOpenPacket("direct-tcpip", 9, 0x4000, 0x8000,
|
|
+ extra, extraSz, in, sizeof(in));
|
|
+
|
|
+ InitChannelOpenHarness(&harness, in, inSz);
|
|
+ /* Intentionally do NOT register fwdCb */
|
|
+
|
|
+ ret = DoReceive(harness.ssh);
|
|
+ AssertChannelOpenFailResponse(&harness, ret);
|
|
+
|
|
+ FreeChannelOpenHarness(&harness);
|
|
+}
|
|
#endif
|
|
|
|
#ifdef WOLFSSH_AGENT
|
|
@@ -1648,6 +1671,7 @@ int main(int argc, char** argv)
|
|
TestChannelOpenCallbackRejectSendsOpenFail();
|
|
#ifdef WOLFSSH_FWD
|
|
TestDirectTcpipRejectSendsOpenFail();
|
|
+ TestDirectTcpipNoFwdCbSendsOpenFail();
|
|
#endif
|
|
#ifdef WOLFSSH_AGENT
|
|
TestAgentChannelNullAgentSendsOpenFail();
|