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