nicolabs/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-05-06 23:14:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Don't allow files to be symbolic links

Browse source
This commit is contained in:
Roger A. Light 2023-07-31 23:45:16 +01:00
parent e656e694ed
commit fd4f4bc31c
2 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
common/misc_mosq.c
View file

@ -41,6 +41,7 @@ Contributors:
# include <pwd.h>
# include <grp.h>
# include <unistd.h>
# include <fcntl.h>
#endif
#include "misc_mosq.h"
@ -139,7 +140,28 @@ FILE *mosquitto__fopen(const char *path, const char *mode, bool restrict_read)
mode_t old_mask;
old_mask = umask(0077);
fptr = fopen(path, mode);
int open_flags = O_NOFOLLOW;
for(size_t i = 0; i<strlen(mode); i++){
if(mode[i] == 'r'){
open_flags |= O_RDONLY;
}else if(mode[i] == 'w'){
open_flags |= O_WRONLY;
open_flags |= (O_TRUNC | O_CREAT | O_EXCL);
}else if(mode[i] == 'a'){
open_flags |= O_WRONLY;
open_flags |= (O_APPEND | O_CREAT);
}else if(mode[i] == 't'){
}else if(mode[i] == 'b'){
}else if(mode[i] == '+'){
open_flags |= O_RDWR;
}
}
int fd = open(path, open_flags, 0600);
if(fd < 0) return NULL;
fptr = fdopen(fd, mode);
umask(old_mask);
}else{
fptr = fopen(path, mode);

12
src/net.c
View file

@ -333,15 +333,23 @@ static unsigned int psk_server_callback(SSL *ssl, const char *identity, unsigned
#ifdef WITH_TLS
static void tls_keylog_callback(const SSL *ssl, const char *line)
{
FILE *fptr;
UNUSED(ssl);
if(db.tls_keylog){
FILE *fptr;
fptr = mosquitto__fopen(db.tls_keylog, "at", true);
if(fptr){
fprintf(fptr, "%s\n", line);
fclose(fptr);
}else{
#ifndef WIN32
if(errno == ELOOP){
log__printf(NULL, MOSQ_LOG_INFO, "Error: keylog file must not be a symbolic link");
}else
#endif
{
log__printf(NULL, MOSQ_LOG_INFO, "Error: Unable to open keylog file: %s", strerror(errno));
}
}
}
}