/mandos/trunk : revision 104

65

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

66

67

#define BUFFER_SIZE 256

68

69

#define PDIR "/lib/mandos/plugins.d"

70

#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"

68

#define ARGFILE "/conf/conf.d/mandos/plugin-runner.conf"

71

69

72

70

const char *argp_program_version = "plugin-runner 1.0";

73

71

const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";

74

72

75

struct plugin;

76

77

typedef struct plugin{

78

char *name; /* can be NULL or any plugin name */

79

char **argv;

80

int argc;

81

char **environ;

82

int envc;

83

bool disabled;

84

85

/* Variables used for running processes*/

73

struct process;

74

75

typedef struct process{

86

76

pid_t pid;

87

77

int fd;

88

78

char *buffer;

91

81

bool eof;

92

82

volatile bool completed;

93

83

volatile int status;

84

struct process *next;

85

} process;

86

87

typedef struct plugin{

88

char *name; /* can be NULL or any plugin name */

89

char **argv;

90

int argc;

91

char **environ;

92

int envc;

93

bool disabled;

94

struct plugin *next;

95

} plugin;

96

97

static plugin *plugin_list = NULL;

98

99

/* Gets a existing plugin based on name,

100

or if none is found, creates a new one */

101

static plugin *getplugin(char *name){

102

/* Check for exiting plugin with that name */

103

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

97

static plugin *getplugin(char *name, plugin **plugin_list){

98

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

104

99

if ((p->name == name)

105

100

or (p->name and name and (strcmp(p->name, name) == 0))){

106

101

return p;

118

113

return NULL;

119

114

}

120

115

}

121

116

122

117

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

123

118

.argc = 1,

119

.envc = 0,

124

120

.disabled = false,

125

.next = plugin_list };

121

.next = *plugin_list };

126

122

127

123

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

128

124

if (new_plugin->argv == NULL){

132

128

}

133

129

new_plugin->argv[0] = copy_name;

134

130

new_plugin->argv[1] = NULL;

135

131

136

132

new_plugin->environ = malloc(sizeof(char *));

137

133

if(new_plugin->environ == NULL){

138

134

free(copy_name);

141

137

return NULL;

142

138

}

143

139

new_plugin->environ[0] = NULL;

144

145

140

/* Append the new plugin to the list */

146

plugin_list = new_plugin;

141

*plugin_list = new_plugin;

147

142

return new_plugin;

148

143

}

149

144

179

174

}

180

175

181

176

/* Add to a plugin's environment */

182

