/mandos/trunk : revision 74

To get this branch, use:

bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugin-runner.c

Committer: Teddy Hogeborn
Date: 2008-08-14 02:24:59 UTC
Revision ID: teddy@fukt.bsnet.se-20080814022459-rq3jt4q409l3qbj3

* Makefile (PREFIX, CONFDIR): New.

* initramfs-tools-hook: Search for Mandos in /usr/local as well as in
                        /usr.  Also copy plugin-runner.  Also chmod
                        the config dir.
  (DESTCONFDIR): Removed.
  (MANDOSDIR): New.
  (PLUGINDIR): Changed to "${MANDOSDIR}/plugins.d".

* initramfs-tools-script: New.

* mandos-client.c: Renamed to "plugin-runner.c".  All references
                   changed.
  (plugindir): Changed to "/lib/mandos/plugins.d".

* plugins.d/usplash: New.

files added:
initramfs-tools-hook

initramfs-tools-hook-conf

initramfs-tools-script

mandos-keygen

plugins.d/usplash

files renamed:
mandos-client.c => plugin-runner.c

mandos-client.xml => plugin-runner.xml

files modified:
Makefile

TODO

clients.conf

plugins.d/password-prompt.c

plugins.d/password-request.c

Show diffs side-by-side

added added

removed removed

plugin-runner.c

#define BUFFER_SIZE 256

const char *argp_program_version = "mandos-client 1.0";

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

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

struct process;

170

proc->completed = true;

171

}

172

173

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

174

ssize_t ret;

175

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

176

length--;

177

}

178

for(size_t written = 0; written < length; written += (size_t)ret){

179

ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,

180

length - written));

181

if(ret < 0){

182

return false;

183

}

184

}

185

return true;

186

}

187

173

188

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

174

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

189

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

175

190

size_t d_name_len;

176

191

DIR *dir = NULL;

177

192

struct dirent *dirst;

187

202

.sa_flags = SA_NOCLDSTOP };

188

203

char *plus_options = NULL;

189

204

char **plus_argv = NULL;

190

205

191

206

/* Establish a signal handler */

192

207

sigemptyset(&sigchld_action.sa_mask);

193

208

ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);

292

307

293

308

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

294

309

if (ret == ARGP_ERR_UNKNOWN){

295

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

310

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

296

311

exitstatus = EXIT_FAILURE;

297

312

goto end;

298

313

}

329

344

}

330

345

ret = argp_parse (&argp, new_argc, plus_argv, 0, 0, &plugin_list);

331

346

if (ret == ARGP_ERR_UNKNOWN){

332

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

347

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

333

348

exitstatus = EXIT_FAILURE;

334

349

goto end;

335

350

}

440

455

char *filename = malloc(d_name_len + strlen(plugindir) + 2);

441

456

if (filename == NULL){

442

457

perror("malloc");

443

exitstatus = EXIT_FAILURE;

444

goto end;

458

continue;

445

459

}

446

460

strcpy(filename, plugindir); /* Spurious warning */

447

461

strcat(filename, "/"); /* Spurious warning */

450

464

ret = stat(filename, &st);

451

465

if (ret == -1){

452

466

perror("stat");

453

exitstatus = EXIT_FAILURE;

454

goto end;

467

free(filename);

468

continue;

455

469

}

456

470

457

471

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

506

520

}

507

521

// Starting a new process to be watched

508

522

pid_t pid = fork();

523

if(pid == -1){

524

perror("fork");

525

exitstatus = EXIT_FAILURE;

526

goto end;

527

}

509

528

if(pid == 0){

510

529

/* this is the child process */

511

530

ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);

583

602

dir = NULL;

584

603

585

604

if (process_list == NULL){

586

fprintf(stderr, "No plugin processes started, exiting\n");

587

exitstatus = EXIT_FAILURE;

588

goto end;

605

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

606

" directory?\n");

607

process_list = NULL;

589

608

}

590

609

while(process_list){

591

610

fd_set rfds = rfds_all;

654

673

break;

655

674

}

656

675

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

657

for(size_t written = 0; written < proc->buffer_length;

658

written += (size_t)ret){

659

ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO,

660

proc->buffer + written,

661

proc->buffer_length

662

- written));

663

if(ret < 0){

664

perror("write");

665

exitstatus = EXIT_FAILURE;

666

goto end;

667

}

676

677

bool bret = print_out_password(proc->buffer, proc->buffer_length);

678

if(not bret){

679

perror("print_out_password");

680

exitstatus = EXIT_FAILURE;

668

681

}

669

682

goto end;

670

683

}

699

712

}

700

713

}

701

714

}

702

if(process_list == NULL){

703

fprintf(stderr, "All plugin processes failed, exiting\n");

704

exitstatus = EXIT_FAILURE;

705

}

706

715

716

707

717

end:

718

719

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

720

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

721

bool bret;

722

fprintf(stderr, "Going to fallback mode using getpass(3)\n");

723

char *passwordbuffer = getpass("Password: ");

724

bret = print_out_password(passwordbuffer, strlen(passwordbuffer));

725

if(not bret){

726

perror("print_out_password");

727

exitstatus = EXIT_FAILURE;

728

goto end;

729

}

730

}

731

708

732

/* Restore old signal handler */

709

733

sigaction(SIGCHLD, &old_sigchld_action, NULL);

710

734

Older »