6f38457323
log debug'' without filling our filesystem/screen with
junk that we don't really want to see.
o change PHYS_STDIN to PHYS_DIRECT - we can handle incoming
connections that aren't on STDIN_FILENO now.
o Allow return values from our FSM LayerUp functions. If
LayerUp() fails, the FSM does an immediate FsmDown() without
calling the fsm_parent's Layer{Up,Down} functions.
o Clear the close-on-exec flag of file descriptor 3 when executing
chat programs so that our documented ability to communicate with
/dev/tty via that descriptor works. Also document it as
descriptor 3, not 4 :-O
o Allow a ``rm'' command as an alias for ``remove''.
o Fix the bind()/connect()/accept() calls made by the MP server.
o Create bundle_SendDatalink() and bundle_ReceiveDatalink().
This allows `struct datalink's to flatten themselves, pass
through a pipe (read: the eye of a needle !) and come alive
at the other end. The donator then fork()s & exec()s pppmpipe,
``passing'' the connection to another ppp instance.
*** PPP NOW TALKS MULTILINK :-))) ***
Our link utilization is hideous, and lots of code needs
tidying still. It's also probably riddled with bugs !
It's been tested against itself only, and has hung once,
so confidence isn't high....
395 lines
8.8 KiB
C
395 lines
8.8 KiB
C
/*
|
|
* System configuration routines
|
|
*
|
|
* Written by Toshiharu OHNO (tony-o@iij.ad.jp)
|
|
*
|
|
* Copyright (C) 1993, Internet Initiative Japan, Inc. All rights reserverd.
|
|
*
|
|
* Redistribution and use in source and binary forms are permitted
|
|
* provided that the above copyright notice and this paragraph are
|
|
* duplicated in all such forms and that any documentation,
|
|
* advertising materials, and other materials related to such
|
|
* distribution and use acknowledge that the software was developed
|
|
* by the Internet Initiative Japan, Inc. The name of the
|
|
* IIJ may not be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
*
|
|
* $Id: systems.c,v 1.35.2.7 1998/04/14 23:17:11 brian Exp $
|
|
*
|
|
* TODO:
|
|
*/
|
|
#include <sys/param.h>
|
|
|
|
#include <ctype.h>
|
|
#include <pwd.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include "command.h"
|
|
#include "log.h"
|
|
#include "id.h"
|
|
#include "defs.h"
|
|
#include "pathnames.h"
|
|
#include "systems.h"
|
|
|
|
#define issep(ch) ((ch) == ' ' || (ch) == '\t')
|
|
|
|
FILE *
|
|
OpenSecret(const char *file)
|
|
{
|
|
FILE *fp;
|
|
char line[100];
|
|
|
|
snprintf(line, sizeof line, "%s/%s", _PATH_PPP, file);
|
|
fp = ID0fopen(line, "r");
|
|
if (fp == NULL)
|
|
LogPrintf(LogWARN, "OpenSecret: Can't open %s.\n", line);
|
|
return (fp);
|
|
}
|
|
|
|
void
|
|
CloseSecret(FILE * fp)
|
|
{
|
|
fclose(fp);
|
|
}
|
|
|
|
/* Move string from ``from'' to ``to'', interpreting ``~'' and $.... */
|
|
static void
|
|
InterpretArg(char *from, char *to)
|
|
{
|
|
const char *env;
|
|
char *ptr, *startto, *endto;
|
|
int len;
|
|
|
|
startto = to;
|
|
endto = to + LINE_LEN - 1;
|
|
|
|
while(issep(*from))
|
|
from++;
|
|
if (*from == '~') {
|
|
ptr = strchr(++from, '/');
|
|
len = ptr ? ptr - from : strlen(from);
|
|
if (len == 0) {
|
|
if ((env = getenv("HOME")) == NULL)
|
|
env = _PATH_PPP;
|
|
strncpy(to, env, endto - to);
|
|
} else {
|
|
struct passwd *pwd;
|
|
|
|
strncpy(to, from, len);
|
|
to[len] = '\0';
|
|
pwd = getpwnam(to);
|
|
if (pwd)
|
|
strncpy(to, pwd->pw_dir, endto-to);
|
|
else
|
|
strncpy(to, _PATH_PPP, endto - to);
|
|
endpwent();
|
|
}
|
|
*endto = '\0';
|
|
to += strlen(to);
|
|
from += len;
|
|
}
|
|
|
|
while (to < endto && *from != '\0') {
|
|
if (*from == '$') {
|
|
if (from[1] == '$') {
|
|
*to = '\0'; /* For an empty var name below */
|
|
from += 2;
|
|
} else if (from[1] == '{') {
|
|
ptr = strchr(from+2, '}');
|
|
if (ptr) {
|
|
len = ptr - from - 2;
|
|
if (endto - to < len )
|
|
len = endto - to;
|
|
if (len) {
|
|
strncpy(to, from+2, len);
|
|
to[len] = '\0';
|
|
from = ptr+1;
|
|
} else {
|
|
*to++ = *from++;
|
|
continue;
|
|
}
|
|
} else {
|
|
*to++ = *from++;
|
|
continue;
|
|
}
|
|
} else {
|
|
ptr = to;
|
|
for (from++; (isalnum(*from) || *from == '_') && ptr < endto; from++)
|
|
*ptr++ = *from;
|
|
*ptr = '\0';
|
|
}
|
|
if (*to == '\0')
|
|
*to++ = '$';
|
|
else if ((env = getenv(to)) != NULL) {
|
|
strncpy(to, env, endto - to);
|
|
*endto = '\0';
|
|
to += strlen(to);
|
|
}
|
|
} else
|
|
*to++ = *from++;
|
|
}
|
|
while (to > startto) {
|
|
to--;
|
|
if (!issep(*to)) {
|
|
to++;
|
|
break;
|
|
}
|
|
}
|
|
*to = '\0';
|
|
}
|
|
|
|
#define CTRL_UNKNOWN (0)
|
|
#define CTRL_INCLUDE (1)
|
|
|
|
static int
|
|
DecodeCtrlCommand(char *line, char *arg)
|
|
{
|
|
if (!strncasecmp(line, "include", 7) && issep(line[7])) {
|
|
InterpretArg(line+8, arg);
|
|
return CTRL_INCLUDE;
|
|
}
|
|
return CTRL_UNKNOWN;
|
|
}
|
|
|
|
/* Initialised in ValidSystem(), set in ReadSystem(), used by ValidSystem() */
|
|
static int modeok;
|
|
static int userok;
|
|
static int modereq;
|
|
|
|
int
|
|
AllowUsers(struct cmdargs const *arg)
|
|
{
|
|
/* arg->bundle may be NULL (see ValidSystem()) ! */
|
|
int f;
|
|
char *user;
|
|
|
|
userok = 0;
|
|
user = getlogin();
|
|
if (user && *user)
|
|
for (f = arg->argn; f < arg->argc; f++)
|
|
if (!strcmp("*", arg->argv[f]) || !strcmp(user, arg->argv[f])) {
|
|
userok = 1;
|
|
break;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct {
|
|
int mode;
|
|
const char *name;
|
|
} modes[] = {
|
|
{ PHYS_MANUAL, "interactive" },
|
|
{ PHYS_DEMAND, "auto" },
|
|
{ PHYS_DIRECT, "direct" },
|
|
{ PHYS_DEDICATED, "dedicated" },
|
|
{ PHYS_PERM, "ddial" },
|
|
{ PHYS_1OFF, "background" },
|
|
{ PHYS_ALL, "*" },
|
|
{ 0, 0 }
|
|
};
|
|
|
|
const char *
|
|
mode2Nam(int mode)
|
|
{
|
|
int m;
|
|
|
|
for (m = 0; modes[m].mode; m++)
|
|
if (modes[m].mode == mode)
|
|
return modes[m].name;
|
|
|
|
return "unknown";
|
|
}
|
|
|
|
int
|
|
AllowModes(struct cmdargs const *arg)
|
|
{
|
|
/* arg->bundle may be NULL (see ValidSystem()) ! */
|
|
int f;
|
|
int m;
|
|
int allowed;
|
|
|
|
allowed = 0;
|
|
for (f = arg->argn; f < arg->argc; f++) {
|
|
for (m = 0; modes[m].mode; m++)
|
|
if (!strcasecmp(modes[m].name, arg->argv[f])) {
|
|
allowed |= modes[m].mode;
|
|
break;
|
|
}
|
|
if (modes[m].mode == 0)
|
|
LogPrintf(LogWARN, "allow modes: %s: Invalid mode\n", arg->argv[f]);
|
|
}
|
|
|
|
modeok = modereq & allowed ? 1 : 0;
|
|
return 0;
|
|
}
|
|
|
|
static char *
|
|
strip(char *line)
|
|
{
|
|
int len;
|
|
|
|
len = strlen(line);
|
|
while (len && (line[len-1] == '\n' || line[len-1] == '\r' ||
|
|
issep(line[len-1])))
|
|
line[--len] = '\0';
|
|
|
|
while (issep(*line))
|
|
line++;
|
|
|
|
if (*line == '#')
|
|
*line = '\0';
|
|
|
|
return line;
|
|
}
|
|
|
|
static int
|
|
xgets(char *buf, int buflen, FILE *fp)
|
|
{
|
|
int len, n;
|
|
|
|
n = 0;
|
|
while (fgets(buf, buflen-1, fp)) {
|
|
n++;
|
|
buf[buflen-1] = '\0';
|
|
len = strlen(buf);
|
|
while (len && (buf[len-1] == '\n' || buf[len-1] == '\r'))
|
|
buf[--len] = '\0';
|
|
if (len && buf[len-1] == '\\') {
|
|
buf += len - 1;
|
|
buflen -= len - 1;
|
|
if (!buflen) /* No buffer space */
|
|
break;
|
|
} else
|
|
break;
|
|
}
|
|
return n;
|
|
}
|
|
|
|
static int
|
|
ReadSystem(struct bundle *bundle, const char *name, const char *file,
|
|
int doexec, struct prompt *prompt)
|
|
{
|
|
FILE *fp;
|
|
char *cp, *wp;
|
|
int n, len;
|
|
char line[LINE_LEN];
|
|
char filename[MAXPATHLEN];
|
|
int linenum;
|
|
int argc;
|
|
char **argv;
|
|
int allowcmd;
|
|
int indent;
|
|
char arg[LINE_LEN];
|
|
|
|
if (*file == '/')
|
|
snprintf(filename, sizeof filename, "%s", file);
|
|
else
|
|
snprintf(filename, sizeof filename, "%s/%s", _PATH_PPP, file);
|
|
fp = ID0fopen(filename, "r");
|
|
if (fp == NULL) {
|
|
LogPrintf(LogDEBUG, "ReadSystem: Can't open %s.\n", filename);
|
|
return (-1);
|
|
}
|
|
LogPrintf(LogDEBUG, "ReadSystem: Checking %s (%s).\n", name, filename);
|
|
|
|
linenum = 0;
|
|
while ((n = xgets(line, sizeof line, fp))) {
|
|
linenum += n;
|
|
if (issep(*line))
|
|
continue;
|
|
|
|
cp = strip(line);
|
|
|
|
switch (*cp) {
|
|
case '\0': /* empty/comment */
|
|
break;
|
|
|
|
case '!':
|
|
switch (DecodeCtrlCommand(cp+1, arg)) {
|
|
case CTRL_INCLUDE:
|
|
LogPrintf(LogCOMMAND, "%s: Including \"%s\"\n", filename, arg);
|
|
n = ReadSystem(bundle, name, arg, doexec, prompt);
|
|
LogPrintf(LogCOMMAND, "%s: Done include of \"%s\"\n", filename, arg);
|
|
if (!n)
|
|
return 0; /* got it */
|
|
break;
|
|
default:
|
|
LogPrintf(LogWARN, "%s: %s: Invalid command\n", filename, cp);
|
|
break;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
wp = strchr(cp, ':');
|
|
if (wp == NULL || wp[1] != '\0') {
|
|
LogPrintf(LogWARN, "Bad rule in %s (line %d) - missing colon.\n",
|
|
filename, linenum);
|
|
continue;
|
|
}
|
|
*wp = '\0';
|
|
cp = strip(cp); /* lose any spaces between the label and the ':' */
|
|
|
|
if (strcmp(cp, name) == 0) {
|
|
/* We're in business */
|
|
while ((n = xgets(line, sizeof line, fp))) {
|
|
linenum += n;
|
|
indent = issep(*line);
|
|
cp = strip(line);
|
|
|
|
if (*cp == '\0') /* empty / comment */
|
|
continue;
|
|
|
|
if (!indent) /* start of next section */
|
|
break;
|
|
|
|
len = strlen(cp);
|
|
InterpretCommand(cp, len, &argc, &argv);
|
|
allowcmd = argc > 0 && !strcasecmp(*argv, "allow");
|
|
if ((!doexec && allowcmd) || (doexec && !allowcmd))
|
|
RunCommand(bundle, argc, (char const *const *)argv, prompt, name);
|
|
}
|
|
|
|
fclose(fp); /* everything read - get out */
|
|
return 0;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
fclose(fp);
|
|
return -1;
|
|
}
|
|
|
|
int
|
|
ValidSystem(const char *name, struct prompt *prompt, int mode)
|
|
{
|
|
/*
|
|
* Note: The ReadSystem() calls only result in calls to the Allow*
|
|
* functions. arg->bundle will be set to NULL for these commands !
|
|
*/
|
|
if (ID0realuid() == 0)
|
|
return userok = modeok = 1;
|
|
userok = 0;
|
|
modeok = 1;
|
|
modereq = mode;
|
|
ReadSystem(NULL, "default", CONFFILE, 0, prompt);
|
|
if (name != NULL)
|
|
ReadSystem(NULL, name, CONFFILE, 0, prompt);
|
|
return userok && modeok;
|
|
}
|
|
|
|
int
|
|
SelectSystem(struct bundle *bundle, const char *name, const char *file,
|
|
struct prompt *prompt)
|
|
{
|
|
userok = modeok = 1;
|
|
modereq = PHYS_ALL;
|
|
return ReadSystem(bundle, name, file, 1, prompt);
|
|
}
|