static bool add_environment(plugin *p, const char *def, bool replace){

177

static bool add_environment(plugin *p, const char *def){

183

178

if(p == NULL){

184

179

return false;

185

180

}

186

/* namelen = length of name of environment variable */

187

size_t namelen = (size_t)(strchrnul(def, '=') - def);

188

/* Search for this environment variable */

189

for(char **e = p->environ; *e != NULL; e++){

190

if(strncmp(*e, def, namelen+1) == 0){

191

/* It already exists */

192

if(replace){

193

char *new = realloc(*e, strlen(def));

194

if(new == NULL){

195

return false;

196

}

197

*e = new;

198

strcpy(*e, def);

199

}

200

return true;

201

}

202

}

203

181

return add_to_char_array(def, &(p->environ), &(p->envc));

204

182

}

205

183

184

206

185

/*

207

186

* Based on the example in the GNU LibC manual chapter 13.13 "File

208

187

* Descriptor Flags".

219

198

return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);

220

199

}

221

200

201

process *process_list = NULL;

222

202

223

203

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

224

204

status. */

225

205

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

226

206

while(true){

227

plugin *proc = plugin_list;

207

process *proc = process_list;

228

208

int status;

229

209

pid_t pid = waitpid(-1, &status, WNOHANG);

230

210

if(pid == 0){

252

232

}

253

233

}

254

234

255

/* Prints out a password to stdout */

256

235

bool print_out_password(const char *buffer, size_t length){

257

236

ssize_t ret;

258

237

if(length>0 and buffer[length-1] == '\n'){

268

247

return true;

269

248

}

270

249

271

/* Removes and free a plugin from the plugin list */

272

static void free_plugin(plugin *plugin_node){

273

274

for(char **arg = plugin_node->argv; *arg != NULL; arg++){

275

free(*arg);

276

}

277

free(plugin_node->argv);

278

for(char **env = plugin_node->environ; *env != NULL; env++){

279

free(*env);

280

}

281

free(plugin_node->environ);

282

free(plugin_node->buffer);

283

284

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

285

if(plugin_node == plugin_list){

286

/* First one - simple */

287

plugin_list = plugin_list->next;

288

} else {

289

/* Second one or later */

290

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

291

if(p->next == plugin_node){

292

p->next = plugin_node->next;

293

break;

294

}

250

char **add_to_argv(char **argv, int *argc, char *arg){

251

if (argv == NULL){

252

*argc = 1;

253

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

254

if(argv == NULL){

255

return NULL;

295

256

}

296

}

297

298

free(plugin_node);

257

argv[0] = NULL; /* Will be set to argv[0] in main before

258

parsing */

259

argv[1] = NULL;

260

}

261

*argc += 1;

262

argv = realloc(argv, sizeof(char *)

263

* ((unsigned int) *argc + 1));

264

if(argv == NULL){

265

return NULL;

266

}

267

argv[*argc-1] = arg;

268

argv[*argc] = NULL;

269

return argv;

299

270

}

300

271

301

static void free_plugin_list(void){

302

while(plugin_list != NULL){

303

free_plugin(plugin_list);

272

static void free_plugin_list(plugin *plugin_list){

273

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

274

next = plugin_list->next;

275

for(char **arg = plugin_list->argv; *arg != NULL; arg++){

276

free(*arg);

277

}

278

free(plugin_list->argv);

279

for(char **env = plugin_list->environ; *env != NULL; env++){

280

free(*env);

281

}

282

free(plugin_list->environ);

283

free(plugin_list);

304

284

}

305

285

}

306

286

307

287

int main(int argc, char *argv[]){

308

char *plugindir = NULL;

309

char *argfile = NULL;

288

const char *plugindir = "/lib/mandos/plugins.d";

289

const char *argfile = ARGFILE;

310

290

FILE *conffp;

311

291

size_t d_name_len;

312

292

DIR *dir = NULL;

344

324

{ .name = "global-options", .key = 'g',

345

325

.arg = "OPTION[,OPTION[,...]]",

346

326

.doc = "Options passed to all plugins" },

347

{ .name = "global-env", .key = 'G',

327

{ .name = "global-envs", .key = 'e',

348

328

.arg = "VAR=value",

349

329

.doc = "Environment variable passed to all plugins" },

350

330

{ .name = "options-for", .key = 'o',

351

331

.arg = "PLUGIN:OPTION[,OPTION[,...]]",

352

332

.doc = "Options passed only to specified plugin" },

353

{ .name = "env-for", .key = 'E',

333

{ .name = "envs-for", .key = 'f',

354

334

.arg = "PLUGIN:ENV=value",

355

335

.doc = "Environment variable passed to specified plugin" },

356

336

{ .name = "disable", .key = 'd',

357

337

.arg = "PLUGIN",

358

338

.doc = "Disable a specific plugin", .group = 1 },

359

{ .name = "enable", .key = 'e',

360

.arg = "PLUGIN",

361

.doc = "Enable a specific plugin", .group = 1 },

362

339

{ .name = "plugin-dir", .key = 128,

363

340

.arg = "DIRECTORY",

364

341

.doc = "Specify a different plugin directory", .group = 2 },

365

{ .name = "config-file", .key = 129,

366

.arg = "FILE",

367

.doc = "Specify a different configuration file", .group = 2 },

368

{ .name = "userid", .key = 130,

369

.arg = "ID", .flags = 0,

370

.doc = "User ID the plugins will run as", .group = 3 },

371

{ .name = "groupid", .key = 131,

372

.arg = "ID", .flags = 0,

373

.doc = "Group ID the plugins will run as", .group = 3 },

374

{ .name = "debug", .key = 132,

375

.doc = "Debug mode", .group = 4 },

342

{ .name = "userid", .key = 129,

343

.arg = "ID", .flags = 0,

344

.doc = "User ID the plugins will run as", .group = 2 },

345

{ .name = "groupid", .key = 130,

346

.arg = "ID", .flags = 0,

347

.doc = "Group ID the plugins will run as", .group = 2 },

348

{ .name = "debug", .key = 131,

349

.doc = "Debug mode", .group = 3 },

376

350

{ .name = NULL }

377

351

};

378

352

379

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

380

struct argp_state *state) {

353

error_t parse_opt (int key, char *arg, struct argp_state *state) {

354

/* Get the INPUT argument from `argp_parse', which we know is a

355

pointer to our plugin list pointer. */

356

plugin **plugins = state->input;

381

357

switch (key) {

382

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

358

case 'g':

383

359

if (arg != NULL){

384

360

char *p;

385

361

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

386

362

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

387

363

continue;

388

364

}

389

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

365

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

390

366

perror("add_argument");

391

367

return ARGP_ERR_UNKNOWN;

392

368

}

393

369

}

394

370

}

395

371

break;

396

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

372

case 'e':

397

373

if(arg == NULL){

398

374

break;

399

375

}

402

378

if(envdef == NULL){

403

379

break;

404

380

}

405

if(not add_environment(getplugin(NULL), envdef, true)){

381

if(not add_environment(getplugin(NULL, plugins), envdef)){

406

382

perror("add_environment");

407

383

}

408

384

}

409

385

break;

410

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

386

case 'o':

411

387

if (arg != NULL){

412

388

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

413

389

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

423

399

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

424

400

continue;

425

401

}

426

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

402

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

427

403

perror("add_argument");

428

404

return ARGP_ERR_UNKNOWN;

429

405

}

431

407

}

432

408

}

433

409

break;

434

case 'E': /* --env-for */

410

case 'f':

435

411

if(arg == NULL){

436

412

break;

437

413

}

445

421

break;

446

422

}

447

423

envdef++;

448

if(not add_environment(getplugin(p_name), envdef, true)){

424

if(not add_environment(getplugin(p_name, plugins), envdef)){

449

425

perror("add_environment");

450

426

}

451

427

}

452

428

break;

453

case 'd': /* --disable */

429

case 'd':

454

430

if (arg != NULL){

455

plugin *p = getplugin(arg);

431

plugin *p = getplugin(arg, plugins);

456

432

if(p == NULL){

457

433

return ARGP_ERR_UNKNOWN;

458

434

}

459

435

p->disabled = true;

460

436

}

461

437

break;

462

case 'e': /* --enable */

463

if (arg != NULL){

464

plugin *p = getplugin(arg);

465

if(p == NULL){

466

return ARGP_ERR_UNKNOWN;

467

}

468

p->disabled = false;

469

}

470

break;

471

case 128: /* --plugin-dir */

472

plugindir = strdup(arg);

473

if(plugindir == NULL){

474

perror("strdup");

475

}

476

break;

477

case 129: /* --config-file */

478

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

479

break;

480

case 130: /* --userid */

438

case 128:

439

plugindir = arg;

440

break;

441

case 129:

481

442

uid = (uid_t)strtol(arg, NULL, 10);

482

443

break;

483

case 131: /* --groupid */

444

case 130:

484

445

gid = (gid_t)strtol(arg, NULL, 10);

485

446

break;

486

case 132: /* --debug */

447

case 131:

487

448

debug = true;

488

449

break;

489

450

case ARGP_KEY_ARG:

497

458

return 0;

498

459

}

