m1ngsama/TNT
1
0
Fork 0
mirror of https://github.com/m1ngsama/TNT.git synced 2026-02-08 00:54:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'fix/resource-management' into feat/security-audit-fixes

Browse source
This commit is contained in:
m1ngsama 2026-01-22 14:07:10 +08:00
commit 4a34a776c2
2 changed files with 57 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/message.c
View file

@ -28,12 +28,33 @@ int message_load(message_t **messages, int max_messages) {
/* Use a ring buffer approach - keep only last max_messages */
/* First, count total lines and seek to appropriate position */
long file_pos[1000]; /* Track positions of last 1000 lines */
/* Use dynamic allocation to handle large log files */
long *file_pos = NULL;
int pos_capacity = 1000;
int line_count = 0;
int start_index = 0;
/* Allocate initial position array */
file_pos = malloc(pos_capacity * sizeof(long));
if (!file_pos) {
fclose(fp);
*messages = msg_array;
return 0;
}
/* Record file positions */
while (fgets(line, sizeof(line), fp) && line_count < 1000) {
while (fgets(line, sizeof(line), fp)) {
/* Expand array if needed */
if (line_count >= pos_capacity) {
int new_capacity = pos_capacity * 2;
long *new_pos = realloc(file_pos, new_capacity * sizeof(long));
if (!new_pos) {
/* Out of memory, stop scanning */
break;
}
file_pos = new_pos;
pos_capacity = new_capacity;
}
file_pos[line_count++] = ftell(fp) - strlen(line);
}
@ -100,6 +121,7 @@ int message_load(message_t **messages, int max_messages) {
count++;
}
free(file_pos);
fclose(fp);
*messages = msg_array;
return count;

39
src/ssh_server.c
View file

@ -50,12 +50,29 @@ static int setup_host_key(ssh_bind sshbind) {
/* Check if host key exists */
if (stat(HOST_KEY_FILE, &st) == 0) {
/* Load existing key */
if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_RSAKEY, HOST_KEY_FILE) < 0) {
fprintf(stderr, "Failed to load host key: %s\n", ssh_get_error(sshbind));
/* Validate file size */
if (st.st_size == 0) {
fprintf(stderr, "Warning: Empty key file, regenerating...\n");
unlink(HOST_KEY_FILE);
/* Fall through to generate new key */
} else if (st.st_size > 10 * 1024 * 1024) {
/* Sanity check: key file shouldn't be > 10MB */
fprintf(stderr, "Error: Key file too large (%lld bytes)\n", (long long)st.st_size);
return -1;
} else {
/* Verify and fix permissions */
if ((st.st_mode & 0077) != 0) {
fprintf(stderr, "Warning: Fixing insecure key file permissions\n");
chmod(HOST_KEY_FILE, 0600);
}
/* Load existing key */
if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_RSAKEY, HOST_KEY_FILE) < 0) {
fprintf(stderr, "Failed to load host key: %s\n", ssh_get_error(sshbind));
return -1;
}
return 0;
}
return 0;
}
/* Generate new key */
@ -827,7 +844,17 @@ int ssh_server_start(int unused) {
/* Create thread for client */
pthread_t thread;
if (pthread_create(&thread, NULL, client_handle_session, client) != 0) {
pthread_attr_t attr;
/* Initialize thread attributes for detached thread */
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if (pthread_create(&thread, &attr, client_handle_session, client) != 0) {
fprintf(stderr, "Thread creation failed: %s\n", strerror(errno));
pthread_attr_destroy(&attr);
/* Clean up all resources */
pthread_mutex_destroy(&client->ref_lock);
ssh_channel_close(channel);
ssh_channel_free(channel);
ssh_disconnect(session);
@ -836,7 +863,7 @@ int ssh_server_start(int unused) {
continue;
}
pthread_detach(thread);
pthread_attr_destroy(&attr);
}
return 0;