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 430
- compare with another revision
- download diff
- download tarball
- view history from revision 430
- Committer: teddy at bsnet
- Date: 2010-09-14 18:22:03 UTC
- Revision ID: teddy@fukt.bsnet.se-20100914182203-w26c64tdthto4jg2
* mandos-monitor.xml: New.
* Makefile (PROGS): Add "mandos-monitor".
(DOCS): Add "mandos-monitor.xml".
(mandos-monitor.8, mandos-monitor.8.xhtml, mandos-monitor): New.
(install-server): Install "mandos-ctl" and "mandos-monitor" too.
(uninstall-server): Remove "mandos-ctl" and "mandos-monitor" too.
* mandos-monitor: Don't log uninteresting messages.
* Makefile (PROGS): Add "mandos-monitor".
(DOCS): Add "mandos-monitor.xml".
(mandos-monitor.8, mandos-monitor.8.xhtml, mandos-monitor): New.
(install-server): Install "mandos-ctl" and "mandos-monitor" too.
(uninstall-server): Remove "mandos-ctl" and "mandos-monitor" too.
* mandos-monitor: Don't log uninteresting messages.
- files removed:
- debian/source
- 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-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 Björn Påhlsson
14
# Copyright © 2008,2009 Teddy Hogeborn
15
# Copyright © 2008,2009 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
28
28
# along with this program. If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
#
31
# Contact the authors at <mandos@recompile.se>.
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
#
33
33
34
from __future__ import (division, absolute_import, print_function,
35
unicode_literals)
34
from __future__ import division, with_statement, absolute_import
36
35
37
36
import SocketServer as socketserver
38
37
import socket
39
import argparse
38
import optparse
40
39
import datetime
41
40
import errno
42
41
import gnutls.crypto
62
61
import functools
63
62
import cPickle as pickle
64
63
import multiprocessing
65
import types
66
import binascii
67
import tempfile
68
64
69
65
import dbus
70
66
import dbus.service
75
71
import ctypes.util
76
72
import xml.dom.minidom
77
73
import inspect
78
import GnuPGInterface
79
74
80
75
try:
81
76
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
80
except ImportError:
86
81
SO_BINDTODEVICE = None
87
82
88
version = "1.4.1"
89
stored_state_file = "clients.pickle"
90
91
logger = logging.getLogger()
83
84
version = "1.0.14"
85
86
#logger = logging.getLogger(u'mandos')
87
logger = logging.Logger(u'mandos')
92
88
syslogger = (logging.handlers.SysLogHandler
93
89
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
address = str("/dev/log")))
95
96
try:
97
if_nametoindex = (ctypes.cdll.LoadLibrary
98
(ctypes.util.find_library("c"))
99
.if_nametoindex)
100
except (OSError, AttributeError):
101
def if_nametoindex(interface):
102
"Get an interface index the hard way, i.e. using fcntl()"
103
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
104
with contextlib.closing(socket.socket()) as s:
105
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
106
struct.pack(str("16s16x"),
107
interface))
108
interface_index = struct.unpack(str("I"),
109
ifreq[16:20])[0]
110
return interface_index
111
112
113
def initlogger(debug, level=logging.WARNING):
114
"""init logger and add loglevel"""
115
116
syslogger.setFormatter(logging.Formatter
117
('Mandos [%(process)d]: %(levelname)s:'
118
' %(message)s'))
119
logger.addHandler(syslogger)
120
121
if debug:
122
console = logging.StreamHandler()
123
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
124
' [%(process)d]:'
125
' %(levelname)s:'
126
' %(message)s'))
127
logger.addHandler(console)
128
logger.setLevel(level)
129
130
131
class PGPError(Exception):
132
"""Exception if encryption/decryption fails"""
133
pass
134
135
136
class PGPEngine(object):
137
"""A simple class for OpenPGP symmetric encryption & decryption"""
138
def __init__(self):
139
self.gnupg = GnuPGInterface.GnuPG()
140
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
141
self.gnupg = GnuPGInterface.GnuPG()
142
self.gnupg.options.meta_interactive = False
143
self.gnupg.options.homedir = self.tempdir
144
self.gnupg.options.extra_args.extend(['--force-mdc',
145
'--quiet'])
146
147
def __enter__(self):
148
return self
149
150
def __exit__ (self, exc_type, exc_value, traceback):
151
self._cleanup()
152
return False
153
154
def __del__(self):
155
self._cleanup()
156
157
def _cleanup(self):
158
if self.tempdir is not None:
159
# Delete contents of tempdir
160
for root, dirs, files in os.walk(self.tempdir,
161
topdown = False):
162
for filename in files:
163
os.remove(os.path.join(root, filename))
164
for dirname in dirs:
165
os.rmdir(os.path.join(root, dirname))
166
# Remove tempdir
167
os.rmdir(self.tempdir)
168
self.tempdir = None
169
170
def password_encode(self, password):
171
# Passphrase can not be empty and can not contain newlines or
172
# NUL bytes. So we prefix it and hex encode it.
173
return b"mandos" + binascii.hexlify(password)
174
175
def encrypt(self, data, password):
176
self.gnupg.passphrase = self.password_encode(password)
177
with open(os.devnull) as devnull:
178
try:
179
proc = self.gnupg.run(['--symmetric'],
180
create_fhs=['stdin', 'stdout'],
181
attach_fhs={'stderr': devnull})
182
with contextlib.closing(proc.handles['stdin']) as f:
183
f.write(data)
184
with contextlib.closing(proc.handles['stdout']) as f:
185
ciphertext = f.read()
186
proc.wait()
187
except IOError as e:
188
raise PGPError(e)
189
self.gnupg.passphrase = None
190
return ciphertext
191
192
def decrypt(self, data, password):
193
self.gnupg.passphrase = self.password_encode(password)
194
with open(os.devnull) as devnull:
195
try:
196
proc = self.gnupg.run(['--decrypt'],
197
create_fhs=['stdin', 'stdout'],
198
attach_fhs={'stderr': devnull})
199
with contextlib.closing(proc.handles['stdin'] ) as f:
200
f.write(data)
201
with contextlib.closing(proc.handles['stdout']) as f:
202
decrypted_plaintext = f.read()
203
proc.wait()
204
except IOError as e:
205
raise PGPError(e)
206
self.gnupg.passphrase = None
207
return decrypted_plaintext
208
209
90
address = "/dev/log"))
91
syslogger.setFormatter(logging.Formatter
92
(u'Mandos [%(process)d]: %(levelname)s:'
93
u' %(message)s'))
94
logger.addHandler(syslogger)
95
96
console = logging.StreamHandler()
97
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
98
u' %(levelname)s:'
99
u' %(message)s'))
100
logger.addHandler(console)
210
101
211
102
class AvahiError(Exception):
212
103
def __init__(self, value, *args, **kwargs):
228
119
Attributes:
229
120
interface: integer; avahi.IF_UNSPEC or an interface index.
230
121
Used to optionally bind to the specified interface.
231
name: string; Example: 'Mandos'
232
type: string; Example: '_mandos._tcp'.
122
name: string; Example: u'Mandos'
123
type: string; Example: u'_mandos._tcp'.
233
124
See <http://www.dns-sd.org/ServiceTypes.html>
234
125
port: integer; what port to announce
235
126
TXT: list of strings; TXT record for the service
244
135
"""
245
136
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
246
137
servicetype = None, port = None, TXT = None,
247
domain = "", host = "", max_renames = 32768,
138
domain = u"", host = u"", max_renames = 32768,
248
139
protocol = avahi.PROTO_UNSPEC, bus = None):
249
140
self.interface = interface
250
141
self.name = name
259
150
self.group = None # our entry group
260
151
self.server = None
261
152
self.bus = bus
262
self.entry_group_state_changed_match = None
263
153
def rename(self):
264
154
"""Derived from the Avahi example code"""
265
155
if self.rename_count >= self.max_renames:
266
logger.critical("No suitable Zeroconf service name found"
267
" after %i retries, exiting.",
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
268
158
self.rename_count)
269
raise AvahiServiceError("Too many renames")
270
self.name = unicode(self.server
271
.GetAlternativeServiceName(self.name))
272
logger.info("Changing Zeroconf service name to %r ...",
159
raise AvahiServiceError(u"Too many renames")
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
logger.info(u"Changing Zeroconf service name to %r ...",
273
162
self.name)
163
syslogger.setFormatter(logging.Formatter
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
166
% self.name))
274
167
self.remove()
275
168
try:
276
169
self.add()
277
except dbus.exceptions.DBusException as error:
278
logger.critical("DBusException: %s", error)
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
279
172
self.cleanup()
280
173
os._exit(1)
281
174
self.rename_count += 1
282
175
def remove(self):
283
176
"""Derived from the Avahi example code"""
284
if self.entry_group_state_changed_match is not None:
285
self.entry_group_state_changed_match.remove()
286
self.entry_group_state_changed_match = None
287
177
if self.group is not None:
288
178
self.group.Reset()
289
179
def add(self):
290
180
"""Derived from the Avahi example code"""
291
self.remove()
292
181
if self.group is None:
293
182
self.group = dbus.Interface(
294
183
self.bus.get_object(avahi.DBUS_NAME,
295
184
self.server.EntryGroupNew()),
296
185
avahi.DBUS_INTERFACE_ENTRY_GROUP)
297
self.entry_group_state_changed_match = (
298
self.group.connect_to_signal(
299
'StateChanged', self.entry_group_state_changed))
300
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
186
self.group.connect_to_signal('StateChanged',
187
self
188
.entry_group_state_changed)
189
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
301
190
self.name, self.type)
302
191
self.group.AddService(
303
192
self.interface,
310
199
self.group.Commit()
311
200
def entry_group_state_changed(self, state, error):
312
201
"""Derived from the Avahi example code"""
313
logger.debug("Avahi entry group state change: %i", state)
202
logger.debug(u"Avahi entry group state change: %i", state)
314
203
315
204
if state == avahi.ENTRY_GROUP_ESTABLISHED:
316
logger.debug("Zeroconf service established.")
205
logger.debug(u"Zeroconf service established.")
317
206
elif state == avahi.ENTRY_GROUP_COLLISION:
318
logger.info("Zeroconf service name collision.")
207
logger.warning(u"Zeroconf service name collision.")
319
208
self.rename()
320
209
elif state == avahi.ENTRY_GROUP_FAILURE:
321
logger.critical("Avahi: Error in group state changed %s",
210
logger.critical(u"Avahi: Error in group state changed %s",
322
211
unicode(error))
323
raise AvahiGroupError("State changed: %s"
212
raise AvahiGroupError(u"State changed: %s"
324
213
% unicode(error))
325
214
def cleanup(self):
326
215
"""Derived from the Avahi example code"""
327
216
if self.group is not None:
328
try:
329
self.group.Free()
330
except (dbus.exceptions.UnknownMethodException,
331
dbus.exceptions.DBusException):
332
pass
217
self.group.Free()
333
218
self.group = None
334
self.remove()
335
def server_state_changed(self, state, error=None):
219
def server_state_changed(self, state):
336
220
"""Derived from the Avahi example code"""
337
logger.debug("Avahi server state change: %i", state)
338
bad_states = { avahi.SERVER_INVALID:
339
"Zeroconf server invalid",
340
avahi.SERVER_REGISTERING: None,
341
avahi.SERVER_COLLISION:
342
"Zeroconf server name collision",
343
avahi.SERVER_FAILURE:
344
"Zeroconf server failure" }
345
if state in bad_states:
346
if bad_states[state] is not None:
347
if error is None:
348
logger.error(bad_states[state])
349
else:
350
logger.error(bad_states[state] + ": %r", error)
351
self.cleanup()
221
logger.debug(u"Avahi server state change: %i", state)
222
if state == avahi.SERVER_COLLISION:
223
logger.error(u"Zeroconf server name collision")
224
self.remove()
352
225
elif state == avahi.SERVER_RUNNING:
353
226
self.add()
354
else:
355
if error is None:
356
logger.debug("Unknown state: %r", state)
357
else:
358
logger.debug("Unknown state: %r: %r", state, error)
359
227
def activate(self):
360
228
"""Derived from the Avahi example code"""
361
229
if self.server is None:
362
230
self.server = dbus.Interface(
363
231
self.bus.get_object(avahi.DBUS_NAME,
364
avahi.DBUS_PATH_SERVER,
365
follow_name_owner_changes=True),
232
avahi.DBUS_PATH_SERVER),
366
233
avahi.DBUS_INTERFACE_SERVER)
367
self.server.connect_to_signal("StateChanged",
234
self.server.connect_to_signal(u"StateChanged",
368
235
self.server_state_changed)
369
236
self.server_state_changed(self.server.GetState())
370
237
371
class AvahiServiceToSyslog(AvahiService):
372
def rename(self):
373
"""Add the new name to the syslog messages"""
374
ret = AvahiService.rename(self)
375
syslogger.setFormatter(logging.Formatter
376
('Mandos (%s) [%%(process)d]:'
377
' %%(levelname)s: %%(message)s'
378
% self.name))
379
return ret
380
238
381
def timedelta_to_milliseconds(td):
382
"Convert a datetime.timedelta() to milliseconds"
383
return ((td.days * 24 * 60 * 60 * 1000)
384
+ (td.seconds * 1000)
385
+ (td.microseconds // 1000))
386
387
239
class Client(object):
388
240
"""A representation of a client host served by this server.
389
241
390
242
Attributes:
391
approved: bool(); 'None' if not yet approved/disapproved
392
approval_delay: datetime.timedelta(); Time to wait for approval
393
approval_duration: datetime.timedelta(); Duration of one approval
243
name: string; from the config file, used in log messages and
244
D-Bus identifiers
245
fingerprint: string (40 or 32 hexadecimal digits); used to
246
uniquely identify the client
247
secret: bytestring; sent verbatim (over TLS) to client
248
host: string; available for use by the checker command
249
created: datetime.datetime(); (UTC) object creation
250
last_enabled: datetime.datetime(); (UTC)
251
enabled: bool()
252
last_checked_ok: datetime.datetime(); (UTC) or None
253
timeout: datetime.timedelta(); How long from last_checked_ok
254
until this client is disabled
255
interval: datetime.timedelta(); How often to start a new checker
256
disable_hook: If set, called by disable() as disable_hook(self)
394
257
checker: subprocess.Popen(); a running checker process used
395
258
to see if the client lives.
396
259
'None' if no process is running.
397
checker_callback_tag: a gobject event source tag, or None
398
checker_command: string; External command which is run to check
399
if client lives. %() expansions are done at
260
checker_initiator_tag: a gobject event source tag, or None
261
disable_initiator_tag: - '' -
262
checker_callback_tag: - '' -
263
checker_command: string; External command which is run to check if
264
client lives. %() expansions are done at
400
265
runtime with vars(self) as dict, so that for
401
266
instance %(name)s can be used in the command.
402
checker_initiator_tag: a gobject event source tag, or None
403
created: datetime.datetime(); (UTC) object creation
404
client_structure: Object describing what attributes a client has
405
and is used for storing the client at exit
406
267
current_checker_command: string; current running checker_command
407
disable_initiator_tag: a gobject event source tag, or None
408
enabled: bool()
409
fingerprint: string (40 or 32 hexadecimal digits); used to
410
uniquely identify the client
411
host: string; available for use by the checker command
412
interval: datetime.timedelta(); How often to start a new checker
413
last_approval_request: datetime.datetime(); (UTC) or None
414
last_checked_ok: datetime.datetime(); (UTC) or None
415
last_checker_status: integer between 0 and 255 reflecting exit
416
status of last checker. -1 reflects crashed
417
checker, or None.
418
last_enabled: datetime.datetime(); (UTC) or None
419
name: string; from the config file, used in log messages and
420
D-Bus identifiers
421
secret: bytestring; sent verbatim (over TLS) to client
422
timeout: datetime.timedelta(); How long from last_checked_ok
423
until this client is disabled
424
extended_timeout: extra long timeout when password has been sent
425
runtime_expansions: Allowed attributes for runtime expansion.
426
expires: datetime.datetime(); time (UTC) when a client will be
427
disabled, or None
268
approval_delay: datetime.timedelta(); Time to wait for approval
269
_approved: bool(); 'None' if not yet approved/disapproved
270
approval_duration: datetime.timedelta(); Duration of one approval
428
271
"""
429
272
430
runtime_expansions = ("approval_delay", "approval_duration",
431
"created", "enabled", "fingerprint",
432
"host", "interval", "last_checked_ok",
433
"last_enabled", "name", "timeout")
434
client_defaults = { "timeout": "5m",
435
"extended_timeout": "15m",
436
"interval": "2m",
437
"checker": "fping -q -- %%(host)s",
438
"host": "",
439
"approval_delay": "0s",
440
"approval_duration": "1s",
441
"approved_by_default": "True",
442
"enabled": "True",
443
}
273
@staticmethod
274
def _timedelta_to_milliseconds(td):
275
"Convert a datetime.timedelta() to milliseconds"
276
return ((td.days * 24 * 60 * 60 * 1000)
277
+ (td.seconds * 1000)
278
+ (td.microseconds // 1000))
444
279
445
280
def timeout_milliseconds(self):
446
281
"Return the 'timeout' attribute in milliseconds"
447
return timedelta_to_milliseconds(self.timeout)
448
449
def extended_timeout_milliseconds(self):
450
"Return the 'extended_timeout' attribute in milliseconds"
451
return timedelta_to_milliseconds(self.extended_timeout)
282
return self._timedelta_to_milliseconds(self.timeout)
452
283
453
284
def interval_milliseconds(self):
454
285
"Return the 'interval' attribute in milliseconds"
455
return timedelta_to_milliseconds(self.interval)
456
286
return self._timedelta_to_milliseconds(self.interval)
287
457
288
def approval_delay_milliseconds(self):
458
return timedelta_to_milliseconds(self.approval_delay)
459
460
@staticmethod
461
def config_parser(config):
462
""" Construct a new dict of client settings of this form:
463
{ client_name: {setting_name: value, ...}, ...}
464
with exceptions for any special settings as defined above"""
465
settings = {}
466
for client_name in config.sections():
467
section = dict(config.items(client_name))
468
client = settings[client_name] = {}
469
470
client["host"] = section["host"]
471
# Reformat values from string types to Python types
472
client["approved_by_default"] = config.getboolean(
473
client_name, "approved_by_default")
474
client["enabled"] = config.getboolean(client_name, "enabled")
475
476
client["fingerprint"] = (section["fingerprint"].upper()
477
.replace(" ", ""))
478
if "secret" in section:
479
client["secret"] = section["secret"].decode("base64")
480
elif "secfile" in section:
481
with open(os.path.expanduser(os.path.expandvars
482
(section["secfile"])),
483
"rb") as secfile:
484
client["secret"] = secfile.read()
485
else:
486
raise TypeError("No secret or secfile for section %s"
487
% section)
488
client["timeout"] = string_to_delta(section["timeout"])
489
client["extended_timeout"] = string_to_delta(
490
section["extended_timeout"])
491
client["interval"] = string_to_delta(section["interval"])
492
client["approval_delay"] = string_to_delta(
493
section["approval_delay"])
494
client["approval_duration"] = string_to_delta(
495
section["approval_duration"])
496
client["checker_command"] = section["checker"]
497
client["last_approval_request"] = None
498
client["last_checked_ok"] = None
499
client["last_checker_status"] = None
500
if client["enabled"]:
501
client["last_enabled"] = datetime.datetime.utcnow()
502
client["expires"] = (datetime.datetime.utcnow()
503
+ client["timeout"])
504
else:
505
client["last_enabled"] = None
506
client["expires"] = None
507
508
return settings
509
510
511
def __init__(self, settings, name = None):
289
return self._timedelta_to_milliseconds(self.approval_delay)
290
291
def __init__(self, name = None, disable_hook=None, config=None):
512
292
"""Note: the 'checker' key in 'config' sets the
513
293
'checker_command' attribute and *not* the 'checker'
514
294
attribute."""
515
295
self.name = name
516
# adding all client settings
517
for setting, value in settings.iteritems():
518
setattr(self, setting, value)
519
520
logger.debug("Creating client %r", self.name)
296
if config is None:
297
config = {}
298
logger.debug(u"Creating client %r", self.name)
521
299
# Uppercase and remove spaces from fingerprint for later
522
300
# comparison purposes with return value from the fingerprint()
523
301
# function
524
logger.debug(" Fingerprint: %s", self.fingerprint)
525
self.created = settings.get("created", datetime.datetime.utcnow())
526
527
# attributes specific for this server instance
302
self.fingerprint = (config[u"fingerprint"].upper()
303
.replace(u" ", u""))
304
logger.debug(u" Fingerprint: %s", self.fingerprint)
305
if u"secret" in config:
306
self.secret = config[u"secret"].decode(u"base64")
307
elif u"secfile" in config:
308
with open(os.path.expanduser(os.path.expandvars
309
(config[u"secfile"])),
310
"rb") as secfile:
311
self.secret = secfile.read()
312
else:
313
raise TypeError(u"No secret or secfile for client %s"
314
% self.name)
315
self.host = config.get(u"host", u"")
316
self.created = datetime.datetime.utcnow()
317
self.enabled = False
318
self.last_enabled = None
319
self.last_checked_ok = None
320
self.timeout = string_to_delta(config[u"timeout"])
321
self.interval = string_to_delta(config[u"interval"])
322
self.disable_hook = disable_hook
528
323
self.checker = None
529
324
self.checker_initiator_tag = None
530
325
self.disable_initiator_tag = None
531
326
self.checker_callback_tag = None
327
self.checker_command = config[u"checker"]
532
328
self.current_checker_command = None
533
self.approved = None
329
self.last_connect = None
330
self._approved = None
331
self.approved_by_default = config.get(u"approved_by_default",
332
True)
534
333
self.approvals_pending = 0
535
self.changedstate = (multiprocessing_manager
536
.Condition(multiprocessing_manager
537
.Lock()))
538
self.client_structure = [attr for attr in
539
self.__dict__.iterkeys()
540
if not attr.startswith("_")]
541
self.client_structure.append("client_structure")
542
543
for name, t in inspect.getmembers(type(self),
544
lambda obj:
545
isinstance(obj,
546
property)):
547
if not name.startswith("_"):
548
self.client_structure.append(name)
334
self.approval_delay = string_to_delta(
335
config[u"approval_delay"])
336
self.approval_duration = string_to_delta(
337
config[u"approval_duration"])
338
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
549
339
550
# Send notice to process children that client state has changed
551
340
def send_changedstate(self):
552
with self.changedstate:
553
self.changedstate.notify_all()
554
341
self.changedstate.acquire()
342
self.changedstate.notify_all()
343
self.changedstate.release()
344
555
345
def enable(self):
556
346
"""Start this client's checker and timeout hooks"""
557
if getattr(self, "enabled", False):
347
if getattr(self, u"enabled", False):
558
348
# Already enabled
559
349
return
560
350
self.send_changedstate()
561
self.expires = datetime.datetime.utcnow() + self.timeout
562
self.enabled = True
563
351
self.last_enabled = datetime.datetime.utcnow()
564
self.init_checker()
565
566
def disable(self, quiet=True):
567
"""Disable this client."""
568
if not getattr(self, "enabled", False):
569
return False
570
if not quiet:
571
self.send_changedstate()
572
if not quiet:
573
logger.info("Disabling client %s", self.name)
574
if getattr(self, "disable_initiator_tag", False):
575
gobject.source_remove(self.disable_initiator_tag)
576
self.disable_initiator_tag = None
577
self.expires = None
578
if getattr(self, "checker_initiator_tag", False):
579
gobject.source_remove(self.checker_initiator_tag)
580
self.checker_initiator_tag = None
581
self.stop_checker()
582
self.enabled = False
583
# Do not run this again if called by a gobject.timeout_add
584
return False
585
586
def __del__(self):
587
self.disable()
588
589
def init_checker(self):
590
352
# Schedule a new checker to be started an 'interval' from now,
591
353
# and every interval from then on.
592
354
self.checker_initiator_tag = (gobject.timeout_add
596
358
self.disable_initiator_tag = (gobject.timeout_add
597
359
(self.timeout_milliseconds(),
598
360
self.disable))
361
self.enabled = True
599
362
# Also start a new checker *right now*.
600
363
self.start_checker()
601
364
365
def disable(self, quiet=True):
366
"""Disable this client."""
367
if not getattr(self, "enabled", False):
368
return False
369
if not quiet:
370
self.send_changedstate()
371
if not quiet:
372
logger.info(u"Disabling client %s", self.name)
373
if getattr(self, u"disable_initiator_tag", False):
374
gobject.source_remove(self.disable_initiator_tag)
375
self.disable_initiator_tag = None
376
if getattr(self, u"checker_initiator_tag", False):
377
gobject.source_remove(self.checker_initiator_tag)
378
self.checker_initiator_tag = None
379
self.stop_checker()
380
if self.disable_hook:
381
self.disable_hook(self)
382
self.enabled = False
383
# Do not run this again if called by a gobject.timeout_add
384
return False
385
386
def __del__(self):
387
self.disable_hook = None
388
self.disable()
389
602
390
def checker_callback(self, pid, condition, command):
603
391
"""The checker has completed, so take appropriate actions."""
604
392
self.checker_callback_tag = None
605
393
self.checker = None
606
394
if os.WIFEXITED(condition):
607
self.last_checker_status = os.WEXITSTATUS(condition)
608
if self.last_checker_status == 0:
609
logger.info("Checker for %(name)s succeeded",
395
exitstatus = os.WEXITSTATUS(condition)
396
if exitstatus == 0:
397
logger.info(u"Checker for %(name)s succeeded",
610
398
vars(self))
611
399
self.checked_ok()
612
400
else:
613
logger.info("Checker for %(name)s failed",
401
logger.info(u"Checker for %(name)s failed",
614
402
vars(self))
615
403
else:
616
self.last_checker_status = -1
617
logger.warning("Checker for %(name)s crashed?",
404
logger.warning(u"Checker for %(name)s crashed?",
618
405
vars(self))
619
406
620
def checked_ok(self, timeout=None):
407
def checked_ok(self):
621
408
"""Bump up the timeout for this client.
622
409
623
410
This should only be called when the client has been seen,
624
411
alive and well.
625
412
"""
626
if timeout is None:
627
timeout = self.timeout
628
413
self.last_checked_ok = datetime.datetime.utcnow()
629
if self.disable_initiator_tag is not None:
630
gobject.source_remove(self.disable_initiator_tag)
631
if getattr(self, "enabled", False):
632
self.disable_initiator_tag = (gobject.timeout_add
633
(timedelta_to_milliseconds
634
(timeout), self.disable))
635
self.expires = datetime.datetime.utcnow() + timeout
636
637
def need_approval(self):
638
self.last_approval_request = datetime.datetime.utcnow()
414
gobject.source_remove(self.disable_initiator_tag)
415
self.disable_initiator_tag = (gobject.timeout_add
416
(self.timeout_milliseconds(),
417
self.disable))
639
418
640
419
def start_checker(self):
641
420
"""Start a new checker subprocess if one is not running.
654
433
# If a checker exists, make sure it is not a zombie
655
434
try:
656
435
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
657
except (AttributeError, OSError) as error:
436
except (AttributeError, OSError), error:
658
437
if (isinstance(error, OSError)
659
438
and error.errno != errno.ECHILD):
660
439
raise error
661
440
else:
662
441
if pid:
663
logger.warning("Checker was a zombie")
442
logger.warning(u"Checker was a zombie")
664
443
gobject.source_remove(self.checker_callback_tag)
665
444
self.checker_callback(pid, status,
666
445
self.current_checker_command)
671
450
command = self.checker_command % self.host
672
451
except TypeError:
673
452
# Escape attributes for the shell
674
escaped_attrs = dict(
675
(attr,
676
re.escape(unicode(str(getattr(self, attr, "")),
677
errors=
678
'replace')))
679
for attr in
680
self.runtime_expansions)
681
453
escaped_attrs = dict((key,
454
re.escape(unicode(str(val),
455
errors=
456
u'replace')))
457
for key, val in
458
vars(self).iteritems())
682
459
try:
683
460
command = self.checker_command % escaped_attrs
684
except TypeError as error:
685
logger.error('Could not format string "%s":'
686
' %s', self.checker_command, error)
461
except TypeError, error:
462
logger.error(u'Could not format string "%s":'
463
u' %s', self.checker_command, error)
687
464
return True # Try again later
688
465
self.current_checker_command = command
689
466
try:
690
logger.info("Starting checker %r for %s",
467
logger.info(u"Starting checker %r for %s",
691
468
command, self.name)
692
469
# We don't need to redirect stdout and stderr, since
693
470
# in normal mode, that is already done by daemon(),
695
472
# always replaced by /dev/null.)
696
473
self.checker = subprocess.Popen(command,
697
474
close_fds=True,
698
shell=True, cwd="/")
475
shell=True, cwd=u"/")
699
476
self.checker_callback_tag = (gobject.child_watch_add
700
477
(self.checker.pid,
701
478
self.checker_callback,
706
483
if pid:
707
484
gobject.source_remove(self.checker_callback_tag)
708
485
self.checker_callback(pid, status, command)
709
except OSError as error:
710
logger.error("Failed to start subprocess: %s",
486
except OSError, error:
487
logger.error(u"Failed to start subprocess: %s",
711
488
error)
712
489
# Re-run this periodically if run by gobject.timeout_add
713
490
return True
717
494
if self.checker_callback_tag:
718
495
gobject.source_remove(self.checker_callback_tag)
719
496
self.checker_callback_tag = None
720
if getattr(self, "checker", None) is None:
497
if getattr(self, u"checker", None) is None:
721
498
return
722
logger.debug("Stopping checker for %(name)s", vars(self))
499
logger.debug(u"Stopping checker for %(name)s", vars(self))
723
500
try:
724
501
os.kill(self.checker.pid, signal.SIGTERM)
725
502
#time.sleep(0.5)
726
503
#if self.checker.poll() is None:
727
504
# os.kill(self.checker.pid, signal.SIGKILL)
728
except OSError as error:
505
except OSError, error:
729
506
if error.errno != errno.ESRCH: # No such process
730
507
raise
731
508
self.checker = None
732
509
733
734
def dbus_service_property(dbus_interface, signature="v",
735
access="readwrite", byte_arrays=False):
510
def dbus_service_property(dbus_interface, signature=u"v",
511
access=u"readwrite", byte_arrays=False):
736
512
"""Decorators for marking methods of a DBusObjectWithProperties to
737
513
become properties on the D-Bus.
738
514
745
521
"""
746
522
# Encoding deeply encoded byte arrays is not supported yet by the
747
523
# "Set" method, so we fail early here:
748
if byte_arrays and signature != "ay":
749
raise ValueError("Byte arrays not supported for non-'ay'"
750
" signature %r" % signature)
524
if byte_arrays and signature != u"ay":
525
raise ValueError(u"Byte arrays not supported for non-'ay'"
526
u" signature %r" % signature)
751
527
def decorator(func):
752
528
func._dbus_is_property = True
753
529
func._dbus_interface = dbus_interface
754
530
func._dbus_signature = signature
755
531
func._dbus_access = access
756
532
func._dbus_name = func.__name__
757
if func._dbus_name.endswith("_dbus_property"):
533
if func._dbus_name.endswith(u"_dbus_property"):
758
534
func._dbus_name = func._dbus_name[:-14]
759
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
535
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
760
536
return func
761
537
return decorator
762
538
782
558
783
559
class DBusObjectWithProperties(dbus.service.Object):
784
560
"""A D-Bus object with properties.
785
561
786
562
Classes inheriting from this can use the dbus_service_property
787
563
decorator to expose methods as D-Bus properties. It exposes the
788
564
standard Get(), Set(), and GetAll() methods on the D-Bus.
790
566
791
567
@staticmethod
792
568
def _is_dbus_property(obj):
793
return getattr(obj, "_dbus_is_property", False)
569
return getattr(obj, u"_dbus_is_property", False)
794
570
795
571
def _get_all_dbus_properties(self):
796
572
"""Returns a generator of (name, attribute) pairs
797
573
"""
798
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
799
for cls in self.__class__.__mro__
574
return ((prop._dbus_name, prop)
800
575
for name, prop in
801
inspect.getmembers(cls, self._is_dbus_property))
576
inspect.getmembers(self, self._is_dbus_property))
802
577
803
578
def _get_dbus_property(self, interface_name, property_name):
804
579
"""Returns a bound method if one exists which is a D-Bus
805
580
property with the specified name and interface.
806
581
"""
807
for cls in self.__class__.__mro__:
808
for name, value in (inspect.getmembers
809
(cls, self._is_dbus_property)):
810
if (value._dbus_name == property_name
811
and value._dbus_interface == interface_name):
812
return value.__get__(self)
813
582
for name in (property_name,
583
property_name + u"_dbus_property"):
584
prop = getattr(self, name, None)
585
if (prop is None
586
or not self._is_dbus_property(prop)
587
or prop._dbus_name != property_name
588
or (interface_name and prop._dbus_interface
589
and interface_name != prop._dbus_interface)):
590
continue
591
return prop
814
592
# No such property
815
raise DBusPropertyNotFound(self.dbus_object_path + ":"
816
+ interface_name + "."
593
raise DBusPropertyNotFound(self.dbus_object_path + u":"
594
+ interface_name + u"."
817
595
+ property_name)
818
596
819
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
820
out_signature="v")
597
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
598
out_signature=u"v")
821
599
def Get(self, interface_name, property_name):
822
600
"""Standard D-Bus property Get() method, see D-Bus standard.
823
601
"""
824
602
prop = self._get_dbus_property(interface_name, property_name)
825
if prop._dbus_access == "write":
603
if prop._dbus_access == u"write":
826
604
raise DBusPropertyAccessException(property_name)
827
605
value = prop()
828
if not hasattr(value, "variant_level"):
606
if not hasattr(value, u"variant_level"):
829
607
return value
830
608
return type(value)(value, variant_level=value.variant_level+1)
831
609
832
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
610
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
833
611
def Set(self, interface_name, property_name, value):
834
612
"""Standard D-Bus property Set() method, see D-Bus standard.
835
613
"""
836
614
prop = self._get_dbus_property(interface_name, property_name)
837
if prop._dbus_access == "read":
615
if prop._dbus_access == u"read":
838
616
raise DBusPropertyAccessException(property_name)
839
if prop._dbus_get_args_options["byte_arrays"]:
617
if prop._dbus_get_args_options[u"byte_arrays"]:
840
618
# The byte_arrays option is not supported yet on
841
619
# signatures other than "ay".
842
if prop._dbus_signature != "ay":
620
if prop._dbus_signature != u"ay":
843
621
raise ValueError
844
622
value = dbus.ByteArray(''.join(unichr(byte)
845
623
for byte in value))
846
624
prop(value)
847
625
848
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
849
out_signature="a{sv}")
626
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
627
out_signature=u"a{sv}")
850
628
def GetAll(self, interface_name):
851
629
"""Standard D-Bus property GetAll() method, see D-Bus
852
630
standard.
853
631
854
632
Note: Will not include properties with access="write".
855
633
"""
856
properties = {}
634
all = {}
857
635
for name, prop in self._get_all_dbus_properties():
858
636
if (interface_name
859
637
and interface_name != prop._dbus_interface):
860
638
# Interface non-empty but did not match
861
639
continue
862
640
# Ignore write-only properties
863
if prop._dbus_access == "write":
641
if prop._dbus_access == u"write":
864
642
continue
865
643
value = prop()
866
if not hasattr(value, "variant_level"):
867
properties[name] = value
644
if not hasattr(value, u"variant_level"):
645
all[name] = value
868
646
continue
869
properties[name] = type(value)(value, variant_level=
870
value.variant_level+1)
871
return dbus.Dictionary(properties, signature="sv")
647
all[name] = type(value)(value, variant_level=
648
value.variant_level+1)
649
return dbus.Dictionary(all, signature=u"sv")
872
650
873
651
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
874
out_signature="s",
652
out_signature=u"s",
875
653
path_keyword='object_path',
876
654
connection_keyword='connection')
877
655
def Introspect(self, object_path, connection):
882
660
try:
883
661
document = xml.dom.minidom.parseString(xmlstring)
884
662
def make_tag(document, name, prop):
885
e = document.createElement("property")
886
e.setAttribute("name", name)
887
e.setAttribute("type", prop._dbus_signature)
888
e.setAttribute("access", prop._dbus_access)
663
e = document.createElement(u"property")
664
e.setAttribute(u"name", name)
665
e.setAttribute(u"type", prop._dbus_signature)
666
e.setAttribute(u"access", prop._dbus_access)
889
667
return e
890
for if_tag in document.getElementsByTagName("interface"):
668
for if_tag in document.getElementsByTagName(u"interface"):
891
669
for tag in (make_tag(document, name, prop)
892
670
for name, prop
893
671
in self._get_all_dbus_properties()
894
672
if prop._dbus_interface
895
== if_tag.getAttribute("name")):
673
== if_tag.getAttribute(u"name")):
896
674
if_tag.appendChild(tag)
897
675
# Add the names to the return values for the
898
676
# "org.freedesktop.DBus.Properties" methods
899
if (if_tag.getAttribute("name")
900
== "org.freedesktop.DBus.Properties"):
901
for cn in if_tag.getElementsByTagName("method"):
902
if cn.getAttribute("name") == "Get":
903
for arg in cn.getElementsByTagName("arg"):
904
if (arg.getAttribute("direction")
905
== "out"):
906
arg.setAttribute("name", "value")
907
elif cn.getAttribute("name") == "GetAll":
908
for arg in cn.getElementsByTagName("arg"):
909
if (arg.getAttribute("direction")
910
== "out"):
911
arg.setAttribute("name", "props")
912
xmlstring = document.toxml("utf-8")
677
if (if_tag.getAttribute(u"name")
678
== u"org.freedesktop.DBus.Properties"):
679
for cn in if_tag.getElementsByTagName(u"method"):
680
if cn.getAttribute(u"name") == u"Get":
681
for arg in cn.getElementsByTagName(u"arg"):
682
if (arg.getAttribute(u"direction")
683
== u"out"):
684
arg.setAttribute(u"name", u"value")
685
elif cn.getAttribute(u"name") == u"GetAll":
686
for arg in cn.getElementsByTagName(u"arg"):
687
if (arg.getAttribute(u"direction")
688
== u"out"):
689
arg.setAttribute(u"name", u"props")
690
xmlstring = document.toxml(u"utf-8")
913
691
document.unlink()
914
692
except (AttributeError, xml.dom.DOMException,
915
xml.parsers.expat.ExpatError) as error:
916
logger.error("Failed to override Introspection method",
693
xml.parsers.expat.ExpatError), error:
694
logger.error(u"Failed to override Introspection method",
917
695
error)
918
696
return xmlstring
919
697
920
698
921
def datetime_to_dbus (dt, variant_level=0):
922
"""Convert a UTC datetime.datetime() to a D-Bus type."""
923
if dt is None:
924
return dbus.String("", variant_level = variant_level)
925
return dbus.String(dt.isoformat(),
926
variant_level=variant_level)
927
928
929
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
930
.__metaclass__):
931
"""Applied to an empty subclass of a D-Bus object, this metaclass
932
will add additional D-Bus attributes matching a certain pattern.
933
"""
934
def __new__(mcs, name, bases, attr):
935
# Go through all the base classes which could have D-Bus
936
# methods, signals, or properties in them
937
for base in (b for b in bases
938
if issubclass(b, dbus.service.Object)):
939
# Go though all attributes of the base class
940
for attrname, attribute in inspect.getmembers(base):
941
# Ignore non-D-Bus attributes, and D-Bus attributes
942
# with the wrong interface name
943
if (not hasattr(attribute, "_dbus_interface")
944
or not attribute._dbus_interface
945
.startswith("se.recompile.Mandos")):
946
continue
947
# Create an alternate D-Bus interface name based on
948
# the current name
949
alt_interface = (attribute._dbus_interface
950
.replace("se.recompile.Mandos",
951
"se.bsnet.fukt.Mandos"))
952
# Is this a D-Bus signal?
953
if getattr(attribute, "_dbus_is_signal", False):
954
# Extract the original non-method function by
955
# black magic
956
nonmethod_func = (dict(
957
zip(attribute.func_code.co_freevars,
958
attribute.__closure__))["func"]
959
.cell_contents)
960
# Create a new, but exactly alike, function
961
# object, and decorate it to be a new D-Bus signal
962
# with the alternate D-Bus interface name
963
new_function = (dbus.service.signal
964
(alt_interface,
965
attribute._dbus_signature)
966
(types.FunctionType(
967
nonmethod_func.func_code,
968
nonmethod_func.func_globals,
969
nonmethod_func.func_name,
970
nonmethod_func.func_defaults,
971
nonmethod_func.func_closure)))
972
# Define a creator of a function to call both the
973
# old and new functions, so both the old and new
974
# signals gets sent when the function is called
975
def fixscope(func1, func2):
976
"""This function is a scope container to pass
977
func1 and func2 to the "call_both" function
978
outside of its arguments"""
979
def call_both(*args, **kwargs):
980
"""This function will emit two D-Bus
981
signals by calling func1 and func2"""
982
func1(*args, **kwargs)
983
func2(*args, **kwargs)
984
return call_both
985
# Create the "call_both" function and add it to
986
# the class
987
attr[attrname] = fixscope(attribute,
988
new_function)
989
# Is this a D-Bus method?
990
elif getattr(attribute, "_dbus_is_method", False):
991
# Create a new, but exactly alike, function
992
# object. Decorate it to be a new D-Bus method
993
# with the alternate D-Bus interface name. Add it
994
# to the class.
995
attr[attrname] = (dbus.service.method
996
(alt_interface,
997
attribute._dbus_in_signature,
998
attribute._dbus_out_signature)
999
(types.FunctionType
1000
(attribute.func_code,
1001
attribute.func_globals,
1002
attribute.func_name,
1003
attribute.func_defaults,
1004
attribute.func_closure)))
1005
# Is this a D-Bus property?
1006
elif getattr(attribute, "_dbus_is_property", False):
1007
# Create a new, but exactly alike, function
1008
# object, and decorate it to be a new D-Bus
1009
# property with the alternate D-Bus interface
1010
# name. Add it to the class.
1011
attr[attrname] = (dbus_service_property
1012
(alt_interface,
1013
attribute._dbus_signature,
1014
attribute._dbus_access,
1015
attribute
1016
._dbus_get_args_options
1017
["byte_arrays"])
1018
(types.FunctionType
1019
(attribute.func_code,
1020
attribute.func_globals,
1021
attribute.func_name,
1022
attribute.func_defaults,
1023
attribute.func_closure)))
1024
return type.__new__(mcs, name, bases, attr)
1025
1026
1027
699
class ClientDBus(Client, DBusObjectWithProperties):
1028
700
"""A Client class using D-Bus
1029
701
1031
703
dbus_object_path: dbus.ObjectPath
1032
704
bus: dbus.SystemBus()
1033
705
"""
1034
1035
runtime_expansions = (Client.runtime_expansions
1036
+ ("dbus_object_path",))
1037
1038
706
# dbus.service.Object doesn't use super(), so we can't either.
1039
707
1040
708
def __init__(self, bus = None, *args, **kwargs):
709
self._approvals_pending = 0
1041
710
self.bus = bus
1042
711
Client.__init__(self, *args, **kwargs)
1043
self._approvals_pending = 0
1044
1045
self._approvals_pending = 0
1046
712
# Only now, when this client is initialized, can it show up on
1047
713
# the D-Bus
1048
client_object_name = unicode(self.name).translate(
1049
{ord("."): ord("_"),
1050
ord("-"): ord("_")})
1051
714
self.dbus_object_path = (dbus.ObjectPath
1052
("/clients/" + client_object_name))
715
(u"/clients/"
716
+ self.name.replace(u".", u"_")))
1053
717
DBusObjectWithProperties.__init__(self, self.bus,
1054
718
self.dbus_object_path)
1055
719
1056
def notifychangeproperty(transform_func,
1057
dbus_name, type_func=lambda x: x,
1058
variant_level=1):
1059
""" Modify a variable so that it's a property which announces
1060
its changes to DBus.
1061
1062
transform_fun: Function that takes a value and a variant_level
1063
and transforms it to a D-Bus type.
1064
dbus_name: D-Bus name of the variable
1065
type_func: Function that transform the value before sending it
1066
to the D-Bus. Default: no transform
1067
variant_level: D-Bus variant level. Default: 1
1068
"""
1069
attrname = "_{0}".format(dbus_name)
1070
def setter(self, value):
1071
if hasattr(self, "dbus_object_path"):
1072
if (not hasattr(self, attrname) or
1073
type_func(getattr(self, attrname, None))
1074
!= type_func(value)):
1075
dbus_value = transform_func(type_func(value),
1076
variant_level
1077
=variant_level)
1078
self.PropertyChanged(dbus.String(dbus_name),
1079
dbus_value)
1080
setattr(self, attrname, value)
1081
1082
return property(lambda self: getattr(self, attrname), setter)
1083
1084
1085
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1086
approvals_pending = notifychangeproperty(dbus.Boolean,
1087
"ApprovalPending",
1088
type_func = bool)
1089
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1090
last_enabled = notifychangeproperty(datetime_to_dbus,
1091
"LastEnabled")
1092
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1093
type_func = lambda checker:
1094
checker is not None)
1095
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1096
"LastCheckedOK")
1097
last_approval_request = notifychangeproperty(
1098
datetime_to_dbus, "LastApprovalRequest")
1099
approved_by_default = notifychangeproperty(dbus.Boolean,
1100
"ApprovedByDefault")
1101
approval_delay = notifychangeproperty(dbus.UInt64,
1102
"ApprovalDelay",
1103
type_func =
1104
timedelta_to_milliseconds)
1105
approval_duration = notifychangeproperty(
1106
dbus.UInt64, "ApprovalDuration",
1107
type_func = timedelta_to_milliseconds)
1108
host = notifychangeproperty(dbus.String, "Host")
1109
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1110
type_func =
1111
timedelta_to_milliseconds)
1112
extended_timeout = notifychangeproperty(
1113
dbus.UInt64, "ExtendedTimeout",
1114
type_func = timedelta_to_milliseconds)
1115
interval = notifychangeproperty(dbus.UInt64,
1116
"Interval",
1117
type_func =
1118
timedelta_to_milliseconds)
1119
checker_command = notifychangeproperty(dbus.String, "Checker")
1120
1121
del notifychangeproperty
720
def _get_approvals_pending(self):
721
return self._approvals_pending
722
def _set_approvals_pending(self, value):
723
old_value = self._approvals_pending
724
self._approvals_pending = value
725
bval = bool(value)
726
if (hasattr(self, "dbus_object_path")
727
and bval is not bool(old_value)):
728
dbus_bool = dbus.Boolean(bval, variant_level=1)
729
self.PropertyChanged(dbus.String(u"ApprovalPending"),
730
dbus_bool)
731
732
approvals_pending = property(_get_approvals_pending,
733
_set_approvals_pending)
734
del _get_approvals_pending, _set_approvals_pending
735
736
@staticmethod
737
def _datetime_to_dbus(dt, variant_level=0):
738
"""Convert a UTC datetime.datetime() to a D-Bus type."""
739
return dbus.String(dt.isoformat(),
740
variant_level=variant_level)
741
742
def enable(self):
743
oldstate = getattr(self, u"enabled", False)
744
r = Client.enable(self)
745
if oldstate != self.enabled:
746
# Emit D-Bus signals
747
self.PropertyChanged(dbus.String(u"Enabled"),
748
dbus.Boolean(True, variant_level=1))
749
self.PropertyChanged(
750
dbus.String(u"LastEnabled"),
751
self._datetime_to_dbus(self.last_enabled,
752
variant_level=1))
753
return r
754
755
def disable(self, quiet = False):
756
oldstate = getattr(self, u"enabled", False)
757
r = Client.disable(self, quiet=quiet)
758
if not quiet and oldstate != self.enabled:
759
# Emit D-Bus signal
760
self.PropertyChanged(dbus.String(u"Enabled"),
761
dbus.Boolean(False, variant_level=1))
762
return r
1122
763
1123
764
def __del__(self, *args, **kwargs):
1124
765
try:
1125
766
self.remove_from_connection()
1126
767
except LookupError:
1127
768
pass
1128
if hasattr(DBusObjectWithProperties, "__del__"):
769
if hasattr(DBusObjectWithProperties, u"__del__"):
1129
770
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1130
771
Client.__del__(self, *args, **kwargs)
1131
772
1133
774
*args, **kwargs):
1134
775
self.checker_callback_tag = None
1135
776
self.checker = None
777
# Emit D-Bus signal
778
self.PropertyChanged(dbus.String(u"CheckerRunning"),
779
dbus.Boolean(False, variant_level=1))
1136
780
if os.WIFEXITED(condition):
1137
781
exitstatus = os.WEXITSTATUS(condition)
1138
782
# Emit D-Bus signal
1148
792
return Client.checker_callback(self, pid, condition, command,
1149
793
*args, **kwargs)
1150
794
795
def checked_ok(self, *args, **kwargs):
796
r = Client.checked_ok(self, *args, **kwargs)
797
# Emit D-Bus signal
798
self.PropertyChanged(
799
dbus.String(u"LastCheckedOK"),
800
(self._datetime_to_dbus(self.last_checked_ok,
801
variant_level=1)))
802
return r
803
1151
804
def start_checker(self, *args, **kwargs):
1152
805
old_checker = self.checker
1153
806
if self.checker is not None:
1160
813
and old_checker_pid != self.checker.pid):
1161
814
# Emit D-Bus signal
1162
815
self.CheckerStarted(self.current_checker_command)
816
self.PropertyChanged(
817
dbus.String(u"CheckerRunning"),
818
dbus.Boolean(True, variant_level=1))
1163
819
return r
1164
820
821
def stop_checker(self, *args, **kwargs):
822
old_checker = getattr(self, u"checker", None)
823
r = Client.stop_checker(self, *args, **kwargs)
824
if (old_checker is not None
825
and getattr(self, u"checker", None) is None):
826
self.PropertyChanged(dbus.String(u"CheckerRunning"),
827
dbus.Boolean(False, variant_level=1))
828
return r
829
1165
830
def _reset_approved(self):
1166
self.approved = None
831
self._approved = None
1167
832
return False
1168
833
1169
834
def approve(self, value=True):
1170
835
self.send_changedstate()
1171
self.approved = value
1172
gobject.timeout_add(timedelta_to_milliseconds
836
self._approved = value
837
gobject.timeout_add(self._timedelta_to_milliseconds
1173
838
(self.approval_duration),
1174
839
self._reset_approved)
1175
840
1176
841
1177
842
## D-Bus methods, signals & properties
1178
_interface = "se.recompile.Mandos.Client"
843
_interface = u"se.bsnet.fukt.Mandos.Client"
1179
844
1180
845
## Signals
1181
846
1182
847
# CheckerCompleted - signal
1183
@dbus.service.signal(_interface, signature="nxs")
848
@dbus.service.signal(_interface, signature=u"nxs")
1184
849
def CheckerCompleted(self, exitcode, waitstatus, command):
1185
850
"D-Bus signal"
1186
851
pass
1187
852
1188
853
# CheckerStarted - signal
1189
@dbus.service.signal(_interface, signature="s")
854
@dbus.service.signal(_interface, signature=u"s")
1190
855
def CheckerStarted(self, command):
1191
856
"D-Bus signal"
1192
857
pass
1193
858
1194
859
# PropertyChanged - signal
1195
@dbus.service.signal(_interface, signature="sv")
860
@dbus.service.signal(_interface, signature=u"sv")
1196
861
def PropertyChanged(self, property, value):
1197
862
"D-Bus signal"
1198
863
pass
1207
872
pass
1208
873
1209
874
# Rejected - signal
1210
@dbus.service.signal(_interface, signature="s")
875
@dbus.service.signal(_interface, signature=u"s")
1211
876
def Rejected(self, reason):
1212
877
"D-Bus signal"
1213
878
pass
1214
879
1215
880
# NeedApproval - signal
1216
@dbus.service.signal(_interface, signature="tb")
881
@dbus.service.signal(_interface, signature=u"tb")
1217
882
def NeedApproval(self, timeout, default):
1218
883
"D-Bus signal"
1219
return self.need_approval()
1220
1221
# NeRwequest - signal
1222
@dbus.service.signal(_interface, signature="s")
1223
def NewRequest(self, ip):
1224
"""D-Bus signal
1225
Is sent after a client request a password.
1226
"""
1227
884
pass
1228
885
1229
886
## Methods
1230
887
1231
888
# Approve - method
1232
@dbus.service.method(_interface, in_signature="b")
889
@dbus.service.method(_interface, in_signature=u"b")
1233
890
def Approve(self, value):
1234
891
self.approve(value)
1235
892
1236
893
# CheckedOK - method
1237
894
@dbus.service.method(_interface)
1238
895
def CheckedOK(self):
1239
self.checked_ok()
896
return self.checked_ok()
1240
897
1241
898
# Enable - method
1242
899
@dbus.service.method(_interface)
1264
921
## Properties
1265
922
1266
923
# ApprovalPending - property
1267
@dbus_service_property(_interface, signature="b", access="read")
924
@dbus_service_property(_interface, signature=u"b", access=u"read")
1268
925
def ApprovalPending_dbus_property(self):
1269
926
return dbus.Boolean(bool(self.approvals_pending))
1270
927
1271
928
# ApprovedByDefault - property
1272
@dbus_service_property(_interface, signature="b",
1273
access="readwrite")
929
@dbus_service_property(_interface, signature=u"b",
930
access=u"readwrite")
1274
931
def ApprovedByDefault_dbus_property(self, value=None):
1275
932
if value is None: # get
1276
933
return dbus.Boolean(self.approved_by_default)
1277
934
self.approved_by_default = bool(value)
935
# Emit D-Bus signal
936
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
937
dbus.Boolean(value, variant_level=1))
1278
938
1279
939
# ApprovalDelay - property
1280
@dbus_service_property(_interface, signature="t",
1281
access="readwrite")
940
@dbus_service_property(_interface, signature=u"t",
941
access=u"readwrite")
1282
942
def ApprovalDelay_dbus_property(self, value=None):
1283
943
if value is None: # get
1284
944
return dbus.UInt64(self.approval_delay_milliseconds())
1285
945
self.approval_delay = datetime.timedelta(0, 0, 0, value)
946
# Emit D-Bus signal
947
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
948
dbus.UInt64(value, variant_level=1))
1286
949
1287
950
# ApprovalDuration - property
1288
@dbus_service_property(_interface, signature="t",
1289
access="readwrite")
951
@dbus_service_property(_interface, signature=u"t",
952
access=u"readwrite")
1290
953
def ApprovalDuration_dbus_property(self, value=None):
1291
954
if value is None: # get
1292
return dbus.UInt64(timedelta_to_milliseconds(
955
return dbus.UInt64(self._timedelta_to_milliseconds(
1293
956
self.approval_duration))
1294
957
self.approval_duration = datetime.timedelta(0, 0, 0, value)
958
# Emit D-Bus signal
959
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
960
dbus.UInt64(value, variant_level=1))
1295
961
1296
962
# Name - property
1297
@dbus_service_property(_interface, signature="s", access="read")
963
@dbus_service_property(_interface, signature=u"s", access=u"read")
1298
964
def Name_dbus_property(self):
1299
965
return dbus.String(self.name)
1300
966
1301
967
# Fingerprint - property
1302
@dbus_service_property(_interface, signature="s", access="read")
968
@dbus_service_property(_interface, signature=u"s", access=u"read")
1303
969
def Fingerprint_dbus_property(self):
1304
970
return dbus.String(self.fingerprint)
1305
971
1306
972
# Host - property
1307
@dbus_service_property(_interface, signature="s",
1308
access="readwrite")
973
@dbus_service_property(_interface, signature=u"s",
974
access=u"readwrite")
1309
975
def Host_dbus_property(self, value=None):
1310
976
if value is None: # get
1311
977
return dbus.String(self.host)
1312
self.host = unicode(value)
978
self.host = value
979
# Emit D-Bus signal
980
self.PropertyChanged(dbus.String(u"Host"),
981
dbus.String(value, variant_level=1))
1313
982
1314
983
# Created - property
1315
@dbus_service_property(_interface, signature="s", access="read")
984
@dbus_service_property(_interface, signature=u"s", access=u"read")
1316
985
def Created_dbus_property(self):
1317
return datetime_to_dbus(self.created)
986
return dbus.String(self._datetime_to_dbus(self.created))
1318
987
1319
988
# LastEnabled - property
1320
@dbus_service_property(_interface, signature="s", access="read")
989
@dbus_service_property(_interface, signature=u"s", access=u"read")
1321
990
def LastEnabled_dbus_property(self):
1322
return datetime_to_dbus(self.last_enabled)
991
if self.last_enabled is None:
992
return dbus.String(u"")
993
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1323
994
1324
995
# Enabled - property
1325
@dbus_service_property(_interface, signature="b",
1326
access="readwrite")
996
@dbus_service_property(_interface, signature=u"b",
997
access=u"readwrite")
1327
998
def Enabled_dbus_property(self, value=None):
1328
999
if value is None: # get
1329
1000
return dbus.Boolean(self.enabled)
1333
1004
self.disable()
1334
1005
1335
1006
# LastCheckedOK - property
1336
@dbus_service_property(_interface, signature="s",
1337
access="readwrite")
1007
@dbus_service_property(_interface, signature=u"s",
1008
access=u"readwrite")
1338
1009
def LastCheckedOK_dbus_property(self, value=None):
1339
1010
if value is not None:
1340
1011
self.checked_ok()
1341
1012
return
1342
return datetime_to_dbus(self.last_checked_ok)
1343
1344
# Expires - property
1345
@dbus_service_property(_interface, signature="s", access="read")
1346
def Expires_dbus_property(self):
1347
return datetime_to_dbus(self.expires)
1348
1349
# LastApprovalRequest - property
1350
@dbus_service_property(_interface, signature="s", access="read")
1351
def LastApprovalRequest_dbus_property(self):
1352
return datetime_to_dbus(self.last_approval_request)
1013
if self.last_checked_ok is None:
1014
return dbus.String(u"")
1015
return dbus.String(self._datetime_to_dbus(self
1016
.last_checked_ok))
1353
1017
1354
1018
# Timeout - property
1355
@dbus_service_property(_interface, signature="t",
1356
access="readwrite")
1019
@dbus_service_property(_interface, signature=u"t",
1020
access=u"readwrite")
1357
1021
def Timeout_dbus_property(self, value=None):
1358
1022
if value is None: # get
1359
1023
return dbus.UInt64(self.timeout_milliseconds())
1360
1024
self.timeout = datetime.timedelta(0, 0, 0, value)
1361
if getattr(self, "disable_initiator_tag", None) is None:
1025
# Emit D-Bus signal
1026
self.PropertyChanged(dbus.String(u"Timeout"),
1027
dbus.UInt64(value, variant_level=1))
1028
if getattr(self, u"disable_initiator_tag", None) is None:
1362
1029
return
1363
1030
# Reschedule timeout
1364
1031
gobject.source_remove(self.disable_initiator_tag)
1365
1032
self.disable_initiator_tag = None
1366
self.expires = None
1367
time_to_die = timedelta_to_milliseconds((self
1368
.last_checked_ok
1369
+ self.timeout)
1370
- datetime.datetime
1371
.utcnow())
1033
time_to_die = (self.
1034
_timedelta_to_milliseconds((self
1035
.last_checked_ok
1036
+ self.timeout)
1037
- datetime.datetime
1038
.utcnow()))
1372
1039
if time_to_die <= 0:
1373
1040
# The timeout has passed
1374
1041
self.disable()
1375
1042
else:
1376
self.expires = (datetime.datetime.utcnow()
1377
+ datetime.timedelta(milliseconds =
1378
time_to_die))
1379
1043
self.disable_initiator_tag = (gobject.timeout_add
1380
1044
(time_to_die, self.disable))
1381
1045
1382
# ExtendedTimeout - property
1383
@dbus_service_property(_interface, signature="t",
1384
access="readwrite")
1385
def ExtendedTimeout_dbus_property(self, value=None):
1386
if value is None: # get
1387
return dbus.UInt64(self.extended_timeout_milliseconds())
1388
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1389
1390
1046
# Interval - property
1391
@dbus_service_property(_interface, signature="t",
1392
access="readwrite")
1047
@dbus_service_property(_interface, signature=u"t",
1048
access=u"readwrite")
1393
1049
def Interval_dbus_property(self, value=None):
1394
1050
if value is None: # get
1395
1051
return dbus.UInt64(self.interval_milliseconds())
1396
1052
self.interval = datetime.timedelta(0, 0, 0, value)
1397
if getattr(self, "checker_initiator_tag", None) is None:
1053
# Emit D-Bus signal
1054
self.PropertyChanged(dbus.String(u"Interval"),
1055
dbus.UInt64(value, variant_level=1))
1056
if getattr(self, u"checker_initiator_tag", None) is None:
1398
1057
return
1399
if self.enabled:
1400
# Reschedule checker run
1401
gobject.source_remove(self.checker_initiator_tag)
1402
self.checker_initiator_tag = (gobject.timeout_add
1403
(value, self.start_checker))
1404
self.start_checker() # Start one now, too
1405
1058
# Reschedule checker run
1059
gobject.source_remove(self.checker_initiator_tag)
1060
self.checker_initiator_tag = (gobject.timeout_add
1061
(value, self.start_checker))
1062
self.start_checker() # Start one now, too
1063
1406
1064
# Checker - property
1407
@dbus_service_property(_interface, signature="s",
1408
access="readwrite")
1065
@dbus_service_property(_interface, signature=u"s",
1066
access=u"readwrite")
1409
1067
def Checker_dbus_property(self, value=None):
1410
1068
if value is None: # get
1411
1069
return dbus.String(self.checker_command)
1412
self.checker_command = unicode(value)
1070
self.checker_command = value
1071
# Emit D-Bus signal
1072
self.PropertyChanged(dbus.String(u"Checker"),
1073
dbus.String(self.checker_command,
1074
variant_level=1))
1413
1075
1414
1076
# CheckerRunning - property
1415
@dbus_service_property(_interface, signature="b",
1416
access="readwrite")
1077
@dbus_service_property(_interface, signature=u"b",
1078
access=u"readwrite")
1417
1079
def CheckerRunning_dbus_property(self, value=None):
1418
1080
if value is None: # get
1419
1081
return dbus.Boolean(self.checker is not None)
1423
1085
self.stop_checker()
1424
1086
1425
1087
# ObjectPath - property
1426
@dbus_service_property(_interface, signature="o", access="read")
1088
@dbus_service_property(_interface, signature=u"o", access=u"read")
1427
1089
def ObjectPath_dbus_property(self):
1428
1090
return self.dbus_object_path # is already a dbus.ObjectPath
1429
1091
1430
1092
# Secret = property
1431
@dbus_service_property(_interface, signature="ay",
1432
access="write", byte_arrays=True)
1093
@dbus_service_property(_interface, signature=u"ay",
1094
access=u"write", byte_arrays=True)
1433
1095
def Secret_dbus_property(self, value):
1434
1096
self.secret = str(value)
1435
1097
1442
1104
self._pipe.send(('init', fpr, address))
1443
1105
if not self._pipe.recv():
1444
1106
raise KeyError()
1445
1107
1446
1108
def __getattribute__(self, name):
1447
if name == '_pipe':
1109
if(name == '_pipe'):
1448
1110
return super(ProxyClient, self).__getattribute__(name)
1449
1111
self._pipe.send(('getattr', name))
1450
1112
data = self._pipe.recv()
1455
1117
self._pipe.send(('funcall', name, args, kwargs))
1456
1118
return self._pipe.recv()[1]
1457
1119
return func
1458
1120
1459
1121
def __setattr__(self, name, value):
1460
if name == '_pipe':
1122
if(name == '_pipe'):
1461
1123
return super(ProxyClient, self).__setattr__(name, value)
1462
1124
self._pipe.send(('setattr', name, value))
1463
1125
1464
1126
1465
class ClientDBusTransitional(ClientDBus):
1466
__metaclass__ = AlternateDBusNamesMetaclass
1467
1468
1469
1127
class ClientHandler(socketserver.BaseRequestHandler, object):
1470
1128
"""A class to handle client connections.
1471
1129
1474
1132
1475
1133
def handle(self):
1476
1134
with contextlib.closing(self.server.child_pipe) as child_pipe:
1477
logger.info("TCP connection from: %s",
1135
logger.info(u"TCP connection from: %s",
1478
1136
unicode(self.client_address))
1479
logger.debug("Pipe FD: %d",
1137
logger.debug(u"Pipe FD: %d",
1480
1138
self.server.child_pipe.fileno())
1481
1139
1482
1140
session = (gnutls.connection
1483
1141
.ClientSession(self.request,
1484
1142
gnutls.connection
1485
1143
.X509Credentials()))
1486
1144
1487
1145
# Note: gnutls.connection.X509Credentials is really a
1488
1146
# generic GnuTLS certificate credentials object so long as
1489
1147
# no X.509 keys are added to it. Therefore, we can use it
1490
1148
# here despite using OpenPGP certificates.
1491
1492
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1493
# "+AES-256-CBC", "+SHA1",
1494
# "+COMP-NULL", "+CTYPE-OPENPGP",
1495
# "+DHE-DSS"))
1149
1150
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1151
# u"+AES-256-CBC", u"+SHA1",
1152
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1153
# u"+DHE-DSS"))
1496
1154
# Use a fallback default, since this MUST be set.
1497
1155
priority = self.server.gnutls_priority
1498
1156
if priority is None:
1499
priority = "NORMAL"
1157
priority = u"NORMAL"
1500
1158
(gnutls.library.functions
1501
1159
.gnutls_priority_set_direct(session._c_object,
1502
1160
priority, None))
1503
1161
1504
1162
# Start communication using the Mandos protocol
1505
1163
# Get protocol number
1506
1164
line = self.request.makefile().readline()
1507
logger.debug("Protocol version: %r", line)
1165
logger.debug(u"Protocol version: %r", line)
1508
1166
try:
1509
1167
if int(line.strip().split()[0]) > 1:
1510
1168
raise RuntimeError
1511
except (ValueError, IndexError, RuntimeError) as error:
1512
logger.error("Unknown protocol version: %s", error)
1169
except (ValueError, IndexError, RuntimeError), error:
1170
logger.error(u"Unknown protocol version: %s", error)
1513
1171
return
1514
1172
1515
1173
# Start GnuTLS connection
1516
1174
try:
1517
1175
session.handshake()
1518
except gnutls.errors.GNUTLSError as error:
1519
logger.warning("Handshake failed: %s", error)
1176
except gnutls.errors.GNUTLSError, error:
1177
logger.warning(u"Handshake failed: %s", error)
1520
1178
# Do not run session.bye() here: the session is not
1521
1179
# established. Just abandon the request.
1522
1180
return
1523
logger.debug("Handshake succeeded")
1524
1181
logger.debug(u"Handshake succeeded")
1182
1525
1183
approval_required = False
1526
1184
try:
1527
1185
try:
1528
1186
fpr = self.fingerprint(self.peer_certificate
1529
1187
(session))
1530
except (TypeError,
1531
gnutls.errors.GNUTLSError) as error:
1532
logger.warning("Bad certificate: %s", error)
1188
except (TypeError, gnutls.errors.GNUTLSError), error:
1189
logger.warning(u"Bad certificate: %s", error)
1533
1190
return
1534
logger.debug("Fingerprint: %s", fpr)
1535
1191
logger.debug(u"Fingerprint: %s", fpr)
1192
1536
1193
try:
1537
1194
client = ProxyClient(child_pipe, fpr,
1538
1195
self.client_address)
1539
1196
except KeyError:
1540
1197
return
1541
1198
1542
if self.server.use_dbus:
1543
# Emit D-Bus signal
1544
client.NewRequest(str(self.client_address))
1545
1546
1199
if client.approval_delay:
1547
1200
delay = client.approval_delay
1548
1201
client.approvals_pending += 1
1550
1203
1551
1204
while True:
1552
1205
if not client.enabled:
1553
logger.info("Client %s is disabled",
1206
logger.warning(u"Client %s is disabled",
1554
1207
client.name)
1555
1208
if self.server.use_dbus:
1556
1209
# Emit D-Bus signal
1557
client.Rejected("Disabled")
1210
client.Rejected("Disabled")
1558
1211
return
1559
1212
1560
if client.approved or not client.approval_delay:
1213
if client._approved or not client.approval_delay:
1561
1214
#We are approved or approval is disabled
1562
1215
break
1563
elif client.approved is None:
1564
logger.info("Client %s needs approval",
1216
elif client._approved is None:
1217
logger.info(u"Client %s needs approval",
1565
1218
client.name)
1566
1219
if self.server.use_dbus:
1567
1220
# Emit D-Bus signal
1569
1222
client.approval_delay_milliseconds(),
1570
1223
client.approved_by_default)
1571
1224
else:
1572
logger.warning("Client %s was not approved",
1225
logger.warning(u"Client %s was not approved",
1573
1226
client.name)
1574
1227
if self.server.use_dbus:
1575
1228
# Emit D-Bus signal
1577
1230
return
1578
1231
1579
1232
#wait until timeout or approved
1233
#x = float(client._timedelta_to_milliseconds(delay))
1580
1234
time = datetime.datetime.now()
1581
1235
client.changedstate.acquire()
1582
(client.changedstate.wait
1583
(float(client.timedelta_to_milliseconds(delay)
1584
/ 1000)))
1236
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1585
1237
client.changedstate.release()
1586
1238
time2 = datetime.datetime.now()
1587
1239
if (time2 - time) >= delay:
1602
1254
while sent_size < len(client.secret):
1603
1255
try:
1604
1256
sent = session.send(client.secret[sent_size:])
1605
except gnutls.errors.GNUTLSError as error:
1257
except (gnutls.errors.GNUTLSError), error:
1606
1258
logger.warning("gnutls send failed")
1607
1259
return
1608
logger.debug("Sent: %d, remaining: %d",
1260
logger.debug(u"Sent: %d, remaining: %d",
1609
1261
sent, len(client.secret)
1610
1262
- (sent_size + sent))
1611
1263
sent_size += sent
1612
1613
logger.info("Sending secret to %s", client.name)
1614
# bump the timeout using extended_timeout
1615
client.checked_ok(client.extended_timeout)
1264
1265
logger.info(u"Sending secret to %s", client.name)
1266
# bump the timeout as if seen
1267
client.checked_ok()
1616
1268
if self.server.use_dbus:
1617
1269
# Emit D-Bus signal
1618
1270
client.GotSecret()
1622
1274
client.approvals_pending -= 1
1623
1275
try:
1624
1276
session.bye()
1625
except gnutls.errors.GNUTLSError as error:
1277
except (gnutls.errors.GNUTLSError), error:
1626
1278
logger.warning("GnuTLS bye failed")
1627
1279
1628
1280
@staticmethod
1639
1291
.gnutls_certificate_get_peers
1640
1292
(session._c_object, ctypes.byref(list_size)))
1641
1293
if not bool(cert_list) and list_size.value != 0:
1642
raise gnutls.errors.GNUTLSError("error getting peer"
1643
" certificate")
1294
raise gnutls.errors.GNUTLSError(u"error getting peer"
1295
u" certificate")
1644
1296
if list_size.value == 0:
1645
1297
return None
1646
1298
cert = cert_list[0]
1672
1324
if crtverify.value != 0:
1673
1325
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1674
1326
raise (gnutls.errors.CertificateSecurityError
1675
("Verify failed"))
1327
(u"Verify failed"))
1676
1328
# New buffer for the fingerprint
1677
1329
buf = ctypes.create_string_buffer(20)
1678
1330
buf_len = ctypes.c_size_t()
1685
1337
# Convert the buffer to a Python bytestring
1686
1338
fpr = ctypes.string_at(buf, buf_len.value)
1687
1339
# Convert the bytestring to hexadecimal notation
1688
hex_fpr = binascii.hexlify(fpr).upper()
1340
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1689
1341
return hex_fpr
1690
1342
1691
1343
1694
1346
def sub_process_main(self, request, address):
1695
1347
try:
1696
1348
self.finish_request(request, address)
1697
except Exception:
1349
except:
1698
1350
self.handle_error(request, address)
1699
1351
self.close_request(request)
1700
1352
1701
1353
def process_request(self, request, address):
1702
1354
"""Start a new process to process the request."""
1703
proc = multiprocessing.Process(target = self.sub_process_main,
1704
args = (request,
1705
address))
1706
proc.start()
1707
return proc
1708
1355
multiprocessing.Process(target = self.sub_process_main,
1356
args = (request, address)).start()
1709
1357
1710
1358
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1711
1359
""" adds a pipe to the MixIn """
1715
1363
This function creates a new pipe in self.pipe
1716
1364
"""
1717
1365
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1718
1719
proc = MultiprocessingMixIn.process_request(self, request,
1720
client_address)
1366
1367
super(MultiprocessingMixInWithPipe,
1368
self).process_request(request, client_address)
1721
1369
self.child_pipe.close()
1722
self.add_pipe(parent_pipe, proc)
1723
1724
def add_pipe(self, parent_pipe, proc):
1370
self.add_pipe(parent_pipe)
1371
1372
def add_pipe(self, parent_pipe):
1725
1373
"""Dummy function; override as necessary"""
1726
raise NotImplementedError
1727
1374
pass
1728
1375
1729
1376
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1730
1377
socketserver.TCPServer, object):
1748
1395
bind to an address or port if they were not specified."""
1749
1396
if self.interface is not None:
1750
1397
if SO_BINDTODEVICE is None:
1751
logger.error("SO_BINDTODEVICE does not exist;"
1752
" cannot bind to interface %s",
1398
logger.error(u"SO_BINDTODEVICE does not exist;"
1399
u" cannot bind to interface %s",
1753
1400
self.interface)
1754
1401
else:
1755
1402
try:
1756
1403
self.socket.setsockopt(socket.SOL_SOCKET,
1757
1404
SO_BINDTODEVICE,
1758
1405
str(self.interface
1759
+ '\0'))
1760
except socket.error as error:
1406
+ u'\0'))
1407
except socket.error, error:
1761
1408
if error[0] == errno.EPERM:
1762
logger.error("No permission to"
1763
" bind to interface %s",
1409
logger.error(u"No permission to"
1410
u" bind to interface %s",
1764
1411
self.interface)
1765
1412
elif error[0] == errno.ENOPROTOOPT:
1766
logger.error("SO_BINDTODEVICE not available;"
1767
" cannot bind to interface %s",
1413
logger.error(u"SO_BINDTODEVICE not available;"
1414
u" cannot bind to interface %s",
1768
1415
self.interface)
1769
1416
else:
1770
1417
raise
1772
1419
if self.server_address[0] or self.server_address[1]:
1773
1420
if not self.server_address[0]:
1774
1421
if self.address_family == socket.AF_INET6:
1775
any_address = "::" # in6addr_any
1422
any_address = u"::" # in6addr_any
1776
1423
else:
1777
1424
any_address = socket.INADDR_ANY
1778
1425
self.server_address = (any_address,
1805
1452
self.enabled = False
1806
1453
self.clients = clients
1807
1454
if self.clients is None:
1808
self.clients = {}
1455
self.clients = set()
1809
1456
self.use_dbus = use_dbus
1810
1457
self.gnutls_priority = gnutls_priority
1811
1458
IPv6_TCPServer.__init__(self, server_address,
1815
1462
def server_activate(self):
1816
1463
if self.enabled:
1817
1464
return socketserver.TCPServer.server_activate(self)
1818
1819
1465
def enable(self):
1820
1466
self.enabled = True
1821
1822
def add_pipe(self, parent_pipe, proc):
1467
def add_pipe(self, parent_pipe):
1823
1468
# Call "handle_ipc" for both data and EOF events
1824
1469
gobject.io_add_watch(parent_pipe.fileno(),
1825
1470
gobject.IO_IN | gobject.IO_HUP,
1826
1471
functools.partial(self.handle_ipc,
1827
parent_pipe =
1828
parent_pipe,
1829
proc = proc))
1830
1472
parent_pipe = parent_pipe))
1473
1831
1474
def handle_ipc(self, source, condition, parent_pipe=None,
1832
proc = None, client_object=None):
1475
client_object=None):
1833
1476
condition_names = {
1834
gobject.IO_IN: "IN", # There is data to read.
1835
gobject.IO_OUT: "OUT", # Data can be written (without
1477
gobject.IO_IN: u"IN", # There is data to read.
1478
gobject.IO_OUT: u"OUT", # Data can be written (without
1836
1479
# blocking).
1837
gobject.IO_PRI: "PRI", # There is urgent data to read.
1838
gobject.IO_ERR: "ERR", # Error condition.
1839
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1480
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1481
gobject.IO_ERR: u"ERR", # Error condition.
1482
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1840
1483
# broken, usually for pipes and
1841
1484
# sockets).
1842
1485
}
1844
1487
for cond, name in
1845
1488
condition_names.iteritems()
1846
1489
if cond & condition)
1847
# error, or the other end of multiprocessing.Pipe has closed
1490
# error or the other end of multiprocessing.Pipe has closed
1848
1491
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1849
# Wait for other process to exit
1850
proc.join()
1851
1492
return False
1852
1493
1853
1494
# Read a request from the child
1858
1499
fpr = request[1]
1859
1500
address = request[2]
1860
1501
1861
for c in self.clients.itervalues():
1502
for c in self.clients:
1862
1503
if c.fingerprint == fpr:
1863
1504
client = c
1864
1505
break
1865
1506
else:
1866
logger.info("Client not found for fingerprint: %s, ad"
1867
"dress: %s", fpr, address)
1507
logger.warning(u"Client not found for fingerprint: %s, ad"
1508
u"dress: %s", fpr, address)
1868
1509
if self.use_dbus:
1869
1510
# Emit D-Bus signal
1870
mandos_dbus_service.ClientNotFound(fpr,
1871
address[0])
1511
mandos_dbus_service.ClientNotFound(fpr, address)
1872
1512
parent_pipe.send(False)
1873
1513
return False
1874
1514
1875
1515
gobject.io_add_watch(parent_pipe.fileno(),
1876
1516
gobject.IO_IN | gobject.IO_HUP,
1877
1517
functools.partial(self.handle_ipc,
1878
parent_pipe =
1879
parent_pipe,
1880
proc = proc,
1881
client_object =
1882
client))
1518
parent_pipe = parent_pipe,
1519
client_object = client))
1883
1520
parent_pipe.send(True)
1884
# remove the old hook in favor of the new above hook on
1885
# same fileno
1521
# remove the old hook in favor of the new above hook on same fileno
1886
1522
return False
1887
1523
if command == 'funcall':
1888
1524
funcname = request[1]
1889
1525
args = request[2]
1890
1526
kwargs = request[3]
1891
1527
1892
parent_pipe.send(('data', getattr(client_object,
1893
funcname)(*args,
1894
**kwargs)))
1895
1528
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1529
1896
1530
if command == 'getattr':
1897
1531
attrname = request[1]
1898
1532
if callable(client_object.__getattribute__(attrname)):
1899
1533
parent_pipe.send(('function',))
1900
1534
else:
1901
parent_pipe.send(('data', client_object
1902
.__getattribute__(attrname)))
1535
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1903
1536
1904
1537
if command == 'setattr':
1905
1538
attrname = request[1]
1906
1539
value = request[2]
1907
1540
setattr(client_object, attrname, value)
1908
1541
1909
1542
return True
1910
1543
1911
1544
1912
1545
def string_to_delta(interval):
1913
1546
"""Parse a string and return a datetime.timedelta
1914
1547
1915
>>> string_to_delta('7d')
1548
>>> string_to_delta(u'7d')
1916
1549
datetime.timedelta(7)
1917
>>> string_to_delta('60s')
1550
>>> string_to_delta(u'60s')
1918
1551
datetime.timedelta(0, 60)
1919
>>> string_to_delta('60m')
1552
>>> string_to_delta(u'60m')
1920
1553
datetime.timedelta(0, 3600)
1921
>>> string_to_delta('24h')
1554
>>> string_to_delta(u'24h')
1922
1555
datetime.timedelta(1)
1923
>>> string_to_delta('1w')
1556
>>> string_to_delta(u'1w')
1924
1557
datetime.timedelta(7)
1925
>>> string_to_delta('5m 30s')
1558
>>> string_to_delta(u'5m 30s')
1926
1559
datetime.timedelta(0, 330)
1927
1560
"""
1928
1561
timevalue = datetime.timedelta(0)
1930
1563
try:
1931
1564
suffix = unicode(s[-1])
1932
1565
value = int(s[:-1])
1933
if suffix == "d":
1566
if suffix == u"d":
1934
1567
delta = datetime.timedelta(value)
1935
elif suffix == "s":
1568
elif suffix == u"s":
1936
1569
delta = datetime.timedelta(0, value)
1937
elif suffix == "m":
1570
elif suffix == u"m":
1938
1571
delta = datetime.timedelta(0, 0, 0, 0, value)
1939
elif suffix == "h":
1572
elif suffix == u"h":
1940
1573
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1941
elif suffix == "w":
1574
elif suffix == u"w":
1942
1575
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1943
1576
else:
1944
raise ValueError("Unknown suffix %r" % suffix)
1945
except (ValueError, IndexError) as e:
1946
raise ValueError(*(e.args))
1577
raise ValueError(u"Unknown suffix %r" % suffix)
1578
except (ValueError, IndexError), e:
1579
raise ValueError(e.message)
1947
1580
timevalue += delta
1948
1581
return timevalue
1949
1582
1950
1583
1584
def if_nametoindex(interface):
1585
"""Call the C function if_nametoindex(), or equivalent
1586
1587
Note: This function cannot accept a unicode string."""
1588
global if_nametoindex
1589
try:
1590
if_nametoindex = (ctypes.cdll.LoadLibrary
1591
(ctypes.util.find_library(u"c"))
1592
.if_nametoindex)
1593
except (OSError, AttributeError):
1594
logger.warning(u"Doing if_nametoindex the hard way")
1595
def if_nametoindex(interface):
1596
"Get an interface index the hard way, i.e. using fcntl()"
1597
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1598
with contextlib.closing(socket.socket()) as s:
1599
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1600
struct.pack(str(u"16s16x"),
1601
interface))
1602
interface_index = struct.unpack(str(u"I"),
1603
ifreq[16:20])[0]
1604
return interface_index
1605
return if_nametoindex(interface)
1606
1607
1951
1608
def daemon(nochdir = False, noclose = False):
1952
1609
"""See daemon(3). Standard BSD Unix function.
1953
1610
1956
1613
sys.exit()
1957
1614
os.setsid()
1958
1615
if not nochdir:
1959
os.chdir("/")
1616
os.chdir(u"/")
1960
1617
if os.fork():
1961
1618
sys.exit()
1962
1619
if not noclose:
1964
1621
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1965
1622
if not stat.S_ISCHR(os.fstat(null).st_mode):
1966
1623
raise OSError(errno.ENODEV,
1967
"%s not a character device"
1624
u"%s not a character device"
1968
1625
% os.path.devnull)
1969
1626
os.dup2(null, sys.stdin.fileno())
1970
1627
os.dup2(null, sys.stdout.fileno())
1978
1635
##################################################################
1979
1636
# Parsing of options, both command line and config file
1980
1637
1981
parser = argparse.ArgumentParser()
1982
parser.add_argument("-v", "--version", action="version",
1983
version = "%%(prog)s %s" % version,
1984
help="show version number and exit")
1985
parser.add_argument("-i", "--interface", metavar="IF",
1986
help="Bind to interface IF")
1987
parser.add_argument("-a", "--address",
1988
help="Address to listen for requests on")
1989
parser.add_argument("-p", "--port", type=int,
1990
help="Port number to receive requests on")
1991
parser.add_argument("--check", action="store_true",
1992
help="Run self-test")
1993
parser.add_argument("--debug", action="store_true",
1994
help="Debug mode; run in foreground and log"
1995
" to terminal")
1996
parser.add_argument("--debuglevel", metavar="LEVEL",
1997
help="Debug level for stdout output")
1998
parser.add_argument("--priority", help="GnuTLS"
1999
" priority string (see GnuTLS documentation)")
2000
parser.add_argument("--servicename",
2001
metavar="NAME", help="Zeroconf service name")
2002
parser.add_argument("--configdir",
2003
default="/etc/mandos", metavar="DIR",
2004
help="Directory to search for configuration"
2005
" files")
2006
parser.add_argument("--no-dbus", action="store_false",
2007
dest="use_dbus", help="Do not provide D-Bus"
2008
" system bus interface")
2009
parser.add_argument("--no-ipv6", action="store_false",
2010
dest="use_ipv6", help="Do not use IPv6")
2011
parser.add_argument("--no-restore", action="store_false",
2012
dest="restore", help="Do not restore stored"
2013
" state")
2014
parser.add_argument("--statedir", metavar="DIR",
2015
help="Directory to save/restore state in")
2016
2017
options = parser.parse_args()
1638
parser = optparse.OptionParser(version = "%%prog %s" % version)
1639
parser.add_option("-i", u"--interface", type=u"string",
1640
metavar="IF", help=u"Bind to interface IF")
1641
parser.add_option("-a", u"--address", type=u"string",
1642
help=u"Address to listen for requests on")
1643
parser.add_option("-p", u"--port", type=u"int",
1644
help=u"Port number to receive requests on")
1645
parser.add_option("--check", action=u"store_true",
1646
help=u"Run self-test")
1647
parser.add_option("--debug", action=u"store_true",
1648
help=u"Debug mode; run in foreground and log to"
1649
u" terminal")
1650
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1651
help=u"Debug level for stdout output")
1652
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1653
u" priority string (see GnuTLS documentation)")
1654
parser.add_option("--servicename", type=u"string",
1655
metavar=u"NAME", help=u"Zeroconf service name")
1656
parser.add_option("--configdir", type=u"string",
1657
default=u"/etc/mandos", metavar=u"DIR",
1658
help=u"Directory to search for configuration"
1659
u" files")
1660
parser.add_option("--no-dbus", action=u"store_false",
1661
dest=u"use_dbus", help=u"Do not provide D-Bus"
1662
u" system bus interface")
1663
parser.add_option("--no-ipv6", action=u"store_false",
1664
dest=u"use_ipv6", help=u"Do not use IPv6")
1665
options = parser.parse_args()[0]
2018
1666
2019
1667
if options.check:
2020
1668
import doctest
2022
1670
sys.exit()
2023
1671
2024
1672
# Default values for config file for server-global settings
2025
server_defaults = { "interface": "",
2026
"address": "",
2027
"port": "",
2028
"debug": "False",
2029
"priority":
2030
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2031
"servicename": "Mandos",
2032
"use_dbus": "True",
2033
"use_ipv6": "True",
2034
"debuglevel": "",
2035
"restore": "True",
2036
"statedir": "/var/lib/mandos"
1673
server_defaults = { u"interface": u"",
1674
u"address": u"",
1675
u"port": u"",
1676
u"debug": u"False",
1677
u"priority":
1678
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1679
u"servicename": u"Mandos",
1680
u"use_dbus": u"True",
1681
u"use_ipv6": u"True",
1682
u"debuglevel": u"",
2037
1683
}
2038
1684
2039
1685
# Parse config file for server-global settings
2040
1686
server_config = configparser.SafeConfigParser(server_defaults)
2041
1687
del server_defaults
2042
1688
server_config.read(os.path.join(options.configdir,
2043
"mandos.conf"))
1689
u"mandos.conf"))
2044
1690
# Convert the SafeConfigParser object to a dict
2045
1691
server_settings = server_config.defaults()
2046
1692
# Use the appropriate methods on the non-string config options
2047
for option in ("debug", "use_dbus", "use_ipv6"):
2048
server_settings[option] = server_config.getboolean("DEFAULT",
1693
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1694
server_settings[option] = server_config.getboolean(u"DEFAULT",
2049
1695
option)
2050
1696
if server_settings["port"]:
2051
server_settings["port"] = server_config.getint("DEFAULT",
2052
"port")
1697
server_settings["port"] = server_config.getint(u"DEFAULT",
1698
u"port")
2053
1699
del server_config
2054
1700
2055
1701
# Override the settings from the config file with command line
2056
1702
# options, if set.
2057
for option in ("interface", "address", "port", "debug",
2058
"priority", "servicename", "configdir",
2059
"use_dbus", "use_ipv6", "debuglevel", "restore",
2060
"statedir"):
1703
for option in (u"interface", u"address", u"port", u"debug",
1704
u"priority", u"servicename", u"configdir",
1705
u"use_dbus", u"use_ipv6", u"debuglevel"):
2061
1706
value = getattr(options, option)
2062
1707
if value is not None:
2063
1708
server_settings[option] = value
2071
1716
##################################################################
2072
1717
2073
1718
# For convenience
2074
debug = server_settings["debug"]
2075
debuglevel = server_settings["debuglevel"]
2076
use_dbus = server_settings["use_dbus"]
2077
use_ipv6 = server_settings["use_ipv6"]
2078
stored_state_path = os.path.join(server_settings["statedir"],
2079
stored_state_file)
2080
2081
if debug:
2082
initlogger(debug, logging.DEBUG)
2083
else:
2084
if not debuglevel:
2085
initlogger(debug)
2086
else:
2087
level = getattr(logging, debuglevel.upper())
2088
initlogger(debug, level)
2089
2090
if server_settings["servicename"] != "Mandos":
1719
debug = server_settings[u"debug"]
1720
debuglevel = server_settings[u"debuglevel"]
1721
use_dbus = server_settings[u"use_dbus"]
1722
use_ipv6 = server_settings[u"use_ipv6"]
1723
1724
if server_settings[u"servicename"] != u"Mandos":
2091
1725
syslogger.setFormatter(logging.Formatter
2092
('Mandos (%s) [%%(process)d]:'
2093
' %%(levelname)s: %%(message)s'
2094
% server_settings["servicename"]))
1726
(u'Mandos (%s) [%%(process)d]:'
1727
u' %%(levelname)s: %%(message)s'
1728
% server_settings[u"servicename"]))
2095
1729
2096
1730
# Parse config file with clients
2097
client_config = configparser.SafeConfigParser(Client.client_defaults)
2098
client_config.read(os.path.join(server_settings["configdir"],
2099
"clients.conf"))
1731
client_defaults = { u"timeout": u"1h",
1732
u"interval": u"5m",
1733
u"checker": u"fping -q -- %%(host)s",
1734
u"host": u"",
1735
u"approval_delay": u"0s",
1736
u"approval_duration": u"1s",
1737
}
1738
client_config = configparser.SafeConfigParser(client_defaults)
1739
client_config.read(os.path.join(server_settings[u"configdir"],
1740
u"clients.conf"))
2100
1741
2101
1742
global mandos_dbus_service
2102
1743
mandos_dbus_service = None
2103
1744
2104
tcp_server = MandosServer((server_settings["address"],
2105
server_settings["port"]),
1745
tcp_server = MandosServer((server_settings[u"address"],
1746
server_settings[u"port"]),
2106
1747
ClientHandler,
2107
interface=(server_settings["interface"]
1748
interface=(server_settings[u"interface"]
2108
1749
or None),
2109
1750
use_ipv6=use_ipv6,
2110
1751
gnutls_priority=
2111
server_settings["priority"],
1752
server_settings[u"priority"],
2112
1753
use_dbus=use_dbus)
2113
if not debug:
2114
pidfilename = "/var/run/mandos.pid"
2115
try:
2116
pidfile = open(pidfilename, "w")
2117
except IOError:
2118
logger.error("Could not open file %r", pidfilename)
1754
pidfilename = u"/var/run/mandos.pid"
1755
try:
1756
pidfile = open(pidfilename, u"w")
1757
except IOError:
1758
logger.error(u"Could not open file %r", pidfilename)
2119
1759
2120
1760
try:
2121
uid = pwd.getpwnam("_mandos").pw_uid
2122
gid = pwd.getpwnam("_mandos").pw_gid
1761
uid = pwd.getpwnam(u"_mandos").pw_uid
1762
gid = pwd.getpwnam(u"_mandos").pw_gid
2123
1763
except KeyError:
2124
1764
try:
2125
uid = pwd.getpwnam("mandos").pw_uid
2126
gid = pwd.getpwnam("mandos").pw_gid
1765
uid = pwd.getpwnam(u"mandos").pw_uid
1766
gid = pwd.getpwnam(u"mandos").pw_gid
2127
1767
except KeyError:
2128
1768
try:
2129
uid = pwd.getpwnam("nobody").pw_uid
2130
gid = pwd.getpwnam("nobody").pw_gid
1769
uid = pwd.getpwnam(u"nobody").pw_uid
1770
gid = pwd.getpwnam(u"nobody").pw_gid
2131
1771
except KeyError:
2132
1772
uid = 65534
2133
1773
gid = 65534
2134
1774
try:
2135
1775
os.setgid(gid)
2136
1776
os.setuid(uid)
2137
except OSError as error:
1777
except OSError, error:
2138
1778
if error[0] != errno.EPERM:
2139
1779
raise error
2140
1780
1781
if not debug and not debuglevel:
1782
syslogger.setLevel(logging.WARNING)
1783
console.setLevel(logging.WARNING)
1784
if debuglevel:
1785
level = getattr(logging, debuglevel.upper())
1786
syslogger.setLevel(level)
1787
console.setLevel(level)
1788
2141
1789
if debug:
2142
1790
# Enable all possible GnuTLS debugging
2143
1791
2147
1795
2148
1796
@gnutls.library.types.gnutls_log_func
2149
1797
def debug_gnutls(level, string):
2150
logger.debug("GnuTLS: %s", string[:-1])
1798
logger.debug(u"GnuTLS: %s", string[:-1])
2151
1799
2152
1800
(gnutls.library.functions
2153
1801
.gnutls_global_set_log_function(debug_gnutls))
2157
1805
os.dup2(null, sys.stdin.fileno())
2158
1806
if null > 2:
2159
1807
os.close(null)
2160
2161
# Need to fork before connecting to D-Bus
2162
if not debug:
2163
# Close all input and output, do double fork, etc.
2164
daemon()
2165
2166
gobject.threads_init()
1808
else:
1809
# No console logging
1810
logger.removeHandler(console)
1811
2167
1812
2168
1813
global main_loop
2169
1814
# From the Avahi example code
2173
1818
# End of Avahi example code
2174
1819
if use_dbus:
2175
1820
try:
2176
bus_name = dbus.service.BusName("se.recompile.Mandos",
1821
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
2177
1822
bus, do_not_queue=True)
2178
old_bus_name = (dbus.service.BusName
2179
("se.bsnet.fukt.Mandos", bus,
2180
do_not_queue=True))
2181
except dbus.exceptions.NameExistsException as e:
2182
logger.error(unicode(e) + ", disabling D-Bus")
1823
except dbus.exceptions.NameExistsException, e:
1824
logger.error(unicode(e) + u", disabling D-Bus")
2183
1825
use_dbus = False
2184
server_settings["use_dbus"] = False
1826
server_settings[u"use_dbus"] = False
2185
1827
tcp_server.use_dbus = False
2186
1828
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2187
service = AvahiServiceToSyslog(name =
2188
server_settings["servicename"],
2189
servicetype = "_mandos._tcp",
2190
protocol = protocol, bus = bus)
1829
service = AvahiService(name = server_settings[u"servicename"],
1830
servicetype = u"_mandos._tcp",
1831
protocol = protocol, bus = bus)
2191
1832
if server_settings["interface"]:
2192
1833
service.interface = (if_nametoindex
2193
(str(server_settings["interface"])))
2194
1834
(str(server_settings[u"interface"])))
1835
1836
if not debug:
1837
# Close all input and output, do double fork, etc.
1838
daemon()
1839
2195
1840
global multiprocessing_manager
2196
1841
multiprocessing_manager = multiprocessing.Manager()
2197
1842
2198
1843
client_class = Client
2199
1844
if use_dbus:
2200
client_class = functools.partial(ClientDBusTransitional,
2201
bus = bus)
2202
2203
client_settings = Client.config_parser(client_config)
2204
old_client_settings = {}
2205
clients_data = {}
2206
2207
# Get client data and settings from last running state.
2208
if server_settings["restore"]:
2209
try:
2210
with open(stored_state_path, "rb") as stored_state:
2211
clients_data, old_client_settings = (pickle.load
2212
(stored_state))
2213
os.remove(stored_state_path)
2214
except IOError as e:
2215
logger.warning("Could not load persistent state: {0}"
2216
.format(e))
2217
if e.errno != errno.ENOENT:
2218
raise
2219
except EOFError as e:
2220
logger.warning("Could not load persistent state: "
2221
"EOFError: {0}".format(e))
2222
2223
with PGPEngine() as pgp:
2224
for client_name, client in clients_data.iteritems():
2225
# Decide which value to use after restoring saved state.
2226
# We have three different values: Old config file,
2227
# new config file, and saved state.
2228
# New config value takes precedence if it differs from old
2229
# config value, otherwise use saved state.
2230
for name, value in client_settings[client_name].items():
2231
try:
2232
# For each value in new config, check if it
2233
# differs from the old config value (Except for
2234
# the "secret" attribute)
2235
if (name != "secret" and
2236
value != old_client_settings[client_name]
2237
[name]):
2238
client[name] = value
2239
except KeyError:
2240
pass
2241
2242
# Clients who has passed its expire date can still be
2243
# enabled if its last checker was successful. Clients
2244
# whose checker failed before we stored its state is
2245
# assumed to have failed all checkers during downtime.
2246
if client["enabled"]:
2247
if datetime.datetime.utcnow() >= client["expires"]:
2248
if not client["last_checked_ok"]:
2249
logger.warning(
2250
"disabling client {0} - Client never "
2251
"performed a successfull checker"
2252
.format(client["name"]))
2253
client["enabled"] = False
2254
elif client["last_checker_status"] != 0:
2255
logger.warning(
2256
"disabling client {0} - Client "
2257
"last checker failed with error code {1}"
2258
.format(client["name"],
2259
client["last_checker_status"]))
2260
client["enabled"] = False
2261
else:
2262
client["expires"] = (datetime.datetime
2263
.utcnow()
2264
+ client["timeout"])
2265
1845
client_class = functools.partial(ClientDBus, bus = bus)
1846
def client_config_items(config, section):
1847
special_settings = {
1848
"approved_by_default":
1849
lambda: config.getboolean(section,
1850
"approved_by_default"),
1851
}
1852
for name, value in config.items(section):
2266
1853
try:
2267
client["secret"] = (
2268
pgp.decrypt(client["encrypted_secret"],
2269
client_settings[client_name]
2270
["secret"]))
2271
except PGPError:
2272
# If decryption fails, we use secret from new settings
2273
logger.debug("Failed to decrypt {0} old secret"
2274
.format(client_name))
2275
client["secret"] = (
2276
client_settings[client_name]["secret"])
2277
2278
2279
# Add/remove clients based on new changes made to config
2280
for client_name in set(old_client_settings) - set(client_settings):
2281
del clients_data[client_name]
2282
for client_name in set(client_settings) - set(old_client_settings):
2283
clients_data[client_name] = client_settings[client_name]
2284
2285
# Create clients all clients
2286
for client_name, client in clients_data.iteritems():
2287
tcp_server.clients[client_name] = client_class(
2288
name = client_name, settings = client)
2289
1854
yield (name, special_settings[name]())
1855
except KeyError:
1856
yield (name, value)
1857
1858
tcp_server.clients.update(set(
1859
client_class(name = section,
1860
config= dict(client_config_items(
1861
client_config, section)))
1862
for section in client_config.sections()))
2290
1863
if not tcp_server.clients:
2291
logger.warning("No clients defined")
1864
logger.warning(u"No clients defined")
2292
1865
1866
try:
1867
with pidfile:
1868
pid = os.getpid()
1869
pidfile.write(str(pid) + "\n")
1870
del pidfile
1871
except IOError:
1872
logger.error(u"Could not write to file %r with PID %d",
1873
pidfilename, pid)
1874
except NameError:
1875
# "pidfile" was never created
1876
pass
1877
del pidfilename
1878
2293
1879
if not debug:
2294
try:
2295
with pidfile:
2296
pid = os.getpid()
2297
pidfile.write(str(pid) + "\n".encode("utf-8"))
2298
del pidfile
2299
except IOError:
2300
logger.error("Could not write to file %r with PID %d",
2301
pidfilename, pid)
2302
except NameError:
2303
# "pidfile" was never created
2304
pass
2305
del pidfilename
2306
1880
signal.signal(signal.SIGINT, signal.SIG_IGN)
2307
2308
1881
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2309
1882
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2310
1883
2312
1885
class MandosDBusService(dbus.service.Object):
2313
1886
"""A D-Bus proxy object"""
2314
1887
def __init__(self):
2315
dbus.service.Object.__init__(self, bus, "/")
2316
_interface = "se.recompile.Mandos"
1888
dbus.service.Object.__init__(self, bus, u"/")
1889
_interface = u"se.bsnet.fukt.Mandos"
2317
1890
2318
@dbus.service.signal(_interface, signature="o")
1891
@dbus.service.signal(_interface, signature=u"o")
2319
1892
def ClientAdded(self, objpath):
2320
1893
"D-Bus signal"
2321
1894
pass
2322
1895
2323
@dbus.service.signal(_interface, signature="ss")
1896
@dbus.service.signal(_interface, signature=u"ss")
2324
1897
def ClientNotFound(self, fingerprint, address):
2325
1898
"D-Bus signal"
2326
1899
pass
2327
1900
2328
@dbus.service.signal(_interface, signature="os")
1901
@dbus.service.signal(_interface, signature=u"os")
2329
1902
def ClientRemoved(self, objpath, name):
2330
1903
"D-Bus signal"
2331
1904
pass
2332
1905
2333
@dbus.service.method(_interface, out_signature="ao")
1906
@dbus.service.method(_interface, out_signature=u"ao")
2334
1907
def GetAllClients(self):
2335
1908
"D-Bus method"
2336
1909
return dbus.Array(c.dbus_object_path
2337
for c in
2338
tcp_server.clients.itervalues())
1910
for c in tcp_server.clients)
2339
1911
2340
1912
@dbus.service.method(_interface,
2341
out_signature="a{oa{sv}}")
1913
out_signature=u"a{oa{sv}}")
2342
1914
def GetAllClientsWithProperties(self):
2343
1915
"D-Bus method"
2344
1916
return dbus.Dictionary(
2345
((c.dbus_object_path, c.GetAll(""))
2346
for c in tcp_server.clients.itervalues()),
2347
signature="oa{sv}")
1917
((c.dbus_object_path, c.GetAll(u""))
1918
for c in tcp_server.clients),
1919
signature=u"oa{sv}")
2348
1920
2349
@dbus.service.method(_interface, in_signature="o")
1921
@dbus.service.method(_interface, in_signature=u"o")
2350
1922
def RemoveClient(self, object_path):
2351
1923
"D-Bus method"
2352
for c in tcp_server.clients.itervalues():
1924
for c in tcp_server.clients:
2353
1925
if c.dbus_object_path == object_path:
2354
del tcp_server.clients[c.name]
1926
tcp_server.clients.remove(c)
2355
1927
c.remove_from_connection()
2356
1928
# Don't signal anything except ClientRemoved
2357
1929
c.disable(quiet=True)
2362
1934
2363
1935
del _interface
2364
1936
2365
class MandosDBusServiceTransitional(MandosDBusService):
2366
__metaclass__ = AlternateDBusNamesMetaclass
2367
mandos_dbus_service = MandosDBusServiceTransitional()
1937
mandos_dbus_service = MandosDBusService()
2368
1938
2369
1939
def cleanup():
2370
1940
"Cleanup function; run on exit"
2371
1941
service.cleanup()
2372
1942
2373
multiprocessing.active_children()
2374
if not (tcp_server.clients or client_settings):
2375
return
2376
2377
# Store client before exiting. Secrets are encrypted with key
2378
# based on what config file has. If config file is
2379
# removed/edited, old secret will thus be unrecovable.
2380
clients = {}
2381
with PGPEngine() as pgp:
2382
for client in tcp_server.clients.itervalues():
2383
key = client_settings[client.name]["secret"]
2384
client.encrypted_secret = pgp.encrypt(client.secret,
2385
key)
2386
client_dict = {}
2387
2388
# A list of attributes that can not be pickled
2389
# + secret.
2390
exclude = set(("bus", "changedstate", "secret",
2391
"checker"))
2392
for name, typ in (inspect.getmembers
2393
(dbus.service.Object)):
2394
exclude.add(name)
2395
2396
client_dict["encrypted_secret"] = (client
2397
.encrypted_secret)
2398
for attr in client.client_structure:
2399
if attr not in exclude:
2400
client_dict[attr] = getattr(client, attr)
2401
2402
clients[client.name] = client_dict
2403
del client_settings[client.name]["secret"]
2404
2405
try:
2406
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2407
prefix="clients-",
2408
dir=os.path.dirname
2409
(stored_state_path))
2410
with os.fdopen(tempfd, "wb") as stored_state:
2411
pickle.dump((clients, client_settings), stored_state)
2412
os.rename(tempname, stored_state_path)
2413
except (IOError, OSError) as e:
2414
logger.warning("Could not save persistent state: {0}"
2415
.format(e))
2416
if not debug:
2417
try:
2418
os.remove(tempname)
2419
except NameError:
2420
pass
2421
if e.errno not in set((errno.ENOENT, errno.EACCES,
2422
errno.EEXIST)):
2423
raise e
2424
2425
# Delete all clients, and settings from config
2426
1943
while tcp_server.clients:
2427
name, client = tcp_server.clients.popitem()
1944
client = tcp_server.clients.pop()
2428
1945
if use_dbus:
2429
1946
client.remove_from_connection()
1947
client.disable_hook = None
2430
1948
# Don't signal anything except ClientRemoved
2431
1949
client.disable(quiet=True)
2432
1950
if use_dbus:
2433
1951
# Emit D-Bus signal
2434
mandos_dbus_service.ClientRemoved(client
2435
.dbus_object_path,
1952
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2436
1953
client.name)
2437
client_settings.clear()
2438
1954
2439
1955
atexit.register(cleanup)
2440
1956
2441
for client in tcp_server.clients.itervalues():
1957
for client in tcp_server.clients:
2442
1958
if use_dbus:
2443
1959
# Emit D-Bus signal
2444
1960
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2445
# Need to initiate checking of clients
2446
if client.enabled:
2447
client.init_checker()
1961
client.enable()
2448
1962
2449
1963
tcp_server.enable()
2450
1964
tcp_server.server_activate()
2452
1966
# Find out what port we got
2453
1967
service.port = tcp_server.socket.getsockname()[1]
2454
1968
if use_ipv6:
2455
logger.info("Now listening on address %r, port %d,"
1969
logger.info(u"Now listening on address %r, port %d,"
2456
1970
" flowinfo %d, scope_id %d"
2457
1971
% tcp_server.socket.getsockname())
2458
1972
else: # IPv4
2459
logger.info("Now listening on address %r, port %d"
1973
logger.info(u"Now listening on address %r, port %d"
2460
1974
% tcp_server.socket.getsockname())
2461
1975
2462
1976
#service.interface = tcp_server.socket.getsockname()[3]
2465
1979
# From the Avahi example code
2466
1980
try:
2467
1981
service.activate()
2468
except dbus.exceptions.DBusException as error:
2469
logger.critical("DBusException: %s", error)
1982
except dbus.exceptions.DBusException, error:
1983
logger.critical(u"DBusException: %s", error)
2470
1984
cleanup()
2471
1985
sys.exit(1)
2472
1986
# End of Avahi example code
2476
1990
(tcp_server.handle_request
2477
1991
(*args[2:], **kwargs) or True))
2478
1992
2479
logger.debug("Starting main loop")
1993
logger.debug(u"Starting main loop")
2480
1994
main_loop.run()
2481
except AvahiError as error:
2482
logger.critical("AvahiError: %s", error)
1995
except AvahiError, error:
1996
logger.critical(u"AvahiError: %s", error)
2483
1997
cleanup()
2484
1998
sys.exit(1)
2485
1999
except KeyboardInterrupt:
2486
2000
if debug:
2487
print("", file=sys.stderr)
2488
logger.debug("Server received KeyboardInterrupt")
2489
logger.debug("Server exiting")
2001
print >> sys.stderr
2002
logger.debug(u"Server received KeyboardInterrupt")
2003
logger.debug(u"Server exiting")
2490
2004
# Must run before the D-Bus bus name gets deregistered
2491
2005
cleanup()
2492
2006
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0