499

460

500

/* This option parser is the same as parse_opt() above, except it

501

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

502

error_t parse_opt_config_file (int key, char *arg,

503

__attribute__((unused))

504

struct argp_state *state) {

505

switch (key) {

506

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

507

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

508

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

509

case 'E': /* --env-for */

510

case 'd': /* --disable */

511

case 'e': /* --enable */

512

case 128: /* --plugin-dir */

513

break;

514

case 129: /* --config-file */

515

argfile = strdup(arg);

516

if(argfile == NULL){

517

perror("strdup");

518

}

519

break;

520

case 130: /* --userid */

521

case 131: /* --groupid */

522

case 132: /* --debug */

523

case ARGP_KEY_ARG:

524

case ARGP_KEY_END:

525

break;

526

default:

527

return ARGP_ERR_UNKNOWN;

528

}

529

return 0;

530

}

461

plugin *plugin_list = NULL;

531

462

532

struct argp argp = { .options = options,

533

.parser = parse_opt_config_file,

534

.args_doc = "",

463

struct argp argp = { .options = options, .parser = parse_opt,

464

.args_doc = "[+PLUS_SEPARATED_OPTIONS]",

535

465

.doc = "Mandos plugin runner -- Run plugins" };

536

466

537

/* Parse using the parse_opt_config_file in order to get the custom

538

config file location, if any. */

539

ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);

467

ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list);

