To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 825
- compare with another revision
- download diff
- download tarball
- view history from revision 825
- Committer: Teddy Hogeborn
- Date: 2016-03-07 23:39:36 UTC
- Revision ID: teddy@recompile.se-20160307233936-mhgpxhggamde443n
Server bug fix: Include CAP_SETGID so it does not run as root
* debian/mandos.postinst (configure): If old version was 1.7.4-1 or
1.7.4-1~bpo8+1, fix situation where clients.pickle file is owned by
root.
* mandos (main): Print debug info about setuid() and setgid()
* mandos.service ([Service]/CapabilityBoundingSet): Add "CAP_KILL
CAP_SETGID"; the latter is needed for setgid() to be allowed.
* debian/mandos.postinst (configure): If old version was 1.7.4-1 or
1.7.4-1~bpo8+1, fix situation where clients.pickle file is owned by
root.
* mandos (main): Print debug info about setuid() and setgid()
* mandos.service ([Service]/CapabilityBoundingSet): Add "CAP_KILL
CAP_SETGID"; the latter is needed for setgid() to be allowed.
added
removed
mandos
1
#!/usr/bin/python2.7
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2014 Teddy Hogeborn
15
# Copyright © 2008-2014 Björn Påhlsson
14
# Copyright © 2008-2016 Teddy Hogeborn
15
# Copyright © 2008-2016 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
36
36
37
37
from future_builtins import *
38
38
39
import SocketServer as socketserver
39
try:
40
import SocketServer as socketserver
41
except ImportError:
42
import socketserver
40
43
import socket
41
44
import argparse
42
45
import datetime
43
46
import errno
44
import gnutls.crypto
45
import gnutls.connection
46
import gnutls.errors
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
47
try:
48
import ConfigParser as configparser
49
except ImportError:
50
import configparser
51
51
import sys
52
52
import re
53
53
import os
62
62
import struct
63
63
import fcntl
64
64
import functools
65
import cPickle as pickle
65
try:
66
import cPickle as pickle
67
except ImportError:
68
import pickle
66
69
import multiprocessing
67
70
import types
68
71
import binascii
69
72
import tempfile
70
73
import itertools
71
74
import collections
75
import codecs
72
76
73
77
import dbus
74
78
import dbus.service
75
import gobject
79
try:
80
from gi.repository import GObject
81
except ImportError:
82
import gobject as GObject
76
83
import avahi
77
84
from dbus.mainloop.glib import DBusGMainLoop
78
85
import ctypes
88
95
except ImportError:
89
96
SO_BINDTODEVICE = None
90
97
91
version = "1.6.8"
98
if sys.version_info.major == 2:
99
str = unicode
100
101
version = "1.7.4"
92
102
stored_state_file = "clients.pickle"
93
103
94
104
logger = logging.getLogger()
95
105
syslogger = None
96
106
97
107
try:
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
100
.if_nametoindex)
108
if_nametoindex = ctypes.cdll.LoadLibrary(
109
ctypes.util.find_library("c")).if_nametoindex
101
110
except (OSError, AttributeError):
111
102
112
def if_nametoindex(interface):
103
113
"Get an interface index the hard way, i.e. using fcntl()"
104
114
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
115
with contextlib.closing(socket.socket()) as s:
106
116
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
108
interface))
109
interface_index = struct.unpack(str("I"),
110
ifreq[16:20])[0]
117
struct.pack(b"16s16x", interface))
118
interface_index = struct.unpack("I", ifreq[16:20])[0]
111
119
return interface_index
112
120
113
121
115
123
"""init logger and add loglevel"""
116
124
117
125
global syslogger
118
syslogger = (logging.handlers.SysLogHandler
119
(facility =
120
logging.handlers.SysLogHandler.LOG_DAEMON,
121
address = str("/dev/log")))
126
syslogger = (logging.handlers.SysLogHandler(
127
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
128
address = "/dev/log"))
122
129
syslogger.setFormatter(logging.Formatter
123
130
('Mandos [%(process)d]: %(levelname)s:'
124
131
' %(message)s'))
141
148
142
149
class PGPEngine(object):
143
150
"""A simple class for OpenPGP symmetric encryption & decryption"""
151
144
152
def __init__(self):
145
153
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
154
self.gpg = "gpg"
155
try:
156
output = subprocess.check_output(["gpgconf"])
157
for line in output.splitlines():
158
name, text, path = line.split(":")
159
if name == "gpg":
160
self.gpg = path
161
break
162
except OSError as e:
163
if e.errno != errno.ENOENT:
164
raise
146
165
self.gnupgargs = ['--batch',
147
'--home', self.tempdir,
166
'--homedir', self.tempdir,
148
167
'--force-mdc',
149
168
'--quiet',
150
169
'--no-use-agent']
185
204
186
205
def encrypt(self, data, password):
187
206
passphrase = self.password_encode(password)
188
with tempfile.NamedTemporaryFile(dir=self.tempdir
189
) as passfile:
207
with tempfile.NamedTemporaryFile(
208
dir=self.tempdir) as passfile:
190
209
passfile.write(passphrase)
191
210
passfile.flush()
192
proc = subprocess.Popen(['gpg', '--symmetric',
211
proc = subprocess.Popen([self.gpg, '--symmetric',
193
212
'--passphrase-file',
194
213
passfile.name]
195
214
+ self.gnupgargs,
203
222
204
223
def decrypt(self, data, password):
205
224
passphrase = self.password_encode(password)
206
with tempfile.NamedTemporaryFile(dir = self.tempdir
207
) as passfile:
225
with tempfile.NamedTemporaryFile(
226
dir = self.tempdir) as passfile:
208
227
passfile.write(passphrase)
209
228
passfile.flush()
210
proc = subprocess.Popen(['gpg', '--decrypt',
229
proc = subprocess.Popen([self.gpg, '--decrypt',
211
230
'--passphrase-file',
212
231
passfile.name]
213
232
+ self.gnupgargs,
214
233
stdin = subprocess.PIPE,
215
234
stdout = subprocess.PIPE,
216
235
stderr = subprocess.PIPE)
217
decrypted_plaintext, err = proc.communicate(input
218
= data)
236
decrypted_plaintext, err = proc.communicate(input = data)
219
237
if proc.returncode != 0:
220
238
raise PGPError(err)
221
239
return decrypted_plaintext
224
242
class AvahiError(Exception):
225
243
def __init__(self, value, *args, **kwargs):
226
244
self.value = value
227
super(AvahiError, self).__init__(value, *args, **kwargs)
228
def __unicode__(self):
229
return unicode(repr(self.value))
245
return super(AvahiError, self).__init__(value, *args,
246
**kwargs)
247
230
248
231
249
class AvahiServiceError(AvahiError):
232
250
pass
233
251
252
234
253
class AvahiGroupError(AvahiError):
235
254
pass
236
255
256
275
bus: dbus.SystemBus()
257
276
"""
258
277
259
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
260
servicetype = None, port = None, TXT = None,
261
domain = "", host = "", max_renames = 32768,
262
protocol = avahi.PROTO_UNSPEC, bus = None):
278
def __init__(self,
279
interface = avahi.IF_UNSPEC,
280
name = None,
281
servicetype = None,
282
port = None,
283
TXT = None,
284
domain = "",
285
host = "",
286
max_renames = 32768,
287
protocol = avahi.PROTO_UNSPEC,
288
bus = None):
263
289
self.interface = interface
264
290
self.name = name
265
291
self.type = servicetype
275
301
self.bus = bus
276
302
self.entry_group_state_changed_match = None
277
303
278
def rename(self):
304
def rename(self, remove=True):
279
305
"""Derived from the Avahi example code"""
280
306
if self.rename_count >= self.max_renames:
281
307
logger.critical("No suitable Zeroconf service name found"
282
308
" after %i retries, exiting.",
283
309
self.rename_count)
284
310
raise AvahiServiceError("Too many renames")
285
self.name = unicode(self.server
286
.GetAlternativeServiceName(self.name))
311
self.name = str(
312
self.server.GetAlternativeServiceName(self.name))
313
self.rename_count += 1
287
314
logger.info("Changing Zeroconf service name to %r ...",
288
315
self.name)
289
self.remove()
316
if remove:
317
self.remove()
290
318
try:
291
319
self.add()
292
320
except dbus.exceptions.DBusException as error:
293
logger.critical("D-Bus Exception", exc_info=error)
294
self.cleanup()
295
os._exit(1)
296
self.rename_count += 1
321
if (error.get_dbus_name()
322
== "org.freedesktop.Avahi.CollisionError"):
323
logger.info("Local Zeroconf service name collision.")
324
return self.rename(remove=False)
325
else:
326
logger.critical("D-Bus Exception", exc_info=error)
327
self.cleanup()
328
os._exit(1)
297
329
298
330
def remove(self):
299
331
"""Derived from the Avahi example code"""
337
369
self.rename()
338
370
elif state == avahi.ENTRY_GROUP_FAILURE:
339
371
logger.critical("Avahi: Error in group state changed %s",
340
unicode(error))
341
raise AvahiGroupError("State changed: {!s}"
342
.format(error))
372
str(error))
373
raise AvahiGroupError("State changed: {!s}".format(error))
343
374
344
375
def cleanup(self):
345
376
"""Derived from the Avahi example code"""
355
386
def server_state_changed(self, state, error=None):
356
387
"""Derived from the Avahi example code"""
357
388
logger.debug("Avahi server state change: %i", state)
358
bad_states = { avahi.SERVER_INVALID:
359
"Zeroconf server invalid",
360
avahi.SERVER_REGISTERING: None,
361
avahi.SERVER_COLLISION:
362
"Zeroconf server name collision",
363
avahi.SERVER_FAILURE:
364
"Zeroconf server failure" }
389
bad_states = {
390
avahi.SERVER_INVALID: "Zeroconf server invalid",
391
avahi.SERVER_REGISTERING: None,
392
avahi.SERVER_COLLISION: "Zeroconf server name collision",
393
avahi.SERVER_FAILURE: "Zeroconf server failure",
394
}
365
395
if state in bad_states:
366
396
if bad_states[state] is not None:
367
397
if error is None:
370
400
logger.error(bad_states[state] + ": %r", error)
371
401
self.cleanup()
372
402
elif state == avahi.SERVER_RUNNING:
373
self.add()
403
try:
404
self.add()
405
except dbus.exceptions.DBusException as error:
406
if (error.get_dbus_name()
407
== "org.freedesktop.Avahi.CollisionError"):
408
logger.info("Local Zeroconf service name"
409
" collision.")
410
return self.rename(remove=False)
411
else:
412
logger.critical("D-Bus Exception", exc_info=error)
413
self.cleanup()
414
os._exit(1)
374
415
else:
375
416
if error is None:
376
417
logger.debug("Unknown state: %r", state)
386
427
follow_name_owner_changes=True),
387
428
avahi.DBUS_INTERFACE_SERVER)
388
429
self.server.connect_to_signal("StateChanged",
389
self.server_state_changed)
430
self.server_state_changed)
390
431
self.server_state_changed(self.server.GetState())
391
432
392
433
393
434
class AvahiServiceToSyslog(AvahiService):
394
def rename(self):
435
def rename(self, *args, **kwargs):
395
436
"""Add the new name to the syslog messages"""
396
ret = AvahiService.rename(self)
397
syslogger.setFormatter(logging.Formatter
398
('Mandos ({}) [%(process)d]:'
399
' %(levelname)s: %(message)s'
400
.format(self.name)))
437
ret = AvahiService.rename(self, *args, **kwargs)
438
syslogger.setFormatter(logging.Formatter(
439
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
440
.format(self.name)))
401
441
return ret
402
442
443
# Pretend that we have a GnuTLS module
444
class GnuTLS(object):
445
"""This isn't so much a class as it is a module-like namespace.
446
It is instantiated once, and simulates having a GnuTLS module."""
447
448
_library = ctypes.cdll.LoadLibrary(
449
ctypes.util.find_library("gnutls"))
450
_need_version = "3.3.0"
451
def __init__(self):
452
# Need to use class name "GnuTLS" here, since this method is
453
# called before the assignment to the "gnutls" global variable
454
# happens.
455
if GnuTLS.check_version(self._need_version) is None:
456
raise GnuTLS.Error("Needs GnuTLS {} or later"
457
.format(self._need_version))
458
459
# Unless otherwise indicated, the constants and types below are
460
# all from the gnutls/gnutls.h C header file.
461
462
# Constants
463
E_SUCCESS = 0
464
E_INTERRUPTED = -52
465
E_AGAIN = -28
466
CRT_OPENPGP = 2
467
CLIENT = 2
468
SHUT_RDWR = 0
469
CRD_CERTIFICATE = 1
470
E_NO_CERTIFICATE_FOUND = -49
471
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
472
473
# Types
474
class session_int(ctypes.Structure):
475
_fields_ = []
476
session_t = ctypes.POINTER(session_int)
477
class certificate_credentials_st(ctypes.Structure):
478
_fields_ = []
479
certificate_credentials_t = ctypes.POINTER(
480
certificate_credentials_st)
481
certificate_type_t = ctypes.c_int
482
class datum_t(ctypes.Structure):
483
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
484
('size', ctypes.c_uint)]
485
class openpgp_crt_int(ctypes.Structure):
486
_fields_ = []
487
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
488
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
489
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
490
credentials_type_t = ctypes.c_int
491
transport_ptr_t = ctypes.c_void_p
492
close_request_t = ctypes.c_int
493
494
# Exceptions
495
class Error(Exception):
496
# We need to use the class name "GnuTLS" here, since this
497
# exception might be raised from within GnuTLS.__init__,
498
# which is called before the assignment to the "gnutls"
499
# global variable has happened.
500
def __init__(self, message = None, code = None, args=()):
501
# Default usage is by a message string, but if a return
502
# code is passed, convert it to a string with
503
# gnutls.strerror()
504
self.code = code
505
if message is None and code is not None:
506
message = GnuTLS.strerror(code)
507
return super(GnuTLS.Error, self).__init__(
508
message, *args)
509
510
class CertificateSecurityError(Error):
511
pass
512
513
# Classes
514
class Credentials(object):
515
def __init__(self):
516
self._c_object = gnutls.certificate_credentials_t()
517
gnutls.certificate_allocate_credentials(
518
ctypes.byref(self._c_object))
519
self.type = gnutls.CRD_CERTIFICATE
520
521
def __del__(self):
522
gnutls.certificate_free_credentials(self._c_object)
523
524
class ClientSession(object):
525
def __init__(self, socket, credentials = None):
526
self._c_object = gnutls.session_t()
527
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
528
gnutls.set_default_priority(self._c_object)
529
gnutls.transport_set_ptr(self._c_object, socket.fileno())
530
gnutls.handshake_set_private_extensions(self._c_object,
531
True)
532
self.socket = socket
533
if credentials is None:
534
credentials = gnutls.Credentials()
535
gnutls.credentials_set(self._c_object, credentials.type,
536
ctypes.cast(credentials._c_object,
537
ctypes.c_void_p))
538
self.credentials = credentials
539
540
def __del__(self):
541
gnutls.deinit(self._c_object)
542
543
def handshake(self):
544
return gnutls.handshake(self._c_object)
545
546
def send(self, data):
547
data = bytes(data)
548
data_len = len(data)
549
while data_len > 0:
550
data_len -= gnutls.record_send(self._c_object,
551
data[-data_len:],
552
data_len)
553
554
def bye(self):
555
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
556
557
# Error handling functions
558
def _error_code(result):
559
"""A function to raise exceptions on errors, suitable
560
for the 'restype' attribute on ctypes functions"""
561
if result >= 0:
562
return result
563
if result == gnutls.E_NO_CERTIFICATE_FOUND:
564
raise gnutls.CertificateSecurityError(code = result)
565
raise gnutls.Error(code = result)
566
567
def _retry_on_error(result, func, arguments):
568
"""A function to retry on some errors, suitable
569
for the 'errcheck' attribute on ctypes functions"""
570
while result < 0:
571
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
572
return _error_code(result)
573
result = func(*arguments)
574
return result
575
576
# Unless otherwise indicated, the function declarations below are
577
# all from the gnutls/gnutls.h C header file.
578
579
# Functions
580
priority_set_direct = _library.gnutls_priority_set_direct
581
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
582
ctypes.POINTER(ctypes.c_char_p)]
583
priority_set_direct.restype = _error_code
584
585
init = _library.gnutls_init
586
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
587
init.restype = _error_code
588
589
set_default_priority = _library.gnutls_set_default_priority
590
set_default_priority.argtypes = [session_t]
591
set_default_priority.restype = _error_code
592
593
record_send = _library.gnutls_record_send
594
record_send.argtypes = [session_t, ctypes.c_void_p,
595
ctypes.c_size_t]
596
record_send.restype = ctypes.c_ssize_t
597
record_send.errcheck = _retry_on_error
598
599
certificate_allocate_credentials = (
600
_library.gnutls_certificate_allocate_credentials)
601
certificate_allocate_credentials.argtypes = [
602
ctypes.POINTER(certificate_credentials_t)]
603
certificate_allocate_credentials.restype = _error_code
604
605
certificate_free_credentials = (
606
_library.gnutls_certificate_free_credentials)
607
certificate_free_credentials.argtypes = [certificate_credentials_t]
608
certificate_free_credentials.restype = None
609
610
handshake_set_private_extensions = (
611
_library.gnutls_handshake_set_private_extensions)
612
handshake_set_private_extensions.argtypes = [session_t,
613
ctypes.c_int]
614
handshake_set_private_extensions.restype = None
615
616
credentials_set = _library.gnutls_credentials_set
617
credentials_set.argtypes = [session_t, credentials_type_t,
618
ctypes.c_void_p]
619
credentials_set.restype = _error_code
620
621
strerror = _library.gnutls_strerror
622
strerror.argtypes = [ctypes.c_int]
623
strerror.restype = ctypes.c_char_p
624
625
certificate_type_get = _library.gnutls_certificate_type_get
626
certificate_type_get.argtypes = [session_t]
627
certificate_type_get.restype = _error_code
628
629
certificate_get_peers = _library.gnutls_certificate_get_peers
630
certificate_get_peers.argtypes = [session_t,
631
ctypes.POINTER(ctypes.c_uint)]
632
certificate_get_peers.restype = ctypes.POINTER(datum_t)
633
634
global_set_log_level = _library.gnutls_global_set_log_level
635
global_set_log_level.argtypes = [ctypes.c_int]
636
global_set_log_level.restype = None
637
638
global_set_log_function = _library.gnutls_global_set_log_function
639
global_set_log_function.argtypes = [log_func]
640
global_set_log_function.restype = None
641
642
deinit = _library.gnutls_deinit
643
deinit.argtypes = [session_t]
644
deinit.restype = None
645
646
handshake = _library.gnutls_handshake
647
handshake.argtypes = [session_t]
648
handshake.restype = _error_code
649
handshake.errcheck = _retry_on_error
650
651
transport_set_ptr = _library.gnutls_transport_set_ptr
652
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
653
transport_set_ptr.restype = None
654
655
bye = _library.gnutls_bye
656
bye.argtypes = [session_t, close_request_t]
657
bye.restype = _error_code
658
bye.errcheck = _retry_on_error
659
660
check_version = _library.gnutls_check_version
661
check_version.argtypes = [ctypes.c_char_p]
662
check_version.restype = ctypes.c_char_p
663
664
# All the function declarations below are from gnutls/openpgp.h
665
666
openpgp_crt_init = _library.gnutls_openpgp_crt_init
667
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
668
openpgp_crt_init.restype = _error_code
669
670
openpgp_crt_import = _library.gnutls_openpgp_crt_import
671
openpgp_crt_import.argtypes = [openpgp_crt_t,
672
ctypes.POINTER(datum_t),
673
openpgp_crt_fmt_t]
674
openpgp_crt_import.restype = _error_code
675
676
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
677
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
678
ctypes.POINTER(ctypes.c_uint)]
679
openpgp_crt_verify_self.restype = _error_code
680
681
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
682
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
683
openpgp_crt_deinit.restype = None
684
685
openpgp_crt_get_fingerprint = (
686
_library.gnutls_openpgp_crt_get_fingerprint)
687
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
688
ctypes.c_void_p,
689
ctypes.POINTER(
690
ctypes.c_size_t)]
691
openpgp_crt_get_fingerprint.restype = _error_code
692
693
# Remove non-public functions
694
del _error_code, _retry_on_error
695
# Create the global "gnutls" object, simulating a module
696
gnutls = GnuTLS()
697
698
def call_pipe(connection, # : multiprocessing.Connection
699
func, *args, **kwargs):
700
"""This function is meant to be called by multiprocessing.Process
701
702
This function runs func(*args, **kwargs), and writes the resulting
703
return value on the provided multiprocessing.Connection.
704
"""
705
connection.send(func(*args, **kwargs))
706
connection.close()
403
707
404
708
class Client(object):
405
709
"""A representation of a client host served by this server.
411
715
checker: subprocess.Popen(); a running checker process used
412
716
to see if the client lives.
413
717
'None' if no process is running.
414
checker_callback_tag: a gobject event source tag, or None
718
checker_callback_tag: a GObject event source tag, or None
415
719
checker_command: string; External command which is run to check
416
720
if client lives. %() expansions are done at
417
721
runtime with vars(self) as dict, so that for
418
722
instance %(name)s can be used in the command.
419
checker_initiator_tag: a gobject event source tag, or None
723
checker_initiator_tag: a GObject event source tag, or None
420
724
created: datetime.datetime(); (UTC) object creation
421
725
client_structure: Object describing what attributes a client has
422
726
and is used for storing the client at exit
423
727
current_checker_command: string; current running checker_command
424
disable_initiator_tag: a gobject event source tag, or None
728
disable_initiator_tag: a GObject event source tag, or None
425
729
enabled: bool()
426
730
fingerprint: string (40 or 32 hexadecimal digits); used to
427
731
uniquely identify the client
432
736
last_checker_status: integer between 0 and 255 reflecting exit
433
737
status of last checker. -1 reflects crashed
434
738
checker, -2 means no checker completed yet.
739
last_checker_signal: The signal which killed the last checker, if
740
last_checker_status is -1
435
741
last_enabled: datetime.datetime(); (UTC) or None
436
742
name: string; from the config file, used in log messages and
437
743
D-Bus identifiers
450
756
"fingerprint", "host", "interval",
451
757
"last_approval_request", "last_checked_ok",
452
758
"last_enabled", "name", "timeout")
453
client_defaults = { "timeout": "PT5M",
454
"extended_timeout": "PT15M",
455
"interval": "PT2M",
456
"checker": "fping -q -- %%(host)s",
457
"host": "",
458
"approval_delay": "PT0S",
459
"approval_duration": "PT1S",
460
"approved_by_default": "True",
461
"enabled": "True",
462
}
759
client_defaults = {
760
"timeout": "PT5M",
761
"extended_timeout": "PT15M",
762
"interval": "PT2M",
763
"checker": "fping -q -- %%(host)s",
764
"host": "",
765
"approval_delay": "PT0S",
766
"approval_duration": "PT1S",
767
"approved_by_default": "True",
768
"enabled": "True",
769
}
463
770
464
771
@staticmethod
465
772
def config_parser(config):
481
788
client["enabled"] = config.getboolean(client_name,
482
789
"enabled")
483
790
791
# Uppercase and remove spaces from fingerprint for later
792
# comparison purposes with return value from the
793
# fingerprint() function
484
794
client["fingerprint"] = (section["fingerprint"].upper()
485
795
.replace(" ", ""))
486
796
if "secret" in section:
528
838
self.expires = None
529
839
530
840
logger.debug("Creating client %r", self.name)
531
# Uppercase and remove spaces from fingerprint for later
532
# comparison purposes with return value from the fingerprint()
533
# function
534
841
logger.debug(" Fingerprint: %s", self.fingerprint)
535
842
self.created = settings.get("created",
536
843
datetime.datetime.utcnow())
543
850
self.current_checker_command = None
544
851
self.approved = None
545
852
self.approvals_pending = 0
546
self.changedstate = (multiprocessing_manager
547
.Condition(multiprocessing_manager
548
.Lock()))
549
self.client_structure = [attr for attr in
550
self.__dict__.iterkeys()
853
self.changedstate = multiprocessing_manager.Condition(
854
multiprocessing_manager.Lock())
855
self.client_structure = [attr
856
for attr in self.__dict__.iterkeys()
551
857
if not attr.startswith("_")]
552
858
self.client_structure.append("client_structure")
553
859
554
for name, t in inspect.getmembers(type(self),
555
lambda obj:
556
isinstance(obj,
557
property)):
860
for name, t in inspect.getmembers(
861
type(self), lambda obj: isinstance(obj, property)):
558
862
if not name.startswith("_"):
559
863
self.client_structure.append(name)
560
864
581
885
if not quiet:
582
886
logger.info("Disabling client %s", self.name)
583
887
if getattr(self, "disable_initiator_tag", None) is not None:
584
gobject.source_remove(self.disable_initiator_tag)
888
GObject.source_remove(self.disable_initiator_tag)
585
889
self.disable_initiator_tag = None
586
890
self.expires = None
587
891
if getattr(self, "checker_initiator_tag", None) is not None:
588
gobject.source_remove(self.checker_initiator_tag)
892
GObject.source_remove(self.checker_initiator_tag)
589
893
self.checker_initiator_tag = None
590
894
self.stop_checker()
591
895
self.enabled = False
592
896
if not quiet:
593
897
self.send_changedstate()
594
# Do not run this again if called by a gobject.timeout_add
898
# Do not run this again if called by a GObject.timeout_add
595
899
return False
596
900
597
901
def __del__(self):
601
905
# Schedule a new checker to be started an 'interval' from now,
602
906
# and every interval from then on.
603
907
if self.checker_initiator_tag is not None:
604
gobject.source_remove(self.checker_initiator_tag)
605
self.checker_initiator_tag = (gobject.timeout_add
606
(int(self.interval
607
.total_seconds() * 1000),
608
self.start_checker))
908
GObject.source_remove(self.checker_initiator_tag)
909
self.checker_initiator_tag = GObject.timeout_add(
910
int(self.interval.total_seconds() * 1000),
911
self.start_checker)
609
912
# Schedule a disable() when 'timeout' has passed
610
913
if self.disable_initiator_tag is not None:
611
gobject.source_remove(self.disable_initiator_tag)
612
self.disable_initiator_tag = (gobject.timeout_add
613
(int(self.timeout
614
.total_seconds() * 1000),
615
self.disable))
914
GObject.source_remove(self.disable_initiator_tag)
915
self.disable_initiator_tag = GObject.timeout_add(
916
int(self.timeout.total_seconds() * 1000), self.disable)
616
917
# Also start a new checker *right now*.
617
918
self.start_checker()
618
919
619
def checker_callback(self, pid, condition, command):
920
def checker_callback(self, source, condition, connection,
921
command):
620
922
"""The checker has completed, so take appropriate actions."""
621
923
self.checker_callback_tag = None
622
924
self.checker = None
623
if os.WIFEXITED(condition):
624
self.last_checker_status = os.WEXITSTATUS(condition)
925
# Read return code from connection (see call_pipe)
926
returncode = connection.recv()
927
connection.close()
928
929
if returncode >= 0:
930
self.last_checker_status = returncode
931
self.last_checker_signal = None
625
932
if self.last_checker_status == 0:
626
933
logger.info("Checker for %(name)s succeeded",
627
934
vars(self))
628
935
self.checked_ok()
629
936
else:
630
logger.info("Checker for %(name)s failed",
631
vars(self))
937
logger.info("Checker for %(name)s failed", vars(self))
632
938
else:
633
939
self.last_checker_status = -1
940
self.last_checker_signal = -returncode
634
941
logger.warning("Checker for %(name)s crashed?",
635
942
vars(self))
943
return False
636
944
637
945
def checked_ok(self):
638
946
"""Assert that the client has been seen, alive and well."""
639
947
self.last_checked_ok = datetime.datetime.utcnow()
640
948
self.last_checker_status = 0
949
self.last_checker_signal = None
641
950
self.bump_timeout()
642
951
643
952
def bump_timeout(self, timeout=None):
645
954
if timeout is None:
646
955
timeout = self.timeout
647
956
if self.disable_initiator_tag is not None:
648
gobject.source_remove(self.disable_initiator_tag)
957
GObject.source_remove(self.disable_initiator_tag)
649
958
self.disable_initiator_tag = None
650
959
if getattr(self, "enabled", False):
651
self.disable_initiator_tag = (gobject.timeout_add
652
(int(timeout.total_seconds()
653
* 1000), self.disable))
960
self.disable_initiator_tag = GObject.timeout_add(
961
int(timeout.total_seconds() * 1000), self.disable)
654
962
self.expires = datetime.datetime.utcnow() + timeout
655
963
656
964
def need_approval(self):
670
978
# than 'timeout' for the client to be disabled, which is as it
671
979
# should be.
672
980
673
# If a checker exists, make sure it is not a zombie
674
try:
675
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
676
except AttributeError:
677
pass
678
except OSError as error:
679
if error.errno != errno.ECHILD:
680
raise
681
else:
682
if pid:
683
logger.warning("Checker was a zombie")
684
gobject.source_remove(self.checker_callback_tag)
685
self.checker_callback(pid, status,
686
self.current_checker_command)
981
if self.checker is not None and not self.checker.is_alive():
982
logger.warning("Checker was not alive; joining")
983
self.checker.join()
984
self.checker = None
687
985
# Start a new checker if needed
688
986
if self.checker is None:
689
987
# Escape attributes for the shell
690
escaped_attrs = { attr:
691
re.escape(unicode(getattr(self,
692
attr)))
693
for attr in self.runtime_expansions }
988
escaped_attrs = {
989
attr: re.escape(str(getattr(self, attr)))
990
for attr in self.runtime_expansions }
694
991
try:
695
992
command = self.checker_command % escaped_attrs
696
993
except TypeError as error:
697
994
logger.error('Could not format string "%s"',
698
self.checker_command, exc_info=error)
699
return True # Try again later
995
self.checker_command,
996
exc_info=error)
997
return True # Try again later
700
998
self.current_checker_command = command
701
try:
702
logger.info("Starting checker %r for %s",
703
command, self.name)
704
# We don't need to redirect stdout and stderr, since
705
# in normal mode, that is already done by daemon(),
706
# and in debug mode we don't want to. (Stdin is
707
# always replaced by /dev/null.)
708
# The exception is when not debugging but nevertheless
709
# running in the foreground; use the previously
710
# created wnull.
711
popen_args = {}
712
if (not self.server_settings["debug"]
713
and self.server_settings["foreground"]):
714
popen_args.update({"stdout": wnull,
715
"stderr": wnull })
716
self.checker = subprocess.Popen(command,
717
close_fds=True,
718
shell=True, cwd="/",
719
**popen_args)
720
except OSError as error:
721
logger.error("Failed to start subprocess",
722
exc_info=error)
723
return True
724
self.checker_callback_tag = (gobject.child_watch_add
725
(self.checker.pid,
726
self.checker_callback,
727
data=command))
728
# The checker may have completed before the gobject
729
# watch was added. Check for this.
730
try:
731
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
732
except OSError as error:
733
if error.errno == errno.ECHILD:
734
# This should never happen
735
logger.error("Child process vanished",
736
exc_info=error)
737
return True
738
raise
739
if pid:
740
gobject.source_remove(self.checker_callback_tag)
741
self.checker_callback(pid, status, command)
742
# Re-run this periodically if run by gobject.timeout_add
999
logger.info("Starting checker %r for %s", command,
1000
self.name)
1001
# We don't need to redirect stdout and stderr, since
1002
# in normal mode, that is already done by daemon(),
1003
# and in debug mode we don't want to. (Stdin is
1004
# always replaced by /dev/null.)
1005
# The exception is when not debugging but nevertheless
1006
# running in the foreground; use the previously
1007
# created wnull.
1008
popen_args = { "close_fds": True,
1009
"shell": True,
1010
"cwd": "/" }
1011
if (not self.server_settings["debug"]
1012
and self.server_settings["foreground"]):
1013
popen_args.update({"stdout": wnull,
1014
"stderr": wnull })
1015
pipe = multiprocessing.Pipe(duplex = False)
1016
self.checker = multiprocessing.Process(
1017
target = call_pipe,
1018
args = (pipe[1], subprocess.call, command),
1019
kwargs = popen_args)
1020
self.checker.start()
1021
self.checker_callback_tag = GObject.io_add_watch(
1022
pipe[0].fileno(), GObject.IO_IN,
1023
self.checker_callback, pipe[0], command)
1024
# Re-run this periodically if run by GObject.timeout_add
743
1025
return True
744
1026
745
1027
def stop_checker(self):
746
1028
"""Force the checker process, if any, to stop."""
747
1029
if self.checker_callback_tag:
748
gobject.source_remove(self.checker_callback_tag)
1030
GObject.source_remove(self.checker_callback_tag)
749
1031
self.checker_callback_tag = None
750
1032
if getattr(self, "checker", None) is None:
751
1033
return
752
1034
logger.debug("Stopping checker for %(name)s", vars(self))
753
try:
754
self.checker.terminate()
755
#time.sleep(0.5)
756
#if self.checker.poll() is None:
757
# self.checker.kill()
758
except OSError as error:
759
if error.errno != errno.ESRCH: # No such process
760
raise
1035
self.checker.terminate()
761
1036
self.checker = None
762
1037
763
1038
764
def dbus_service_property(dbus_interface, signature="v",
765
access="readwrite", byte_arrays=False):
1039
def dbus_service_property(dbus_interface,
1040
signature="v",
1041
access="readwrite",
1042
byte_arrays=False):
766
1043
"""Decorators for marking methods of a DBusObjectWithProperties to
767
1044
become properties on the D-Bus.
768
1045
778
1055
if byte_arrays and signature != "ay":
779
1056
raise ValueError("Byte arrays not supported for non-'ay'"
780
1057
" signature {!r}".format(signature))
1058
781
1059
def decorator(func):
782
1060
func._dbus_is_property = True
783
1061
func._dbus_interface = dbus_interface
788
1066
func._dbus_name = func._dbus_name[:-14]
789
1067
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
790
1068
return func
1069
791
1070
return decorator
792
1071
793
1072
802
1081
"org.freedesktop.DBus.Property.EmitsChangedSignal":
803
1082
"false"}
804
1083
"""
1084
805
1085
def decorator(func):
806
1086
func._dbus_is_interface = True
807
1087
func._dbus_interface = dbus_interface
808
1088
func._dbus_name = dbus_interface
809
1089
return func
1090
810
1091
return decorator
811
1092
812
1093
814
1095
"""Decorator to annotate D-Bus methods, signals or properties
815
1096
Usage:
816
1097
1098
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
1099
"org.freedesktop.DBus.Property."
1100
"EmitsChangedSignal": "false"})
817
1101
@dbus_service_property("org.example.Interface", signature="b",
818
1102
access="r")
819
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
820
"org.freedesktop.DBus.Property."
821
"EmitsChangedSignal": "false"})
822
1103
def Property_dbus_property(self):
823
1104
return dbus.Boolean(False)
1105
1106
See also the DBusObjectWithAnnotations class.
824
1107
"""
1108
825
1109
def decorator(func):
826
1110
func._dbus_annotations = annotations
827
1111
return func
1112
828
1113
return decorator
829
1114
830
1115
831
1116
class DBusPropertyException(dbus.exceptions.DBusException):
832
1117
"""A base class for D-Bus property-related exceptions
833
1118
"""
834
def __unicode__(self):
835
return unicode(str(self))
1119
pass
836
1120
837
1121
838
1122
class DBusPropertyAccessException(DBusPropertyException):
847
1131
pass
848
1132
849
1133
850
class DBusObjectWithProperties(dbus.service.Object):
851
"""A D-Bus object with properties.
1134
class DBusObjectWithAnnotations(dbus.service.Object):
1135
"""A D-Bus object with annotations.
852
1136
853
Classes inheriting from this can use the dbus_service_property
854
decorator to expose methods as D-Bus properties. It exposes the
855
standard Get(), Set(), and GetAll() methods on the D-Bus.
1137
Classes inheriting from this can use the dbus_annotations
1138
decorator to add annotations to methods or signals.
856
1139
"""
857
1140
858
1141
@staticmethod
868
1151
def _get_all_dbus_things(self, thing):
869
1152
"""Returns a generator of (name, attribute) pairs
870
1153
"""
871
return ((getattr(athing.__get__(self), "_dbus_name",
872
name),
1154
return ((getattr(athing.__get__(self), "_dbus_name", name),
873
1155
athing.__get__(self))
874
1156
for cls in self.__class__.__mro__
875
1157
for name, athing in
876
inspect.getmembers(cls,
877
self._is_dbus_thing(thing)))
1158
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1159
1160
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1161
out_signature = "s",
1162
path_keyword = 'object_path',
1163
connection_keyword = 'connection')
1164
def Introspect(self, object_path, connection):
1165
"""Overloading of standard D-Bus method.
1166
1167
Inserts annotation tags on methods and signals.
1168
"""
1169
xmlstring = dbus.service.Object.Introspect(self, object_path,
1170
connection)
1171
try:
1172
document = xml.dom.minidom.parseString(xmlstring)
1173
1174
for if_tag in document.getElementsByTagName("interface"):
1175
# Add annotation tags
1176
for typ in ("method", "signal"):
1177
for tag in if_tag.getElementsByTagName(typ):
1178
annots = dict()
1179
for name, prop in (self.
1180
_get_all_dbus_things(typ)):
1181
if (name == tag.getAttribute("name")
1182
and prop._dbus_interface
1183
== if_tag.getAttribute("name")):
1184
annots.update(getattr(
1185
prop, "_dbus_annotations", {}))
1186
for name, value in annots.items():
1187
ann_tag = document.createElement(
1188
"annotation")
1189
ann_tag.setAttribute("name", name)
1190
ann_tag.setAttribute("value", value)
1191
tag.appendChild(ann_tag)
1192
# Add interface annotation tags
1193
for annotation, value in dict(
1194
itertools.chain.from_iterable(
1195
annotations().items()
1196
for name, annotations
1197
in self._get_all_dbus_things("interface")
1198
if name == if_tag.getAttribute("name")
1199
)).items():
1200
ann_tag = document.createElement("annotation")
1201
ann_tag.setAttribute("name", annotation)
1202
ann_tag.setAttribute("value", value)
1203
if_tag.appendChild(ann_tag)
1204
# Fix argument name for the Introspect method itself
1205
if (if_tag.getAttribute("name")
1206
== dbus.INTROSPECTABLE_IFACE):
1207
for cn in if_tag.getElementsByTagName("method"):
1208
if cn.getAttribute("name") == "Introspect":
1209
for arg in cn.getElementsByTagName("arg"):
1210
if (arg.getAttribute("direction")
1211
== "out"):
1212
arg.setAttribute("name",
1213
"xml_data")
1214
xmlstring = document.toxml("utf-8")
1215
document.unlink()
1216
except (AttributeError, xml.dom.DOMException,
1217
xml.parsers.expat.ExpatError) as error:
1218
logger.error("Failed to override Introspection method",
1219
exc_info=error)
1220
return xmlstring
1221
1222
1223
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1224
"""A D-Bus object with properties.
1225
1226
Classes inheriting from this can use the dbus_service_property
1227
decorator to expose methods as D-Bus properties. It exposes the
1228
standard Get(), Set(), and GetAll() methods on the D-Bus.
1229
"""
878
1230
879
1231
def _get_dbus_property(self, interface_name, property_name):
880
1232
"""Returns a bound method if one exists which is a D-Bus
881
1233
property with the specified name and interface.
882
1234
"""
883
for cls in self.__class__.__mro__:
884
for name, value in (inspect.getmembers
885
(cls,
886
self._is_dbus_thing("property"))):
1235
for cls in self.__class__.__mro__:
1236
for name, value in inspect.getmembers(
1237
cls, self._is_dbus_thing("property")):
887
1238
if (value._dbus_name == property_name
888
1239
and value._dbus_interface == interface_name):
889
1240
return value.__get__(self)
890
1241
891
1242
# No such property
892
raise DBusPropertyNotFound(self.dbus_object_path + ":"
893
+ interface_name + "."
894
+ property_name)
895
896
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1243
raise DBusPropertyNotFound("{}:{}.{}".format(
1244
self.dbus_object_path, interface_name, property_name))
1245
1246
@classmethod
1247
def _get_all_interface_names(cls):
1248
"""Get a sequence of all interfaces supported by an object"""
1249
return (name for name in set(getattr(getattr(x, attr),
1250
"_dbus_interface", None)
1251
for x in (inspect.getmro(cls))
1252
for attr in dir(x))
1253
if name is not None)
1254
1255
@dbus.service.method(dbus.PROPERTIES_IFACE,
1256
in_signature="ss",
897
1257
out_signature="v")
898
1258
def Get(self, interface_name, property_name):
899
1259
"""Standard D-Bus property Get() method, see D-Bus standard.
924
1284
for byte in value))
925
1285
prop(value)
926
1286
927
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
1287
@dbus.service.method(dbus.PROPERTIES_IFACE,
1288
in_signature="s",
928
1289
out_signature="a{sv}")
929
1290
def GetAll(self, interface_name):
930
1291
"""Standard D-Bus property GetAll() method, see D-Bus
945
1306
if not hasattr(value, "variant_level"):
946
1307
properties[name] = value
947
1308
continue
948
properties[name] = type(value)(value, variant_level=
949
value.variant_level+1)
1309
properties[name] = type(value)(
1310
value, variant_level = value.variant_level + 1)
950
1311
return dbus.Dictionary(properties, signature="sv")
951
1312
1313
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1314
def PropertiesChanged(self, interface_name, changed_properties,
1315
invalidated_properties):
1316
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
1317
standard.
1318
"""
1319
pass
1320
952
1321
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
953
1322
out_signature="s",
954
1323
path_keyword='object_path',
958
1327
959
1328
Inserts property tags and interface annotation tags.
960
1329
"""
961
xmlstring = dbus.service.Object.Introspect(self, object_path,
962
connection)
1330
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1331
object_path,
1332
connection)
963
1333
try:
964
1334
document = xml.dom.minidom.parseString(xmlstring)
1335
965
1336
def make_tag(document, name, prop):
966
1337
e = document.createElement("property")
967
1338
e.setAttribute("name", name)
968
1339
e.setAttribute("type", prop._dbus_signature)
969
1340
e.setAttribute("access", prop._dbus_access)
970
1341
return e
1342
971
1343
for if_tag in document.getElementsByTagName("interface"):
972
1344
# Add property tags
973
1345
for tag in (make_tag(document, name, prop)
976
1348
if prop._dbus_interface
977
1349
== if_tag.getAttribute("name")):
978
1350
if_tag.appendChild(tag)
979
# Add annotation tags
980
for typ in ("method", "signal", "property"):
981
for tag in if_tag.getElementsByTagName(typ):
982
annots = dict()
983
for name, prop in (self.
984
_get_all_dbus_things(typ)):
985
if (name == tag.getAttribute("name")
986
and prop._dbus_interface
987
== if_tag.getAttribute("name")):
988
annots.update(getattr
989
(prop,
990
"_dbus_annotations",
991
{}))
992
for name, value in annots.items():
993
ann_tag = document.createElement(
994
"annotation")
995
ann_tag.setAttribute("name", name)
996
ann_tag.setAttribute("value", value)
997
tag.appendChild(ann_tag)
998
# Add interface annotation tags
999
for annotation, value in dict(
1000
itertools.chain.from_iterable(
1001
annotations().items()
1002
for name, annotations in
1003
self._get_all_dbus_things("interface")
1004
if name == if_tag.getAttribute("name")
1005
)).items():
1006
ann_tag = document.createElement("annotation")
1007
ann_tag.setAttribute("name", annotation)
1008
ann_tag.setAttribute("value", value)
1009
if_tag.appendChild(ann_tag)
1351
# Add annotation tags for properties
1352
for tag in if_tag.getElementsByTagName("property"):
1353
annots = dict()
1354
for name, prop in self._get_all_dbus_things(
1355
"property"):
1356
if (name == tag.getAttribute("name")
1357
and prop._dbus_interface
1358
== if_tag.getAttribute("name")):
1359
annots.update(getattr(
1360
prop, "_dbus_annotations", {}))
1361
for name, value in annots.items():
1362
ann_tag = document.createElement(
1363
"annotation")
1364
ann_tag.setAttribute("name", name)
1365
ann_tag.setAttribute("value", value)
1366
tag.appendChild(ann_tag)
1010
1367
# Add the names to the return values for the
1011
1368
# "org.freedesktop.DBus.Properties" methods
1012
1369
if (if_tag.getAttribute("name")
1030
1387
exc_info=error)
1031
1388
return xmlstring
1032
1389
1390
try:
1391
dbus.OBJECT_MANAGER_IFACE
1392
except AttributeError:
1393
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1394
1395
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1396
"""A D-Bus object with an ObjectManager.
1397
1398
Classes inheriting from this exposes the standard
1399
GetManagedObjects call and the InterfacesAdded and
1400
InterfacesRemoved signals on the standard
1401
"org.freedesktop.DBus.ObjectManager" interface.
1402
1403
Note: No signals are sent automatically; they must be sent
1404
manually.
1405
"""
1406
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1407
out_signature = "a{oa{sa{sv}}}")
1408
def GetManagedObjects(self):
1409
"""This function must be overridden"""
1410
raise NotImplementedError()
1411
1412
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1413
signature = "oa{sa{sv}}")
1414
def InterfacesAdded(self, object_path, interfaces_and_properties):
1415
pass
1416
1417
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1418
def InterfacesRemoved(self, object_path, interfaces):
1419
pass
1420
1421
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1422
out_signature = "s",
1423
path_keyword = 'object_path',
1424
connection_keyword = 'connection')
1425
def Introspect(self, object_path, connection):
1426
"""Overloading of standard D-Bus method.
1427
1428
Override return argument name of GetManagedObjects to be
1429
"objpath_interfaces_and_properties"
1430
"""
1431
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1432
object_path,
1433
connection)
1434
try:
1435
document = xml.dom.minidom.parseString(xmlstring)
1436
1437
for if_tag in document.getElementsByTagName("interface"):
1438
# Fix argument name for the GetManagedObjects method
1439
if (if_tag.getAttribute("name")
1440
== dbus.OBJECT_MANAGER_IFACE):
1441
for cn in if_tag.getElementsByTagName("method"):
1442
if (cn.getAttribute("name")
1443
== "GetManagedObjects"):
1444
for arg in cn.getElementsByTagName("arg"):
1445
if (arg.getAttribute("direction")
1446
== "out"):
1447
arg.setAttribute(
1448
"name",
1449
"objpath_interfaces"
1450
"_and_properties")
1451
xmlstring = document.toxml("utf-8")
1452
document.unlink()
1453
except (AttributeError, xml.dom.DOMException,
1454
xml.parsers.expat.ExpatError) as error:
1455
logger.error("Failed to override Introspection method",
1456
exc_info = error)
1457
return xmlstring
1033
1458
1034
1459
def datetime_to_dbus(dt, variant_level=0):
1035
1460
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1036
1461
if dt is None:
1037
1462
return dbus.String("", variant_level = variant_level)
1038
return dbus.String(dt.isoformat(),
1039
variant_level=variant_level)
1463
return dbus.String(dt.isoformat(), variant_level=variant_level)
1040
1464
1041
1465
1042
1466
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1062
1486
(from DBusObjectWithProperties) and interfaces (from the
1063
1487
dbus_interface_annotations decorator).
1064
1488
"""
1489
1065
1490
def wrapper(cls):
1066
1491
for orig_interface_name, alt_interface_name in (
1067
alt_interface_names.items()):
1492
alt_interface_names.items()):
1068
1493
attr = {}
1069
1494
interface_names = set()
1070
1495
# Go though all attributes of the class
1072
1497
# Ignore non-D-Bus attributes, and D-Bus attributes
1073
1498
# with the wrong interface name
1074
1499
if (not hasattr(attribute, "_dbus_interface")
1075
or not attribute._dbus_interface
1076
.startswith(orig_interface_name)):
1500
or not attribute._dbus_interface.startswith(
1501
orig_interface_name)):
1077
1502
continue
1078
1503
# Create an alternate D-Bus interface name based on
1079
1504
# the current name
1080
alt_interface = (attribute._dbus_interface
1081
.replace(orig_interface_name,
1082
alt_interface_name))
1505
alt_interface = attribute._dbus_interface.replace(
1506
orig_interface_name, alt_interface_name)
1083
1507
interface_names.add(alt_interface)
1084
1508
# Is this a D-Bus signal?
1085
1509
if getattr(attribute, "_dbus_is_signal", False):
1086
# Extract the original non-method undecorated
1087
# function by black magic
1088
nonmethod_func = (dict(
1510
if sys.version_info.major == 2:
1511
# Extract the original non-method undecorated
1512
# function by black magic
1513
nonmethod_func = (dict(
1089
1514
zip(attribute.func_code.co_freevars,
1090
attribute.__closure__))["func"]
1091
.cell_contents)
1515
attribute.__closure__))
1516
["func"].cell_contents)
1517
else:
1518
nonmethod_func = attribute
1092
1519
# Create a new, but exactly alike, function
1093
1520
# object, and decorate it to be a new D-Bus signal
1094
1521
# with the alternate D-Bus interface name
1095
new_function = (dbus.service.signal
1096
(alt_interface,
1097
attribute._dbus_signature)
1098
(types.FunctionType(
1099
nonmethod_func.func_code,
1100
nonmethod_func.func_globals,
1101
nonmethod_func.func_name,
1102
nonmethod_func.func_defaults,
1103
nonmethod_func.func_closure)))
1522
if sys.version_info.major == 2:
1523
new_function = types.FunctionType(
1524
nonmethod_func.func_code,
1525
nonmethod_func.func_globals,
1526
nonmethod_func.func_name,
1527
nonmethod_func.func_defaults,
1528
nonmethod_func.func_closure)
1529
else:
1530
new_function = types.FunctionType(
1531
nonmethod_func.__code__,
1532
nonmethod_func.__globals__,
1533
nonmethod_func.__name__,
1534
nonmethod_func.__defaults__,
1535
nonmethod_func.__closure__)
1536
new_function = (dbus.service.signal(
1537
alt_interface,
1538
attribute._dbus_signature)(new_function))
1104
1539
# Copy annotations, if any
1105
1540
try:
1106
new_function._dbus_annotations = (
1107
dict(attribute._dbus_annotations))
1541
new_function._dbus_annotations = dict(
1542
attribute._dbus_annotations)
1108
1543
except AttributeError:
1109
1544
pass
1110
1545
# Define a creator of a function to call both the
1115
1550
"""This function is a scope container to pass
1116
1551
func1 and func2 to the "call_both" function
1117
1552
outside of its arguments"""
1553
1554
@functools.wraps(func2)
1118
1555
def call_both(*args, **kwargs):
1119
1556
"""This function will emit two D-Bus
1120
1557
signals by calling func1 and func2"""
1121
1558
func1(*args, **kwargs)
1122
1559
func2(*args, **kwargs)
1560
# Make wrapper function look like a D-Bus signal
1561
for name, attr in inspect.getmembers(func2):
1562
if name.startswith("_dbus_"):
1563
setattr(call_both, name, attr)
1564
1123
1565
return call_both
1124
1566
# Create the "call_both" function and add it to
1125
1567
# the class
1130
1572
# object. Decorate it to be a new D-Bus method
1131
1573
# with the alternate D-Bus interface name. Add it
1132
1574
# to the class.
1133
attr[attrname] = (dbus.service.method
1134
(alt_interface,
1135
attribute._dbus_in_signature,
1136
attribute._dbus_out_signature)
1137
(types.FunctionType
1138
(attribute.func_code,
1139
attribute.func_globals,
1140
attribute.func_name,
1141
attribute.func_defaults,
1142
attribute.func_closure)))
1575
attr[attrname] = (
1576
dbus.service.method(
1577
alt_interface,
1578
attribute._dbus_in_signature,
1579
attribute._dbus_out_signature)
1580
(types.FunctionType(attribute.func_code,
1581
attribute.func_globals,
1582
attribute.func_name,
1583
attribute.func_defaults,
1584
attribute.func_closure)))
1143
1585
# Copy annotations, if any
1144
1586
try:
1145
attr[attrname]._dbus_annotations = (
1146
dict(attribute._dbus_annotations))
1587
attr[attrname]._dbus_annotations = dict(
1588
attribute._dbus_annotations)
1147
1589
except AttributeError:
1148
1590
pass
1149
1591
# Is this a D-Bus property?
1152
1594
# object, and decorate it to be a new D-Bus
1153
1595
# property with the alternate D-Bus interface
1154
1596
# name. Add it to the class.
1155
attr[attrname] = (dbus_service_property
1156
(alt_interface,
1157
attribute._dbus_signature,
1158
attribute._dbus_access,
1159
attribute
1160
._dbus_get_args_options
1161
["byte_arrays"])
1162
(types.FunctionType
1163
(attribute.func_code,
1164
attribute.func_globals,
1165
attribute.func_name,
1166
attribute.func_defaults,
1167
attribute.func_closure)))
1597
attr[attrname] = (dbus_service_property(
1598
alt_interface, attribute._dbus_signature,
1599
attribute._dbus_access,
1600
attribute._dbus_get_args_options
1601
["byte_arrays"])
1602
(types.FunctionType(
1603
attribute.func_code,
1604
attribute.func_globals,
1605
attribute.func_name,
1606
attribute.func_defaults,
1607
attribute.func_closure)))
1168
1608
# Copy annotations, if any
1169
1609
try:
1170
attr[attrname]._dbus_annotations = (
1171
dict(attribute._dbus_annotations))
1610
attr[attrname]._dbus_annotations = dict(
1611
attribute._dbus_annotations)
1172
1612
except AttributeError:
1173
1613
pass
1174
1614
# Is this a D-Bus interface?
1177
1617
# object. Decorate it to be a new D-Bus interface
1178
1618
# with the alternate D-Bus interface name. Add it
1179
1619
# to the class.
1180
attr[attrname] = (dbus_interface_annotations
1181
(alt_interface)
1182
(types.FunctionType
1183
(attribute.func_code,
1184
attribute.func_globals,
1185
attribute.func_name,
1186
attribute.func_defaults,
1187
attribute.func_closure)))
1620
attr[attrname] = (
1621
dbus_interface_annotations(alt_interface)
1622
(types.FunctionType(attribute.func_code,
1623
attribute.func_globals,
1624
attribute.func_name,
1625
attribute.func_defaults,
1626
attribute.func_closure)))
1188
1627
if deprecate:
1189
1628
# Deprecate all alternate interfaces
1190
1629
iname="_AlternateDBusNames_interface_annotation{}"
1191
1630
for interface_name in interface_names:
1631
1192
1632
@dbus_interface_annotations(interface_name)
1193
1633
def func(self):
1194
1634
return { "org.freedesktop.DBus.Deprecated":
1195
"true" }
1635
"true" }
1196
1636
# Find an unused name
1197
1637
for aname in (iname.format(i)
1198
1638
for i in itertools.count()):
1203
1643
# Replace the class with a new subclass of it with
1204
1644
# methods, signals, etc. as created above.
1205
1645
cls = type(b"{}Alternate".format(cls.__name__),
1206
(cls,), attr)
1646
(cls, ), attr)
1207
1647
return cls
1648
1208
1649
return wrapper
1209
1650
1210
1651
1211
1652
@alternate_dbus_interfaces({"se.recompile.Mandos":
1212
"se.bsnet.fukt.Mandos"})
1653
"se.bsnet.fukt.Mandos"})
1213
1654
class ClientDBus(Client, DBusObjectWithProperties):
1214
1655
"""A Client class using D-Bus
1215
1656
1219
1660
"""
1220
1661
1221
1662
runtime_expansions = (Client.runtime_expansions
1222
+ ("dbus_object_path",))
1663
+ ("dbus_object_path", ))
1664
1665
_interface = "se.recompile.Mandos.Client"
1223
1666
1224
1667
# dbus.service.Object doesn't use super(), so we can't either.
1225
1668
1228
1671
Client.__init__(self, *args, **kwargs)
1229
1672
# Only now, when this client is initialized, can it show up on
1230
1673
# the D-Bus
1231
client_object_name = unicode(self.name).translate(
1674
client_object_name = str(self.name).translate(
1232
1675
{ord("."): ord("_"),
1233
1676
ord("-"): ord("_")})
1234
self.dbus_object_path = (dbus.ObjectPath
1235
("/clients/" + client_object_name))
1677
self.dbus_object_path = dbus.ObjectPath(
1678
"/clients/" + client_object_name)
1236
1679
DBusObjectWithProperties.__init__(self, self.bus,
1237
1680
self.dbus_object_path)
1238
1681
1239
def notifychangeproperty(transform_func,
1240
dbus_name, type_func=lambda x: x,
1241
variant_level=1):
1682
def notifychangeproperty(transform_func, dbus_name,
1683
type_func=lambda x: x,
1684
variant_level=1,
1685
invalidate_only=False,
1686
_interface=_interface):
1242
1687
""" Modify a variable so that it's a property which announces
1243
1688
its changes to DBus.
1244
1689
1250
1695
variant_level: D-Bus variant level. Default: 1
1251
1696
"""
1252
1697
attrname = "_{}".format(dbus_name)
1698
1253
1699
def setter(self, value):
1254
1700
if hasattr(self, "dbus_object_path"):
1255
1701
if (not hasattr(self, attrname) or
1256
1702
type_func(getattr(self, attrname, None))
1257
1703
!= type_func(value)):
1258
dbus_value = transform_func(type_func(value),
1259
variant_level
1260
=variant_level)
1261
self.PropertyChanged(dbus.String(dbus_name),
1262
dbus_value)
1704
if invalidate_only:
1705
self.PropertiesChanged(
1706
_interface, dbus.Dictionary(),
1707
dbus.Array((dbus_name, )))
1708
else:
1709
dbus_value = transform_func(
1710
type_func(value),
1711
variant_level = variant_level)
1712
self.PropertyChanged(dbus.String(dbus_name),
1713
dbus_value)
1714
self.PropertiesChanged(
1715
_interface,
1716
dbus.Dictionary({ dbus.String(dbus_name):
1717
dbus_value }),
1718
dbus.Array())
1263
1719
setattr(self, attrname, value)
1264
1720
1265
1721
return property(lambda self: getattr(self, attrname), setter)
1271
1727
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1272
1728
last_enabled = notifychangeproperty(datetime_to_dbus,
1273
1729
"LastEnabled")
1274
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1275
type_func = lambda checker:
1276
checker is not None)
1730
checker = notifychangeproperty(
1731
dbus.Boolean, "CheckerRunning",
1732
type_func = lambda checker: checker is not None)
1277
1733
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1278
1734
"LastCheckedOK")
1279
1735
last_checker_status = notifychangeproperty(dbus.Int16,
1282
1738
datetime_to_dbus, "LastApprovalRequest")
1283
1739
approved_by_default = notifychangeproperty(dbus.Boolean,
1284
1740
"ApprovedByDefault")
1285
approval_delay = notifychangeproperty(dbus.UInt64,
1286
"ApprovalDelay",
1287
type_func =
1288
lambda td: td.total_seconds()
1289
* 1000)
1741
approval_delay = notifychangeproperty(
1742
dbus.UInt64, "ApprovalDelay",
1743
type_func = lambda td: td.total_seconds() * 1000)
1290
1744
approval_duration = notifychangeproperty(
1291
1745
dbus.UInt64, "ApprovalDuration",
1292
1746
type_func = lambda td: td.total_seconds() * 1000)
1293
1747
host = notifychangeproperty(dbus.String, "Host")
1294
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1295
type_func = lambda td:
1296
td.total_seconds() * 1000)
1748
timeout = notifychangeproperty(
1749
dbus.UInt64, "Timeout",
1750
type_func = lambda td: td.total_seconds() * 1000)
1297
1751
extended_timeout = notifychangeproperty(
1298
1752
dbus.UInt64, "ExtendedTimeout",
1299
1753
type_func = lambda td: td.total_seconds() * 1000)
1300
interval = notifychangeproperty(dbus.UInt64,
1301
"Interval",
1302
type_func =
1303
lambda td: td.total_seconds()
1304
* 1000)
1754
interval = notifychangeproperty(
1755
dbus.UInt64, "Interval",
1756
type_func = lambda td: td.total_seconds() * 1000)
1305
1757
checker_command = notifychangeproperty(dbus.String, "Checker")
1758
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1759
invalidate_only=True)
1306
1760
1307
1761
del notifychangeproperty
1308
1762
1315
1769
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1316
1770
Client.__del__(self, *args, **kwargs)
1317
1771
1318
def checker_callback(self, pid, condition, command,
1319
*args, **kwargs):
1320
self.checker_callback_tag = None
1321
self.checker = None
1322
if os.WIFEXITED(condition):
1323
exitstatus = os.WEXITSTATUS(condition)
1772
def checker_callback(self, source, condition,
1773
connection, command, *args, **kwargs):
1774
ret = Client.checker_callback(self, source, condition,
1775
connection, command, *args,
1776
**kwargs)
1777
exitstatus = self.last_checker_status
1778
if exitstatus >= 0:
1324
1779
# Emit D-Bus signal
1325
1780
self.CheckerCompleted(dbus.Int16(exitstatus),
1326
dbus.Int64(condition),
1781
# This is specific to GNU libC
1782
dbus.Int64(exitstatus << 8),
1327
1783
dbus.String(command))
1328
1784
else:
1329
1785
# Emit D-Bus signal
1330
1786
self.CheckerCompleted(dbus.Int16(-1),
1331
dbus.Int64(condition),
1787
dbus.Int64(
1788
# This is specific to GNU libC
1789
(exitstatus << 8)
1790
| self.last_checker_signal),
1332
1791
dbus.String(command))
1333
1334
return Client.checker_callback(self, pid, condition, command,
1335
*args, **kwargs)
1792
return ret
1336
1793
1337
1794
def start_checker(self, *args, **kwargs):
1338
1795
old_checker_pid = getattr(self.checker, "pid", None)
1350
1807
1351
1808
def approve(self, value=True):
1352
1809
self.approved = value
1353
gobject.timeout_add(int(self.approval_duration.total_seconds()
1810
GObject.timeout_add(int(self.approval_duration.total_seconds()
1354
1811
* 1000), self._reset_approved)
1355
1812
self.send_changedstate()
1356
1813
1357
1814
## D-Bus methods, signals & properties
1358
_interface = "se.recompile.Mandos.Client"
1359
1815
1360
1816
## Interfaces
1361
1817
1362
@dbus_interface_annotations(_interface)
1363
def _foo(self):
1364
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1365
"false"}
1366
1367
1818
## Signals
1368
1819
1369
1820
# CheckerCompleted - signal
1379
1830
pass
1380
1831
1381
1832
# PropertyChanged - signal
1833
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1382
1834
@dbus.service.signal(_interface, signature="sv")
1383
1835
def PropertyChanged(self, property, value):
1384
1836
"D-Bus signal"
1418
1870
self.checked_ok()
1419
1871
1420
1872
# Enable - method
1873
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1421
1874
@dbus.service.method(_interface)
1422
1875
def Enable(self):
1423
1876
"D-Bus method"
1424
1877
self.enable()
1425
1878
1426
1879
# StartChecker - method
1880
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1427
1881
@dbus.service.method(_interface)
1428
1882
def StartChecker(self):
1429
1883
"D-Bus method"
1430
1884
self.start_checker()
1431
1885
1432
1886
# Disable - method
1887
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1433
1888
@dbus.service.method(_interface)
1434
1889
def Disable(self):
1435
1890
"D-Bus method"
1436
1891
self.disable()
1437
1892
1438
1893
# StopChecker - method
1894
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1439
1895
@dbus.service.method(_interface)
1440
1896
def StopChecker(self):
1441
1897
self.stop_checker()
1448
1904
return dbus.Boolean(bool(self.approvals_pending))
1449
1905
1450
1906
# ApprovedByDefault - property
1451
@dbus_service_property(_interface, signature="b",
1907
@dbus_service_property(_interface,
1908
signature="b",
1452
1909
access="readwrite")
1453
1910
def ApprovedByDefault_dbus_property(self, value=None):
1454
1911
if value is None: # get
1456
1913
self.approved_by_default = bool(value)
1457
1914
1458
1915
# ApprovalDelay - property
1459
@dbus_service_property(_interface, signature="t",
1916
@dbus_service_property(_interface,
1917
signature="t",
1460
1918
access="readwrite")
1461
1919
def ApprovalDelay_dbus_property(self, value=None):
1462
1920
if value is None: # get
1465
1923
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1466
1924
1467
1925
# ApprovalDuration - property
1468
@dbus_service_property(_interface, signature="t",
1926
@dbus_service_property(_interface,
1927
signature="t",
1469
1928
access="readwrite")
1470
1929
def ApprovalDuration_dbus_property(self, value=None):
1471
1930
if value is None: # get
1474
1933
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1475
1934
1476
1935
# Name - property
1936
@dbus_annotations(
1937
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1477
1938
@dbus_service_property(_interface, signature="s", access="read")
1478
1939
def Name_dbus_property(self):
1479
1940
return dbus.String(self.name)
1480
1941
1481
1942
# Fingerprint - property
1943
@dbus_annotations(
1944
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1482
1945
@dbus_service_property(_interface, signature="s", access="read")
1483
1946
def Fingerprint_dbus_property(self):
1484
1947
return dbus.String(self.fingerprint)
1485
1948
1486
1949
# Host - property
1487
@dbus_service_property(_interface, signature="s",
1950
@dbus_service_property(_interface,
1951
signature="s",
1488
1952
access="readwrite")
1489
1953
def Host_dbus_property(self, value=None):
1490
1954
if value is None: # get
1491
1955
return dbus.String(self.host)
1492
self.host = unicode(value)
1956
self.host = str(value)
1493
1957
1494
1958
# Created - property
1959
@dbus_annotations(
1960
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1495
1961
@dbus_service_property(_interface, signature="s", access="read")
1496
1962
def Created_dbus_property(self):
1497
1963
return datetime_to_dbus(self.created)
1502
1968
return datetime_to_dbus(self.last_enabled)
1503
1969
1504
1970
# Enabled - property
1505
@dbus_service_property(_interface, signature="b",
1971
@dbus_service_property(_interface,
1972
signature="b",
1506
1973
access="readwrite")
1507
1974
def Enabled_dbus_property(self, value=None):
1508
1975
if value is None: # get
1513
1980
self.disable()
1514
1981
1515
1982
# LastCheckedOK - property
1516
@dbus_service_property(_interface, signature="s",
1983
@dbus_service_property(_interface,
1984
signature="s",
1517
1985
access="readwrite")
1518
1986
def LastCheckedOK_dbus_property(self, value=None):
1519
1987
if value is not None:
1522
1990
return datetime_to_dbus(self.last_checked_ok)
1523
1991
1524
1992
# LastCheckerStatus - property
1525
@dbus_service_property(_interface, signature="n",
1526
access="read")
1993
@dbus_service_property(_interface, signature="n", access="read")
1527
1994
def LastCheckerStatus_dbus_property(self):
1528
1995
return dbus.Int16(self.last_checker_status)
1529
1996
1538
2005
return datetime_to_dbus(self.last_approval_request)
1539
2006
1540
2007
# Timeout - property
1541
@dbus_service_property(_interface, signature="t",
2008
@dbus_service_property(_interface,
2009
signature="t",
1542
2010
access="readwrite")
1543
2011
def Timeout_dbus_property(self, value=None):
1544
2012
if value is None: # get
1556
2024
if (getattr(self, "disable_initiator_tag", None)
1557
2025
is None):
1558
2026
return
1559
gobject.source_remove(self.disable_initiator_tag)
1560
self.disable_initiator_tag = (
1561
gobject.timeout_add(
1562
int((self.expires - now).total_seconds()
1563
* 1000), self.disable))
2027
GObject.source_remove(self.disable_initiator_tag)
2028
self.disable_initiator_tag = GObject.timeout_add(
2029
int((self.expires - now).total_seconds() * 1000),
2030
self.disable)
1564
2031
1565
2032
# ExtendedTimeout - property
1566
@dbus_service_property(_interface, signature="t",
2033
@dbus_service_property(_interface,
2034
signature="t",
1567
2035
access="readwrite")
1568
2036
def ExtendedTimeout_dbus_property(self, value=None):
1569
2037
if value is None: # get
1572
2040
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1573
2041
1574
2042
# Interval - property
1575
@dbus_service_property(_interface, signature="t",
2043
@dbus_service_property(_interface,
2044
signature="t",
1576
2045
access="readwrite")
1577
2046
def Interval_dbus_property(self, value=None):
1578
2047
if value is None: # get
1582
2051
return
1583
2052
if self.enabled:
1584
2053
# Reschedule checker run
1585
gobject.source_remove(self.checker_initiator_tag)
1586
self.checker_initiator_tag = (gobject.timeout_add
1587
(value, self.start_checker))
1588
self.start_checker() # Start one now, too
2054
GObject.source_remove(self.checker_initiator_tag)
2055
self.checker_initiator_tag = GObject.timeout_add(
2056
value, self.start_checker)
2057
self.start_checker() # Start one now, too
1589
2058
1590
2059
# Checker - property
1591
@dbus_service_property(_interface, signature="s",
2060
@dbus_service_property(_interface,
2061
signature="s",
1592
2062
access="readwrite")
1593
2063
def Checker_dbus_property(self, value=None):
1594
2064
if value is None: # get
1595
2065
return dbus.String(self.checker_command)
1596
self.checker_command = unicode(value)
2066
self.checker_command = str(value)
1597
2067
1598
2068
# CheckerRunning - property
1599
@dbus_service_property(_interface, signature="b",
2069
@dbus_service_property(_interface,
2070
signature="b",
1600
2071
access="readwrite")
1601
2072
def CheckerRunning_dbus_property(self, value=None):
1602
2073
if value is None: # get
1607
2078
self.stop_checker()
1608
2079
1609
2080
# ObjectPath - property
2081
@dbus_annotations(
2082
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2083
"org.freedesktop.DBus.Deprecated": "true"})
1610
2084
@dbus_service_property(_interface, signature="o", access="read")
1611
2085
def ObjectPath_dbus_property(self):
1612
2086
return self.dbus_object_path # is already a dbus.ObjectPath
1613
2087
1614
2088
# Secret = property
1615
@dbus_service_property(_interface, signature="ay",
1616
access="write", byte_arrays=True)
2089
@dbus_annotations(
2090
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2091
"invalidates"})
2092
@dbus_service_property(_interface,
2093
signature="ay",
2094
access="write",
2095
byte_arrays=True)
1617
2096
def Secret_dbus_property(self, value):
1618
self.secret = str(value)
2097
self.secret = bytes(value)
1619
2098
1620
2099
del _interface
1621
2100
1625
2104
self._pipe = child_pipe
1626
2105
self._pipe.send(('init', fpr, address))
1627
2106
if not self._pipe.recv():
1628
raise KeyError()
2107
raise KeyError(fpr)
1629
2108
1630
2109
def __getattribute__(self, name):
1631
2110
if name == '_pipe':
1635
2114
if data[0] == 'data':
1636
2115
return data[1]
1637
2116
if data[0] == 'function':
2117
1638
2118
def func(*args, **kwargs):
1639
2119
self._pipe.send(('funcall', name, args, kwargs))
1640
2120
return self._pipe.recv()[1]
2121
1641
2122
return func
1642
2123
1643
2124
def __setattr__(self, name, value):
1655
2136
def handle(self):
1656
2137
with contextlib.closing(self.server.child_pipe) as child_pipe:
1657
2138
logger.info("TCP connection from: %s",
1658
unicode(self.client_address))
2139
str(self.client_address))
1659
2140
logger.debug("Pipe FD: %d",
1660
2141
self.server.child_pipe.fileno())
1661
2142
1662
session = (gnutls.connection
1663
.ClientSession(self.request,
1664
gnutls.connection
1665
.X509Credentials()))
1666
1667
# Note: gnutls.connection.X509Credentials is really a
1668
# generic GnuTLS certificate credentials object so long as
1669
# no X.509 keys are added to it. Therefore, we can use it
1670
# here despite using OpenPGP certificates.
2143
session = gnutls.ClientSession(self.request)
1671
2144
1672
2145
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1673
2146
# "+AES-256-CBC", "+SHA1",
1677
2150
priority = self.server.gnutls_priority
1678
2151
if priority is None:
1679
2152
priority = "NORMAL"
1680
(gnutls.library.functions
1681
.gnutls_priority_set_direct(session._c_object,
1682
priority, None))
2153
gnutls.priority_set_direct(session._c_object, priority,
2154
None)
1683
2155
1684
2156
# Start communication using the Mandos protocol
1685
2157
# Get protocol number
1695
2167
# Start GnuTLS connection
1696
2168
try:
1697
2169
session.handshake()
1698
except gnutls.errors.GNUTLSError as error:
2170
except gnutls.Error as error:
1699
2171
logger.warning("Handshake failed: %s", error)
1700
2172
# Do not run session.bye() here: the session is not
1701
2173
# established. Just abandon the request.
1705
2177
approval_required = False
1706
2178
try:
1707
2179
try:
1708
fpr = self.fingerprint(self.peer_certificate
1709
(session))
1710
except (TypeError,
1711
gnutls.errors.GNUTLSError) as error:
2180
fpr = self.fingerprint(
2181
self.peer_certificate(session))
2182
except (TypeError, gnutls.Error) as error:
1712
2183
logger.warning("Bad certificate: %s", error)
1713
2184
return
1714
2185
logger.debug("Fingerprint: %s", fpr)
1727
2198
while True:
1728
2199
if not client.enabled:
1729
2200
logger.info("Client %s is disabled",
1730
client.name)
2201
client.name)
1731
2202
if self.server.use_dbus:
1732
2203
# Emit D-Bus signal
1733
2204
client.Rejected("Disabled")
1772
2243
else:
1773
2244
delay -= time2 - time
1774
2245
1775
sent_size = 0
1776
while sent_size < len(client.secret):
1777
try:
1778
sent = session.send(client.secret[sent_size:])
1779
except gnutls.errors.GNUTLSError as error:
1780
logger.warning("gnutls send failed",
1781
exc_info=error)
1782
return
1783
logger.debug("Sent: %d, remaining: %d",
1784
sent, len(client.secret)
1785
- (sent_size + sent))
1786
sent_size += sent
2246
try:
2247
session.send(client.secret)
2248
except gnutls.Error as error:
2249
logger.warning("gnutls send failed",
2250
exc_info = error)
2251
return
1787
2252
1788
2253
logger.info("Sending secret to %s", client.name)
1789
2254
# bump the timeout using extended_timeout
1797
2262
client.approvals_pending -= 1
1798
2263
try:
1799
2264
session.bye()
1800
except gnutls.errors.GNUTLSError as error:
2265
except gnutls.Error as error:
1801
2266
logger.warning("GnuTLS bye failed",
1802
2267
exc_info=error)
1803
2268
1805
2270
def peer_certificate(session):
1806
2271
"Return the peer's OpenPGP certificate as a bytestring"
1807
2272
# If not an OpenPGP certificate...
1808
if (gnutls.library.functions
1809
.gnutls_certificate_type_get(session._c_object)
1810
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1811
# ...do the normal thing
1812
return session.peer_certificate
2273
if (gnutls.certificate_type_get(session._c_object)
2274
!= gnutls.CRT_OPENPGP):
2275
# ...return invalid data
2276
return b""
1813
2277
list_size = ctypes.c_uint(1)
1814
cert_list = (gnutls.library.functions
1815
.gnutls_certificate_get_peers
2278
cert_list = (gnutls.certificate_get_peers
1816
2279
(session._c_object, ctypes.byref(list_size)))
1817
2280
if not bool(cert_list) and list_size.value != 0:
1818
raise gnutls.errors.GNUTLSError("error getting peer"
1819
" certificate")
2281
raise gnutls.Error("error getting peer certificate")
1820
2282
if list_size.value == 0:
1821
2283
return None
1822
2284
cert = cert_list[0]
1826
2288
def fingerprint(openpgp):
1827
2289
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1828
2290
# New GnuTLS "datum" with the OpenPGP public key
1829
datum = (gnutls.library.types
1830
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1831
ctypes.POINTER
1832
(ctypes.c_ubyte)),
1833
ctypes.c_uint(len(openpgp))))
2291
datum = gnutls.datum_t(
2292
ctypes.cast(ctypes.c_char_p(openpgp),
2293
ctypes.POINTER(ctypes.c_ubyte)),
2294
ctypes.c_uint(len(openpgp)))
1834
2295
# New empty GnuTLS certificate
1835
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1836
(gnutls.library.functions
1837
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2296
crt = gnutls.openpgp_crt_t()
2297
gnutls.openpgp_crt_init(ctypes.byref(crt))
1838
2298
# Import the OpenPGP public key into the certificate
1839
(gnutls.library.functions
1840
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1841
gnutls.library.constants
1842
.GNUTLS_OPENPGP_FMT_RAW))
2299
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2300
gnutls.OPENPGP_FMT_RAW)
1843
2301
# Verify the self signature in the key
1844
2302
crtverify = ctypes.c_uint()
1845
(gnutls.library.functions
1846
.gnutls_openpgp_crt_verify_self(crt, 0,
1847
ctypes.byref(crtverify)))
2303
gnutls.openpgp_crt_verify_self(crt, 0,
2304
ctypes.byref(crtverify))
1848
2305
if crtverify.value != 0:
1849
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1850
raise (gnutls.errors.CertificateSecurityError
1851
("Verify failed"))
2306
gnutls.openpgp_crt_deinit(crt)
2307
raise gnutls.CertificateSecurityError("Verify failed")
1852
2308
# New buffer for the fingerprint
1853
2309
buf = ctypes.create_string_buffer(20)
1854
2310
buf_len = ctypes.c_size_t()
1855
2311
# Get the fingerprint from the certificate into the buffer
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1858
ctypes.byref(buf_len)))
2312
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2313
ctypes.byref(buf_len))
1859
2314
# Deinit the certificate
1860
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2315
gnutls.openpgp_crt_deinit(crt)
1861
2316
# Convert the buffer to a Python bytestring
1862
2317
fpr = ctypes.string_at(buf, buf_len.value)
1863
2318
# Convert the bytestring to hexadecimal notation
1867
2322
1868
2323
class MultiprocessingMixIn(object):
1869
2324
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2325
1870
2326
def sub_process_main(self, request, address):
1871
2327
try:
1872
2328
self.finish_request(request, address)
1884
2340
1885
2341
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1886
2342
""" adds a pipe to the MixIn """
2343
1887
2344
def process_request(self, request, client_address):
1888
2345
"""Overrides and wraps the original process_request().
1889
2346
1910
2367
interface: None or a network interface name (string)
1911
2368
use_ipv6: Boolean; to use IPv6 or not
1912
2369
"""
2370
1913
2371
def __init__(self, server_address, RequestHandlerClass,
1914
interface=None, use_ipv6=True, socketfd=None):
2372
interface=None,
2373
use_ipv6=True,
2374
socketfd=None):
1915
2375
"""If socketfd is set, use that file descriptor instead of
1916
2376
creating a new one with socket.socket().
1917
2377
"""
1958
2418
self.interface)
1959
2419
else:
1960
2420
try:
1961
self.socket.setsockopt(socket.SOL_SOCKET,
1962
SO_BINDTODEVICE,
1963
str(self.interface + '\0'))
2421
self.socket.setsockopt(
2422
socket.SOL_SOCKET, SO_BINDTODEVICE,
2423
(self.interface + "\0").encode("utf-8"))
1964
2424
except socket.error as error:
1965
2425
if error.errno == errno.EPERM:
1966
2426
logger.error("No permission to bind to"
1984
2444
self.server_address = (any_address,
1985
2445
self.server_address[1])
1986
2446
elif not self.server_address[1]:
1987
self.server_address = (self.server_address[0],
1988
0)
2447
self.server_address = (self.server_address[0], 0)
1989
2448
# if self.interface:
1990
2449
# self.server_address = (self.server_address[0],
1991
2450
# 0, # port
2003
2462
gnutls_priority GnuTLS priority string
2004
2463
use_dbus: Boolean; to emit D-Bus signals or not
2005
2464
2006
Assumes a gobject.MainLoop event loop.
2465
Assumes a GObject.MainLoop event loop.
2007
2466
"""
2467
2008
2468
def __init__(self, server_address, RequestHandlerClass,
2009
interface=None, use_ipv6=True, clients=None,
2010
gnutls_priority=None, use_dbus=True, socketfd=None):
2469
interface=None,
2470
use_ipv6=True,
2471
clients=None,
2472
gnutls_priority=None,
2473
use_dbus=True,
2474
socketfd=None):
2011
2475
self.enabled = False
2012
2476
self.clients = clients
2013
2477
if self.clients is None:
2019
2483
interface = interface,
2020
2484
use_ipv6 = use_ipv6,
2021
2485
socketfd = socketfd)
2486
2022
2487
def server_activate(self):
2023
2488
if self.enabled:
2024
2489
return socketserver.TCPServer.server_activate(self)
2028
2493
2029
2494
def add_pipe(self, parent_pipe, proc):
2030
2495
# Call "handle_ipc" for both data and EOF events
2031
gobject.io_add_watch(parent_pipe.fileno(),
2032
gobject.IO_IN | gobject.IO_HUP,
2033
functools.partial(self.handle_ipc,
2034
parent_pipe =
2035
parent_pipe,
2036
proc = proc))
2496
GObject.io_add_watch(
2497
parent_pipe.fileno(),
2498
GObject.IO_IN | GObject.IO_HUP,
2499
functools.partial(self.handle_ipc,
2500
parent_pipe = parent_pipe,
2501
proc = proc))
2037
2502
2038
def handle_ipc(self, source, condition, parent_pipe=None,
2039
proc = None, client_object=None):
2503
def handle_ipc(self, source, condition,
2504
parent_pipe=None,
2505
proc = None,
2506
client_object=None):
2040
2507
# error, or the other end of multiprocessing.Pipe has closed
2041
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2508
if condition & (GObject.IO_ERR | GObject.IO_HUP):
2042
2509
# Wait for other process to exit
2043
2510
proc.join()
2044
2511
return False
2065
2532
parent_pipe.send(False)
2066
2533
return False
2067
2534
2068
gobject.io_add_watch(parent_pipe.fileno(),
2069
gobject.IO_IN | gobject.IO_HUP,
2070
functools.partial(self.handle_ipc,
2071
parent_pipe =
2072
parent_pipe,
2073
proc = proc,
2074
client_object =
2075
client))
2535
GObject.io_add_watch(
2536
parent_pipe.fileno(),
2537
GObject.IO_IN | GObject.IO_HUP,
2538
functools.partial(self.handle_ipc,
2539
parent_pipe = parent_pipe,
2540
proc = proc,
2541
client_object = client))
2076
2542
parent_pipe.send(True)
2077
2543
# remove the old hook in favor of the new above hook on
2078
2544
# same fileno
2084
2550
2085
2551
parent_pipe.send(('data', getattr(client_object,
2086
2552
funcname)(*args,
2087
**kwargs)))
2553
**kwargs)))
2088
2554
2089
2555
if command == 'getattr':
2090
2556
attrname = request[1]
2091
if callable(client_object.__getattribute__(attrname)):
2092
parent_pipe.send(('function',))
2557
if isinstance(client_object.__getattribute__(attrname),
2558
collections.Callable):
2559
parent_pipe.send(('function', ))
2093
2560
else:
2094
parent_pipe.send(('data', client_object
2095
.__getattribute__(attrname)))
2561
parent_pipe.send((
2562
'data', client_object.__getattribute__(attrname)))
2096
2563
2097
2564
if command == 'setattr':
2098
2565
attrname = request[1]
2129
2596
# avoid excessive use of external libraries.
2130
2597
2131
2598
# New type for defining tokens, syntax, and semantics all-in-one
2132
Token = collections.namedtuple("Token",
2133
("regexp", # To match token; if
2134
# "value" is not None,
2135
# must have a "group"
2136
# containing digits
2137
"value", # datetime.timedelta or
2138
# None
2139
"followers")) # Tokens valid after
2140
# this token
2599
Token = collections.namedtuple("Token", (
2600
"regexp", # To match token; if "value" is not None, must have
2601
# a "group" containing digits
2602
"value", # datetime.timedelta or None
2603
"followers")) # Tokens valid after this token
2141
2604
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2142
2605
# the "duration" ABNF definition in RFC 3339, Appendix A.
2143
2606
token_end = Token(re.compile(r"$"), None, frozenset())
2144
2607
token_second = Token(re.compile(r"(\d+)S"),
2145
2608
datetime.timedelta(seconds=1),
2146
frozenset((token_end,)))
2609
frozenset((token_end, )))
2147
2610
token_minute = Token(re.compile(r"(\d+)M"),
2148
2611
datetime.timedelta(minutes=1),
2149
2612
frozenset((token_second, token_end)))
2165
2628
frozenset((token_month, token_end)))
2166
2629
token_week = Token(re.compile(r"(\d+)W"),
2167
2630
datetime.timedelta(weeks=1),
2168
frozenset((token_end,)))
2631
frozenset((token_end, )))
2169
2632
token_duration = Token(re.compile(r"P"), None,
2170
2633
frozenset((token_year, token_month,
2171
2634
token_day, token_time,
2173
2636
# Define starting values
2174
2637
value = datetime.timedelta() # Value so far
2175
2638
found_token = None
2176
followers = frozenset((token_duration,)) # Following valid tokens
2639
followers = frozenset((token_duration, )) # Following valid tokens
2177
2640
s = duration # String left to parse
2178
2641
# Loop until end token is found
2179
2642
while found_token is not token_end:
2196
2659
break
2197
2660
else:
2198
2661
# No currently valid tokens were found
2199
raise ValueError("Invalid RFC 3339 duration")
2662
raise ValueError("Invalid RFC 3339 duration: {!r}"
2663
.format(duration))
2200
2664
# End token found
2201
2665
return value
2202
2666
2226
2690
timevalue = datetime.timedelta(0)
2227
2691
for s in interval.split():
2228
2692
try:
2229
suffix = unicode(s[-1])
2693
suffix = s[-1]
2230
2694
value = int(s[:-1])
2231
2695
if suffix == "d":
2232
2696
delta = datetime.timedelta(value)
2239
2703
elif suffix == "w":
2240
2704
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2241
2705
else:
2242
raise ValueError("Unknown suffix {!r}"
2243
.format(suffix))
2706
raise ValueError("Unknown suffix {!r}".format(suffix))
2244
2707
except IndexError as e:
2245
2708
raise ValueError(*(e.args))
2246
2709
timevalue += delta
2262
2725
# Close all standard open file descriptors
2263
2726
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2264
2727
if not stat.S_ISCHR(os.fstat(null).st_mode):
2265
raise OSError(errno.ENODEV, "{} not a character device"
2728
raise OSError(errno.ENODEV,
2729
"{} not a character device"
2266
2730
.format(os.devnull))
2267
2731
os.dup2(null, sys.stdin.fileno())
2268
2732
os.dup2(null, sys.stdout.fileno())
2334
2798
"port": "",
2335
2799
"debug": "False",
2336
2800
"priority":
2337
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2801
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2802
":+SIGN-DSA-SHA256",
2338
2803
"servicename": "Mandos",
2339
2804
"use_dbus": "True",
2340
2805
"use_ipv6": "True",
2344
2809
"statedir": "/var/lib/mandos",
2345
2810
"foreground": "False",
2346
2811
"zeroconf": "True",
2347
}
2812
}
2348
2813
2349
2814
# Parse config file for server-global settings
2350
2815
server_config = configparser.SafeConfigParser(server_defaults)
2351
2816
del server_defaults
2352
server_config.read(os.path.join(options.configdir,
2353
"mandos.conf"))
2817
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2354
2818
# Convert the SafeConfigParser object to a dict
2355
2819
server_settings = server_config.defaults()
2356
2820
# Use the appropriate methods on the non-string config options
2374
2838
# Override the settings from the config file with command line
2375
2839
# options, if set.
2376
2840
for option in ("interface", "address", "port", "debug",
2377
"priority", "servicename", "configdir",
2378
"use_dbus", "use_ipv6", "debuglevel", "restore",
2379
"statedir", "socket", "foreground", "zeroconf"):
2841
"priority", "servicename", "configdir", "use_dbus",
2842
"use_ipv6", "debuglevel", "restore", "statedir",
2843
"socket", "foreground", "zeroconf"):
2380
2844
value = getattr(options, option)
2381
2845
if value is not None:
2382
2846
server_settings[option] = value
2383
2847
del options
2384
2848
# Force all strings to be unicode
2385
2849
for option in server_settings.keys():
2386
if type(server_settings[option]) is str:
2387
server_settings[option] = unicode(server_settings[option])
2850
if isinstance(server_settings[option], bytes):
2851
server_settings[option] = (server_settings[option]
2852
.decode("utf-8"))
2388
2853
# Force all boolean options to be boolean
2389
2854
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2390
2855
"foreground", "zeroconf"):
2396
2861
2397
2862
##################################################################
2398
2863
2399
if (not server_settings["zeroconf"] and
2400
not (server_settings["port"]
2401
or server_settings["socket"] != "")):
2402
parser.error("Needs port or socket to work without"
2403
" Zeroconf")
2864
if (not server_settings["zeroconf"]
2865
and not (server_settings["port"]
2866
or server_settings["socket"] != "")):
2867
parser.error("Needs port or socket to work without Zeroconf")
2404
2868
2405
2869
# For convenience
2406
2870
debug = server_settings["debug"]
2422
2886
initlogger(debug, level)
2423
2887
2424
2888
if server_settings["servicename"] != "Mandos":
2425
syslogger.setFormatter(logging.Formatter
2426
('Mandos ({}) [%(process)d]:'
2427
' %(levelname)s: %(message)s'
2428
.format(server_settings
2429
["servicename"])))
2889
syslogger.setFormatter(
2890
logging.Formatter('Mandos ({}) [%(process)d]:'
2891
' %(levelname)s: %(message)s'.format(
2892
server_settings["servicename"])))
2430
2893
2431
2894
# Parse config file with clients
2432
2895
client_config = configparser.SafeConfigParser(Client
2440
2903
socketfd = None
2441
2904
if server_settings["socket"] != "":
2442
2905
socketfd = server_settings["socket"]
2443
tcp_server = MandosServer((server_settings["address"],
2444
server_settings["port"]),
2445
ClientHandler,
2446
interface=(server_settings["interface"]
2447
or None),
2448
use_ipv6=use_ipv6,
2449
gnutls_priority=
2450
server_settings["priority"],
2451
use_dbus=use_dbus,
2452
socketfd=socketfd)
2906
tcp_server = MandosServer(
2907
(server_settings["address"], server_settings["port"]),
2908
ClientHandler,
2909
interface=(server_settings["interface"] or None),
2910
use_ipv6=use_ipv6,
2911
gnutls_priority=server_settings["priority"],
2912
use_dbus=use_dbus,
2913
socketfd=socketfd)
2453
2914
if not foreground:
2454
2915
pidfilename = "/run/mandos.pid"
2455
2916
if not os.path.isdir("/run/."):
2456
2917
pidfilename = "/var/run/mandos.pid"
2457
2918
pidfile = None
2458
2919
try:
2459
pidfile = open(pidfilename, "w")
2920
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2460
2921
except IOError as e:
2461
2922
logger.error("Could not open file %r", pidfilename,
2462
2923
exc_info=e)
2463
2924
2464
for name in ("_mandos", "mandos", "nobody"):
2925
for name, group in (("_mandos", "_mandos"),
2926
("mandos", "mandos"),
2927
("nobody", "nogroup")):
2465
2928
try:
2466
2929
uid = pwd.getpwnam(name).pw_uid
2467
gid = pwd.getpwnam(name).pw_gid
2930
gid = pwd.getpwnam(group).pw_gid
2468
2931
break
2469
2932
except KeyError:
2470
2933
continue
2474
2937
try:
2475
2938
os.setgid(gid)
2476
2939
os.setuid(uid)
2940
if debug:
2941
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2942
gid))
2477
2943
except OSError as error:
2944
logger.warning("Failed to setuid/setgid to {}:{}: {}"
2945
.format(uid, gid, os.strerror(error.errno)))
2478
2946
if error.errno != errno.EPERM:
2479
2947
raise
2480
2948
2483
2951
2484
2952
# "Use a log level over 10 to enable all debugging options."
2485
2953
# - GnuTLS manual
2486
gnutls.library.functions.gnutls_global_set_log_level(11)
2954
gnutls.global_set_log_level(11)
2487
2955
2488
@gnutls.library.types.gnutls_log_func
2956
@gnutls.log_func
2489
2957
def debug_gnutls(level, string):
2490
2958
logger.debug("GnuTLS: %s", string[:-1])
2491
2959
2492
(gnutls.library.functions
2493
.gnutls_global_set_log_function(debug_gnutls))
2960
gnutls.global_set_log_function(debug_gnutls)
2494
2961
2495
2962
# Redirect stdin so all checkers get /dev/null
2496
2963
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2503
2970
# Close all input and output, do double fork, etc.
2504
2971
daemon()
2505
2972
2506
# multiprocessing will use threads, so before we use gobject we
2507
# need to inform gobject that threads will be used.
2508
gobject.threads_init()
2973
# multiprocessing will use threads, so before we use GObject we
2974
# need to inform GObject that threads will be used.
2975
GObject.threads_init()
2509
2976
2510
2977
global main_loop
2511
2978
# From the Avahi example code
2512
2979
DBusGMainLoop(set_as_default=True)
2513
main_loop = gobject.MainLoop()
2980
main_loop = GObject.MainLoop()
2514
2981
bus = dbus.SystemBus()
2515
2982
# End of Avahi example code
2516
2983
if use_dbus:
2517
2984
try:
2518
2985
bus_name = dbus.service.BusName("se.recompile.Mandos",
2519
bus, do_not_queue=True)
2520
old_bus_name = (dbus.service.BusName
2521
("se.bsnet.fukt.Mandos", bus,
2522
do_not_queue=True))
2523
except dbus.exceptions.NameExistsException as e:
2986
bus,
2987
do_not_queue=True)
2988
old_bus_name = dbus.service.BusName(
2989
"se.bsnet.fukt.Mandos", bus,
2990
do_not_queue=True)
2991
except dbus.exceptions.DBusException as e:
2524
2992
logger.error("Disabling D-Bus:", exc_info=e)
2525
2993
use_dbus = False
2526
2994
server_settings["use_dbus"] = False
2527
2995
tcp_server.use_dbus = False
2528
2996
if zeroconf:
2529
2997
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2530
service = AvahiServiceToSyslog(name =
2531
server_settings["servicename"],
2532
servicetype = "_mandos._tcp",
2533
protocol = protocol, bus = bus)
2998
service = AvahiServiceToSyslog(
2999
name = server_settings["servicename"],
3000
servicetype = "_mandos._tcp",
3001
protocol = protocol,
3002
bus = bus)
2534
3003
if server_settings["interface"]:
2535
service.interface = (if_nametoindex
2536
(str(server_settings["interface"])))
3004
service.interface = if_nametoindex(
3005
server_settings["interface"].encode("utf-8"))
2537
3006
2538
3007
global multiprocessing_manager
2539
3008
multiprocessing_manager = multiprocessing.Manager()
2558
3027
if server_settings["restore"]:
2559
3028
try:
2560
3029
with open(stored_state_path, "rb") as stored_state:
2561
clients_data, old_client_settings = (pickle.load
2562
(stored_state))
3030
clients_data, old_client_settings = pickle.load(
3031
stored_state)
2563
3032
os.remove(stored_state_path)
2564
3033
except IOError as e:
2565
3034
if e.errno == errno.ENOENT:
2566
logger.warning("Could not load persistent state: {}"
2567
.format(os.strerror(e.errno)))
3035
logger.warning("Could not load persistent state:"
3036
" {}".format(os.strerror(e.errno)))
2568
3037
else:
2569
3038
logger.critical("Could not load persistent state:",
2570
3039
exc_info=e)
2571
3040
raise
2572
3041
except EOFError as e:
2573
3042
logger.warning("Could not load persistent state: "
2574
"EOFError:", exc_info=e)
3043
"EOFError:",
3044
exc_info=e)
2575
3045
2576
3046
with PGPEngine() as pgp:
2577
3047
for client_name, client in clients_data.items():
2589
3059
# For each value in new config, check if it
2590
3060
# differs from the old config value (Except for
2591
3061
# the "secret" attribute)
2592
if (name != "secret" and
2593
value != old_client_settings[client_name]
2594
[name]):
3062
if (name != "secret"
3063
and (value !=
3064
old_client_settings[client_name][name])):
2595
3065
client[name] = value
2596
3066
except KeyError:
2597
3067
pass
2598
3068
2599
3069
# Clients who has passed its expire date can still be
2600
# enabled if its last checker was successful. Clients
3070
# enabled if its last checker was successful. A Client
2601
3071
# whose checker succeeded before we stored its state is
2602
3072
# assumed to have successfully run all checkers during
2603
3073
# downtime.
2606
3076
if not client["last_checked_ok"]:
2607
3077
logger.warning(
2608
3078
"disabling client {} - Client never "
2609
"performed a successful checker"
2610
.format(client_name))
3079
"performed a successful checker".format(
3080
client_name))
2611
3081
client["enabled"] = False
2612
3082
elif client["last_checker_status"] != 0:
2613
3083
logger.warning(
2614
3084
"disabling client {} - Client last"
2615
" checker failed with error code {}"
2616
.format(client_name,
2617
client["last_checker_status"]))
3085
" checker failed with error code"
3086
" {}".format(
3087
client_name,
3088
client["last_checker_status"]))
2618
3089
client["enabled"] = False
2619
3090
else:
2620
client["expires"] = (datetime.datetime
2621
.utcnow()
2622
+ client["timeout"])
3091
client["expires"] = (
3092
datetime.datetime.utcnow()
3093
+ client["timeout"])
2623
3094
logger.debug("Last checker succeeded,"
2624
" keeping {} enabled"
2625
.format(client_name))
3095
" keeping {} enabled".format(
3096
client_name))
2626
3097
try:
2627
client["secret"] = (
2628
pgp.decrypt(client["encrypted_secret"],
2629
client_settings[client_name]
2630
["secret"]))
3098
client["secret"] = pgp.decrypt(
3099
client["encrypted_secret"],
3100
client_settings[client_name]["secret"])
2631
3101
except PGPError:
2632
3102
# If decryption fails, we use secret from new settings
2633
logger.debug("Failed to decrypt {} old secret"
2634
.format(client_name))
2635
client["secret"] = (
2636
client_settings[client_name]["secret"])
3103
logger.debug("Failed to decrypt {} old secret".format(
3104
client_name))
3105
client["secret"] = (client_settings[client_name]
3106
["secret"])
2637
3107
2638
3108
# Add/remove clients based on new changes made to config
2639
3109
for client_name in (set(old_client_settings)
2646
3116
# Create all client objects
2647
3117
for client_name, client in clients_data.items():
2648
3118
tcp_server.clients[client_name] = client_class(
2649
name = client_name, settings = client,
3119
name = client_name,
3120
settings = client,
2650
3121
server_settings = server_settings)
2651
3122
2652
3123
if not tcp_server.clients:
2654
3125
2655
3126
if not foreground:
2656
3127
if pidfile is not None:
3128
pid = os.getpid()
2657
3129
try:
2658
3130
with pidfile:
2659
pid = os.getpid()
2660
pidfile.write(str(pid) + "\n".encode("utf-8"))
3131
print(pid, file=pidfile)
2661
3132
except IOError:
2662
3133
logger.error("Could not write to file %r with PID %d",
2663
3134
pidfilename, pid)
2668
3139
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2669
3140
2670
3141
if use_dbus:
2671
@alternate_dbus_interfaces({"se.recompile.Mandos":
2672
"se.bsnet.fukt.Mandos"})
2673
class MandosDBusService(DBusObjectWithProperties):
3142
3143
@alternate_dbus_interfaces(
3144
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3145
class MandosDBusService(DBusObjectWithObjectManager):
2674
3146
"""A D-Bus proxy object"""
3147
2675
3148
def __init__(self):
2676
3149
dbus.service.Object.__init__(self, bus, "/")
3150
2677
3151
_interface = "se.recompile.Mandos"
2678
3152
2679
@dbus_interface_annotations(_interface)
2680
def _foo(self):
2681
return { "org.freedesktop.DBus.Property"
2682
".EmitsChangedSignal":
2683
"false"}
2684
2685
3153
@dbus.service.signal(_interface, signature="o")
2686
3154
def ClientAdded(self, objpath):
2687
3155
"D-Bus signal"
2692
3160
"D-Bus signal"
2693
3161
pass
2694
3162
3163
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3164
"true"})
2695
3165
@dbus.service.signal(_interface, signature="os")
2696
3166
def ClientRemoved(self, objpath, name):
2697
3167
"D-Bus signal"
2698
3168
pass
2699
3169
3170
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3171
"true"})
2700
3172
@dbus.service.method(_interface, out_signature="ao")
2701
3173
def GetAllClients(self):
2702
3174
"D-Bus method"
2703
return dbus.Array(c.dbus_object_path
2704
for c in
3175
return dbus.Array(c.dbus_object_path for c in
2705
3176
tcp_server.clients.itervalues())
2706
3177
3178
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3179
"true"})
2707
3180
@dbus.service.method(_interface,
2708
3181
out_signature="a{oa{sv}}")
2709
3182
def GetAllClientsWithProperties(self):
2710
3183
"D-Bus method"
2711
3184
return dbus.Dictionary(
2712
((c.dbus_object_path, c.GetAll(""))
2713
for c in tcp_server.clients.itervalues()),
3185
{ c.dbus_object_path: c.GetAll(
3186
"se.recompile.Mandos.Client")
3187
for c in tcp_server.clients.itervalues() },
2714
3188
signature="oa{sv}")
2715
3189
2716
3190
@dbus.service.method(_interface, in_signature="o")
2720
3194
if c.dbus_object_path == object_path:
2721
3195
del tcp_server.clients[c.name]
2722
3196
c.remove_from_connection()
2723
# Don't signal anything except ClientRemoved
3197
# Don't signal the disabling
2724
3198
c.disable(quiet=True)
2725
# Emit D-Bus signal
2726
self.ClientRemoved(object_path, c.name)
3199
# Emit D-Bus signal for removal
3200
self.client_removed_signal(c)
2727
3201
return
2728
3202
raise KeyError(object_path)
2729
3203
2730
3204
del _interface
3205
3206
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3207
out_signature = "a{oa{sa{sv}}}")
3208
def GetManagedObjects(self):
3209
"""D-Bus method"""
3210
return dbus.Dictionary(
3211
{ client.dbus_object_path:
3212
dbus.Dictionary(
3213
{ interface: client.GetAll(interface)
3214
for interface in
3215
client._get_all_interface_names()})
3216
for client in tcp_server.clients.values()})
3217
3218
def client_added_signal(self, client):
3219
"""Send the new standard signal and the old signal"""
3220
if use_dbus:
3221
# New standard signal
3222
self.InterfacesAdded(
3223
client.dbus_object_path,
3224
dbus.Dictionary(
3225
{ interface: client.GetAll(interface)
3226
for interface in
3227
client._get_all_interface_names()}))
3228
# Old signal
3229
self.ClientAdded(client.dbus_object_path)
3230
3231
def client_removed_signal(self, client):
3232
"""Send the new standard signal and the old signal"""
3233
if use_dbus:
3234
# New standard signal
3235
self.InterfacesRemoved(
3236
client.dbus_object_path,
3237
client._get_all_interface_names())
3238
# Old signal
3239
self.ClientRemoved(client.dbus_object_path,
3240
client.name)
2731
3241
2732
3242
mandos_dbus_service = MandosDBusService()
2733
3243
2756
3266
# + secret.
2757
3267
exclude = { "bus", "changedstate", "secret",
2758
3268
"checker", "server_settings" }
2759
for name, typ in (inspect.getmembers
2760
(dbus.service.Object)):
3269
for name, typ in inspect.getmembers(dbus.service
3270
.Object):
2761
3271
exclude.add(name)
2762
3272
2763
3273
client_dict["encrypted_secret"] = (client
2770
3280
del client_settings[client.name]["secret"]
2771
3281
2772
3282
try:
2773
with (tempfile.NamedTemporaryFile
2774
(mode='wb', suffix=".pickle", prefix='clients-',
2775
dir=os.path.dirname(stored_state_path),
2776
delete=False)) as stored_state:
3283
with tempfile.NamedTemporaryFile(
3284
mode='wb',
3285
suffix=".pickle",
3286
prefix='clients-',
3287
dir=os.path.dirname(stored_state_path),
3288
delete=False) as stored_state:
2777
3289
pickle.dump((clients, client_settings), stored_state)
2778
tempname=stored_state.name
3290
tempname = stored_state.name
2779
3291
os.rename(tempname, stored_state_path)
2780
3292
except (IOError, OSError) as e:
2781
3293
if not debug:
2796
3308
name, client = tcp_server.clients.popitem()
2797
3309
if use_dbus:
2798
3310
client.remove_from_connection()
2799
# Don't signal anything except ClientRemoved
3311
# Don't signal the disabling
2800
3312
client.disable(quiet=True)
3313
# Emit D-Bus signal for removal
2801
3314
if use_dbus:
2802
# Emit D-Bus signal
2803
mandos_dbus_service.ClientRemoved(client
2804
.dbus_object_path,
2805
client.name)
3315
mandos_dbus_service.client_removed_signal(client)
2806
3316
client_settings.clear()
2807
3317
2808
3318
atexit.register(cleanup)
2809
3319
2810
3320
for client in tcp_server.clients.itervalues():
2811
3321
if use_dbus:
2812
# Emit D-Bus signal
2813
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3322
# Emit D-Bus signal for adding
3323
mandos_dbus_service.client_added_signal(client)
2814
3324
# Need to initiate checking of clients
2815
3325
if client.enabled:
2816
3326
client.init_checker()
2842
3352
sys.exit(1)
2843
3353
# End of Avahi example code
2844
3354
2845
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
3355
GObject.io_add_watch(tcp_server.fileno(), GObject.IO_IN,
2846
3356
lambda *args, **kwargs:
2847
3357
(tcp_server.handle_request
2848
3358
(*args[2:], **kwargs) or True))
2861
3371
# Must run before the D-Bus bus name gets deregistered
2862
3372
cleanup()
2863
3373
3374
2864
3375
if __name__ == '__main__':
2865
3376
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0