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