540

468

if (ret == ARGP_ERR_UNKNOWN){

541

469

fprintf(stderr, "Unknown error while parsing arguments\n");

542

470

exitstatus = EXIT_FAILURE;

543

471

goto fallback;

544

472

}

545

546

/* Reset to the normal argument parser */

547

argp.parser = parse_opt;

548

549

/* Open the configfile if available */

550

if (argfile == NULL){

551

conffp = fopen(AFILE, "r");

552

} else {

553

conffp = fopen(argfile, "r");

554

}

473

474

conffp = fopen(argfile, "r");

555

475

if(conffp != NULL){

556

476

char *org_line = NULL;

557

477

char *p, *arg, *new_arg, *line;

560

480

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

561

481

const char comment_delim[] = "#";

562

482

563

custom_argc = 1;

564

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

565

if(custom_argv == NULL){

566

perror("malloc");

567

exitstatus = EXIT_FAILURE;

568

goto fallback;

569

}

570

custom_argv[0] = argv[0];

571

custom_argv[1] = NULL;

572

573

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

574

commented text */

575

483

while(true){

576

484

sret = getline(&org_line, &size, conffp);

577

485

if(sret == -1){

585

493

continue;

586

494

}

587

495

new_arg = strdup(p);

588

if(new_arg == NULL){

589

perror("strdup");

590

exitstatus = EXIT_FAILURE;

591

free(org_line);

592

goto fallback;

593

}

594

595

custom_argc += 1;

596

custom_argv = realloc(custom_argv, sizeof(char *)

597

* ((unsigned int) custom_argc + 1));

598

if(custom_argv == NULL){

599

perror("realloc");

600

exitstatus = EXIT_FAILURE;

601

free(org_line);

602

goto fallback;

603

}

604

custom_argv[custom_argc-1] = new_arg;

605

custom_argv[custom_argc] = NULL;

496

custom_argv = add_to_argv(custom_argv, &custom_argc, new_arg);

497

if (custom_argv == NULL){

498

perror("add_to_argv");

499

exitstatus = EXIT_FAILURE;

500

goto fallback;

501

}

606

502

}

607

503

}

608

504

free(org_line);

609

} else {

505

} else{

610

506

/* Check for harmful errors and go to fallback. Other errors might

611

507

not affect opening plugins */

612

508

if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){

615

511

goto fallback;

616

512

}

617

513

}

618

/* If there was any arguments from configuration file,

619

pass them to parser as command arguments */

514

620

515

if(custom_argv != NULL){

621

ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,

622

0, NULL);

516

custom_argv[0] = argv[0];

517

ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0,

518

&plugin_list);

623

519

if (ret == ARGP_ERR_UNKNOWN){

624

520

fprintf(stderr, "Unknown error while parsing arguments\n");

625

521

exitstatus = EXIT_FAILURE;

627

523

}

628

524

}

629

525

630

/* Parse actual command line arguments, to let them override the

631

config file */

632

ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);

633

if (ret == ARGP_ERR_UNKNOWN){

634

fprintf(stderr, "Unknown error while parsing arguments\n");

635

exitstatus = EXIT_FAILURE;

636

goto fallback;

637

}

638

639

526

if(debug){

640

527

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

641

528

fprintf(stderr, "Plugin: %s has %d arguments\n",

650

537

}

651

538

}

652

539

653

/* Strip permissions down to nobody */

654

540

ret = setuid(uid);

655

541

if (ret == -1){

656

542

perror("setuid");

657

}

543

}

544

658

545

setgid(gid);

659

546

if (ret == -1){

660

547

perror("setgid");

661

548

}

662

549

663

if (plugindir == NULL){

664

dir = opendir(PDIR);

665

} else {

666

dir = opendir(plugindir);

667

}

668

550

dir = opendir(plugindir);

669

551

