/mandos/trunk : revision 286

62

#include <signal.h> /* struct sigaction, sigemptyset(),

63

sigaddset(), sigaction(),

64

sigprocmask(), SIG_BLOCK, SIGCHLD,

65

SIG_UNBLOCK, kill(), sig_atomic_t

66

*/

65

SIG_UNBLOCK, kill() */

67

66

#include <errno.h> /* errno, EBADF */

68

#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */

67

#include <inttypes.h> /* intmax_t, SCNdMAX, PRIdMAX, */

69

68

70

69

#define BUFFER_SIZE 256

71

70

82

81

char **environ;

83

82

int envc;

84

83

bool disabled;

85

84

86

85

/* Variables used for running processes*/

87

86

pid_t pid;

88

87

int fd;

90

89

size_t buffer_size;

91

90

size_t buffer_length;

92

91

bool eof;

93

volatile sig_atomic_t completed;

94

int status;

92

volatile bool completed;

93

volatile int status;

95

94

struct plugin *next;

96

95

} plugin;

97

96

121

120

}

122

121

}

123

122

124

*new_plugin = (plugin){ .name = copy_name,

125

.argc = 1,

126

.disabled = false,

127

.next = plugin_list };

123

*new_plugin = (plugin) { .name = copy_name,

124

.argc = 1,

125

.disabled = false,

126

.next = plugin_list };

128

127

129

128

new_plugin->argv = malloc(sizeof(char *) * 2);

130

129

if(new_plugin->argv == NULL){

224

223

/* Mark processes as completed when they exit, and save their exit

225

224

status. */

226

225

static void handle_sigchld(__attribute__((unused)) int sig){

227

int old_errno = errno;

228

226

while(true){

229

227

plugin *proc = plugin_list;

230

228

int status;

234

232

break;

235

233

}

236

234

if(pid == -1){

237

if(errno == ECHILD){

238

/* No child processes */

239

break;

235

if(errno != ECHILD){

236

perror("waitpid");

240

237

}

241

perror("waitpid");

238

/* No child processes */

239

break;

242

240

}

243

241

244

242

/* A child exited, find it in process_list */

250

248

continue;

251

249

}

252

250

proc->status = status;

253

proc->completed = 1;

251

proc->completed = true;

254

252

}

255

errno = old_errno;

256

253

}

257

254

258

255

/* Prints out a password to stdout */

280

277

}

281

278

free(plugin_node->environ);

282

279

free(plugin_node->buffer);

283

280

284

281

/* Removes the plugin from the singly-linked list */

285

282

if(plugin_node == plugin_list){

286

283

/* First one - simple */

313

310

struct dirent *dirst;

314

311

struct stat st;

315

312

fd_set rfds_all;

316

int ret, maxfd = 0;

313

int ret, numchars, maxfd = 0;

317

314

ssize_t sret;

318

315

intmax_t tmpmax;

319

316

uid_t uid = 65534;

379

376

};

380

377

381

378

