To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 237.7.329
- compare with another revision
- download diff
- download tarball
- view history from revision 237.7.329
- Committer: Teddy Hogeborn
- Date: 2015-08-02 16:45:29 UTC
- mto: (237.7.594 trunk)
- mto: This revision was merged to the branch mainline in revision 325.
- Revision ID: teddy@recompile.se-20150802164529-pemtk1agiqluoiua
Deprecate some D-Bus methods in favor of D-Bus properties.
The following D-Bus methods on the interface
"se.recompile.Mandos.Client" are redundant, and are therefore
deprecated: "Disable", "Enable", "StartChecker", and "StopChecker".
Instead, the D-Bus properties "Enabled" and "CheckerRunning" should be
set, as was always also possible.
* DBUS-API (se.recompile.Mandos.Client.Disable): Remove; deprecated.
(se.recompile.Mandos.Client.Enable): - '' -
(se.recompile.Mandos.Client.StartChecker): - '' -
(se.recompile.Mandos.Client.StopChecker): - '' -
* mandos (ClientDBus.Enable): Annotate as deprecated.
(ClientDBus.StartChecker): - '' -
(ClientDBus.Disable): - '' -
(ClientDBus.StopChecker): - '' -
* mandos-monitor (MandosClientWidget.keypress): Set properties instead
of calling deprecated
methods.
The following D-Bus methods on the interface
"se.recompile.Mandos.Client" are redundant, and are therefore
deprecated: "Disable", "Enable", "StartChecker", and "StopChecker".
Instead, the D-Bus properties "Enabled" and "CheckerRunning" should be
set, as was always also possible.
* DBUS-API (se.recompile.Mandos.Client.Disable): Remove; deprecated.
(se.recompile.Mandos.Client.Enable): - '' -
(se.recompile.Mandos.Client.StartChecker): - '' -
(se.recompile.Mandos.Client.StopChecker): - '' -
* mandos (ClientDBus.Enable): Annotate as deprecated.
(ClientDBus.StartChecker): - '' -
(ClientDBus.Disable): - '' -
(ClientDBus.StopChecker): - '' -
* mandos-monitor (MandosClientWidget.keypress): Set properties instead
of calling deprecated
methods.
- files added:
- debian/mandos-client.examples
- debian/upstream
- plugin-helpers
- files modified:
- .bzrignore
added
removed
mandos
1
#!/usr/bin/python
1
#!/usr/bin/python2.7
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-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
14
# Copyright © 2008-2015 Teddy Hogeborn
15
# Copyright © 2008-2015 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
34
34
from __future__ import (division, absolute_import, print_function,
35
35
unicode_literals)
36
36
37
import SocketServer as socketserver
37
from future_builtins import *
38
39
try:
40
import SocketServer as socketserver
41
except ImportError:
42
import socketserver
38
43
import socket
39
44
import argparse
40
45
import datetime
45
50
import gnutls.library.functions
46
51
import gnutls.library.constants
47
52
import gnutls.library.types
48
import ConfigParser as configparser
53
try:
54
import ConfigParser as configparser
55
except ImportError:
56
import configparser
49
57
import sys
50
58
import re
51
59
import os
60
68
import struct
61
69
import fcntl
62
70
import functools
63
import cPickle as pickle
71
try:
72
import cPickle as pickle
73
except ImportError:
74
import pickle
64
75
import multiprocessing
65
76
import types
66
77
import binascii
67
78
import tempfile
68
79
import itertools
80
import collections
81
import codecs
69
82
70
83
import dbus
71
84
import dbus.service
72
import gobject
85
try:
86
import gobject
87
except ImportError:
88
from gi.repository import GObject as gobject
73
89
import avahi
74
90
from dbus.mainloop.glib import DBusGMainLoop
75
91
import ctypes
76
92
import ctypes.util
77
93
import xml.dom.minidom
78
94
import inspect
79
import GnuPGInterface
80
95
81
96
try:
82
97
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
86
101
except ImportError:
87
102
SO_BINDTODEVICE = None
88
103
89
version = "1.5.3"
104
if sys.version_info.major == 2:
105
str = unicode
106
107
version = "1.6.9"
90
108
stored_state_file = "clients.pickle"
91
109
92
110
logger = logging.getLogger()
93
syslogger = (logging.handlers.SysLogHandler
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
111
syslogger = None
96
112
97
113
try:
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
100
.if_nametoindex)
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
101
116
except (OSError, AttributeError):
117
102
118
def if_nametoindex(interface):
103
119
"Get an interface index the hard way, i.e. using fcntl()"
104
120
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
121
with contextlib.closing(socket.socket()) as s:
106
122
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
108
interface))
109
interface_index = struct.unpack(str("I"),
110
ifreq[16:20])[0]
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
111
125
return interface_index
112
126
113
127
114
128
def initlogger(debug, level=logging.WARNING):
115
129
"""init logger and add loglevel"""
116
130
131
global syslogger
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
117
135
syslogger.setFormatter(logging.Formatter
118
136
('Mandos [%(process)d]: %(levelname)s:'
119
137
' %(message)s'))
136
154
137
155
class PGPEngine(object):
138
156
"""A simple class for OpenPGP symmetric encryption & decryption"""
157
139
158
def __init__(self):
140
self.gnupg = GnuPGInterface.GnuPG()
141
159
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
142
self.gnupg = GnuPGInterface.GnuPG()
143
self.gnupg.options.meta_interactive = False
144
self.gnupg.options.homedir = self.tempdir
145
self.gnupg.options.extra_args.extend(['--force-mdc',
146
'--quiet',
147
'--no-use-agent'])
160
self.gnupgargs = ['--batch',
161
'--home', self.tempdir,
162
'--force-mdc',
163
'--quiet',
164
'--no-use-agent']
148
165
149
166
def __enter__(self):
150
167
return self
151
168
152
def __exit__ (self, exc_type, exc_value, traceback):
169
def __exit__(self, exc_type, exc_value, traceback):
153
170
self._cleanup()
154
171
return False
155
172
172
189
def password_encode(self, password):
173
190
# Passphrase can not be empty and can not contain newlines or
174
191
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
192
encoded = b"mandos" + binascii.hexlify(password)
193
if len(encoded) > 2048:
194
# GnuPG can't handle long passwords, so encode differently
195
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
196
.replace(b"\n", b"\\n")
197
.replace(b"\0", b"\\x00"))
198
return encoded
176
199
177
200
def encrypt(self, data, password):
178
self.gnupg.passphrase = self.password_encode(password)
179
with open(os.devnull, "w") as devnull:
180
try:
181
proc = self.gnupg.run(['--symmetric'],
182
create_fhs=['stdin', 'stdout'],
183
attach_fhs={'stderr': devnull})
184
with contextlib.closing(proc.handles['stdin']) as f:
185
f.write(data)
186
with contextlib.closing(proc.handles['stdout']) as f:
187
ciphertext = f.read()
188
proc.wait()
189
except IOError as e:
190
raise PGPError(e)
191
self.gnupg.passphrase = None
201
passphrase = self.password_encode(password)
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
204
passfile.write(passphrase)
205
passfile.flush()
206
proc = subprocess.Popen(['gpg', '--symmetric',
207
'--passphrase-file',
208
passfile.name]
209
+ self.gnupgargs,
210
stdin = subprocess.PIPE,
211
stdout = subprocess.PIPE,
212
stderr = subprocess.PIPE)
213
ciphertext, err = proc.communicate(input = data)
214
if proc.returncode != 0:
215
raise PGPError(err)
192
216
return ciphertext
193
217
194
218
def decrypt(self, data, password):
195
self.gnupg.passphrase = self.password_encode(password)
196
with open(os.devnull, "w") as devnull:
197
try:
198
proc = self.gnupg.run(['--decrypt'],
199
create_fhs=['stdin', 'stdout'],
200
attach_fhs={'stderr': devnull})
201
with contextlib.closing(proc.handles['stdin']) as f:
202
f.write(data)
203
with contextlib.closing(proc.handles['stdout']) as f:
204
decrypted_plaintext = f.read()
205
proc.wait()
206
except IOError as e:
207
raise PGPError(e)
208
self.gnupg.passphrase = None
219
passphrase = self.password_encode(password)
220
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
222
passfile.write(passphrase)
223
passfile.flush()
224
proc = subprocess.Popen(['gpg', '--decrypt',
225
'--passphrase-file',
226
passfile.name]
227
+ self.gnupgargs,
228
stdin = subprocess.PIPE,
229
stdout = subprocess.PIPE,
230
stderr = subprocess.PIPE)
231
decrypted_plaintext, err = proc.communicate(input = data)
232
if proc.returncode != 0:
233
raise PGPError(err)
209
234
return decrypted_plaintext
210
235
211
236
212
237
class AvahiError(Exception):
213
238
def __init__(self, value, *args, **kwargs):
214
239
self.value = value
215
super(AvahiError, self).__init__(value, *args, **kwargs)
216
def __unicode__(self):
217
return unicode(repr(self.value))
240
return super(AvahiError, self).__init__(value, *args,
241
**kwargs)
242
218
243
219
244
class AvahiServiceError(AvahiError):
220
245
pass
221
246
247
222
248
class AvahiGroupError(AvahiError):
223
249
pass
224
250
231
257
Used to optionally bind to the specified interface.
232
258
name: string; Example: 'Mandos'
233
259
type: string; Example: '_mandos._tcp'.
234
See <http://www.dns-sd.org/ServiceTypes.html>
260
See <https://www.iana.org/assignments/service-names-port-numbers>
235
261
port: integer; what port to announce
236
262
TXT: list of strings; TXT record for the service
237
263
domain: string; Domain to publish on, default to .local if empty.
244
270
bus: dbus.SystemBus()
245
271
"""
246
272
247
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
248
servicetype = None, port = None, TXT = None,
249
domain = "", host = "", max_renames = 32768,
250
protocol = avahi.PROTO_UNSPEC, bus = None):
273
def __init__(self,
274
interface = avahi.IF_UNSPEC,
275
name = None,
276
servicetype = None,
277
port = None,
278
TXT = None,
279
domain = "",
280
host = "",
281
max_renames = 32768,
282
protocol = avahi.PROTO_UNSPEC,
283
bus = None):
251
284
self.interface = interface
252
285
self.name = name
253
286
self.type = servicetype
263
296
self.bus = bus
264
297
self.entry_group_state_changed_match = None
265
298
266
def rename(self):
299
def rename(self, remove=True):
267
300
"""Derived from the Avahi example code"""
268
301
if self.rename_count >= self.max_renames:
269
302
logger.critical("No suitable Zeroconf service name found"
270
303
" after %i retries, exiting.",
271
304
self.rename_count)
272
305
raise AvahiServiceError("Too many renames")
273
self.name = unicode(self.server
274
.GetAlternativeServiceName(self.name))
306
self.name = str(
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
275
309
logger.info("Changing Zeroconf service name to %r ...",
276
310
self.name)
277
self.remove()
311
if remove:
312
self.remove()
278
313
try:
279
314
self.add()
280
315
except dbus.exceptions.DBusException as error:
281
logger.critical("D-Bus Exception", exc_info=error)
282
self.cleanup()
283
os._exit(1)
284
self.rename_count += 1
316
if (error.get_dbus_name()
317
== "org.freedesktop.Avahi.CollisionError"):
318
logger.info("Local Zeroconf service name collision.")
319
return self.rename(remove=False)
320
else:
321
logger.critical("D-Bus Exception", exc_info=error)
322
self.cleanup()
323
os._exit(1)
285
324
286
325
def remove(self):
287
326
"""Derived from the Avahi example code"""
325
364
self.rename()
326
365
elif state == avahi.ENTRY_GROUP_FAILURE:
327
366
logger.critical("Avahi: Error in group state changed %s",
328
unicode(error))
329
raise AvahiGroupError("State changed: {0!s}"
330
.format(error))
367
str(error))
368
raise AvahiGroupError("State changed: {!s}".format(error))
331
369
332
370
def cleanup(self):
333
371
"""Derived from the Avahi example code"""
343
381
def server_state_changed(self, state, error=None):
344
382
"""Derived from the Avahi example code"""
345
383
logger.debug("Avahi server state change: %i", state)
346
bad_states = { avahi.SERVER_INVALID:
347
"Zeroconf server invalid",
348
avahi.SERVER_REGISTERING: None,
349
avahi.SERVER_COLLISION:
350
"Zeroconf server name collision",
351
avahi.SERVER_FAILURE:
352
"Zeroconf server failure" }
384
bad_states = {
385
avahi.SERVER_INVALID: "Zeroconf server invalid",
386
avahi.SERVER_REGISTERING: None,
387
avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
avahi.SERVER_FAILURE: "Zeroconf server failure",
389
}
353
390
if state in bad_states:
354
391
if bad_states[state] is not None:
355
392
if error is None:
358
395
logger.error(bad_states[state] + ": %r", error)
359
396
self.cleanup()
360
397
elif state == avahi.SERVER_RUNNING:
361
self.add()
398
try:
399
self.add()
400
except dbus.exceptions.DBusException as error:
401
if (error.get_dbus_name()
402
== "org.freedesktop.Avahi.CollisionError"):
403
logger.info("Local Zeroconf service name"
404
" collision.")
405
return self.rename(remove=False)
406
else:
407
logger.critical("D-Bus Exception", exc_info=error)
408
self.cleanup()
409
os._exit(1)
362
410
else:
363
411
if error is None:
364
412
logger.debug("Unknown state: %r", state)
374
422
follow_name_owner_changes=True),
375
423
avahi.DBUS_INTERFACE_SERVER)
376
424
self.server.connect_to_signal("StateChanged",
377
self.server_state_changed)
425
self.server_state_changed)
378
426
self.server_state_changed(self.server.GetState())
379
427
428
380
429
class AvahiServiceToSyslog(AvahiService):
381
def rename(self):
430
def rename(self, *args, **kwargs):
382
431
"""Add the new name to the syslog messages"""
383
ret = AvahiService.rename(self)
384
syslogger.setFormatter(logging.Formatter
385
('Mandos ({0}) [%(process)d]:'
386
' %(levelname)s: %(message)s'
387
.format(self.name)))
432
ret = AvahiService.rename(self, *args, **kwargs)
433
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
435
.format(self.name)))
388
436
return ret
389
437
390
def timedelta_to_milliseconds(td):
391
"Convert a datetime.timedelta() to milliseconds"
392
return ((td.days * 24 * 60 * 60 * 1000)
393
+ (td.seconds * 1000)
394
+ (td.microseconds // 1000))
438
def call_pipe(connection, # : multiprocessing.Connection
439
func, *args, **kwargs):
440
"""This function is meant to be called by multiprocessing.Process
441
442
This function runs func(*args, **kwargs), and writes the resulting
443
return value on the provided multiprocessing.Connection.
444
"""
445
connection.send(func(*args, **kwargs))
446
connection.close()
395
447
396
448
class Client(object):
397
449
"""A representation of a client host served by this server.
424
476
last_checker_status: integer between 0 and 255 reflecting exit
425
477
status of last checker. -1 reflects crashed
426
478
checker, -2 means no checker completed yet.
479
last_checker_signal: The signal which killed the last checker, if
480
last_checker_status is -1
427
481
last_enabled: datetime.datetime(); (UTC) or None
428
482
name: string; from the config file, used in log messages and
429
483
D-Bus identifiers
434
488
runtime_expansions: Allowed attributes for runtime expansion.
435
489
expires: datetime.datetime(); time (UTC) when a client will be
436
490
disabled, or None
491
server_settings: The server_settings dict from main()
437
492
"""
438
493
439
494
runtime_expansions = ("approval_delay", "approval_duration",
440
"created", "enabled", "fingerprint",
441
"host", "interval", "last_checked_ok",
495
"created", "enabled", "expires",
496
"fingerprint", "host", "interval",
497
"last_approval_request", "last_checked_ok",
442
498
"last_enabled", "name", "timeout")
443
client_defaults = { "timeout": "5m",
444
"extended_timeout": "15m",
445
"interval": "2m",
446
"checker": "fping -q -- %%(host)s",
447
"host": "",
448
"approval_delay": "0s",
449
"approval_duration": "1s",
450
"approved_by_default": "True",
451
"enabled": "True",
452
}
453
454
def timeout_milliseconds(self):
455
"Return the 'timeout' attribute in milliseconds"
456
return timedelta_to_milliseconds(self.timeout)
457
458
def extended_timeout_milliseconds(self):
459
"Return the 'extended_timeout' attribute in milliseconds"
460
return timedelta_to_milliseconds(self.extended_timeout)
461
462
def interval_milliseconds(self):
463
"Return the 'interval' attribute in milliseconds"
464
return timedelta_to_milliseconds(self.interval)
465
466
def approval_delay_milliseconds(self):
467
return timedelta_to_milliseconds(self.approval_delay)
499
client_defaults = {
500
"timeout": "PT5M",
501
"extended_timeout": "PT15M",
502
"interval": "PT2M",
503
"checker": "fping -q -- %%(host)s",
504
"host": "",
505
"approval_delay": "PT0S",
506
"approval_duration": "PT1S",
507
"approved_by_default": "True",
508
"enabled": "True",
509
}
468
510
469
511
@staticmethod
470
512
def config_parser(config):
486
528
client["enabled"] = config.getboolean(client_name,
487
529
"enabled")
488
530
531
# Uppercase and remove spaces from fingerprint for later
532
# comparison purposes with return value from the
533
# fingerprint() function
489
534
client["fingerprint"] = (section["fingerprint"].upper()
490
535
.replace(" ", ""))
491
536
if "secret" in section:
496
541
"rb") as secfile:
497
542
client["secret"] = secfile.read()
498
543
else:
499
raise TypeError("No secret or secfile for section {0}"
544
raise TypeError("No secret or secfile for section {}"
500
545
.format(section))
501
546
client["timeout"] = string_to_delta(section["timeout"])
502
547
client["extended_timeout"] = string_to_delta(
513
558
514
559
return settings
515
560
516
def __init__(self, settings, name = None):
561
def __init__(self, settings, name = None, server_settings=None):
517
562
self.name = name
563
if server_settings is None:
564
server_settings = {}
565
self.server_settings = server_settings
518
566
# adding all client settings
519
for setting, value in settings.iteritems():
567
for setting, value in settings.items():
520
568
setattr(self, setting, value)
521
569
522
570
if self.enabled:
530
578
self.expires = None
531
579
532
580
logger.debug("Creating client %r", self.name)
533
# Uppercase and remove spaces from fingerprint for later
534
# comparison purposes with return value from the fingerprint()
535
# function
536
581
logger.debug(" Fingerprint: %s", self.fingerprint)
537
582
self.created = settings.get("created",
538
583
datetime.datetime.utcnow())
545
590
self.current_checker_command = None
546
591
self.approved = None
547
592
self.approvals_pending = 0
548
self.changedstate = (multiprocessing_manager
549
.Condition(multiprocessing_manager
550
.Lock()))
551
self.client_structure = [attr for attr in
552
self.__dict__.iterkeys()
593
self.changedstate = multiprocessing_manager.Condition(
594
multiprocessing_manager.Lock())
595
self.client_structure = [attr
596
for attr in self.__dict__.iterkeys()
553
597
if not attr.startswith("_")]
554
598
self.client_structure.append("client_structure")
555
599
556
for name, t in inspect.getmembers(type(self),
557
lambda obj:
558
isinstance(obj,
559
property)):
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
560
602
if not name.startswith("_"):
561
603
self.client_structure.append(name)
562
604
570
612
if getattr(self, "enabled", False):
571
613
# Already enabled
572
614
return
573
self.send_changedstate()
574
615
self.expires = datetime.datetime.utcnow() + self.timeout
575
616
self.enabled = True
576
617
self.last_enabled = datetime.datetime.utcnow()
577
618
self.init_checker()
619
self.send_changedstate()
578
620
579
621
def disable(self, quiet=True):
580
622
"""Disable this client."""
581
623
if not getattr(self, "enabled", False):
582
624
return False
583
625
if not quiet:
584
self.send_changedstate()
585
if not quiet:
586
626
logger.info("Disabling client %s", self.name)
587
if getattr(self, "disable_initiator_tag", False):
627
if getattr(self, "disable_initiator_tag", None) is not None:
588
628
gobject.source_remove(self.disable_initiator_tag)
589
629
self.disable_initiator_tag = None
590
630
self.expires = None
591
if getattr(self, "checker_initiator_tag", False):
631
if getattr(self, "checker_initiator_tag", None) is not None:
592
632
gobject.source_remove(self.checker_initiator_tag)
593
633
self.checker_initiator_tag = None
594
634
self.stop_checker()
595
635
self.enabled = False
636
if not quiet:
637
self.send_changedstate()
596
638
# Do not run this again if called by a gobject.timeout_add
597
639
return False
598
640
602
644
def init_checker(self):
603
645
# Schedule a new checker to be started an 'interval' from now,
604
646
# and every interval from then on.
605
self.checker_initiator_tag = (gobject.timeout_add
606
(self.interval_milliseconds(),
607
self.start_checker))
647
if self.checker_initiator_tag is not None:
648
gobject.source_remove(self.checker_initiator_tag)
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
651
self.start_checker)
608
652
# Schedule a disable() when 'timeout' has passed
609
self.disable_initiator_tag = (gobject.timeout_add
610
(self.timeout_milliseconds(),
611
self.disable))
653
if self.disable_initiator_tag is not None:
654
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
612
657
# Also start a new checker *right now*.
613
658
self.start_checker()
614
659
615
def checker_callback(self, pid, condition, command):
660
def checker_callback(self, source, condition, connection,
661
command):
616
662
"""The checker has completed, so take appropriate actions."""
617
663
self.checker_callback_tag = None
618
664
self.checker = None
619
if os.WIFEXITED(condition):
620
self.last_checker_status = os.WEXITSTATUS(condition)
665
# Read return code from connection (see call_pipe)
666
returncode = connection.recv()
667
connection.close()
668
669
if returncode >= 0:
670
self.last_checker_status = returncode
671
self.last_checker_signal = None
621
672
if self.last_checker_status == 0:
622
673
logger.info("Checker for %(name)s succeeded",
623
674
vars(self))
624
675
self.checked_ok()
625
676
else:
626
logger.info("Checker for %(name)s failed",
627
vars(self))
677
logger.info("Checker for %(name)s failed", vars(self))
628
678
else:
629
679
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
630
681
logger.warning("Checker for %(name)s crashed?",
631
682
vars(self))
683
return False
632
684
633
685
def checked_ok(self):
634
686
"""Assert that the client has been seen, alive and well."""
635
687
self.last_checked_ok = datetime.datetime.utcnow()
636
688
self.last_checker_status = 0
689
self.last_checker_signal = None
637
690
self.bump_timeout()
638
691
639
692
def bump_timeout(self, timeout=None):
642
695
timeout = self.timeout
643
696
if self.disable_initiator_tag is not None:
644
697
gobject.source_remove(self.disable_initiator_tag)
698
self.disable_initiator_tag = None
645
699
if getattr(self, "enabled", False):
646
self.disable_initiator_tag = (gobject.timeout_add
647
(timedelta_to_milliseconds
648
(timeout), self.disable))
700
self.disable_initiator_tag = gobject.timeout_add(
701
int(timeout.total_seconds() * 1000), self.disable)
649
702
self.expires = datetime.datetime.utcnow() + timeout
650
703
651
704
def need_approval(self):
657
710
If a checker already exists, leave it running and do
658
711
nothing."""
659
712
# The reason for not killing a running checker is that if we
660
# did that, then if a checker (for some reason) started
661
# running slowly and taking more than 'interval' time, the
662
# client would inevitably timeout, since no checker would get
663
# a chance to run to completion. If we instead leave running
713
# did that, and if a checker (for some reason) started running
714
# slowly and taking more than 'interval' time, then the client
715
# would inevitably timeout, since no checker would get a
716
# chance to run to completion. If we instead leave running
664
717
# checkers alone, the checker would have to take more time
665
718
# than 'timeout' for the client to be disabled, which is as it
666
719
# should be.
667
720
668
# If a checker exists, make sure it is not a zombie
669
try:
670
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
671
except (AttributeError, OSError) as error:
672
if (isinstance(error, OSError)
673
and error.errno != errno.ECHILD):
674
raise error
675
else:
676
if pid:
677
logger.warning("Checker was a zombie")
678
gobject.source_remove(self.checker_callback_tag)
679
self.checker_callback(pid, status,
680
self.current_checker_command)
721
if self.checker is not None and not self.checker.is_alive():
722
logger.warning("Checker was not alive; joining")
723
self.checker.join()
724
self.checker = None
681
725
# Start a new checker if needed
682
726
if self.checker is None:
727
# Escape attributes for the shell
728
escaped_attrs = {
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
683
731
try:
684
# In case checker_command has exactly one % operator
685
command = self.checker_command % self.host
686
except TypeError:
687
# Escape attributes for the shell
688
escaped_attrs = dict(
689
(attr,
690
re.escape(unicode(str(getattr(self, attr, "")),
691
errors=
692
'replace')))
693
for attr in
694
self.runtime_expansions)
695
696
try:
697
command = self.checker_command % escaped_attrs
698
except TypeError as error:
699
logger.error('Could not format string "%s"',
700
self.checker_command, exc_info=error)
701
return True # Try again later
732
command = self.checker_command % escaped_attrs
733
except TypeError as error:
734
logger.error('Could not format string "%s"',
735
self.checker_command,
736
exc_info=error)
737
return True # Try again later
702
738
self.current_checker_command = command
703
try:
704
logger.info("Starting checker %r for %s",
705
command, self.name)
706
# We don't need to redirect stdout and stderr, since
707
# in normal mode, that is already done by daemon(),
708
# and in debug mode we don't want to. (Stdin is
709
# always replaced by /dev/null.)
710
self.checker = subprocess.Popen(command,
711
close_fds=True,
712
shell=True, cwd="/")
713
self.checker_callback_tag = (gobject.child_watch_add
714
(self.checker.pid,
715
self.checker_callback,
716
data=command))
717
# The checker may have completed before the gobject
718
# watch was added. Check for this.
719
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
720
if pid:
721
gobject.source_remove(self.checker_callback_tag)
722
self.checker_callback(pid, status, command)
723
except OSError as error:
724
logger.error("Failed to start subprocess",
725
exc_info=error)
739
logger.info("Starting checker %r for %s", command,
740
self.name)
741
# We don't need to redirect stdout and stderr, since
742
# in normal mode, that is already done by daemon(),
743
# and in debug mode we don't want to. (Stdin is
744
# always replaced by /dev/null.)
745
# The exception is when not debugging but nevertheless
746
# running in the foreground; use the previously
747
# created wnull.
748
popen_args = { "close_fds": True,
749
"shell": True,
750
"cwd": "/" }
751
if (not self.server_settings["debug"]
752
and self.server_settings["foreground"]):
753
popen_args.update({"stdout": wnull,
754
"stderr": wnull })
755
pipe = multiprocessing.Pipe(duplex = False)
756
self.checker = multiprocessing.Process(
757
target = call_pipe,
758
args = (pipe[1], subprocess.call, command),
759
kwargs = popen_args)
760
self.checker.start()
761
self.checker_callback_tag = gobject.io_add_watch(
762
pipe[0].fileno(), gobject.IO_IN,
763
self.checker_callback, pipe[0], command)
726
764
# Re-run this periodically if run by gobject.timeout_add
727
765
return True
728
766
734
772
if getattr(self, "checker", None) is None:
735
773
return
736
774
logger.debug("Stopping checker for %(name)s", vars(self))
737
try:
738
self.checker.terminate()
739
#time.sleep(0.5)
740
#if self.checker.poll() is None:
741
# self.checker.kill()
742
except OSError as error:
743
if error.errno != errno.ESRCH: # No such process
744
raise
775
self.checker.terminate()
745
776
self.checker = None
746
777
747
778
748
def dbus_service_property(dbus_interface, signature="v",
749
access="readwrite", byte_arrays=False):
779
def dbus_service_property(dbus_interface,
780
signature="v",
781
access="readwrite",
782
byte_arrays=False):
750
783
"""Decorators for marking methods of a DBusObjectWithProperties to
751
784
become properties on the D-Bus.
752
785
761
794
# "Set" method, so we fail early here:
762
795
if byte_arrays and signature != "ay":
763
796
raise ValueError("Byte arrays not supported for non-'ay'"
764
" signature {0!r}".format(signature))
797
" signature {!r}".format(signature))
798
765
799
def decorator(func):
766
800
func._dbus_is_property = True
767
801
func._dbus_interface = dbus_interface
772
806
func._dbus_name = func._dbus_name[:-14]
773
807
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
774
808
return func
809
775
810
return decorator
776
811
777
812
786
821
"org.freedesktop.DBus.Property.EmitsChangedSignal":
787
822
"false"}
788
823
"""
824
789
825
def decorator(func):
790
826
func._dbus_is_interface = True
791
827
func._dbus_interface = dbus_interface
792
828
func._dbus_name = dbus_interface
793
829
return func
830
794
831
return decorator
795
832
796
833
798
835
"""Decorator to annotate D-Bus methods, signals or properties
799
836
Usage:
800
837
838
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
839
"org.freedesktop.DBus.Property."
840
"EmitsChangedSignal": "false"})
801
841
@dbus_service_property("org.example.Interface", signature="b",
802
842
access="r")
803
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
804
"org.freedesktop.DBus.Property."
805
"EmitsChangedSignal": "false"})
806
843
def Property_dbus_property(self):
807
844
return dbus.Boolean(False)
808
845
"""
846
809
847
def decorator(func):
810
848
func._dbus_annotations = annotations
811
849
return func
850
812
851
return decorator
813
852
814
853
815
854
class DBusPropertyException(dbus.exceptions.DBusException):
816
855
"""A base class for D-Bus property-related exceptions
817
856
"""
818
def __unicode__(self):
819
return unicode(str(self))
857
pass
820
858
821
859
822
860
class DBusPropertyAccessException(DBusPropertyException):
846
884
If called like _is_dbus_thing("method") it returns a function
847
885
suitable for use as predicate to inspect.getmembers().
848
886
"""
849
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
887
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
850
888
False)
851
889
852
890
def _get_all_dbus_things(self, thing):
853
891
"""Returns a generator of (name, attribute) pairs
854
892
"""
855
return ((getattr(athing.__get__(self), "_dbus_name",
856
name),
893
return ((getattr(athing.__get__(self), "_dbus_name", name),
857
894
athing.__get__(self))
858
895
for cls in self.__class__.__mro__
859
896
for name, athing in
860
inspect.getmembers(cls,
861
self._is_dbus_thing(thing)))
897
inspect.getmembers(cls, self._is_dbus_thing(thing)))
862
898
863
899
def _get_dbus_property(self, interface_name, property_name):
864
900
"""Returns a bound method if one exists which is a D-Bus
865
901
property with the specified name and interface.
866
902
"""
867
for cls in self.__class__.__mro__:
868
for name, value in (inspect.getmembers
869
(cls,
870
self._is_dbus_thing("property"))):
903
for cls in self.__class__.__mro__:
904
for name, value in inspect.getmembers(
905
cls, self._is_dbus_thing("property")):
871
906
if (value._dbus_name == property_name
872
907
and value._dbus_interface == interface_name):
873
908
return value.__get__(self)
874
909
875
910
# No such property
876
raise DBusPropertyNotFound(self.dbus_object_path + ":"
877
+ interface_name + "."
878
+ property_name)
911
raise DBusPropertyNotFound("{}:{}.{}".format(
912
self.dbus_object_path, interface_name, property_name))
879
913
880
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
914
@dbus.service.method(dbus.PROPERTIES_IFACE,
915
in_signature="ss",
881
916
out_signature="v")
882
917
def Get(self, interface_name, property_name):
883
918
"""Standard D-Bus property Get() method, see D-Bus standard.
901
936
# The byte_arrays option is not supported yet on
902
937
# signatures other than "ay".
903
938
if prop._dbus_signature != "ay":
904
raise ValueError
939
raise ValueError("Byte arrays not supported for non-"
940
"'ay' signature {!r}"
941
.format(prop._dbus_signature))
905
942
value = dbus.ByteArray(b''.join(chr(byte)
906
943
for byte in value))
907
944
prop(value)
908
945
909
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
946
@dbus.service.method(dbus.PROPERTIES_IFACE,
947
in_signature="s",
910
948
out_signature="a{sv}")
911
949
def GetAll(self, interface_name):
912
950
"""Standard D-Bus property GetAll() method, see D-Bus
927
965
if not hasattr(value, "variant_level"):
928
966
properties[name] = value
929
967
continue
930
properties[name] = type(value)(value, variant_level=
931
value.variant_level+1)
968
properties[name] = type(value)(
969
value, variant_level = value.variant_level + 1)
932
970
return dbus.Dictionary(properties, signature="sv")
933
971
972
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
973
def PropertiesChanged(self, interface_name, changed_properties,
974
invalidated_properties):
975
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
976
standard.
977
"""
978
pass
979
934
980
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
935
981
out_signature="s",
936
982
path_keyword='object_path',
944
990
connection)
945
991
try:
946
992
document = xml.dom.minidom.parseString(xmlstring)
993
947
994
def make_tag(document, name, prop):
948
995
e = document.createElement("property")
949
996
e.setAttribute("name", name)
950
997
e.setAttribute("type", prop._dbus_signature)
951
998
e.setAttribute("access", prop._dbus_access)
952
999
return e
1000
953
1001
for if_tag in document.getElementsByTagName("interface"):
954
1002
# Add property tags
955
1003
for tag in (make_tag(document, name, prop)
967
1015
if (name == tag.getAttribute("name")
968
1016
and prop._dbus_interface
969
1017
== if_tag.getAttribute("name")):
970
annots.update(getattr
971
(prop,
972
"_dbus_annotations",
973
{}))
974
for name, value in annots.iteritems():
1018
annots.update(getattr(
1019
prop, "_dbus_annotations", {}))
1020
for name, value in annots.items():
975
1021
ann_tag = document.createElement(
976
1022
"annotation")
977
1023
ann_tag.setAttribute("name", name)
979
1025
tag.appendChild(ann_tag)
980
1026
# Add interface annotation tags
981
1027
for annotation, value in dict(
982
itertools.chain(
983
*(annotations().iteritems()
984
for name, annotations in
985
self._get_all_dbus_things("interface")
986
if name == if_tag.getAttribute("name")
987
))).iteritems():
1028
itertools.chain.from_iterable(
1029
annotations().items()
1030
for name, annotations
1031
in self._get_all_dbus_things("interface")
1032
if name == if_tag.getAttribute("name")
1033
)).items():
988
1034
ann_tag = document.createElement("annotation")
989
1035
ann_tag.setAttribute("name", annotation)
990
1036
ann_tag.setAttribute("value", value)
1013
1059
return xmlstring
1014
1060
1015
1061
1016
def datetime_to_dbus (dt, variant_level=0):
1062
def datetime_to_dbus(dt, variant_level=0):
1017
1063
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1018
1064
if dt is None:
1019
1065
return dbus.String("", variant_level = variant_level)
1020
return dbus.String(dt.isoformat(),
1021
variant_level=variant_level)
1022
1023
1024
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1025
.__metaclass__):
1026
"""Applied to an empty subclass of a D-Bus object, this metaclass
1027
will add additional D-Bus attributes matching a certain pattern.
1066
return dbus.String(dt.isoformat(), variant_level=variant_level)
1067
1068
1069
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1070
"""A class decorator; applied to a subclass of
1071
dbus.service.Object, it will add alternate D-Bus attributes with
1072
interface names according to the "alt_interface_names" mapping.
1073
Usage:
1074
1075
@alternate_dbus_interfaces({"org.example.Interface":
1076
"net.example.AlternateInterface"})
1077
class SampleDBusObject(dbus.service.Object):
1078
@dbus.service.method("org.example.Interface")
1079
def SampleDBusMethod():
1080
pass
1081
1082
The above "SampleDBusMethod" on "SampleDBusObject" will be
1083
reachable via two interfaces: "org.example.Interface" and
1084
"net.example.AlternateInterface", the latter of which will have
1085
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1086
"true", unless "deprecate" is passed with a False value.
1087
1088
This works for methods and signals, and also for D-Bus properties
1089
(from DBusObjectWithProperties) and interfaces (from the
1090
dbus_interface_annotations decorator).
1028
1091
"""
1029
def __new__(mcs, name, bases, attr):
1030
# Go through all the base classes which could have D-Bus
1031
# methods, signals, or properties in them
1032
old_interface_names = []
1033
for base in (b for b in bases
1034
if issubclass(b, dbus.service.Object)):
1035
# Go though all attributes of the base class
1036
for attrname, attribute in inspect.getmembers(base):
1092
1093
def wrapper(cls):
1094
for orig_interface_name, alt_interface_name in (
1095
alt_interface_names.items()):
1096
attr = {}
1097
interface_names = set()
1098
# Go though all attributes of the class
1099
for attrname, attribute in inspect.getmembers(cls):
1037
1100
# Ignore non-D-Bus attributes, and D-Bus attributes
1038
1101
# with the wrong interface name
1039
1102
if (not hasattr(attribute, "_dbus_interface")
1040
or not attribute._dbus_interface
1041
.startswith("se.recompile.Mandos")):
1103
or not attribute._dbus_interface.startswith(
1104
orig_interface_name)):
1042
1105
continue
1043
1106
# Create an alternate D-Bus interface name based on
1044
1107
# the current name
1045
alt_interface = (attribute._dbus_interface
1046
.replace("se.recompile.Mandos",
1047
"se.bsnet.fukt.Mandos"))
1048
if alt_interface != attribute._dbus_interface:
1049
old_interface_names.append(alt_interface)
1108
alt_interface = attribute._dbus_interface.replace(
1109
orig_interface_name, alt_interface_name)
1110
interface_names.add(alt_interface)
1050
1111
# Is this a D-Bus signal?
1051
1112
if getattr(attribute, "_dbus_is_signal", False):
1052
# Extract the original non-method function by
1053
# black magic
1054
nonmethod_func = (dict(
1113
if sys.version_info.major == 2:
1114
# Extract the original non-method undecorated
1115
# function by black magic
1116
nonmethod_func = (dict(
1055
1117
zip(attribute.func_code.co_freevars,
1056
attribute.__closure__))["func"]
1057
.cell_contents)
1118
attribute.__closure__))
1119
["func"].cell_contents)
1120
else:
1121
nonmethod_func = attribute
1058
1122
# Create a new, but exactly alike, function
1059
1123
# object, and decorate it to be a new D-Bus signal
1060
1124
# with the alternate D-Bus interface name
1061
new_function = (dbus.service.signal
1062
(alt_interface,
1063
attribute._dbus_signature)
1064
(types.FunctionType(
1065
nonmethod_func.func_code,
1066
nonmethod_func.func_globals,
1067
nonmethod_func.func_name,
1068
nonmethod_func.func_defaults,
1069
nonmethod_func.func_closure)))
1125
if sys.version_info.major == 2:
1126
new_function = types.FunctionType(
1127
nonmethod_func.func_code,
1128
nonmethod_func.func_globals,
1129
nonmethod_func.func_name,
1130
nonmethod_func.func_defaults,
1131
nonmethod_func.func_closure)
1132
else:
1133
new_function = types.FunctionType(
1134
nonmethod_func.__code__,
1135
nonmethod_func.__globals__,
1136
nonmethod_func.__name__,
1137
nonmethod_func.__defaults__,
1138
nonmethod_func.__closure__)
1139
new_function = (dbus.service.signal(
1140
alt_interface,
1141
attribute._dbus_signature)(new_function))
1070
1142
# Copy annotations, if any
1071
1143
try:
1072
new_function._dbus_annotations = (
1073
dict(attribute._dbus_annotations))
1144
new_function._dbus_annotations = dict(
1145
attribute._dbus_annotations)
1074
1146
except AttributeError:
1075
1147
pass
1076
1148
# Define a creator of a function to call both the
1077
# old and new functions, so both the old and new
1078
# signals gets sent when the function is called
1149
# original and alternate functions, so both the
1150
# original and alternate signals gets sent when
1151
# the function is called
1079
1152
def fixscope(func1, func2):
1080
1153
"""This function is a scope container to pass
1081
1154
func1 and func2 to the "call_both" function
1082
1155
outside of its arguments"""
1156
1083
1157
def call_both(*args, **kwargs):
1084
1158
"""This function will emit two D-Bus
1085
1159
signals by calling func1 and func2"""
1086
1160
func1(*args, **kwargs)
1087
1161
func2(*args, **kwargs)
1162
1088
1163
return call_both
1089
1164
# Create the "call_both" function and add it to
1090
1165
# the class
1091
attr[attrname] = fixscope(attribute,
1092
new_function)
1166
attr[attrname] = fixscope(attribute, new_function)
1093
1167
# Is this a D-Bus method?
1094
1168
elif getattr(attribute, "_dbus_is_method", False):
1095
1169
# Create a new, but exactly alike, function
1096
1170
# object. Decorate it to be a new D-Bus method
1097
1171
# with the alternate D-Bus interface name. Add it
1098
1172
# to the class.
1099
attr[attrname] = (dbus.service.method
1100
(alt_interface,
1101
attribute._dbus_in_signature,
1102
attribute._dbus_out_signature)
1103
(types.FunctionType
1104
(attribute.func_code,
1105
attribute.func_globals,
1106
attribute.func_name,
1107
attribute.func_defaults,
1108
attribute.func_closure)))
1173
attr[attrname] = (
1174
dbus.service.method(
1175
alt_interface,
1176
attribute._dbus_in_signature,
1177
attribute._dbus_out_signature)
1178
(types.FunctionType(attribute.func_code,
1179
attribute.func_globals,
1180
attribute.func_name,
1181
attribute.func_defaults,
1182
attribute.func_closure)))
1109
1183
# Copy annotations, if any
1110
1184
try:
1111
attr[attrname]._dbus_annotations = (
1112
dict(attribute._dbus_annotations))
1185
attr[attrname]._dbus_annotations = dict(
1186
attribute._dbus_annotations)
1113
1187
except AttributeError:
1114
1188
pass
1115
1189
# Is this a D-Bus property?
1118
1192
# object, and decorate it to be a new D-Bus
1119
1193
# property with the alternate D-Bus interface
1120
1194
# name. Add it to the class.
1121
attr[attrname] = (dbus_service_property
1122
(alt_interface,
1123
attribute._dbus_signature,
1124
attribute._dbus_access,
1125
attribute
1126
._dbus_get_args_options
1127
["byte_arrays"])
1128
(types.FunctionType
1129
(attribute.func_code,
1130
attribute.func_globals,
1131
attribute.func_name,
1132
attribute.func_defaults,
1133
attribute.func_closure)))
1195
attr[attrname] = (dbus_service_property(
1196
alt_interface, attribute._dbus_signature,
1197
attribute._dbus_access,
1198
attribute._dbus_get_args_options
1199
["byte_arrays"])
1200
(types.FunctionType(
1201
attribute.func_code,
1202
attribute.func_globals,
1203
attribute.func_name,
1204
attribute.func_defaults,
1205
attribute.func_closure)))
1134
1206
# Copy annotations, if any
1135
1207
try:
1136
attr[attrname]._dbus_annotations = (
1137
dict(attribute._dbus_annotations))
1208
attr[attrname]._dbus_annotations = dict(
1209
attribute._dbus_annotations)
1138
1210
except AttributeError:
1139
1211
pass
1140
1212
# Is this a D-Bus interface?
1143
1215
# object. Decorate it to be a new D-Bus interface
1144
1216
# with the alternate D-Bus interface name. Add it
1145
1217
# to the class.
1146
attr[attrname] = (dbus_interface_annotations
1147
(alt_interface)
1148
(types.FunctionType
1149
(attribute.func_code,
1150
attribute.func_globals,
1151
attribute.func_name,
1152
attribute.func_defaults,
1153
attribute.func_closure)))
1154
# Deprecate all old interfaces
1155
iname="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1156
for old_interface_name in old_interface_names:
1157
@dbus_interface_annotations(old_interface_name)
1158
def func(self):
1159
return { "org.freedesktop.DBus.Deprecated": "true" }
1160
# Find an unused name
1161
for aname in (iname.format(i) for i in itertools.count()):
1162
if aname not in attr:
1163
attr[aname] = func
1164
break
1165
return type.__new__(mcs, name, bases, attr)
1166
1167
1218
attr[attrname] = (
1219
dbus_interface_annotations(alt_interface)
1220
(types.FunctionType(attribute.func_code,
1221
attribute.func_globals,
1222
attribute.func_name,
1223
attribute.func_defaults,
1224
attribute.func_closure)))
1225
if deprecate:
1226
# Deprecate all alternate interfaces
1227
iname="_AlternateDBusNames_interface_annotation{}"
1228
for interface_name in interface_names:
1229
1230
@dbus_interface_annotations(interface_name)
1231
def func(self):
1232
return { "org.freedesktop.DBus.Deprecated":
1233
"true" }
1234
# Find an unused name
1235
for aname in (iname.format(i)
1236
for i in itertools.count()):
1237
if aname not in attr:
1238
attr[aname] = func
1239
break
1240
if interface_names:
1241
# Replace the class with a new subclass of it with
1242
# methods, signals, etc. as created above.
1243
cls = type(b"{}Alternate".format(cls.__name__),
1244
(cls, ), attr)
1245
return cls
1246
1247
return wrapper
1248
1249
1250
@alternate_dbus_interfaces({"se.recompile.Mandos":
1251
"se.bsnet.fukt.Mandos"})
1168
1252
class ClientDBus(Client, DBusObjectWithProperties):
1169
1253
"""A Client class using D-Bus
1170
1254
1174
1258
"""
1175
1259
1176
1260
runtime_expansions = (Client.runtime_expansions
1177
+ ("dbus_object_path",))
1261
+ ("dbus_object_path", ))
1262
1263
_interface = "se.recompile.Mandos.Client"
1178
1264
1179
1265
# dbus.service.Object doesn't use super(), so we can't either.
1180
1266
1183
1269
Client.__init__(self, *args, **kwargs)
1184
1270
# Only now, when this client is initialized, can it show up on
1185
1271
# the D-Bus
1186
client_object_name = unicode(self.name).translate(
1272
client_object_name = str(self.name).translate(
1187
1273
{ord("."): ord("_"),
1188
1274
ord("-"): ord("_")})
1189
self.dbus_object_path = (dbus.ObjectPath
1190
("/clients/" + client_object_name))
1275
self.dbus_object_path = dbus.ObjectPath(
1276
"/clients/" + client_object_name)
1191
1277
DBusObjectWithProperties.__init__(self, self.bus,
1192
1278
self.dbus_object_path)
1193
1279
1194
def notifychangeproperty(transform_func,
1195
dbus_name, type_func=lambda x: x,
1196
variant_level=1):
1280
def notifychangeproperty(transform_func, dbus_name,
1281
type_func=lambda x: x,
1282
variant_level=1,
1283
invalidate_only=False,
1284
_interface=_interface):
1197
1285
""" Modify a variable so that it's a property which announces
1198
1286
its changes to DBus.
1199
1287
1204
1292
to the D-Bus. Default: no transform
1205
1293
variant_level: D-Bus variant level. Default: 1
1206
1294
"""
1207
attrname = "_{0}".format(dbus_name)
1295
attrname = "_{}".format(dbus_name)
1296
1208
1297
def setter(self, value):
1209
1298
if hasattr(self, "dbus_object_path"):
1210
1299
if (not hasattr(self, attrname) or
1211
1300
type_func(getattr(self, attrname, None))
1212
1301
!= type_func(value)):
1213
dbus_value = transform_func(type_func(value),
1214
variant_level
1215
=variant_level)
1216
self.PropertyChanged(dbus.String(dbus_name),
1217
dbus_value)
1302
if invalidate_only:
1303
self.PropertiesChanged(
1304
_interface, dbus.Dictionary(),
1305
dbus.Array((dbus_name, )))
1306
else:
1307
dbus_value = transform_func(
1308
type_func(value),
1309
variant_level = variant_level)
1310
self.PropertyChanged(dbus.String(dbus_name),
1311
dbus_value)
1312
self.PropertiesChanged(
1313
_interface,
1314
dbus.Dictionary({ dbus.String(dbus_name):
1315
dbus_value }),
1316
dbus.Array())
1218
1317
setattr(self, attrname, value)
1219
1318
1220
1319
return property(lambda self: getattr(self, attrname), setter)
1226
1325
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1227
1326
last_enabled = notifychangeproperty(datetime_to_dbus,
1228
1327
"LastEnabled")
1229
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1230
type_func = lambda checker:
1231
checker is not None)
1328
checker = notifychangeproperty(
1329
dbus.Boolean, "CheckerRunning",
1330
type_func = lambda checker: checker is not None)
1232
1331
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1233
1332
"LastCheckedOK")
1234
1333
last_checker_status = notifychangeproperty(dbus.Int16,
1237
1336
datetime_to_dbus, "LastApprovalRequest")
1238
1337
approved_by_default = notifychangeproperty(dbus.Boolean,
1239
1338
"ApprovedByDefault")
1240
approval_delay = notifychangeproperty(dbus.UInt64,
1241
"ApprovalDelay",
1242
type_func =
1243
timedelta_to_milliseconds)
1339
approval_delay = notifychangeproperty(
1340
dbus.UInt64, "ApprovalDelay",
1341
type_func = lambda td: td.total_seconds() * 1000)
1244
1342
approval_duration = notifychangeproperty(
1245
1343
dbus.UInt64, "ApprovalDuration",
1246
type_func = timedelta_to_milliseconds)
1344
type_func = lambda td: td.total_seconds() * 1000)
1247
1345
host = notifychangeproperty(dbus.String, "Host")
1248
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1249
type_func =
1250
timedelta_to_milliseconds)
1346
timeout = notifychangeproperty(
1347
dbus.UInt64, "Timeout",
1348
type_func = lambda td: td.total_seconds() * 1000)
1251
1349
extended_timeout = notifychangeproperty(
1252
1350
dbus.UInt64, "ExtendedTimeout",
1253
type_func = timedelta_to_milliseconds)
1254
interval = notifychangeproperty(dbus.UInt64,
1255
"Interval",
1256
type_func =
1257
timedelta_to_milliseconds)
1351
type_func = lambda td: td.total_seconds() * 1000)
1352
interval = notifychangeproperty(
1353
dbus.UInt64, "Interval",
1354
type_func = lambda td: td.total_seconds() * 1000)
1258
1355
checker_command = notifychangeproperty(dbus.String, "Checker")
1356
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1357
invalidate_only=True)
1259
1358
1260
1359
del notifychangeproperty
1261
1360
1268
1367
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1269
1368
Client.__del__(self, *args, **kwargs)
1270
1369
1271
def checker_callback(self, pid, condition, command,
1272
*args, **kwargs):
1273
self.checker_callback_tag = None
1274
self.checker = None
1275
if os.WIFEXITED(condition):
1276
exitstatus = os.WEXITSTATUS(condition)
1370
def checker_callback(self, source, condition,
1371
connection, command, *args, **kwargs):
1372
ret = Client.checker_callback(self, source, condition,
1373
connection, command, *args,
1374
**kwargs)
1375
exitstatus = self.last_checker_status
1376
if exitstatus >= 0:
1277
1377
# Emit D-Bus signal
1278
1378
self.CheckerCompleted(dbus.Int16(exitstatus),
1279
dbus.Int64(condition),
1379
dbus.Int64(0),
1280
1380
dbus.String(command))
1281
1381
else:
1282
1382
# Emit D-Bus signal
1283
1383
self.CheckerCompleted(dbus.Int16(-1),
1284
dbus.Int64(condition),
1384
dbus.Int64(
1385
self.last_checker_signal),
1285
1386
dbus.String(command))
1286
1287
return Client.checker_callback(self, pid, condition, command,
1288
*args, **kwargs)
1387
return ret
1289
1388
1290
1389
def start_checker(self, *args, **kwargs):
1291
old_checker = self.checker
1292
if self.checker is not None:
1293
old_checker_pid = self.checker.pid
1294
else:
1295
old_checker_pid = None
1390
old_checker_pid = getattr(self.checker, "pid", None)
1296
1391
r = Client.start_checker(self, *args, **kwargs)
1297
1392
# Only if new checker process was started
1298
1393
if (self.checker is not None
1306
1401
return False
1307
1402
1308
1403
def approve(self, value=True):
1309
self.send_changedstate()
1310
1404
self.approved = value
1311
gobject.timeout_add(timedelta_to_milliseconds
1312
(self.approval_duration),
1313
self._reset_approved)
1405
gobject.timeout_add(int(self.approval_duration.total_seconds()
1406
* 1000), self._reset_approved)
1407
self.send_changedstate()
1314
1408
1315
1409
## D-Bus methods, signals & properties
1316
_interface = "se.recompile.Mandos.Client"
1317
1410
1318
1411
## Interfaces
1319
1412
1320
@dbus_interface_annotations(_interface)
1321
def _foo(self):
1322
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1323
"false"}
1324
1325
1413
## Signals
1326
1414
1327
1415
# CheckerCompleted - signal
1337
1425
pass
1338
1426
1339
1427
# PropertyChanged - signal
1428
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1340
1429
@dbus.service.signal(_interface, signature="sv")
1341
1430
def PropertyChanged(self, property, value):
1342
1431
"D-Bus signal"
1376
1465
self.checked_ok()
1377
1466
1378
1467
# Enable - method
1468
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1379
1469
@dbus.service.method(_interface)
1380
1470
def Enable(self):
1381
1471
"D-Bus method"
1382
1472
self.enable()
1383
1473
1384
1474
# StartChecker - method
1475
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1385
1476
@dbus.service.method(_interface)
1386
1477
def StartChecker(self):
1387
1478
"D-Bus method"
1388
1479
self.start_checker()
1389
1480
1390
1481
# Disable - method
1482
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1391
1483
@dbus.service.method(_interface)
1392
1484
def Disable(self):
1393
1485
"D-Bus method"
1394
1486
self.disable()
1395
1487
1396
1488
# StopChecker - method
1489
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1397
1490
@dbus.service.method(_interface)
1398
1491
def StopChecker(self):
1399
1492
self.stop_checker()
1406
1499
return dbus.Boolean(bool(self.approvals_pending))
1407
1500
1408
1501
# ApprovedByDefault - property
1409
@dbus_service_property(_interface, signature="b",
1502
@dbus_service_property(_interface,
1503
signature="b",
1410
1504
access="readwrite")
1411
1505
def ApprovedByDefault_dbus_property(self, value=None):
1412
1506
if value is None: # get
1414
1508
self.approved_by_default = bool(value)
1415
1509
1416
1510
# ApprovalDelay - property
1417
@dbus_service_property(_interface, signature="t",
1511
@dbus_service_property(_interface,
1512
signature="t",
1418
1513
access="readwrite")
1419
1514
def ApprovalDelay_dbus_property(self, value=None):
1420
1515
if value is None: # get
1421
return dbus.UInt64(self.approval_delay_milliseconds())
1516
return dbus.UInt64(self.approval_delay.total_seconds()
1517
* 1000)
1422
1518
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1423
1519
1424
1520
# ApprovalDuration - property
1425
@dbus_service_property(_interface, signature="t",
1521
@dbus_service_property(_interface,
1522
signature="t",
1426
1523
access="readwrite")
1427
1524
def ApprovalDuration_dbus_property(self, value=None):
1428
1525
if value is None: # get
1429
return dbus.UInt64(timedelta_to_milliseconds(
1430
self.approval_duration))
1526
return dbus.UInt64(self.approval_duration.total_seconds()
1527
* 1000)
1431
1528
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1432
1529
1433
1530
# Name - property
1531
@dbus_annotations(
1532
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1434
1533
@dbus_service_property(_interface, signature="s", access="read")
1435
1534
def Name_dbus_property(self):
1436
1535
return dbus.String(self.name)
1437
1536
1438
1537
# Fingerprint - property
1538
@dbus_annotations(
1539
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1439
1540
@dbus_service_property(_interface, signature="s", access="read")
1440
1541
def Fingerprint_dbus_property(self):
1441
1542
return dbus.String(self.fingerprint)
1442
1543
1443
1544
# Host - property
1444
@dbus_service_property(_interface, signature="s",
1545
@dbus_service_property(_interface,
1546
signature="s",
1445
1547
access="readwrite")
1446
1548
def Host_dbus_property(self, value=None):
1447
1549
if value is None: # get
1448
1550
return dbus.String(self.host)
1449
self.host = unicode(value)
1551
self.host = str(value)
1450
1552
1451
1553
# Created - property
1554
@dbus_annotations(
1555
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1452
1556
@dbus_service_property(_interface, signature="s", access="read")
1453
1557
def Created_dbus_property(self):
1454
1558
return datetime_to_dbus(self.created)
1459
1563
return datetime_to_dbus(self.last_enabled)
1460
1564
1461
1565
# Enabled - property
1462
@dbus_service_property(_interface, signature="b",
1566
@dbus_service_property(_interface,
1567
signature="b",
1463
1568
access="readwrite")
1464
1569
def Enabled_dbus_property(self, value=None):
1465
1570
if value is None: # get
1470
1575
self.disable()
1471
1576
1472
1577
# LastCheckedOK - property
1473
@dbus_service_property(_interface, signature="s",
1578
@dbus_service_property(_interface,
1579
signature="s",
1474
1580
access="readwrite")
1475
1581
def LastCheckedOK_dbus_property(self, value=None):
1476
1582
if value is not None:
1479
1585
return datetime_to_dbus(self.last_checked_ok)
1480
1586
1481
1587
# LastCheckerStatus - property
1482
@dbus_service_property(_interface, signature="n",
1483
access="read")
1588
@dbus_service_property(_interface, signature="n", access="read")
1484
1589
def LastCheckerStatus_dbus_property(self):
1485
1590
return dbus.Int16(self.last_checker_status)
1486
1591
1495
1600
return datetime_to_dbus(self.last_approval_request)
1496
1601
1497
1602
# Timeout - property
1498
@dbus_service_property(_interface, signature="t",
1603
@dbus_service_property(_interface,
1604
signature="t",
1499
1605
access="readwrite")
1500
1606
def Timeout_dbus_property(self, value=None):
1501
1607
if value is None: # get
1502
return dbus.UInt64(self.timeout_milliseconds())
1608
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1609
old_timeout = self.timeout
1503
1610
self.timeout = datetime.timedelta(0, 0, 0, value)
1504
# Reschedule timeout
1611
# Reschedule disabling
1505
1612
if self.enabled:
1506
1613
now = datetime.datetime.utcnow()
1507
time_to_die = timedelta_to_milliseconds(
1508
(self.last_checked_ok + self.timeout) - now)
1509
if time_to_die <= 0:
1614
self.expires += self.timeout - old_timeout
1615
if self.expires <= now:
1510
1616
# The timeout has passed
1511
1617
self.disable()
1512
1618
else:
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1515
time_to_die))
1516
1619
if (getattr(self, "disable_initiator_tag", None)
1517
1620
is None):
1518
1621
return
1519
1622
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
1521
(time_to_die,
1522
self.disable))
1623
self.disable_initiator_tag = gobject.timeout_add(
1624
int((self.expires - now).total_seconds() * 1000),
1625
self.disable)
1523
1626
1524
1627
# ExtendedTimeout - property
1525
@dbus_service_property(_interface, signature="t",
1628
@dbus_service_property(_interface,
1629
signature="t",
1526
1630
access="readwrite")
1527
1631
def ExtendedTimeout_dbus_property(self, value=None):
1528
1632
if value is None: # get
1529
return dbus.UInt64(self.extended_timeout_milliseconds())
1633
return dbus.UInt64(self.extended_timeout.total_seconds()
1634
* 1000)
1530
1635
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1531
1636
1532
1637
# Interval - property
1533
@dbus_service_property(_interface, signature="t",
1638
@dbus_service_property(_interface,
1639
signature="t",
1534
1640
access="readwrite")
1535
1641
def Interval_dbus_property(self, value=None):
1536
1642
if value is None: # get
1537
return dbus.UInt64(self.interval_milliseconds())
1643
return dbus.UInt64(self.interval.total_seconds() * 1000)
1538
1644
self.interval = datetime.timedelta(0, 0, 0, value)
1539
1645
if getattr(self, "checker_initiator_tag", None) is None:
1540
1646
return
1541
1647
if self.enabled:
1542
1648
# Reschedule checker run
1543
1649
gobject.source_remove(self.checker_initiator_tag)
1544
self.checker_initiator_tag = (gobject.timeout_add
1545
(value, self.start_checker))
1546
self.start_checker() # Start one now, too
1650
self.checker_initiator_tag = gobject.timeout_add(
1651
value, self.start_checker)
1652
self.start_checker() # Start one now, too
1547
1653
1548
1654
# Checker - property
1549
@dbus_service_property(_interface, signature="s",
1655
@dbus_service_property(_interface,
1656
signature="s",
1550
1657
access="readwrite")
1551
1658
def Checker_dbus_property(self, value=None):
1552
1659
if value is None: # get
1553
1660
return dbus.String(self.checker_command)
1554
self.checker_command = unicode(value)
1661
self.checker_command = str(value)
1555
1662
1556
1663
# CheckerRunning - property
1557
@dbus_service_property(_interface, signature="b",
1664
@dbus_service_property(_interface,
1665
signature="b",
1558
1666
access="readwrite")
1559
1667
def CheckerRunning_dbus_property(self, value=None):
1560
1668
if value is None: # get
1565
1673
self.stop_checker()
1566
1674
1567
1675
# ObjectPath - property
1676
@dbus_annotations(
1677
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1568
1678
@dbus_service_property(_interface, signature="o", access="read")
1569
1679
def ObjectPath_dbus_property(self):
1570
1680
return self.dbus_object_path # is already a dbus.ObjectPath
1571
1681
1572
1682
# Secret = property
1573
@dbus_service_property(_interface, signature="ay",
1574
access="write", byte_arrays=True)
1683
@dbus_annotations(
1684
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
1685
"invalidates"})
1686
@dbus_service_property(_interface,
1687
signature="ay",
1688
access="write",
1689
byte_arrays=True)
1575
1690
def Secret_dbus_property(self, value):
1576
self.secret = str(value)
1691
self.secret = bytes(value)
1577
1692
1578
1693
del _interface
1579
1694
1583
1698
self._pipe = child_pipe
1584
1699
self._pipe.send(('init', fpr, address))
1585
1700
if not self._pipe.recv():
1586
raise KeyError()
1701
raise KeyError(fpr)
1587
1702
1588
1703
def __getattribute__(self, name):
1589
1704
if name == '_pipe':
1593
1708
if data[0] == 'data':
1594
1709
return data[1]
1595
1710
if data[0] == 'function':
1711
1596
1712
def func(*args, **kwargs):
1597
1713
self._pipe.send(('funcall', name, args, kwargs))
1598
1714
return self._pipe.recv()[1]
1715
1599
1716
return func
1600
1717
1601
1718
def __setattr__(self, name, value):
1604
1721
self._pipe.send(('setattr', name, value))
1605
1722
1606
1723
1607
class ClientDBusTransitional(ClientDBus):
1608
__metaclass__ = AlternateDBusNamesMetaclass
1609
1610
1611
1724
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
1725
"""A class to handle client connections.
1613
1726
1617
1730
def handle(self):
1618
1731
with contextlib.closing(self.server.child_pipe) as child_pipe:
1619
1732
logger.info("TCP connection from: %s",
1620
unicode(self.client_address))
1733
str(self.client_address))
1621
1734
logger.debug("Pipe FD: %d",
1622
1735
self.server.child_pipe.fileno())
1623
1736
1624
session = (gnutls.connection
1625
.ClientSession(self.request,
1626
gnutls.connection
1627
.X509Credentials()))
1737
session = gnutls.connection.ClientSession(
1738
self.request, gnutls.connection .X509Credentials())
1628
1739
1629
1740
# Note: gnutls.connection.X509Credentials is really a
1630
1741
# generic GnuTLS certificate credentials object so long as
1639
1750
priority = self.server.gnutls_priority
1640
1751
if priority is None:
1641
1752
priority = "NORMAL"
1642
(gnutls.library.functions
1643
.gnutls_priority_set_direct(session._c_object,
1644
priority, None))
1753
gnutls.library.functions.gnutls_priority_set_direct(
1754
session._c_object, priority, None)
1645
1755
1646
1756
# Start communication using the Mandos protocol
1647
1757
# Get protocol number
1649
1759
logger.debug("Protocol version: %r", line)
1650
1760
try:
1651
1761
if int(line.strip().split()[0]) > 1:
1652
raise RuntimeError
1762
raise RuntimeError(line)
1653
1763
except (ValueError, IndexError, RuntimeError) as error:
1654
1764
logger.error("Unknown protocol version: %s", error)
1655
1765
return
1667
1777
approval_required = False
1668
1778
try:
1669
1779
try:
1670
fpr = self.fingerprint(self.peer_certificate
1671
(session))
1780
fpr = self.fingerprint(
1781
self.peer_certificate(session))
1672
1782
except (TypeError,
1673
1783
gnutls.errors.GNUTLSError) as error:
1674
1784
logger.warning("Bad certificate: %s", error)
1689
1799
while True:
1690
1800
if not client.enabled:
1691
1801
logger.info("Client %s is disabled",
1692
client.name)
1802
client.name)
1693
1803
if self.server.use_dbus:
1694
1804
# Emit D-Bus signal
1695
1805
client.Rejected("Disabled")
1704
1814
if self.server.use_dbus:
1705
1815
# Emit D-Bus signal
1706
1816
client.NeedApproval(
1707
client.approval_delay_milliseconds(),
1708
client.approved_by_default)
1817
client.approval_delay.total_seconds()
1818
* 1000, client.approved_by_default)
1709
1819
else:
1710
1820
logger.warning("Client %s was not approved",
1711
1821
client.name)
1717
1827
#wait until timeout or approved
1718
1828
time = datetime.datetime.now()
1719
1829
client.changedstate.acquire()
1720
(client.changedstate.wait
1721
(float(client.timedelta_to_milliseconds(delay)
1722
/ 1000)))
1830
client.changedstate.wait(delay.total_seconds())
1723
1831
client.changedstate.release()
1724
1832
time2 = datetime.datetime.now()
1725
1833
if (time2 - time) >= delay:
1744
1852
logger.warning("gnutls send failed",
1745
1853
exc_info=error)
1746
1854
return
1747
logger.debug("Sent: %d, remaining: %d",
1748
sent, len(client.secret)
1749
- (sent_size + sent))
1855
logger.debug("Sent: %d, remaining: %d", sent,
1856
len(client.secret) - (sent_size
1857
+ sent))
1750
1858
sent_size += sent
1751
1859
1752
1860
logger.info("Sending secret to %s", client.name)
1769
1877
def peer_certificate(session):
1770
1878
"Return the peer's OpenPGP certificate as a bytestring"
1771
1879
# If not an OpenPGP certificate...
1772
if (gnutls.library.functions
1773
.gnutls_certificate_type_get(session._c_object)
1880
if (gnutls.library.functions.gnutls_certificate_type_get(
1881
session._c_object)
1774
1882
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1775
1883
# ...do the normal thing
1776
1884
return session.peer_certificate
1790
1898
def fingerprint(openpgp):
1791
1899
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1792
1900
# New GnuTLS "datum" with the OpenPGP public key
1793
datum = (gnutls.library.types
1794
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1795
ctypes.POINTER
1796
(ctypes.c_ubyte)),
1797
ctypes.c_uint(len(openpgp))))
1901
datum = gnutls.library.types.gnutls_datum_t(
1902
ctypes.cast(ctypes.c_char_p(openpgp),
1903
ctypes.POINTER(ctypes.c_ubyte)),
1904
ctypes.c_uint(len(openpgp)))
1798
1905
# New empty GnuTLS certificate
1799
1906
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1800
(gnutls.library.functions
1801
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1907
gnutls.library.functions.gnutls_openpgp_crt_init(
1908
ctypes.byref(crt))
1802
1909
# Import the OpenPGP public key into the certificate
1803
(gnutls.library.functions
1804
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1805
gnutls.library.constants
1806
.GNUTLS_OPENPGP_FMT_RAW))
1910
gnutls.library.functions.gnutls_openpgp_crt_import(
1911
crt, ctypes.byref(datum),
1912
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1807
1913
# Verify the self signature in the key
1808
1914
crtverify = ctypes.c_uint()
1809
(gnutls.library.functions
1810
.gnutls_openpgp_crt_verify_self(crt, 0,
1811
ctypes.byref(crtverify)))
1915
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1916
crt, 0, ctypes.byref(crtverify))
1812
1917
if crtverify.value != 0:
1813
1918
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1814
raise (gnutls.errors.CertificateSecurityError
1815
("Verify failed"))
1919
raise gnutls.errors.CertificateSecurityError(
1920
"Verify failed")
1816
1921
# New buffer for the fingerprint
1817
1922
buf = ctypes.create_string_buffer(20)
1818
1923
buf_len = ctypes.c_size_t()
1819
1924
# Get the fingerprint from the certificate into the buffer
1820
(gnutls.library.functions
1821
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1822
ctypes.byref(buf_len)))
1925
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1926
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1823
1927
# Deinit the certificate
1824
1928
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1825
1929
# Convert the buffer to a Python bytestring
1831
1935
1832
1936
class MultiprocessingMixIn(object):
1833
1937
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1938
1834
1939
def sub_process_main(self, request, address):
1835
1940
try:
1836
1941
self.finish_request(request, address)
1841
1946
def process_request(self, request, address):
1842
1947
"""Start a new process to process the request."""
1843
1948
proc = multiprocessing.Process(target = self.sub_process_main,
1844
args = (request,
1845
address))
1949
args = (request, address))
1846
1950
proc.start()
1847
1951
return proc
1848
1952
1849
1953
1850
1954
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1851
1955
""" adds a pipe to the MixIn """
1956
1852
1957
def process_request(self, request, client_address):
1853
1958
"""Overrides and wraps the original process_request().
1854
1959
1863
1968
1864
1969
def add_pipe(self, parent_pipe, proc):
1865
1970
"""Dummy function; override as necessary"""
1866
raise NotImplementedError
1971
raise NotImplementedError()
1867
1972
1868
1973
1869
1974
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1875
1980
interface: None or a network interface name (string)
1876
1981
use_ipv6: Boolean; to use IPv6 or not
1877
1982
"""
1983
1878
1984
def __init__(self, server_address, RequestHandlerClass,
1879
interface=None, use_ipv6=True):
1985
interface=None,
1986
use_ipv6=True,
1987
socketfd=None):
1988
"""If socketfd is set, use that file descriptor instead of
1989
creating a new one with socket.socket().
1990
"""
1880
1991
self.interface = interface
1881
1992
if use_ipv6:
1882
1993
self.address_family = socket.AF_INET6
1994
if socketfd is not None:
1995
# Save the file descriptor
1996
self.socketfd = socketfd
1997
# Save the original socket.socket() function
1998
self.socket_socket = socket.socket
1999
# To implement --socket, we monkey patch socket.socket.
2000
#
2001
# (When socketserver.TCPServer is a new-style class, we
2002
# could make self.socket into a property instead of monkey
2003
# patching socket.socket.)
2004
#
2005
# Create a one-time-only replacement for socket.socket()
2006
@functools.wraps(socket.socket)
2007
def socket_wrapper(*args, **kwargs):
2008
# Restore original function so subsequent calls are
2009
# not affected.
2010
socket.socket = self.socket_socket
2011
del self.socket_socket
2012
# This time only, return a new socket object from the
2013
# saved file descriptor.
2014
return socket.fromfd(self.socketfd, *args, **kwargs)
2015
# Replace socket.socket() function with wrapper
2016
socket.socket = socket_wrapper
2017
# The socketserver.TCPServer.__init__ will call
2018
# socket.socket(), which might be our replacement,
2019
# socket_wrapper(), if socketfd was set.
1883
2020
socketserver.TCPServer.__init__(self, server_address,
1884
2021
RequestHandlerClass)
2022
1885
2023
def server_bind(self):
1886
2024
"""This overrides the normal server_bind() function
1887
2025
to bind to an interface if one was specified, and also NOT to
1893
2031
self.interface)
1894
2032
else:
1895
2033
try:
1896
self.socket.setsockopt(socket.SOL_SOCKET,
1897
SO_BINDTODEVICE,
1898
str(self.interface
1899
+ '\0'))
2034
self.socket.setsockopt(
2035
socket.SOL_SOCKET, SO_BINDTODEVICE,
2036
(self.interface + "\0").encode("utf-8"))
1900
2037
except socket.error as error:
1901
if error[0] == errno.EPERM:
1902
logger.error("No permission to"
1903
" bind to interface %s",
1904
self.interface)
1905
elif error[0] == errno.ENOPROTOOPT:
2038
if error.errno == errno.EPERM:
2039
logger.error("No permission to bind to"
2040
" interface %s", self.interface)
2041
elif error.errno == errno.ENOPROTOOPT:
1906
2042
logger.error("SO_BINDTODEVICE not available;"
1907
2043
" cannot bind to interface %s",
1908
2044
self.interface)
2045
elif error.errno == errno.ENODEV:
2046
logger.error("Interface %s does not exist,"
2047
" cannot bind", self.interface)
1909
2048
else:
1910
2049
raise
1911
2050
# Only bind(2) the socket if we really need to.
1914
2053
if self.address_family == socket.AF_INET6:
1915
2054
any_address = "::" # in6addr_any
1916
2055
else:
1917
any_address = socket.INADDR_ANY
2056
any_address = "0.0.0.0" # INADDR_ANY
1918
2057
self.server_address = (any_address,
1919
2058
self.server_address[1])
1920
2059
elif not self.server_address[1]:
1921
self.server_address = (self.server_address[0],
1922
0)
2060
self.server_address = (self.server_address[0], 0)
1923
2061
# if self.interface:
1924
2062
# self.server_address = (self.server_address[0],
1925
2063
# 0, # port
1939
2077
1940
2078
Assumes a gobject.MainLoop event loop.
1941
2079
"""
2080
1942
2081
def __init__(self, server_address, RequestHandlerClass,
1943
interface=None, use_ipv6=True, clients=None,
1944
gnutls_priority=None, use_dbus=True):
2082
interface=None,
2083
use_ipv6=True,
2084
clients=None,
2085
gnutls_priority=None,
2086
use_dbus=True,
2087
socketfd=None):
1945
2088
self.enabled = False
1946
2089
self.clients = clients
1947
2090
if self.clients is None:
1951
2094
IPv6_TCPServer.__init__(self, server_address,
1952
2095
RequestHandlerClass,
1953
2096
interface = interface,
1954
use_ipv6 = use_ipv6)
2097
use_ipv6 = use_ipv6,
2098
socketfd = socketfd)
2099
1955
2100
def server_activate(self):
1956
2101
if self.enabled:
1957
2102
return socketserver.TCPServer.server_activate(self)
1961
2106
1962
2107
def add_pipe(self, parent_pipe, proc):
1963
2108
# Call "handle_ipc" for both data and EOF events
1964
gobject.io_add_watch(parent_pipe.fileno(),
1965
gobject.IO_IN | gobject.IO_HUP,
1966
functools.partial(self.handle_ipc,
1967
parent_pipe =
1968
parent_pipe,
1969
proc = proc))
2109
gobject.io_add_watch(
2110
parent_pipe.fileno(),
2111
gobject.IO_IN | gobject.IO_HUP,
2112
functools.partial(self.handle_ipc,
2113
parent_pipe = parent_pipe,
2114
proc = proc))
1970
2115
1971
def handle_ipc(self, source, condition, parent_pipe=None,
1972
proc = None, client_object=None):
1973
condition_names = {
1974
gobject.IO_IN: "IN", # There is data to read.
1975
gobject.IO_OUT: "OUT", # Data can be written (without
1976
# blocking).
1977
gobject.IO_PRI: "PRI", # There is urgent data to read.
1978
gobject.IO_ERR: "ERR", # Error condition.
1979
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1980
# broken, usually for pipes and
1981
# sockets).
1982
}
1983
conditions_string = ' | '.join(name
1984
for cond, name in
1985
condition_names.iteritems()
1986
if cond & condition)
2116
def handle_ipc(self, source, condition,
2117
parent_pipe=None,
2118
proc = None,
2119
client_object=None):
1987
2120
# error, or the other end of multiprocessing.Pipe has closed
1988
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2121
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1989
2122
# Wait for other process to exit
1990
2123
proc.join()
1991
2124
return False
2012
2145
parent_pipe.send(False)
2013
2146
return False
2014
2147
2015
gobject.io_add_watch(parent_pipe.fileno(),
2016
gobject.IO_IN | gobject.IO_HUP,
2017
functools.partial(self.handle_ipc,
2018
parent_pipe =
2019
parent_pipe,
2020
proc = proc,
2021
client_object =
2022
client))
2148
gobject.io_add_watch(
2149
parent_pipe.fileno(),
2150
gobject.IO_IN | gobject.IO_HUP,
2151
functools.partial(self.handle_ipc,
2152
parent_pipe = parent_pipe,
2153
proc = proc,
2154
client_object = client))
2023
2155
parent_pipe.send(True)
2024
2156
# remove the old hook in favor of the new above hook on
2025
2157
# same fileno
2031
2163
2032
2164
parent_pipe.send(('data', getattr(client_object,
2033
2165
funcname)(*args,
2034
**kwargs)))
2166
**kwargs)))
2035
2167
2036
2168
if command == 'getattr':
2037
2169
attrname = request[1]
2038
if callable(client_object.__getattribute__(attrname)):
2039
parent_pipe.send(('function',))
2170
if isinstance(client_object.__getattribute__(attrname),
2171
collections.Callable):
2172
parent_pipe.send(('function', ))
2040
2173
else:
2041
parent_pipe.send(('data', client_object
2042
.__getattribute__(attrname)))
2174
parent_pipe.send((
2175
'data', client_object.__getattribute__(attrname)))
2043
2176
2044
2177
if command == 'setattr':
2045
2178
attrname = request[1]
2049
2182
return True
2050
2183
2051
2184
2185
def rfc3339_duration_to_delta(duration):
2186
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2187
2188
>>> rfc3339_duration_to_delta("P7D")
2189
datetime.timedelta(7)
2190
>>> rfc3339_duration_to_delta("PT60S")
2191
datetime.timedelta(0, 60)
2192
>>> rfc3339_duration_to_delta("PT60M")
2193
datetime.timedelta(0, 3600)
2194
>>> rfc3339_duration_to_delta("PT24H")
2195
datetime.timedelta(1)
2196
>>> rfc3339_duration_to_delta("P1W")
2197
datetime.timedelta(7)
2198
>>> rfc3339_duration_to_delta("PT5M30S")
2199
datetime.timedelta(0, 330)
2200
>>> rfc3339_duration_to_delta("P1DT3M20S")
2201
datetime.timedelta(1, 200)
2202
"""
2203
2204
# Parsing an RFC 3339 duration with regular expressions is not
2205
# possible - there would have to be multiple places for the same
2206
# values, like seconds. The current code, while more esoteric, is
2207
# cleaner without depending on a parsing library. If Python had a
2208
# built-in library for parsing we would use it, but we'd like to
2209
# avoid excessive use of external libraries.
2210
2211
# New type for defining tokens, syntax, and semantics all-in-one
2212
Token = collections.namedtuple("Token", (
2213
"regexp", # To match token; if "value" is not None, must have
2214
# a "group" containing digits
2215
"value", # datetime.timedelta or None
2216
"followers")) # Tokens valid after this token
2217
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2218
# the "duration" ABNF definition in RFC 3339, Appendix A.
2219
token_end = Token(re.compile(r"$"), None, frozenset())
2220
token_second = Token(re.compile(r"(\d+)S"),
2221
datetime.timedelta(seconds=1),
2222
frozenset((token_end, )))
2223
token_minute = Token(re.compile(r"(\d+)M"),
2224
datetime.timedelta(minutes=1),
2225
frozenset((token_second, token_end)))
2226
token_hour = Token(re.compile(r"(\d+)H"),
2227
datetime.timedelta(hours=1),
2228
frozenset((token_minute, token_end)))
2229
token_time = Token(re.compile(r"T"),
2230
None,
2231
frozenset((token_hour, token_minute,
2232
token_second)))
2233
token_day = Token(re.compile(r"(\d+)D"),
2234
datetime.timedelta(days=1),
2235
frozenset((token_time, token_end)))
2236
token_month = Token(re.compile(r"(\d+)M"),
2237
datetime.timedelta(weeks=4),
2238
frozenset((token_day, token_end)))
2239
token_year = Token(re.compile(r"(\d+)Y"),
2240
datetime.timedelta(weeks=52),
2241
frozenset((token_month, token_end)))
2242
token_week = Token(re.compile(r"(\d+)W"),
2243
datetime.timedelta(weeks=1),
2244
frozenset((token_end, )))
2245
token_duration = Token(re.compile(r"P"), None,
2246
frozenset((token_year, token_month,
2247
token_day, token_time,
2248
token_week)))
2249
# Define starting values
2250
value = datetime.timedelta() # Value so far
2251
found_token = None
2252
followers = frozenset((token_duration, )) # Following valid tokens
2253
s = duration # String left to parse
2254
# Loop until end token is found
2255
while found_token is not token_end:
2256
# Search for any currently valid tokens
2257
for token in followers:
2258
match = token.regexp.match(s)
2259
if match is not None:
2260
# Token found
2261
if token.value is not None:
2262
# Value found, parse digits
2263
factor = int(match.group(1), 10)
2264
# Add to value so far
2265
value += factor * token.value
2266
# Strip token from string
2267
s = token.regexp.sub("", s, 1)
2268
# Go to found token
2269
found_token = token
2270
# Set valid next tokens
2271
followers = found_token.followers
2272
break
2273
else:
2274
# No currently valid tokens were found
2275
raise ValueError("Invalid RFC 3339 duration: {!r}"
2276
.format(duration))
2277
# End token found
2278
return value
2279
2280
2052
2281
def string_to_delta(interval):
2053
2282
"""Parse a string and return a datetime.timedelta
2054
2283
2065
2294
>>> string_to_delta('5m 30s')
2066
2295
datetime.timedelta(0, 330)
2067
2296
"""
2297
2298
try:
2299
return rfc3339_duration_to_delta(interval)
2300
except ValueError:
2301
pass
2302
2068
2303
timevalue = datetime.timedelta(0)
2069
2304
for s in interval.split():
2070
2305
try:
2071
suffix = unicode(s[-1])
2306
suffix = s[-1]
2072
2307
value = int(s[:-1])
2073
2308
if suffix == "d":
2074
2309
delta = datetime.timedelta(value)
2081
2316
elif suffix == "w":
2082
2317
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2083
2318
else:
2084
raise ValueError("Unknown suffix {0!r}"
2085
.format(suffix))
2086
except (ValueError, IndexError) as e:
2319
raise ValueError("Unknown suffix {!r}".format(suffix))
2320
except IndexError as e:
2087
2321
raise ValueError(*(e.args))
2088
2322
timevalue += delta
2089
2323
return timevalue
2105
2339
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2106
2340
if not stat.S_ISCHR(os.fstat(null).st_mode):
2107
2341
raise OSError(errno.ENODEV,
2108
"{0} not a character device"
2342
"{} not a character device"
2109
2343
.format(os.devnull))
2110
2344
os.dup2(null, sys.stdin.fileno())
2111
2345
os.dup2(null, sys.stdout.fileno())
2121
2355
2122
2356
parser = argparse.ArgumentParser()
2123
2357
parser.add_argument("-v", "--version", action="version",
2124
version = "%(prog)s {0}".format(version),
2358
version = "%(prog)s {}".format(version),
2125
2359
help="show version number and exit")
2126
2360
parser.add_argument("-i", "--interface", metavar="IF",
2127
2361
help="Bind to interface IF")
2133
2367
help="Run self-test")
2134
2368
parser.add_argument("--debug", action="store_true",
2135
2369
help="Debug mode; run in foreground and log"
2136
" to terminal")
2370
" to terminal", default=None)
2137
2371
parser.add_argument("--debuglevel", metavar="LEVEL",
2138
2372
help="Debug level for stdout output")
2139
2373
parser.add_argument("--priority", help="GnuTLS"
2146
2380
" files")
2147
2381
parser.add_argument("--no-dbus", action="store_false",
2148
2382
dest="use_dbus", help="Do not provide D-Bus"
2149
" system bus interface")
2383
" system bus interface", default=None)
2150
2384
parser.add_argument("--no-ipv6", action="store_false",
2151
dest="use_ipv6", help="Do not use IPv6")
2385
dest="use_ipv6", help="Do not use IPv6",
2386
default=None)
2152
2387
parser.add_argument("--no-restore", action="store_false",
2153
2388
dest="restore", help="Do not restore stored"
2154
" state")
2389
" state", default=None)
2390
parser.add_argument("--socket", type=int,
2391
help="Specify a file descriptor to a network"
2392
" socket to use instead of creating one")
2155
2393
parser.add_argument("--statedir", metavar="DIR",
2156
2394
help="Directory to save/restore state in")
2395
parser.add_argument("--foreground", action="store_true",
2396
help="Run in foreground", default=None)
2397
parser.add_argument("--no-zeroconf", action="store_false",
2398
dest="zeroconf", help="Do not use Zeroconf",
2399
default=None)
2157
2400
2158
2401
options = parser.parse_args()
2159
2402
2160
2403
if options.check:
2161
2404
import doctest
2162
doctest.testmod()
2163
sys.exit()
2405
fail_count, test_count = doctest.testmod()
2406
sys.exit(os.EX_OK if fail_count == 0 else 1)
2164
2407
2165
2408
# Default values for config file for server-global settings
2166
2409
server_defaults = { "interface": "",
2168
2411
"port": "",
2169
2412
"debug": "False",
2170
2413
"priority":
2171
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2414
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2415
":+SIGN-DSA-SHA256",
2172
2416
"servicename": "Mandos",
2173
2417
"use_dbus": "True",
2174
2418
"use_ipv6": "True",
2175
2419
"debuglevel": "",
2176
2420
"restore": "True",
2177
"statedir": "/var/lib/mandos"
2178
}
2421
"socket": "",
2422
"statedir": "/var/lib/mandos",
2423
"foreground": "False",
2424
"zeroconf": "True",
2425
}
2179
2426
2180
2427
# Parse config file for server-global settings
2181
2428
server_config = configparser.SafeConfigParser(server_defaults)
2182
2429
del server_defaults
2183
server_config.read(os.path.join(options.configdir,
2184
"mandos.conf"))
2430
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2185
2431
# Convert the SafeConfigParser object to a dict
2186
2432
server_settings = server_config.defaults()
2187
2433
# Use the appropriate methods on the non-string config options
2188
for option in ("debug", "use_dbus", "use_ipv6"):
2434
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2189
2435
server_settings[option] = server_config.getboolean("DEFAULT",
2190
2436
option)
2191
2437
if server_settings["port"]:
2192
2438
server_settings["port"] = server_config.getint("DEFAULT",
2193
2439
"port")
2440
if server_settings["socket"]:
2441
server_settings["socket"] = server_config.getint("DEFAULT",
2442
"socket")
2443
# Later, stdin will, and stdout and stderr might, be dup'ed
2444
# over with an opened os.devnull. But we don't want this to
2445
# happen with a supplied network socket.
2446
if 0 <= server_settings["socket"] <= 2:
2447
server_settings["socket"] = os.dup(server_settings
2448
["socket"])
2194
2449
del server_config
2195
2450
2196
2451
# Override the settings from the config file with command line
2197
2452
# options, if set.
2198
2453
for option in ("interface", "address", "port", "debug",
2199
"priority", "servicename", "configdir",
2200
"use_dbus", "use_ipv6", "debuglevel", "restore",
2201
"statedir"):
2454
"priority", "servicename", "configdir", "use_dbus",
2455
"use_ipv6", "debuglevel", "restore", "statedir",
2456
"socket", "foreground", "zeroconf"):
2202
2457
value = getattr(options, option)
2203
2458
if value is not None:
2204
2459
server_settings[option] = value
2205
2460
del options
2206
2461
# Force all strings to be unicode
2207
2462
for option in server_settings.keys():
2208
if type(server_settings[option]) is str:
2209
server_settings[option] = unicode(server_settings[option])
2463
if isinstance(server_settings[option], bytes):
2464
server_settings[option] = (server_settings[option]
2465
.decode("utf-8"))
2466
# Force all boolean options to be boolean
2467
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2468
"foreground", "zeroconf"):
2469
server_settings[option] = bool(server_settings[option])
2470
# Debug implies foreground
2471
if server_settings["debug"]:
2472
server_settings["foreground"] = True
2210
2473
# Now we have our good server settings in "server_settings"
2211
2474
2212
2475
##################################################################
2213
2476
2477
if (not server_settings["zeroconf"]
2478
and not (server_settings["port"]
2479
or server_settings["socket"] != "")):
2480
parser.error("Needs port or socket to work without Zeroconf")
2481
2214
2482
# For convenience
2215
2483
debug = server_settings["debug"]
2216
2484
debuglevel = server_settings["debuglevel"]
2218
2486
use_ipv6 = server_settings["use_ipv6"]
2219
2487
stored_state_path = os.path.join(server_settings["statedir"],
2220
2488
stored_state_file)
2489
foreground = server_settings["foreground"]
2490
zeroconf = server_settings["zeroconf"]
2221
2491
2222
2492
if debug:
2223
2493
initlogger(debug, logging.DEBUG)
2229
2499
initlogger(debug, level)
2230
2500
2231
2501
if server_settings["servicename"] != "Mandos":
2232
syslogger.setFormatter(logging.Formatter
2233
('Mandos ({0}) [%(process)d]:'
2234
' %(levelname)s: %(message)s'
2235
.format(server_settings
2236
["servicename"])))
2502
syslogger.setFormatter(
2503
logging.Formatter('Mandos ({}) [%(process)d]:'
2504
' %(levelname)s: %(message)s'.format(
2505
server_settings["servicename"])))
2237
2506
2238
2507
# Parse config file with clients
2239
2508
client_config = configparser.SafeConfigParser(Client
2244
2513
global mandos_dbus_service
2245
2514
mandos_dbus_service = None
2246
2515
2247
tcp_server = MandosServer((server_settings["address"],
2248
server_settings["port"]),
2249
ClientHandler,
2250
interface=(server_settings["interface"]
2251
or None),
2252
use_ipv6=use_ipv6,
2253
gnutls_priority=
2254
server_settings["priority"],
2255
use_dbus=use_dbus)
2256
if not debug:
2257
pidfilename = "/var/run/mandos.pid"
2516
socketfd = None
2517
if server_settings["socket"] != "":
2518
socketfd = server_settings["socket"]
2519
tcp_server = MandosServer(
2520
(server_settings["address"], server_settings["port"]),
2521
ClientHandler,
2522
interface=(server_settings["interface"] or None),
2523
use_ipv6=use_ipv6,
2524
gnutls_priority=server_settings["priority"],
2525
use_dbus=use_dbus,
2526
socketfd=socketfd)
2527
if not foreground:
2528
pidfilename = "/run/mandos.pid"
2529
if not os.path.isdir("/run/."):
2530
pidfilename = "/var/run/mandos.pid"
2531
pidfile = None
2258
2532
try:
2259
pidfile = open(pidfilename, "w")
2533
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2260
2534
except IOError as e:
2261
2535
logger.error("Could not open file %r", pidfilename,
2262
2536
exc_info=e)
2275
2549
os.setgid(gid)
2276
2550
os.setuid(uid)
2277
2551
except OSError as error:
2278
if error[0] != errno.EPERM:
2279
raise error
2552
if error.errno != errno.EPERM:
2553
raise
2280
2554
2281
2555
if debug:
2282
2556
# Enable all possible GnuTLS debugging
2289
2563
def debug_gnutls(level, string):
2290
2564
logger.debug("GnuTLS: %s", string[:-1])
2291
2565
2292
(gnutls.library.functions
2293
.gnutls_global_set_log_function(debug_gnutls))
2566
gnutls.library.functions.gnutls_global_set_log_function(
2567
debug_gnutls)
2294
2568
2295
2569
# Redirect stdin so all checkers get /dev/null
2296
2570
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2299
2573
os.close(null)
2300
2574
2301
2575
# Need to fork before connecting to D-Bus
2302
if not debug:
2576
if not foreground:
2303
2577
# Close all input and output, do double fork, etc.
2304
2578
daemon()
2305
2579
2580
# multiprocessing will use threads, so before we use gobject we
2581
# need to inform gobject that threads will be used.
2306
2582
gobject.threads_init()
2307
2583
2308
2584
global main_loop
2314
2590
if use_dbus:
2315
2591
try:
2316
2592
bus_name = dbus.service.BusName("se.recompile.Mandos",
2317
bus, do_not_queue=True)
2318
old_bus_name = (dbus.service.BusName
2319
("se.bsnet.fukt.Mandos", bus,
2320
do_not_queue=True))
2321
except dbus.exceptions.NameExistsException as e:
2593
bus,
2594
do_not_queue=True)
2595
old_bus_name = dbus.service.BusName(
2596
"se.bsnet.fukt.Mandos", bus,
2597
do_not_queue=True)
2598
except dbus.exceptions.DBusException as e:
2322
2599
logger.error("Disabling D-Bus:", exc_info=e)
2323
2600
use_dbus = False
2324
2601
server_settings["use_dbus"] = False
2325
2602
tcp_server.use_dbus = False
2326
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2327
service = AvahiServiceToSyslog(name =
2328
server_settings["servicename"],
2329
servicetype = "_mandos._tcp",
2330
protocol = protocol, bus = bus)
2331
if server_settings["interface"]:
2332
service.interface = (if_nametoindex
2333
(str(server_settings["interface"])))
2603
if zeroconf:
2604
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2605
service = AvahiServiceToSyslog(
2606
name = server_settings["servicename"],
2607
servicetype = "_mandos._tcp",
2608
protocol = protocol,
2609
bus = bus)
2610
if server_settings["interface"]:
2611
service.interface = if_nametoindex(
2612
server_settings["interface"].encode("utf-8"))
2334
2613
2335
2614
global multiprocessing_manager
2336
2615
multiprocessing_manager = multiprocessing.Manager()
2337
2616
2338
2617
client_class = Client
2339
2618
if use_dbus:
2340
client_class = functools.partial(ClientDBusTransitional,
2341
bus = bus)
2619
client_class = functools.partial(ClientDBus, bus = bus)
2342
2620
2343
2621
client_settings = Client.config_parser(client_config)
2344
2622
old_client_settings = {}
2345
2623
clients_data = {}
2346
2624
2625
# This is used to redirect stdout and stderr for checker processes
2626
global wnull
2627
wnull = open(os.devnull, "w") # A writable /dev/null
2628
# Only used if server is running in foreground but not in debug
2629
# mode
2630
if debug or not foreground:
2631
wnull.close()
2632
2347
2633
# Get client data and settings from last running state.
2348
2634
if server_settings["restore"]:
2349
2635
try:
2350
2636
with open(stored_state_path, "rb") as stored_state:
2351
clients_data, old_client_settings = (pickle.load
2352
(stored_state))
2637
clients_data, old_client_settings = pickle.load(
2638
stored_state)
2353
2639
os.remove(stored_state_path)
2354
2640
except IOError as e:
2355
2641
if e.errno == errno.ENOENT:
2356
logger.warning("Could not load persistent state: {0}"
2357
.format(os.strerror(e.errno)))
2642
logger.warning("Could not load persistent state:"
2643
" {}".format(os.strerror(e.errno)))
2358
2644
else:
2359
2645
logger.critical("Could not load persistent state:",
2360
2646
exc_info=e)
2361
2647
raise
2362
2648
except EOFError as e:
2363
2649
logger.warning("Could not load persistent state: "
2364
"EOFError:", exc_info=e)
2650
"EOFError:",
2651
exc_info=e)
2365
2652
2366
2653
with PGPEngine() as pgp:
2367
for client_name, client in clients_data.iteritems():
2654
for client_name, client in clients_data.items():
2655
# Skip removed clients
2656
if client_name not in client_settings:
2657
continue
2658
2368
2659
# Decide which value to use after restoring saved state.
2369
2660
# We have three different values: Old config file,
2370
2661
# new config file, and saved state.
2375
2666
# For each value in new config, check if it
2376
2667
# differs from the old config value (Except for
2377
2668
# the "secret" attribute)
2378
if (name != "secret" and
2379
value != old_client_settings[client_name]
2380
[name]):
2669
if (name != "secret"
2670
and (value !=
2671
old_client_settings[client_name][name])):
2381
2672
client[name] = value
2382
2673
except KeyError:
2383
2674
pass
2384
2675
2385
2676
# Clients who has passed its expire date can still be
2386
# enabled if its last checker was successful. Clients
2677
# enabled if its last checker was successful. A Client
2387
2678
# whose checker succeeded before we stored its state is
2388
2679
# assumed to have successfully run all checkers during
2389
2680
# downtime.
2391
2682
if datetime.datetime.utcnow() >= client["expires"]:
2392
2683
if not client["last_checked_ok"]:
2393
2684
logger.warning(
2394
"disabling client {0} - Client never "
2395
"performed a successful checker"
2396
.format(client_name))
2685
"disabling client {} - Client never "
2686
"performed a successful checker".format(
2687
client_name))
2397
2688
client["enabled"] = False
2398
2689
elif client["last_checker_status"] != 0:
2399
2690
logger.warning(
2400
"disabling client {0} - Client "
2401
"last checker failed with error code {1}"
2402
.format(client_name,
2403
client["last_checker_status"]))
2691
"disabling client {} - Client last"
2692
" checker failed with error code"
2693
" {}".format(
2694
client_name,
2695
client["last_checker_status"]))
2404
2696
client["enabled"] = False
2405
2697
else:
2406
client["expires"] = (datetime.datetime
2407
.utcnow()
2408
+ client["timeout"])
2698
client["expires"] = (
2699
datetime.datetime.utcnow()
2700
+ client["timeout"])
2409
2701
logger.debug("Last checker succeeded,"
2410
" keeping {0} enabled"
2411
.format(client_name))
2702
" keeping {} enabled".format(
2703
client_name))
2412
2704
try:
2413
client["secret"] = (
2414
pgp.decrypt(client["encrypted_secret"],
2415
client_settings[client_name]
2416
["secret"]))
2705
client["secret"] = pgp.decrypt(
2706
client["encrypted_secret"],
2707
client_settings[client_name]["secret"])
2417
2708
except PGPError:
2418
2709
# If decryption fails, we use secret from new settings
2419
logger.debug("Failed to decrypt {0} old secret"
2420
.format(client_name))
2421
client["secret"] = (
2422
client_settings[client_name]["secret"])
2710
logger.debug("Failed to decrypt {} old secret".format(
2711
client_name))
2712
client["secret"] = (client_settings[client_name]
2713
["secret"])
2423
2714
2424
2715
# Add/remove clients based on new changes made to config
2425
2716
for client_name in (set(old_client_settings)
2430
2721
clients_data[client_name] = client_settings[client_name]
2431
2722
2432
2723
# Create all client objects
2433
for client_name, client in clients_data.iteritems():
2724
for client_name, client in clients_data.items():
2434
2725
tcp_server.clients[client_name] = client_class(
2435
name = client_name, settings = client)
2726
name = client_name,
2727
settings = client,
2728
server_settings = server_settings)
2436
2729
2437
2730
if not tcp_server.clients:
2438
2731
logger.warning("No clients defined")
2439
2732
2440
if not debug:
2441
try:
2442
with pidfile:
2443
pid = os.getpid()
2444
pidfile.write(str(pid) + "\n".encode("utf-8"))
2445
del pidfile
2446
except IOError:
2447
logger.error("Could not write to file %r with PID %d",
2448
pidfilename, pid)
2449
except NameError:
2450
# "pidfile" was never created
2451
pass
2733
if not foreground:
2734
if pidfile is not None:
2735
pid = os.getpid()
2736
try:
2737
with pidfile:
2738
print(pid, file=pidfile)
2739
except IOError:
2740
logger.error("Could not write to file %r with PID %d",
2741
pidfilename, pid)
2742
del pidfile
2452
2743
del pidfilename
2453
signal.signal(signal.SIGINT, signal.SIG_IGN)
2454
2744
2455
2745
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2456
2746
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2457
2747
2458
2748
if use_dbus:
2749
2750
@alternate_dbus_interfaces(
2751
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2459
2752
class MandosDBusService(DBusObjectWithProperties):
2460
2753
"""A D-Bus proxy object"""
2754
2461
2755
def __init__(self):
2462
2756
dbus.service.Object.__init__(self, bus, "/")
2757
2463
2758
_interface = "se.recompile.Mandos"
2464
2759
2465
2760
@dbus_interface_annotations(_interface)
2466
2761
def _foo(self):
2467
return { "org.freedesktop.DBus.Property"
2468
".EmitsChangedSignal":
2469
"false"}
2762
return {
2763
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2764
"false" }
2470
2765
2471
2766
@dbus.service.signal(_interface, signature="o")
2472
2767
def ClientAdded(self, objpath):
2486
2781
@dbus.service.method(_interface, out_signature="ao")
2487
2782
def GetAllClients(self):
2488
2783
"D-Bus method"
2489
return dbus.Array(c.dbus_object_path
2490
for c in
2784
return dbus.Array(c.dbus_object_path for c in
2491
2785
tcp_server.clients.itervalues())
2492
2786
2493
2787
@dbus.service.method(_interface,
2495
2789
def GetAllClientsWithProperties(self):
2496
2790
"D-Bus method"
2497
2791
return dbus.Dictionary(
2498
((c.dbus_object_path, c.GetAll(""))
2499
for c in tcp_server.clients.itervalues()),
2792
{ c.dbus_object_path: c.GetAll("")
2793
for c in tcp_server.clients.itervalues() },
2500
2794
signature="oa{sv}")
2501
2795
2502
2796
@dbus.service.method(_interface, in_signature="o")
2515
2809
2516
2810
del _interface
2517
2811
2518
class MandosDBusServiceTransitional(MandosDBusService):
2519
__metaclass__ = AlternateDBusNamesMetaclass
2520
mandos_dbus_service = MandosDBusServiceTransitional()
2812
mandos_dbus_service = MandosDBusService()
2521
2813
2522
2814
def cleanup():
2523
2815
"Cleanup function; run on exit"
2524
service.cleanup()
2816
if zeroconf:
2817
service.cleanup()
2525
2818
2526
2819
multiprocessing.active_children()
2820
wnull.close()
2527
2821
if not (tcp_server.clients or client_settings):
2528
2822
return
2529
2823
2540
2834
2541
2835
# A list of attributes that can not be pickled
2542
2836
# + secret.
2543
exclude = set(("bus", "changedstate", "secret",
2544
"checker"))
2545
for name, typ in (inspect.getmembers
2546
(dbus.service.Object)):
2837
exclude = { "bus", "changedstate", "secret",
2838
"checker", "server_settings" }
2839
for name, typ in inspect.getmembers(dbus.service
2840
.Object):
2547
2841
exclude.add(name)
2548
2842
2549
2843
client_dict["encrypted_secret"] = (client
2556
2850
del client_settings[client.name]["secret"]
2557
2851
2558
2852
try:
2559
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2560
prefix="clients-",
2561
dir=os.path.dirname
2562
(stored_state_path))
2563
with os.fdopen(tempfd, "wb") as stored_state:
2853
with tempfile.NamedTemporaryFile(
2854
mode='wb',
2855
suffix=".pickle",
2856
prefix='clients-',
2857
dir=os.path.dirname(stored_state_path),
2858
delete=False) as stored_state:
2564
2859
pickle.dump((clients, client_settings), stored_state)
2860
tempname = stored_state.name
2565
2861
os.rename(tempname, stored_state_path)
2566
2862
except (IOError, OSError) as e:
2567
2863
if not debug:
2570
2866
except NameError:
2571
2867
pass
2572
2868
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2573
logger.warning("Could not save persistent state: {0}"
2869
logger.warning("Could not save persistent state: {}"
2574
2870
.format(os.strerror(e.errno)))
2575
2871
else:
2576
2872
logger.warning("Could not save persistent state:",
2577
2873
exc_info=e)
2578
raise e
2874
raise
2579
2875
2580
2876
# Delete all clients, and settings from config
2581
2877
while tcp_server.clients:
2586
2882
client.disable(quiet=True)
2587
2883
if use_dbus:
2588
2884
# Emit D-Bus signal
2589
mandos_dbus_service.ClientRemoved(client
2590
.dbus_object_path,
2591
client.name)
2885
mandos_dbus_service.ClientRemoved(
2886
client.dbus_object_path, client.name)
2592
2887
client_settings.clear()
2593
2888
2594
2889
atexit.register(cleanup)
2605
2900
tcp_server.server_activate()
2606
2901
2607
2902
# Find out what port we got
2608
service.port = tcp_server.socket.getsockname()[1]
2903
if zeroconf:
2904
service.port = tcp_server.socket.getsockname()[1]
2609
2905
if use_ipv6:
2610
2906
logger.info("Now listening on address %r, port %d,"
2611
2907
" flowinfo %d, scope_id %d",
2617
2913
#service.interface = tcp_server.socket.getsockname()[3]
2618
2914
2619
2915
try:
2620
# From the Avahi example code
2621
try:
2622
service.activate()
2623
except dbus.exceptions.DBusException as error:
2624
logger.critical("D-Bus Exception", exc_info=error)
2625
cleanup()
2626
sys.exit(1)
2627
# End of Avahi example code
2916
if zeroconf:
2917
# From the Avahi example code
2918
try:
2919
service.activate()
2920
except dbus.exceptions.DBusException as error:
2921
logger.critical("D-Bus Exception", exc_info=error)
2922
cleanup()
2923
sys.exit(1)
2924
# End of Avahi example code
2628
2925
2629
2926
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2630
2927
lambda *args, **kwargs:
2645
2942
# Must run before the D-Bus bus name gets deregistered
2646
2943
cleanup()
2647
2944
2945
2648
2946
if __name__ == '__main__':
2649
2947
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0