if(dir == NULL){

670

552

perror("Could not open plugin dir");

671

553

exitstatus = EXIT_FAILURE;

687

569

688

570

FD_ZERO(&rfds_all);

689

571

690

/* Read and execute any executable in the plugin directory*/

691

572

while(true){

692

573

dirst = readdir(dir);

693

574

694

/* All directory entries have been processed */

575

// All directory entries have been processed

695

576

if(dirst == NULL){

696

577

if (errno == EBADF){

697

578

perror("readdir");

703

584

704

585

d_name_len = strlen(dirst->d_name);

705

586

706

/* Ignore dotfiles, backup files and other junk */

587

// Ignore dotfiles, backup files and other junk

707

588

{

708

589

bool bad_name = false;

709

590

724

605

break;

725

606

}

726

607

}

608

727

609

if(bad_name){

728

610

continue;

729

611

}

612

730

613

for(const char **suf = bad_suffixes; *suf != NULL; suf++){

731

614

size_t suf_len = strlen(*suf);

732

615

if((d_name_len >= suf_len)

759

642

free(filename);

760

643

continue;

761

644

}

762

763

/* Ignore non-executable files */

645

764

646

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

765

647

if(debug){

766

648

fprintf(stderr, "Ignoring plugin dir entry \"%s\""

769

651

free(filename);

770

652

continue;

771

653

}

772

773

plugin *p = getplugin(dirst->d_name);

654

plugin *p = getplugin(dirst->d_name, &plugin_list);

774

655

if(p == NULL){

775

656

perror("getplugin");

776

657

free(filename);

786

667

}

787

668

{

788

669

/* Add global arguments to argument list for this plugin */

789

plugin *g = getplugin(NULL);

670

plugin *g = getplugin(NULL, &plugin_list);

790

671

if(g != NULL){

791

672

for(char **a = g->argv + 1; *a != NULL; a++){

792

673

if(not add_argument(p, *a)){

795

676

}

796

677

/* Add global environment variables */

797

678

for(char **e = g->environ; *e != NULL; e++){

798

if(not add_environment(p, *e, false)){

679

if(not add_environment(p, *e)){

799

680

perror("add_environment");

800

681

}

801

682

}

806

687

process, too. */

807

688

if(p->environ[0] != NULL){

808

689

for(char **e = environ; *e != NULL; e++){

809

if(not add_environment(p, *e, false)){

690

char *copy = strdup(*e);

691

if(copy == NULL){

692

perror("strdup");

693

continue;

694

}

695

if(not add_environment(p, copy)){

810

696

perror("add_environment");

811

697

}

812

698

}

819

705

exitstatus = EXIT_FAILURE;

820

706

goto fallback;

821

707

}

822

/* Ask OS to automatic close the pipe on exec */

823

708

ret = set_cloexec_flag(pipefd[0]);

824

709

if(ret < 0){

825

710

perror("set_cloexec_flag");

839

724

exitstatus = EXIT_FAILURE;

840

725

goto fallback;

841

726

}

842

/* Starting a new process to be watched */

727

// Starting a new process to be watched

843

728

pid_t pid = fork();

844

729

if(pid == -1){

845

730

perror("fork");

883

768

}

884

769

/* no return */

885

770

}

886

/* Parent process */

887

close(pipefd[1]); /* Close unused write end of pipe */

771

/* parent process */

888

772

free(filename);

889

plugin *new_plugin = getplugin(dirst->d_name);

890

if (new_plugin == NULL){

891

perror("getplugin");

773

close(pipefd[1]); /* close unused write end of pipe */

774

process *new_process = malloc(sizeof(process));

775

if (new_process == NULL){

776

perror("malloc");

892

777

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

893

778

if(ret < 0){

894

perror("sigprocmask");

779

perror("sigprocmask");

895

780

}

896

781

exitstatus = EXIT_FAILURE;

897

782

goto fallback;

898

783

}

899

784

900

new_plugin->pid = pid;

901

new_plugin->fd = pipefd[0];

902

785

*new_process = (struct process){ .pid = pid,

786

.fd = pipefd[0],

787

.next = process_list };

788

// List handling

789

process_list = new_process;

903

790

/* Unblock SIGCHLD so signal handler can be run if this process

904

791

has already completed */

905

792

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

909

796

goto fallback;

910

797

}

911

798

912

FD_SET(new_plugin->fd, &rfds_all);

799

FD_SET(new_process->fd, &rfds_all);

913

800

914

if (maxfd < new_plugin->fd){

915

maxfd = new_plugin->fd;

801

if (maxfd < new_process->fd){

802

maxfd = new_process->fd;

916

803

}

917

804

918

805

}

919

806

807

free_plugin_list(plugin_list);

808

plugin_list = NULL;

809

920

810

closedir(dir);

921

811

dir = NULL;

922

923

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

924

if(p->pid != 0){

925

break;

926

}

927

if(p->next == NULL){

928

fprintf(stderr, "No plugin processes started. Incorrect plugin"

929

" directory?\n");

930

free_plugin_list();

931

}

812

813

if (process_list == NULL){

814

fprintf(stderr, "No plugin processes started. Incorrect plugin"

815

" directory?\n");

816

process_list = NULL;

932

817

}

933

934

/* Main loop while running plugins exist */

935

while(plugin_list){

818

while(process_list){

936

819

fd_set rfds = rfds_all;

937

820

int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);

938

821

if (select_ret == -1){

942

825

}

943

826

/* OK, now either a process completed, or something can be read

944

827

from one of them */

945

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

828

for(process *proc = process_list; proc ; proc = proc->next){

946

829

/* Is this process completely done? */

947

830

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

948

831

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

949

832

if(not WIFEXITED(proc->status)

950

833

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

951

834

/* Bad exit by plugin */

952

953

835

if(debug){

954

836

if(WIFEXITED(proc->status)){

955

837

fprintf(stderr, "Plugin %u exited with status %d\n",

964

846

(unsigned int) (proc->pid));

965

847

}

966

848

}

967

968

849

/* Remove the plugin */

969

850

FD_CLR(proc->fd, &rfds_all);

970

971

851

/* Block signal while modifying process_list */

972

852

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

973

853

if(ret < 0){

975

855

exitstatus = EXIT_FAILURE;

976

856

goto fallback;

977

857

}

978

free_plugin(proc);

858

/* Delete this process entry from the list */

859

if(process_list == proc){

860

/* First one - simple */

861

process_list = proc->next;

862

} else {

863

/* Second one or later */

864

for(process *p = process_list; p != NULL; p = p->next){

865

if(p->next == proc){

866

p->next = proc->next;

867

break;

868

}

869

}

870

}

979

871

/* We are done modifying process list, so unblock signal */

980

872

ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,

981

873

NULL);

982

874

if(ret < 0){

983

875

perror("sigprocmask");

984

exitstatus = EXIT_FAILURE;

985

goto fallback;

986

}

987

988

if(plugin_list == NULL){

989

break;

990

}

991

continue;

876

}

877

free(proc->buffer);

878

free(proc);

879

/* We deleted this process from the list, so we can't go

880

proc->next. Therefore, start over from the beginning of

881

the process list */

882

break;

992

883

}

993

994

884

/* This process exited nicely, so print its buffer */

995

885

996

886

bool bret = print_out_password(proc->buffer,

1001

891

}

1002

892

goto fallback;

1003

893

}

1004

1005

894

/* This process has not completed. Does it have any output? */

1006

895

if(proc->eof or not FD_ISSET(proc->fd, &rfds)){

1007

896

/* This process had nothing to say at this time */

1037

926

1038

927

fallback:

1039

928

1040

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

929

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

1041

930

/* Fallback if all plugins failed, none are found or an error

1042

931

occured */

1043

932

bool bret;

1058

947

}

1059

948

1060

949

if(custom_argv != NULL){

1061

for(char **arg = custom_argv+1; *arg != NULL; arg++){

950

for(char **arg = custom_argv; *arg != NULL; arg++){

1062

951

free(*arg);

1063

952

}

1064

953

free(custom_argv);

1065

954

}

955

free_plugin_list(plugin_list);

1066

956

1067

957

if(dir != NULL){

1068

958

closedir(dir);

1069

959

}

1070

960

1071

961

/* Free the process list and kill the processes */

1072

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

1073

if(p->pid != 0){

1074

close(p->fd);

1075

ret = kill(p->pid, SIGTERM);

1076

if(ret == -1 and errno != ESRCH){

1077

/* Set-uid proccesses might not get closed */

1078

perror("kill");

1079

}

962

for(process *next; process_list != NULL; process_list = next){

963

next = process_list->next;

964

close(process_list->fd);

965

ret = kill(process_list->pid, SIGTERM);

966

if(ret == -1 and errno != ESRCH){

967

/* set-uid proccesses migth not get closed */

968

perror("kill");

1080

969

}

970

free(process_list->buffer);

971

free(process_list);

1081

972

}

1082

973

1083

974

/* Wait for any remaining child processes to terminate */

1087

978

if(errno != ECHILD){

1088

979

perror("wait");

1089

980

}

1090

1091

free_plugin_list();

1092

1093

free(plugindir);

1094

free(argfile);

1095

981

1096

982

return exitstatus;

1097

983

}