/mandos/release

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

« back to all changes in this revision

Viewing changes to plugins.d/password-prompt.c

  • Committer: Björn Påhlsson
  • Date: 2011-02-27 15:45:24 UTC
  • mto: (237.7.15 mandos)
  • mto: This revision was merged to the branch mainline in revision 282.
  • Revision ID: belorn@fukt.bsnet.se-20110227154524-zac8443jod8v1g1g
fixed bug with conflict detection between plymouthd and password-prompt

Show diffs side-by-side

added added

removed removed

Lines of Context:
35
35
                                   SIGQUIT, SIGHUP, SIGTERM,
36
36
                                   raise() */
37
37
#include <stddef.h>             /* NULL, size_t, ssize_t */
38
 
#include <sys/types.h>          /* ssize_t, struct dirent, pid_t, ssize_t */
 
38
#include <sys/types.h>          /* ssize_t, struct dirent, pid_t,
 
39
                                   ssize_t, open() */
39
40
#include <stdlib.h>             /* EXIT_SUCCESS, EXIT_FAILURE,
40
41
                                   getenv(), free() */
41
42
#include <dirent.h>             /* scandir(), alphasort() */
49
50
#include <iso646.h>             /* or, not */
50
51
#include <stdbool.h>            /* bool, false, true */
51
52
#include <inttypes.h>           /* strtoumax() */
52
 
#include <sys/stat.h>           /* struct stat, lstat() */
 
53
#include <sys/stat.h>           /* struct stat, lstat(), open() */
53
54
#include <string.h>             /* strlen, rindex, memcmp */
54
55
#include <argp.h>               /* struct argp_option, struct
55
56
                                   argp_state, struct argp,
58
59
                                   ARGP_ERR_UNKNOWN */
59
60
#include <sysexits.h>           /* EX_SOFTWARE, EX_OSERR,
60
61
                                   EX_UNAVAILABLE, EX_IOERR, EX_OK */
 
62
#include <fcntl.h>              /* open() */
61
63
 
62
64
volatile sig_atomic_t quit_now = 0;
63
65
int signal_received;
66
68
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
67
69
 
68
70
/* Needed for conflic resolution */
69
 
const char plymouthd_path[] = "/sbin/plymouth";
 
71
const char plymouthd_name[] = "plymouthd";
70
72
 
71
73
 
72
74
static void termination_handler(int signum){
79
81
 
80
82
bool conflict_detection(void){
81
83
 
82
 
  /* plymouth conflicts with password-promt since both want to control the
83
 
     associated terminal. Password-prompt exit since plymouth perferms the same
84
 
     functionallity.
 
84
  /* plymouth conflicts with password-prompt since both want to read
 
85
     from the terminal.  Password-prompt will exit if it detects
 
86
     plymouth since plymouth performs the same functionality.
85
87
   */
86
88
  int is_plymouth(const struct dirent *proc_entry){
87
89
    int ret;
 
90
    int cl_fd;
88
91
    {
89
92
      uintmax_t maxvalue;
90
93
      char *tmp;
96
99
        return 0;
97
100
      }
98
101
    }
99
 
    char exe_target[sizeof(plymouthd_path)];
100
 
    char *exe_link;
101
 
    ret = asprintf(&exe_link, "/proc/%s/exe", proc_entry->d_name);
 
102
    
 
103
    char *cmdline_filename;
 
104
    ret = asprintf(&cmdline_filename, "/proc/%s/cmdline", proc_entry->d_name);
102
105
    if(ret == -1){
103
106
      error(0, errno, "asprintf");
104
107
      return 0;
105
108
    }
106
 
  
107
 
    struct stat exe_stat;
108
 
    ret = lstat(exe_link, &exe_stat);
109
 
    if(ret == -1){
110
 
      free(exe_link);
111
 
      if(errno != ENOENT){
112
 
        error(0, errno, "lstat");
 
109
    
 
110
    /* Open /proc/<pid>/cmdline  */
 
111
    cl_fd = open(cmdline_filename, O_RDONLY);
 
112
    free(cmdline_filename);
 
113
    if(cl_fd == -1){
 
114
      error(0, errno, "open");
 
115
      return 0;
 
116
    }
 
117
    
 
118
    char *cmdline = NULL;
 
119
    {
 
120
      size_t cmdline_len = 0;
 
121
      size_t cmdline_allocated = 0;
 
122
      char *tmp;
 
123
      const size_t blocksize = 1024;
 
124
      ssize_t sret;
 
125
      do {
 
126
        /* Allocate more space? */
 
127
        if(cmdline_len + blocksize + 1 > cmdline_allocated){
 
128
          tmp = realloc(cmdline, cmdline_allocated + blocksize + 1);
 
129
          if(tmp == NULL){
 
130
            error(0, errno, "realloc");
 
131
            free(cmdline);
 
132
            close(cl_fd);
 
133
            return 0;
 
134
          }
 
135
          cmdline = tmp;
 
136
          cmdline_allocated += blocksize;
 
137
        }
 
138
        
 
139
        /* Read data */
 
140
        sret = read(cl_fd, cmdline + cmdline_len,
 
141
                    cmdline_allocated - cmdline_len);
 
142
        if(sret == -1){
 
143
          error(0, errno, "read");
 
144
          free(cmdline);
 
145
          close(cl_fd);
 
146
          return 0;
 
147
        }
 
148
        cmdline_len += (size_t)sret;
 
149
      } while(sret != 0);
 
150
      ret = close(cl_fd);
 
151
      if(ret == -1){
 
152
        error(0, errno, "close");
 
153
        free(cmdline);
 
154
        return 0;
113
155
      }
114
 
      return 0;
115
 
    }
116
 
  
117
 
    if(not S_ISLNK(exe_stat.st_mode)
118
 
       or exe_stat.st_uid != 0
119
 
       or exe_stat.st_gid != 0){
120
 
      free(exe_link);
121
 
      return 0;
122
 
    }
123
 
  
124
 
    ssize_t sret = readlink(exe_link, exe_target, sizeof(exe_target));
125
 
    free(exe_link);
126
 
    if((sret != (ssize_t)sizeof(plymouthd_path)-1) or
127
 
       (memcmp(plymouthd_path, exe_target,
128
 
               sizeof(plymouthd_path)-1) != 0)){
129
 
      return 0;
130
 
    }
 
156
      cmdline[cmdline_len] = '\0'; /* Make sure it is terminated */
 
157
    }
 
158
    /* we now have cmdline */
 
159
    
 
160
    /* get basename */
 
161
    char *cmdline_base = strrchr(cmdline, '/');
 
162
    if(cmdline_base != NULL){
 
163
      cmdline_base += 1;                /* skip the slash */
 
164
    } else {
 
165
      cmdline_base = cmdline;
 
166
    }
 
167
    
 
168
    if(strcmp(cmdline_base, plymouthd_name) != 0){
 
169
      free(cmdline);
 
170
      return 0;
 
171
    }
 
172
    free(cmdline);
131
173
    return 1;
132
174
  }
133
175
 
137
179
  if (ret == -1){
138
180
    error(1, errno, "scandir");
139
181
  }
140
 
  if (ret < 0){
141
 
    return 1;
 
182
  if (ret > 0){
 
183
    return true;
142
184
  } else {
143
 
    return 0;
 
185
    return false;
144
186
  }
145
187
}
146
188