/mandos/trunk : revision 38

To get this branch, use:

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

« back to all changes in this revision

Viewing changes to plugbasedclient.c

Committer: Teddy Hogeborn
Date: 2008-08-03 01:09:36 UTC
mfrom: (24.1.9 mandos)
Revision ID: teddy@fukt.bsnet.se-20080803010936-ujme8tgxceszfbi1

* plugbasedclient.c (main): New "--userid" and "--groupid" options.
                            Take an additional non-option argument and
                            parse it as a plus-separated and -prefixed
                            list of additional options.

* plugins.d/mandosclient.c (DH_BITS): Replaced with
                                      "mandos_context.dh_bits".  All
                                      users changed.
  (certdir): Renamed to "keydir".  All users changed.
  (certfile): Renamed to "pubkeyfile".  All users changed.
  (certkey): Renamed to "seckeyfile".  All users changed.
  (encrypted_session): Replaced with "mandos_context".  All users
                       changed.
  (initgnutls): Take additional "session" and "dh_params" arguments.
                All callers changed.
  (start_mandos_communication): Take additional "mc" argument.  All
                                callers changed.  Print target IPv6
                                address if different than supplied
                                string.
  (simple_poll) Replaced with "mandos_context.simple_poll".  All users
                changed.
  (server): Replaced with "mandos_context.server".  All users changed.
  (main): Default interface to "eth0".  Rename "--certdir" to
          "--keydir", "--certkey" to "--seckey", and "--certfile" to
          "--pubkey".  New options "--dh-bits" and "--priority".  If
          the interface is not up, bring it up.

files added:
ca.pem

cert.pem

client-cert.pem

client-key.pem

crl.pem

key.pem

files removed:
mandos-client.xml

mandos-clients.conf.xml

mandos.conf.xml

mandos.xml

network-protocol.txt

plugins.d/password-prompt.xml

plugins.d/password-request.xml

files renamed:
mandos-client.c => plugbasedclient.c

plugins.d/password-request.c => plugins.d/mandosclient.c

plugins.d/password-prompt.c => plugins.d/passprompt.c

mandos.conf => server.conf

mandos => server.py

files modified:
Makefile

TODO

clients.conf

Show diffs side-by-side

added added

removed removed

plugbasedclient.c

#define _GNU_SOURCE /* TEMP_FAILURE_RETRY() */

#include <stddef.h> /* size_t, NULL */

#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,

EXIT_SUCCESS, realloc() */

#include <stdbool.h> /* bool, true, false */

#include <stdio.h> /* perror, popen(), fileno(),

fprintf(), stderr, STDOUT_FILENO */

#include <sys/types.h> /* DIR, opendir(), stat(), struct

stat, waitpid(), WIFEXITED(),

WEXITSTATUS(), wait(), pid_t,

uid_t, gid_t, getuid(), getgid(),

dirfd() */

#include <sys/select.h> /* fd_set, select(), FD_ZERO(),

FD_SET(), FD_ISSET(), FD_CLR */

#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),

WEXITSTATUS() */

#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */

#include <stdio.h> /* popen(), fileno(), fprintf(),

stderr, STDOUT_FILENO */

#include <iso646.h> /* and, or, not */

#include <sys/types.h> /* DIR, opendir(), stat(),

struct stat, waitpid(),

WIFEXITED(), WEXITSTATUS(),

wait() */

#include <sys/wait.h> /* wait() */

#include <dirent.h> /* DIR, struct dirent, opendir(),

readdir(), closedir(), dirfd() */

readdir(), closedir() */

#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */

#include <unistd.h> /* struct stat, stat(), S_ISREG(),

fcntl(), setuid(), setgid(),

F_GETFD, F_SETFD, FD_CLOEXEC,

access(), pipe(), fork(), close()

dup2, STDOUT_FILENO, _exit(),

execv(), write(), read(),

close() */

#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,

FD_CLOEXEC */

#include <string.h> /* strtok, strlen(), strcpy(),

strcat() */

fcntl() */

#include <fcntl.h> /* fcntl() */

#include <stddef.h> /* NULL */

#include <stdlib.h> /* EXIT_FAILURE */

