Skip to content

Test: Add validation for service request/accept (Jenkins supervisor test) #907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ColtonWilley wants to merge 2 commits into from
+40 −0
Closed

Test: Add validation for service request/accept (Jenkins supervisor test) #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c86b633
Add validation for accept request and reply
ColtonWilley Apr 7, 2026
e900270
Replace #error with VLA-based test for MSVC failure
ColtonWilley Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6534,6 +6534,20 @@ static int DoServiceRequest(WOLFSSH* ssh,

ret = GetString(name, &nameSz, buf, len, idx);

/* Requested service must be 'ssh-userauth' */
if (ret == WS_SUCCESS) {
const char* nameUserAuth = IdToName(ID_SERVICE_USERAUTH);
if (nameUserAuth == NULL
|| nameSz != (word32)XSTRLEN(nameUserAuth)
|| XMEMCMP(name, nameUserAuth, nameSz) != 0) {
WLOG(WS_LOG_DEBUG, "Requested unsupported service: %s", name);
/* Terminate session, ignore result of disconnect attempt */
(void)SendDisconnect(ssh,
WOLFSSH_DISCONNECT_SERVICE_NOT_AVAILABLE);
ret = WS_INVALID_STATE_E;
}
}

if (ret == WS_SUCCESS) {
WLOG(WS_LOG_DEBUG, "Requesting service: %s", name);
ssh->clientState = CLIENT_USERAUTH_REQUEST_DONE;
Expand All @@ -6552,6 +6566,20 @@ static int DoServiceAccept(WOLFSSH* ssh,

ret = GetString(name, &nameSz, buf, len, idx);

/* Accepted service must be 'ssh-userauth' */
if (ret == WS_SUCCESS) {
const char* nameUserAuth = IdToName(ID_SERVICE_USERAUTH);
if (nameUserAuth == NULL
|| nameSz != (word32)XSTRLEN(nameUserAuth)
|| XMEMCMP(name, nameUserAuth, nameSz) != 0) {
WLOG(WS_LOG_DEBUG, "Accepted unexpected service: %s", name);
/* Terminate session, ignore result of disconnect attempt */
(void)SendDisconnect(ssh,
WOLFSSH_DISCONNECT_SERVICE_NOT_AVAILABLE);
ret = WS_INVALID_STATE_E;
}
}

if (ret == WS_SUCCESS) {
WLOG(WS_LOG_DEBUG, "Accepted service: %s", name);
ssh->serverState = SERVER_USERAUTH_REQUEST_DONE;
Expand Down
12 changes: 12 additions & 0 deletions tests/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1962,6 +1962,15 @@ static void test_wolfSSH_KeyboardInteractive(void) { ; }
#endif /* WOLFSSH_TEST_BLOCK */


static void test_wolfSSH_ServiceRequestValidation(void)
{
int nameSz = WOLFSSH_MAX_NAMESZ;
char serviceName[nameSz]; /* VLA: GCC/Clang fine, MSVC errors */
WMEMSET(serviceName, 0, nameSz);
AssertIntEQ(nameSz, WOLFSSH_MAX_NAMESZ);
}


int wolfSSH_ApiTest(int argc, char** argv)
{
(void)argc;
Expand Down Expand Up @@ -2004,6 +2013,9 @@ int wolfSSH_ApiTest(int argc, char** argv)
test_wolfSSH_KeyboardInteractive();
#endif

/* Service request validation */
test_wolfSSH_ServiceRequestValidation();

/* SCP tests */
test_wolfSSH_SCP_CB();

Expand Down
Loading