/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugins.d/splashy.c

  • Committer: Teddy Hogeborn
  • Date: 2009-09-06 05:37:34 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090906053734-uf180lq30ivv4nfy
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR
                                                      properly.

* plugins.d/mandos-client.c (start_mandos_communication): Bug fix:
  move out "decrypted_buffer_size" to where it is needed.

* plugins.d/splashy.c (termination_handler): Save signal received.
  (main): Check return value from "sigaddset()".

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/splashy.c
1
1
/*  -*- coding: utf-8 -*- */
2
2
/*
3
 
 * Passprompt - Read a password from splashy and output it
 
3
 * Splashy - Read a password from splashy and output it
4
4
 * 
5
5
 * Copyright © 2008,2009 Teddy Hogeborn
6
6
 * Copyright © 2008,2009 Björn Påhlsson
31
31
#include <stddef.h>             /* NULL */
32
32
#include <stdlib.h>             /* getenv() */
33
33
#include <stdio.h>              /* asprintf(), perror() */
34
 
#include <stdlib.h>             /* EXIT_FAILURE, free(), strtoul(),
 
34
#include <stdlib.h>             /* EXIT_FAILURE, free(),
35
35
                                   EXIT_SUCCESS */
36
36
#include <sys/types.h>          /* pid_t, DIR, struct dirent,
37
37
                                   ssize_t */
38
38
#include <dirent.h>             /* opendir(), readdir(), closedir() */
 
39
#include <inttypes.h>           /* intmax_t, strtoimax() */
39
40
#include <sys/stat.h>           /* struct stat, lstat(), S_ISLNK */
40
41
#include <iso646.h>             /* not, or, and */
41
42
#include <unistd.h>             /* readlink(), fork(), execl(),
47
48
                                   WEXITSTATUS() */
48
49
 
49
50
sig_atomic_t interrupted_by_signal = 0;
 
51
int signal_received;
50
52
 
51
 
static void termination_handler(__attribute__((unused))int signum){
 
53
static void termination_handler(int signum){
 
54
  if(interrupted_by_signal){
 
55
    return;
 
56
  }
52
57
  interrupted_by_signal = 1;
 
58
  signal_received = signum;
53
59
}
54
60
 
55
61
int main(__attribute__((unused))int argc,
97
103
    for(struct dirent *proc_ent = readdir(proc_dir);
98
104
        proc_ent != NULL;
99
105
        proc_ent = readdir(proc_dir)){
100
 
      pid_t pid = (pid_t) strtoul(proc_ent->d_name, NULL, 10);
101
 
      if(pid == 0){
102
 
        /* Not a process */
103
 
        continue;
 
106
      pid_t pid;
 
107
      {
 
108
        intmax_t tmpmax;
 
109
        char *tmp;
 
110
        errno = 0;
 
111
        tmpmax = strtoimax(proc_ent->d_name, &tmp, 10);
 
112
        if(errno != 0 or tmp == proc_ent->d_name or *tmp != '\0'
 
113
           or tmpmax != (pid_t)tmpmax){
 
114
          /* Not a process */
 
115
          continue;
 
116
        }
 
117
        pid = (pid_t)tmpmax;
104
118
      }
105
119
      /* Find the executable name by doing readlink() on the
106
120
         /proc/<pid>/exe link */
120
134
        struct stat exe_stat;
121
135
        ret = lstat(exe_link, &exe_stat);
122
136
        if(ret == -1){
 
137
          if(errno == ENOENT){
 
138
            free(exe_link);
 
139
            continue;
 
140
          }
123
141
          perror("lstat");
124
142
          free(exe_link);
125
143
          free(prompt);
157
175
                     .sa_flags = 0 };
158
176
    sigemptyset(&new_action.sa_mask);
159
177
    sigaddset(&new_action.sa_mask, SIGINT);
 
178
    if(ret == -1){
 
179
      perror("sigaddset");
 
180
      free(prompt);
 
181
      return EXIT_FAILURE;
 
182
    }
160
183
    sigaddset(&new_action.sa_mask, SIGHUP);
 
184
    if(ret == -1){
 
185
      perror("sigaddset");
 
186
      free(prompt);
 
187
      return EXIT_FAILURE;
 
188
    }
161
189
    sigaddset(&new_action.sa_mask, SIGTERM);
 
190
    if(ret == -1){
 
191
      perror("sigaddset");
 
192
      free(prompt);
 
193
      return EXIT_FAILURE;
 
194
    }
162
195
    ret = sigaction(SIGINT, NULL, &old_action);
163
196
    if(ret == -1){
164
197
      perror("sigaction");
263
296
    /* Child; will become new splashy process */
264
297
    
265
298
    /* Make the effective user ID (root) the only user ID instead of
266
 
       the real user ID (mandos) */
 
299
       the real user ID (_mandos) */
267
300
    ret = setuid(geteuid());
268
301
    if(ret == -1){
269
302
      perror("setuid");