#include <sys/select.h> /* fd_set, select(), FD_ZERO(),

FD_SET(), FD_ISSET() */

#include <string.h> /* strlen(), strcpy(), strcat() */

#include <stdbool.h> /* true */

#include <sys/wait.h> /* waitpid(), WIFEXITED(),

WEXITSTATUS() */

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

#include <argp.h> /* struct argp_option, struct

argp_state, struct argp,

argp_parse(), ARGP_ERR_UNKNOWN,

ARGP_KEY_END, ARGP_KEY_ARG, error_t */

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

sigaddset(), sigaction(),

sigprocmask(), SIG_BLOCK, SIGCHLD,

SIG_UNBLOCK, kill() */

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

#include <argp.h> /* struct argp_option,

struct argp_state, struct argp,

argp_parse() */

#define BUFFER_SIZE 256

const char *argp_program_version = "plugbasedclient 1.0";

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

struct process;

typedef struct process{

147

130

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

148

131

}

149

132

133

const char *argp_program_version = "plugbasedclient 0.9";

134

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

135

150

136

process *process_list = NULL;

151

137

152

138

/* Mark a process as completed when it exits, and save its exit

155

141

process *proc = process_list;

156

142

int status;

157

143

pid_t pid = wait(&status);

158

if(pid == -1){

159

perror("wait");

160

return;

161

}

162

144

while(proc != NULL and proc->pid != pid){

163

145

proc = proc->next;

164

146

}

290

272

.args_doc = "[+PLUS_SEPARATED_OPTIONS]",

291

273

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

292

274

293

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

294

if (ret == ARGP_ERR_UNKNOWN){

295

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

296

exitstatus = EXIT_FAILURE;

297

goto end;

298

}

275

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

299

276

300

277

if(plus_options){

301

278

/* This is a mangled argument in the form of

319

296

plus_argv = realloc(plus_argv, sizeof(char *)

320

297

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

321

298

if(plus_argv == NULL){

322

perror("realloc");

299

perror("malloc");

323

300

exitstatus = EXIT_FAILURE;

324

301

goto end;

325

302

}

327

304

plus_argv[new_argc] = NULL;

328

305

arg = strtok(NULL, delims); /* Get next argument */

329

306

}

330

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

331

if (ret == ARGP_ERR_UNKNOWN){

332

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

333

exitstatus = EXIT_FAILURE;

334

goto end;

335

}

307

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

336

308

}

337

309

338

310

if(debug){

352

324

353

325

setgid(gid);

354

326

if (ret == -1){

355

perror("setgid");

327

perror("setuid");

356

328

}

357

329

358

330

dir = opendir(plugindir);

382

354

383

355

// All directory entries have been processed

384

356

if(dirst == NULL){

385

if (errno == EBADF){

386

perror("readdir");

387

exitstatus = EXIT_FAILURE;

388

goto end;

389

}

390

357

break;

391

358

}

392

359

447

414

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

448

415

strcat(filename, dirst->d_name); /* Spurious warning */

449

416

450

ret = stat(filename, &st);

451

if (ret == -1){

452

perror("stat");

453

exitstatus = EXIT_FAILURE;

454

goto end;

455

}

417

stat(filename, &st);

456

418

457

419

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

458

420

if(debug){

518

480

perror("sigprocmask");

519

481

_exit(EXIT_FAILURE);

520

482

}

521

522

ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */

523

if(ret == -1){

524

perror("dup2");

525

_exit(EXIT_FAILURE);

526

}

483

dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */

527

484

528

485

if(dirfd(dir) < 0){

529

486

/* If dir has no file descriptor, we could not set FD_CLOEXEC

581

538

582

539

closedir(dir);

583

540

dir = NULL;

584

541

585

542

if (process_list == NULL){

586

543

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

587

544

exitstatus = EXIT_FAILURE;

722

679

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

723

680

next = process_list->next;

724

681

close(process_list->fd);

725

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

726

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

727

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

728

perror("kill");

729

}

682

kill(process_list->pid, SIGTERM);

730

683

free(process_list->buffer);

731

684

free(process_list);

732

685

}

Older »