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:
- network-hooks.d
- files modified:
- .bzrignore
added
removed
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
14
# Copyright © 2008-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
37
import SocketServer as socketserver
40
38
import socket
41
39
import argparse
65
63
import cPickle as pickle
66
64
import multiprocessing
67
65
import types
68
import binascii
69
import tempfile
70
import itertools
66
import hashlib
71
67
72
68
import dbus
73
69
import dbus.service
78
74
import ctypes.util
79
75
import xml.dom.minidom
80
76
import inspect
81
import GnuPGInterface
77
import Crypto.Cipher.AES
82
78
83
79
try:
84
80
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
88
84
except ImportError:
89
85
SO_BINDTODEVICE = None
90
86
91
version = "1.5.4"
92
stored_state_file = "clients.pickle"
87
88
version = "1.4.1"
93
89
94
90
logger = logging.getLogger()
91
stored_state_path = "/var/lib/mandos/clients.pickle"
92
95
93
syslogger = (logging.handlers.SysLogHandler
96
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
95
address = str("/dev/log")))
98
99
try:
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
102
.if_nametoindex)
103
except (OSError, AttributeError):
104
def if_nametoindex(interface):
105
"Get an interface index the hard way, i.e. using fcntl()"
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
107
with contextlib.closing(socket.socket()) as s:
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
struct.pack(str("16s16x"),
110
interface))
111
interface_index = struct.unpack(str("I"),
112
ifreq[16:20])[0]
113
return interface_index
114
115
116
def initlogger(debug, level=logging.WARNING):
117
"""init logger and add loglevel"""
118
119
syslogger.setFormatter(logging.Formatter
120
('Mandos [%(process)d]: %(levelname)s:'
121
' %(message)s'))
122
logger.addHandler(syslogger)
123
124
if debug:
125
console = logging.StreamHandler()
126
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
127
' [%(process)d]:'
128
' %(levelname)s:'
129
' %(message)s'))
130
logger.addHandler(console)
131
logger.setLevel(level)
132
133
134
class PGPError(Exception):
135
"""Exception if encryption/decryption fails"""
136
pass
137
138
139
class PGPEngine(object):
140
"""A simple class for OpenPGP symmetric encryption & decryption"""
141
def __init__(self):
142
self.gnupg = GnuPGInterface.GnuPG()
143
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
144
self.gnupg = GnuPGInterface.GnuPG()
145
self.gnupg.options.meta_interactive = False
146
self.gnupg.options.homedir = self.tempdir
147
self.gnupg.options.extra_args.extend(['--force-mdc',
148
'--quiet',
149
'--no-use-agent'])
150
151
def __enter__(self):
152
return self
153
154
def __exit__ (self, exc_type, exc_value, traceback):
155
self._cleanup()
156
return False
157
158
def __del__(self):
159
self._cleanup()
160
161
def _cleanup(self):
162
if self.tempdir is not None:
163
# Delete contents of tempdir
164
for root, dirs, files in os.walk(self.tempdir,
165
topdown = False):
166
for filename in files:
167
os.remove(os.path.join(root, filename))
168
for dirname in dirs:
169
os.rmdir(os.path.join(root, dirname))
170
# Remove tempdir
171
os.rmdir(self.tempdir)
172
self.tempdir = None
173
174
def password_encode(self, password):
175
# Passphrase can not be empty and can not contain newlines or
176
# NUL bytes. So we prefix it and hex encode it.
177
return b"mandos" + binascii.hexlify(password)
178
179
def encrypt(self, data, password):
180
self.gnupg.passphrase = self.password_encode(password)
181
with open(os.devnull, "w") as devnull:
182
try:
183
proc = self.gnupg.run(['--symmetric'],
184
create_fhs=['stdin', 'stdout'],
185
attach_fhs={'stderr': devnull})
186
with contextlib.closing(proc.handles['stdin']) as f:
187
f.write(data)
188
with contextlib.closing(proc.handles['stdout']) as f:
189
ciphertext = f.read()
190
proc.wait()
191
except IOError as e:
192
raise PGPError(e)
193
self.gnupg.passphrase = None
194
return ciphertext
195
196
def decrypt(self, data, password):
197
self.gnupg.passphrase = self.password_encode(password)
198
with open(os.devnull, "w") as devnull:
199
try:
200
proc = self.gnupg.run(['--decrypt'],
201
create_fhs=['stdin', 'stdout'],
202
attach_fhs={'stderr': devnull})
203
with contextlib.closing(proc.handles['stdin']) as f:
204
f.write(data)
205
with contextlib.closing(proc.handles['stdout']) as f:
206
decrypted_plaintext = f.read()
207
proc.wait()
208
except IOError as e:
209
raise PGPError(e)
210
self.gnupg.passphrase = None
211
return decrypted_plaintext
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)
212
107
213
108
214
109
class AvahiError(Exception):
245
140
server: D-Bus Server
246
141
bus: dbus.SystemBus()
247
142
"""
248
249
143
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
250
144
servicetype = None, port = None, TXT = None,
251
145
domain = "", host = "", max_renames = 32768,
264
158
self.server = None
265
159
self.bus = bus
266
160
self.entry_group_state_changed_match = None
267
268
161
def rename(self):
269
162
"""Derived from the Avahi example code"""
270
163
if self.rename_count >= self.max_renames:
280
173
try:
281
174
self.add()
282
175
except dbus.exceptions.DBusException as error:
283
logger.critical("D-Bus Exception", exc_info=error)
176
logger.critical("DBusException: %s", error)
284
177
self.cleanup()
285
178
os._exit(1)
286
179
self.rename_count += 1
287
288
180
def remove(self):
289
181
"""Derived from the Avahi example code"""
290
182
if self.entry_group_state_changed_match is not None:
292
184
self.entry_group_state_changed_match = None
293
185
if self.group is not None:
294
186
self.group.Reset()
295
296
187
def add(self):
297
188
"""Derived from the Avahi example code"""
298
189
self.remove()
315
206
dbus.UInt16(self.port),
316
207
avahi.string_array_to_txt_array(self.TXT))
317
208
self.group.Commit()
318
319
209
def entry_group_state_changed(self, state, error):
320
210
"""Derived from the Avahi example code"""
321
211
logger.debug("Avahi entry group state change: %i", state)
328
218
elif state == avahi.ENTRY_GROUP_FAILURE:
329
219
logger.critical("Avahi: Error in group state changed %s",
330
220
unicode(error))
331
raise AvahiGroupError("State changed: {0!s}"
332
.format(error))
333
221
raise AvahiGroupError("State changed: %s"
222
% unicode(error))
334
223
def cleanup(self):
335
224
"""Derived from the Avahi example code"""
336
225
if self.group is not None:
337
226
try:
338
227
self.group.Free()
339
228
except (dbus.exceptions.UnknownMethodException,
340
dbus.exceptions.DBusException):
229
dbus.exceptions.DBusException) as e:
341
230
pass
342
231
self.group = None
343
232
self.remove()
344
345
233
def server_state_changed(self, state, error=None):
346
234
"""Derived from the Avahi example code"""
347
235
logger.debug("Avahi server state change: %i", state)
366
254
logger.debug("Unknown state: %r", state)
367
255
else:
368
256
logger.debug("Unknown state: %r: %r", state, error)
369
370
257
def activate(self):
371
258
"""Derived from the Avahi example code"""
372
259
if self.server is None:
379
266
self.server_state_changed)
380
267
self.server_state_changed(self.server.GetState())
381
268
382
383
269
class AvahiServiceToSyslog(AvahiService):
384
270
def rename(self):
385
271
"""Add the new name to the syslog messages"""
386
272
ret = AvahiService.rename(self)
387
273
syslogger.setFormatter(logging.Formatter
388
('Mandos ({0}) [%(process)d]:'
389
' %(levelname)s: %(message)s'
390
.format(self.name)))
274
('Mandos (%s) [%%(process)d]:'
275
' %%(levelname)s: %%(message)s'
276
% self.name))
391
277
return ret
392
278
393
394
def timedelta_to_milliseconds(td):
279
def _timedelta_to_milliseconds(td):
395
280
"Convert a datetime.timedelta() to milliseconds"
396
281
return ((td.days * 24 * 60 * 60 * 1000)
397
282
+ (td.seconds * 1000)
398
283
+ (td.microseconds // 1000))
399
400
284
401
285
class Client(object):
402
286
"""A representation of a client host served by this server.
403
287
404
288
Attributes:
405
approved: bool(); 'None' if not yet approved/disapproved
289
_approved: bool(); 'None' if not yet approved/disapproved
406
290
approval_delay: datetime.timedelta(); Time to wait for approval
407
291
approval_duration: datetime.timedelta(); Duration of one approval
408
292
checker: subprocess.Popen(); a running checker process used
426
310
interval: datetime.timedelta(); How often to start a new checker
427
311
last_approval_request: datetime.datetime(); (UTC) or None
428
312
last_checked_ok: datetime.datetime(); (UTC) or None
429
last_checker_status: integer between 0 and 255 reflecting exit
430
status of last checker. -1 reflects crashed
431
checker, -2 means no checker completed yet.
432
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)
433
317
name: string; from the config file, used in log messages and
434
318
D-Bus identifiers
435
319
secret: bytestring; sent verbatim (over TLS) to client
436
320
timeout: datetime.timedelta(); How long from last_checked_ok
437
321
until this client is disabled
438
extended_timeout: extra long timeout when secret has been sent
322
extended_timeout: extra long timeout when password has been sent
439
323
runtime_expansions: Allowed attributes for runtime expansion.
440
324
expires: datetime.datetime(); time (UTC) when a client will be
441
325
disabled, or None
442
326
"""
443
327
444
328
runtime_expansions = ("approval_delay", "approval_duration",
445
"created", "enabled", "expires",
446
"fingerprint", "host", "interval",
447
"last_approval_request", "last_checked_ok",
329
"created", "enabled", "fingerprint",
330
"host", "interval", "last_checked_ok",
448
331
"last_enabled", "name", "timeout")
449
client_defaults = { "timeout": "5m",
450
"extended_timeout": "15m",
451
"interval": "2m",
452
"checker": "fping -q -- %%(host)s",
453
"host": "",
454
"approval_delay": "0s",
455
"approval_duration": "1s",
456
"approved_by_default": "True",
457
"enabled": "True",
458
}
459
332
460
333
def timeout_milliseconds(self):
461
334
"Return the 'timeout' attribute in milliseconds"
462
return timedelta_to_milliseconds(self.timeout)
335
return _timedelta_to_milliseconds(self.timeout)
463
336
464
337
def extended_timeout_milliseconds(self):
465
338
"Return the 'extended_timeout' attribute in milliseconds"
466
return timedelta_to_milliseconds(self.extended_timeout)
339
return _timedelta_to_milliseconds(self.extended_timeout)
467
340
468
341
def interval_milliseconds(self):
469
342
"Return the 'interval' attribute in milliseconds"
470
return timedelta_to_milliseconds(self.interval)
343
return _timedelta_to_milliseconds(self.interval)
471
344
472
345
def approval_delay_milliseconds(self):
473
return timedelta_to_milliseconds(self.approval_delay)
474
475
@staticmethod
476
def config_parser(config):
477
"""Construct a new dict of client settings of this form:
478
{ client_name: {setting_name: value, ...}, ...}
479
with exceptions for any special settings as defined above.
480
NOTE: Must be a pure function. Must return the same result
481
value given the same arguments.
482
"""
483
settings = {}
484
for client_name in config.sections():
485
section = dict(config.items(client_name))
486
client = settings[client_name] = {}
487
488
client["host"] = section["host"]
489
# Reformat values from string types to Python types
490
client["approved_by_default"] = config.getboolean(
491
client_name, "approved_by_default")
492
client["enabled"] = config.getboolean(client_name,
493
"enabled")
494
495
client["fingerprint"] = (section["fingerprint"].upper()
496
.replace(" ", ""))
497
if "secret" in section:
498
client["secret"] = section["secret"].decode("base64")
499
elif "secfile" in section:
500
with open(os.path.expanduser(os.path.expandvars
501
(section["secfile"])),
502
"rb") as secfile:
503
client["secret"] = secfile.read()
504
else:
505
raise TypeError("No secret or secfile for section {0}"
506
.format(section))
507
client["timeout"] = string_to_delta(section["timeout"])
508
client["extended_timeout"] = string_to_delta(
509
section["extended_timeout"])
510
client["interval"] = string_to_delta(section["interval"])
511
client["approval_delay"] = string_to_delta(
512
section["approval_delay"])
513
client["approval_duration"] = string_to_delta(
514
section["approval_duration"])
515
client["checker_command"] = section["checker"]
516
client["last_approval_request"] = None
517
client["last_checked_ok"] = None
518
client["last_checker_status"] = -2
519
520
return settings
521
522
def __init__(self, settings, name = None):
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."""
523
352
self.name = name
524
# adding all client settings
525
for setting, value in settings.iteritems():
526
setattr(self, setting, value)
527
528
if self.enabled:
529
if not hasattr(self, "last_enabled"):
530
self.last_enabled = datetime.datetime.utcnow()
531
if not hasattr(self, "expires"):
532
self.expires = (datetime.datetime.utcnow()
533
+ self.timeout)
534
else:
535
self.last_enabled = None
536
self.expires = None
537
353
if config is None:
354
config = {}
538
355
logger.debug("Creating client %r", self.name)
539
356
# Uppercase and remove spaces from fingerprint for later
540
357
# comparison purposes with return value from the fingerprint()
541
358
# function
359
self.fingerprint = (config["fingerprint"].upper()
360
.replace(" ", ""))
542
361
logger.debug(" Fingerprint: %s", self.fingerprint)
543
self.created = settings.get("created",
544
datetime.datetime.utcnow())
545
546
# 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"])
547
383
self.checker = None
548
384
self.checker_initiator_tag = None
549
385
self.disable_initiator_tag = None
386
self.expires = datetime.datetime.utcnow() + self.timeout
550
387
self.checker_callback_tag = None
388
self.checker_command = config["checker"]
551
389
self.current_checker_command = None
552
self.approved = None
390
self._approved = None
391
self.approved_by_default = config.get("approved_by_default",
392
True)
553
393
self.approvals_pending = 0
394
self.approval_delay = string_to_delta(
395
config["approval_delay"])
396
self.approval_duration = string_to_delta(
397
config["approval_duration"])
554
398
self.changedstate = (multiprocessing_manager
555
399
.Condition(multiprocessing_manager
556
400
.Lock()))
557
self.client_structure = [attr for attr in
558
self.__dict__.iterkeys()
559
if not attr.startswith("_")]
401
self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
560
402
self.client_structure.append("client_structure")
561
403
404
562
405
for name, t in inspect.getmembers(type(self),
563
lambda obj:
564
isinstance(obj,
565
property)):
406
lambda obj: isinstance(obj, property)):
566
407
if not name.startswith("_"):
567
408
self.client_structure.append(name)
568
409
576
417
if getattr(self, "enabled", False):
577
418
# Already enabled
578
419
return
420
self.send_changedstate()
579
421
self.expires = datetime.datetime.utcnow() + self.timeout
580
422
self.enabled = True
581
423
self.last_enabled = datetime.datetime.utcnow()
582
424
self.init_checker()
583
self.send_changedstate()
584
425
585
426
def disable(self, quiet=True):
586
427
"""Disable this client."""
587
428
if not getattr(self, "enabled", False):
588
429
return False
589
430
if not quiet:
431
self.send_changedstate()
432
if not quiet:
590
433
logger.info("Disabling client %s", self.name)
591
if getattr(self, "disable_initiator_tag", None) is not None:
434
if getattr(self, "disable_initiator_tag", False):
592
435
gobject.source_remove(self.disable_initiator_tag)
593
436
self.disable_initiator_tag = None
594
437
self.expires = None
595
if getattr(self, "checker_initiator_tag", None) is not None:
438
if getattr(self, "checker_initiator_tag", False):
596
439
gobject.source_remove(self.checker_initiator_tag)
597
440
self.checker_initiator_tag = None
598
441
self.stop_checker()
599
442
self.enabled = False
600
if not quiet:
601
self.send_changedstate()
602
443
# Do not run this again if called by a gobject.timeout_add
603
444
return False
604
445
605
446
def __del__(self):
606
447
self.disable()
607
448
608
449
def init_checker(self):
609
450
# Schedule a new checker to be started an 'interval' from now,
610
451
# and every interval from then on.
611
if self.checker_initiator_tag is not None:
612
gobject.source_remove(self.checker_initiator_tag)
613
452
self.checker_initiator_tag = (gobject.timeout_add
614
453
(self.interval_milliseconds(),
615
454
self.start_checker))
616
455
# Schedule a disable() when 'timeout' has passed
617
if self.disable_initiator_tag is not None:
618
gobject.source_remove(self.disable_initiator_tag)
619
456
self.disable_initiator_tag = (gobject.timeout_add
620
457
(self.timeout_milliseconds(),
621
458
self.disable))
622
459
# Also start a new checker *right now*.
623
460
self.start_checker()
624
461
462
625
463
def checker_callback(self, pid, condition, command):
626
464
"""The checker has completed, so take appropriate actions."""
627
465
self.checker_callback_tag = None
628
466
self.checker = None
629
467
if os.WIFEXITED(condition):
630
self.last_checker_status = os.WEXITSTATUS(condition)
468
self.last_checker_status = os.WEXITSTATUS(condition)
631
469
if self.last_checker_status == 0:
632
470
logger.info("Checker for %(name)s succeeded",
633
471
vars(self))
640
478
logger.warning("Checker for %(name)s crashed?",
641
479
vars(self))
642
480
643
def checked_ok(self):
644
"""Assert that the client has been seen, alive and well."""
645
self.last_checked_ok = datetime.datetime.utcnow()
646
self.last_checker_status = 0
647
self.bump_timeout()
648
649
def bump_timeout(self, timeout=None):
650
"""Bump up the timeout for this client."""
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
"""
651
487
if timeout is None:
652
488
timeout = self.timeout
489
self.last_checked_ok = datetime.datetime.utcnow()
653
490
if self.disable_initiator_tag is not None:
654
491
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = None
656
492
if getattr(self, "enabled", False):
657
493
self.disable_initiator_tag = (gobject.timeout_add
658
(timedelta_to_milliseconds
494
(_timedelta_to_milliseconds
659
495
(timeout), self.disable))
660
496
self.expires = datetime.datetime.utcnow() + timeout
661
497
668
504
If a checker already exists, leave it running and do
669
505
nothing."""
670
506
# The reason for not killing a running checker is that if we
671
# did that, and if a checker (for some reason) started running
672
# slowly and taking more than 'interval' time, then the client
673
# would inevitably timeout, since no checker would get a
674
# 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
675
511
# checkers alone, the checker would have to take more time
676
512
# than 'timeout' for the client to be disabled, which is as it
677
513
# should be.
691
527
self.current_checker_command)
692
528
# Start a new checker if needed
693
529
if self.checker is None:
694
# Escape attributes for the shell
695
escaped_attrs = dict(
696
(attr, re.escape(unicode(getattr(self, attr))))
697
for attr in
698
self.runtime_expansions)
699
530
try:
700
command = self.checker_command % escaped_attrs
701
except TypeError as error:
702
logger.error('Could not format string "%s"',
703
self.checker_command, exc_info=error)
704
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
705
549
self.current_checker_command = command
706
550
try:
707
551
logger.info("Starting checker %r for %s",
713
557
self.checker = subprocess.Popen(command,
714
558
close_fds=True,
715
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)
716
570
except OSError as error:
717
logger.error("Failed to start subprocess",
718
exc_info=error)
719
self.checker_callback_tag = (gobject.child_watch_add
720
(self.checker.pid,
721
self.checker_callback,
722
data=command))
723
# The checker may have completed before the gobject
724
# watch was added. Check for this.
725
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
726
if pid:
727
gobject.source_remove(self.checker_callback_tag)
728
self.checker_callback(pid, status, command)
571
logger.error("Failed to start subprocess: %s",
572
error)
729
573
# Re-run this periodically if run by gobject.timeout_add
730
574
return True
731
575
738
582
return
739
583
logger.debug("Stopping checker for %(name)s", vars(self))
740
584
try:
741
self.checker.terminate()
585
os.kill(self.checker.pid, signal.SIGTERM)
742
586
#time.sleep(0.5)
743
587
#if self.checker.poll() is None:
744
# self.checker.kill()
588
# os.kill(self.checker.pid, signal.SIGKILL)
745
589
except OSError as error:
746
590
if error.errno != errno.ESRCH: # No such process
747
591
raise
748
592
self.checker = None
749
593
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
750
640
751
641
def dbus_service_property(dbus_interface, signature="v",
752
642
access="readwrite", byte_arrays=False):
764
654
# "Set" method, so we fail early here:
765
655
if byte_arrays and signature != "ay":
766
656
raise ValueError("Byte arrays not supported for non-'ay'"
767
" signature {0!r}".format(signature))
657
" signature %r" % signature)
768
658
def decorator(func):
769
659
func._dbus_is_property = True
770
660
func._dbus_interface = dbus_interface
778
668
return decorator
779
669
780
670
781
def dbus_interface_annotations(dbus_interface):
782
"""Decorator for marking functions returning interface annotations
783
784
Usage:
785
786
@dbus_interface_annotations("org.example.Interface")
787
def _foo(self): # Function name does not matter
788
return {"org.freedesktop.DBus.Deprecated": "true",
789
"org.freedesktop.DBus.Property.EmitsChangedSignal":
790
"false"}
791
"""
792
def decorator(func):
793
func._dbus_is_interface = True
794
func._dbus_interface = dbus_interface
795
func._dbus_name = dbus_interface
796
return func
797
return decorator
798
799
800
def dbus_annotations(annotations):
801
"""Decorator to annotate D-Bus methods, signals or properties
802
Usage:
803
804
@dbus_service_property("org.example.Interface", signature="b",
805
access="r")
806
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
807
"org.freedesktop.DBus.Property."
808
"EmitsChangedSignal": "false"})
809
def Property_dbus_property(self):
810
return dbus.Boolean(False)
811
"""
812
def decorator(func):
813
func._dbus_annotations = annotations
814
return func
815
return decorator
816
817
818
671
class DBusPropertyException(dbus.exceptions.DBusException):
819
672
"""A base class for D-Bus property-related exceptions
820
673
"""
843
696
"""
844
697
845
698
@staticmethod
846
def _is_dbus_thing(thing):
847
"""Returns a function testing if an attribute is a D-Bus thing
848
849
If called like _is_dbus_thing("method") it returns a function
850
suitable for use as predicate to inspect.getmembers().
851
"""
852
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
853
False)
699
def _is_dbus_property(obj):
700
return getattr(obj, "_dbus_is_property", False)
854
701
855
def _get_all_dbus_things(self, thing):
702
def _get_all_dbus_properties(self):
856
703
"""Returns a generator of (name, attribute) pairs
857
704
"""
858
return ((getattr(athing.__get__(self), "_dbus_name",
859
name),
860
athing.__get__(self))
705
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
861
706
for cls in self.__class__.__mro__
862
for name, athing in
863
inspect.getmembers(cls,
864
self._is_dbus_thing(thing)))
707
for name, prop in
708
inspect.getmembers(cls, self._is_dbus_property))
865
709
866
710
def _get_dbus_property(self, interface_name, property_name):
867
711
"""Returns a bound method if one exists which is a D-Bus
869
713
"""
870
714
for cls in self.__class__.__mro__:
871
715
for name, value in (inspect.getmembers
872
(cls,
873
self._is_dbus_thing("property"))):
716
(cls, self._is_dbus_property)):
874
717
if (value._dbus_name == property_name
875
718
and value._dbus_interface == interface_name):
876
719
return value.__get__(self)
905
748
# signatures other than "ay".
906
749
if prop._dbus_signature != "ay":
907
750
raise ValueError
908
value = dbus.ByteArray(b''.join(chr(byte)
909
for byte in value))
751
value = dbus.ByteArray(''.join(unichr(byte)
752
for byte in value))
910
753
prop(value)
911
754
912
755
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
917
760
918
761
Note: Will not include properties with access="write".
919
762
"""
920
properties = {}
921
for name, prop in self._get_all_dbus_things("property"):
763
all = {}
764
for name, prop in self._get_all_dbus_properties():
922
765
if (interface_name
923
766
and interface_name != prop._dbus_interface):
924
767
# Interface non-empty but did not match
928
771
continue
929
772
value = prop()
930
773
if not hasattr(value, "variant_level"):
931
properties[name] = value
774
all[name] = value
932
775
continue
933
properties[name] = type(value)(value, variant_level=
934
value.variant_level+1)
935
return dbus.Dictionary(properties, signature="sv")
776
all[name] = type(value)(value, variant_level=
777
value.variant_level+1)
778
return dbus.Dictionary(all, signature="sv")
936
779
937
780
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
938
781
out_signature="s",
939
782
path_keyword='object_path',
940
783
connection_keyword='connection')
941
784
def Introspect(self, object_path, connection):
942
"""Overloading of standard D-Bus method.
943
944
Inserts property tags and interface annotation tags.
785
"""Standard D-Bus method, overloaded to insert property tags.
945
786
"""
946
787
xmlstring = dbus.service.Object.Introspect(self, object_path,
947
788
connection)
954
795
e.setAttribute("access", prop._dbus_access)
955
796
return e
956
797
for if_tag in document.getElementsByTagName("interface"):
957
# Add property tags
958
798
for tag in (make_tag(document, name, prop)
959
799
for name, prop
960
in self._get_all_dbus_things("property")
800
in self._get_all_dbus_properties()
961
801
if prop._dbus_interface
962
802
== if_tag.getAttribute("name")):
963
803
if_tag.appendChild(tag)
964
# Add annotation tags
965
for typ in ("method", "signal", "property"):
966
for tag in if_tag.getElementsByTagName(typ):
967
annots = dict()
968
for name, prop in (self.
969
_get_all_dbus_things(typ)):
970
if (name == tag.getAttribute("name")
971
and prop._dbus_interface
972
== if_tag.getAttribute("name")):
973
annots.update(getattr
974
(prop,
975
"_dbus_annotations",
976
{}))
977
for name, value in annots.iteritems():
978
ann_tag = document.createElement(
979
"annotation")
980
ann_tag.setAttribute("name", name)
981
ann_tag.setAttribute("value", value)
982
tag.appendChild(ann_tag)
983
# Add interface annotation tags
984
for annotation, value in dict(
985
itertools.chain.from_iterable(
986
annotations().iteritems()
987
for name, annotations in
988
self._get_all_dbus_things("interface")
989
if name == if_tag.getAttribute("name")
990
)).iteritems():
991
ann_tag = document.createElement("annotation")
992
ann_tag.setAttribute("name", annotation)
993
ann_tag.setAttribute("value", value)
994
if_tag.appendChild(ann_tag)
995
804
# Add the names to the return values for the
996
805
# "org.freedesktop.DBus.Properties" methods
997
806
if (if_tag.getAttribute("name")
1012
821
except (AttributeError, xml.dom.DOMException,
1013
822
xml.parsers.expat.ExpatError) as error:
1014
823
logger.error("Failed to override Introspection method",
1015
exc_info=error)
824
error)
1016
825
return xmlstring
1017
826
1018
827
1023
832
return dbus.String(dt.isoformat(),
1024
833
variant_level=variant_level)
1025
834
1026
1027
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1028
"""A class decorator; applied to a subclass of
1029
dbus.service.Object, it will add alternate D-Bus attributes with
1030
interface names according to the "alt_interface_names" mapping.
1031
Usage:
1032
1033
@alternate_dbus_names({"org.example.Interface":
1034
"net.example.AlternateInterface"})
1035
class SampleDBusObject(dbus.service.Object):
1036
@dbus.service.method("org.example.Interface")
1037
def SampleDBusMethod():
1038
pass
1039
1040
The above "SampleDBusMethod" on "SampleDBusObject" will be
1041
reachable via two interfaces: "org.example.Interface" and
1042
"net.example.AlternateInterface", the latter of which will have
1043
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1044
"true", unless "deprecate" is passed with a False value.
1045
1046
This works for methods and signals, and also for D-Bus properties
1047
(from DBusObjectWithProperties) and interfaces (from the
1048
dbus_interface_annotations decorator).
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.
1049
839
"""
1050
def wrapper(cls):
1051
for orig_interface_name, alt_interface_name in (
1052
alt_interface_names.iteritems()):
1053
attr = {}
1054
interface_names = set()
1055
# Go though all attributes of the class
1056
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):
1057
847
# Ignore non-D-Bus attributes, and D-Bus attributes
1058
848
# with the wrong interface name
1059
849
if (not hasattr(attribute, "_dbus_interface")
1060
850
or not attribute._dbus_interface
1061
.startswith(orig_interface_name)):
851
.startswith("se.recompile.Mandos")):
1062
852
continue
1063
853
# Create an alternate D-Bus interface name based on
1064
854
# the current name
1065
855
alt_interface = (attribute._dbus_interface
1066
.replace(orig_interface_name,
1067
alt_interface_name))
1068
interface_names.add(alt_interface)
856
.replace("se.recompile.Mandos",
857
"se.bsnet.fukt.Mandos"))
1069
858
# Is this a D-Bus signal?
1070
859
if getattr(attribute, "_dbus_is_signal", False):
1071
860
# Extract the original non-method function by
1086
875
nonmethod_func.func_name,
1087
876
nonmethod_func.func_defaults,
1088
877
nonmethod_func.func_closure)))
1089
# Copy annotations, if any
1090
try:
1091
new_function._dbus_annotations = (
1092
dict(attribute._dbus_annotations))
1093
except AttributeError:
1094
pass
1095
878
# Define a creator of a function to call both the
1096
# original and alternate functions, so both the
1097
# original and alternate signals gets sent when
1098
# the function is called
879
# old and new functions, so both the old and new
880
# signals gets sent when the function is called
1099
881
def fixscope(func1, func2):
1100
882
"""This function is a scope container to pass
1101
883
func1 and func2 to the "call_both" function
1108
890
return call_both
1109
891
# Create the "call_both" function and add it to
1110
892
# the class
1111
attr[attrname] = fixscope(attribute, new_function)
893
attr[attrname] = fixscope(attribute,
894
new_function)
1112
895
# Is this a D-Bus method?
1113
896
elif getattr(attribute, "_dbus_is_method", False):
1114
897
# Create a new, but exactly alike, function
1125
908
attribute.func_name,
1126
909
attribute.func_defaults,
1127
910
attribute.func_closure)))
1128
# Copy annotations, if any
1129
try:
1130
attr[attrname]._dbus_annotations = (
1131
dict(attribute._dbus_annotations))
1132
except AttributeError:
1133
pass
1134
911
# Is this a D-Bus property?
1135
912
elif getattr(attribute, "_dbus_is_property", False):
1136
913
# Create a new, but exactly alike, function
1150
927
attribute.func_name,
1151
928
attribute.func_defaults,
1152
929
attribute.func_closure)))
1153
# Copy annotations, if any
1154
try:
1155
attr[attrname]._dbus_annotations = (
1156
dict(attribute._dbus_annotations))
1157
except AttributeError:
1158
pass
1159
# Is this a D-Bus interface?
1160
elif getattr(attribute, "_dbus_is_interface", False):
1161
# Create a new, but exactly alike, function
1162
# object. Decorate it to be a new D-Bus interface
1163
# with the alternate D-Bus interface name. Add it
1164
# to the class.
1165
attr[attrname] = (dbus_interface_annotations
1166
(alt_interface)
1167
(types.FunctionType
1168
(attribute.func_code,
1169
attribute.func_globals,
1170
attribute.func_name,
1171
attribute.func_defaults,
1172
attribute.func_closure)))
1173
if deprecate:
1174
# Deprecate all alternate interfaces
1175
iname="_AlternateDBusNames_interface_annotation{0}"
1176
for interface_name in interface_names:
1177
@dbus_interface_annotations(interface_name)
1178
def func(self):
1179
return { "org.freedesktop.DBus.Deprecated":
1180
"true" }
1181
# Find an unused name
1182
for aname in (iname.format(i)
1183
for i in itertools.count()):
1184
if aname not in attr:
1185
attr[aname] = func
1186
break
1187
if interface_names:
1188
# Replace the class with a new subclass of it with
1189
# methods, signals, etc. as created above.
1190
cls = type(b"{0}Alternate".format(cls.__name__),
1191
(cls,), attr)
1192
return cls
1193
return wrapper
1194
1195
1196
@alternate_dbus_interfaces({"se.recompile.Mandos":
1197
"se.bsnet.fukt.Mandos"})
930
return type.__new__(mcs, name, bases, attr)
931
1198
932
class ClientDBus(Client, DBusObjectWithProperties):
1199
933
"""A Client class using D-Bus
1200
934
1211
945
def __init__(self, bus = None, *args, **kwargs):
1212
946
self.bus = bus
1213
947
Client.__init__(self, *args, **kwargs)
948
949
self._approvals_pending = 0
1214
950
# Only now, when this client is initialized, can it show up on
1215
951
# the D-Bus
1216
952
client_object_name = unicode(self.name).translate(
1220
956
("/clients/" + client_object_name))
1221
957
DBusObjectWithProperties.__init__(self, self.bus,
1222
958
self.dbus_object_path)
1223
959
1224
960
def notifychangeproperty(transform_func,
1225
961
dbus_name, type_func=lambda x: x,
1226
962
variant_level=1):
1227
963
""" Modify a variable so that it's a property which announces
1228
964
its changes to DBus.
1229
965
1230
966
transform_fun: Function that takes a value and a variant_level
1231
967
and transforms it to a D-Bus type.
1232
968
dbus_name: D-Bus name of the variable
1249
985
1250
986
return property(lambda self: getattr(self, attrname), setter)
1251
987
988
1252
989
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1253
990
approvals_pending = notifychangeproperty(dbus.Boolean,
1254
991
"ApprovalPending",
1261
998
checker is not None)
1262
999
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1263
1000
"LastCheckedOK")
1264
last_checker_status = notifychangeproperty(dbus.Int16,
1265
"LastCheckerStatus")
1266
1001
last_approval_request = notifychangeproperty(
1267
1002
datetime_to_dbus, "LastApprovalRequest")
1268
1003
approved_by_default = notifychangeproperty(dbus.Boolean,
1269
1004
"ApprovedByDefault")
1270
approval_delay = notifychangeproperty(dbus.UInt64,
1005
approval_delay = notifychangeproperty(dbus.UInt16,
1271
1006
"ApprovalDelay",
1272
1007
type_func =
1273
timedelta_to_milliseconds)
1008
_timedelta_to_milliseconds)
1274
1009
approval_duration = notifychangeproperty(
1275
dbus.UInt64, "ApprovalDuration",
1276
type_func = timedelta_to_milliseconds)
1010
dbus.UInt16, "ApprovalDuration",
1011
type_func = _timedelta_to_milliseconds)
1277
1012
host = notifychangeproperty(dbus.String, "Host")
1278
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1013
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1279
1014
type_func =
1280
timedelta_to_milliseconds)
1015
_timedelta_to_milliseconds)
1281
1016
extended_timeout = notifychangeproperty(
1282
dbus.UInt64, "ExtendedTimeout",
1283
type_func = timedelta_to_milliseconds)
1284
interval = notifychangeproperty(dbus.UInt64,
1017
dbus.UInt16, "ExtendedTimeout",
1018
type_func = _timedelta_to_milliseconds)
1019
interval = notifychangeproperty(dbus.UInt16,
1285
1020
"Interval",
1286
1021
type_func =
1287
timedelta_to_milliseconds)
1022
_timedelta_to_milliseconds)
1288
1023
checker_command = notifychangeproperty(dbus.String, "Checker")
1289
1024
1290
1025
del notifychangeproperty
1332
1067
return r
1333
1068
1334
1069
def _reset_approved(self):
1335
self.approved = None
1070
self._approved = None
1336
1071
return False
1337
1072
1338
1073
def approve(self, value=True):
1339
self.approved = value
1340
gobject.timeout_add(timedelta_to_milliseconds
1074
self.send_changedstate()
1075
self._approved = value
1076
gobject.timeout_add(_timedelta_to_milliseconds
1341
1077
(self.approval_duration),
1342
1078
self._reset_approved)
1343
self.send_changedstate()
1079
1344
1080
1345
1081
## D-Bus methods, signals & properties
1346
1082
_interface = "se.recompile.Mandos.Client"
1347
1083
1348
## Interfaces
1349
1350
@dbus_interface_annotations(_interface)
1351
def _foo(self):
1352
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1353
"false"}
1354
1355
1084
## Signals
1356
1085
1357
1086
# CheckerCompleted - signal
1456
1185
access="readwrite")
1457
1186
def ApprovalDuration_dbus_property(self, value=None):
1458
1187
if value is None: # get
1459
return dbus.UInt64(timedelta_to_milliseconds(
1188
return dbus.UInt64(_timedelta_to_milliseconds(
1460
1189
self.approval_duration))
1461
1190
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1462
1191
1476
1205
def Host_dbus_property(self, value=None):
1477
1206
if value is None: # get
1478
1207
return dbus.String(self.host)
1479
self.host = unicode(value)
1208
self.host = value
1480
1209
1481
1210
# Created - property
1482
1211
@dbus_service_property(_interface, signature="s", access="read")
1483
1212
def Created_dbus_property(self):
1484
return datetime_to_dbus(self.created)
1213
return dbus.String(datetime_to_dbus(self.created))
1485
1214
1486
1215
# LastEnabled - property
1487
1216
@dbus_service_property(_interface, signature="s", access="read")
1508
1237
return
1509
1238
return datetime_to_dbus(self.last_checked_ok)
1510
1239
1511
# LastCheckerStatus - property
1512
@dbus_service_property(_interface, signature="n",
1513
access="read")
1514
def LastCheckerStatus_dbus_property(self):
1515
return dbus.Int16(self.last_checker_status)
1516
1517
1240
# Expires - property
1518
1241
@dbus_service_property(_interface, signature="s", access="read")
1519
1242
def Expires_dbus_property(self):
1530
1253
def Timeout_dbus_property(self, value=None):
1531
1254
if value is None: # get
1532
1255
return dbus.UInt64(self.timeout_milliseconds())
1533
old_timeout = self.timeout
1534
1256
self.timeout = datetime.timedelta(0, 0, 0, value)
1535
# Reschedule disabling
1536
if self.enabled:
1537
now = datetime.datetime.utcnow()
1538
self.expires += self.timeout - old_timeout
1539
if self.expires <= now:
1540
# The timeout has passed
1541
self.disable()
1542
else:
1543
if (getattr(self, "disable_initiator_tag", None)
1544
is None):
1545
return
1546
gobject.source_remove(self.disable_initiator_tag)
1547
self.disable_initiator_tag = (
1548
gobject.timeout_add(
1549
timedelta_to_milliseconds(self.expires - now),
1550
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))
1551
1277
1552
1278
# ExtendedTimeout - property
1553
1279
@dbus_service_property(_interface, signature="t",
1566
1292
self.interval = datetime.timedelta(0, 0, 0, value)
1567
1293
if getattr(self, "checker_initiator_tag", None) is None:
1568
1294
return
1569
if self.enabled:
1570
# Reschedule checker run
1571
gobject.source_remove(self.checker_initiator_tag)
1572
self.checker_initiator_tag = (gobject.timeout_add
1573
(value, self.start_checker))
1574
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
1575
1300
1576
1301
# Checker - property
1577
1302
@dbus_service_property(_interface, signature="s",
1579
1304
def Checker_dbus_property(self, value=None):
1580
1305
if value is None: # get
1581
1306
return dbus.String(self.checker_command)
1582
self.checker_command = unicode(value)
1307
self.checker_command = value
1583
1308
1584
1309
# CheckerRunning - property
1585
1310
@dbus_service_property(_interface, signature="b",
1614
1339
raise KeyError()
1615
1340
1616
1341
def __getattribute__(self, name):
1617
if name == '_pipe':
1342
if(name == '_pipe'):
1618
1343
return super(ProxyClient, self).__getattribute__(name)
1619
1344
self._pipe.send(('getattr', name))
1620
1345
data = self._pipe.recv()
1627
1352
return func
1628
1353
1629
1354
def __setattr__(self, name, value):
1630
if name == '_pipe':
1355
if(name == '_pipe'):
1631
1356
return super(ProxyClient, self).__setattr__(name, value)
1632
1357
self._pipe.send(('setattr', name, value))
1633
1358
1359
class ClientDBusTransitional(ClientDBus):
1360
__metaclass__ = AlternateDBusNamesMetaclass
1634
1361
1635
1362
class ClientHandler(socketserver.BaseRequestHandler, object):
1636
1363
"""A class to handle client connections.
1719
1446
client.Rejected("Disabled")
1720
1447
return
1721
1448
1722
if client.approved or not client.approval_delay:
1449
if client._approved or not client.approval_delay:
1723
1450
#We are approved or approval is disabled
1724
1451
break
1725
elif client.approved is None:
1452
elif client._approved is None:
1726
1453
logger.info("Client %s needs approval",
1727
1454
client.name)
1728
1455
if self.server.use_dbus:
1741
1468
#wait until timeout or approved
1742
1469
time = datetime.datetime.now()
1743
1470
client.changedstate.acquire()
1744
client.changedstate.wait(
1745
float(timedelta_to_milliseconds(delay)
1746
/ 1000))
1471
(client.changedstate.wait
1472
(float(client._timedelta_to_milliseconds(delay)
1473
/ 1000)))
1747
1474
client.changedstate.release()
1748
1475
time2 = datetime.datetime.now()
1749
1476
if (time2 - time) >= delay:
1765
1492
try:
1766
1493
sent = session.send(client.secret[sent_size:])
1767
1494
except gnutls.errors.GNUTLSError as error:
1768
logger.warning("gnutls send failed",
1769
exc_info=error)
1495
logger.warning("gnutls send failed")
1770
1496
return
1771
1497
logger.debug("Sent: %d, remaining: %d",
1772
1498
sent, len(client.secret)
1775
1501
1776
1502
logger.info("Sending secret to %s", client.name)
1777
1503
# bump the timeout using extended_timeout
1778
client.bump_timeout(client.extended_timeout)
1504
client.checked_ok(client.extended_timeout)
1779
1505
if self.server.use_dbus:
1780
1506
# Emit D-Bus signal
1781
1507
client.GotSecret()
1786
1512
try:
1787
1513
session.bye()
1788
1514
except gnutls.errors.GNUTLSError as error:
1789
logger.warning("GnuTLS bye failed",
1790
exc_info=error)
1515
logger.warning("GnuTLS bye failed")
1791
1516
1792
1517
@staticmethod
1793
1518
def peer_certificate(session):
1849
1574
# Convert the buffer to a Python bytestring
1850
1575
fpr = ctypes.string_at(buf, buf_len.value)
1851
1576
# Convert the bytestring to hexadecimal notation
1852
hex_fpr = binascii.hexlify(fpr).upper()
1577
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1853
1578
return hex_fpr
1854
1579
1855
1580
1858
1583
def sub_process_main(self, request, address):
1859
1584
try:
1860
1585
self.finish_request(request, address)
1861
except Exception:
1586
except:
1862
1587
self.handle_error(request, address)
1863
1588
self.close_request(request)
1864
1589
1865
1590
def process_request(self, request, address):
1866
1591
"""Start a new process to process the request."""
1867
1592
proc = multiprocessing.Process(target = self.sub_process_main,
1868
args = (request, address))
1593
args = (request,
1594
address))
1869
1595
proc.start()
1870
1596
return proc
1871
1597
1921
1647
str(self.interface
1922
1648
+ '\0'))
1923
1649
except socket.error as error:
1924
if error.errno == errno.EPERM:
1650
if error[0] == errno.EPERM:
1925
1651
logger.error("No permission to"
1926
1652
" bind to interface %s",
1927
1653
self.interface)
1928
elif error.errno == errno.ENOPROTOOPT:
1654
elif error[0] == errno.ENOPROTOOPT:
1929
1655
logger.error("SO_BINDTODEVICE not available;"
1930
1656
" cannot bind to interface %s",
1931
1657
self.interface)
1932
elif error.errno == errno.ENODEV:
1933
logger.error("Interface %s does not"
1934
" exist, cannot bind",
1935
self.interface)
1936
1658
else:
1937
1659
raise
1938
1660
# Only bind(2) the socket if we really need to.
1997
1719
1998
1720
def handle_ipc(self, source, condition, parent_pipe=None,
1999
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)
2000
1736
# error, or the other end of multiprocessing.Pipe has closed
2001
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1737
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2002
1738
# Wait for other process to exit
2003
1739
proc.join()
2004
1740
return False
2094
1830
elif suffix == "w":
2095
1831
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2096
1832
else:
2097
raise ValueError("Unknown suffix {0!r}"
2098
.format(suffix))
1833
raise ValueError("Unknown suffix %r" % suffix)
2099
1834
except (ValueError, IndexError) as e:
2100
1835
raise ValueError(*(e.args))
2101
1836
timevalue += delta
2102
1837
return timevalue
2103
1838
2104
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
2105
1864
def daemon(nochdir = False, noclose = False):
2106
1865
"""See daemon(3). Standard BSD Unix function.
2107
1866
2115
1874
sys.exit()
2116
1875
if not noclose:
2117
1876
# Close all standard open file descriptors
2118
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1877
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2119
1878
if not stat.S_ISCHR(os.fstat(null).st_mode):
2120
1879
raise OSError(errno.ENODEV,
2121
"{0} not a character device"
2122
.format(os.devnull))
1880
"%s not a character device"
1881
% os.path.devnull)
2123
1882
os.dup2(null, sys.stdin.fileno())
2124
1883
os.dup2(null, sys.stdout.fileno())
2125
1884
os.dup2(null, sys.stderr.fileno())
2134
1893
2135
1894
parser = argparse.ArgumentParser()
2136
1895
parser.add_argument("-v", "--version", action="version",
2137
version = "%(prog)s {0}".format(version),
1896
version = "%%(prog)s %s" % version,
2138
1897
help="show version number and exit")
2139
1898
parser.add_argument("-i", "--interface", metavar="IF",
2140
1899
help="Bind to interface IF")
2163
1922
parser.add_argument("--no-ipv6", action="store_false",
2164
1923
dest="use_ipv6", help="Do not use IPv6")
2165
1924
parser.add_argument("--no-restore", action="store_false",
2166
dest="restore", help="Do not restore stored"
2167
" state")
2168
parser.add_argument("--statedir", metavar="DIR",
2169
help="Directory to save/restore state in")
2170
1925
dest="restore", help="Do not restore stored state",
1926
default=True)
1927
2171
1928
options = parser.parse_args()
2172
1929
2173
1930
if options.check:
2186
1943
"use_dbus": "True",
2187
1944
"use_ipv6": "True",
2188
1945
"debuglevel": "",
2189
"restore": "True",
2190
"statedir": "/var/lib/mandos"
2191
1946
}
2192
1947
2193
1948
# Parse config file for server-global settings
2210
1965
# options, if set.
2211
1966
for option in ("interface", "address", "port", "debug",
2212
1967
"priority", "servicename", "configdir",
2213
"use_dbus", "use_ipv6", "debuglevel", "restore",
2214
"statedir"):
1968
"use_dbus", "use_ipv6", "debuglevel", "restore"):
2215
1969
value = getattr(options, option)
2216
1970
if value is not None:
2217
1971
server_settings[option] = value
2229
1983
debuglevel = server_settings["debuglevel"]
2230
1984
use_dbus = server_settings["use_dbus"]
2231
1985
use_ipv6 = server_settings["use_ipv6"]
2232
stored_state_path = os.path.join(server_settings["statedir"],
2233
stored_state_file)
2234
2235
if debug:
2236
initlogger(debug, logging.DEBUG)
2237
else:
2238
if not debuglevel:
2239
initlogger(debug)
2240
else:
2241
level = getattr(logging, debuglevel.upper())
2242
initlogger(debug, level)
2243
1986
2244
1987
if server_settings["servicename"] != "Mandos":
2245
1988
syslogger.setFormatter(logging.Formatter
2246
('Mandos ({0}) [%(process)d]:'
2247
' %(levelname)s: %(message)s'
2248
.format(server_settings
2249
["servicename"])))
1989
('Mandos (%s) [%%(process)d]:'
1990
' %%(levelname)s: %%(message)s'
1991
% server_settings["servicename"]))
2250
1992
2251
1993
# Parse config file with clients
2252
client_config = configparser.SafeConfigParser(Client
2253
.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)
2254
2003
client_config.read(os.path.join(server_settings["configdir"],
2255
2004
"clients.conf"))
2256
2005
2270
2019
pidfilename = "/var/run/mandos.pid"
2271
2020
try:
2272
2021
pidfile = open(pidfilename, "w")
2273
except IOError as e:
2274
logger.error("Could not open file %r", pidfilename,
2275
exc_info=e)
2022
except IOError:
2023
logger.error("Could not open file %r", pidfilename)
2276
2024
2277
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:
2278
2029
try:
2279
uid = pwd.getpwnam(name).pw_uid
2280
gid = pwd.getpwnam(name).pw_gid
2281
break
2030
uid = pwd.getpwnam("mandos").pw_uid
2031
gid = pwd.getpwnam("mandos").pw_gid
2282
2032
except KeyError:
2283
continue
2284
else:
2285
uid = 65534
2286
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
2287
2039
try:
2288
2040
os.setgid(gid)
2289
2041
os.setuid(uid)
2290
2042
except OSError as error:
2291
if error.errno != errno.EPERM:
2043
if error[0] != errno.EPERM:
2292
2044
raise error
2293
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)
2051
2294
2052
if debug:
2053
logger.setLevel(logging.DEBUG)
2295
2054
# Enable all possible GnuTLS debugging
2296
2055
2297
2056
# "Use a log level over 10 to enable all debugging options."
2306
2065
.gnutls_global_set_log_function(debug_gnutls))
2307
2066
2308
2067
# Redirect stdin so all checkers get /dev/null
2309
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2068
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2310
2069
os.dup2(null, sys.stdin.fileno())
2311
2070
if null > 2:
2312
2071
os.close(null)
2072
else:
2073
# No console logging
2074
logger.removeHandler(console)
2313
2075
2314
2076
# Need to fork before connecting to D-Bus
2315
2077
if not debug:
2316
2078
# Close all input and output, do double fork, etc.
2317
2079
daemon()
2318
2080
2319
gobject.threads_init()
2320
2321
2081
global main_loop
2322
2082
# From the Avahi example code
2323
DBusGMainLoop(set_as_default=True)
2083
DBusGMainLoop(set_as_default=True )
2324
2084
main_loop = gobject.MainLoop()
2325
2085
bus = dbus.SystemBus()
2326
2086
# End of Avahi example code
2332
2092
("se.bsnet.fukt.Mandos", bus,
2333
2093
do_not_queue=True))
2334
2094
except dbus.exceptions.NameExistsException as e:
2335
logger.error("Disabling D-Bus:", exc_info=e)
2095
logger.error(unicode(e) + ", disabling D-Bus")
2336
2096
use_dbus = False
2337
2097
server_settings["use_dbus"] = False
2338
2098
tcp_server.use_dbus = False
2350
2110
2351
2111
client_class = Client
2352
2112
if use_dbus:
2353
client_class = functools.partial(ClientDBus, bus = bus)
2354
2355
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
2356
2133
old_client_settings = {}
2357
clients_data = {}
2358
2359
# Get client data and settings from last running state.
2134
clients_data = []
2135
2136
# Get client data and settings from last running state.
2360
2137
if server_settings["restore"]:
2361
2138
try:
2362
2139
with open(stored_state_path, "rb") as stored_state:
2363
clients_data, old_client_settings = (pickle.load
2364
(stored_state))
2140
clients_data, old_client_settings = pickle.load(stored_state)
2365
2141
os.remove(stored_state_path)
2366
2142
except IOError as e:
2367
if e.errno == errno.ENOENT:
2368
logger.warning("Could not load persistent state: {0}"
2369
.format(os.strerror(e.errno)))
2370
else:
2371
logger.critical("Could not load persistent state:",
2372
exc_info=e)
2143
logger.warning("Could not load persistant state: {0}".format(e))
2144
if e.errno != errno.ENOENT:
2373
2145
raise
2374
except EOFError as e:
2375
logger.warning("Could not load persistent state: "
2376
"EOFError:", exc_info=e)
2377
2378
with PGPEngine() as pgp:
2379
for client_name, client in clients_data.iteritems():
2380
# Decide which value to use after restoring saved state.
2381
# We have three different values: Old config file,
2382
# new config file, and saved state.
2383
# New config value takes precedence if it differs from old
2384
# config value, otherwise use saved state.
2385
for name, value in client_settings[client_name].items():
2386
try:
2387
# For each value in new config, check if it
2388
# differs from the old config value (Except for
2389
# the "secret" attribute)
2390
if (name != "secret" and
2391
value != old_client_settings[client_name]
2392
[name]):
2393
client[name] = value
2394
except KeyError:
2395
pass
2396
2397
# Clients who has passed its expire date can still be
2398
# enabled if its last checker was successful. Clients
2399
# whose checker succeeded before we stored its state is
2400
# assumed to have successfully run all checkers during
2401
# downtime.
2402
if client["enabled"]:
2403
if datetime.datetime.utcnow() >= client["expires"]:
2404
if not client["last_checked_ok"]:
2405
logger.warning(
2406
"disabling client {0} - Client never "
2407
"performed a successful checker"
2408
.format(client_name))
2409
client["enabled"] = False
2410
elif client["last_checker_status"] != 0:
2411
logger.warning(
2412
"disabling client {0} - Client "
2413
"last checker failed with error code {1}"
2414
.format(client_name,
2415
client["last_checker_status"]))
2416
client["enabled"] = False
2417
else:
2418
client["expires"] = (datetime.datetime
2419
.utcnow()
2420
+ client["timeout"])
2421
logger.debug("Last checker succeeded,"
2422
" keeping {0} enabled"
2423
.format(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():
2424
2156
try:
2425
client["secret"] = (
2426
pgp.decrypt(client["encrypted_secret"],
2427
client_settings[client_name]
2428
["secret"]))
2429
except PGPError:
2430
# If decryption fails, we use secret from new settings
2431
logger.debug("Failed to decrypt {0} old secret"
2432
.format(client_name))
2433
client["secret"] = (
2434
client_settings[client_name]["secret"])
2435
2436
# Add/remove clients based on new changes made to config
2437
for client_name in (set(old_client_settings)
2438
- set(client_settings)):
2439
del clients_data[client_name]
2440
for client_name in (set(client_settings)
2441
- set(old_client_settings)):
2442
clients_data[client_name] = client_settings[client_name]
2443
2444
# Create all client objects
2445
for client_name, client in clients_data.iteritems():
2446
tcp_server.clients[client_name] = client_class(
2447
name = client_name, settings = client)
2448
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
2449
2211
if not tcp_server.clients:
2450
2212
logger.warning("No clients defined")
2451
2213
2452
2214
if not debug:
2453
2215
try:
2454
2216
with pidfile:
2462
2224
# "pidfile" was never created
2463
2225
pass
2464
2226
del pidfilename
2227
2228
signal.signal(signal.SIGINT, signal.SIG_IGN)
2465
2229
2466
2230
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2467
2231
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2468
2232
2469
2233
if use_dbus:
2470
@alternate_dbus_interfaces({"se.recompile.Mandos":
2471
"se.bsnet.fukt.Mandos"})
2472
class MandosDBusService(DBusObjectWithProperties):
2234
class MandosDBusService(dbus.service.Object):
2473
2235
"""A D-Bus proxy object"""
2474
2236
def __init__(self):
2475
2237
dbus.service.Object.__init__(self, bus, "/")
2476
2238
_interface = "se.recompile.Mandos"
2477
2239
2478
@dbus_interface_annotations(_interface)
2479
def _foo(self):
2480
return { "org.freedesktop.DBus.Property"
2481
".EmitsChangedSignal":
2482
"false"}
2483
2484
2240
@dbus.service.signal(_interface, signature="o")
2485
2241
def ClientAdded(self, objpath):
2486
2242
"D-Bus signal"
2528
2284
2529
2285
del _interface
2530
2286
2531
mandos_dbus_service = MandosDBusService()
2287
class MandosDBusServiceTransitional(MandosDBusService):
2288
__metaclass__ = AlternateDBusNamesMetaclass
2289
mandos_dbus_service = MandosDBusServiceTransitional()
2532
2290
2533
2291
def cleanup():
2534
2292
"Cleanup function; run on exit"
2537
2295
multiprocessing.active_children()
2538
2296
if not (tcp_server.clients or client_settings):
2539
2297
return
2540
2541
# Store client before exiting. Secrets are encrypted with key
2542
# based on what config file has. If config file is
2543
# removed/edited, old secret will thus be unrecovable.
2544
clients = {}
2545
with PGPEngine() as pgp:
2546
for client in tcp_server.clients.itervalues():
2547
key = client_settings[client.name]["secret"]
2548
client.encrypted_secret = pgp.encrypt(client.secret,
2549
key)
2550
client_dict = {}
2551
2552
# A list of attributes that can not be pickled
2553
# + secret.
2554
exclude = set(("bus", "changedstate", "secret",
2555
"checker"))
2556
for name, typ in (inspect.getmembers
2557
(dbus.service.Object)):
2558
exclude.add(name)
2559
2560
client_dict["encrypted_secret"] = (client
2561
.encrypted_secret)
2562
for attr in client.client_structure:
2563
if attr not in exclude:
2564
client_dict[attr] = getattr(client, attr)
2565
2566
clients[client.name] = client_dict
2567
del client_settings[client.name]["secret"]
2568
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
2569
2321
try:
2570
with (tempfile.NamedTemporaryFile
2571
(mode='wb', suffix=".pickle", prefix='clients-',
2572
dir=os.path.dirname(stored_state_path),
2573
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:
2574
2323
pickle.dump((clients, client_settings), stored_state)
2575
tempname=stored_state.name
2576
os.rename(tempname, stored_state_path)
2577
except (IOError, OSError) as e:
2578
if not debug:
2579
try:
2580
os.remove(tempname)
2581
except NameError:
2582
pass
2583
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2584
logger.warning("Could not save persistent state: {0}"
2585
.format(os.strerror(e.errno)))
2586
else:
2587
logger.warning("Could not save persistent state:",
2588
exc_info=e)
2589
raise e
2590
2324
except IOError as e:
2325
logger.warning("Could not save persistant state: {0}".format(e))
2326
if e.errno != errno.ENOENT:
2327
raise
2328
2591
2329
# Delete all clients, and settings from config
2592
2330
while tcp_server.clients:
2593
2331
name, client = tcp_server.clients.popitem()
2611
2349
# Need to initiate checking of clients
2612
2350
if client.enabled:
2613
2351
client.init_checker()
2352
2614
2353
2615
2354
tcp_server.enable()
2616
2355
tcp_server.server_activate()
2619
2358
service.port = tcp_server.socket.getsockname()[1]
2620
2359
if use_ipv6:
2621
2360
logger.info("Now listening on address %r, port %d,"
2622
" flowinfo %d, scope_id %d",
2623
*tcp_server.socket.getsockname())
2361
" flowinfo %d, scope_id %d"
2362
% tcp_server.socket.getsockname())
2624
2363
else: # IPv4
2625
logger.info("Now listening on address %r, port %d",
2626
*tcp_server.socket.getsockname())
2364
logger.info("Now listening on address %r, port %d"
2365
% tcp_server.socket.getsockname())
2627
2366
2628
2367
#service.interface = tcp_server.socket.getsockname()[3]
2629
2368
2632
2371
try:
2633
2372
service.activate()
2634
2373
except dbus.exceptions.DBusException as error:
2635
logger.critical("D-Bus Exception", exc_info=error)
2374
logger.critical("DBusException: %s", error)
2636
2375
cleanup()
2637
2376
sys.exit(1)
2638
2377
# End of Avahi example code
2645
2384
logger.debug("Starting main loop")
2646
2385
main_loop.run()
2647
2386
except AvahiError as error:
2648
logger.critical("Avahi Error", exc_info=error)
2387
logger.critical("AvahiError: %s", error)
2649
2388
cleanup()
2650
2389
sys.exit(1)
2651
2390
except KeyboardInterrupt:
2656
2395
# Must run before the D-Bus bus name gets deregistered
2657
2396
cleanup()
2658
2397
2398
2659
2399
if __name__ == '__main__':
2660
2400
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0