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 869
- compare with another revision
- download diff
- download tarball
- view history from revision 869
- Committer: Teddy Hogeborn
- Date: 2016-07-10 03:43:48 UTC
- Revision ID: teddy@recompile.se-20160710034348-5qc50yeyyn7peirm
Update RFC references to their modern equivalents.
* plugins.d/mandos-client.xml (SEE ALSO): Replace RFC 4346 (TLS 1.1)
with RFC 5246 (TLS 1.2), and replace RFC 5081 (TLS OpenPGP) with its
replacement RFC 6091.
* plugins.d/mandos-client.xml (SEE ALSO): Replace RFC 4346 (TLS 1.1)
with RFC 5246 (TLS 1.2), and replace RFC 5081 (TLS OpenPGP) with its
replacement RFC 6091.
- files modified:
- DBUS-API
added
removed
mandos
1
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
#
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
5
#
5
#
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
9
# methods "add", "remove", "server_state_changed",
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
11
# "AvahiService" class, and some lines in "main".
12
#
12
#
13
13
# Everything else is
14
# Copyright © 2008-2018 Teddy Hogeborn
15
# Copyright © 2008-2018 Björn Påhlsson
16
#
17
# This file is part of Mandos.
18
#
19
# Mandos is free software: you can redistribute it and/or modify it
20
# under the terms of the GNU General Public License as published by
14
# Copyright © 2008-2016 Teddy Hogeborn
15
# Copyright © 2008-2016 Björn Påhlsson
16
#
17
# This program is free software: you can redistribute it and/or modify
18
# it under the terms of the GNU General Public License as published by
21
19
# the Free Software Foundation, either version 3 of the License, or
22
20
# (at your option) any later version.
23
21
#
24
# Mandos is distributed in the hope that it will be useful, but
25
# WITHOUT ANY WARRANTY; without even the implied warranty of
22
# This program is distributed in the hope that it will be useful,
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
26
24
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27
25
# GNU General Public License for more details.
28
#
26
#
29
27
# You should have received a copy of the GNU General Public License
30
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
31
#
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
30
#
32
31
# Contact the authors at <mandos@recompile.se>.
33
#
32
#
34
33
35
34
from __future__ import (division, absolute_import, print_function,
36
35
unicode_literals)
115
114
if sys.version_info.major == 2:
116
115
str = unicode
117
116
118
version = "1.7.16"
117
version = "1.7.10"
119
118
stored_state_file = "clients.pickle"
120
119
121
120
logger = logging.getLogger()
125
124
if_nametoindex = ctypes.cdll.LoadLibrary(
126
125
ctypes.util.find_library("c")).if_nametoindex
127
126
except (OSError, AttributeError):
128
127
129
128
def if_nametoindex(interface):
130
129
"Get an interface index the hard way, i.e. using fcntl()"
131
130
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
154
153
155
154
def initlogger(debug, level=logging.WARNING):
156
155
"""init logger and add loglevel"""
157
156
158
157
global syslogger
159
158
syslogger = (logging.handlers.SysLogHandler(
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
161
address="/dev/log"))
159
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
160
address = "/dev/log"))
162
161
syslogger.setFormatter(logging.Formatter
163
162
('Mandos [%(process)d]: %(levelname)s:'
164
163
' %(message)s'))
165
164
logger.addHandler(syslogger)
166
165
167
166
if debug:
168
167
console = logging.StreamHandler()
169
168
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
181
180
182
181
class PGPEngine(object):
183
182
"""A simple class for OpenPGP symmetric encryption & decryption"""
184
183
185
184
def __init__(self):
186
185
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
187
186
self.gpg = "gpg"
202
201
# Only GPG version 1 has the --no-use-agent option.
203
202
if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
204
203
self.gnupgargs.append("--no-use-agent")
205
204
206
205
def __enter__(self):
207
206
return self
208
207
209
208
def __exit__(self, exc_type, exc_value, traceback):
210
209
self._cleanup()
211
210
return False
212
211
213
212
def __del__(self):
214
213
self._cleanup()
215
214
216
215
def _cleanup(self):
217
216
if self.tempdir is not None:
218
217
# Delete contents of tempdir
219
218
for root, dirs, files in os.walk(self.tempdir,
220
topdown=False):
219
topdown = False):
221
220
for filename in files:
222
221
os.remove(os.path.join(root, filename))
223
222
for dirname in dirs:
225
224
# Remove tempdir
226
225
os.rmdir(self.tempdir)
227
226
self.tempdir = None
228
227
229
228
def password_encode(self, password):
230
229
# Passphrase can not be empty and can not contain newlines or
231
230
# NUL bytes. So we prefix it and hex encode it.
236
235
.replace(b"\n", b"\\n")
237
236
.replace(b"\0", b"\\x00"))
238
237
return encoded
239
238
240
239
def encrypt(self, data, password):
241
240
passphrase = self.password_encode(password)
242
241
with tempfile.NamedTemporaryFile(
247
246
'--passphrase-file',
248
247
passfile.name]
249
248
+ self.gnupgargs,
250
stdin=subprocess.PIPE,
251
stdout=subprocess.PIPE,
252
stderr=subprocess.PIPE)
253
ciphertext, err = proc.communicate(input=data)
249
stdin = subprocess.PIPE,
250
stdout = subprocess.PIPE,
251
stderr = subprocess.PIPE)
252
ciphertext, err = proc.communicate(input = data)
254
253
if proc.returncode != 0:
255
254
raise PGPError(err)
256
255
return ciphertext
257
256
258
257
def decrypt(self, data, password):
259
258
passphrase = self.password_encode(password)
260
259
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
260
dir = self.tempdir) as passfile:
262
261
passfile.write(passphrase)
263
262
passfile.flush()
264
263
proc = subprocess.Popen([self.gpg, '--decrypt',
265
264
'--passphrase-file',
266
265
passfile.name]
267
266
+ self.gnupgargs,
268
stdin=subprocess.PIPE,
269
stdout=subprocess.PIPE,
270
stderr=subprocess.PIPE)
271
decrypted_plaintext, err = proc.communicate(input=data)
267
stdin = subprocess.PIPE,
268
stdout = subprocess.PIPE,
269
stderr = subprocess.PIPE)
270
decrypted_plaintext, err = proc.communicate(input = data)
272
271
if proc.returncode != 0:
273
272
raise PGPError(err)
274
273
return decrypted_plaintext
275
274
276
277
275
# Pretend that we have an Avahi module
278
276
class Avahi(object):
279
277
"""This isn't so much a class as it is a module-like namespace.
280
278
It is instantiated once, and simulates having an Avahi module."""
281
IF_UNSPEC = -1 # avahi-common/address.h
282
PROTO_UNSPEC = -1 # avahi-common/address.h
283
PROTO_INET = 0 # avahi-common/address.h
284
PROTO_INET6 = 1 # avahi-common/address.h
279
IF_UNSPEC = -1 # avahi-common/address.h
280
PROTO_UNSPEC = -1 # avahi-common/address.h
281
PROTO_INET = 0 # avahi-common/address.h
282
PROTO_INET6 = 1 # avahi-common/address.h
285
283
DBUS_NAME = "org.freedesktop.Avahi"
286
284
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
287
285
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
288
286
DBUS_PATH_SERVER = "/"
289
290
287
def string_array_to_txt_array(self, t):
291
288
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
292
289
for s in t), signature="ay")
293
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
294
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
295
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
296
SERVER_INVALID = 0 # avahi-common/defs.h
297
SERVER_REGISTERING = 1 # avahi-common/defs.h
298
SERVER_RUNNING = 2 # avahi-common/defs.h
299
SERVER_COLLISION = 3 # avahi-common/defs.h
300
SERVER_FAILURE = 4 # avahi-common/defs.h
290
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
291
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
292
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
293
SERVER_INVALID = 0 # avahi-common/defs.h
294
SERVER_REGISTERING = 1 # avahi-common/defs.h
295
SERVER_RUNNING = 2 # avahi-common/defs.h
296
SERVER_COLLISION = 3 # avahi-common/defs.h
297
SERVER_FAILURE = 4 # avahi-common/defs.h
301
298
avahi = Avahi()
302
299
303
304
300
class AvahiError(Exception):
305
301
def __init__(self, value, *args, **kwargs):
306
302
self.value = value
318
314
319
315
class AvahiService(object):
320
316
"""An Avahi (Zeroconf) service.
321
317
322
318
Attributes:
323
319
interface: integer; avahi.IF_UNSPEC or an interface index.
324
320
Used to optionally bind to the specified interface.
336
332
server: D-Bus Server
337
333
bus: dbus.SystemBus()
338
334
"""
339
335
340
336
def __init__(self,
341
interface=avahi.IF_UNSPEC,
342
name=None,
343
servicetype=None,
344
port=None,
345
TXT=None,
346
domain="",
347
host="",
348
max_renames=32768,
349
protocol=avahi.PROTO_UNSPEC,
350
bus=None):
337
interface = avahi.IF_UNSPEC,
338
name = None,
339
servicetype = None,
340
port = None,
341
TXT = None,
342
domain = "",
343
host = "",
344
max_renames = 32768,
345
protocol = avahi.PROTO_UNSPEC,
346
bus = None):
351
347
self.interface = interface
352
348
self.name = name
353
349
self.type = servicetype
362
358
self.server = None
363
359
self.bus = bus
364
360
self.entry_group_state_changed_match = None
365
361
366
362
def rename(self, remove=True):
367
363
"""Derived from the Avahi example code"""
368
364
if self.rename_count >= self.max_renames:
388
384
logger.critical("D-Bus Exception", exc_info=error)
389
385
self.cleanup()
390
386
os._exit(1)
391
387
392
388
def remove(self):
393
389
"""Derived from the Avahi example code"""
394
390
if self.entry_group_state_changed_match is not None:
396
392
self.entry_group_state_changed_match = None
397
393
if self.group is not None:
398
394
self.group.Reset()
399
395
400
396
def add(self):
401
397
"""Derived from the Avahi example code"""
402
398
self.remove()
419
415
dbus.UInt16(self.port),
420
416
avahi.string_array_to_txt_array(self.TXT))
421
417
self.group.Commit()
422
418
423
419
def entry_group_state_changed(self, state, error):
424
420
"""Derived from the Avahi example code"""
425
421
logger.debug("Avahi entry group state change: %i", state)
426
422
427
423
if state == avahi.ENTRY_GROUP_ESTABLISHED:
428
424
logger.debug("Zeroconf service established.")
429
425
elif state == avahi.ENTRY_GROUP_COLLISION:
433
429
logger.critical("Avahi: Error in group state changed %s",
434
430
str(error))
435
431
raise AvahiGroupError("State changed: {!s}".format(error))
436
432
437
433
def cleanup(self):
438
434
"""Derived from the Avahi example code"""
439
435
if self.group is not None:
444
440
pass
445
441
self.group = None
446
442
self.remove()
447
443
448
444
def server_state_changed(self, state, error=None):
449
445
"""Derived from the Avahi example code"""
450
446
logger.debug("Avahi server state change: %i", state)
479
475
logger.debug("Unknown state: %r", state)
480
476
else:
481
477
logger.debug("Unknown state: %r: %r", state, error)
482
478
483
479
def activate(self):
484
480
"""Derived from the Avahi example code"""
485
481
if self.server is None:
496
492
class AvahiServiceToSyslog(AvahiService):
497
493
def rename(self, *args, **kwargs):
498
494
"""Add the new name to the syslog messages"""
499
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
495
ret = AvahiService.rename(self, *args, **kwargs)
500
496
syslogger.setFormatter(logging.Formatter(
501
497
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
502
498
.format(self.name)))
503
499
return ret
504
500
505
506
501
# Pretend that we have a GnuTLS module
507
502
class GnuTLS(object):
508
503
"""This isn't so much a class as it is a module-like namespace.
509
504
It is instantiated once, and simulates having a GnuTLS module."""
510
511
library = ctypes.util.find_library("gnutls")
512
if library is None:
513
library = ctypes.util.find_library("gnutls-deb0")
514
_library = ctypes.cdll.LoadLibrary(library)
515
del library
505
506
_library = ctypes.cdll.LoadLibrary(
507
ctypes.util.find_library("gnutls"))
516
508
_need_version = b"3.3.0"
517
518
509
def __init__(self):
519
# Need to use "self" here, since this method is called before
520
# the assignment to the "gnutls" global variable happens.
521
if self.check_version(self._need_version) is None:
522
raise self.Error("Needs GnuTLS {} or later"
523
.format(self._need_version))
524
510
# Need to use class name "GnuTLS" here, since this method is
511
# called before the assignment to the "gnutls" global variable
512
# happens.
513
if GnuTLS.check_version(self._need_version) is None:
514
raise GnuTLS.Error("Needs GnuTLS {} or later"
515
.format(self._need_version))
516
525
517
# Unless otherwise indicated, the constants and types below are
526
518
# all from the gnutls/gnutls.h C header file.
527
519
528
520
# Constants
529
521
E_SUCCESS = 0
530
522
E_INTERRUPTED = -52
535
527
CRD_CERTIFICATE = 1
536
528
E_NO_CERTIFICATE_FOUND = -49
537
529
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
538
530
539
531
# Types
540
532
class session_int(ctypes.Structure):
541
533
_fields_ = []
542
534
session_t = ctypes.POINTER(session_int)
543
544
535
class certificate_credentials_st(ctypes.Structure):
545
536
_fields_ = []
546
537
certificate_credentials_t = ctypes.POINTER(
547
538
certificate_credentials_st)
548
539
certificate_type_t = ctypes.c_int
549
550
540
class datum_t(ctypes.Structure):
551
541
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
552
542
('size', ctypes.c_uint)]
553
554
543
class openpgp_crt_int(ctypes.Structure):
555
544
_fields_ = []
556
545
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
557
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
546
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
558
547
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
559
548
credentials_type_t = ctypes.c_int
560
549
transport_ptr_t = ctypes.c_void_p
561
550
close_request_t = ctypes.c_int
562
551
563
552
# Exceptions
564
553
class Error(Exception):
565
554
# We need to use the class name "GnuTLS" here, since this
566
555
# exception might be raised from within GnuTLS.__init__,
567
556
# which is called before the assignment to the "gnutls"
568
557
# global variable has happened.
569
def __init__(self, message=None, code=None, args=()):
558
def __init__(self, message = None, code = None, args=()):
570
559
# Default usage is by a message string, but if a return
571
560
# code is passed, convert it to a string with
572
561
# gnutls.strerror()
575
564
message = GnuTLS.strerror(code)
576
565
return super(GnuTLS.Error, self).__init__(
577
566
message, *args)
578
567
579
568
class CertificateSecurityError(Error):
580
569
pass
581
570
582
571
# Classes
583
572
class Credentials(object):
584
573
def __init__(self):
586
575
gnutls.certificate_allocate_credentials(
587
576
ctypes.byref(self._c_object))
588
577
self.type = gnutls.CRD_CERTIFICATE
589
578
590
579
def __del__(self):
591
580
gnutls.certificate_free_credentials(self._c_object)
592
581
593
582
class ClientSession(object):
594
def __init__(self, socket, credentials=None):
583
def __init__(self, socket, credentials = None):
595
584
self._c_object = gnutls.session_t()
596
585
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
597
586
gnutls.set_default_priority(self._c_object)
605
594
ctypes.cast(credentials._c_object,
606
595
ctypes.c_void_p))
607
596
self.credentials = credentials
608
597
609
598
def __del__(self):
610
599
gnutls.deinit(self._c_object)
611
600
612
601
def handshake(self):
613
602
return gnutls.handshake(self._c_object)
614
603
615
604
def send(self, data):
616
605
data = bytes(data)
617
606
data_len = len(data)
619
608
data_len -= gnutls.record_send(self._c_object,
620
609
data[-data_len:],
621
610
data_len)
622
611
623
612
def bye(self):
624
613
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
625
614
626
615
# Error handling functions
627
616
def _error_code(result):
628
617
"""A function to raise exceptions on errors, suitable
630
619
if result >= 0:
631
620
return result
632
621
if result == gnutls.E_NO_CERTIFICATE_FOUND:
633
raise gnutls.CertificateSecurityError(code=result)
634
raise gnutls.Error(code=result)
635
622
raise gnutls.CertificateSecurityError(code = result)
623
raise gnutls.Error(code = result)
624
636
625
def _retry_on_error(result, func, arguments):
637
626
"""A function to retry on some errors, suitable
638
627
for the 'errcheck' attribute on ctypes functions"""
641
630
return _error_code(result)
642
631
result = func(*arguments)
643
632
return result
644
633
645
634
# Unless otherwise indicated, the function declarations below are
646
635
# all from the gnutls/gnutls.h C header file.
647
636
648
637
# Functions
649
638
priority_set_direct = _library.gnutls_priority_set_direct
650
639
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
651
640
ctypes.POINTER(ctypes.c_char_p)]
652
641
priority_set_direct.restype = _error_code
653
642
654
643
init = _library.gnutls_init
655
644
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
656
645
init.restype = _error_code
657
646
658
647
set_default_priority = _library.gnutls_set_default_priority
659
648
set_default_priority.argtypes = [session_t]
660
649
set_default_priority.restype = _error_code
661
650
662
651
record_send = _library.gnutls_record_send
663
652
record_send.argtypes = [session_t, ctypes.c_void_p,
664
653
ctypes.c_size_t]
665
654
record_send.restype = ctypes.c_ssize_t
666
655
record_send.errcheck = _retry_on_error
667
656
668
657
certificate_allocate_credentials = (
669
658
_library.gnutls_certificate_allocate_credentials)
670
659
certificate_allocate_credentials.argtypes = [
671
660
ctypes.POINTER(certificate_credentials_t)]
672
661
certificate_allocate_credentials.restype = _error_code
673
662
674
663
certificate_free_credentials = (
675
664
_library.gnutls_certificate_free_credentials)
676
certificate_free_credentials.argtypes = [
677
certificate_credentials_t]
665
certificate_free_credentials.argtypes = [certificate_credentials_t]
678
666
certificate_free_credentials.restype = None
679
667
680
668
handshake_set_private_extensions = (
681
669
_library.gnutls_handshake_set_private_extensions)
682
670
handshake_set_private_extensions.argtypes = [session_t,
683
671
ctypes.c_int]
684
672
handshake_set_private_extensions.restype = None
685
673
686
674
credentials_set = _library.gnutls_credentials_set
687
675
credentials_set.argtypes = [session_t, credentials_type_t,
688
676
ctypes.c_void_p]
689
677
credentials_set.restype = _error_code
690
678
691
679
strerror = _library.gnutls_strerror
692
680
strerror.argtypes = [ctypes.c_int]
693
681
strerror.restype = ctypes.c_char_p
694
682
695
683
certificate_type_get = _library.gnutls_certificate_type_get
696
684
certificate_type_get.argtypes = [session_t]
697
685
certificate_type_get.restype = _error_code
698
686
699
687
certificate_get_peers = _library.gnutls_certificate_get_peers
700
688
certificate_get_peers.argtypes = [session_t,
701
689
ctypes.POINTER(ctypes.c_uint)]
702
690
certificate_get_peers.restype = ctypes.POINTER(datum_t)
703
691
704
692
global_set_log_level = _library.gnutls_global_set_log_level
705
693
global_set_log_level.argtypes = [ctypes.c_int]
706
694
global_set_log_level.restype = None
707
695
708
696
global_set_log_function = _library.gnutls_global_set_log_function
709
697
global_set_log_function.argtypes = [log_func]
710
698
global_set_log_function.restype = None
711
699
712
700
deinit = _library.gnutls_deinit
713
701
deinit.argtypes = [session_t]
714
702
deinit.restype = None
715
703
716
704
handshake = _library.gnutls_handshake
717
705
handshake.argtypes = [session_t]
718
706
handshake.restype = _error_code
719
707
handshake.errcheck = _retry_on_error
720
708
721
709
transport_set_ptr = _library.gnutls_transport_set_ptr
722
710
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
723
711
transport_set_ptr.restype = None
724
712
725
713
bye = _library.gnutls_bye
726
714
bye.argtypes = [session_t, close_request_t]
727
715
bye.restype = _error_code
728
716
bye.errcheck = _retry_on_error
729
717
730
718
check_version = _library.gnutls_check_version
731
719
check_version.argtypes = [ctypes.c_char_p]
732
720
check_version.restype = ctypes.c_char_p
733
721
734
722
# All the function declarations below are from gnutls/openpgp.h
735
723
736
724
openpgp_crt_init = _library.gnutls_openpgp_crt_init
737
725
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
738
726
openpgp_crt_init.restype = _error_code
739
727
740
728
openpgp_crt_import = _library.gnutls_openpgp_crt_import
741
729
openpgp_crt_import.argtypes = [openpgp_crt_t,
742
730
ctypes.POINTER(datum_t),
743
731
openpgp_crt_fmt_t]
744
732
openpgp_crt_import.restype = _error_code
745
733
746
734
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
747
735
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
748
736
ctypes.POINTER(ctypes.c_uint)]
749
737
openpgp_crt_verify_self.restype = _error_code
750
738
751
739
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
752
740
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
753
741
openpgp_crt_deinit.restype = None
754
742
755
743
openpgp_crt_get_fingerprint = (
756
744
_library.gnutls_openpgp_crt_get_fingerprint)
757
745
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
759
747
ctypes.POINTER(
760
748
ctypes.c_size_t)]
761
749
openpgp_crt_get_fingerprint.restype = _error_code
762
750
763
751
# Remove non-public functions
764
752
del _error_code, _retry_on_error
765
753
# Create the global "gnutls" object, simulating a module
766
754
gnutls = GnuTLS()
767
755
768
769
756
def call_pipe(connection, # : multiprocessing.Connection
770
757
func, *args, **kwargs):
771
758
"""This function is meant to be called by multiprocessing.Process
772
759
773
760
This function runs func(*args, **kwargs), and writes the resulting
774
761
return value on the provided multiprocessing.Connection.
775
762
"""
776
763
connection.send(func(*args, **kwargs))
777
764
connection.close()
778
765
779
780
766
class Client(object):
781
767
"""A representation of a client host served by this server.
782
768
783
769
Attributes:
784
770
approved: bool(); 'None' if not yet approved/disapproved
785
771
approval_delay: datetime.timedelta(); Time to wait for approval
822
808
disabled, or None
823
809
server_settings: The server_settings dict from main()
824
810
"""
825
811
826
812
runtime_expansions = ("approval_delay", "approval_duration",
827
813
"created", "enabled", "expires",
828
814
"fingerprint", "host", "interval",
839
825
"approved_by_default": "True",
840
826
"enabled": "True",
841
827
}
842
828
843
829
@staticmethod
844
830
def config_parser(config):
845
831
"""Construct a new dict of client settings of this form:
852
838
for client_name in config.sections():
853
839
section = dict(config.items(client_name))
854
840
client = settings[client_name] = {}
855
841
856
842
client["host"] = section["host"]
857
843
# Reformat values from string types to Python types
858
844
client["approved_by_default"] = config.getboolean(
859
845
client_name, "approved_by_default")
860
846
client["enabled"] = config.getboolean(client_name,
861
847
"enabled")
862
848
863
849
# Uppercase and remove spaces from fingerprint for later
864
850
# comparison purposes with return value from the
865
851
# fingerprint() function
889
875
client["last_approval_request"] = None
890
876
client["last_checked_ok"] = None
891
877
client["last_checker_status"] = -2
892
878
893
879
return settings
894
895
def __init__(self, settings, name=None, server_settings=None):
880
881
def __init__(self, settings, name = None, server_settings=None):
896
882
self.name = name
897
883
if server_settings is None:
898
884
server_settings = {}
900
886
# adding all client settings
901
887
for setting, value in settings.items():
902
888
setattr(self, setting, value)
903
889
904
890
if self.enabled:
905
891
if not hasattr(self, "last_enabled"):
906
892
self.last_enabled = datetime.datetime.utcnow()
910
896
else:
911
897
self.last_enabled = None
912
898
self.expires = None
913
899
914
900
logger.debug("Creating client %r", self.name)
915
901
logger.debug(" Fingerprint: %s", self.fingerprint)
916
902
self.created = settings.get("created",
917
903
datetime.datetime.utcnow())
918
904
919
905
# attributes specific for this server instance
920
906
self.checker = None
921
907
self.checker_initiator_tag = None
930
916
for attr in self.__dict__.keys()
931
917
if not attr.startswith("_")]
932
918
self.client_structure.append("client_structure")
933
919
934
920
for name, t in inspect.getmembers(
935
921
type(self), lambda obj: isinstance(obj, property)):
936
922
if not name.startswith("_"):
937
923
self.client_structure.append(name)
938
924
939
925
# Send notice to process children that client state has changed
940
926
def send_changedstate(self):
941
927
with self.changedstate:
942
928
self.changedstate.notify_all()
943
929
944
930
def enable(self):
945
931
"""Start this client's checker and timeout hooks"""
946
932
if getattr(self, "enabled", False):
951
937
self.last_enabled = datetime.datetime.utcnow()
952
938
self.init_checker()
953
939
self.send_changedstate()
954
940
955
941
def disable(self, quiet=True):
956
942
"""Disable this client."""
957
943
if not getattr(self, "enabled", False):
971
957
self.send_changedstate()
972
958
# Do not run this again if called by a GLib.timeout_add
973
959
return False
974
960
975
961
def __del__(self):
976
962
self.disable()
977
963
978
964
def init_checker(self):
979
965
# Schedule a new checker to be started an 'interval' from now,
980
966
# and every interval from then on.
990
976
int(self.timeout.total_seconds() * 1000), self.disable)
991
977
# Also start a new checker *right now*.
992
978
self.start_checker()
993
979
994
980
def checker_callback(self, source, condition, connection,
995
981
command):
996
982
"""The checker has completed, so take appropriate actions."""
999
985
# Read return code from connection (see call_pipe)
1000
986
returncode = connection.recv()
1001
987
connection.close()
1002
988
1003
989
if returncode >= 0:
1004
990
self.last_checker_status = returncode
1005
991
self.last_checker_signal = None
1015
1001
logger.warning("Checker for %(name)s crashed?",
1016
1002
vars(self))
1017
1003
return False
1018
1004
1019
1005
def checked_ok(self):
1020
1006
"""Assert that the client has been seen, alive and well."""
1021
1007
self.last_checked_ok = datetime.datetime.utcnow()
1022
1008
self.last_checker_status = 0
1023
1009
self.last_checker_signal = None
1024
1010
self.bump_timeout()
1025
1011
1026
1012
def bump_timeout(self, timeout=None):
1027
1013
"""Bump up the timeout for this client."""
1028
1014
if timeout is None:
1034
1020
self.disable_initiator_tag = GLib.timeout_add(
1035
1021
int(timeout.total_seconds() * 1000), self.disable)
1036
1022
self.expires = datetime.datetime.utcnow() + timeout
1037
1023
1038
1024
def need_approval(self):
1039
1025
self.last_approval_request = datetime.datetime.utcnow()
1040
1026
1041
1027
def start_checker(self):
1042
1028
"""Start a new checker subprocess if one is not running.
1043
1029
1044
1030
If a checker already exists, leave it running and do
1045
1031
nothing."""
1046
1032
# The reason for not killing a running checker is that if we
1051
1037
# checkers alone, the checker would have to take more time
1052
1038
# than 'timeout' for the client to be disabled, which is as it
1053
1039
# should be.
1054
1040
1055
1041
if self.checker is not None and not self.checker.is_alive():
1056
1042
logger.warning("Checker was not alive; joining")
1057
1043
self.checker.join()
1061
1047
# Escape attributes for the shell
1062
1048
escaped_attrs = {
1063
1049
attr: re.escape(str(getattr(self, attr)))
1064
for attr in self.runtime_expansions}
1050
for attr in self.runtime_expansions }
1065
1051
try:
1066
1052
command = self.checker_command % escaped_attrs
1067
1053
except TypeError as error:
1079
1065
# The exception is when not debugging but nevertheless
1080
1066
# running in the foreground; use the previously
1081
1067
# created wnull.
1082
popen_args = {"close_fds": True,
1083
"shell": True,
1084
"cwd": "/"}
1068
popen_args = { "close_fds": True,
1069
"shell": True,
1070
"cwd": "/" }
1085
1071
if (not self.server_settings["debug"]
1086
1072
and self.server_settings["foreground"]):
1087
1073
popen_args.update({"stdout": wnull,
1088
"stderr": wnull})
1089
pipe = multiprocessing.Pipe(duplex=False)
1074
"stderr": wnull })
1075
pipe = multiprocessing.Pipe(duplex = False)
1090
1076
self.checker = multiprocessing.Process(
1091
target=call_pipe,
1092
args=(pipe[1], subprocess.call, command),
1093
kwargs=popen_args)
1077
target = call_pipe,
1078
args = (pipe[1], subprocess.call, command),
1079
kwargs = popen_args)
1094
1080
self.checker.start()
1095
1081
self.checker_callback_tag = GLib.io_add_watch(
1096
1082
pipe[0].fileno(), GLib.IO_IN,
1097
1083
self.checker_callback, pipe[0], command)
1098
1084
# Re-run this periodically if run by GLib.timeout_add
1099
1085
return True
1100
1086
1101
1087
def stop_checker(self):
1102
1088
"""Force the checker process, if any, to stop."""
1103
1089
if self.checker_callback_tag:
1116
1102
byte_arrays=False):
1117
1103
"""Decorators for marking methods of a DBusObjectWithProperties to
1118
1104
become properties on the D-Bus.
1119
1105
1120
1106
The decorated method will be called with no arguments by "Get"
1121
1107
and with one argument by "Set".
1122
1108
1123
1109
The parameters, where they are supported, are the same as
1124
1110
dbus.service.method, except there is only "signature", since the
1125
1111
type from Get() and the type sent to Set() is the same.
1129
1115
if byte_arrays and signature != "ay":
1130
1116
raise ValueError("Byte arrays not supported for non-'ay'"
1131
1117
" signature {!r}".format(signature))
1132
1118
1133
1119
def decorator(func):
1134
1120
func._dbus_is_property = True
1135
1121
func._dbus_interface = dbus_interface
1138
1124
func._dbus_name = func.__name__
1139
1125
if func._dbus_name.endswith("_dbus_property"):
1140
1126
func._dbus_name = func._dbus_name[:-14]
1141
func._dbus_get_args_options = {'byte_arrays': byte_arrays}
1127
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
1142
1128
return func
1143
1129
1144
1130
return decorator
1145
1131
1146
1132
1147
1133
def dbus_interface_annotations(dbus_interface):
1148
1134
"""Decorator for marking functions returning interface annotations
1149
1135
1150
1136
Usage:
1151
1137
1152
1138
@dbus_interface_annotations("org.example.Interface")
1153
1139
def _foo(self): # Function name does not matter
1154
1140
return {"org.freedesktop.DBus.Deprecated": "true",
1155
1141
"org.freedesktop.DBus.Property.EmitsChangedSignal":
1156
1142
"false"}
1157
1143
"""
1158
1144
1159
1145
def decorator(func):
1160
1146
func._dbus_is_interface = True
1161
1147
func._dbus_interface = dbus_interface
1162
1148
func._dbus_name = dbus_interface
1163
1149
return func
1164
1150
1165
1151
return decorator
1166
1152
1167
1153
1168
1154
def dbus_annotations(annotations):
1169
1155
"""Decorator to annotate D-Bus methods, signals or properties
1170
1156
Usage:
1171
1157
1172
1158
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
1173
1159
"org.freedesktop.DBus.Property."
1174
1160
"EmitsChangedSignal": "false"})
1176
1162
access="r")
1177
1163
def Property_dbus_property(self):
1178
1164
return dbus.Boolean(False)
1179
1165
1180
1166
See also the DBusObjectWithAnnotations class.
1181
1167
"""
1182
1168
1183
1169
def decorator(func):
1184
1170
func._dbus_annotations = annotations
1185
1171
return func
1186
1172
1187
1173
return decorator
1188
1174
1189
1175
1207
1193
1208
1194
class DBusObjectWithAnnotations(dbus.service.Object):
1209
1195
"""A D-Bus object with annotations.
1210
1196
1211
1197
Classes inheriting from this can use the dbus_annotations
1212
1198
decorator to add annotations to methods or signals.
1213
1199
"""
1214
1200
1215
1201
@staticmethod
1216
1202
def _is_dbus_thing(thing):
1217
1203
"""Returns a function testing if an attribute is a D-Bus thing
1218
1204
1219
1205
If called like _is_dbus_thing("method") it returns a function
1220
1206
suitable for use as predicate to inspect.getmembers().
1221
1207
"""
1222
1208
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1223
1209
False)
1224
1210
1225
1211
def _get_all_dbus_things(self, thing):
1226
1212
"""Returns a generator of (name, attribute) pairs
1227
1213
"""
1230
1216
for cls in self.__class__.__mro__
1231
1217
for name, athing in
1232
1218
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1233
1219
1234
1220
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1235
out_signature="s",
1236
path_keyword='object_path',
1237
connection_keyword='connection')
1221
out_signature = "s",
1222
path_keyword = 'object_path',
1223
connection_keyword = 'connection')
1238
1224
def Introspect(self, object_path, connection):
1239
1225
"""Overloading of standard D-Bus method.
1240
1226
1241
1227
Inserts annotation tags on methods and signals.
1242
1228
"""
1243
1229
xmlstring = dbus.service.Object.Introspect(self, object_path,
1244
1230
connection)
1245
1231
try:
1246
1232
document = xml.dom.minidom.parseString(xmlstring)
1247
1233
1248
1234
for if_tag in document.getElementsByTagName("interface"):
1249
1235
# Add annotation tags
1250
1236
for typ in ("method", "signal"):
1277
1263
if_tag.appendChild(ann_tag)
1278
1264
# Fix argument name for the Introspect method itself
1279
1265
if (if_tag.getAttribute("name")
1280
== dbus.INTROSPECTABLE_IFACE):
1266
== dbus.INTROSPECTABLE_IFACE):
1281
1267
for cn in if_tag.getElementsByTagName("method"):
1282
1268
if cn.getAttribute("name") == "Introspect":
1283
1269
for arg in cn.getElementsByTagName("arg"):
1296
1282
1297
1283
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1298
1284
"""A D-Bus object with properties.
1299
1285
1300
1286
Classes inheriting from this can use the dbus_service_property
1301
1287
decorator to expose methods as D-Bus properties. It exposes the
1302
1288
standard Get(), Set(), and GetAll() methods on the D-Bus.
1303
1289
"""
1304
1290
1305
1291
def _get_dbus_property(self, interface_name, property_name):
1306
1292
"""Returns a bound method if one exists which is a D-Bus
1307
1293
property with the specified name and interface.
1312
1298
if (value._dbus_name == property_name
1313
1299
and value._dbus_interface == interface_name):
1314
1300
return value.__get__(self)
1315
1301
1316
1302
# No such property
1317
1303
raise DBusPropertyNotFound("{}:{}.{}".format(
1318
1304
self.dbus_object_path, interface_name, property_name))
1319
1305
1320
1306
@classmethod
1321
1307
def _get_all_interface_names(cls):
1322
1308
"""Get a sequence of all interfaces supported by an object"""
1325
1311
for x in (inspect.getmro(cls))
1326
1312
for attr in dir(x))
1327
1313
if name is not None)
1328
1314
1329
1315
@dbus.service.method(dbus.PROPERTIES_IFACE,
1330
1316
in_signature="ss",
1331
1317
out_signature="v")
1339
1325
if not hasattr(value, "variant_level"):
1340
1326
return value
1341
1327
return type(value)(value, variant_level=value.variant_level+1)
1342
1328
1343
1329
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
1344
1330
def Set(self, interface_name, property_name, value):
1345
1331
"""Standard D-Bus property Set() method, see D-Bus standard.
1357
1343
value = dbus.ByteArray(b''.join(chr(byte)
1358
1344
for byte in value))
1359
1345
prop(value)
1360
1346
1361
1347
@dbus.service.method(dbus.PROPERTIES_IFACE,
1362
1348
in_signature="s",
1363
1349
out_signature="a{sv}")
1364
1350
def GetAll(self, interface_name):
1365
1351
"""Standard D-Bus property GetAll() method, see D-Bus
1366
1352
standard.
1367
1353
1368
1354
Note: Will not include properties with access="write".
1369
1355
"""
1370
1356
properties = {}
1381
1367
properties[name] = value
1382
1368
continue
1383
1369
properties[name] = type(value)(
1384
value, variant_level=value.variant_level + 1)
1370
value, variant_level = value.variant_level + 1)
1385
1371
return dbus.Dictionary(properties, signature="sv")
1386
1372
1387
1373
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1388
1374
def PropertiesChanged(self, interface_name, changed_properties,
1389
1375
invalidated_properties):
1391
1377
standard.
1392
1378
"""
1393
1379
pass
1394
1380
1395
1381
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1396
1382
out_signature="s",
1397
1383
path_keyword='object_path',
1398
1384
connection_keyword='connection')
1399
1385
def Introspect(self, object_path, connection):
1400
1386
"""Overloading of standard D-Bus method.
1401
1387
1402
1388
Inserts property tags and interface annotation tags.
1403
1389
"""
1404
1390
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1406
1392
connection)
1407
1393
try:
1408
1394
document = xml.dom.minidom.parseString(xmlstring)
1409
1395
1410
1396
def make_tag(document, name, prop):
1411
1397
e = document.createElement("property")
1412
1398
e.setAttribute("name", name)
1413
1399
e.setAttribute("type", prop._dbus_signature)
1414
1400
e.setAttribute("access", prop._dbus_access)
1415
1401
return e
1416
1402
1417
1403
for if_tag in document.getElementsByTagName("interface"):
1418
1404
# Add property tags
1419
1405
for tag in (make_tag(document, name, prop)
1461
1447
exc_info=error)
1462
1448
return xmlstring
1463
1449
1464
1465
1450
try:
1466
1451
dbus.OBJECT_MANAGER_IFACE
1467
1452
except AttributeError:
1468
1453
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1469
1454
1470
1471
1455
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1472
1456
"""A D-Bus object with an ObjectManager.
1473
1457
1474
1458
Classes inheriting from this exposes the standard
1475
1459
GetManagedObjects call and the InterfacesAdded and
1476
1460
InterfacesRemoved signals on the standard
1477
1461
"org.freedesktop.DBus.ObjectManager" interface.
1478
1462
1479
1463
Note: No signals are sent automatically; they must be sent
1480
1464
manually.
1481
1465
"""
1482
1466
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1483
out_signature="a{oa{sa{sv}}}")
1467
out_signature = "a{oa{sa{sv}}}")
1484
1468
def GetManagedObjects(self):
1485
1469
"""This function must be overridden"""
1486
1470
raise NotImplementedError()
1487
1471
1488
1472
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1489
signature="oa{sa{sv}}")
1473
signature = "oa{sa{sv}}")
1490
1474
def InterfacesAdded(self, object_path, interfaces_and_properties):
1491
1475
pass
1492
1493
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1476
1477
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1494
1478
def InterfacesRemoved(self, object_path, interfaces):
1495
1479
pass
1496
1480
1497
1481
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1498
out_signature="s",
1499
path_keyword='object_path',
1500
connection_keyword='connection')
1482
out_signature = "s",
1483
path_keyword = 'object_path',
1484
connection_keyword = 'connection')
1501
1485
def Introspect(self, object_path, connection):
1502
1486
"""Overloading of standard D-Bus method.
1503
1487
1504
1488
Override return argument name of GetManagedObjects to be
1505
1489
"objpath_interfaces_and_properties"
1506
1490
"""
1509
1493
connection)
1510
1494
try:
1511
1495
document = xml.dom.minidom.parseString(xmlstring)
1512
1496
1513
1497
for if_tag in document.getElementsByTagName("interface"):
1514
1498
# Fix argument name for the GetManagedObjects method
1515
1499
if (if_tag.getAttribute("name")
1516
== dbus.OBJECT_MANAGER_IFACE):
1500
== dbus.OBJECT_MANAGER_IFACE):
1517
1501
for cn in if_tag.getElementsByTagName("method"):
1518
1502
if (cn.getAttribute("name")
1519
1503
== "GetManagedObjects"):
1529
1513
except (AttributeError, xml.dom.DOMException,
1530
1514
xml.parsers.expat.ExpatError) as error:
1531
1515
logger.error("Failed to override Introspection method",
1532
exc_info=error)
1516
exc_info = error)
1533
1517
return xmlstring
1534
1518
1535
1536
1519
def datetime_to_dbus(dt, variant_level=0):
1537
1520
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1538
1521
if dt is None:
1539
return dbus.String("", variant_level=variant_level)
1522
return dbus.String("", variant_level = variant_level)
1540
1523
return dbus.String(dt.isoformat(), variant_level=variant_level)
1541
1524
1542
1525
1545
1528
dbus.service.Object, it will add alternate D-Bus attributes with
1546
1529
interface names according to the "alt_interface_names" mapping.
1547
1530
Usage:
1548
1531
1549
1532
@alternate_dbus_interfaces({"org.example.Interface":
1550
1533
"net.example.AlternateInterface"})
1551
1534
class SampleDBusObject(dbus.service.Object):
1552
1535
@dbus.service.method("org.example.Interface")
1553
1536
def SampleDBusMethod():
1554
1537
pass
1555
1538
1556
1539
The above "SampleDBusMethod" on "SampleDBusObject" will be
1557
1540
reachable via two interfaces: "org.example.Interface" and
1558
1541
"net.example.AlternateInterface", the latter of which will have
1559
1542
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1560
1543
"true", unless "deprecate" is passed with a False value.
1561
1544
1562
1545
This works for methods and signals, and also for D-Bus properties
1563
1546
(from DBusObjectWithProperties) and interfaces (from the
1564
1547
dbus_interface_annotations decorator).
1565
1548
"""
1566
1549
1567
1550
def wrapper(cls):
1568
1551
for orig_interface_name, alt_interface_name in (
1569
1552
alt_interface_names.items()):
1609
1592
attribute._dbus_annotations)
1610
1593
except AttributeError:
1611
1594
pass
1612
1613
1595
# Define a creator of a function to call both the
1614
1596
# original and alternate functions, so both the
1615
1597
# original and alternate signals gets sent when
1618
1600
"""This function is a scope container to pass
1619
1601
func1 and func2 to the "call_both" function
1620
1602
outside of its arguments"""
1621
1603
1622
1604
@functools.wraps(func2)
1623
1605
def call_both(*args, **kwargs):
1624
1606
"""This function will emit two D-Bus
1625
1607
signals by calling func1 and func2"""
1626
1608
func1(*args, **kwargs)
1627
1609
func2(*args, **kwargs)
1628
# Make wrapper function look like a D-Bus
1629
# signal
1610
# Make wrapper function look like a D-Bus signal
1630
1611
for name, attr in inspect.getmembers(func2):
1631
1612
if name.startswith("_dbus_"):
1632
1613
setattr(call_both, name, attr)
1633
1614
1634
1615
return call_both
1635
1616
# Create the "call_both" function and add it to
1636
1617
# the class
1682
1663
(copy_function(attribute)))
1683
1664
if deprecate:
1684
1665
# Deprecate all alternate interfaces
1685
iname = "_AlternateDBusNames_interface_annotation{}"
1666
iname="_AlternateDBusNames_interface_annotation{}"
1686
1667
for interface_name in interface_names:
1687
1668
1688
1669
@dbus_interface_annotations(interface_name)
1689
1670
def func(self):
1690
return {"org.freedesktop.DBus.Deprecated":
1691
"true"}
1671
return { "org.freedesktop.DBus.Deprecated":
1672
"true" }
1692
1673
# Find an unused name
1693
1674
for aname in (iname.format(i)
1694
1675
for i in itertools.count()):
1705
1686
cls = type("{}Alternate".format(cls.__name__),
1706
1687
(cls, ), attr)
1707
1688
return cls
1708
1689
1709
1690
return wrapper
1710
1691
1711
1692
1713
1694
"se.bsnet.fukt.Mandos"})
1714
1695
class ClientDBus(Client, DBusObjectWithProperties):
1715
1696
"""A Client class using D-Bus
1716
1697
1717
1698
Attributes:
1718
1699
dbus_object_path: dbus.ObjectPath
1719
1700
bus: dbus.SystemBus()
1720
1701
"""
1721
1702
1722
1703
runtime_expansions = (Client.runtime_expansions
1723
1704
+ ("dbus_object_path", ))
1724
1705
1725
1706
_interface = "se.recompile.Mandos.Client"
1726
1707
1727
1708
# dbus.service.Object doesn't use super(), so we can't either.
1728
1729
def __init__(self, bus=None, *args, **kwargs):
1709
1710
def __init__(self, bus = None, *args, **kwargs):
1730
1711
self.bus = bus
1731
1712
Client.__init__(self, *args, **kwargs)
1732
1713
# Only now, when this client is initialized, can it show up on
1738
1719
"/clients/" + client_object_name)
1739
1720
DBusObjectWithProperties.__init__(self, self.bus,
1740
1721
self.dbus_object_path)
1741
1722
1742
1723
def notifychangeproperty(transform_func, dbus_name,
1743
1724
type_func=lambda x: x,
1744
1725
variant_level=1,
1746
1727
_interface=_interface):
1747
1728
""" Modify a variable so that it's a property which announces
1748
1729
its changes to DBus.
1749
1730
1750
1731
transform_fun: Function that takes a value and a variant_level
1751
1732
and transforms it to a D-Bus type.
1752
1733
dbus_name: D-Bus name of the variable
1755
1736
variant_level: D-Bus variant level. Default: 1
1756
1737
"""
1757
1738
attrname = "_{}".format(dbus_name)
1758
1739
1759
1740
def setter(self, value):
1760
1741
if hasattr(self, "dbus_object_path"):
1761
1742
if (not hasattr(self, attrname) or
1768
1749
else:
1769
1750
dbus_value = transform_func(
1770
1751
type_func(value),
1771
variant_level=variant_level)
1752
variant_level = variant_level)
1772
1753
self.PropertyChanged(dbus.String(dbus_name),
1773
1754
dbus_value)
1774
1755
self.PropertiesChanged(
1775
1756
_interface,
1776
dbus.Dictionary({dbus.String(dbus_name):
1777
dbus_value}),
1757
dbus.Dictionary({ dbus.String(dbus_name):
1758
dbus_value }),
1778
1759
dbus.Array())
1779
1760
setattr(self, attrname, value)
1780
1761
1781
1762
return property(lambda self: getattr(self, attrname), setter)
1782
1763
1783
1764
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1784
1765
approvals_pending = notifychangeproperty(dbus.Boolean,
1785
1766
"ApprovalPending",
1786
type_func=bool)
1767
type_func = bool)
1787
1768
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1788
1769
last_enabled = notifychangeproperty(datetime_to_dbus,
1789
1770
"LastEnabled")
1790
1771
checker = notifychangeproperty(
1791
1772
dbus.Boolean, "CheckerRunning",
1792
type_func=lambda checker: checker is not None)
1773
type_func = lambda checker: checker is not None)
1793
1774
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1794
1775
"LastCheckedOK")
1795
1776
last_checker_status = notifychangeproperty(dbus.Int16,
1800
1781
"ApprovedByDefault")
1801
1782
approval_delay = notifychangeproperty(
1802
1783
dbus.UInt64, "ApprovalDelay",
1803
type_func=lambda td: td.total_seconds() * 1000)
1784
type_func = lambda td: td.total_seconds() * 1000)
1804
1785
approval_duration = notifychangeproperty(
1805
1786
dbus.UInt64, "ApprovalDuration",
1806
type_func=lambda td: td.total_seconds() * 1000)
1787
type_func = lambda td: td.total_seconds() * 1000)
1807
1788
host = notifychangeproperty(dbus.String, "Host")
1808
1789
timeout = notifychangeproperty(
1809
1790
dbus.UInt64, "Timeout",
1810
type_func=lambda td: td.total_seconds() * 1000)
1791
type_func = lambda td: td.total_seconds() * 1000)
1811
1792
extended_timeout = notifychangeproperty(
1812
1793
dbus.UInt64, "ExtendedTimeout",
1813
type_func=lambda td: td.total_seconds() * 1000)
1794
type_func = lambda td: td.total_seconds() * 1000)
1814
1795
interval = notifychangeproperty(
1815
1796
dbus.UInt64, "Interval",
1816
type_func=lambda td: td.total_seconds() * 1000)
1797
type_func = lambda td: td.total_seconds() * 1000)
1817
1798
checker_command = notifychangeproperty(dbus.String, "Checker")
1818
1799
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1819
1800
invalidate_only=True)
1820
1801
1821
1802
del notifychangeproperty
1822
1803
1823
1804
def __del__(self, *args, **kwargs):
1824
1805
try:
1825
1806
self.remove_from_connection()
1828
1809
if hasattr(DBusObjectWithProperties, "__del__"):
1829
1810
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1830
1811
Client.__del__(self, *args, **kwargs)
1831
1812
1832
1813
def checker_callback(self, source, condition,
1833
1814
connection, command, *args, **kwargs):
1834
1815
ret = Client.checker_callback(self, source, condition,
1850
1831
| self.last_checker_signal),
1851
1832
dbus.String(command))
1852
1833
return ret
1853
1834
1854
1835
def start_checker(self, *args, **kwargs):
1855
1836
old_checker_pid = getattr(self.checker, "pid", None)
1856
1837
r = Client.start_checker(self, *args, **kwargs)
1860
1841
# Emit D-Bus signal
1861
1842
self.CheckerStarted(self.current_checker_command)
1862
1843
return r
1863
1844
1864
1845
def _reset_approved(self):
1865
1846
self.approved = None
1866
1847
return False
1867
1848
1868
1849
def approve(self, value=True):
1869
1850
self.approved = value
1870
1851
GLib.timeout_add(int(self.approval_duration.total_seconds()
1871
1852
* 1000), self._reset_approved)
1872
1853
self.send_changedstate()
1873
1874
# D-Bus methods, signals & properties
1875
1876
# Interfaces
1877
1878
# Signals
1879
1854
1855
## D-Bus methods, signals & properties
1856
1857
## Interfaces
1858
1859
## Signals
1860
1880
1861
# CheckerCompleted - signal
1881
1862
@dbus.service.signal(_interface, signature="nxs")
1882
1863
def CheckerCompleted(self, exitcode, waitstatus, command):
1883
1864
"D-Bus signal"
1884
1865
pass
1885
1866
1886
1867
# CheckerStarted - signal
1887
1868
@dbus.service.signal(_interface, signature="s")
1888
1869
def CheckerStarted(self, command):
1889
1870
"D-Bus signal"
1890
1871
pass
1891
1872
1892
1873
# PropertyChanged - signal
1893
1874
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1894
1875
@dbus.service.signal(_interface, signature="sv")
1895
1876
def PropertyChanged(self, property, value):
1896
1877
"D-Bus signal"
1897
1878
pass
1898
1879
1899
1880
# GotSecret - signal
1900
1881
@dbus.service.signal(_interface)
1901
1882
def GotSecret(self):
1904
1885
server to mandos-client
1905
1886
"""
1906
1887
pass
1907
1888
1908
1889
# Rejected - signal
1909
1890
@dbus.service.signal(_interface, signature="s")
1910
1891
def Rejected(self, reason):
1911
1892
"D-Bus signal"
1912
1893
pass
1913
1894
1914
1895
# NeedApproval - signal
1915
1896
@dbus.service.signal(_interface, signature="tb")
1916
1897
def NeedApproval(self, timeout, default):
1917
1898
"D-Bus signal"
1918
1899
return self.need_approval()
1919
1920
# Methods
1921
1900
1901
## Methods
1902
1922
1903
# Approve - method
1923
1904
@dbus.service.method(_interface, in_signature="b")
1924
1905
def Approve(self, value):
1925
1906
self.approve(value)
1926
1907
1927
1908
# CheckedOK - method
1928
1909
@dbus.service.method(_interface)
1929
1910
def CheckedOK(self):
1930
1911
self.checked_ok()
1931
1912
1932
1913
# Enable - method
1933
1914
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1934
1915
@dbus.service.method(_interface)
1935
1916
def Enable(self):
1936
1917
"D-Bus method"
1937
1918
self.enable()
1938
1919
1939
1920
# StartChecker - method
1940
1921
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1941
1922
@dbus.service.method(_interface)
1942
1923
def StartChecker(self):
1943
1924
"D-Bus method"
1944
1925
self.start_checker()
1945
1926
1946
1927
# Disable - method
1947
1928
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1948
1929
@dbus.service.method(_interface)
1949
1930
def Disable(self):
1950
1931
"D-Bus method"
1951
1932
self.disable()
1952
1933
1953
1934
# StopChecker - method
1954
1935
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1955
1936
@dbus.service.method(_interface)
1956
1937
def StopChecker(self):
1957
1938
self.stop_checker()
1958
1959
# Properties
1960
1939
1940
## Properties
1941
1961
1942
# ApprovalPending - property
1962
1943
@dbus_service_property(_interface, signature="b", access="read")
1963
1944
def ApprovalPending_dbus_property(self):
1964
1945
return dbus.Boolean(bool(self.approvals_pending))
1965
1946
1966
1947
# ApprovedByDefault - property
1967
1948
@dbus_service_property(_interface,
1968
1949
signature="b",
1971
1952
if value is None: # get
1972
1953
return dbus.Boolean(self.approved_by_default)
1973
1954
self.approved_by_default = bool(value)
1974
1955
1975
1956
# ApprovalDelay - property
1976
1957
@dbus_service_property(_interface,
1977
1958
signature="t",
1981
1962
return dbus.UInt64(self.approval_delay.total_seconds()
1982
1963
* 1000)
1983
1964
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1984
1965
1985
1966
# ApprovalDuration - property
1986
1967
@dbus_service_property(_interface,
1987
1968
signature="t",
1991
1972
return dbus.UInt64(self.approval_duration.total_seconds()
1992
1973
* 1000)
1993
1974
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1994
1975
1995
1976
# Name - property
1996
1977
@dbus_annotations(
1997
1978
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1998
1979
@dbus_service_property(_interface, signature="s", access="read")
1999
1980
def Name_dbus_property(self):
2000
1981
return dbus.String(self.name)
2001
1982
2002
1983
# Fingerprint - property
2003
1984
@dbus_annotations(
2004
1985
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2005
1986
@dbus_service_property(_interface, signature="s", access="read")
2006
1987
def Fingerprint_dbus_property(self):
2007
1988
return dbus.String(self.fingerprint)
2008
1989
2009
1990
# Host - property
2010
1991
@dbus_service_property(_interface,
2011
1992
signature="s",
2014
1995
if value is None: # get
2015
1996
return dbus.String(self.host)
2016
1997
self.host = str(value)
2017
1998
2018
1999
# Created - property
2019
2000
@dbus_annotations(
2020
2001
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2021
2002
@dbus_service_property(_interface, signature="s", access="read")
2022
2003
def Created_dbus_property(self):
2023
2004
return datetime_to_dbus(self.created)
2024
2005
2025
2006
# LastEnabled - property
2026
2007
@dbus_service_property(_interface, signature="s", access="read")
2027
2008
def LastEnabled_dbus_property(self):
2028
2009
return datetime_to_dbus(self.last_enabled)
2029
2010
2030
2011
# Enabled - property
2031
2012
@dbus_service_property(_interface,
2032
2013
signature="b",
2038
2019
self.enable()
2039
2020
else:
2040
2021
self.disable()
2041
2022
2042
2023
# LastCheckedOK - property
2043
2024
@dbus_service_property(_interface,
2044
2025
signature="s",
2048
2029
self.checked_ok()
2049
2030
return
2050
2031
return datetime_to_dbus(self.last_checked_ok)
2051
2032
2052
2033
# LastCheckerStatus - property
2053
2034
@dbus_service_property(_interface, signature="n", access="read")
2054
2035
def LastCheckerStatus_dbus_property(self):
2055
2036
return dbus.Int16(self.last_checker_status)
2056
2037
2057
2038
# Expires - property
2058
2039
@dbus_service_property(_interface, signature="s", access="read")
2059
2040
def Expires_dbus_property(self):
2060
2041
return datetime_to_dbus(self.expires)
2061
2042
2062
2043
# LastApprovalRequest - property
2063
2044
@dbus_service_property(_interface, signature="s", access="read")
2064
2045
def LastApprovalRequest_dbus_property(self):
2065
2046
return datetime_to_dbus(self.last_approval_request)
2066
2047
2067
2048
# Timeout - property
2068
2049
@dbus_service_property(_interface,
2069
2050
signature="t",
2088
2069
self.disable_initiator_tag = GLib.timeout_add(
2089
2070
int((self.expires - now).total_seconds() * 1000),
2090
2071
self.disable)
2091
2072
2092
2073
# ExtendedTimeout - property
2093
2074
@dbus_service_property(_interface,
2094
2075
signature="t",
2098
2079
return dbus.UInt64(self.extended_timeout.total_seconds()
2099
2080
* 1000)
2100
2081
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2101
2082
2102
2083
# Interval - property
2103
2084
@dbus_service_property(_interface,
2104
2085
signature="t",
2114
2095
GLib.source_remove(self.checker_initiator_tag)
2115
2096
self.checker_initiator_tag = GLib.timeout_add(
2116
2097
value, self.start_checker)
2117
self.start_checker() # Start one now, too
2118
2098
self.start_checker() # Start one now, too
2099
2119
2100
# Checker - property
2120
2101
@dbus_service_property(_interface,
2121
2102
signature="s",
2124
2105
if value is None: # get
2125
2106
return dbus.String(self.checker_command)
2126
2107
self.checker_command = str(value)
2127
2108
2128
2109
# CheckerRunning - property
2129
2110
@dbus_service_property(_interface,
2130
2111
signature="b",
2136
2117
self.start_checker()
2137
2118
else:
2138
2119
self.stop_checker()
2139
2120
2140
2121
# ObjectPath - property
2141
2122
@dbus_annotations(
2142
2123
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2143
2124
"org.freedesktop.DBus.Deprecated": "true"})
2144
2125
@dbus_service_property(_interface, signature="o", access="read")
2145
2126
def ObjectPath_dbus_property(self):
2146
return self.dbus_object_path # is already a dbus.ObjectPath
2147
2127
return self.dbus_object_path # is already a dbus.ObjectPath
2128
2148
2129
# Secret = property
2149
2130
@dbus_annotations(
2150
2131
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2155
2136
byte_arrays=True)
2156
2137
def Secret_dbus_property(self, value):
2157
2138
self.secret = bytes(value)
2158
2139
2159
2140
del _interface
2160
2141
2161
2142
2165
2146
self._pipe.send(('init', fpr, address))
2166
2147
if not self._pipe.recv():
2167
2148
raise KeyError(fpr)
2168
2149
2169
2150
def __getattribute__(self, name):
2170
2151
if name == '_pipe':
2171
2152
return super(ProxyClient, self).__getattribute__(name)
2174
2155
if data[0] == 'data':
2175
2156
return data[1]
2176
2157
if data[0] == 'function':
2177
2158
2178
2159
def func(*args, **kwargs):
2179
2160
self._pipe.send(('funcall', name, args, kwargs))
2180
2161
return self._pipe.recv()[1]
2181
2162
2182
2163
return func
2183
2164
2184
2165
def __setattr__(self, name, value):
2185
2166
if name == '_pipe':
2186
2167
return super(ProxyClient, self).__setattr__(name, value)
2189
2170
2190
2171
class ClientHandler(socketserver.BaseRequestHandler, object):
2191
2172
"""A class to handle client connections.
2192
2173
2193
2174
Instantiated once for each connection to handle it.
2194
2175
Note: This will run in its own forked process."""
2195
2176
2196
2177
def handle(self):
2197
2178
with contextlib.closing(self.server.child_pipe) as child_pipe:
2198
2179
logger.info("TCP connection from: %s",
2199
2180
str(self.client_address))
2200
2181
logger.debug("Pipe FD: %d",
2201
2182
self.server.child_pipe.fileno())
2202
2183
2203
2184
session = gnutls.ClientSession(self.request)
2204
2205
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2206
# "+AES-256-CBC", "+SHA1",
2207
# "+COMP-NULL", "+CTYPE-OPENPGP",
2208
# "+DHE-DSS"))
2185
2186
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
2187
# "+AES-256-CBC", "+SHA1",
2188
# "+COMP-NULL", "+CTYPE-OPENPGP",
2189
# "+DHE-DSS"))
2209
2190
# Use a fallback default, since this MUST be set.
2210
2191
priority = self.server.gnutls_priority
2211
2192
if priority is None:
2213
2194
gnutls.priority_set_direct(session._c_object,
2214
2195
priority.encode("utf-8"),
2215
2196
None)
2216
2197
2217
2198
# Start communication using the Mandos protocol
2218
2199
# Get protocol number
2219
2200
line = self.request.makefile().readline()
2224
2205
except (ValueError, IndexError, RuntimeError) as error:
2225
2206
logger.error("Unknown protocol version: %s", error)
2226
2207
return
2227
2208
2228
2209
# Start GnuTLS connection
2229
2210
try:
2230
2211
session.handshake()
2234
2215
# established. Just abandon the request.
2235
2216
return
2236
2217
logger.debug("Handshake succeeded")
2237
2218
2238
2219
approval_required = False
2239
2220
try:
2240
2221
try:
2244
2225
logger.warning("Bad certificate: %s", error)
2245
2226
return
2246
2227
logger.debug("Fingerprint: %s", fpr)
2247
2228
2248
2229
try:
2249
2230
client = ProxyClient(child_pipe, fpr,
2250
2231
self.client_address)
2251
2232
except KeyError:
2252
2233
return
2253
2234
2254
2235
if client.approval_delay:
2255
2236
delay = client.approval_delay
2256
2237
client.approvals_pending += 1
2257
2238
approval_required = True
2258
2239
2259
2240
while True:
2260
2241
if not client.enabled:
2261
2242
logger.info("Client %s is disabled",
2264
2245
# Emit D-Bus signal
2265
2246
client.Rejected("Disabled")
2266
2247
return
2267
2248
2268
2249
if client.approved or not client.approval_delay:
2269
# We are approved or approval is disabled
2250
#We are approved or approval is disabled
2270
2251
break
2271
2252
elif client.approved is None:
2272
2253
logger.info("Client %s needs approval",
2283
2264
# Emit D-Bus signal
2284
2265
client.Rejected("Denied")
2285
2266
return
2286
2287
# wait until timeout or approved
2267
2268
#wait until timeout or approved
2288
2269
time = datetime.datetime.now()
2289
2270
client.changedstate.acquire()
2290
2271
client.changedstate.wait(delay.total_seconds())
2303
2284
break
2304
2285
else:
2305
2286
delay -= time2 - time
2306
2287
2307
2288
try:
2308
2289
session.send(client.secret)
2309
2290
except gnutls.Error as error:
2310
2291
logger.warning("gnutls send failed",
2311
exc_info=error)
2292
exc_info = error)
2312
2293
return
2313
2294
2314
2295
logger.info("Sending secret to %s", client.name)
2315
2296
# bump the timeout using extended_timeout
2316
2297
client.bump_timeout(client.extended_timeout)
2317
2298
if self.server.use_dbus:
2318
2299
# Emit D-Bus signal
2319
2300
client.GotSecret()
2320
2301
2321
2302
finally:
2322
2303
if approval_required:
2323
2304
client.approvals_pending -= 1
2326
2307
except gnutls.Error as error:
2327
2308
logger.warning("GnuTLS bye failed",
2328
2309
exc_info=error)
2329
2310
2330
2311
@staticmethod
2331
2312
def peer_certificate(session):
2332
2313
"Return the peer's OpenPGP certificate as a bytestring"
2344
2325
return None
2345
2326
cert = cert_list[0]
2346
2327
return ctypes.string_at(cert.data, cert.size)
2347
2328
2348
2329
@staticmethod
2349
2330
def fingerprint(openpgp):
2350
2331
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2383
2364
2384
2365
class MultiprocessingMixIn(object):
2385
2366
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2386
2367
2387
2368
def sub_process_main(self, request, address):
2388
2369
try:
2389
2370
self.finish_request(request, address)
2390
2371
except Exception:
2391
2372
self.handle_error(request, address)
2392
2373
self.close_request(request)
2393
2374
2394
2375
def process_request(self, request, address):
2395
2376
"""Start a new process to process the request."""
2396
proc = multiprocessing.Process(target=self.sub_process_main,
2397
args=(request, address))
2377
proc = multiprocessing.Process(target = self.sub_process_main,
2378
args = (request, address))
2398
2379
proc.start()
2399
2380
return proc
2400
2381
2401
2382
2402
2383
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2403
2384
""" adds a pipe to the MixIn """
2404
2385
2405
2386
def process_request(self, request, client_address):
2406
2387
"""Overrides and wraps the original process_request().
2407
2388
2408
2389
This function creates a new pipe in self.pipe
2409
2390
"""
2410
2391
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2411
2392
2412
2393
proc = MultiprocessingMixIn.process_request(self, request,
2413
2394
client_address)
2414
2395
self.child_pipe.close()
2415
2396
self.add_pipe(parent_pipe, proc)
2416
2397
2417
2398
def add_pipe(self, parent_pipe, proc):
2418
2399
"""Dummy function; override as necessary"""
2419
2400
raise NotImplementedError()
2422
2403
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2423
2404
socketserver.TCPServer, object):
2424
2405
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2425
2406
2426
2407
Attributes:
2427
2408
enabled: Boolean; whether this server is activated yet
2428
2409
interface: None or a network interface name (string)
2429
2410
use_ipv6: Boolean; to use IPv6 or not
2430
2411
"""
2431
2412
2432
2413
def __init__(self, server_address, RequestHandlerClass,
2433
2414
interface=None,
2434
2415
use_ipv6=True,
2444
2425
self.socketfd = socketfd
2445
2426
# Save the original socket.socket() function
2446
2427
self.socket_socket = socket.socket
2447
2448
2428
# To implement --socket, we monkey patch socket.socket.
2449
#
2429
#
2450
2430
# (When socketserver.TCPServer is a new-style class, we
2451
2431
# could make self.socket into a property instead of monkey
2452
2432
# patching socket.socket.)
2453
#
2433
#
2454
2434
# Create a one-time-only replacement for socket.socket()
2455
2435
@functools.wraps(socket.socket)
2456
2436
def socket_wrapper(*args, **kwargs):
2468
2448
# socket_wrapper(), if socketfd was set.
2469
2449
socketserver.TCPServer.__init__(self, server_address,
2470
2450
RequestHandlerClass)
2471
2451
2472
2452
def server_bind(self):
2473
2453
"""This overrides the normal server_bind() function
2474
2454
to bind to an interface if one was specified, and also NOT to
2501
2481
if self.server_address[0] or self.server_address[1]:
2502
2482
if not self.server_address[0]:
2503
2483
if self.address_family == socket.AF_INET6:
2504
any_address = "::" # in6addr_any
2484
any_address = "::" # in6addr_any
2505
2485
else:
2506
any_address = "0.0.0.0" # INADDR_ANY
2486
any_address = "0.0.0.0" # INADDR_ANY
2507
2487
self.server_address = (any_address,
2508
2488
self.server_address[1])
2509
2489
elif not self.server_address[1]:
2519
2499
2520
2500
class MandosServer(IPv6_TCPServer):
2521
2501
"""Mandos server.
2522
2502
2523
2503
Attributes:
2524
2504
clients: set of Client objects
2525
2505
gnutls_priority GnuTLS priority string
2526
2506
use_dbus: Boolean; to emit D-Bus signals or not
2527
2507
2528
2508
Assumes a GLib.MainLoop event loop.
2529
2509
"""
2530
2510
2531
2511
def __init__(self, server_address, RequestHandlerClass,
2532
2512
interface=None,
2533
2513
use_ipv6=True,
2543
2523
self.gnutls_priority = gnutls_priority
2544
2524
IPv6_TCPServer.__init__(self, server_address,
2545
2525
RequestHandlerClass,
2546
interface=interface,
2547
use_ipv6=use_ipv6,
2548
socketfd=socketfd)
2549
2526
interface = interface,
2527
use_ipv6 = use_ipv6,
2528
socketfd = socketfd)
2529
2550
2530
def server_activate(self):
2551
2531
if self.enabled:
2552
2532
return socketserver.TCPServer.server_activate(self)
2553
2533
2554
2534
def enable(self):
2555
2535
self.enabled = True
2556
2536
2557
2537
def add_pipe(self, parent_pipe, proc):
2558
2538
# Call "handle_ipc" for both data and EOF events
2559
2539
GLib.io_add_watch(
2560
2540
parent_pipe.fileno(),
2561
2541
GLib.IO_IN | GLib.IO_HUP,
2562
2542
functools.partial(self.handle_ipc,
2563
parent_pipe=parent_pipe,
2564
proc=proc))
2565
2543
parent_pipe = parent_pipe,
2544
proc = proc))
2545
2566
2546
def handle_ipc(self, source, condition,
2567
2547
parent_pipe=None,
2568
proc=None,
2548
proc = None,
2569
2549
client_object=None):
2570
2550
# error, or the other end of multiprocessing.Pipe has closed
2571
2551
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2572
2552
# Wait for other process to exit
2573
2553
proc.join()
2574
2554
return False
2575
2555
2576
2556
# Read a request from the child
2577
2557
request = parent_pipe.recv()
2578
2558
command = request[0]
2579
2559
2580
2560
if command == 'init':
2581
fpr = request[1].decode("ascii")
2561
fpr = request[1]
2582
2562
address = request[2]
2583
2563
2584
2564
for c in self.clients.values():
2585
2565
if c.fingerprint == fpr:
2586
2566
client = c
2594
2574
address[0])
2595
2575
parent_pipe.send(False)
2596
2576
return False
2597
2577
2598
2578
GLib.io_add_watch(
2599
2579
parent_pipe.fileno(),
2600
2580
GLib.IO_IN | GLib.IO_HUP,
2601
2581
functools.partial(self.handle_ipc,
2602
parent_pipe=parent_pipe,
2603
proc=proc,
2604
client_object=client))
2582
parent_pipe = parent_pipe,
2583
proc = proc,
2584
client_object = client))
2605
2585
parent_pipe.send(True)
2606
2586
# remove the old hook in favor of the new above hook on
2607
2587
# same fileno
2610
2590
funcname = request[1]
2611
2591
args = request[2]
2612
2592
kwargs = request[3]
2613
2593
2614
2594
parent_pipe.send(('data', getattr(client_object,
2615
2595
funcname)(*args,
2616
2596
**kwargs)))
2617
2597
2618
2598
if command == 'getattr':
2619
2599
attrname = request[1]
2620
2600
if isinstance(client_object.__getattribute__(attrname),
2623
2603
else:
2624
2604
parent_pipe.send((
2625
2605
'data', client_object.__getattribute__(attrname)))
2626
2606
2627
2607
if command == 'setattr':
2628
2608
attrname = request[1]
2629
2609
value = request[2]
2630
2610
setattr(client_object, attrname, value)
2631
2611
2632
2612
return True
2633
2613
2634
2614
2635
2615
def rfc3339_duration_to_delta(duration):
2636
2616
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2637
2617
2638
2618
>>> rfc3339_duration_to_delta("P7D")
2639
2619
datetime.timedelta(7)
2640
2620
>>> rfc3339_duration_to_delta("PT60S")
2650
2630
>>> rfc3339_duration_to_delta("P1DT3M20S")
2651
2631
datetime.timedelta(1, 200)
2652
2632
"""
2653
2633
2654
2634
# Parsing an RFC 3339 duration with regular expressions is not
2655
2635
# possible - there would have to be multiple places for the same
2656
2636
# values, like seconds. The current code, while more esoteric, is
2657
2637
# cleaner without depending on a parsing library. If Python had a
2658
2638
# built-in library for parsing we would use it, but we'd like to
2659
2639
# avoid excessive use of external libraries.
2660
2640
2661
2641
# New type for defining tokens, syntax, and semantics all-in-one
2662
2642
Token = collections.namedtuple("Token", (
2663
2643
"regexp", # To match token; if "value" is not None, must have
2696
2676
frozenset((token_year, token_month,
2697
2677
token_day, token_time,
2698
2678
token_week)))
2699
# Define starting values:
2700
# Value so far
2701
value = datetime.timedelta()
2679
# Define starting values
2680
value = datetime.timedelta() # Value so far
2702
2681
found_token = None
2703
# Following valid tokens
2704
followers = frozenset((token_duration, ))
2705
# String left to parse
2706
s = duration
2682
followers = frozenset((token_duration, )) # Following valid tokens
2683
s = duration # String left to parse
2707
2684
# Loop until end token is found
2708
2685
while found_token is not token_end:
2709
2686
# Search for any currently valid tokens
2733
2710
2734
2711
def string_to_delta(interval):
2735
2712
"""Parse a string and return a datetime.timedelta
2736
2713
2737
2714
>>> string_to_delta('7d')
2738
2715
datetime.timedelta(7)
2739
2716
>>> string_to_delta('60s')
2747
2724
>>> string_to_delta('5m 30s')
2748
2725
datetime.timedelta(0, 330)
2749
2726
"""
2750
2727
2751
2728
try:
2752
2729
return rfc3339_duration_to_delta(interval)
2753
2730
except ValueError:
2754
2731
pass
2755
2732
2756
2733
timevalue = datetime.timedelta(0)
2757
2734
for s in interval.split():
2758
2735
try:
2776
2753
return timevalue
2777
2754
2778
2755
2779
def daemon(nochdir=False, noclose=False):
2756
def daemon(nochdir = False, noclose = False):
2780
2757
"""See daemon(3). Standard BSD Unix function.
2781
2758
2782
2759
This should really exist as os.daemon, but it doesn't (yet)."""
2783
2760
if os.fork():
2784
2761
sys.exit()
2802
2779
2803
2780
2804
2781
def main():
2805
2782
2806
2783
##################################################################
2807
2784
# Parsing of options, both command line and config file
2808
2785
2809
2786
parser = argparse.ArgumentParser()
2810
2787
parser.add_argument("-v", "--version", action="version",
2811
version="%(prog)s {}".format(version),
2788
version = "%(prog)s {}".format(version),
2812
2789
help="show version number and exit")
2813
2790
parser.add_argument("-i", "--interface", metavar="IF",
2814
2791
help="Bind to interface IF")
2850
2827
parser.add_argument("--no-zeroconf", action="store_false",
2851
2828
dest="zeroconf", help="Do not use Zeroconf",
2852
2829
default=None)
2853
2830
2854
2831
options = parser.parse_args()
2855
2832
2856
2833
if options.check:
2857
2834
import doctest
2858
2835
fail_count, test_count = doctest.testmod()
2859
2836
sys.exit(os.EX_OK if fail_count == 0 else 1)
2860
2837
2861
2838
# Default values for config file for server-global settings
2862
server_defaults = {"interface": "",
2863
"address": "",
2864
"port": "",
2865
"debug": "False",
2866
"priority":
2867
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2868
":+SIGN-DSA-SHA256",
2869
"servicename": "Mandos",
2870
"use_dbus": "True",
2871
"use_ipv6": "True",
2872
"debuglevel": "",
2873
"restore": "True",
2874
"socket": "",
2875
"statedir": "/var/lib/mandos",
2876
"foreground": "False",
2877
"zeroconf": "True",
2878
}
2879
2839
server_defaults = { "interface": "",
2840
"address": "",
2841
"port": "",
2842
"debug": "False",
2843
"priority":
2844
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2845
":+SIGN-DSA-SHA256",
2846
"servicename": "Mandos",
2847
"use_dbus": "True",
2848
"use_ipv6": "True",
2849
"debuglevel": "",
2850
"restore": "True",
2851
"socket": "",
2852
"statedir": "/var/lib/mandos",
2853
"foreground": "False",
2854
"zeroconf": "True",
2855
}
2856
2880
2857
# Parse config file for server-global settings
2881
2858
server_config = configparser.SafeConfigParser(server_defaults)
2882
2859
del server_defaults
2884
2861
# Convert the SafeConfigParser object to a dict
2885
2862
server_settings = server_config.defaults()
2886
2863
# Use the appropriate methods on the non-string config options
2887
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2888
"foreground", "zeroconf"):
2864
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2889
2865
server_settings[option] = server_config.getboolean("DEFAULT",
2890
2866
option)
2891
2867
if server_settings["port"]:
2901
2877
server_settings["socket"] = os.dup(server_settings
2902
2878
["socket"])
2903
2879
del server_config
2904
2880
2905
2881
# Override the settings from the config file with command line
2906
2882
# options, if set.
2907
2883
for option in ("interface", "address", "port", "debug",
2925
2901
if server_settings["debug"]:
2926
2902
server_settings["foreground"] = True
2927
2903
# Now we have our good server settings in "server_settings"
2928
2904
2929
2905
##################################################################
2930
2906
2931
2907
if (not server_settings["zeroconf"]
2932
2908
and not (server_settings["port"]
2933
2909
or server_settings["socket"] != "")):
2934
2910
parser.error("Needs port or socket to work without Zeroconf")
2935
2911
2936
2912
# For convenience
2937
2913
debug = server_settings["debug"]
2938
2914
debuglevel = server_settings["debuglevel"]
2942
2918
stored_state_file)
2943
2919
foreground = server_settings["foreground"]
2944
2920
zeroconf = server_settings["zeroconf"]
2945
2921
2946
2922
if debug:
2947
2923
initlogger(debug, logging.DEBUG)
2948
2924
else:
2951
2927
else:
2952
2928
level = getattr(logging, debuglevel.upper())
2953
2929
initlogger(debug, level)
2954
2930
2955
2931
if server_settings["servicename"] != "Mandos":
2956
2932
syslogger.setFormatter(
2957
2933
logging.Formatter('Mandos ({}) [%(process)d]:'
2958
2934
' %(levelname)s: %(message)s'.format(
2959
2935
server_settings["servicename"])))
2960
2936
2961
2937
# Parse config file with clients
2962
2938
client_config = configparser.SafeConfigParser(Client
2963
2939
.client_defaults)
2964
2940
client_config.read(os.path.join(server_settings["configdir"],
2965
2941
"clients.conf"))
2966
2942
2967
2943
global mandos_dbus_service
2968
2944
mandos_dbus_service = None
2969
2945
2970
2946
socketfd = None
2971
2947
if server_settings["socket"] != "":
2972
2948
socketfd = server_settings["socket"]
2988
2964
except IOError as e:
2989
2965
logger.error("Could not open file %r", pidfilename,
2990
2966
exc_info=e)
2991
2967
2992
2968
for name, group in (("_mandos", "_mandos"),
2993
2969
("mandos", "mandos"),
2994
2970
("nobody", "nogroup")):
3012
2988
.format(uid, gid, os.strerror(error.errno)))
3013
2989
if error.errno != errno.EPERM:
3014
2990
raise
3015
2991
3016
2992
if debug:
3017
2993
# Enable all possible GnuTLS debugging
3018
2994
3019
2995
# "Use a log level over 10 to enable all debugging options."
3020
2996
# - GnuTLS manual
3021
2997
gnutls.global_set_log_level(11)
3022
2998
3023
2999
@gnutls.log_func
3024
3000
def debug_gnutls(level, string):
3025
3001
logger.debug("GnuTLS: %s", string[:-1])
3026
3002
3027
3003
gnutls.global_set_log_function(debug_gnutls)
3028
3004
3029
3005
# Redirect stdin so all checkers get /dev/null
3030
3006
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3031
3007
os.dup2(null, sys.stdin.fileno())
3032
3008
if null > 2:
3033
3009
os.close(null)
3034
3010
3035
3011
# Need to fork before connecting to D-Bus
3036
3012
if not foreground:
3037
3013
# Close all input and output, do double fork, etc.
3038
3014
daemon()
3039
3015
3040
3016
# multiprocessing will use threads, so before we use GLib we need
3041
3017
# to inform GLib that threads will be used.
3042
3018
GLib.threads_init()
3043
3019
3044
3020
global main_loop
3045
3021
# From the Avahi example code
3046
3022
DBusGMainLoop(set_as_default=True)
3063
3039
if zeroconf:
3064
3040
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3065
3041
service = AvahiServiceToSyslog(
3066
name=server_settings["servicename"],
3067
servicetype="_mandos._tcp",
3068
protocol=protocol,
3069
bus=bus)
3042
name = server_settings["servicename"],
3043
servicetype = "_mandos._tcp",
3044
protocol = protocol,
3045
bus = bus)
3070
3046
if server_settings["interface"]:
3071
3047
service.interface = if_nametoindex(
3072
3048
server_settings["interface"].encode("utf-8"))
3073
3049
3074
3050
global multiprocessing_manager
3075
3051
multiprocessing_manager = multiprocessing.Manager()
3076
3052
3077
3053
client_class = Client
3078
3054
if use_dbus:
3079
client_class = functools.partial(ClientDBus, bus=bus)
3080
3055
client_class = functools.partial(ClientDBus, bus = bus)
3056
3081
3057
client_settings = Client.config_parser(client_config)
3082
3058
old_client_settings = {}
3083
3059
clients_data = {}
3084
3060
3085
3061
# This is used to redirect stdout and stderr for checker processes
3086
3062
global wnull
3087
wnull = open(os.devnull, "w") # A writable /dev/null
3063
wnull = open(os.devnull, "w") # A writable /dev/null
3088
3064
# Only used if server is running in foreground but not in debug
3089
3065
# mode
3090
3066
if debug or not foreground:
3091
3067
wnull.close()
3092
3068
3093
3069
# Get client data and settings from last running state.
3094
3070
if server_settings["restore"]:
3095
3071
try:
3096
3072
with open(stored_state_path, "rb") as stored_state:
3097
if sys.version_info.major == 2:
3073
if sys.version_info.major == 2:
3098
3074
clients_data, old_client_settings = pickle.load(
3099
3075
stored_state)
3100
3076
else:
3101
3077
bytes_clients_data, bytes_old_client_settings = (
3102
pickle.load(stored_state, encoding="bytes"))
3103
# Fix bytes to strings
3104
# clients_data
3078
pickle.load(stored_state, encoding = "bytes"))
3079
### Fix bytes to strings
3080
## clients_data
3105
3081
# .keys()
3106
clients_data = {(key.decode("utf-8")
3107
if isinstance(key, bytes)
3108
else key): value
3109
for key, value in
3110
bytes_clients_data.items()}
3082
clients_data = { (key.decode("utf-8")
3083
if isinstance(key, bytes)
3084
else key): value
3085
for key, value in
3086
bytes_clients_data.items() }
3111
3087
del bytes_clients_data
3112
3088
for key in clients_data:
3113
value = {(k.decode("utf-8")
3114
if isinstance(k, bytes) else k): v
3115
for k, v in
3116
clients_data[key].items()}
3089
value = { (k.decode("utf-8")
3090
if isinstance(k, bytes) else k): v
3091
for k, v in
3092
clients_data[key].items() }
3117
3093
clients_data[key] = value
3118
3094
# .client_structure
3119
3095
value["client_structure"] = [
3120
3096
(s.decode("utf-8")
3121
3097
if isinstance(s, bytes)
3122
3098
else s) for s in
3123
value["client_structure"]]
3099
value["client_structure"] ]
3124
3100
# .name & .host
3125
3101
for k in ("name", "host"):
3126
3102
if isinstance(value[k], bytes):
3127
3103
value[k] = value[k].decode("utf-8")
3128
# old_client_settings
3104
## old_client_settings
3129
3105
# .keys()
3130
3106
old_client_settings = {
3131
3107
(key.decode("utf-8")
3132
3108
if isinstance(key, bytes)
3133
3109
else key): value
3134
3110
for key, value in
3135
bytes_old_client_settings.items()}
3111
bytes_old_client_settings.items() }
3136
3112
del bytes_old_client_settings
3137
3113
# .host
3138
3114
for value in old_client_settings.values():
3152
3128
logger.warning("Could not load persistent state: "
3153
3129
"EOFError:",
3154
3130
exc_info=e)
3155
3131
3156
3132
with PGPEngine() as pgp:
3157
3133
for client_name, client in clients_data.items():
3158
3134
# Skip removed clients
3159
3135
if client_name not in client_settings:
3160
3136
continue
3161
3137
3162
3138
# Decide which value to use after restoring saved state.
3163
3139
# We have three different values: Old config file,
3164
3140
# new config file, and saved state.
3175
3151
client[name] = value
3176
3152
except KeyError:
3177
3153
pass
3178
3154
3179
3155
# Clients who has passed its expire date can still be
3180
3156
# enabled if its last checker was successful. A Client
3181
3157
# whose checker succeeded before we stored its state is
3214
3190
client_name))
3215
3191
client["secret"] = (client_settings[client_name]
3216
3192
["secret"])
3217
3193
3218
3194
# Add/remove clients based on new changes made to config
3219
3195
for client_name in (set(old_client_settings)
3220
3196
- set(client_settings)):
3222
3198
for client_name in (set(client_settings)
3223
3199
- set(old_client_settings)):
3224
3200
clients_data[client_name] = client_settings[client_name]
3225
3201
3226
3202
# Create all client objects
3227
3203
for client_name, client in clients_data.items():
3228
3204
tcp_server.clients[client_name] = client_class(
3229
name=client_name,
3230
settings=client,
3231
server_settings=server_settings)
3232
3205
name = client_name,
3206
settings = client,
3207
server_settings = server_settings)
3208
3233
3209
if not tcp_server.clients:
3234
3210
logger.warning("No clients defined")
3235
3211
3236
3212
if not foreground:
3237
3213
if pidfile is not None:
3238
3214
pid = os.getpid()
3244
3220
pidfilename, pid)
3245
3221
del pidfile
3246
3222
del pidfilename
3247
3223
3248
3224
for termsig in (signal.SIGHUP, signal.SIGTERM):
3249
3225
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3250
3226
lambda: main_loop.quit() and False)
3251
3227
3252
3228
if use_dbus:
3253
3229
3254
3230
@alternate_dbus_interfaces(
3255
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3231
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3256
3232
class MandosDBusService(DBusObjectWithObjectManager):
3257
3233
"""A D-Bus proxy object"""
3258
3234
3259
3235
def __init__(self):
3260
3236
dbus.service.Object.__init__(self, bus, "/")
3261
3237
3262
3238
_interface = "se.recompile.Mandos"
3263
3239
3264
3240
@dbus.service.signal(_interface, signature="o")
3265
3241
def ClientAdded(self, objpath):
3266
3242
"D-Bus signal"
3267
3243
pass
3268
3244
3269
3245
@dbus.service.signal(_interface, signature="ss")
3270
3246
def ClientNotFound(self, fingerprint, address):
3271
3247
"D-Bus signal"
3272
3248
pass
3273
3249
3274
3250
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3275
3251
"true"})
3276
3252
@dbus.service.signal(_interface, signature="os")
3277
3253
def ClientRemoved(self, objpath, name):
3278
3254
"D-Bus signal"
3279
3255
pass
3280
3256
3281
3257
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3282
3258
"true"})
3283
3259
@dbus.service.method(_interface, out_signature="ao")
3285
3261
"D-Bus method"
3286
3262
return dbus.Array(c.dbus_object_path for c in
3287
3263
tcp_server.clients.values())
3288
3264
3289
3265
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3290
3266
"true"})
3291
3267
@dbus.service.method(_interface,
3293
3269
def GetAllClientsWithProperties(self):
3294
3270
"D-Bus method"
3295
3271
return dbus.Dictionary(
3296
{c.dbus_object_path: c.GetAll(
3272
{ c.dbus_object_path: c.GetAll(
3297
3273
"se.recompile.Mandos.Client")
3298
for c in tcp_server.clients.values()},
3274
for c in tcp_server.clients.values() },
3299
3275
signature="oa{sv}")
3300
3276
3301
3277
@dbus.service.method(_interface, in_signature="o")
3302
3278
def RemoveClient(self, object_path):
3303
3279
"D-Bus method"
3311
3287
self.client_removed_signal(c)
3312
3288
return
3313
3289
raise KeyError(object_path)
3314
3290
3315
3291
del _interface
3316
3292
3317
3293
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3318
out_signature="a{oa{sa{sv}}}")
3294
out_signature = "a{oa{sa{sv}}}")
3319
3295
def GetManagedObjects(self):
3320
3296
"""D-Bus method"""
3321
3297
return dbus.Dictionary(
3322
{client.dbus_object_path:
3323
dbus.Dictionary(
3324
{interface: client.GetAll(interface)
3325
for interface in
3326
client._get_all_interface_names()})
3327
for client in tcp_server.clients.values()})
3328
3298
{ client.dbus_object_path:
3299
dbus.Dictionary(
3300
{ interface: client.GetAll(interface)
3301
for interface in
3302
client._get_all_interface_names()})
3303
for client in tcp_server.clients.values()})
3304
3329
3305
def client_added_signal(self, client):
3330
3306
"""Send the new standard signal and the old signal"""
3331
3307
if use_dbus:
3333
3309
self.InterfacesAdded(
3334
3310
client.dbus_object_path,
3335
3311
dbus.Dictionary(
3336
{interface: client.GetAll(interface)
3337
for interface in
3338
client._get_all_interface_names()}))
3312
{ interface: client.GetAll(interface)
3313
for interface in
3314
client._get_all_interface_names()}))
3339
3315
# Old signal
3340
3316
self.ClientAdded(client.dbus_object_path)
3341
3317
3342
3318
def client_removed_signal(self, client):
3343
3319
"""Send the new standard signal and the old signal"""
3344
3320
if use_dbus:
3349
3325
# Old signal
3350
3326
self.ClientRemoved(client.dbus_object_path,
3351
3327
client.name)
3352
3328
3353
3329
mandos_dbus_service = MandosDBusService()
3354
3330
3355
3331
# Save modules to variables to exempt the modules from being
3356
3332
# unloaded before the function registered with atexit() is run.
3357
3333
mp = multiprocessing
3358
3334
wn = wnull
3359
3360
3335
def cleanup():
3361
3336
"Cleanup function; run on exit"
3362
3337
if zeroconf:
3363
3338
service.cleanup()
3364
3339
3365
3340
mp.active_children()
3366
3341
wn.close()
3367
3342
if not (tcp_server.clients or client_settings):
3368
3343
return
3369
3344
3370
3345
# Store client before exiting. Secrets are encrypted with key
3371
3346
# based on what config file has. If config file is
3372
3347
# removed/edited, old secret will thus be unrecovable.
3377
3352
client.encrypted_secret = pgp.encrypt(client.secret,
3378
3353
key)
3379
3354
client_dict = {}
3380
3355
3381
3356
# A list of attributes that can not be pickled
3382
3357
# + secret.
3383
exclude = {"bus", "changedstate", "secret",
3384
"checker", "server_settings"}
3358
exclude = { "bus", "changedstate", "secret",
3359
"checker", "server_settings" }
3385
3360
for name, typ in inspect.getmembers(dbus.service
3386
3361
.Object):
3387
3362
exclude.add(name)
3388
3363
3389
3364
client_dict["encrypted_secret"] = (client
3390
3365
.encrypted_secret)
3391
3366
for attr in client.client_structure:
3392
3367
if attr not in exclude:
3393
3368
client_dict[attr] = getattr(client, attr)
3394
3369
3395
3370
clients[client.name] = client_dict
3396
3371
del client_settings[client.name]["secret"]
3397
3372
3398
3373
try:
3399
3374
with tempfile.NamedTemporaryFile(
3400
3375
mode='wb',
3403
3378
dir=os.path.dirname(stored_state_path),
3404
3379
delete=False) as stored_state:
3405
3380
pickle.dump((clients, client_settings), stored_state,
3406
protocol=2)
3381
protocol = 2)
3407
3382
tempname = stored_state.name
3408
3383
os.rename(tempname, stored_state_path)
3409
3384
except (IOError, OSError) as e:
3419
3394
logger.warning("Could not save persistent state:",
3420
3395
exc_info=e)
3421
3396
raise
3422
3397
3423
3398
# Delete all clients, and settings from config
3424
3399
while tcp_server.clients:
3425
3400
name, client = tcp_server.clients.popitem()
3431
3406
if use_dbus:
3432
3407
mandos_dbus_service.client_removed_signal(client)
3433
3408
client_settings.clear()
3434
3409
3435
3410
atexit.register(cleanup)
3436
3411
3437
3412
for client in tcp_server.clients.values():
3438
3413
if use_dbus:
3439
3414
# Emit D-Bus signal for adding
3441
3416
# Need to initiate checking of clients
3442
3417
if client.enabled:
3443
3418
client.init_checker()
3444
3419
3445
3420
tcp_server.enable()
3446
3421
tcp_server.server_activate()
3447
3422
3448
3423
# Find out what port we got
3449
3424
if zeroconf:
3450
3425
service.port = tcp_server.socket.getsockname()[1]
3455
3430
else: # IPv4
3456
3431
logger.info("Now listening on address %r, port %d",
3457
3432
*tcp_server.socket.getsockname())
3458
3459
# service.interface = tcp_server.socket.getsockname()[3]
3460
3433
3434
#service.interface = tcp_server.socket.getsockname()[3]
3435
3461
3436
try:
3462
3437
if zeroconf:
3463
3438
# From the Avahi example code
3468
3443
cleanup()
3469
3444
sys.exit(1)
3470
3445
# End of Avahi example code
3471
3446
3472
3447
GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3473
3448
lambda *args, **kwargs:
3474
3449
(tcp_server.handle_request
3475
3450
(*args[2:], **kwargs) or True))
3476
3451
3477
3452
logger.debug("Starting main loop")
3478
3453
main_loop.run()
3479
3454
except AvahiError as error:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0