Skip to content

Fix issues found using ZeroPath #845

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

Merged
merged 6 commits into from
Oct 23, 2025
Merged

Fix issues found using ZeroPath #845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
42f48d3
Reject traversal filenames in SCP receive path
LinuxJedi Oct 22, 2025
06fe99b
Clean SCP base path before filesystem access
LinuxJedi Oct 22, 2025
ec9ca4f
Bound agent signature copies
LinuxJedi Oct 22, 2025
ab17b01
Validate agent signature responses
LinuxJedi Oct 22, 2025
6622473
Add agent sign request regression tests
LinuxJedi Oct 22, 2025
190dda3
Fix agent test setup
LinuxJedi Oct 22, 2025
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
58 changes: 47 additions & 11 deletions src/agent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1340,6 +1340,8 @@ static int DoMessage(WOLFSSH_AGENT_CTX* agent,

if (agent == NULL)
ret = WS_SSH_NULL_E; /* WS_AGENT_NULL_E */
else
agent->lastMsgId = 0;

if (ret == WS_SUCCESS) {
if (buf == NULL || idx == NULL || len == 0)
Expand Down Expand Up @@ -1371,6 +1373,7 @@ static int DoMessage(WOLFSSH_AGENT_CTX* agent,

if (ret == WS_SUCCESS) {
msg = buf[begin++];
agent->lastMsgId = msg;
payloadIdx = 0;
switch (msg) {
case MSGID_AGENT_FAILURE:
Expand Down Expand Up @@ -1793,6 +1796,11 @@ int wolfSSH_AGENT_SignRequest(WOLFSSH* ssh,

if (ret == WS_SUCCESS) {
agent = ssh->agent;
agent->requestFailure = 0;
agent->requestSuccess = 0;
agent->msg = NULL;
agent->msgSz = 0;
agent->lastMsgId = 0;
if (ssh->ctx->agentCb)
ret = ssh->ctx->agentCb(WOLFSSH_AGENT_LOCAL_SETUP, ssh->agentCbCtx);
}
Expand All @@ -1801,11 +1809,16 @@ int wolfSSH_AGENT_SignRequest(WOLFSSH* ssh,
ret = SendSignRequest(agent, digest, digestSz,
keyBlob, keyBlobSz, flags);

if (ret == WS_SUCCESS)
ret = ssh->ctx->agentIoCb(WOLFSSH_AGENT_IO_WRITE,
agent->msg, agent->msgSz, ssh->agentCbCtx);
if (ret == WS_SUCCESS) {
int wrote;

if (ret > 0) ret = WS_SUCCESS;
wrote = ssh->ctx->agentIoCb(WOLFSSH_AGENT_IO_WRITE,
agent->msg, agent->msgSz, ssh->agentCbCtx);
if (wrote != (int)agent->msgSz) {
WLOG(WS_LOG_AGENT, "agent write incomplete");
ret = WS_AGENT_CXN_FAIL;
}
}

if (agent != NULL && agent->msg != NULL) {
WFREE(ssh->agent->msg, ssh->agent->heap, DYNTYPE_AGENT_BUFFER);
Expand All @@ -1818,18 +1831,41 @@ int wolfSSH_AGENT_SignRequest(WOLFSSH* ssh,
rxBuf, sizeof(rxBuf), ssh->agentCbCtx);
if (rxSz > 0) {
ret = DoMessage(ssh->agent, rxBuf, rxSz, &idx);
if (ssh->agent->requestFailure) {
ssh->agent->requestFailure = 0;
ret = WS_AGENT_NO_KEY_E;
}
else {
WMEMCPY(sig, ssh->agent->msg, ssh->agent->msgSz);
*sigSz = ssh->agent->msgSz;
if (ret == WS_SUCCESS) {
if (ssh->agent->lastMsgId != MSGID_AGENT_SIGN_RESPONSE) {
WLOG(WS_LOG_AGENT,
"agent response was not a signature message");
ret = WS_AGENT_NO_KEY_E;
}
else {
if (ssh->agent->requestFailure ||
ssh->agent->msg == NULL ||
ssh->agent->msgSz == 0) {
ssh->agent->requestFailure = 0;
ret = WS_AGENT_NO_KEY_E;
}
else {
word32 maxSigSz = *sigSz;

if (ssh->agent->msgSz > maxSigSz) {
WLOG(WS_LOG_AGENT,
"agent signature too large for caller buffer");
ret = WS_BUFFER_E;
}
else {
WMEMCPY(sig, ssh->agent->msg, ssh->agent->msgSz);
*sigSz = ssh->agent->msgSz;
}
}
}
}
}
else ret = WS_AGENT_NO_KEY_E;
}

if (ret != WS_SUCCESS && sigSz != NULL)
*sigSz = 0;

if (agent != NULL) {
agent->msg = NULL;
agent->msgSz = 0;
Expand Down
37 changes: 32 additions & 5 deletions src/wolfscp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,7 @@ static int GetScpFileName(WOLFSSH* ssh, byte* buf, word32 bufSz,
{
int ret = WS_SUCCESS;
word32 idx, len;
const char* fileName;

if (ssh == NULL || buf == NULL || inOutIdx == NULL)
return WS_BAD_ARGUMENT;
Expand All @@ -977,6 +978,31 @@ static int GetScpFileName(WOLFSSH* ssh, byte* buf, word32 bufSz,
ret = WS_SCP_CMD_E;

if (ret == WS_SUCCESS) {
word32 i;

fileName = (const char*)(buf + idx);

if (len == 0 ||
(len == 1 && fileName[0] == '.') ||
(len == 2 && fileName[0] == '.' && fileName[1] == '.')) {
WLOG(WS_LOG_ERROR, "scp: invalid file name component received");
wolfSSH_SetScpErrorMsg(ssh, "invalid file name");
return WS_SCP_BAD_MSG_E;
}

for (i = 0; i < len; i++) {
char c = fileName[i];

if (c == '/' || c == '\\'
#if defined(USE_WINDOWS_API) || defined(WOLFSSL_NUCLEUS)
|| c == ':'
#endif
) {
WLOG(WS_LOG_ERROR, "scp: invalid file name component received");
wolfSSH_SetScpErrorMsg(ssh, "invalid file name");
return WS_SCP_BAD_MSG_E;
}
}

if (ssh->scpFileName != NULL) {
WFREE(ssh->scpFileName, ssh->ctx->heap, DYNTYPE_STRING);
Expand Down Expand Up @@ -1277,11 +1303,13 @@ int ParseScpCommand(WOLFSSH* ssh)
ssh->scpBasePath = ssh->scpBasePathDynamic;
WMEMCPY(ssh->scpBasePathDynamic, cmd + idx,
cmdSz - idx);
ret = ParseBasePathHelper(ssh, cmdSz);
if (ret == WS_SUCCESS &&
wolfSSH_CleanPath(ssh,
ssh->scpBasePathDynamic) < 0)
if (wolfSSH_CleanPath(ssh,
ssh->scpBasePathDynamic) < 0) {
ret = WS_FATAL_ERROR;
}
else {
ret = ParseBasePathHelper(ssh, cmdSz);
}
}
break;

Expand Down Expand Up @@ -3090,4 +3118,3 @@ int wsScpSendCallback(WOLFSSH* ssh, int state, const char* peerRequest,
#endif /* WOLFSSH_SCP_USER_CALLBACKS */

#endif /* WOLFSSH_SCP */

Loading