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