/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/askpass-fifo.c

  • Committer: Teddy Hogeborn
  • Date: 2009-09-21 21:39:25 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090921213925-jbpt6tzu99otseng
Use D-Bus properties instead of our own methods.

* mandos (Client._datetime_to_milliseconds): Renamed to
                                             "_timedelta_to_milliseconds".
                                             All callers changed.
  (dbus_service_property): New decorator for D-Bus properties.
  (DBusPropertyException, DBusPropertyAccessException,
  DBusPropertyNotFound): New D-Bus exception classes.
  (DBusObjectWithProperties): New; extends "dbus.service.Object" with
                              support for properties.
  (ClientDBus): Inherit from, and call up to, "DBusObjectWithProperties".
  (ClientDBus.CheckedOK, ClientDBus.GetAllProperties,
  ClientDBus.SetChecker, ClientDBus.SetHost, ClientDBus.SetInterval,
  ClientDBus.SetSecret, ClientDBus.SetTimeout, ClientDBus.Enable,
  ClientDBus.StartChecker, ClientDBus.Disable,
  ClientDBus.StopChecker): Removed, replaced with properties.
  (ClientDBus.IsStillValid): Removed, superfluous.
  (ClientDBus.name_dbus_property,
  ClientDBus.fingerprint_dbus_property, ClientDBus.host_dbus_property,
  ClientDBus.created_dbus_property,
  ClientDBus.last_enabled_dbus_property,
  ClientDBus.enabled_dbus_property,
  ClientDBus.last_checked_ok_dbus_property,
  ClientDBus.timeout_dbus_property, ClientDBus.interval_dbus_property,
  ClientDBus.checker_dbus_property,
  ClientDBus.checker_running_dbus_property,
  ClientDBus.object_path_dbus_property,
  ClientDBus.secret_dbus_property): New D-Bus properties.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/askpass-fifo.c
19
19
 * along with this program.  If not, see
20
20
 * <http://www.gnu.org/licenses/>.
21
21
 * 
22
 
 * Contact the authors at <https://www.fukt.bsnet.se/~belorn/> and
23
 
 * <https://www.fukt.bsnet.se/~teddy/>.
 
22
 * Contact the authors at <mandos@fukt.bsnet.se>.
24
23
 */
25
24
 
26
25
#define _GNU_SOURCE             /* TEMP_FAILURE_RETRY() */
29
28
#include <iso646.h>             /* and */
30
29
#include <errno.h>              /* errno, EEXIST */
31
30
#include <stdio.h>              /* perror() */
32
 
#include <stdlib.h>             /* EXIT_FAILURE, NULL, size_t, free(), 
 
31
#include <stdlib.h>             /* EXIT_FAILURE, NULL, size_t, free(),
33
32
                                   realloc(), EXIT_SUCCESS */
34
33
#include <fcntl.h>              /* open(), O_RDONLY */
35
34
#include <unistd.h>             /* read(), close(), write(),
43
42
  
44
43
  /* Create FIFO */
45
44
  const char passfifo[] = "/lib/cryptsetup/passfifo";
46
 
  ret = (int)TEMP_FAILURE_RETRY(mkfifo(passfifo, S_IRUSR | S_IWUSR));
 
45
  ret = mkfifo(passfifo, S_IRUSR | S_IWUSR);
47
46
  if(ret == -1 and errno != EEXIST){
48
47
    perror("mkfifo");
49
48
    return EXIT_FAILURE;
50
49
  }
51
50
  
52
51
  /* Open FIFO */
53
 
  int fifo_fd = (int)TEMP_FAILURE_RETRY(open(passfifo, O_RDONLY));
 
52
  int fifo_fd = open(passfifo, O_RDONLY);
54
53
  if(fifo_fd == -1){
55
54
    perror("open");
56
55
    return EXIT_FAILURE;
62
61
  {
63
62
    size_t buf_allocated = 0;
64
63
    const size_t blocksize = 1024;
65
 
    do{
 
64
    do {
66
65
      if(buf_len + blocksize > buf_allocated){
67
66
        char *tmp = realloc(buf, buf_allocated + blocksize);
68
67
        if(tmp == NULL){
73
72
        buf = tmp;
74
73
        buf_allocated += blocksize;
75
74
      }
76
 
      sret = TEMP_FAILURE_RETRY(read(fifo_fd, buf + buf_len,
77
 
                                     buf_allocated - buf_len));
 
75
      sret = read(fifo_fd, buf + buf_len, buf_allocated - buf_len);
78
76
      if(sret == -1){
79
77
        perror("read");
80
78
        free(buf);
81
79
        return EXIT_FAILURE;
82
80
      }
83
81
      buf_len += (size_t)sret;
84
 
    }while(sret != 0);
 
82
    } while(sret != 0);
85
83
  }
86
84
  
87
85
  /* Close FIFO */
88
 
  TEMP_FAILURE_RETRY(close(fifo_fd));
 
86
  close(fifo_fd);
89
87
  
90
88
  /* Print password to stdout */
91
89
  size_t written = 0;
92
90
  while(written < buf_len){
93
 
    sret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buf + written,
94
 
                                    buf_len - written));
 
91
    sret = write(STDOUT_FILENO, buf + written, buf_len - written);
95
92
    if(sret == -1){
96
93
      perror("write");
97
94
      free(buf);