/mandos/trunk : revision 1237

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: 2021-02-03 23:10:42 UTC
Revision ID: teddy@recompile.se-20210203231042-2z3egrvpo1zt7nej

mandos-ctl: Fix bad test for command.Remove and related minor issues

The test for command.Remove removes all clients from the spy server,
and then loops over all clients, looking for the corresponding Remove
command as recorded by the spy server.  But since since there aren't
any clients left after they were removed, no assertions are made, and
the test therefore does nothing.  Fix this.

In tests for command.Approve and command.Deny, add checks that clients
were not somehow removed by the command (in which case, likewise, no
assertions are made).

Add related checks to TestPropertySetterCmd.runTest; i.e. test that a
sequence is not empty before looping over it and making assertions.

* mandos-ctl (TestBaseCommands.test_Remove): Save a copy of the
  original "clients" dict, and loop over those instead.  Add assertion
  that all clients were indeed removed.  Also fix the code which looks
  for the Remove command, which now needs to actually work.
  (TestBaseCommands.test_Approve, TestBaseCommands.test_Deny): Add
  assertion that there are still clients before looping over them.
  (TestPropertySetterCmd.runTest): Add assertion that the list of
  values to get is not empty before looping over them.  Also add check
  that there are still clients before looping over clients.

Show diffs side-by-side

added added

removed removed

plugin-runner.c

* Mandos plugin runner - Run Mandos plugins

* This file is part of Mandos.

* Contact the authors at <mandos@recompile.se>.

#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),

O_CLOEXEC, pipe2() */

#define _GNU_SOURCE /* strchrnul(), TEMP_FAILURE_RETRY(),

getline(), asprintf(), O_CLOEXEC,

scandirat(), pipe2() */

#include <argp.h> /* argp_program_version,

argp_program_bug_address,

struct argp_option,

struct argp_state, argp_error(),

ARGP_NO_EXIT, argp_state_help,

ARGP_HELP_STD_HELP,

ARGP_HELP_USAGE, ARGP_HELP_EXIT_OK,

ARGP_KEY_ARG, ARGP_ERR_UNKNOWN,

struct argp, argp_parse(),

ARGP_IN_ORDER, ARGP_NO_HELP */

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

#include <sys/types.h> /* pid_t, sig_atomic_t, uid_t, gid_t,

getuid(), setgid(), setuid() */

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

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

realloc() */

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

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

stderr, STDOUT_FILENO, fclose() */

#include <sys/types.h> /* fstat(), struct stat, waitpid(),

WIFEXITED(), WEXITSTATUS(), wait(),

pid_t, uid_t, gid_t, getuid(),

getgid() */

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

FD_SET(), FD_ISSET(), FD_CLR */

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

WEXITSTATUS(), WTERMSIG() */

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

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

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

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

FD_CLOEXEC, write(), STDOUT_FILENO,

struct stat, fstat(), close(),

setgid(), setuid(), S_ISREG(),

faccessat() pipe2(), fork(),

_exit(), dup2(), fexecve(), read()

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

#include <string.h> /* strcmp(), strdup(), strchrnul(),

strncmp(), strlen(), strcpy(),

strsep(), strchr(), strsignal() */

#include <stdlib.h> /* malloc(), free(), reallocarray(),

realloc(), EXIT_SUCCESS */

#include <errno.h> /* errno, EINTR, ENOMEM, ECHILD,

error_t, EINVAL, EMFILE, ENFILE,

ENOENT, ESRCH */

#include <stdint.h> /* SIZE_MAX */

#define _GNU_SOURCE /* strchrnul(), TEMP_FAILURE_RETRY(),

getline(), asprintf(), O_CLOEXEC,

scandirat(), pipe2() */

#include <unistd.h> /* TEMP_FAILURE_RETRY(), ssize_t,

write(), STDOUT_FILENO, uid_t,

gid_t, getuid(), fchown(), close(),

symlink(), setgid(), setuid(),

faccessat(), X_OK, pipe(), pipe2(),

fork(), _exit(), dup2(), fexecve(),

read(), getpass() */

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

FD_CLOEXEC, openat(), scandirat(),

pipe2() */

#include <string.h> /* strsep, strlen(), strsignal(),

strcmp(), strncmp() */

#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(), sig_atomic_t

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

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

FD_CLOEXEC, open(), O_RDONLY,

O_CLOEXEC, openat() */

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

WEXITSTATUS(), WIFSIGNALED(),

WTERMSIG(), wait() */

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

#include <stdio.h> /* FILE, fprintf(), fopen(),

getline(), fclose(), EOF,

asprintf(), stderr */

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

alphasort() */

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

lstat(), S_ISREG() */

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

FD_SET(), select(), FD_CLR(),

FD_ISSET() */

#include <signal.h> /* struct sigaction, SA_NOCLDSTOP,

sigemptyset(), sigaddset(),

SIGCHLD, sigprocmask(), SIG_BLOCK,

SIG_UNBLOCK, kill(), SIGTERM */

#include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_IOERR,

EX_CONFIG, EX_UNAVAILABLE, EX_OK */

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

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

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

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

#include <fnmatch.h> /* fnmatch(), FNM_FILE_NAME,

FNM_PERIOD, FNM_NOMATCH */

#define BUFFER_SIZE 256

179

193

/* Resize the pointed-to array to hold one more pointer */

180

194

char **new_array = NULL;

181

195

do {

182

new_array = realloc(*array, sizeof(char *)

183

* (size_t) ((*len) + 2));

196

#if defined(__GLIBC_PREREQ) and __GLIBC_PREREQ(2, 26)

197

new_array = reallocarray(*array, (size_t)((*len) + 2),

198

sizeof(char *));

199

#else

200

if(((size_t)((*len) + 2)) > (SIZE_MAX / sizeof(char *))){

201

/* overflow */

202

new_array = NULL;

203

errno = ENOMEM;

204

} else {

205

new_array = realloc(*array, (size_t)((*len) + 2)

206

* sizeof(char *));

207

}

208

#endif

184

209

} while(new_array == NULL and errno == EINTR);

185

210

/* Malloc check */

186

211

if(new_array == NULL){

708

733

709

734

custom_argc += 1;

710

735

{

711

char **new_argv = realloc(custom_argv, sizeof(char *)

712

* ((size_t)custom_argc + 1));

736

#if defined(__GLIBC_PREREQ) and __GLIBC_PREREQ(2, 26)

737

char **new_argv = reallocarray(custom_argv, (size_t)custom_argc + 1,

738

sizeof(char *));

739

#else

740

char **new_argv = NULL;

741

if(((size_t)custom_argc + 1) > (SIZE_MAX / sizeof(char *))){

742

/* overflow */

743

errno = ENOMEM;

744

} else {

745

new_argv = realloc(custom_argv, ((size_t)custom_argc + 1)

746

* sizeof(char *));

747

}

748

#endif

713

749

if(new_argv == NULL){

714

error(0, errno, "realloc");

750

error(0, errno, "reallocarray");

715

751

exitstatus = EX_OSERR;

716

752

free(new_arg);

717

753

free(org_line);

836

872

}

837

873

close(plugindir_fd);

838

874

}

875

876

/* Work around Debian bug #981302

877

<https://bugs.debian.org/981302> */

878

if(lstat("/dev/fd", &st) != 0 and errno == ENOENT){

879

ret = symlink("/proc/self/fd", "/dev/fd");

880

if(ret == -1){

881

error(0, errno, "Failed to create /dev/fd symlink");

882

}

883

}

839

884

}

840

885

841

886

/* Lower permissions */

Older »