nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

put quotes around user-supplied strings so they are more likely to

Browse Source 
realize if they add bad characters (like quotes) to the torrc


svn:r4844
This commit is contained in:
Roger Dingledine 2005-08-26 18:40:44 +00:00
parent ff25a7707a
commit fa507c63e8
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/compat.c
View File

@ -533,7 +533,7 @@ get_user_homedir(const char *username)
tor_assert(username); tor_assert(username);
if (!(pw = getpwnam(username))) { if (!(pw = getpwnam(username))) {
log_fn(LOG_ERR,"User '%s' not found.", username); log_fn(LOG_ERR,"User \"%s\" not found.", username);
return NULL; return NULL;
} }
return tor_strdup(pw->pw_dir); return tor_strdup(pw->pw_dir);

4
src/common/crypto.c
View File

@ -422,7 +422,7 @@ int crypto_pk_read_private_key_from_filename(crypto_pk_env_t *env, const char *k
/* Read the file into a string. */ /* Read the file into a string. */
contents = read_file_to_str(keyfile, 0); contents = read_file_to_str(keyfile, 0);
if (!contents) { if (!contents) {
log_fn(LOG_WARN, "Error reading private key from %s", keyfile); log_fn(LOG_WARN, "Error reading private key from \"%s\"", keyfile);
return -1; return -1;
} }
@ -1550,7 +1550,7 @@ int crypto_seed_rng(void)
for (i = 0; filenames[i]; ++i) { for (i = 0; filenames[i]; ++i) {
fd = open(filenames[i], O_RDONLY, 0); fd = open(filenames[i], O_RDONLY, 0);
if (fd<0) continue; if (fd<0) continue;
log_fn(LOG_INFO, "Seeding RNG from %s", filenames[i]); log_fn(LOG_INFO, "Seeding RNG from \"%s\"", filenames[i]);
n = read_all(fd, buf, sizeof(buf), 0); n = read_all(fd, buf, sizeof(buf), 0);
close(fd); close(fd);
if (n != sizeof(buf)) { if (n != sizeof(buf)) {

2
src/common/tortls.c
View File

@ -652,7 +652,7 @@ tor_tls_get_peer_cert_nickname(tor_tls *tls, char *buf, size_t buflen)
if (lenout == -1) if (lenout == -1)
goto error; goto error;
if (((int)strspn(buf, LEGAL_NICKNAME_CHARACTERS)) < lenout) { if (((int)strspn(buf, LEGAL_NICKNAME_CHARACTERS)) < lenout) {
log_fn(LOG_WARN, "Peer certificate nickname '%s' has illegal characters.", log_fn(LOG_WARN, "Peer certificate nickname \"%s\" has illegal characters.",
buf); buf);
if (strchr(buf, '.')) if (strchr(buf, '.'))
log_fn(LOG_WARN, " (Maybe it is not really running Tor at its advertised OR port.)"); log_fn(LOG_WARN, " (Maybe it is not really running Tor at its advertised OR port.)");

30
src/common/util.c
View File

@ -889,22 +889,22 @@ int write_bytes_to_file(const char *fname, const char *str, size_t len,
} }
if ((fd = open(tempname, O_WRONLY|O_CREAT|O_TRUNC|(bin?O_BINARY:O_TEXT), 0600)) if ((fd = open(tempname, O_WRONLY|O_CREAT|O_TRUNC|(bin?O_BINARY:O_TEXT), 0600))
< 0) { < 0) {
log(LOG_WARN, "Couldn't open %s for writing: %s", tempname, log(LOG_WARN, "Couldn't open \"%s\" for writing: %s", tempname,
strerror(errno)); strerror(errno));
goto err; goto err;
} }
result = write_all(fd, str, len, 0); result = write_all(fd, str, len, 0);
if (result < 0 || (size_t)result != len) { if (result < 0 || (size_t)result != len) {
log(LOG_WARN, "Error writing to %s: %s", tempname, strerror(errno)); log(LOG_WARN, "Error writing to \"%s\": %s", tempname, strerror(errno));
close(fd); close(fd);
goto err; goto err;
} }
if (close(fd)) { if (close(fd)) {
log(LOG_WARN,"Error flushing to %s: %s", tempname, strerror(errno)); log(LOG_WARN,"Error flushing to \"%s\": %s", tempname, strerror(errno));
goto err; goto err;
} }
if (replace_file(tempname, fname)) { if (replace_file(tempname, fname)) {
log(LOG_WARN, "Error replacing %s: %s", fname, strerror(errno)); log(LOG_WARN, "Error replacing \"%s\": %s", fname, strerror(errno));
goto err; goto err;
} }
tor_free(tempname); tor_free(tempname);
@ -937,13 +937,13 @@ char *read_file_to_str(const char *filename, int bin) {
r = stat(f, &statbuf); r = stat(f, &statbuf);
tor_free(f); tor_free(f);
if (r < 0) { if (r < 0) {
log_fn(LOG_INFO,"Could not stat %s.",filename); log_fn(LOG_INFO,"Could not stat \"%s\".",filename);
return NULL; return NULL;
} }
fd = open(filename,O_RDONLY|(bin?O_BINARY:O_TEXT),0); fd = open(filename,O_RDONLY|(bin?O_BINARY:O_TEXT),0);
if (fd<0) { if (fd<0) {
log_fn(LOG_WARN,"Could not open %s.",filename); log_fn(LOG_WARN,"Could not open \"%s\".",filename);
return NULL; return NULL;
} }
@ -951,7 +951,7 @@ char *read_file_to_str(const char *filename, int bin) {
r = read_all(fd,string,statbuf.st_size,0); r = read_all(fd,string,statbuf.st_size,0);
if (r<0) { if (r<0) {
log_fn(LOG_WARN,"Error reading from file '%s': %s", filename, log_fn(LOG_WARN,"Error reading from file \"%s\": %s", filename,
strerror(errno)); strerror(errno));
tor_free(string); tor_free(string);
close(fd); close(fd);
@ -962,7 +962,7 @@ char *read_file_to_str(const char *filename, int bin) {
if (bin && r != statbuf.st_size) { if (bin && r != statbuf.st_size) {
/* If we're in binary mode, then we'd better have an exact match for /* If we're in binary mode, then we'd better have an exact match for
* size. Otherwise, win32 encoding may throw us off, and that's okay. */ * size. Otherwise, win32 encoding may throw us off, and that's okay. */
log_fn(LOG_WARN,"Could read only %d of %ld bytes of file '%s'.", log_fn(LOG_WARN,"Could read only %d of %ld bytes of file \"%s\".",
r, (long)statbuf.st_size,filename); r, (long)statbuf.st_size,filename);
tor_free(string); tor_free(string);
close(fd); close(fd);
@ -1078,7 +1078,7 @@ char *expand_filename(const char *filename)
else else
username = tor_strdup(filename+1); username = tor_strdup(filename+1);
if (!(home = get_user_homedir(username))) { if (!(home = get_user_homedir(username))) {
log_fn(LOG_WARN,"Couldn't get homedir for %s",username); log_fn(LOG_WARN,"Couldn't get homedir for \"%s\"",username);
tor_free(username); tor_free(username);
return NULL; return NULL;
} }
@ -1235,7 +1235,7 @@ parse_addr_and_port_range(const char *s, uint32_t *addr_out,
} else if (tor_inet_aton(address, &in) != 0) { } else if (tor_inet_aton(address, &in) != 0) {
*addr_out = ntohl(in.s_addr); *addr_out = ntohl(in.s_addr);
} else { } else {
log_fn(LOG_WARN, "Malformed IP %s in address pattern; rejecting.",address); log_fn(LOG_WARN, "Malformed IP \"%s\" in address pattern; rejecting.",address);
goto err; goto err;
} }
@ -1257,7 +1257,7 @@ parse_addr_and_port_range(const char *s, uint32_t *addr_out,
} else if (tor_inet_aton(mask, &in) != 0) { } else if (tor_inet_aton(mask, &in) != 0) {
*mask_out = ntohl(in.s_addr); *mask_out = ntohl(in.s_addr);
} else { } else {
log_fn(LOG_WARN, "Malformed mask %s on address range; rejecting.", log_fn(LOG_WARN, "Malformed mask \"%s\" on address range; rejecting.",
mask); mask);
goto err; goto err;
} }
@ -1276,11 +1276,11 @@ parse_addr_and_port_range(const char *s, uint32_t *addr_out,
*port_max_out = (uint16_t) tor_parse_long(port, 10, 1, 65535, NULL, *port_max_out = (uint16_t) tor_parse_long(port, 10, 1, 65535, NULL,
&endptr); &endptr);
if (*endptr || !*port_max_out) { if (*endptr || !*port_max_out) {
log_fn(LOG_WARN, "Malformed port %s on address range rejecting.", log_fn(LOG_WARN, "Malformed port \"%s\" on address range rejecting.",
port); port);
} }
} else if (*endptr || !*port_min_out) { } else if (*endptr || !*port_min_out) {
log_fn(LOG_WARN, "Malformed port %s on address range; rejecting.", log_fn(LOG_WARN, "Malformed port \"%s\" on address range; rejecting.",
port); port);
goto err; goto err;
} else { } else {
@ -1476,7 +1476,7 @@ void finish_daemon(const char *desired_cwd)
desired_cwd = "/"; desired_cwd = "/";
/* Don't hold the wrong FS mounted */ /* Don't hold the wrong FS mounted */
if (chdir(desired_cwd) < 0) { if (chdir(desired_cwd) < 0) {
log_fn(LOG_ERR,"chdir to %s failed. Exiting.",desired_cwd); log_fn(LOG_ERR,"chdir to \"%s\" failed. Exiting.",desired_cwd);
exit(1); exit(1);
} }
@ -1514,7 +1514,7 @@ void write_pidfile(char *filename) {
FILE *pidfile; FILE *pidfile;
if ((pidfile = fopen(filename, "w")) == NULL) { if ((pidfile = fopen(filename, "w")) == NULL) {
log_fn(LOG_WARN, "Unable to open %s for writing: %s", filename, log_fn(LOG_WARN, "Unable to open \"%s\" for writing: %s", filename,
strerror(errno)); strerror(errno));
} else { } else {
fprintf(pidfile, "%d\n", (int)getpid()); fprintf(pidfile, "%d\n", (int)getpid());