error_t parse_opt(int key, char *arg, __attribute__((unused))

382

struct argp_state *state){

383

char *tmp;

384

switch(key){

379

struct argp_state *state) {

380

switch(key) {

385

381

case 'g': /* --global-options */

386

382

if(arg != NULL){

387

char *plugin_option;

388

while((plugin_option = strsep(&arg, ",")) != NULL){

389

if(plugin_option[0] == '\0'){

383

char *p;

384

while((p = strsep(&arg, ",")) != NULL){

385

if(p[0] == '\0'){

390

386

continue;

391

387

}

392

if(not add_argument(getplugin(NULL), plugin_option)){

388

if(not add_argument(getplugin(NULL), p)){

393

389

perror("add_argument");

394

390

return ARGP_ERR_UNKNOWN;

395

391

}

406

402

break;

407

403

case 'o': /* --options-for */

408

404

if(arg != NULL){

409

char *plugin_name = strsep(&arg, ":");

410

if(plugin_name[0] == '\0'){

411

break;

412

}

413

char *plugin_option;

414

while((plugin_option = strsep(&arg, ",")) != NULL){

415

if(not add_argument(getplugin(plugin_name), plugin_option)){

405

char *p_name = strsep(&arg, ":");

406

if(p_name[0] == '\0' or arg == NULL){

407

break;

408

}

409

char *opt = strsep(&arg, ":");

410

if(opt[0] == '\0' or opt == NULL){

411

break;

412

}

413

char *p;

414

while((p = strsep(&opt, ",")) != NULL){

415

if(p[0] == '\0'){

416

continue;

417

}

418

if(not add_argument(getplugin(p_name), p)){

416

419

perror("add_argument");

417

420

return ARGP_ERR_UNKNOWN;

418

421

}

463

466

/* This is already done by parse_opt_config_file() */

464

467

break;

465

468

case 130: /* --userid */

466

errno = 0;

467

tmpmax = strtoimax(arg, &tmp, 10);

468

if(errno != 0 or tmp == arg or *tmp != '\0'

469

or tmpmax != (uid_t)tmpmax){

469

ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);

470

if(ret < 1 or tmpmax != (uid_t)tmpmax

471

or arg[numchars] != '\0'){

470

472

fprintf(stderr, "Bad user ID number: \"%s\", using %"

471

473

PRIdMAX "\n", arg, (intmax_t)uid);

472

474

} else {

474

476

}

475

477

break;

476

478

case 131: /* --groupid */

477

errno = 0;

478

tmpmax = strtoimax(arg, &tmp, 10);

479

if(errno != 0 or tmp == arg or *tmp != '\0'

480

or tmpmax != (gid_t)tmpmax){

479

ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);

480

if(ret < 1 or tmpmax != (gid_t)tmpmax

481

or arg[numchars] != '\0'){

481

482

fprintf(stderr, "Bad group ID number: \"%s\", using %"

482

483

PRIdMAX "\n", arg, (intmax_t)gid);

483

484

} else {

511

512

ignores everything but the --config-file option. */

512

513

error_t parse_opt_config_file(int key, char *arg,

513

514

__attribute__((unused))

514

struct argp_state *state){

515

switch(key){

515

struct argp_state *state) {

516

switch(key) {

516

517

case 'g': /* --global-options */

517

518

case 'G': /* --global-env */

518

519

case 'o': /* --options-for */

569

570

size_t size = 0;

570

571

const char whitespace_delims[] = " \r\t\f\v\n";

571

572

const char comment_delim[] = "#";

572

573

574

custom_argc = 1;

574

575

custom_argv = malloc(sizeof(char*) * 2);

575

576

if(custom_argv == NULL){

579

580

}

580

581

custom_argv[0] = argv[0];

581

582

custom_argv[1] = NULL;

582

583

584

/* for each line in the config file, strip whitespace and ignore

584

585

commented text */

585

586

while(true){

587

588

if(sret == -1){

588

589

break;

589

590

}

590

591

592

line = org_line;

592

593

arg = strsep(&line, comment_delim);

593

594

while((p = strsep(&arg, whitespace_delims)) != NULL){

661

662

}

662

663

664

/* Strip permissions down to nobody */

665

ret = setuid(uid);

666

if(ret == -1){

667

perror("setuid");

668

}

664

669

setgid(gid);

665

670

if(ret == -1){

666

671

perror("setgid");

667

672

}

668

ret = setuid(uid);

669

if(ret == -1){

670

perror("setuid");

671

}

672

673

674

if(plugindir == NULL){

674

675

dir = opendir(PDIR);

756

757

continue;

757

758

}

758

759

}

759

760

761

char *filename;

761

762

if(plugindir == NULL){

762

763

ret = asprintf(&filename, PDIR "/%s", dirst->d_name);

774

775

free(filename);

775

776

continue;

776

777

}

777

778

779

/* Ignore non-executable files */

779

780

if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){

780

781

if(debug){

933

934

935

closedir(dir);

935

936

dir = NULL;

936

free_plugin(getplugin(NULL));

937

938

for(plugin *p = plugin_list; p != NULL; p = p->next){

939

if(p->pid != 0){

959

from one of them */

960

for(plugin *proc = plugin_list; proc != NULL;){

961

/* Is this process completely done? */

962

if(proc->completed and proc->eof){

962

if(proc->eof and proc->completed){

963

/* Only accept the plugin output if it exited cleanly */

964

if(not WIFEXITED(proc->status)

965

or WEXITSTATUS(proc->status) != 0){

966

/* Bad exit by plugin */

967

968

if(debug){

969

if(WIFEXITED(proc->status)){

970

fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"

971

" status %d\n", proc->name,

972

(intmax_t) (proc->pid),

970

fprintf(stderr, "Plugin %" PRIdMAX " exited with status"

971

" %d\n", (intmax_t) (proc->pid),

973

972

WEXITSTATUS(proc->status));

974

} else if(WIFSIGNALED(proc->status)){

975

fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"

976

" signal %d\n", proc->name,

977

(intmax_t) (proc->pid),

973

} else if(WIFSIGNALED(proc->status)) {

974

fprintf(stderr, "Plugin %" PRIdMAX " killed by signal"

975

" %d\n", (intmax_t) (proc->pid),

978

976

WTERMSIG(proc->status));

979

977

} else if(WCOREDUMP(proc->status)){

980

fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"

981

" core\n", proc->name, (intmax_t) (proc->pid));

978

fprintf(stderr, "Plugin %" PRIdMAX " dumped core\n",

979

(intmax_t) (proc->pid));

982

980

}

983

981

}

984

982

985

983

/* Remove the plugin */

986

984

FD_CLR(proc->fd, &rfds_all);

987

985

988

986

/* Block signal while modifying process_list */

989

987

ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);

990

988

if(ret < 0){

1057

1055

}

1058

1056

}

1059

1057

}

1060

1061

1058

1059

1062

1060

fallback:

1063

1061

1064

1062

if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){