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 482
- compare with another revision
- download diff
- download tarball
- view history from revision 482
- Committer: Teddy Hogeborn
- Date: 2011-04-02 06:37:18 UTC
- Revision ID: teddy@fukt.bsnet.se-20110402063718-13ldrcuu0t33sdc4
* mandos: Tolerate restarting Avahi servers. Also Changed to new
"except x as y" exception syntax.
(AvahiService.entry_group_state_changed_match): New; contains the
SignalMatch object.
(AvahiService.remove): Really remove the group and the signal
connection, if any.
(AvahiService.add): Always create a new group and signal connection.
(AvahiService.cleanup): Changed to simply call remove().
(AvahiService.server_state_changed): Handle and log more bad states.
(AvahiService.activate): Set "follow_name_owner_changes=True" on the
Avahi Server proxy object.
(ClientDBus.checked_ok): Do not return anything.
(ClientDBus.CheckedOK): Do not return anything, as documented.
* mandos-monitor: Call D-Bus methods asynchronously.
"except x as y" exception syntax.
(AvahiService.entry_group_state_changed_match): New; contains the
SignalMatch object.
(AvahiService.remove): Really remove the group and the signal
connection, if any.
(AvahiService.add): Always create a new group and signal connection.
(AvahiService.cleanup): Changed to simply call remove().
(AvahiService.server_state_changed): Handle and log more bad states.
(AvahiService.activate): Set "follow_name_owner_changes=True" on the
Avahi Server proxy object.
(ClientDBus.checked_ok): Do not return anything.
(ClientDBus.CheckedOK): Do not return anything, as documented.
* mandos-monitor: Call D-Bus methods asynchronously.
- files added:
- DBUS-API
- debian/source
- files removed:
- plugins.d/plymouth
- 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,2009 Teddy Hogeborn
15
# Copyright © 2008,2009 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
31
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
#
33
33
34
from __future__ import division, with_statement, absolute_import
34
from __future__ import (division, absolute_import, print_function,
35
unicode_literals)
35
36
36
37
import SocketServer as socketserver
37
38
import socket
38
import optparse
39
import argparse
39
40
import datetime
40
41
import errno
41
42
import gnutls.crypto
81
82
SO_BINDTODEVICE = None
82
83
83
84
84
version = "1.0.14"
85
version = "1.3.0"
85
86
86
#logger = logging.getLogger(u'mandos')
87
logger = logging.Logger(u'mandos')
87
#logger = logging.getLogger('mandos')
88
logger = logging.Logger('mandos')
88
89
syslogger = (logging.handlers.SysLogHandler
89
90
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
90
address = "/dev/log"))
91
address = str("/dev/log")))
91
92
syslogger.setFormatter(logging.Formatter
92
(u'Mandos [%(process)d]: %(levelname)s:'
93
u' %(message)s'))
93
('Mandos [%(process)d]: %(levelname)s:'
94
' %(message)s'))
94
95
logger.addHandler(syslogger)
95
96
96
97
console = logging.StreamHandler()
97
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
98
u' %(levelname)s:'
99
u' %(message)s'))
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
' %(levelname)s:'
100
' %(message)s'))
100
101
logger.addHandler(console)
101
102
102
103
class AvahiError(Exception):
119
120
Attributes:
120
121
interface: integer; avahi.IF_UNSPEC or an interface index.
121
122
Used to optionally bind to the specified interface.
122
name: string; Example: u'Mandos'
123
type: string; Example: u'_mandos._tcp'.
123
name: string; Example: 'Mandos'
124
type: string; Example: '_mandos._tcp'.
124
125
See <http://www.dns-sd.org/ServiceTypes.html>
125
126
port: integer; what port to announce
126
127
TXT: list of strings; TXT record for the service
135
136
"""
136
137
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
137
138
servicetype = None, port = None, TXT = None,
138
domain = u"", host = u"", max_renames = 32768,
139
domain = "", host = "", max_renames = 32768,
139
140
protocol = avahi.PROTO_UNSPEC, bus = None):
140
141
self.interface = interface
141
142
self.name = name
150
151
self.group = None # our entry group
151
152
self.server = None
152
153
self.bus = bus
154
self.entry_group_state_changed_match = None
153
155
def rename(self):
154
156
"""Derived from the Avahi example code"""
155
157
if self.rename_count >= self.max_renames:
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
158
logger.critical("No suitable Zeroconf service name found"
159
" after %i retries, exiting.",
158
160
self.rename_count)
159
raise AvahiServiceError(u"Too many renames")
161
raise AvahiServiceError("Too many renames")
160
162
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
logger.info(u"Changing Zeroconf service name to %r ...",
163
logger.info("Changing Zeroconf service name to %r ...",
162
164
self.name)
163
165
syslogger.setFormatter(logging.Formatter
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
166
('Mandos (%s) [%%(process)d]:'
167
' %%(levelname)s: %%(message)s'
166
168
% self.name))
167
169
self.remove()
168
self.add()
170
try:
171
self.add()
172
except dbus.exceptions.DBusException as error:
173
logger.critical("DBusException: %s", error)
174
self.cleanup()
175
os._exit(1)
169
176
self.rename_count += 1
170
177
def remove(self):
171
178
"""Derived from the Avahi example code"""
172
179
if self.group is not None:
173
self.group.Reset()
180
try:
181
self.group.Free()
182
except (dbus.exceptions.UnknownMethodException,
183
dbus.exceptions.DBusException) as e:
184
pass
185
self.group = None
186
if self.entry_group_state_changed_match is not None:
187
self.entry_group_state_changed_match.remove()
188
self.entry_group_state_changed_match = None
174
189
def add(self):
175
190
"""Derived from the Avahi example code"""
176
if self.group is None:
177
self.group = dbus.Interface(
178
self.bus.get_object(avahi.DBUS_NAME,
179
self.server.EntryGroupNew()),
180
avahi.DBUS_INTERFACE_ENTRY_GROUP)
181
self.group.connect_to_signal('StateChanged',
182
self
183
.entry_group_state_changed)
184
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
191
self.remove()
192
self.group = dbus.Interface(
193
self.bus.get_object(avahi.DBUS_NAME,
194
self.server.EntryGroupNew(),
195
follow_name_owner_changes=True),
196
avahi.DBUS_INTERFACE_ENTRY_GROUP)
197
self.entry_group_state_changed_match = (
198
self.group.connect_to_signal(
199
'StateChanged', self .entry_group_state_changed))
200
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
185
201
self.name, self.type)
186
202
self.group.AddService(
187
203
self.interface,
194
210
self.group.Commit()
195
211
def entry_group_state_changed(self, state, error):
196
212
"""Derived from the Avahi example code"""
197
logger.debug(u"Avahi state change: %i", state)
213
logger.debug("Avahi entry group state change: %i", state)
198
214
199
215
if state == avahi.ENTRY_GROUP_ESTABLISHED:
200
logger.debug(u"Zeroconf service established.")
216
logger.debug("Zeroconf service established.")
201
217
elif state == avahi.ENTRY_GROUP_COLLISION:
202
logger.warning(u"Zeroconf service name collision.")
218
logger.info("Zeroconf service name collision.")
203
219
self.rename()
204
220
elif state == avahi.ENTRY_GROUP_FAILURE:
205
logger.critical(u"Avahi: Error in group state changed %s",
221
logger.critical("Avahi: Error in group state changed %s",
206
222
unicode(error))
207
raise AvahiGroupError(u"State changed: %s"
223
raise AvahiGroupError("State changed: %s"
208
224
% unicode(error))
209
225
def cleanup(self):
210
226
"""Derived from the Avahi example code"""
211
if self.group is not None:
212
self.group.Free()
213
self.group = None
214
def server_state_changed(self, state):
227
self.remove()
228
def server_state_changed(self, state, error=None):
215
229
"""Derived from the Avahi example code"""
216
if state == avahi.SERVER_COLLISION:
217
logger.error(u"Zeroconf server name collision")
230
logger.debug("Avahi server state change: %i", state)
231
bad_states = { avahi.SERVER_INVALID:
232
"Zeroconf server invalid",
233
avahi.SERVER_REGISTERING: None,
234
avahi.SERVER_COLLISION:
235
"Zeroconf server name collision",
236
avahi.SERVER_FAILURE:
237
"Zeroconf server failure" }
238
if state in bad_states:
239
if bad_states[state]:
240
logger.error(bad_states[state])
218
241
self.remove()
219
242
elif state == avahi.SERVER_RUNNING:
220
243
self.add()
244
else:
245
logger.debug("Unknown state: %r", state)
221
246
def activate(self):
222
247
"""Derived from the Avahi example code"""
223
248
if self.server is None:
224
249
self.server = dbus.Interface(
225
250
self.bus.get_object(avahi.DBUS_NAME,
226
avahi.DBUS_PATH_SERVER),
251
avahi.DBUS_PATH_SERVER,
252
follow_name_owner_changes=True),
227
253
avahi.DBUS_INTERFACE_SERVER)
228
self.server.connect_to_signal(u"StateChanged",
254
self.server.connect_to_signal("StateChanged",
229
255
self.server_state_changed)
230
256
self.server_state_changed(self.server.GetState())
231
257
234
260
"""A representation of a client host served by this server.
235
261
236
262
Attributes:
237
name: string; from the config file, used in log messages and
238
D-Bus identifiers
263
_approved: bool(); 'None' if not yet approved/disapproved
264
approval_delay: datetime.timedelta(); Time to wait for approval
265
approval_duration: datetime.timedelta(); Duration of one approval
266
checker: subprocess.Popen(); a running checker process used
267
to see if the client lives.
268
'None' if no process is running.
269
checker_callback_tag: a gobject event source tag, or None
270
checker_command: string; External command which is run to check
271
if client lives. %() expansions are done at
272
runtime with vars(self) as dict, so that for
273
instance %(name)s can be used in the command.
274
checker_initiator_tag: a gobject event source tag, or None
275
created: datetime.datetime(); (UTC) object creation
276
current_checker_command: string; current running checker_command
277
disable_hook: If set, called by disable() as disable_hook(self)
278
disable_initiator_tag: a gobject event source tag, or None
279
enabled: bool()
239
280
fingerprint: string (40 or 32 hexadecimal digits); used to
240
281
uniquely identify the client
241
secret: bytestring; sent verbatim (over TLS) to client
242
282
host: string; available for use by the checker command
243
created: datetime.datetime(); (UTC) object creation
283
interval: datetime.timedelta(); How often to start a new checker
284
last_approval_request: datetime.datetime(); (UTC) or None
285
last_checked_ok: datetime.datetime(); (UTC) or None
244
286
last_enabled: datetime.datetime(); (UTC)
245
enabled: bool()
246
last_checked_ok: datetime.datetime(); (UTC) or None
287
name: string; from the config file, used in log messages and
288
D-Bus identifiers
289
secret: bytestring; sent verbatim (over TLS) to client
247
290
timeout: datetime.timedelta(); How long from last_checked_ok
248
291
until this client is disabled
249
interval: datetime.timedelta(); How often to start a new checker
250
disable_hook: If set, called by disable() as disable_hook(self)
251
checker: subprocess.Popen(); a running checker process used
252
to see if the client lives.
253
'None' if no process is running.
254
checker_initiator_tag: a gobject event source tag, or None
255
disable_initiator_tag: - '' -
256
checker_callback_tag: - '' -
257
checker_command: string; External command which is run to check if
258
client lives. %() expansions are done at
259
runtime with vars(self) as dict, so that for
260
instance %(name)s can be used in the command.
261
current_checker_command: string; current running checker_command
262
approved_delay: datetime.timedelta(); Time to wait for approval
263
_approved: bool(); 'None' if not yet approved/disapproved
264
approved_duration: datetime.timedelta(); Duration of one approval
292
runtime_expansions: Allowed attributes for runtime expansion.
265
293
"""
266
294
295
runtime_expansions = ("approval_delay", "approval_duration",
296
"created", "enabled", "fingerprint",
297
"host", "interval", "last_checked_ok",
298
"last_enabled", "name", "timeout")
299
267
300
@staticmethod
268
301
def _timedelta_to_milliseconds(td):
269
302
"Convert a datetime.timedelta() to milliseconds"
279
312
"Return the 'interval' attribute in milliseconds"
280
313
return self._timedelta_to_milliseconds(self.interval)
281
314
282
def approved_delay_milliseconds(self):
283
return self._timedelta_to_milliseconds(self.approved_delay)
315
def approval_delay_milliseconds(self):
316
return self._timedelta_to_milliseconds(self.approval_delay)
284
317
285
318
def __init__(self, name = None, disable_hook=None, config=None):
286
319
"""Note: the 'checker' key in 'config' sets the
289
322
self.name = name
290
323
if config is None:
291
324
config = {}
292
logger.debug(u"Creating client %r", self.name)
325
logger.debug("Creating client %r", self.name)
293
326
# Uppercase and remove spaces from fingerprint for later
294
327
# comparison purposes with return value from the fingerprint()
295
328
# function
296
self.fingerprint = (config[u"fingerprint"].upper()
297
.replace(u" ", u""))
298
logger.debug(u" Fingerprint: %s", self.fingerprint)
299
if u"secret" in config:
300
self.secret = config[u"secret"].decode(u"base64")
301
elif u"secfile" in config:
329
self.fingerprint = (config["fingerprint"].upper()
330
.replace(" ", ""))
331
logger.debug(" Fingerprint: %s", self.fingerprint)
332
if "secret" in config:
333
self.secret = config["secret"].decode("base64")
334
elif "secfile" in config:
302
335
with open(os.path.expanduser(os.path.expandvars
303
(config[u"secfile"])),
336
(config["secfile"])),
304
337
"rb") as secfile:
305
338
self.secret = secfile.read()
306
339
else:
307
raise TypeError(u"No secret or secfile for client %s"
340
raise TypeError("No secret or secfile for client %s"
308
341
% self.name)
309
self.host = config.get(u"host", u"")
342
self.host = config.get("host", "")
310
343
self.created = datetime.datetime.utcnow()
311
344
self.enabled = False
345
self.last_approval_request = None
312
346
self.last_enabled = None
313
347
self.last_checked_ok = None
314
self.timeout = string_to_delta(config[u"timeout"])
315
self.interval = string_to_delta(config[u"interval"])
348
self.timeout = string_to_delta(config["timeout"])
349
self.interval = string_to_delta(config["interval"])
316
350
self.disable_hook = disable_hook
317
351
self.checker = None
318
352
self.checker_initiator_tag = None
319
353
self.disable_initiator_tag = None
320
354
self.checker_callback_tag = None
321
self.checker_command = config[u"checker"]
355
self.checker_command = config["checker"]
322
356
self.current_checker_command = None
323
357
self.last_connect = None
324
358
self._approved = None
325
self.approved_by_default = config.get(u"approved_by_default",
359
self.approved_by_default = config.get("approved_by_default",
326
360
True)
327
361
self.approvals_pending = 0
328
self.approved_delay = string_to_delta(
329
config[u"approved_delay"])
330
self.approved_duration = string_to_delta(
331
config[u"approved_duration"])
362
self.approval_delay = string_to_delta(
363
config["approval_delay"])
364
self.approval_duration = string_to_delta(
365
config["approval_duration"])
332
366
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
333
367
334
368
def send_changedstate(self):
338
372
339
373
def enable(self):
340
374
"""Start this client's checker and timeout hooks"""
341
if getattr(self, u"enabled", False):
375
if getattr(self, "enabled", False):
342
376
# Already enabled
343
377
return
344
378
self.send_changedstate()
363
397
if not quiet:
364
398
self.send_changedstate()
365
399
if not quiet:
366
logger.info(u"Disabling client %s", self.name)
367
if getattr(self, u"disable_initiator_tag", False):
400
logger.info("Disabling client %s", self.name)
401
if getattr(self, "disable_initiator_tag", False):
368
402
gobject.source_remove(self.disable_initiator_tag)
369
403
self.disable_initiator_tag = None
370
if getattr(self, u"checker_initiator_tag", False):
404
if getattr(self, "checker_initiator_tag", False):
371
405
gobject.source_remove(self.checker_initiator_tag)
372
406
self.checker_initiator_tag = None
373
407
self.stop_checker()
388
422
if os.WIFEXITED(condition):
389
423
exitstatus = os.WEXITSTATUS(condition)
390
424
if exitstatus == 0:
391
logger.info(u"Checker for %(name)s succeeded",
425
logger.info("Checker for %(name)s succeeded",
392
426
vars(self))
393
427
self.checked_ok()
394
428
else:
395
logger.info(u"Checker for %(name)s failed",
429
logger.info("Checker for %(name)s failed",
396
430
vars(self))
397
431
else:
398
logger.warning(u"Checker for %(name)s crashed?",
432
logger.warning("Checker for %(name)s crashed?",
399
433
vars(self))
400
434
401
435
def checked_ok(self):
410
444
(self.timeout_milliseconds(),
411
445
self.disable))
412
446
447
def need_approval(self):
448
self.last_approval_request = datetime.datetime.utcnow()
449
413
450
def start_checker(self):
414
451
"""Start a new checker subprocess if one is not running.
415
452
427
464
# If a checker exists, make sure it is not a zombie
428
465
try:
429
466
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
430
except (AttributeError, OSError), error:
467
except (AttributeError, OSError) as error:
431
468
if (isinstance(error, OSError)
432
469
and error.errno != errno.ECHILD):
433
470
raise error
434
471
else:
435
472
if pid:
436
logger.warning(u"Checker was a zombie")
473
logger.warning("Checker was a zombie")
437
474
gobject.source_remove(self.checker_callback_tag)
438
475
self.checker_callback(pid, status,
439
476
self.current_checker_command)
444
481
command = self.checker_command % self.host
445
482
except TypeError:
446
483
# Escape attributes for the shell
447
escaped_attrs = dict((key,
448
re.escape(unicode(str(val),
449
errors=
450
u'replace')))
451
for key, val in
452
vars(self).iteritems())
484
escaped_attrs = dict(
485
(attr,
486
re.escape(unicode(str(getattr(self, attr, "")),
487
errors=
488
'replace')))
489
for attr in
490
self.runtime_expansions)
491
453
492
try:
454
493
command = self.checker_command % escaped_attrs
455
except TypeError, error:
456
logger.error(u'Could not format string "%s":'
457
u' %s', self.checker_command, error)
494
except TypeError as error:
495
logger.error('Could not format string "%s":'
496
' %s', self.checker_command, error)
458
497
return True # Try again later
459
498
self.current_checker_command = command
460
499
try:
461
logger.info(u"Starting checker %r for %s",
500
logger.info("Starting checker %r for %s",
462
501
command, self.name)
463
502
# We don't need to redirect stdout and stderr, since
464
503
# in normal mode, that is already done by daemon(),
466
505
# always replaced by /dev/null.)
467
506
self.checker = subprocess.Popen(command,
468
507
close_fds=True,
469
shell=True, cwd=u"/")
508
shell=True, cwd="/")
470
509
self.checker_callback_tag = (gobject.child_watch_add
471
510
(self.checker.pid,
472
511
self.checker_callback,
477
516
if pid:
478
517
gobject.source_remove(self.checker_callback_tag)
479
518
self.checker_callback(pid, status, command)
480
except OSError, error:
481
logger.error(u"Failed to start subprocess: %s",
519
except OSError as error:
520
logger.error("Failed to start subprocess: %s",
482
521
error)
483
522
# Re-run this periodically if run by gobject.timeout_add
484
523
return True
488
527
if self.checker_callback_tag:
489
528
gobject.source_remove(self.checker_callback_tag)
490
529
self.checker_callback_tag = None
491
if getattr(self, u"checker", None) is None:
530
if getattr(self, "checker", None) is None:
492
531
return
493
logger.debug(u"Stopping checker for %(name)s", vars(self))
532
logger.debug("Stopping checker for %(name)s", vars(self))
494
533
try:
495
534
os.kill(self.checker.pid, signal.SIGTERM)
496
535
#time.sleep(0.5)
497
536
#if self.checker.poll() is None:
498
537
# os.kill(self.checker.pid, signal.SIGKILL)
499
except OSError, error:
538
except OSError as error:
500
539
if error.errno != errno.ESRCH: # No such process
501
540
raise
502
541
self.checker = None
503
542
504
def dbus_service_property(dbus_interface, signature=u"v",
505
access=u"readwrite", byte_arrays=False):
543
def dbus_service_property(dbus_interface, signature="v",
544
access="readwrite", byte_arrays=False):
506
545
"""Decorators for marking methods of a DBusObjectWithProperties to
507
546
become properties on the D-Bus.
508
547
515
554
"""
516
555
# Encoding deeply encoded byte arrays is not supported yet by the
517
556
# "Set" method, so we fail early here:
518
if byte_arrays and signature != u"ay":
519
raise ValueError(u"Byte arrays not supported for non-'ay'"
520
u" signature %r" % signature)
557
if byte_arrays and signature != "ay":
558
raise ValueError("Byte arrays not supported for non-'ay'"
559
" signature %r" % signature)
521
560
def decorator(func):
522
561
func._dbus_is_property = True
523
562
func._dbus_interface = dbus_interface
524
563
func._dbus_signature = signature
525
564
func._dbus_access = access
526
565
func._dbus_name = func.__name__
527
if func._dbus_name.endswith(u"_dbus_property"):
566
if func._dbus_name.endswith("_dbus_property"):
528
567
func._dbus_name = func._dbus_name[:-14]
529
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
568
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
530
569
return func
531
570
return decorator
532
571
560
599
561
600
@staticmethod
562
601
def _is_dbus_property(obj):
563
return getattr(obj, u"_dbus_is_property", False)
602
return getattr(obj, "_dbus_is_property", False)
564
603
565
604
def _get_all_dbus_properties(self):
566
605
"""Returns a generator of (name, attribute) pairs
574
613
property with the specified name and interface.
575
614
"""
576
615
for name in (property_name,
577
property_name + u"_dbus_property"):
616
property_name + "_dbus_property"):
578
617
prop = getattr(self, name, None)
579
618
if (prop is None
580
619
or not self._is_dbus_property(prop)
584
623
continue
585
624
return prop
586
625
# No such property
587
raise DBusPropertyNotFound(self.dbus_object_path + u":"
588
+ interface_name + u"."
626
raise DBusPropertyNotFound(self.dbus_object_path + ":"
627
+ interface_name + "."
589
628
+ property_name)
590
629
591
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
592
out_signature=u"v")
630
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
631
out_signature="v")
593
632
def Get(self, interface_name, property_name):
594
633
"""Standard D-Bus property Get() method, see D-Bus standard.
595
634
"""
596
635
prop = self._get_dbus_property(interface_name, property_name)
597
if prop._dbus_access == u"write":
636
if prop._dbus_access == "write":
598
637
raise DBusPropertyAccessException(property_name)
599
638
value = prop()
600
if not hasattr(value, u"variant_level"):
639
if not hasattr(value, "variant_level"):
601
640
return value
602
641
return type(value)(value, variant_level=value.variant_level+1)
603
642
604
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
643
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
605
644
def Set(self, interface_name, property_name, value):
606
645
"""Standard D-Bus property Set() method, see D-Bus standard.
607
646
"""
608
647
prop = self._get_dbus_property(interface_name, property_name)
609
if prop._dbus_access == u"read":
648
if prop._dbus_access == "read":
610
649
raise DBusPropertyAccessException(property_name)
611
if prop._dbus_get_args_options[u"byte_arrays"]:
650
if prop._dbus_get_args_options["byte_arrays"]:
612
651
# The byte_arrays option is not supported yet on
613
652
# signatures other than "ay".
614
if prop._dbus_signature != u"ay":
653
if prop._dbus_signature != "ay":
615
654
raise ValueError
616
655
value = dbus.ByteArray(''.join(unichr(byte)
617
656
for byte in value))
618
657
prop(value)
619
658
620
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
621
out_signature=u"a{sv}")
659
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
660
out_signature="a{sv}")
622
661
def GetAll(self, interface_name):
623
662
"""Standard D-Bus property GetAll() method, see D-Bus
624
663
standard.
632
671
# Interface non-empty but did not match
633
672
continue
634
673
# Ignore write-only properties
635
if prop._dbus_access == u"write":
674
if prop._dbus_access == "write":
636
675
continue
637
676
value = prop()
638
if not hasattr(value, u"variant_level"):
677
if not hasattr(value, "variant_level"):
639
678
all[name] = value
640
679
continue
641
680
all[name] = type(value)(value, variant_level=
642
681
value.variant_level+1)
643
return dbus.Dictionary(all, signature=u"sv")
682
return dbus.Dictionary(all, signature="sv")
644
683
645
684
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
646
out_signature=u"s",
685
out_signature="s",
647
686
path_keyword='object_path',
648
687
connection_keyword='connection')
649
688
def Introspect(self, object_path, connection):
654
693
try:
655
694
document = xml.dom.minidom.parseString(xmlstring)
656
695
def make_tag(document, name, prop):
657
e = document.createElement(u"property")
658
e.setAttribute(u"name", name)
659
e.setAttribute(u"type", prop._dbus_signature)
660
e.setAttribute(u"access", prop._dbus_access)
696
e = document.createElement("property")
697
e.setAttribute("name", name)
698
e.setAttribute("type", prop._dbus_signature)
699
e.setAttribute("access", prop._dbus_access)
661
700
return e
662
for if_tag in document.getElementsByTagName(u"interface"):
701
for if_tag in document.getElementsByTagName("interface"):
663
702
for tag in (make_tag(document, name, prop)
664
703
for name, prop
665
704
in self._get_all_dbus_properties()
666
705
if prop._dbus_interface
667
== if_tag.getAttribute(u"name")):
706
== if_tag.getAttribute("name")):
668
707
if_tag.appendChild(tag)
669
708
# Add the names to the return values for the
670
709
# "org.freedesktop.DBus.Properties" methods
671
if (if_tag.getAttribute(u"name")
672
== u"org.freedesktop.DBus.Properties"):
673
for cn in if_tag.getElementsByTagName(u"method"):
674
if cn.getAttribute(u"name") == u"Get":
675
for arg in cn.getElementsByTagName(u"arg"):
676
if (arg.getAttribute(u"direction")
677
== u"out"):
678
arg.setAttribute(u"name", u"value")
679
elif cn.getAttribute(u"name") == u"GetAll":
680
for arg in cn.getElementsByTagName(u"arg"):
681
if (arg.getAttribute(u"direction")
682
== u"out"):
683
arg.setAttribute(u"name", u"props")
684
xmlstring = document.toxml(u"utf-8")
710
if (if_tag.getAttribute("name")
711
== "org.freedesktop.DBus.Properties"):
712
for cn in if_tag.getElementsByTagName("method"):
713
if cn.getAttribute("name") == "Get":
714
for arg in cn.getElementsByTagName("arg"):
715
if (arg.getAttribute("direction")
716
== "out"):
717
arg.setAttribute("name", "value")
718
elif cn.getAttribute("name") == "GetAll":
719
for arg in cn.getElementsByTagName("arg"):
720
if (arg.getAttribute("direction")
721
== "out"):
722
arg.setAttribute("name", "props")
723
xmlstring = document.toxml("utf-8")
685
724
document.unlink()
686
725
except (AttributeError, xml.dom.DOMException,
687
xml.parsers.expat.ExpatError), error:
688
logger.error(u"Failed to override Introspection method",
726
xml.parsers.expat.ExpatError) as error:
727
logger.error("Failed to override Introspection method",
689
728
error)
690
729
return xmlstring
691
730
697
736
dbus_object_path: dbus.ObjectPath
698
737
bus: dbus.SystemBus()
699
738
"""
739
740
runtime_expansions = (Client.runtime_expansions
741
+ ("dbus_object_path",))
742
700
743
# dbus.service.Object doesn't use super(), so we can't either.
701
744
702
745
def __init__(self, bus = None, *args, **kwargs):
705
748
Client.__init__(self, *args, **kwargs)
706
749
# Only now, when this client is initialized, can it show up on
707
750
# the D-Bus
751
client_object_name = unicode(self.name).translate(
752
{ord("."): ord("_"),
753
ord("-"): ord("_")})
708
754
self.dbus_object_path = (dbus.ObjectPath
709
(u"/clients/"
710
+ self.name.replace(u".", u"_")))
755
("/clients/" + client_object_name))
711
756
DBusObjectWithProperties.__init__(self, self.bus,
712
757
self.dbus_object_path)
713
758
714
759
def _get_approvals_pending(self):
715
760
return self._approvals_pending
716
761
def _set_approvals_pending(self, value):
720
765
if (hasattr(self, "dbus_object_path")
721
766
and bval is not bool(old_value)):
722
767
dbus_bool = dbus.Boolean(bval, variant_level=1)
723
self.PropertyChanged(dbus.String(u"approved_pending"),
768
self.PropertyChanged(dbus.String("ApprovalPending"),
724
769
dbus_bool)
725
770
726
771
approvals_pending = property(_get_approvals_pending,
734
779
variant_level=variant_level)
735
780
736
781
def enable(self):
737
oldstate = getattr(self, u"enabled", False)
782
oldstate = getattr(self, "enabled", False)
738
783
r = Client.enable(self)
739
784
if oldstate != self.enabled:
740
785
# Emit D-Bus signals
741
self.PropertyChanged(dbus.String(u"enabled"),
786
self.PropertyChanged(dbus.String("Enabled"),
742
787
dbus.Boolean(True, variant_level=1))
743
788
self.PropertyChanged(
744
dbus.String(u"last_enabled"),
789
dbus.String("LastEnabled"),
745
790
self._datetime_to_dbus(self.last_enabled,
746
791
variant_level=1))
747
792
return r
748
793
749
794
def disable(self, quiet = False):
750
oldstate = getattr(self, u"enabled", False)
795
oldstate = getattr(self, "enabled", False)
751
796
r = Client.disable(self, quiet=quiet)
752
797
if not quiet and oldstate != self.enabled:
753
798
# Emit D-Bus signal
754
self.PropertyChanged(dbus.String(u"enabled"),
799
self.PropertyChanged(dbus.String("Enabled"),
755
800
dbus.Boolean(False, variant_level=1))
756
801
return r
757
802
760
805
self.remove_from_connection()
761
806
except LookupError:
762
807
pass
763
if hasattr(DBusObjectWithProperties, u"__del__"):
808
if hasattr(DBusObjectWithProperties, "__del__"):
764
809
DBusObjectWithProperties.__del__(self, *args, **kwargs)
765
810
Client.__del__(self, *args, **kwargs)
766
811
769
814
self.checker_callback_tag = None
770
815
self.checker = None
771
816
# Emit D-Bus signal
772
self.PropertyChanged(dbus.String(u"checker_running"),
817
self.PropertyChanged(dbus.String("CheckerRunning"),
773
818
dbus.Boolean(False, variant_level=1))
774
819
if os.WIFEXITED(condition):
775
820
exitstatus = os.WEXITSTATUS(condition)
787
832
*args, **kwargs)
788
833
789
834
def checked_ok(self, *args, **kwargs):
790
r = Client.checked_ok(self, *args, **kwargs)
835
Client.checked_ok(self, *args, **kwargs)
791
836
# Emit D-Bus signal
792
837
self.PropertyChanged(
793
dbus.String(u"last_checked_ok"),
838
dbus.String("LastCheckedOK"),
794
839
(self._datetime_to_dbus(self.last_checked_ok,
795
840
variant_level=1)))
841
842
def need_approval(self, *args, **kwargs):
843
r = Client.need_approval(self, *args, **kwargs)
844
# Emit D-Bus signal
845
self.PropertyChanged(
846
dbus.String("LastApprovalRequest"),
847
(self._datetime_to_dbus(self.last_approval_request,
848
variant_level=1)))
796
849
return r
797
850
798
851
def start_checker(self, *args, **kwargs):
808
861
# Emit D-Bus signal
809
862
self.CheckerStarted(self.current_checker_command)
810
863
self.PropertyChanged(
811
dbus.String(u"checker_running"),
864
dbus.String("CheckerRunning"),
812
865
dbus.Boolean(True, variant_level=1))
813
866
return r
814
867
815
868
def stop_checker(self, *args, **kwargs):
816
old_checker = getattr(self, u"checker", None)
869
old_checker = getattr(self, "checker", None)
817
870
r = Client.stop_checker(self, *args, **kwargs)
818
871
if (old_checker is not None
819
and getattr(self, u"checker", None) is None):
820
self.PropertyChanged(dbus.String(u"checker_running"),
872
and getattr(self, "checker", None) is None):
873
self.PropertyChanged(dbus.String("CheckerRunning"),
821
874
dbus.Boolean(False, variant_level=1))
822
875
return r
823
876
828
881
def approve(self, value=True):
829
882
self.send_changedstate()
830
883
self._approved = value
831
gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration),
884
gobject.timeout_add(self._timedelta_to_milliseconds
885
(self.approval_duration),
832
886
self._reset_approved)
833
887
834
888
835
889
## D-Bus methods, signals & properties
836
_interface = u"se.bsnet.fukt.Mandos.Client"
890
_interface = "se.bsnet.fukt.Mandos.Client"
837
891
838
892
## Signals
839
893
840
894
# CheckerCompleted - signal
841
@dbus.service.signal(_interface, signature=u"nxs")
895
@dbus.service.signal(_interface, signature="nxs")
842
896
def CheckerCompleted(self, exitcode, waitstatus, command):
843
897
"D-Bus signal"
844
898
pass
845
899
846
900
# CheckerStarted - signal
847
@dbus.service.signal(_interface, signature=u"s")
901
@dbus.service.signal(_interface, signature="s")
848
902
def CheckerStarted(self, command):
849
903
"D-Bus signal"
850
904
pass
851
905
852
906
# PropertyChanged - signal
853
@dbus.service.signal(_interface, signature=u"sv")
907
@dbus.service.signal(_interface, signature="sv")
854
908
def PropertyChanged(self, property, value):
855
909
"D-Bus signal"
856
910
pass
865
919
pass
866
920
867
921
# Rejected - signal
868
@dbus.service.signal(_interface, signature=u"s")
922
@dbus.service.signal(_interface, signature="s")
869
923
def Rejected(self, reason):
870
924
"D-Bus signal"
871
925
pass
872
926
873
927
# NeedApproval - signal
874
@dbus.service.signal(_interface, signature=u"db")
928
@dbus.service.signal(_interface, signature="tb")
875
929
def NeedApproval(self, timeout, default):
876
930
"D-Bus signal"
877
pass
931
return self.need_approval()
878
932
879
933
## Methods
880
934
881
935
# Approve - method
882
@dbus.service.method(_interface, in_signature=u"b")
936
@dbus.service.method(_interface, in_signature="b")
883
937
def Approve(self, value):
884
938
self.approve(value)
885
939
886
940
# CheckedOK - method
887
941
@dbus.service.method(_interface)
888
942
def CheckedOK(self):
889
return self.checked_ok()
943
self.checked_ok()
890
944
891
945
# Enable - method
892
946
@dbus.service.method(_interface)
913
967
914
968
## Properties
915
969
916
# approved_pending - property
917
@dbus_service_property(_interface, signature=u"b", access=u"read")
918
def approved_pending_dbus_property(self):
970
# ApprovalPending - property
971
@dbus_service_property(_interface, signature="b", access="read")
972
def ApprovalPending_dbus_property(self):
919
973
return dbus.Boolean(bool(self.approvals_pending))
920
974
921
# approved_by_default - property
922
@dbus_service_property(_interface, signature=u"b",
923
access=u"readwrite")
924
def approved_by_default_dbus_property(self):
925
return dbus.Boolean(self.approved_by_default)
926
927
# approved_delay - property
928
@dbus_service_property(_interface, signature=u"t",
929
access=u"readwrite")
930
def approved_delay_dbus_property(self):
931
return dbus.UInt64(self.approved_delay_milliseconds())
932
933
# approved_duration - property
934
@dbus_service_property(_interface, signature=u"t",
935
access=u"readwrite")
936
def approved_duration_dbus_property(self):
937
return dbus.UInt64(self._timedelta_to_milliseconds(
938
self.approved_duration))
939
940
# name - property
941
@dbus_service_property(_interface, signature=u"s", access=u"read")
942
def name_dbus_property(self):
975
# ApprovedByDefault - property
976
@dbus_service_property(_interface, signature="b",
977
access="readwrite")
978
def ApprovedByDefault_dbus_property(self, value=None):
979
if value is None: # get
980
return dbus.Boolean(self.approved_by_default)
981
self.approved_by_default = bool(value)
982
# Emit D-Bus signal
983
self.PropertyChanged(dbus.String("ApprovedByDefault"),
984
dbus.Boolean(value, variant_level=1))
985
986
# ApprovalDelay - property
987
@dbus_service_property(_interface, signature="t",
988
access="readwrite")
989
def ApprovalDelay_dbus_property(self, value=None):
990
if value is None: # get
991
return dbus.UInt64(self.approval_delay_milliseconds())
992
self.approval_delay = datetime.timedelta(0, 0, 0, value)
993
# Emit D-Bus signal
994
self.PropertyChanged(dbus.String("ApprovalDelay"),
995
dbus.UInt64(value, variant_level=1))
996
997
# ApprovalDuration - property
998
@dbus_service_property(_interface, signature="t",
999
access="readwrite")
1000
def ApprovalDuration_dbus_property(self, value=None):
1001
if value is None: # get
1002
return dbus.UInt64(self._timedelta_to_milliseconds(
1003
self.approval_duration))
1004
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1005
# Emit D-Bus signal
1006
self.PropertyChanged(dbus.String("ApprovalDuration"),
1007
dbus.UInt64(value, variant_level=1))
1008
1009
# Name - property
1010
@dbus_service_property(_interface, signature="s", access="read")
1011
def Name_dbus_property(self):
943
1012
return dbus.String(self.name)
944
1013
945
# fingerprint - property
946
@dbus_service_property(_interface, signature=u"s", access=u"read")
947
def fingerprint_dbus_property(self):
1014
# Fingerprint - property
1015
@dbus_service_property(_interface, signature="s", access="read")
1016
def Fingerprint_dbus_property(self):
948
1017
return dbus.String(self.fingerprint)
949
1018
950
# host - property
951
@dbus_service_property(_interface, signature=u"s",
952
access=u"readwrite")
953
def host_dbus_property(self, value=None):
1019
# Host - property
1020
@dbus_service_property(_interface, signature="s",
1021
access="readwrite")
1022
def Host_dbus_property(self, value=None):
954
1023
if value is None: # get
955
1024
return dbus.String(self.host)
956
1025
self.host = value
957
1026
# Emit D-Bus signal
958
self.PropertyChanged(dbus.String(u"host"),
1027
self.PropertyChanged(dbus.String("Host"),
959
1028
dbus.String(value, variant_level=1))
960
1029
961
# created - property
962
@dbus_service_property(_interface, signature=u"s", access=u"read")
963
def created_dbus_property(self):
1030
# Created - property
1031
@dbus_service_property(_interface, signature="s", access="read")
1032
def Created_dbus_property(self):
964
1033
return dbus.String(self._datetime_to_dbus(self.created))
965
1034
966
# last_enabled - property
967
@dbus_service_property(_interface, signature=u"s", access=u"read")
968
def last_enabled_dbus_property(self):
1035
# LastEnabled - property
1036
@dbus_service_property(_interface, signature="s", access="read")
1037
def LastEnabled_dbus_property(self):
969
1038
if self.last_enabled is None:
970
return dbus.String(u"")
1039
return dbus.String("")
971
1040
return dbus.String(self._datetime_to_dbus(self.last_enabled))
972
1041
973
# enabled - property
974
@dbus_service_property(_interface, signature=u"b",
975
access=u"readwrite")
976
def enabled_dbus_property(self, value=None):
1042
# Enabled - property
1043
@dbus_service_property(_interface, signature="b",
1044
access="readwrite")
1045
def Enabled_dbus_property(self, value=None):
977
1046
if value is None: # get
978
1047
return dbus.Boolean(self.enabled)
979
1048
if value:
981
1050
else:
982
1051
self.disable()
983
1052
984
# last_checked_ok - property
985
@dbus_service_property(_interface, signature=u"s",
986
access=u"readwrite")
987
def last_checked_ok_dbus_property(self, value=None):
1053
# LastCheckedOK - property
1054
@dbus_service_property(_interface, signature="s",
1055
access="readwrite")
1056
def LastCheckedOK_dbus_property(self, value=None):
988
1057
if value is not None:
989
1058
self.checked_ok()
990
1059
return
991
1060
if self.last_checked_ok is None:
992
return dbus.String(u"")
1061
return dbus.String("")
993
1062
return dbus.String(self._datetime_to_dbus(self
994
1063
.last_checked_ok))
995
1064
996
# timeout - property
997
@dbus_service_property(_interface, signature=u"t",
998
access=u"readwrite")
999
def timeout_dbus_property(self, value=None):
1065
# LastApprovalRequest - property
1066
@dbus_service_property(_interface, signature="s", access="read")
1067
def LastApprovalRequest_dbus_property(self):
1068
if self.last_approval_request is None:
1069
return dbus.String("")
1070
return dbus.String(self.
1071
_datetime_to_dbus(self
1072
.last_approval_request))
1073
1074
# Timeout - property
1075
@dbus_service_property(_interface, signature="t",
1076
access="readwrite")
1077
def Timeout_dbus_property(self, value=None):
1000
1078
if value is None: # get
1001
1079
return dbus.UInt64(self.timeout_milliseconds())
1002
1080
self.timeout = datetime.timedelta(0, 0, 0, value)
1003
1081
# Emit D-Bus signal
1004
self.PropertyChanged(dbus.String(u"timeout"),
1082
self.PropertyChanged(dbus.String("Timeout"),
1005
1083
dbus.UInt64(value, variant_level=1))
1006
if getattr(self, u"disable_initiator_tag", None) is None:
1084
if getattr(self, "disable_initiator_tag", None) is None:
1007
1085
return
1008
1086
# Reschedule timeout
1009
1087
gobject.source_remove(self.disable_initiator_tag)
1021
1099
self.disable_initiator_tag = (gobject.timeout_add
1022
1100
(time_to_die, self.disable))
1023
1101
1024
# interval - property
1025
@dbus_service_property(_interface, signature=u"t",
1026
access=u"readwrite")
1027
def interval_dbus_property(self, value=None):
1102
# Interval - property
1103
@dbus_service_property(_interface, signature="t",
1104
access="readwrite")
1105
def Interval_dbus_property(self, value=None):
1028
1106
if value is None: # get
1029
1107
return dbus.UInt64(self.interval_milliseconds())
1030
1108
self.interval = datetime.timedelta(0, 0, 0, value)
1031
1109
# Emit D-Bus signal
1032
self.PropertyChanged(dbus.String(u"interval"),
1110
self.PropertyChanged(dbus.String("Interval"),
1033
1111
dbus.UInt64(value, variant_level=1))
1034
if getattr(self, u"checker_initiator_tag", None) is None:
1112
if getattr(self, "checker_initiator_tag", None) is None:
1035
1113
return
1036
1114
# Reschedule checker run
1037
1115
gobject.source_remove(self.checker_initiator_tag)
1039
1117
(value, self.start_checker))
1040
1118
self.start_checker() # Start one now, too
1041
1119
1042
# checker - property
1043
@dbus_service_property(_interface, signature=u"s",
1044
access=u"readwrite")
1045
def checker_dbus_property(self, value=None):
1120
# Checker - property
1121
@dbus_service_property(_interface, signature="s",
1122
access="readwrite")
1123
def Checker_dbus_property(self, value=None):
1046
1124
if value is None: # get
1047
1125
return dbus.String(self.checker_command)
1048
1126
self.checker_command = value
1049
1127
# Emit D-Bus signal
1050
self.PropertyChanged(dbus.String(u"checker"),
1128
self.PropertyChanged(dbus.String("Checker"),
1051
1129
dbus.String(self.checker_command,
1052
1130
variant_level=1))
1053
1131
1054
# checker_running - property
1055
@dbus_service_property(_interface, signature=u"b",
1056
access=u"readwrite")
1057
def checker_running_dbus_property(self, value=None):
1132
# CheckerRunning - property
1133
@dbus_service_property(_interface, signature="b",
1134
access="readwrite")
1135
def CheckerRunning_dbus_property(self, value=None):
1058
1136
if value is None: # get
1059
1137
return dbus.Boolean(self.checker is not None)
1060
1138
if value:
1062
1140
else:
1063
1141
self.stop_checker()
1064
1142
1065
# object_path - property
1066
@dbus_service_property(_interface, signature=u"o", access=u"read")
1067
def object_path_dbus_property(self):
1143
# ObjectPath - property
1144
@dbus_service_property(_interface, signature="o", access="read")
1145
def ObjectPath_dbus_property(self):
1068
1146
return self.dbus_object_path # is already a dbus.ObjectPath
1069
1147
1070
# secret = property
1071
@dbus_service_property(_interface, signature=u"ay",
1072
access=u"write", byte_arrays=True)
1073
def secret_dbus_property(self, value):
1148
# Secret = property
1149
@dbus_service_property(_interface, signature="ay",
1150
access="write", byte_arrays=True)
1151
def Secret_dbus_property(self, value):
1074
1152
self.secret = str(value)
1075
1153
1076
1154
del _interface
1110
1188
1111
1189
def handle(self):
1112
1190
with contextlib.closing(self.server.child_pipe) as child_pipe:
1113
logger.info(u"TCP connection from: %s",
1191
logger.info("TCP connection from: %s",
1114
1192
unicode(self.client_address))
1115
logger.debug(u"Pipe FD: %d",
1193
logger.debug("Pipe FD: %d",
1116
1194
self.server.child_pipe.fileno())
1117
1195
1118
1196
session = (gnutls.connection
1125
1203
# no X.509 keys are added to it. Therefore, we can use it
1126
1204
# here despite using OpenPGP certificates.
1127
1205
1128
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1129
# u"+AES-256-CBC", u"+SHA1",
1130
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1131
# u"+DHE-DSS"))
1206
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1207
# "+AES-256-CBC", "+SHA1",
1208
# "+COMP-NULL", "+CTYPE-OPENPGP",
1209
# "+DHE-DSS"))
1132
1210
# Use a fallback default, since this MUST be set.
1133
1211
priority = self.server.gnutls_priority
1134
1212
if priority is None:
1135
priority = u"NORMAL"
1213
priority = "NORMAL"
1136
1214
(gnutls.library.functions
1137
1215
.gnutls_priority_set_direct(session._c_object,
1138
1216
priority, None))
1140
1218
# Start communication using the Mandos protocol
1141
1219
# Get protocol number
1142
1220
line = self.request.makefile().readline()
1143
logger.debug(u"Protocol version: %r", line)
1221
logger.debug("Protocol version: %r", line)
1144
1222
try:
1145
1223
if int(line.strip().split()[0]) > 1:
1146
1224
raise RuntimeError
1147
except (ValueError, IndexError, RuntimeError), error:
1148
logger.error(u"Unknown protocol version: %s", error)
1225
except (ValueError, IndexError, RuntimeError) as error:
1226
logger.error("Unknown protocol version: %s", error)
1149
1227
return
1150
1228
1151
1229
# Start GnuTLS connection
1152
1230
try:
1153
1231
session.handshake()
1154
except gnutls.errors.GNUTLSError, error:
1155
logger.warning(u"Handshake failed: %s", error)
1232
except gnutls.errors.GNUTLSError as error:
1233
logger.warning("Handshake failed: %s", error)
1156
1234
# Do not run session.bye() here: the session is not
1157
1235
# established. Just abandon the request.
1158
1236
return
1159
logger.debug(u"Handshake succeeded")
1237
logger.debug("Handshake succeeded")
1160
1238
1161
1239
approval_required = False
1162
1240
try:
1163
1241
try:
1164
1242
fpr = self.fingerprint(self.peer_certificate
1165
1243
(session))
1166
except (TypeError, gnutls.errors.GNUTLSError), error:
1167
logger.warning(u"Bad certificate: %s", error)
1244
except (TypeError,
1245
gnutls.errors.GNUTLSError) as error:
1246
logger.warning("Bad certificate: %s", error)
1168
1247
return
1169
logger.debug(u"Fingerprint: %s", fpr)
1248
logger.debug("Fingerprint: %s", fpr)
1170
1249
1171
1250
try:
1172
1251
client = ProxyClient(child_pipe, fpr,
1174
1253
except KeyError:
1175
1254
return
1176
1255
1177
if client.approved_delay:
1178
delay = client.approved_delay
1256
if client.approval_delay:
1257
delay = client.approval_delay
1179
1258
client.approvals_pending += 1
1180
1259
approval_required = True
1181
1260
1182
1261
while True:
1183
1262
if not client.enabled:
1184
logger.warning(u"Client %s is disabled",
1263
logger.warning("Client %s is disabled",
1185
1264
client.name)
1186
1265
if self.server.use_dbus:
1187
1266
# Emit D-Bus signal
1188
1267
client.Rejected("Disabled")
1189
1268
return
1190
1269
1191
if client._approved or not client.approved_delay:
1270
if client._approved or not client.approval_delay:
1192
1271
#We are approved or approval is disabled
1193
1272
break
1194
1273
elif client._approved is None:
1195
logger.info(u"Client %s need approval",
1274
logger.info("Client %s needs approval",
1196
1275
client.name)
1197
1276
if self.server.use_dbus:
1198
1277
# Emit D-Bus signal
1199
1278
client.NeedApproval(
1200
client.approved_delay_milliseconds(),
1279
client.approval_delay_milliseconds(),
1201
1280
client.approved_by_default)
1202
1281
else:
1203
logger.warning(u"Client %s was not approved",
1282
logger.warning("Client %s was not approved",
1204
1283
client.name)
1205
1284
if self.server.use_dbus:
1206
1285
# Emit D-Bus signal
1207
client.Rejected("Disapproved")
1286
client.Rejected("Denied")
1208
1287
return
1209
1288
1210
1289
#wait until timeout or approved
1221
1300
client.name)
1222
1301
if self.server.use_dbus:
1223
1302
# Emit D-Bus signal
1224
client.Rejected("Time out")
1303
client.Rejected("Approval timed out")
1225
1304
return
1226
1305
else:
1227
1306
break
1232
1311
while sent_size < len(client.secret):
1233
1312
try:
1234
1313
sent = session.send(client.secret[sent_size:])
1235
except (gnutls.errors.GNUTLSError), error:
1314
except gnutls.errors.GNUTLSError as error:
1236
1315
logger.warning("gnutls send failed")
1237
1316
return
1238
logger.debug(u"Sent: %d, remaining: %d",
1317
logger.debug("Sent: %d, remaining: %d",
1239
1318
sent, len(client.secret)
1240
1319
- (sent_size + sent))
1241
1320
sent_size += sent
1242
1321
1243
logger.info(u"Sending secret to %s", client.name)
1322
logger.info("Sending secret to %s", client.name)
1244
1323
# bump the timeout as if seen
1245
1324
client.checked_ok()
1246
1325
if self.server.use_dbus:
1252
1331
client.approvals_pending -= 1
1253
1332
try:
1254
1333
session.bye()
1255
except (gnutls.errors.GNUTLSError), error:
1256
logger.warning("gnutls bye failed")
1334
except gnutls.errors.GNUTLSError as error:
1335
logger.warning("GnuTLS bye failed")
1257
1336
1258
1337
@staticmethod
1259
1338
def peer_certificate(session):
1269
1348
.gnutls_certificate_get_peers
1270
1349
(session._c_object, ctypes.byref(list_size)))
1271
1350
if not bool(cert_list) and list_size.value != 0:
1272
raise gnutls.errors.GNUTLSError(u"error getting peer"
1273
u" certificate")
1351
raise gnutls.errors.GNUTLSError("error getting peer"
1352
" certificate")
1274
1353
if list_size.value == 0:
1275
1354
return None
1276
1355
cert = cert_list[0]
1302
1381
if crtverify.value != 0:
1303
1382
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1304
1383
raise (gnutls.errors.CertificateSecurityError
1305
(u"Verify failed"))
1384
("Verify failed"))
1306
1385
# New buffer for the fingerprint
1307
1386
buf = ctypes.create_string_buffer(20)
1308
1387
buf_len = ctypes.c_size_t()
1315
1394
# Convert the buffer to a Python bytestring
1316
1395
fpr = ctypes.string_at(buf, buf_len.value)
1317
1396
# Convert the bytestring to hexadecimal notation
1318
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1397
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1319
1398
return hex_fpr
1320
1399
1321
1400
1349
1428
1350
1429
def add_pipe(self, parent_pipe):
1351
1430
"""Dummy function; override as necessary"""
1352
pass
1431
raise NotImplementedError
1353
1432
1354
1433
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1355
1434
socketserver.TCPServer, object):
1373
1452
bind to an address or port if they were not specified."""
1374
1453
if self.interface is not None:
1375
1454
if SO_BINDTODEVICE is None:
1376
logger.error(u"SO_BINDTODEVICE does not exist;"
1377
u" cannot bind to interface %s",
1455
logger.error("SO_BINDTODEVICE does not exist;"
1456
" cannot bind to interface %s",
1378
1457
self.interface)
1379
1458
else:
1380
1459
try:
1381
1460
self.socket.setsockopt(socket.SOL_SOCKET,
1382
1461
SO_BINDTODEVICE,
1383
1462
str(self.interface
1384
+ u'\0'))
1385
except socket.error, error:
1463
+ '\0'))
1464
except socket.error as error:
1386
1465
if error[0] == errno.EPERM:
1387
logger.error(u"No permission to"
1388
u" bind to interface %s",
1466
logger.error("No permission to"
1467
" bind to interface %s",
1389
1468
self.interface)
1390
1469
elif error[0] == errno.ENOPROTOOPT:
1391
logger.error(u"SO_BINDTODEVICE not available;"
1392
u" cannot bind to interface %s",
1470
logger.error("SO_BINDTODEVICE not available;"
1471
" cannot bind to interface %s",
1393
1472
self.interface)
1394
1473
else:
1395
1474
raise
1397
1476
if self.server_address[0] or self.server_address[1]:
1398
1477
if not self.server_address[0]:
1399
1478
if self.address_family == socket.AF_INET6:
1400
any_address = u"::" # in6addr_any
1479
any_address = "::" # in6addr_any
1401
1480
else:
1402
1481
any_address = socket.INADDR_ANY
1403
1482
self.server_address = (any_address,
1452
1531
def handle_ipc(self, source, condition, parent_pipe=None,
1453
1532
client_object=None):
1454
1533
condition_names = {
1455
gobject.IO_IN: u"IN", # There is data to read.
1456
gobject.IO_OUT: u"OUT", # Data can be written (without
1534
gobject.IO_IN: "IN", # There is data to read.
1535
gobject.IO_OUT: "OUT", # Data can be written (without
1457
1536
# blocking).
1458
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1459
gobject.IO_ERR: u"ERR", # Error condition.
1460
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1537
gobject.IO_PRI: "PRI", # There is urgent data to read.
1538
gobject.IO_ERR: "ERR", # Error condition.
1539
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1461
1540
# broken, usually for pipes and
1462
1541
# sockets).
1463
1542
}
1465
1544
for cond, name in
1466
1545
condition_names.iteritems()
1467
1546
if cond & condition)
1468
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1469
conditions_string)
1470
1471
1547
# error or the other end of multiprocessing.Pipe has closed
1472
1548
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1473
1549
return False
1474
1550
1475
1551
# Read a request from the child
1476
1552
request = parent_pipe.recv()
1477
logger.debug(u"IPC request: %s", repr(request))
1478
1553
command = request[0]
1479
1554
1480
1555
if command == 'init':
1486
1561
client = c
1487
1562
break
1488
1563
else:
1489
logger.warning(u"Client not found for fingerprint: %s, ad"
1490
u"dress: %s", fpr, address)
1564
logger.warning("Client not found for fingerprint: %s, ad"
1565
"dress: %s", fpr, address)
1491
1566
if self.use_dbus:
1492
1567
# Emit D-Bus signal
1493
mandos_dbus_service.ClientNotFound(fpr, address)
1568
mandos_dbus_service.ClientNotFound(fpr, address[0])
1494
1569
parent_pipe.send(False)
1495
1570
return False
1496
1571
1527
1602
def string_to_delta(interval):
1528
1603
"""Parse a string and return a datetime.timedelta
1529
1604
1530
>>> string_to_delta(u'7d')
1605
>>> string_to_delta('7d')
1531
1606
datetime.timedelta(7)
1532
>>> string_to_delta(u'60s')
1607
>>> string_to_delta('60s')
1533
1608
datetime.timedelta(0, 60)
1534
>>> string_to_delta(u'60m')
1609
>>> string_to_delta('60m')
1535
1610
datetime.timedelta(0, 3600)
1536
>>> string_to_delta(u'24h')
1611
>>> string_to_delta('24h')
1537
1612
datetime.timedelta(1)
1538
>>> string_to_delta(u'1w')
1613
>>> string_to_delta('1w')
1539
1614
datetime.timedelta(7)
1540
>>> string_to_delta(u'5m 30s')
1615
>>> string_to_delta('5m 30s')
1541
1616
datetime.timedelta(0, 330)
1542
1617
"""
1543
1618
timevalue = datetime.timedelta(0)
1545
1620
try:
1546
1621
suffix = unicode(s[-1])
1547
1622
value = int(s[:-1])
1548
if suffix == u"d":
1623
if suffix == "d":
1549
1624
delta = datetime.timedelta(value)
1550
elif suffix == u"s":
1625
elif suffix == "s":
1551
1626
delta = datetime.timedelta(0, value)
1552
elif suffix == u"m":
1627
elif suffix == "m":
1553
1628
delta = datetime.timedelta(0, 0, 0, 0, value)
1554
elif suffix == u"h":
1629
elif suffix == "h":
1555
1630
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1556
elif suffix == u"w":
1631
elif suffix == "w":
1557
1632
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1558
1633
else:
1559
raise ValueError(u"Unknown suffix %r" % suffix)
1560
except (ValueError, IndexError), e:
1561
raise ValueError(e.message)
1634
raise ValueError("Unknown suffix %r" % suffix)
1635
except (ValueError, IndexError) as e:
1636
raise ValueError(*(e.args))
1562
1637
timevalue += delta
1563
1638
return timevalue
1564
1639
1570
1645
global if_nametoindex
1571
1646
try:
1572
1647
if_nametoindex = (ctypes.cdll.LoadLibrary
1573
(ctypes.util.find_library(u"c"))
1648
(ctypes.util.find_library("c"))
1574
1649
.if_nametoindex)
1575
1650
except (OSError, AttributeError):
1576
logger.warning(u"Doing if_nametoindex the hard way")
1651
logger.warning("Doing if_nametoindex the hard way")
1577
1652
def if_nametoindex(interface):
1578
1653
"Get an interface index the hard way, i.e. using fcntl()"
1579
1654
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1580
1655
with contextlib.closing(socket.socket()) as s:
1581
1656
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1582
struct.pack(str(u"16s16x"),
1657
struct.pack(str("16s16x"),
1583
1658
interface))
1584
interface_index = struct.unpack(str(u"I"),
1659
interface_index = struct.unpack(str("I"),
1585
1660
ifreq[16:20])[0]
1586
1661
return interface_index
1587
1662
return if_nametoindex(interface)
1595
1670
sys.exit()
1596
1671
os.setsid()
1597
1672
if not nochdir:
1598
os.chdir(u"/")
1673
os.chdir("/")
1599
1674
if os.fork():
1600
1675
sys.exit()
1601
1676
if not noclose:
1603
1678
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1604
1679
if not stat.S_ISCHR(os.fstat(null).st_mode):
1605
1680
raise OSError(errno.ENODEV,
1606
u"%s not a character device"
1681
"%s not a character device"
1607
1682
% os.path.devnull)
1608
1683
os.dup2(null, sys.stdin.fileno())
1609
1684
os.dup2(null, sys.stdout.fileno())
1617
1692
##################################################################
1618
1693
# Parsing of options, both command line and config file
1619
1694
1620
parser = optparse.OptionParser(version = "%%prog %s" % version)
1621
parser.add_option("-i", u"--interface", type=u"string",
1622
metavar="IF", help=u"Bind to interface IF")
1623
parser.add_option("-a", u"--address", type=u"string",
1624
help=u"Address to listen for requests on")
1625
parser.add_option("-p", u"--port", type=u"int",
1626
help=u"Port number to receive requests on")
1627
parser.add_option("--check", action=u"store_true",
1628
help=u"Run self-test")
1629
parser.add_option("--debug", action=u"store_true",
1630
help=u"Debug mode; run in foreground and log to"
1631
u" terminal")
1632
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1633
help=u"Debug level for stdout output")
1634
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1635
u" priority string (see GnuTLS documentation)")
1636
parser.add_option("--servicename", type=u"string",
1637
metavar=u"NAME", help=u"Zeroconf service name")
1638
parser.add_option("--configdir", type=u"string",
1639
default=u"/etc/mandos", metavar=u"DIR",
1640
help=u"Directory to search for configuration"
1641
u" files")
1642
parser.add_option("--no-dbus", action=u"store_false",
1643
dest=u"use_dbus", help=u"Do not provide D-Bus"
1644
u" system bus interface")
1645
parser.add_option("--no-ipv6", action=u"store_false",
1646
dest=u"use_ipv6", help=u"Do not use IPv6")
1647
options = parser.parse_args()[0]
1695
parser = argparse.ArgumentParser()
1696
parser.add_argument("-v", "--version", action="version",
1697
version = "%%(prog)s %s" % version,
1698
help="show version number and exit")
1699
parser.add_argument("-i", "--interface", metavar="IF",
1700
help="Bind to interface IF")
1701
parser.add_argument("-a", "--address",
1702
help="Address to listen for requests on")
1703
parser.add_argument("-p", "--port", type=int,
1704
help="Port number to receive requests on")
1705
parser.add_argument("--check", action="store_true",
1706
help="Run self-test")
1707
parser.add_argument("--debug", action="store_true",
1708
help="Debug mode; run in foreground and log"
1709
" to terminal")
1710
parser.add_argument("--debuglevel", metavar="LEVEL",
1711
help="Debug level for stdout output")
1712
parser.add_argument("--priority", help="GnuTLS"
1713
" priority string (see GnuTLS documentation)")
1714
parser.add_argument("--servicename",
1715
metavar="NAME", help="Zeroconf service name")
1716
parser.add_argument("--configdir",
1717
default="/etc/mandos", metavar="DIR",
1718
help="Directory to search for configuration"
1719
" files")
1720
parser.add_argument("--no-dbus", action="store_false",
1721
dest="use_dbus", help="Do not provide D-Bus"
1722
" system bus interface")
1723
parser.add_argument("--no-ipv6", action="store_false",
1724
dest="use_ipv6", help="Do not use IPv6")
1725
options = parser.parse_args()
1648
1726
1649
1727
if options.check:
1650
1728
import doctest
1652
1730
sys.exit()
1653
1731
1654
1732
# Default values for config file for server-global settings
1655
server_defaults = { u"interface": u"",
1656
u"address": u"",
1657
u"port": u"",
1658
u"debug": u"False",
1659
u"priority":
1660
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1661
u"servicename": u"Mandos",
1662
u"use_dbus": u"True",
1663
u"use_ipv6": u"True",
1664
u"debuglevel": u"",
1733
server_defaults = { "interface": "",
1734
"address": "",
1735
"port": "",
1736
"debug": "False",
1737
"priority":
1738
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1739
"servicename": "Mandos",
1740
"use_dbus": "True",
1741
"use_ipv6": "True",
1742
"debuglevel": "",
1665
1743
}
1666
1744
1667
1745
# Parse config file for server-global settings
1668
1746
server_config = configparser.SafeConfigParser(server_defaults)
1669
1747
del server_defaults
1670
1748
server_config.read(os.path.join(options.configdir,
1671
u"mandos.conf"))
1749
"mandos.conf"))
1672
1750
# Convert the SafeConfigParser object to a dict
1673
1751
server_settings = server_config.defaults()
1674
1752
# Use the appropriate methods on the non-string config options
1675
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1676
server_settings[option] = server_config.getboolean(u"DEFAULT",
1753
for option in ("debug", "use_dbus", "use_ipv6"):
1754
server_settings[option] = server_config.getboolean("DEFAULT",
1677
1755
option)
1678
1756
if server_settings["port"]:
1679
server_settings["port"] = server_config.getint(u"DEFAULT",
1680
u"port")
1757
server_settings["port"] = server_config.getint("DEFAULT",
1758
"port")
1681
1759
del server_config
1682
1760
1683
1761
# Override the settings from the config file with command line
1684
1762
# options, if set.
1685
for option in (u"interface", u"address", u"port", u"debug",
1686
u"priority", u"servicename", u"configdir",
1687
u"use_dbus", u"use_ipv6", u"debuglevel"):
1763
for option in ("interface", "address", "port", "debug",
1764
"priority", "servicename", "configdir",
1765
"use_dbus", "use_ipv6", "debuglevel"):
1688
1766
value = getattr(options, option)
1689
1767
if value is not None:
1690
1768
server_settings[option] = value
1698
1776
##################################################################
1699
1777
1700
1778
# For convenience
1701
debug = server_settings[u"debug"]
1702
debuglevel = server_settings[u"debuglevel"]
1703
use_dbus = server_settings[u"use_dbus"]
1704
use_ipv6 = server_settings[u"use_ipv6"]
1779
debug = server_settings["debug"]
1780
debuglevel = server_settings["debuglevel"]
1781
use_dbus = server_settings["use_dbus"]
1782
use_ipv6 = server_settings["use_ipv6"]
1705
1783
1706
if server_settings[u"servicename"] != u"Mandos":
1784
if server_settings["servicename"] != "Mandos":
1707
1785
syslogger.setFormatter(logging.Formatter
1708
(u'Mandos (%s) [%%(process)d]:'
1709
u' %%(levelname)s: %%(message)s'
1710
% server_settings[u"servicename"]))
1786
('Mandos (%s) [%%(process)d]:'
1787
' %%(levelname)s: %%(message)s'
1788
% server_settings["servicename"]))
1711
1789
1712
1790
# Parse config file with clients
1713
client_defaults = { u"timeout": u"1h",
1714
u"interval": u"5m",
1715
u"checker": u"fping -q -- %%(host)s",
1716
u"host": u"",
1717
u"approved_delay": u"0s",
1718
u"approved_duration": u"1s",
1791
client_defaults = { "timeout": "1h",
1792
"interval": "5m",
1793
"checker": "fping -q -- %%(host)s",
1794
"host": "",
1795
"approval_delay": "0s",
1796
"approval_duration": "1s",
1719
1797
}
1720
1798
client_config = configparser.SafeConfigParser(client_defaults)
1721
client_config.read(os.path.join(server_settings[u"configdir"],
1722
u"clients.conf"))
1799
client_config.read(os.path.join(server_settings["configdir"],
1800
"clients.conf"))
1723
1801
1724
1802
global mandos_dbus_service
1725
1803
mandos_dbus_service = None
1726
1804
1727
tcp_server = MandosServer((server_settings[u"address"],
1728
server_settings[u"port"]),
1805
tcp_server = MandosServer((server_settings["address"],
1806
server_settings["port"]),
1729
1807
ClientHandler,
1730
interface=server_settings[u"interface"],
1808
interface=(server_settings["interface"]
1809
or None),
1731
1810
use_ipv6=use_ipv6,
1732
1811
gnutls_priority=
1733
server_settings[u"priority"],
1812
server_settings["priority"],
1734
1813
use_dbus=use_dbus)
1735
pidfilename = u"/var/run/mandos.pid"
1736
try:
1737
pidfile = open(pidfilename, u"w")
1738
except IOError:
1739
logger.error(u"Could not open file %r", pidfilename)
1814
if not debug:
1815
pidfilename = "/var/run/mandos.pid"
1816
try:
1817
pidfile = open(pidfilename, "w")
1818
except IOError:
1819
logger.error("Could not open file %r", pidfilename)
1740
1820
1741
1821
try:
1742
uid = pwd.getpwnam(u"_mandos").pw_uid
1743
gid = pwd.getpwnam(u"_mandos").pw_gid
1822
uid = pwd.getpwnam("_mandos").pw_uid
1823
gid = pwd.getpwnam("_mandos").pw_gid
1744
1824
except KeyError:
1745
1825
try:
1746
uid = pwd.getpwnam(u"mandos").pw_uid
1747
gid = pwd.getpwnam(u"mandos").pw_gid
1826
uid = pwd.getpwnam("mandos").pw_uid
1827
gid = pwd.getpwnam("mandos").pw_gid
1748
1828
except KeyError:
1749
1829
try:
1750
uid = pwd.getpwnam(u"nobody").pw_uid
1751
gid = pwd.getpwnam(u"nobody").pw_gid
1830
uid = pwd.getpwnam("nobody").pw_uid
1831
gid = pwd.getpwnam("nobody").pw_gid
1752
1832
except KeyError:
1753
1833
uid = 65534
1754
1834
gid = 65534
1755
1835
try:
1756
1836
os.setgid(gid)
1757
1837
os.setuid(uid)
1758
except OSError, error:
1838
except OSError as error:
1759
1839
if error[0] != errno.EPERM:
1760
1840
raise error
1761
1841
1762
# Enable all possible GnuTLS debugging
1763
1764
1765
1842
if not debug and not debuglevel:
1766
1843
syslogger.setLevel(logging.WARNING)
1767
1844
console.setLevel(logging.WARNING)
1771
1848
console.setLevel(level)
1772
1849
1773
1850
if debug:
1851
# Enable all possible GnuTLS debugging
1852
1774
1853
# "Use a log level over 10 to enable all debugging options."
1775
1854
# - GnuTLS manual
1776
1855
gnutls.library.functions.gnutls_global_set_log_level(11)
1777
1856
1778
1857
@gnutls.library.types.gnutls_log_func
1779
1858
def debug_gnutls(level, string):
1780
logger.debug(u"GnuTLS: %s", string[:-1])
1859
logger.debug("GnuTLS: %s", string[:-1])
1781
1860
1782
1861
(gnutls.library.functions
1783
1862
.gnutls_global_set_log_function(debug_gnutls))
1784
1863
1785
1864
# Redirect stdin so all checkers get /dev/null
1786
1865
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1787
1866
os.dup2(null, sys.stdin.fileno())
1790
1869
else:
1791
1870
# No console logging
1792
1871
logger.removeHandler(console)
1793
1872
1873
# Need to fork before connecting to D-Bus
1874
if not debug:
1875
# Close all input and output, do double fork, etc.
1876
daemon()
1794
1877
1795
1878
global main_loop
1796
1879
# From the Avahi example code
1800
1883
# End of Avahi example code
1801
1884
if use_dbus:
1802
1885
try:
1803
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1886
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1804
1887
bus, do_not_queue=True)
1805
except dbus.exceptions.NameExistsException, e:
1806
logger.error(unicode(e) + u", disabling D-Bus")
1888
except dbus.exceptions.NameExistsException as e:
1889
logger.error(unicode(e) + ", disabling D-Bus")
1807
1890
use_dbus = False
1808
server_settings[u"use_dbus"] = False
1891
server_settings["use_dbus"] = False
1809
1892
tcp_server.use_dbus = False
1810
1893
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1811
service = AvahiService(name = server_settings[u"servicename"],
1812
servicetype = u"_mandos._tcp",
1894
service = AvahiService(name = server_settings["servicename"],
1895
servicetype = "_mandos._tcp",
1813
1896
protocol = protocol, bus = bus)
1814
1897
if server_settings["interface"]:
1815
1898
service.interface = (if_nametoindex
1816
(str(server_settings[u"interface"])))
1817
1818
if not debug:
1819
# Close all input and output, do double fork, etc.
1820
daemon()
1821
1899
(str(server_settings["interface"])))
1900
1822
1901
global multiprocessing_manager
1823
1902
multiprocessing_manager = multiprocessing.Manager()
1824
1903
1843
1922
client_config, section)))
1844
1923
for section in client_config.sections()))
1845
1924
if not tcp_server.clients:
1846
logger.warning(u"No clients defined")
1925
logger.warning("No clients defined")
1847
1926
1848
try:
1849
with pidfile:
1850
pid = os.getpid()
1851
pidfile.write(str(pid) + "\n")
1852
del pidfile
1853
except IOError:
1854
logger.error(u"Could not write to file %r with PID %d",
1855
pidfilename, pid)
1856
except NameError:
1857
# "pidfile" was never created
1858
pass
1859
del pidfilename
1860
1861
1927
if not debug:
1928
try:
1929
with pidfile:
1930
pid = os.getpid()
1931
pidfile.write(str(pid) + "\n".encode("utf-8"))
1932
del pidfile
1933
except IOError:
1934
logger.error("Could not write to file %r with PID %d",
1935
pidfilename, pid)
1936
except NameError:
1937
# "pidfile" was never created
1938
pass
1939
del pidfilename
1940
1862
1941
signal.signal(signal.SIGINT, signal.SIG_IGN)
1942
1863
1943
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1864
1944
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1865
1945
1867
1947
class MandosDBusService(dbus.service.Object):
1868
1948
"""A D-Bus proxy object"""
1869
1949
def __init__(self):
1870
dbus.service.Object.__init__(self, bus, u"/")
1871
_interface = u"se.bsnet.fukt.Mandos"
1950
dbus.service.Object.__init__(self, bus, "/")
1951
_interface = "se.bsnet.fukt.Mandos"
1872
1952
1873
@dbus.service.signal(_interface, signature=u"o")
1953
@dbus.service.signal(_interface, signature="o")
1874
1954
def ClientAdded(self, objpath):
1875
1955
"D-Bus signal"
1876
1956
pass
1877
1957
1878
@dbus.service.signal(_interface, signature=u"ss")
1958
@dbus.service.signal(_interface, signature="ss")
1879
1959
def ClientNotFound(self, fingerprint, address):
1880
1960
"D-Bus signal"
1881
1961
pass
1882
1962
1883
@dbus.service.signal(_interface, signature=u"os")
1963
@dbus.service.signal(_interface, signature="os")
1884
1964
def ClientRemoved(self, objpath, name):
1885
1965
"D-Bus signal"
1886
1966
pass
1887
1967
1888
@dbus.service.method(_interface, out_signature=u"ao")
1968
@dbus.service.method(_interface, out_signature="ao")
1889
1969
def GetAllClients(self):
1890
1970
"D-Bus method"
1891
1971
return dbus.Array(c.dbus_object_path
1892
1972
for c in tcp_server.clients)
1893
1973
1894
1974
@dbus.service.method(_interface,
1895
out_signature=u"a{oa{sv}}")
1975
out_signature="a{oa{sv}}")
1896
1976
def GetAllClientsWithProperties(self):
1897
1977
"D-Bus method"
1898
1978
return dbus.Dictionary(
1899
((c.dbus_object_path, c.GetAll(u""))
1979
((c.dbus_object_path, c.GetAll(""))
1900
1980
for c in tcp_server.clients),
1901
signature=u"oa{sv}")
1981
signature="oa{sv}")
1902
1982
1903
@dbus.service.method(_interface, in_signature=u"o")
1983
@dbus.service.method(_interface, in_signature="o")
1904
1984
def RemoveClient(self, object_path):
1905
1985
"D-Bus method"
1906
1986
for c in tcp_server.clients:
1948
2028
# Find out what port we got
1949
2029
service.port = tcp_server.socket.getsockname()[1]
1950
2030
if use_ipv6:
1951
logger.info(u"Now listening on address %r, port %d,"
2031
logger.info("Now listening on address %r, port %d,"
1952
2032
" flowinfo %d, scope_id %d"
1953
2033
% tcp_server.socket.getsockname())
1954
2034
else: # IPv4
1955
logger.info(u"Now listening on address %r, port %d"
2035
logger.info("Now listening on address %r, port %d"
1956
2036
% tcp_server.socket.getsockname())
1957
2037
1958
2038
#service.interface = tcp_server.socket.getsockname()[3]
1961
2041
# From the Avahi example code
1962
2042
try:
1963
2043
service.activate()
1964
except dbus.exceptions.DBusException, error:
1965
logger.critical(u"DBusException: %s", error)
2044
except dbus.exceptions.DBusException as error:
2045
logger.critical("DBusException: %s", error)
1966
2046
cleanup()
1967
2047
sys.exit(1)
1968
2048
# End of Avahi example code
1972
2052
(tcp_server.handle_request
1973
2053
(*args[2:], **kwargs) or True))
1974
2054
1975
logger.debug(u"Starting main loop")
2055
logger.debug("Starting main loop")
1976
2056
main_loop.run()
1977
except AvahiError, error:
1978
logger.critical(u"AvahiError: %s", error)
2057
except AvahiError as error:
2058
logger.critical("AvahiError: %s", error)
1979
2059
cleanup()
1980
2060
sys.exit(1)
1981
2061
except KeyboardInterrupt:
1982
2062
if debug:
1983
print >> sys.stderr
1984
logger.debug(u"Server received KeyboardInterrupt")
1985
logger.debug(u"Server exiting")
2063
print("", file=sys.stderr)
2064
logger.debug("Server received KeyboardInterrupt")
2065
logger.debug("Server exiting")
1986
2066
# Must run before the D-Bus bus name gets deregistered
1987
2067
cleanup()
1988
2068
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0