emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Vodz, last_path_87, formatiing changes

Browse Source
This commit is contained in:
Glenn L McGrath
2003-05-26 14:09:12 +00:00
parent 393183dccc
commit 2faee7b1ed
1 changed files with 317 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

331
applets/applets.c
View File

@@ -44,7 +44,7 @@ const size_t NUM_APPLETS = (sizeof (applets) / sizeof (struct BB_applet) - 1);
#ifdef CONFIG_FEATURE_SUID #ifdef CONFIG_FEATURE_SUID
static void check_suid ( struct BB_applet *app ); static void check_suid (struct BB_applet *app);
#ifdef CONFIG_FEATURE_SUID_CONFIG #ifdef CONFIG_FEATURE_SUID_CONFIG
@@ -53,14 +53,15 @@ static void check_suid ( struct BB_applet *app );
#include "pwd_.h" #include "pwd_.h"
#include "grp_.h" #include "grp_.h"
static int parse_config_file ( void ); static int parse_config_file (void);
static int config_ok; static int config_ok;
#define CONFIG_FILE "/etc/busybox.conf" #define CONFIG_FILE "/etc/busybox.conf"
/* applets [] is const, so we have to define this "override" structure */ /* applets [] is const, so we have to define this "override" structure */
struct BB_suid_config { struct BB_suid_config
{
struct BB_applet *m_applet; struct BB_applet *m_applet;
uid_t m_uid; uid_t m_uid;
@@ -78,77 +79,82 @@ static struct BB_suid_config *suid_config;
extern void bb_show_usage(void) extern void
bb_show_usage (void)
{ {
const char *format_string; const char *format_string;
const char *usage_string = usage_messages; const char *usage_string = usage_messages;
int i; int i;
for (i = applet_using - applets; i > 0; ) { for (i = applet_using - applets; i > 0;) {
if (!*usage_string++) { if (!*usage_string++) {
--i; --i;
} }
} }
format_string = "%s\n\nUsage: %s %s\n\n"; format_string = "%s\n\nUsage: %s %s\n\n";
if(*usage_string == '\b') if (*usage_string == '\b')
format_string = "%s\n\nNo help available.\n\n"; format_string = "%s\n\nNo help available.\n\n";
fprintf(stderr, format_string, bb_msg_full_version, applet_using->name, usage_string); fprintf (stderr, format_string, bb_msg_full_version, applet_using->name,
usage_string);
exit(EXIT_FAILURE); exit (EXIT_FAILURE);
} }
static int applet_name_compare(const void *x, const void *y) static int
applet_name_compare (const void *x, const void *y)
{ {
const char *name = x; const char *name = x;
const struct BB_applet *applet = y; const struct BB_applet *applet = y;
return strcmp(name, applet->name); return strcmp (name, applet->name);
} }
extern const size_t NUM_APPLETS; extern const size_t NUM_APPLETS;
struct BB_applet *find_applet_by_name(const char *name) struct BB_applet *
find_applet_by_name (const char *name)
{ {
return bsearch(name, applets, NUM_APPLETS, sizeof(struct BB_applet), return bsearch (name, applets, NUM_APPLETS, sizeof (struct BB_applet),
applet_name_compare); applet_name_compare);
} }
void run_applet_by_name(const char *name, int argc, char **argv) void
run_applet_by_name (const char *name, int argc, char **argv)
{ {
static int recurse_level = 0; static int recurse_level = 0;
extern int been_there_done_that; /* From busybox.c */ extern int been_there_done_that; /* From busybox.c */
#ifdef CONFIG_FEATURE_SUID_CONFIG #ifdef CONFIG_FEATURE_SUID_CONFIG
if ( recurse_level == 0 ) if (recurse_level == 0)
config_ok = parse_config_file ( ); config_ok = parse_config_file ();
#endif #endif
recurse_level++; recurse_level++;
/* Do a binary search to find the applet entry given the name. */ /* Do a binary search to find the applet entry given the name. */
if ((applet_using = find_applet_by_name(name)) != NULL) { if ((applet_using = find_applet_by_name (name)) != NULL) {
bb_applet_name = applet_using->name; bb_applet_name = applet_using->name;
if (argv[1] && strcmp(argv[1], "--help") == 0) { if (argv[1] && strcmp (argv[1], "--help") == 0) {
if (strcmp(applet_using->name, "busybox")==0) { if (strcmp (applet_using->name, "busybox") == 0) {
if(argv[2]) if (argv[2])
applet_using = find_applet_by_name(argv[2]); applet_using = find_applet_by_name (argv[2]);
else else
applet_using = NULL; applet_using = NULL;
} }
if(applet_using) if (applet_using)
bb_show_usage(); bb_show_usage ();
been_there_done_that=1; been_there_done_that = 1;
busybox_main(0, NULL); busybox_main (0, NULL);
} }
#ifdef CONFIG_FEATURE_SUID #ifdef CONFIG_FEATURE_SUID
check_suid ( applet_using ); check_suid (applet_using);
#endif #endif
exit((*(applet_using->main)) (argc, argv)); exit ((*(applet_using->main)) (argc, argv));
} }
/* Just in case they have renamed busybox - Check argv[1] */ /* Just in case they have renamed busybox - Check argv[1] */
if (recurse_level == 1) { if (recurse_level == 1) {
run_applet_by_name("busybox", argc, argv); run_applet_by_name ("busybox", argc, argv);
} }
recurse_level--; recurse_level--;
} }
@@ -159,17 +165,18 @@ void run_applet_by_name(const char *name, int argc, char **argv)
#ifdef CONFIG_FEATURE_SUID_CONFIG #ifdef CONFIG_FEATURE_SUID_CONFIG
/* check if u is member of group g */ /* check if u is member of group g */
static int ingroup ( uid_t u, gid_t g ) static int
ingroup (uid_t u, gid_t g)
{ {
struct group *grp = getgrgid ( g ); struct group *grp = getgrgid (g);
if ( grp ) { if (grp) {
char **mem; char **mem;
for ( mem = grp-> gr_mem; *mem; mem++ ) { for (mem = grp->gr_mem; *mem; mem++) {
struct passwd *pwd = getpwnam ( *mem ); struct passwd *pwd = getpwnam (*mem);
if ( pwd && ( pwd-> pw_uid == u )) if (pwd && (pwd->pw_uid == u))
return 1; return 1;
} }
} }
@@ -179,69 +186,68 @@ static int ingroup ( uid_t u, gid_t g )
#endif #endif
void check_suid ( struct BB_applet *applet ) void
check_suid (struct BB_applet *applet)
{ {
uid_t ruid = getuid ( ); /* real [ug]id */ uid_t ruid = getuid (); /* real [ug]id */
uid_t rgid = getgid ( ); uid_t rgid = getgid ();
#ifdef CONFIG_FEATURE_SUID_CONFIG #ifdef CONFIG_FEATURE_SUID_CONFIG
if ( config_ok ) { if (config_ok) {
struct BB_suid_config *sct; struct BB_suid_config *sct;
for ( sct = suid_config; sct; sct = sct-> m_next ) { for (sct = suid_config; sct; sct = sct->m_next) {
if ( sct-> m_applet == applet ) if (sct->m_applet == applet)
break; break;
} }
if ( sct ) { if (sct) {
mode_t m = sct-> m_mode; mode_t m = sct->m_mode;
if ( sct-> m_uid == ruid ) /* same uid */ if (sct->m_uid == ruid) /* same uid */
m >>= 6; m >>= 6;
else if (( sct-> m_gid == rgid ) || ingroup ( ruid, sct-> m_gid )) /* same group / in group */ else if ((sct->m_gid == rgid) || ingroup (ruid, sct->m_gid)) /* same group / in group */
m >>= 3; m >>= 3;
if (!( m & S_IXOTH )) /* is x bit not set ? */ if (!(m & S_IXOTH)) /* is x bit not set ? */
bb_error_msg_and_die ( "You have no permission to run this applet!" ); bb_error_msg_and_die ("You have no permission to run this applet!");
if (( sct-> m_mode & ( S_ISGID | S_IXGRP )) == ( S_ISGID | S_IXGRP )) { /* *both* have to be set for sgid */ if ((sct->m_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) { /* *both* have to be set for sgid */
if ( setegid ( sct-> m_gid )) if (setegid (sct->m_gid))
bb_error_msg_and_die ( "BusyBox binary has insufficient rights to set proper GID for applet!" ); bb_error_msg_and_die
} ("BusyBox binary has insufficient rights to set proper GID for applet!");
else } else
setgid ( rgid ); /* no sgid -> drop */ setgid (rgid); /* no sgid -> drop */
if ( sct-> m_mode & S_ISUID ) { if (sct->m_mode & S_ISUID) {
if ( seteuid ( sct-> m_uid )) if (seteuid (sct->m_uid))
bb_error_msg_and_die ( "BusyBox binary has insufficient rights to set proper UID for applet!" ); bb_error_msg_and_die
} ("BusyBox binary has insufficient rights to set proper UID for applet!");
else } else
setuid ( ruid ); /* no suid -> drop */ setuid (ruid); /* no suid -> drop */
} } else {
else { /* default: drop all priviledges */ /* default: drop all priviledges */
setgid ( rgid ); setgid (rgid);
setuid ( ruid ); setuid (ruid);
} }
return; return;
} } else {
else {
#ifndef CONFIG_FEATURE_SUID_CONFIG_QUIET #ifndef CONFIG_FEATURE_SUID_CONFIG_QUIET
static int onetime = 0; static int onetime = 0;
if ( !onetime ) { if (!onetime) {
onetime = 1; onetime = 1;
fprintf ( stderr, "Using fallback suid method\n" ); fprintf (stderr, "Using fallback suid method\n");
} }
#endif #endif
} }
#endif #endif
if ( applet-> need_suid == _BB_SUID_ALWAYS ) { if (applet->need_suid == _BB_SUID_ALWAYS) {
if ( geteuid ( ) != 0 ) if (geteuid () != 0)
bb_error_msg_and_die ( "This applet requires root priviledges!" ); bb_error_msg_and_die ("This applet requires root priviledges!");
} } else if (applet->need_suid == _BB_SUID_NEVER) {
else if ( applet-> need_suid == _BB_SUID_NEVER ) { setgid (rgid); /* drop all priviledges */
setgid ( rgid ); /* drop all priviledges */ setuid (ruid);
setuid ( ruid );
} }
} }
@@ -251,7 +257,8 @@ void check_suid ( struct BB_applet *applet )
#define parse_error(x) { err=x; goto pe_label; } #define parse_error(x) { err=x; goto pe_label; }
int parse_config_file ( void ) int
parse_config_file (void)
{ {
struct stat st; struct stat st;
char *err = 0; char *err = 0;
@@ -261,128 +268,153 @@ int parse_config_file ( void )
suid_config = 0; suid_config = 0;
/* is there a config file ? */ /* is there a config file ? */
if ( stat ( CONFIG_FILE, &st ) == 0 ) { if (stat (CONFIG_FILE, &st) == 0) {
/* is it owned by root with no write perm. for group and others ? */ /* is it owned by root with no write perm. for group and others ? */
if ( S_ISREG( st. st_mode ) && ( st. st_uid == 0 ) && (!( st. st_mode & ( S_IWGRP | S_IWOTH )))) { if (S_ISREG (st.st_mode) && (st.st_uid == 0)
&& (!(st.st_mode & (S_IWGRP | S_IWOTH)))) {
/* that's ok .. then try to open it */ /* that's ok .. then try to open it */
f = fopen ( CONFIG_FILE, "r" ); f = fopen (CONFIG_FILE, "r");
if ( f ) { if (f) {
char buffer [256]; char buffer[256];
int section = 0; int section = 0;
while ( fgets ( buffer, sizeof( buffer ) - 1, f )) { while (fgets (buffer, sizeof (buffer) - 1, f)) {
char c = buffer [0]; char c = buffer[0];
char *p; char *p;
lc++; lc++;
p = strchr ( buffer, '#' ); p = strchr (buffer, '#');
if ( p ) if (p)
*p = 0; *p = 0;
p = buffer + bb_strlen ( buffer ); p = buffer + bb_strlen (buffer);
while (( p > buffer ) && isspace ( *--p )) while ((p > buffer) && isspace (*--p))
*p = 0; *p = 0;
if ( p == buffer ) if (p == buffer)
continue; continue;
if ( c == '[' ) { if (c == '[') {
p = strchr ( buffer, ']' ); p = strchr (buffer, ']');
if ( !p || ( p == ( buffer + 1 ))) /* no matching ] or empty [] */ if (!p || (p == (buffer + 1))) /* no matching ] or empty [] */
parse_error ( "malformed section header" ); parse_error ("malformed section header");
*p = 0; *p = 0;
if ( strcasecmp ( buffer + 1, "SUID" ) == 0 ) if (strcasecmp (buffer + 1, "SUID") == 0)
section = 1; section = 1;
else else
section = -1; /* unknown section - just skip */ section = -1; /* unknown section - just skip */
} } else if (section) {
else if ( section ) { switch (section) {
switch ( section ) { case 1:{ /* SUID */
case 1: { /* SUID */
int l; int l;
struct BB_applet *applet; struct BB_applet *applet;
p = strchr ( buffer, '=' ); /* <key>[::space::]*=[::space::]*<value> */ p = strchr (buffer, '='); /* <key>[::space::]*=[::space::]*<value> */
if ( !p || ( p == ( buffer + 1 ))) /* no = or key is empty */ if (!p || (p == (buffer + 1))) /* no = or key is empty */
parse_error ( "malformed keyword" ); parse_error ("malformed keyword");
l = p - buffer; l = p - buffer;
while ( isspace ( buffer [--l] )) { } /* skip whitespace */ while (isspace (buffer[--l])) {
/* skip whitespace */
}
buffer [l+1] = 0; buffer[l + 1] = 0;
if (( applet = find_applet_by_name ( buffer ))) { if ((applet = find_applet_by_name (buffer))) {
struct BB_suid_config *sct = xmalloc ( sizeof( struct BB_suid_config )); struct BB_suid_config *sct =
xmalloc (sizeof (struct BB_suid_config));
sct-> m_applet = applet; sct->m_applet = applet;
sct-> m_next = suid_config; sct->m_next = suid_config;
suid_config = sct; suid_config = sct;
while ( isspace ( *++p )) { } /* skip whitespace */ while (isspace (*++p)) {
/* skip whitespace */
sct-> m_mode = 0;
switch ( *p++ ) {
case 'S': sct-> m_mode |= S_ISUID; break;
case 's': sct-> m_mode |= S_ISUID; /* no break */
case 'x': sct-> m_mode |= S_IXUSR; break;
case '-': break;
default : parse_error ( "invalid user mode" );
} }
switch ( *p++ ) { sct->m_mode = 0;
case 's': sct-> m_mode |= S_ISGID; /* no break */
case 'x': sct-> m_mode |= S_IXGRP; break; switch (*p++) {
case 'S': break; case 'S':
case '-': break; sct->m_mode |= S_ISUID;
default : parse_error ( "invalid group mode" ); break;
case 's':
sct->m_mode |= S_ISUID;
/* no break */
case 'x':
sct->m_mode |= S_IXUSR;
break;
case '-':
break;
default:
parse_error ("invalid user mode");
} }
switch ( *p ) { switch (*p++) {
case 's':
sct->m_mode |= S_ISGID;
/* no break */
case 'x':
sct->m_mode |= S_IXGRP;
break;
case 'S':
break;
case '-':
break;
default:
parse_error ("invalid group mode");
}
switch (*p) {
case 't': case 't':
case 'x': sct-> m_mode |= S_IXOTH; break; case 'x':
sct->m_mode |= S_IXOTH;
break;
case 'T': case 'T':
case '-': break; case '-':
default : parse_error ( "invalid other mode" ); break;
default:
parse_error ("invalid other mode");
} }
while ( isspace ( *++p )) { } /* skip whitespace */ while (isspace (*++p)) {
/* skip whitespace */
if ( isdigit ( *p )) {
sct-> m_uid = strtol ( p, &p, 10 );
if ( *p++ != '.' )
parse_error ( "parsing <uid>.<gid>" );
} }
else {
if (isdigit (*p)) {
sct->m_uid = strtol (p, &p, 10);
if (*p++ != '.')
parse_error ("parsing <uid>.<gid>");
} else {
struct passwd *pwd; struct passwd *pwd;
char *p2 = strchr ( p, '.' ); char *p2 = strchr (p, '.');
if ( !p2 ) if (!p2)
parse_error ( "parsing <uid>.<gid>" ); parse_error ("parsing <uid>.<gid>");
*p2 = 0; *p2 = 0;
pwd = getpwnam ( p ); pwd = getpwnam (p);
if ( !pwd ) if (!pwd)
parse_error ( "invalid user name" ); parse_error ("invalid user name");
sct-> m_uid = pwd-> pw_uid; sct->m_uid = pwd->pw_uid;
p = p2 + 1; p = p2 + 1;
} }
if ( isdigit ( *p )) if (isdigit (*p))
sct-> m_gid = strtol ( p, &p, 10 ); sct->m_gid = strtol (p, &p, 10);
else { else {
struct group *grp = getgrnam ( p ); struct group *grp = getgrnam (p);
if ( !grp ) if (!grp)
parse_error ( "invalid group name" ); parse_error ("invalid group name");
sct-> m_gid = grp-> gr_gid; sct->m_gid = grp->gr_gid;
} }
} }
break; break;
@@ -390,11 +422,10 @@ int parse_config_file ( void )
default: /* unknown - skip */ default: /* unknown - skip */
break; break;
} }
} else
parse_error ("keyword not within section");
} }
else fclose (f);
parse_error ( "keyword not within section" );
}
fclose ( f );
return 1; return 1;
} }
} }
@@ -402,10 +433,10 @@ int parse_config_file ( void )
return 0; /* no config file or not readable (not an error) */ return 0; /* no config file or not readable (not an error) */
pe_label: pe_label:
fprintf ( stderr, "Parse error in %s, line %d: %s\n", CONFIG_FILE, lc, err ); fprintf (stderr, "Parse error in %s, line %d: %s\n", CONFIG_FILE, lc, err);
if ( f ) if (f)
fclose ( f ); fclose (f);
return 0; return 0;
} }