m1ngsama/TNT
1
0
Fork 0
mirror of https://oauth2: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@github.com/m1ngsama/TNT.git synced 2026-05-10 19:00:57 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #35 from m1ngsama/fix/auth-strncpy-nul

Browse source 
fix: correct pubkey auth, strncpy warning, and NUL byte validation
This commit is contained in:
m1ngsama 2026-04-19 18:30:38 +08:00 committed by GitHub
commit 03d82a5a83
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ssh_server.c
View file

@ -1109,9 +1109,8 @@ static void execute_command(client_t *client) {
(max_hist - 1) * sizeof(client->command_history[0])); (max_hist - 1) * sizeof(client->command_history[0]));
client->command_history_count = max_hist - 1; client->command_history_count = max_hist - 1;
} }
strncpy(client->command_history[client->command_history_count], snprintf(client->command_history[client->command_history_count],
cmd, sizeof(client->command_history[0]) - 1); sizeof(client->command_history[0]), "%s", cmd);
client->command_history[client->command_history_count][sizeof(client->command_history[0]) - 1] = '\0';
client->command_history_count++; client->command_history_count++;
client->command_history_pos = client->command_history_count; client->command_history_pos = client->command_history_count;
} }
@ -1740,10 +1739,11 @@ static int auth_pubkey(ssh_session session, const char *user,
return SSH_AUTH_DENIED; return SSH_AUTH_DENIED;
} }
/* Only accept after the signature has been verified by libssh. /* SSH_PUBLICKEY_STATE_NONE = key offer (no signature yet).
* SSH_PUBLICKEY_STATE_NONE is just a key offer — no proof of possession. */ * Return SUCCESS to tell libssh "I accept this key, verify the signature."
* SSH_PUBLICKEY_STATE_VALID = signature verified by libssh. */
if (signature_state != SSH_PUBLICKEY_STATE_VALID) { if (signature_state != SSH_PUBLICKEY_STATE_VALID) {
return SSH_AUTH_PARTIAL; return SSH_AUTH_SUCCESS;
} }
ctx->auth_success = true; ctx->auth_success = true;

4
src/utf8.c
View file

@ -193,9 +193,9 @@ bool utf8_is_valid_sequence(const char *bytes, int len) {
uint32_t codepoint = 0; uint32_t codepoint = 0;
switch (len) { switch (len) {
case 1: case 1:
/* 0xxxxxxx - valid range: 0x00-0x7F */ /* 0xxxxxxx - valid range: 0x01-0x7F (reject NUL) */
codepoint = b[0]; codepoint = b[0];
if (codepoint > 0x7F) return false; if (codepoint == 0 || codepoint > 0x7F) return false;
break; break;
case 2: case 2:
/* 110xxxxx 10xxxxxx - valid range: 0x80-0x7FF */ /* 110xxxxx 10xxxxxx - valid range: 0x80-0x7FF */