projects
/
oweals
/
tinc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Oops.
[oweals/tinc.git]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index b6d2b0af835a05dafdf62da11ebf1afcce3d2c39..0fb18ab1db1edd80ac44ce0becfbc5703b820128 100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-19,31
+19,17
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: conf.c,v 1.9.4.
65 2003/07/12 17:41:45
guus Exp $
+ $Id: conf.c,v 1.9.4.
72 2003/08/02 21:34:10
guus Exp $
*/
*/
-#include "config.h"
-
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <xalloc.h>
-#include <utils.h> /* for cp */
-#include <avl_tree.h>
+#include "system.h"
+#include "avl_tree.h"
#include "conf.h"
#include "conf.h"
-#include "netutl.h" /* for str2address */
#include "logger.h"
#include "logger.h"
-
-#include "system.h"
+#include "netutl.h" /* for str2address */
+#include "utils.h" /* for cp */
+#include "xalloc.h"
avl_tree_t *config_tree;
avl_tree_t *config_tree;
@@
-51,7
+37,7
@@
int pingtimeout = 0; /* seconds before timeout */
char *confbase = NULL; /* directory in which all config files are */
char *netname = NULL; /* name of the vpn network */
char *confbase = NULL; /* directory in which all config files are */
char *netname = NULL; /* name of the vpn network */
-static int config_compare(con
fig_t *a,
config_t *b)
+static int config_compare(con
st config_t *a, const
config_t *b)
{
int result;
{
int result;
@@
-113,7
+99,7
@@
void config_add(avl_tree_t *config_tree, config_t *cfg)
avl_insert(config_tree, cfg);
}
avl_insert(config_tree, cfg);
}
-config_t *lookup_config(avl_tree_t *config_tree, char *variable)
+config_t *lookup_config(
const
avl_tree_t *config_tree, char *variable)
{
config_t cfg, *found;
{
config_t cfg, *found;
@@
-134,7
+120,7
@@
config_t *lookup_config(avl_tree_t *config_tree, char *variable)
return found;
}
return found;
}
-config_t *lookup_config_next(
avl_tree_t *config_tree,
config_t *cfg)
+config_t *lookup_config_next(
const avl_tree_t *config_tree, const
config_t *cfg)
{
avl_node_t *node;
config_t *found;
{
avl_node_t *node;
config_t *found;
@@
-155,109
+141,109
@@
config_t *lookup_config_next(avl_tree_t *config_tree, config_t *cfg)
return NULL;
}
return NULL;
}
-
int get_config_bool(config_t *cfg, int
*result)
+
bool get_config_bool(const config_t *cfg, bool
*result)
{
cp();
if(!cfg)
{
cp();
if(!cfg)
- return
0
;
+ return
false
;
if(!strcasecmp(cfg->value, "yes")) {
if(!strcasecmp(cfg->value, "yes")) {
- *result =
1
;
- return
1
;
+ *result =
true
;
+ return
true
;
} else if(!strcasecmp(cfg->value, "no")) {
} else if(!strcasecmp(cfg->value, "no")) {
- *result =
0
;
- return
1
;
+ *result =
false
;
+ return
true
;
}
logger(LOG_ERR, _("\"yes\" or \"no\" expected for configuration variable %s in %s line %d"),
cfg->variable, cfg->file, cfg->line);
}
logger(LOG_ERR, _("\"yes\" or \"no\" expected for configuration variable %s in %s line %d"),
cfg->variable, cfg->file, cfg->line);
- return
0
;
+ return
false
;
}
}
-
int get_config_int(
config_t *cfg, int *result)
+
bool get_config_int(const
config_t *cfg, int *result)
{
cp();
if(!cfg)
{
cp();
if(!cfg)
- return
0
;
+ return
false
;
if(sscanf(cfg->value, "%d", result) == 1)
if(sscanf(cfg->value, "%d", result) == 1)
- return
1
;
+ return
true
;
logger(LOG_ERR, _("Integer expected for configuration variable %s in %s line %d"),
cfg->variable, cfg->file, cfg->line);
logger(LOG_ERR, _("Integer expected for configuration variable %s in %s line %d"),
cfg->variable, cfg->file, cfg->line);
- return
0
;
+ return
false
;
}
}
-
int get_config_string(
config_t *cfg, char **result)
+
bool get_config_string(const
config_t *cfg, char **result)
{
cp();
if(!cfg)
{
cp();
if(!cfg)
- return
0
;
+ return
false
;
*result = xstrdup(cfg->value);
*result = xstrdup(cfg->value);
- return
1
;
+ return
true
;
}
}
-
int get_config_address(
config_t *cfg, struct addrinfo **result)
+
bool get_config_address(const
config_t *cfg, struct addrinfo **result)
{
struct addrinfo *ai;
cp();
if(!cfg)
{
struct addrinfo *ai;
cp();
if(!cfg)
- return
0
;
+ return
false
;
ai = str2addrinfo(cfg->value, NULL, 0);
if(ai) {
*result = ai;
ai = str2addrinfo(cfg->value, NULL, 0);
if(ai) {
*result = ai;
- return
1
;
+ return
true
;
}
logger(LOG_ERR, _("Hostname or IP address expected for configuration variable %s in %s line %d"),
cfg->variable, cfg->file, cfg->line);
}
logger(LOG_ERR, _("Hostname or IP address expected for configuration variable %s in %s line %d"),
cfg->variable, cfg->file, cfg->line);
- return
0
;
+ return
false
;
}
}
-
int get_config_subnet(
config_t *cfg, subnet_t ** result)
+
bool get_config_subnet(const
config_t *cfg, subnet_t ** result)
{
subnet_t *subnet;
cp();
if(!cfg)
{
subnet_t *subnet;
cp();
if(!cfg)
- return
0
;
+ return
false
;
subnet = str2net(cfg->value);
if(!subnet) {
logger(LOG_ERR, _("Subnet expected for configuration variable %s in %s line %d"),
cfg->variable, cfg->file, cfg->line);
subnet = str2net(cfg->value);
if(!subnet) {
logger(LOG_ERR, _("Subnet expected for configuration variable %s in %s line %d"),
cfg->variable, cfg->file, cfg->line);
- return
0
;
+ return
false
;
}
/* Teach newbies what subnets are... */
if(((subnet->type == SUBNET_IPV4)
}
/* Teach newbies what subnets are... */
if(((subnet->type == SUBNET_IPV4)
- && maskcheck(&subnet->net.ipv4.address, subnet->net.ipv4.prefixlength, sizeof(ipv4_t)))
+ &&
!
maskcheck(&subnet->net.ipv4.address, subnet->net.ipv4.prefixlength, sizeof(ipv4_t)))
|| ((subnet->type == SUBNET_IPV6)
|| ((subnet->type == SUBNET_IPV6)
- && maskcheck(&subnet->net.ipv6.address, subnet->net.ipv6.prefixlength, sizeof(ipv6_t)))) {
+ &&
!
maskcheck(&subnet->net.ipv6.address, subnet->net.ipv6.prefixlength, sizeof(ipv6_t)))) {
logger(LOG_ERR, _ ("Network address and prefix length do not match for configuration variable %s in %s line %d"),
cfg->variable, cfg->file, cfg->line);
free(subnet);
logger(LOG_ERR, _ ("Network address and prefix length do not match for configuration variable %s in %s line %d"),
cfg->variable, cfg->file, cfg->line);
free(subnet);
- return
0
;
+ return
false
;
}
*result = subnet;
}
*result = subnet;
- return
1
;
+ return
true
;
}
/*
}
/*
@@
-339,7
+325,9
@@
int read_config_file(avl_tree_t *config_tree, const char *fname)
FILE *fp;
char *buffer, *line;
char *variable, *value;
FILE *fp;
char *buffer, *line;
char *variable, *value;
- int lineno = 0, ignore = 0;
+ int lineno = 0;
+ int len;
+ bool ignore = false;
config_t *cfg;
size_t bufsize;
config_t *cfg;
size_t bufsize;
@@
-371,37
+359,44
@@
int read_config_file(avl_tree_t *config_tree, const char *fname)
lineno++;
lineno++;
- variable = strtok(line, "\t =");
-
- if(!variable)
- continue; /* no tokens on this line */
-
- if(variable[0] == '#')
- continue; /* comment: ignore */
-
- if(!strcmp(variable, "-----BEGIN"))
- ignore = 1;
+ if(*line == '#')
+ continue;
- if(!ignore) {
- value = strtok(NULL, "\t\n\r =");
+ if(ignore) {
+ if(!strncmp(line, "-----END", 8))
+ ignore = false;
+ continue;
+ }
+
+ if(!strncmp(line, "-----BEGIN", 10)) {
+ ignore = true;
+ continue;
+ }
- if(!value || value[0] == '#') {
- logger(LOG_ERR, _("No value for variable `%s' on line %d while reading config file %s"),
- variable, lineno, fname);
- break;
- }
+ variable = value = line;
- cfg = new_config();
- cfg->variable = xstrdup(variable);
- cfg->value = xstrdup(value);
- cfg->file = xstrdup(fname);
- cfg->line = lineno;
+ len = strcspn(value, "\t =");
+ value += len;
+ value += strspn(value, "\t ");
+ if(*value == '=') {
+ value++;
+ value += strspn(value, "\t ");
+ }
+ variable[len] = '\0';
- config_add(config_tree, cfg);
+ if(!*value) {
+ logger(LOG_ERR, _("No value for variable `%s' on line %d while reading config file %s"),
+ variable, lineno, fname);
+ break;
}
}
- if(!strcmp(variable, "-----END"))
- ignore = 0;
+ cfg = new_config();
+ cfg->variable = xstrdup(variable);
+ cfg->value = xstrdup(value);
+ cfg->file = xstrdup(fname);
+ cfg->line = lineno;
+
+ config_add(config_tree, cfg);
}
free(buffer);
}
free(buffer);
@@
-410,7
+405,7
@@
int read_config_file(avl_tree_t *config_tree, const char *fname)
return err;
}
return err;
}
-
int
read_server_config()
+
bool
read_server_config()
{
char *fname;
int x;
{
char *fname;
int x;
@@
-426,11
+421,12
@@
int read_server_config()
free(fname);
free(fname);
- return x;
+ return x
== 0
;
}
}
-
int
is_safe_path(const char *file)
+
bool
is_safe_path(const char *file)
{
{
+#if !(defined(HAVE_CYGWIN) || defined(HAVE_MINGW))
char *p;
const char *f;
char x;
char *p;
const char *f;
char x;
@@
-439,7
+435,7
@@
int is_safe_path(const char *file)
if(*file != '/') {
logger(LOG_ERR, _("`%s' is not an absolute path"), file);
if(*file != '/') {
logger(LOG_ERR, _("`%s' is not an absolute path"), file);
- return
0
;
+ return
false
;
}
p = strrchr(file, '/');
}
p = strrchr(file, '/');
@@
-455,13
+451,13
@@
int is_safe_path(const char *file)
check1:
if(lstat(f, &s) < 0) {
logger(LOG_ERR, _("Couldn't stat `%s': %s"), f, strerror(errno));
check1:
if(lstat(f, &s) < 0) {
logger(LOG_ERR, _("Couldn't stat `%s': %s"), f, strerror(errno));
- return
0
;
+ return
false
;
}
if(s.st_uid != geteuid()) {
logger(LOG_ERR, _("`%s' is owned by UID %d instead of %d"),
f, s.st_uid, geteuid());
}
if(s.st_uid != geteuid()) {
logger(LOG_ERR, _("`%s' is owned by UID %d instead of %d"),
f, s.st_uid, geteuid());
- return
0
;
+ return
false
;
}
if(S_ISLNK(s.st_mode)) {
}
if(S_ISLNK(s.st_mode)) {
@@
-470,7
+466,7
@@
check1:
if(readlink(f, l, MAXBUFSIZE) < 0) {
logger(LOG_ERR, _("Unable to read symbolic link `%s': %s"), f,
strerror(errno));
if(readlink(f, l, MAXBUFSIZE) < 0) {
logger(LOG_ERR, _("Unable to read symbolic link `%s': %s"), f,
strerror(errno));
- return
0
;
+ return
false
;
}
f = l;
}
f = l;
@@
-483,16
+479,16
@@
check1:
check2:
if(lstat(f, &s) < 0 && errno != ENOENT) {
logger(LOG_ERR, _("Couldn't stat `%s': %s"), f, strerror(errno));
check2:
if(lstat(f, &s) < 0 && errno != ENOENT) {
logger(LOG_ERR, _("Couldn't stat `%s': %s"), f, strerror(errno));
- return
0
;
+ return
false
;
}
if(errno == ENOENT)
}
if(errno == ENOENT)
- return
1
;
+ return
true
;
if(s.st_uid != geteuid()) {
logger(LOG_ERR, _("`%s' is owned by UID %d instead of %d"),
f, s.st_uid, geteuid());
if(s.st_uid != geteuid()) {
logger(LOG_ERR, _("`%s' is owned by UID %d instead of %d"),
f, s.st_uid, geteuid());
- return
0
;
+ return
false
;
}
if(S_ISLNK(s.st_mode)) {
}
if(S_ISLNK(s.st_mode)) {
@@
-501,7
+497,7
@@
check2:
if(readlink(f, l, MAXBUFSIZE) < 0) {
logger(LOG_ERR, _("Unable to read symbolic link `%s': %s"), f,
strerror(errno));
if(readlink(f, l, MAXBUFSIZE) < 0) {
logger(LOG_ERR, _("Unable to read symbolic link `%s': %s"), f,
strerror(errno));
- return
0
;
+ return
false
;
}
f = l;
}
f = l;
@@
-511,14
+507,14
@@
check2:
if(s.st_mode & 0007) {
/* Accessible by others */
logger(LOG_ERR, _("`%s' has unsecure permissions"), f);
if(s.st_mode & 0007) {
/* Accessible by others */
logger(LOG_ERR, _("`%s' has unsecure permissions"), f);
- return
0
;
+ return
false
;
}
}
+#endif
- return
1
;
+ return
true
;
}
}
-FILE *ask_and_safe_open(const char *filename, const char *what,
- const char *mode)
+FILE *ask_and_safe_open(const char *filename, const char *what, bool safe, const char *mode)
{
FILE *r;
char *directory;
{
FILE *r;
char *directory;
@@
-574,12
+570,14
@@
FILE *ask_and_safe_open(const char *filename, const char *what,
}
/* Then check the file for nasty attacks */
}
/* Then check the file for nasty attacks */
- if(!is_safe_path(fn)) { /* Do not permit any directories that are readable or writeable by other users. */
- fprintf(stderr, _("The file `%s' (or any of the leading directories) has unsafe permissions.\n"
- "I will not create or overwrite this file.\n"), fn);
- fclose(r);
- free(fn);
- return NULL;
+ if(safe) {
+ if(!is_safe_path(fn)) { /* Do not permit any directories that are readable or writeable by other users. */
+ fprintf(stderr, _("The file `%s' (or any of the leading directories) has unsafe permissions.\n"
+ "I will not create or overwrite this file.\n"), fn);
+ fclose(r);
+ free(fn);
+ return NULL;
+ }
}
free(fn);
}
free(fn);