To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 237.7.370
- compare with another revision
- download diff
- download tarball
- view history from revision 237.7.370
- Committer: Teddy Hogeborn
- Date: 2016-03-05 21:46:00 UTC
- mto: (237.7.594 trunk)
- mto: This revision was merged to the branch mainline in revision 335.
- Revision ID: teddy@recompile.se-20160305214600-2d7peg8qb5xhpi64
Fix incorrect documentation of minor limitation
* mandos-monitor.xml (BUGS): The name which is hard-coded is the D-Bus
*bus* name, not the service name. Fix
the documentation.
* mandos-monitor.xml (BUGS): The name which is hard-coded is the D-Bus
*bus* name, not the service name. Fix
the documentation.
- files added:
- initramfs-tools-hook-conf
- files removed:
- debian/mandos-client.templates
- debian/tests
- dracut-module
- files modified:
- .bzrignore
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-2019 Teddy Hogeborn
15
# Copyright © 2008-2019 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)
37
36
38
try:
39
from future_builtins import *
40
except ImportError:
41
pass
37
from future_builtins import *
42
38
43
39
try:
44
40
import SocketServer as socketserver
80
76
81
77
import dbus
82
78
import dbus.service
83
from gi.repository import GLib
79
try:
80
from gi.repository import GObject
81
except ImportError:
82
import gobject as GObject
83
import avahi
84
84
from dbus.mainloop.glib import DBusGMainLoop
85
85
import ctypes
86
86
import ctypes.util
87
87
import xml.dom.minidom
88
88
import inspect
89
89
90
# Try to find the value of SO_BINDTODEVICE:
91
90
try:
92
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
93
# newer, and it is also the most natural place for it:
94
91
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
95
92
except AttributeError:
96
93
try:
97
# This is where SO_BINDTODEVICE was up to and including Python
98
# 2.6, and also 3.2:
99
94
from IN import SO_BINDTODEVICE
100
95
except ImportError:
101
# In Python 2.7 it seems to have been removed entirely.
102
# Try running the C preprocessor:
103
try:
104
cc = subprocess.Popen(["cc", "--language=c", "-E",
105
"/dev/stdin"],
106
stdin=subprocess.PIPE,
107
stdout=subprocess.PIPE)
108
stdout = cc.communicate(
109
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
110
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
111
except (OSError, ValueError, IndexError):
112
# No value found
113
SO_BINDTODEVICE = None
96
SO_BINDTODEVICE = None
114
97
115
98
if sys.version_info.major == 2:
116
99
str = unicode
117
100
118
version = "1.8.5"
101
version = "1.7.3"
119
102
stored_state_file = "clients.pickle"
120
103
121
104
logger = logging.getLogger()
125
108
if_nametoindex = ctypes.cdll.LoadLibrary(
126
109
ctypes.util.find_library("c")).if_nametoindex
127
110
except (OSError, AttributeError):
128
111
129
112
def if_nametoindex(interface):
130
113
"Get an interface index the hard way, i.e. using fcntl()"
131
114
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
136
119
return interface_index
137
120
138
121
139
def copy_function(func):
140
"""Make a copy of a function"""
141
if sys.version_info.major == 2:
142
return types.FunctionType(func.func_code,
143
func.func_globals,
144
func.func_name,
145
func.func_defaults,
146
func.func_closure)
147
else:
148
return types.FunctionType(func.__code__,
149
func.__globals__,
150
func.__name__,
151
func.__defaults__,
152
func.__closure__)
153
154
155
122
def initlogger(debug, level=logging.WARNING):
156
123
"""init logger and add loglevel"""
157
124
158
125
global syslogger
159
126
syslogger = (logging.handlers.SysLogHandler(
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
161
address="/dev/log"))
127
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
128
address = "/dev/log"))
162
129
syslogger.setFormatter(logging.Formatter
163
130
('Mandos [%(process)d]: %(levelname)s:'
164
131
' %(message)s'))
165
132
logger.addHandler(syslogger)
166
133
167
134
if debug:
168
135
console = logging.StreamHandler()
169
136
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
181
148
182
149
class PGPEngine(object):
183
150
"""A simple class for OpenPGP symmetric encryption & decryption"""
184
151
185
152
def __init__(self):
186
153
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
187
154
self.gpg = "gpg"
188
155
try:
189
156
output = subprocess.check_output(["gpgconf"])
190
157
for line in output.splitlines():
191
name, text, path = line.split(b":")
158
name, text, path = line.split(":")
192
159
if name == "gpg":
193
160
self.gpg = path
194
161
break
198
165
self.gnupgargs = ['--batch',
199
166
'--homedir', self.tempdir,
200
167
'--force-mdc',
201
'--quiet']
202
# Only GPG version 1 has the --no-use-agent option.
203
if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
204
self.gnupgargs.append("--no-use-agent")
205
168
'--quiet',
169
'--no-use-agent']
170
206
171
def __enter__(self):
207
172
return self
208
173
209
174
def __exit__(self, exc_type, exc_value, traceback):
210
175
self._cleanup()
211
176
return False
212
177
213
178
def __del__(self):
214
179
self._cleanup()
215
180
216
181
def _cleanup(self):
217
182
if self.tempdir is not None:
218
183
# Delete contents of tempdir
219
184
for root, dirs, files in os.walk(self.tempdir,
220
topdown=False):
185
topdown = False):
221
186
for filename in files:
222
187
os.remove(os.path.join(root, filename))
223
188
for dirname in dirs:
225
190
# Remove tempdir
226
191
os.rmdir(self.tempdir)
227
192
self.tempdir = None
228
193
229
194
def password_encode(self, password):
230
195
# Passphrase can not be empty and can not contain newlines or
231
196
# NUL bytes. So we prefix it and hex encode it.
236
201
.replace(b"\n", b"\\n")
237
202
.replace(b"\0", b"\\x00"))
238
203
return encoded
239
204
240
205
def encrypt(self, data, password):
241
206
passphrase = self.password_encode(password)
242
207
with tempfile.NamedTemporaryFile(
247
212
'--passphrase-file',
248
213
passfile.name]
249
214
+ self.gnupgargs,
250
stdin=subprocess.PIPE,
251
stdout=subprocess.PIPE,
252
stderr=subprocess.PIPE)
253
ciphertext, err = proc.communicate(input=data)
215
stdin = subprocess.PIPE,
216
stdout = subprocess.PIPE,
217
stderr = subprocess.PIPE)
218
ciphertext, err = proc.communicate(input = data)
254
219
if proc.returncode != 0:
255
220
raise PGPError(err)
256
221
return ciphertext
257
222
258
223
def decrypt(self, data, password):
259
224
passphrase = self.password_encode(password)
260
225
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
226
dir = self.tempdir) as passfile:
262
227
passfile.write(passphrase)
263
228
passfile.flush()
264
229
proc = subprocess.Popen([self.gpg, '--decrypt',
265
230
'--passphrase-file',
266
231
passfile.name]
267
232
+ self.gnupgargs,
268
stdin=subprocess.PIPE,
269
stdout=subprocess.PIPE,
270
stderr=subprocess.PIPE)
271
decrypted_plaintext, err = proc.communicate(input=data)
233
stdin = subprocess.PIPE,
234
stdout = subprocess.PIPE,
235
stderr = subprocess.PIPE)
236
decrypted_plaintext, err = proc.communicate(input = data)
272
237
if proc.returncode != 0:
273
238
raise PGPError(err)
274
239
return decrypted_plaintext
275
240
276
241
277
# Pretend that we have an Avahi module
278
class avahi(object):
279
"""This isn't so much a class as it is a module-like namespace."""
280
IF_UNSPEC = -1 # avahi-common/address.h
281
PROTO_UNSPEC = -1 # avahi-common/address.h
282
PROTO_INET = 0 # avahi-common/address.h
283
PROTO_INET6 = 1 # avahi-common/address.h
284
DBUS_NAME = "org.freedesktop.Avahi"
285
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
286
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
287
DBUS_PATH_SERVER = "/"
288
289
@staticmethod
290
def string_array_to_txt_array(t):
291
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
292
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
301
302
303
242
class AvahiError(Exception):
304
243
def __init__(self, value, *args, **kwargs):
305
244
self.value = value
317
256
318
257
class AvahiService(object):
319
258
"""An Avahi (Zeroconf) service.
320
259
321
260
Attributes:
322
261
interface: integer; avahi.IF_UNSPEC or an interface index.
323
262
Used to optionally bind to the specified interface.
335
274
server: D-Bus Server
336
275
bus: dbus.SystemBus()
337
276
"""
338
277
339
278
def __init__(self,
340
interface=avahi.IF_UNSPEC,
341
name=None,
342
servicetype=None,
343
port=None,
344
TXT=None,
345
domain="",
346
host="",
347
max_renames=32768,
348
protocol=avahi.PROTO_UNSPEC,
349
bus=None):
279
interface = avahi.IF_UNSPEC,
280
name = None,
281
servicetype = None,
282
port = None,
283
TXT = None,
284
domain = "",
285
host = "",
286
max_renames = 32768,
287
protocol = avahi.PROTO_UNSPEC,
288
bus = None):
350
289
self.interface = interface
351
290
self.name = name
352
291
self.type = servicetype
361
300
self.server = None
362
301
self.bus = bus
363
302
self.entry_group_state_changed_match = None
364
303
365
304
def rename(self, remove=True):
366
305
"""Derived from the Avahi example code"""
367
306
if self.rename_count >= self.max_renames:
387
326
logger.critical("D-Bus Exception", exc_info=error)
388
327
self.cleanup()
389
328
os._exit(1)
390
329
391
330
def remove(self):
392
331
"""Derived from the Avahi example code"""
393
332
if self.entry_group_state_changed_match is not None:
395
334
self.entry_group_state_changed_match = None
396
335
if self.group is not None:
397
336
self.group.Reset()
398
337
399
338
def add(self):
400
339
"""Derived from the Avahi example code"""
401
340
self.remove()
418
357
dbus.UInt16(self.port),
419
358
avahi.string_array_to_txt_array(self.TXT))
420
359
self.group.Commit()
421
360
422
361
def entry_group_state_changed(self, state, error):
423
362
"""Derived from the Avahi example code"""
424
363
logger.debug("Avahi entry group state change: %i", state)
425
364
426
365
if state == avahi.ENTRY_GROUP_ESTABLISHED:
427
366
logger.debug("Zeroconf service established.")
428
367
elif state == avahi.ENTRY_GROUP_COLLISION:
432
371
logger.critical("Avahi: Error in group state changed %s",
433
372
str(error))
434
373
raise AvahiGroupError("State changed: {!s}".format(error))
435
374
436
375
def cleanup(self):
437
376
"""Derived from the Avahi example code"""
438
377
if self.group is not None:
443
382
pass
444
383
self.group = None
445
384
self.remove()
446
385
447
386
def server_state_changed(self, state, error=None):
448
387
"""Derived from the Avahi example code"""
449
388
logger.debug("Avahi server state change: %i", state)
478
417
logger.debug("Unknown state: %r", state)
479
418
else:
480
419
logger.debug("Unknown state: %r: %r", state, error)
481
420
482
421
def activate(self):
483
422
"""Derived from the Avahi example code"""
484
423
if self.server is None:
495
434
class AvahiServiceToSyslog(AvahiService):
496
435
def rename(self, *args, **kwargs):
497
436
"""Add the new name to the syslog messages"""
498
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
437
ret = AvahiService.rename(self, *args, **kwargs)
499
438
syslogger.setFormatter(logging.Formatter(
500
439
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
501
440
.format(self.name)))
502
441
return ret
503
442
504
505
443
# Pretend that we have a GnuTLS module
506
class gnutls(object):
507
"""This isn't so much a class as it is a module-like namespace."""
508
509
library = ctypes.util.find_library("gnutls")
510
if library is None:
511
library = ctypes.util.find_library("gnutls-deb0")
512
_library = ctypes.cdll.LoadLibrary(library)
513
del library
514
444
class GnuTLS(object):
445
"""This isn't so much a class as it is a module-like namespace.
446
It is instantiated once, and simulates having a GnuTLS module."""
447
448
_library = ctypes.cdll.LoadLibrary(
449
ctypes.util.find_library("gnutls"))
450
_need_version = "3.3.0"
451
def __init__(self):
452
# Need to use class name "GnuTLS" here, since this method is
453
# called before the assignment to the "gnutls" global variable
454
# happens.
455
if GnuTLS.check_version(self._need_version) is None:
456
raise GnuTLS.Error("Needs GnuTLS {} or later"
457
.format(self._need_version))
458
515
459
# Unless otherwise indicated, the constants and types below are
516
460
# all from the gnutls/gnutls.h C header file.
517
461
518
462
# Constants
519
463
E_SUCCESS = 0
520
464
E_INTERRUPTED = -52
521
465
E_AGAIN = -28
522
466
CRT_OPENPGP = 2
523
CRT_RAWPK = 3
524
467
CLIENT = 2
525
468
SHUT_RDWR = 0
526
469
CRD_CERTIFICATE = 1
527
470
E_NO_CERTIFICATE_FOUND = -49
528
X509_FMT_DER = 0
529
NO_TICKETS = 1<<10
530
ENABLE_RAWPK = 1<<18
531
CTYPE_PEERS = 3
532
KEYID_USE_SHA256 = 1 # gnutls/x509.h
533
471
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
534
472
535
473
# Types
536
474
class session_int(ctypes.Structure):
537
475
_fields_ = []
538
476
session_t = ctypes.POINTER(session_int)
539
540
477
class certificate_credentials_st(ctypes.Structure):
541
478
_fields_ = []
542
479
certificate_credentials_t = ctypes.POINTER(
543
480
certificate_credentials_st)
544
481
certificate_type_t = ctypes.c_int
545
546
482
class datum_t(ctypes.Structure):
547
483
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
548
484
('size', ctypes.c_uint)]
549
550
485
class openpgp_crt_int(ctypes.Structure):
551
486
_fields_ = []
552
487
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
553
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
488
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
554
489
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
555
credentials_type_t = ctypes.c_int
490
credentials_type_t = ctypes.c_int #
556
491
transport_ptr_t = ctypes.c_void_p
557
492
close_request_t = ctypes.c_int
558
493
559
494
# Exceptions
560
495
class Error(Exception):
561
def __init__(self, message=None, code=None, args=()):
496
# We need to use the class name "GnuTLS" here, since this
497
# exception might be raised from within GnuTLS.__init__,
498
# which is called before the assignment to the "gnutls"
499
# global variable has happened.
500
def __init__(self, message = None, code = None, args=()):
562
501
# Default usage is by a message string, but if a return
563
502
# code is passed, convert it to a string with
564
503
# gnutls.strerror()
565
504
self.code = code
566
505
if message is None and code is not None:
567
message = gnutls.strerror(code)
568
return super(gnutls.Error, self).__init__(
506
message = GnuTLS.strerror(code)
507
return super(GnuTLS.Error, self).__init__(
569
508
message, *args)
570
509
571
510
class CertificateSecurityError(Error):
572
511
pass
573
512
574
513
# Classes
575
514
class Credentials(object):
576
515
def __init__(self):
578
517
gnutls.certificate_allocate_credentials(
579
518
ctypes.byref(self._c_object))
580
519
self.type = gnutls.CRD_CERTIFICATE
581
520
582
521
def __del__(self):
583
522
gnutls.certificate_free_credentials(self._c_object)
584
523
585
524
class ClientSession(object):
586
def __init__(self, socket, credentials=None):
525
def __init__(self, socket, credentials = None):
587
526
self._c_object = gnutls.session_t()
588
gnutls_flags = gnutls.CLIENT
589
if gnutls.check_version(b"3.5.6"):
590
gnutls_flags |= gnutls.NO_TICKETS
591
if gnutls.has_rawpk:
592
gnutls_flags |= gnutls.ENABLE_RAWPK
593
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
594
del gnutls_flags
527
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
595
528
gnutls.set_default_priority(self._c_object)
596
529
gnutls.transport_set_ptr(self._c_object, socket.fileno())
597
530
gnutls.handshake_set_private_extensions(self._c_object,
603
536
ctypes.cast(credentials._c_object,
604
537
ctypes.c_void_p))
605
538
self.credentials = credentials
606
539
607
540
def __del__(self):
608
541
gnutls.deinit(self._c_object)
609
542
610
543
def handshake(self):
611
544
return gnutls.handshake(self._c_object)
612
545
613
546
def send(self, data):
614
547
data = bytes(data)
615
548
data_len = len(data)
617
550
data_len -= gnutls.record_send(self._c_object,
618
551
data[-data_len:],
619
552
data_len)
620
553
621
554
def bye(self):
622
555
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
623
556
624
557
# Error handling functions
625
558
def _error_code(result):
626
559
"""A function to raise exceptions on errors, suitable
628
561
if result >= 0:
629
562
return result
630
563
if result == gnutls.E_NO_CERTIFICATE_FOUND:
631
raise gnutls.CertificateSecurityError(code=result)
632
raise gnutls.Error(code=result)
633
564
raise gnutls.CertificateSecurityError(code = result)
565
raise gnutls.Error(code = result)
566
634
567
def _retry_on_error(result, func, arguments):
635
568
"""A function to retry on some errors, suitable
636
569
for the 'errcheck' attribute on ctypes functions"""
639
572
return _error_code(result)
640
573
result = func(*arguments)
641
574
return result
642
575
643
576
# Unless otherwise indicated, the function declarations below are
644
577
# all from the gnutls/gnutls.h C header file.
645
578
646
579
# Functions
647
580
priority_set_direct = _library.gnutls_priority_set_direct
648
581
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
649
582
ctypes.POINTER(ctypes.c_char_p)]
650
583
priority_set_direct.restype = _error_code
651
584
652
585
init = _library.gnutls_init
653
586
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
654
587
init.restype = _error_code
655
588
656
589
set_default_priority = _library.gnutls_set_default_priority
657
590
set_default_priority.argtypes = [session_t]
658
591
set_default_priority.restype = _error_code
659
592
660
593
record_send = _library.gnutls_record_send
661
594
record_send.argtypes = [session_t, ctypes.c_void_p,
662
595
ctypes.c_size_t]
663
596
record_send.restype = ctypes.c_ssize_t
664
597
record_send.errcheck = _retry_on_error
665
598
666
599
certificate_allocate_credentials = (
667
600
_library.gnutls_certificate_allocate_credentials)
668
601
certificate_allocate_credentials.argtypes = [
669
602
ctypes.POINTER(certificate_credentials_t)]
670
603
certificate_allocate_credentials.restype = _error_code
671
604
672
605
certificate_free_credentials = (
673
606
_library.gnutls_certificate_free_credentials)
674
certificate_free_credentials.argtypes = [
675
certificate_credentials_t]
607
certificate_free_credentials.argtypes = [certificate_credentials_t]
676
608
certificate_free_credentials.restype = None
677
609
678
610
handshake_set_private_extensions = (
679
611
_library.gnutls_handshake_set_private_extensions)
680
612
handshake_set_private_extensions.argtypes = [session_t,
681
613
ctypes.c_int]
682
614
handshake_set_private_extensions.restype = None
683
615
684
616
credentials_set = _library.gnutls_credentials_set
685
617
credentials_set.argtypes = [session_t, credentials_type_t,
686
618
ctypes.c_void_p]
687
619
credentials_set.restype = _error_code
688
620
689
621
strerror = _library.gnutls_strerror
690
622
strerror.argtypes = [ctypes.c_int]
691
623
strerror.restype = ctypes.c_char_p
692
624
693
625
certificate_type_get = _library.gnutls_certificate_type_get
694
626
certificate_type_get.argtypes = [session_t]
695
627
certificate_type_get.restype = _error_code
696
628
697
629
certificate_get_peers = _library.gnutls_certificate_get_peers
698
630
certificate_get_peers.argtypes = [session_t,
699
631
ctypes.POINTER(ctypes.c_uint)]
700
632
certificate_get_peers.restype = ctypes.POINTER(datum_t)
701
633
702
634
global_set_log_level = _library.gnutls_global_set_log_level
703
635
global_set_log_level.argtypes = [ctypes.c_int]
704
636
global_set_log_level.restype = None
705
637
706
638
global_set_log_function = _library.gnutls_global_set_log_function
707
639
global_set_log_function.argtypes = [log_func]
708
640
global_set_log_function.restype = None
709
641
710
642
deinit = _library.gnutls_deinit
711
643
deinit.argtypes = [session_t]
712
644
deinit.restype = None
713
645
714
646
handshake = _library.gnutls_handshake
715
647
handshake.argtypes = [session_t]
716
648
handshake.restype = _error_code
717
649
handshake.errcheck = _retry_on_error
718
650
719
651
transport_set_ptr = _library.gnutls_transport_set_ptr
720
652
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
721
653
transport_set_ptr.restype = None
722
654
723
655
bye = _library.gnutls_bye
724
656
bye.argtypes = [session_t, close_request_t]
725
657
bye.restype = _error_code
726
658
bye.errcheck = _retry_on_error
727
659
728
660
check_version = _library.gnutls_check_version
729
661
check_version.argtypes = [ctypes.c_char_p]
730
662
check_version.restype = ctypes.c_char_p
731
732
_need_version = b"3.3.0"
733
if check_version(_need_version) is None:
734
raise self.Error("Needs GnuTLS {} or later"
735
.format(_need_version))
736
737
_tls_rawpk_version = b"3.6.6"
738
has_rawpk = bool(check_version(_tls_rawpk_version))
739
740
if has_rawpk:
741
# Types
742
class pubkey_st(ctypes.Structure):
743
_fields = []
744
pubkey_t = ctypes.POINTER(pubkey_st)
745
746
x509_crt_fmt_t = ctypes.c_int
747
748
# All the function declarations below are from gnutls/abstract.h
749
pubkey_init = _library.gnutls_pubkey_init
750
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
751
pubkey_init.restype = _error_code
752
753
pubkey_import = _library.gnutls_pubkey_import
754
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
755
x509_crt_fmt_t]
756
pubkey_import.restype = _error_code
757
758
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
759
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
760
ctypes.POINTER(ctypes.c_ubyte),
761
ctypes.POINTER(ctypes.c_size_t)]
762
pubkey_get_key_id.restype = _error_code
763
764
pubkey_deinit = _library.gnutls_pubkey_deinit
765
pubkey_deinit.argtypes = [pubkey_t]
766
pubkey_deinit.restype = None
767
else:
768
# All the function declarations below are from gnutls/openpgp.h
769
770
openpgp_crt_init = _library.gnutls_openpgp_crt_init
771
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
772
openpgp_crt_init.restype = _error_code
773
774
openpgp_crt_import = _library.gnutls_openpgp_crt_import
775
openpgp_crt_import.argtypes = [openpgp_crt_t,
776
ctypes.POINTER(datum_t),
777
openpgp_crt_fmt_t]
778
openpgp_crt_import.restype = _error_code
779
780
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
781
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
782
ctypes.POINTER(ctypes.c_uint)]
783
openpgp_crt_verify_self.restype = _error_code
784
785
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
786
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
787
openpgp_crt_deinit.restype = None
788
789
openpgp_crt_get_fingerprint = (
790
_library.gnutls_openpgp_crt_get_fingerprint)
791
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
792
ctypes.c_void_p,
793
ctypes.POINTER(
794
ctypes.c_size_t)]
795
openpgp_crt_get_fingerprint.restype = _error_code
796
797
if check_version(b"3.6.4"):
798
certificate_type_get2 = _library.gnutls_certificate_type_get2
799
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
800
certificate_type_get2.restype = _error_code
801
663
664
# All the function declarations below are from gnutls/openpgp.h
665
666
openpgp_crt_init = _library.gnutls_openpgp_crt_init
667
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
668
openpgp_crt_init.restype = _error_code
669
670
openpgp_crt_import = _library.gnutls_openpgp_crt_import
671
openpgp_crt_import.argtypes = [openpgp_crt_t,
672
ctypes.POINTER(datum_t),
673
openpgp_crt_fmt_t]
674
openpgp_crt_import.restype = _error_code
675
676
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
677
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
678
ctypes.POINTER(ctypes.c_uint)]
679
openpgp_crt_verify_self.restype = _error_code
680
681
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
682
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
683
openpgp_crt_deinit.restype = None
684
685
openpgp_crt_get_fingerprint = (
686
_library.gnutls_openpgp_crt_get_fingerprint)
687
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
688
ctypes.c_void_p,
689
ctypes.POINTER(
690
ctypes.c_size_t)]
691
openpgp_crt_get_fingerprint.restype = _error_code
692
802
693
# Remove non-public functions
803
694
del _error_code, _retry_on_error
804
695
# Create the global "gnutls" object, simulating a module
696
gnutls = GnuTLS()
805
697
806
698
def call_pipe(connection, # : multiprocessing.Connection
807
699
func, *args, **kwargs):
808
700
"""This function is meant to be called by multiprocessing.Process
809
701
810
702
This function runs func(*args, **kwargs), and writes the resulting
811
703
return value on the provided multiprocessing.Connection.
812
704
"""
813
705
connection.send(func(*args, **kwargs))
814
706
connection.close()
815
707
816
817
708
class Client(object):
818
709
"""A representation of a client host served by this server.
819
710
820
711
Attributes:
821
712
approved: bool(); 'None' if not yet approved/disapproved
822
713
approval_delay: datetime.timedelta(); Time to wait for approval
823
714
approval_duration: datetime.timedelta(); Duration of one approval
824
checker: multiprocessing.Process(); a running checker process used
825
to see if the client lives. 'None' if no process is
826
running.
827
checker_callback_tag: a GLib event source tag, or None
715
checker: subprocess.Popen(); a running checker process used
716
to see if the client lives.
717
'None' if no process is running.
718
checker_callback_tag: a GObject event source tag, or None
828
719
checker_command: string; External command which is run to check
829
720
if client lives. %() expansions are done at
830
721
runtime with vars(self) as dict, so that for
831
722
instance %(name)s can be used in the command.
832
checker_initiator_tag: a GLib event source tag, or None
723
checker_initiator_tag: a GObject event source tag, or None
833
724
created: datetime.datetime(); (UTC) object creation
834
725
client_structure: Object describing what attributes a client has
835
726
and is used for storing the client at exit
836
727
current_checker_command: string; current running checker_command
837
disable_initiator_tag: a GLib event source tag, or None
728
disable_initiator_tag: a GObject event source tag, or None
838
729
enabled: bool()
839
730
fingerprint: string (40 or 32 hexadecimal digits); used to
840
uniquely identify an OpenPGP client
841
key_id: string (64 hexadecimal digits); used to uniquely identify
842
a client using raw public keys
731
uniquely identify the client
843
732
host: string; available for use by the checker command
844
733
interval: datetime.timedelta(); How often to start a new checker
845
734
last_approval_request: datetime.datetime(); (UTC) or None
861
750
disabled, or None
862
751
server_settings: The server_settings dict from main()
863
752
"""
864
753
865
754
runtime_expansions = ("approval_delay", "approval_duration",
866
"created", "enabled", "expires", "key_id",
755
"created", "enabled", "expires",
867
756
"fingerprint", "host", "interval",
868
757
"last_approval_request", "last_checked_ok",
869
758
"last_enabled", "name", "timeout")
878
767
"approved_by_default": "True",
879
768
"enabled": "True",
880
769
}
881
770
882
771
@staticmethod
883
772
def config_parser(config):
884
773
"""Construct a new dict of client settings of this form:
891
780
for client_name in config.sections():
892
781
section = dict(config.items(client_name))
893
782
client = settings[client_name] = {}
894
783
895
784
client["host"] = section["host"]
896
785
# Reformat values from string types to Python types
897
786
client["approved_by_default"] = config.getboolean(
898
787
client_name, "approved_by_default")
899
788
client["enabled"] = config.getboolean(client_name,
900
789
"enabled")
901
902
# Uppercase and remove spaces from key_id and fingerprint
903
# for later comparison purposes with return value from the
904
# key_id() and fingerprint() functions
905
client["key_id"] = (section.get("key_id", "").upper()
906
.replace(" ", ""))
790
791
# Uppercase and remove spaces from fingerprint for later
792
# comparison purposes with return value from the
793
# fingerprint() function
907
794
client["fingerprint"] = (section["fingerprint"].upper()
908
795
.replace(" ", ""))
909
796
if "secret" in section:
910
client["secret"] = codecs.decode(section["secret"]
911
.encode("utf-8"),
912
"base64")
797
client["secret"] = section["secret"].decode("base64")
913
798
elif "secfile" in section:
914
799
with open(os.path.expanduser(os.path.expandvars
915
800
(section["secfile"])),
930
815
client["last_approval_request"] = None
931
816
client["last_checked_ok"] = None
932
817
client["last_checker_status"] = -2
933
818
934
819
return settings
935
936
def __init__(self, settings, name=None, server_settings=None):
820
821
def __init__(self, settings, name = None, server_settings=None):
937
822
self.name = name
938
823
if server_settings is None:
939
824
server_settings = {}
941
826
# adding all client settings
942
827
for setting, value in settings.items():
943
828
setattr(self, setting, value)
944
829
945
830
if self.enabled:
946
831
if not hasattr(self, "last_enabled"):
947
832
self.last_enabled = datetime.datetime.utcnow()
951
836
else:
952
837
self.last_enabled = None
953
838
self.expires = None
954
839
955
840
logger.debug("Creating client %r", self.name)
956
logger.debug(" Key ID: %s", self.key_id)
957
841
logger.debug(" Fingerprint: %s", self.fingerprint)
958
842
self.created = settings.get("created",
959
843
datetime.datetime.utcnow())
960
844
961
845
# attributes specific for this server instance
962
846
self.checker = None
963
847
self.checker_initiator_tag = None
969
853
self.changedstate = multiprocessing_manager.Condition(
970
854
multiprocessing_manager.Lock())
971
855
self.client_structure = [attr
972
for attr in self.__dict__.keys()
856
for attr in self.__dict__.iterkeys()
973
857
if not attr.startswith("_")]
974
858
self.client_structure.append("client_structure")
975
859
976
860
for name, t in inspect.getmembers(
977
861
type(self), lambda obj: isinstance(obj, property)):
978
862
if not name.startswith("_"):
979
863
self.client_structure.append(name)
980
864
981
865
# Send notice to process children that client state has changed
982
866
def send_changedstate(self):
983
867
with self.changedstate:
984
868
self.changedstate.notify_all()
985
869
986
870
def enable(self):
987
871
"""Start this client's checker and timeout hooks"""
988
872
if getattr(self, "enabled", False):
993
877
self.last_enabled = datetime.datetime.utcnow()
994
878
self.init_checker()
995
879
self.send_changedstate()
996
880
997
881
def disable(self, quiet=True):
998
882
"""Disable this client."""
999
883
if not getattr(self, "enabled", False):
1001
885
if not quiet:
1002
886
logger.info("Disabling client %s", self.name)
1003
887
if getattr(self, "disable_initiator_tag", None) is not None:
1004
GLib.source_remove(self.disable_initiator_tag)
888
GObject.source_remove(self.disable_initiator_tag)
1005
889
self.disable_initiator_tag = None
1006
890
self.expires = None
1007
891
if getattr(self, "checker_initiator_tag", None) is not None:
1008
GLib.source_remove(self.checker_initiator_tag)
892
GObject.source_remove(self.checker_initiator_tag)
1009
893
self.checker_initiator_tag = None
1010
894
self.stop_checker()
1011
895
self.enabled = False
1012
896
if not quiet:
1013
897
self.send_changedstate()
1014
# Do not run this again if called by a GLib.timeout_add
898
# Do not run this again if called by a GObject.timeout_add
1015
899
return False
1016
900
1017
901
def __del__(self):
1018
902
self.disable()
1019
903
1020
904
def init_checker(self):
1021
905
# Schedule a new checker to be started an 'interval' from now,
1022
906
# and every interval from then on.
1023
907
if self.checker_initiator_tag is not None:
1024
GLib.source_remove(self.checker_initiator_tag)
1025
self.checker_initiator_tag = GLib.timeout_add(
908
GObject.source_remove(self.checker_initiator_tag)
909
self.checker_initiator_tag = GObject.timeout_add(
1026
910
int(self.interval.total_seconds() * 1000),
1027
911
self.start_checker)
1028
912
# Schedule a disable() when 'timeout' has passed
1029
913
if self.disable_initiator_tag is not None:
1030
GLib.source_remove(self.disable_initiator_tag)
1031
self.disable_initiator_tag = GLib.timeout_add(
914
GObject.source_remove(self.disable_initiator_tag)
915
self.disable_initiator_tag = GObject.timeout_add(
1032
916
int(self.timeout.total_seconds() * 1000), self.disable)
1033
917
# Also start a new checker *right now*.
1034
918
self.start_checker()
1035
919
1036
920
def checker_callback(self, source, condition, connection,
1037
921
command):
1038
922
"""The checker has completed, so take appropriate actions."""
923
self.checker_callback_tag = None
924
self.checker = None
1039
925
# Read return code from connection (see call_pipe)
1040
926
returncode = connection.recv()
1041
927
connection.close()
1042
self.checker.join()
1043
self.checker_callback_tag = None
1044
self.checker = None
1045
928
1046
929
if returncode >= 0:
1047
930
self.last_checker_status = returncode
1048
931
self.last_checker_signal = None
1058
941
logger.warning("Checker for %(name)s crashed?",
1059
942
vars(self))
1060
943
return False
1061
944
1062
945
def checked_ok(self):
1063
946
"""Assert that the client has been seen, alive and well."""
1064
947
self.last_checked_ok = datetime.datetime.utcnow()
1065
948
self.last_checker_status = 0
1066
949
self.last_checker_signal = None
1067
950
self.bump_timeout()
1068
951
1069
952
def bump_timeout(self, timeout=None):
1070
953
"""Bump up the timeout for this client."""
1071
954
if timeout is None:
1072
955
timeout = self.timeout
1073
956
if self.disable_initiator_tag is not None:
1074
GLib.source_remove(self.disable_initiator_tag)
957
GObject.source_remove(self.disable_initiator_tag)
1075
958
self.disable_initiator_tag = None
1076
959
if getattr(self, "enabled", False):
1077
self.disable_initiator_tag = GLib.timeout_add(
960
self.disable_initiator_tag = GObject.timeout_add(
1078
961
int(timeout.total_seconds() * 1000), self.disable)
1079
962
self.expires = datetime.datetime.utcnow() + timeout
1080
963
1081
964
def need_approval(self):
1082
965
self.last_approval_request = datetime.datetime.utcnow()
1083
966
1084
967
def start_checker(self):
1085
968
"""Start a new checker subprocess if one is not running.
1086
969
1087
970
If a checker already exists, leave it running and do
1088
971
nothing."""
1089
972
# The reason for not killing a running checker is that if we
1094
977
# checkers alone, the checker would have to take more time
1095
978
# than 'timeout' for the client to be disabled, which is as it
1096
979
# should be.
1097
980
1098
981
if self.checker is not None and not self.checker.is_alive():
1099
982
logger.warning("Checker was not alive; joining")
1100
983
self.checker.join()
1104
987
# Escape attributes for the shell
1105
988
escaped_attrs = {
1106
989
attr: re.escape(str(getattr(self, attr)))
1107
for attr in self.runtime_expansions}
990
for attr in self.runtime_expansions }
1108
991
try:
1109
992
command = self.checker_command % escaped_attrs
1110
993
except TypeError as error:
1122
1005
# The exception is when not debugging but nevertheless
1123
1006
# running in the foreground; use the previously
1124
1007
# created wnull.
1125
popen_args = {"close_fds": True,
1126
"shell": True,
1127
"cwd": "/"}
1008
popen_args = { "close_fds": True,
1009
"shell": True,
1010
"cwd": "/" }
1128
1011
if (not self.server_settings["debug"]
1129
1012
and self.server_settings["foreground"]):
1130
1013
popen_args.update({"stdout": wnull,
1131
"stderr": wnull})
1132
pipe = multiprocessing.Pipe(duplex=False)
1014
"stderr": wnull })
1015
pipe = multiprocessing.Pipe(duplex = False)
1133
1016
self.checker = multiprocessing.Process(
1134
target=call_pipe,
1135
args=(pipe[1], subprocess.call, command),
1136
kwargs=popen_args)
1017
target = call_pipe,
1018
args = (pipe[1], subprocess.call, command),
1019
kwargs = popen_args)
1137
1020
self.checker.start()
1138
self.checker_callback_tag = GLib.io_add_watch(
1139
pipe[0].fileno(), GLib.IO_IN,
1021
self.checker_callback_tag = GObject.io_add_watch(
1022
pipe[0].fileno(), GObject.IO_IN,
1140
1023
self.checker_callback, pipe[0], command)
1141
# Re-run this periodically if run by GLib.timeout_add
1024
# Re-run this periodically if run by GObject.timeout_add
1142
1025
return True
1143
1026
1144
1027
def stop_checker(self):
1145
1028
"""Force the checker process, if any, to stop."""
1146
1029
if self.checker_callback_tag:
1147
GLib.source_remove(self.checker_callback_tag)
1030
GObject.source_remove(self.checker_callback_tag)
1148
1031
self.checker_callback_tag = None
1149
1032
if getattr(self, "checker", None) is None:
1150
1033
return
1159
1042
byte_arrays=False):
1160
1043
"""Decorators for marking methods of a DBusObjectWithProperties to
1161
1044
become properties on the D-Bus.
1162
1045
1163
1046
The decorated method will be called with no arguments by "Get"
1164
1047
and with one argument by "Set".
1165
1048
1166
1049
The parameters, where they are supported, are the same as
1167
1050
dbus.service.method, except there is only "signature", since the
1168
1051
type from Get() and the type sent to Set() is the same.
1172
1055
if byte_arrays and signature != "ay":
1173
1056
raise ValueError("Byte arrays not supported for non-'ay'"
1174
1057
" signature {!r}".format(signature))
1175
1058
1176
1059
def decorator(func):
1177
1060
func._dbus_is_property = True
1178
1061
func._dbus_interface = dbus_interface
1181
1064
func._dbus_name = func.__name__
1182
1065
if func._dbus_name.endswith("_dbus_property"):
1183
1066
func._dbus_name = func._dbus_name[:-14]
1184
func._dbus_get_args_options = {'byte_arrays': byte_arrays}
1067
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
1185
1068
return func
1186
1069
1187
1070
return decorator
1188
1071
1189
1072
1190
1073
def dbus_interface_annotations(dbus_interface):
1191
1074
"""Decorator for marking functions returning interface annotations
1192
1075
1193
1076
Usage:
1194
1077
1195
1078
@dbus_interface_annotations("org.example.Interface")
1196
1079
def _foo(self): # Function name does not matter
1197
1080
return {"org.freedesktop.DBus.Deprecated": "true",
1198
1081
"org.freedesktop.DBus.Property.EmitsChangedSignal":
1199
1082
"false"}
1200
1083
"""
1201
1084
1202
1085
def decorator(func):
1203
1086
func._dbus_is_interface = True
1204
1087
func._dbus_interface = dbus_interface
1205
1088
func._dbus_name = dbus_interface
1206
1089
return func
1207
1090
1208
1091
return decorator
1209
1092
1210
1093
1211
1094
def dbus_annotations(annotations):
1212
1095
"""Decorator to annotate D-Bus methods, signals or properties
1213
1096
Usage:
1214
1097
1215
1098
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
1216
1099
"org.freedesktop.DBus.Property."
1217
1100
"EmitsChangedSignal": "false"})
1219
1102
access="r")
1220
1103
def Property_dbus_property(self):
1221
1104
return dbus.Boolean(False)
1222
1105
1223
1106
See also the DBusObjectWithAnnotations class.
1224
1107
"""
1225
1108
1226
1109
def decorator(func):
1227
1110
func._dbus_annotations = annotations
1228
1111
return func
1229
1112
1230
1113
return decorator
1231
1114
1232
1115
1250
1133
1251
1134
class DBusObjectWithAnnotations(dbus.service.Object):
1252
1135
"""A D-Bus object with annotations.
1253
1136
1254
1137
Classes inheriting from this can use the dbus_annotations
1255
1138
decorator to add annotations to methods or signals.
1256
1139
"""
1257
1140
1258
1141
@staticmethod
1259
1142
def _is_dbus_thing(thing):
1260
1143
"""Returns a function testing if an attribute is a D-Bus thing
1261
1144
1262
1145
If called like _is_dbus_thing("method") it returns a function
1263
1146
suitable for use as predicate to inspect.getmembers().
1264
1147
"""
1265
1148
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1266
1149
False)
1267
1150
1268
1151
def _get_all_dbus_things(self, thing):
1269
1152
"""Returns a generator of (name, attribute) pairs
1270
1153
"""
1273
1156
for cls in self.__class__.__mro__
1274
1157
for name, athing in
1275
1158
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1276
1159
1277
1160
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1278
out_signature="s",
1279
path_keyword='object_path',
1280
connection_keyword='connection')
1161
out_signature = "s",
1162
path_keyword = 'object_path',
1163
connection_keyword = 'connection')
1281
1164
def Introspect(self, object_path, connection):
1282
1165
"""Overloading of standard D-Bus method.
1283
1166
1284
1167
Inserts annotation tags on methods and signals.
1285
1168
"""
1286
1169
xmlstring = dbus.service.Object.Introspect(self, object_path,
1287
1170
connection)
1288
1171
try:
1289
1172
document = xml.dom.minidom.parseString(xmlstring)
1290
1173
1291
1174
for if_tag in document.getElementsByTagName("interface"):
1292
1175
# Add annotation tags
1293
1176
for typ in ("method", "signal"):
1320
1203
if_tag.appendChild(ann_tag)
1321
1204
# Fix argument name for the Introspect method itself
1322
1205
if (if_tag.getAttribute("name")
1323
== dbus.INTROSPECTABLE_IFACE):
1206
== dbus.INTROSPECTABLE_IFACE):
1324
1207
for cn in if_tag.getElementsByTagName("method"):
1325
1208
if cn.getAttribute("name") == "Introspect":
1326
1209
for arg in cn.getElementsByTagName("arg"):
1339
1222
1340
1223
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1341
1224
"""A D-Bus object with properties.
1342
1225
1343
1226
Classes inheriting from this can use the dbus_service_property
1344
1227
decorator to expose methods as D-Bus properties. It exposes the
1345
1228
standard Get(), Set(), and GetAll() methods on the D-Bus.
1346
1229
"""
1347
1230
1348
1231
def _get_dbus_property(self, interface_name, property_name):
1349
1232
"""Returns a bound method if one exists which is a D-Bus
1350
1233
property with the specified name and interface.
1355
1238
if (value._dbus_name == property_name
1356
1239
and value._dbus_interface == interface_name):
1357
1240
return value.__get__(self)
1358
1241
1359
1242
# No such property
1360
1243
raise DBusPropertyNotFound("{}:{}.{}".format(
1361
1244
self.dbus_object_path, interface_name, property_name))
1362
1245
1363
1246
@classmethod
1364
1247
def _get_all_interface_names(cls):
1365
1248
"""Get a sequence of all interfaces supported by an object"""
1368
1251
for x in (inspect.getmro(cls))
1369
1252
for attr in dir(x))
1370
1253
if name is not None)
1371
1254
1372
1255
@dbus.service.method(dbus.PROPERTIES_IFACE,
1373
1256
in_signature="ss",
1374
1257
out_signature="v")
1382
1265
if not hasattr(value, "variant_level"):
1383
1266
return value
1384
1267
return type(value)(value, variant_level=value.variant_level+1)
1385
1268
1386
1269
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
1387
1270
def Set(self, interface_name, property_name, value):
1388
1271
"""Standard D-Bus property Set() method, see D-Bus standard.
1400
1283
value = dbus.ByteArray(b''.join(chr(byte)
1401
1284
for byte in value))
1402
1285
prop(value)
1403
1286
1404
1287
@dbus.service.method(dbus.PROPERTIES_IFACE,
1405
1288
in_signature="s",
1406
1289
out_signature="a{sv}")
1407
1290
def GetAll(self, interface_name):
1408
1291
"""Standard D-Bus property GetAll() method, see D-Bus
1409
1292
standard.
1410
1293
1411
1294
Note: Will not include properties with access="write".
1412
1295
"""
1413
1296
properties = {}
1424
1307
properties[name] = value
1425
1308
continue
1426
1309
properties[name] = type(value)(
1427
value, variant_level=value.variant_level + 1)
1310
value, variant_level = value.variant_level + 1)
1428
1311
return dbus.Dictionary(properties, signature="sv")
1429
1312
1430
1313
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1431
1314
def PropertiesChanged(self, interface_name, changed_properties,
1432
1315
invalidated_properties):
1434
1317
standard.
1435
1318
"""
1436
1319
pass
1437
1320
1438
1321
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1439
1322
out_signature="s",
1440
1323
path_keyword='object_path',
1441
1324
connection_keyword='connection')
1442
1325
def Introspect(self, object_path, connection):
1443
1326
"""Overloading of standard D-Bus method.
1444
1327
1445
1328
Inserts property tags and interface annotation tags.
1446
1329
"""
1447
1330
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1449
1332
connection)
1450
1333
try:
1451
1334
document = xml.dom.minidom.parseString(xmlstring)
1452
1335
1453
1336
def make_tag(document, name, prop):
1454
1337
e = document.createElement("property")
1455
1338
e.setAttribute("name", name)
1456
1339
e.setAttribute("type", prop._dbus_signature)
1457
1340
e.setAttribute("access", prop._dbus_access)
1458
1341
return e
1459
1342
1460
1343
for if_tag in document.getElementsByTagName("interface"):
1461
1344
# Add property tags
1462
1345
for tag in (make_tag(document, name, prop)
1504
1387
exc_info=error)
1505
1388
return xmlstring
1506
1389
1507
1508
1390
try:
1509
1391
dbus.OBJECT_MANAGER_IFACE
1510
1392
except AttributeError:
1511
1393
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1512
1394
1513
1514
1395
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1515
1396
"""A D-Bus object with an ObjectManager.
1516
1397
1517
1398
Classes inheriting from this exposes the standard
1518
1399
GetManagedObjects call and the InterfacesAdded and
1519
1400
InterfacesRemoved signals on the standard
1520
1401
"org.freedesktop.DBus.ObjectManager" interface.
1521
1402
1522
1403
Note: No signals are sent automatically; they must be sent
1523
1404
manually.
1524
1405
"""
1525
1406
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1526
out_signature="a{oa{sa{sv}}}")
1407
out_signature = "a{oa{sa{sv}}}")
1527
1408
def GetManagedObjects(self):
1528
1409
"""This function must be overridden"""
1529
1410
raise NotImplementedError()
1530
1411
1531
1412
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1532
signature="oa{sa{sv}}")
1413
signature = "oa{sa{sv}}")
1533
1414
def InterfacesAdded(self, object_path, interfaces_and_properties):
1534
1415
pass
1535
1536
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1416
1417
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1537
1418
def InterfacesRemoved(self, object_path, interfaces):
1538
1419
pass
1539
1420
1540
1421
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1541
out_signature="s",
1542
path_keyword='object_path',
1543
connection_keyword='connection')
1422
out_signature = "s",
1423
path_keyword = 'object_path',
1424
connection_keyword = 'connection')
1544
1425
def Introspect(self, object_path, connection):
1545
1426
"""Overloading of standard D-Bus method.
1546
1427
1547
1428
Override return argument name of GetManagedObjects to be
1548
1429
"objpath_interfaces_and_properties"
1549
1430
"""
1552
1433
connection)
1553
1434
try:
1554
1435
document = xml.dom.minidom.parseString(xmlstring)
1555
1436
1556
1437
for if_tag in document.getElementsByTagName("interface"):
1557
1438
# Fix argument name for the GetManagedObjects method
1558
1439
if (if_tag.getAttribute("name")
1559
== dbus.OBJECT_MANAGER_IFACE):
1440
== dbus.OBJECT_MANAGER_IFACE):
1560
1441
for cn in if_tag.getElementsByTagName("method"):
1561
1442
if (cn.getAttribute("name")
1562
1443
== "GetManagedObjects"):
1572
1453
except (AttributeError, xml.dom.DOMException,
1573
1454
xml.parsers.expat.ExpatError) as error:
1574
1455
logger.error("Failed to override Introspection method",
1575
exc_info=error)
1456
exc_info = error)
1576
1457
return xmlstring
1577
1458
1578
1579
1459
def datetime_to_dbus(dt, variant_level=0):
1580
1460
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1581
1461
if dt is None:
1582
return dbus.String("", variant_level=variant_level)
1462
return dbus.String("", variant_level = variant_level)
1583
1463
return dbus.String(dt.isoformat(), variant_level=variant_level)
1584
1464
1585
1465
1588
1468
dbus.service.Object, it will add alternate D-Bus attributes with
1589
1469
interface names according to the "alt_interface_names" mapping.
1590
1470
Usage:
1591
1471
1592
1472
@alternate_dbus_interfaces({"org.example.Interface":
1593
1473
"net.example.AlternateInterface"})
1594
1474
class SampleDBusObject(dbus.service.Object):
1595
1475
@dbus.service.method("org.example.Interface")
1596
1476
def SampleDBusMethod():
1597
1477
pass
1598
1478
1599
1479
The above "SampleDBusMethod" on "SampleDBusObject" will be
1600
1480
reachable via two interfaces: "org.example.Interface" and
1601
1481
"net.example.AlternateInterface", the latter of which will have
1602
1482
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1603
1483
"true", unless "deprecate" is passed with a False value.
1604
1484
1605
1485
This works for methods and signals, and also for D-Bus properties
1606
1486
(from DBusObjectWithProperties) and interfaces (from the
1607
1487
dbus_interface_annotations decorator).
1608
1488
"""
1609
1489
1610
1490
def wrapper(cls):
1611
1491
for orig_interface_name, alt_interface_name in (
1612
1492
alt_interface_names.items()):
1627
1507
interface_names.add(alt_interface)
1628
1508
# Is this a D-Bus signal?
1629
1509
if getattr(attribute, "_dbus_is_signal", False):
1630
# Extract the original non-method undecorated
1631
# function by black magic
1632
1510
if sys.version_info.major == 2:
1511
# Extract the original non-method undecorated
1512
# function by black magic
1633
1513
nonmethod_func = (dict(
1634
1514
zip(attribute.func_code.co_freevars,
1635
1515
attribute.__closure__))
1636
1516
["func"].cell_contents)
1637
1517
else:
1638
nonmethod_func = (dict(
1639
zip(attribute.__code__.co_freevars,
1640
attribute.__closure__))
1641
["func"].cell_contents)
1518
nonmethod_func = attribute
1642
1519
# Create a new, but exactly alike, function
1643
1520
# object, and decorate it to be a new D-Bus signal
1644
1521
# with the alternate D-Bus interface name
1645
new_function = copy_function(nonmethod_func)
1522
if sys.version_info.major == 2:
1523
new_function = types.FunctionType(
1524
nonmethod_func.func_code,
1525
nonmethod_func.func_globals,
1526
nonmethod_func.func_name,
1527
nonmethod_func.func_defaults,
1528
nonmethod_func.func_closure)
1529
else:
1530
new_function = types.FunctionType(
1531
nonmethod_func.__code__,
1532
nonmethod_func.__globals__,
1533
nonmethod_func.__name__,
1534
nonmethod_func.__defaults__,
1535
nonmethod_func.__closure__)
1646
1536
new_function = (dbus.service.signal(
1647
1537
alt_interface,
1648
1538
attribute._dbus_signature)(new_function))
1652
1542
attribute._dbus_annotations)
1653
1543
except AttributeError:
1654
1544
pass
1655
1656
1545
# Define a creator of a function to call both the
1657
1546
# original and alternate functions, so both the
1658
1547
# original and alternate signals gets sent when
1661
1550
"""This function is a scope container to pass
1662
1551
func1 and func2 to the "call_both" function
1663
1552
outside of its arguments"""
1664
1553
1665
1554
@functools.wraps(func2)
1666
1555
def call_both(*args, **kwargs):
1667
1556
"""This function will emit two D-Bus
1668
1557
signals by calling func1 and func2"""
1669
1558
func1(*args, **kwargs)
1670
1559
func2(*args, **kwargs)
1671
# Make wrapper function look like a D-Bus
1672
# signal
1560
# Make wrapper function look like a D-Bus signal
1673
1561
for name, attr in inspect.getmembers(func2):
1674
1562
if name.startswith("_dbus_"):
1675
1563
setattr(call_both, name, attr)
1676
1564
1677
1565
return call_both
1678
1566
# Create the "call_both" function and add it to
1679
1567
# the class
1689
1577
alt_interface,
1690
1578
attribute._dbus_in_signature,
1691
1579
attribute._dbus_out_signature)
1692
(copy_function(attribute)))
1580
(types.FunctionType(attribute.func_code,
1581
attribute.func_globals,
1582
attribute.func_name,
1583
attribute.func_defaults,
1584
attribute.func_closure)))
1693
1585
# Copy annotations, if any
1694
1586
try:
1695
1587
attr[attrname]._dbus_annotations = dict(
1707
1599
attribute._dbus_access,
1708
1600
attribute._dbus_get_args_options
1709
1601
["byte_arrays"])
1710
(copy_function(attribute)))
1602
(types.FunctionType(
1603
attribute.func_code,
1604
attribute.func_globals,
1605
attribute.func_name,
1606
attribute.func_defaults,
1607
attribute.func_closure)))
1711
1608
# Copy annotations, if any
1712
1609
try:
1713
1610
attr[attrname]._dbus_annotations = dict(
1722
1619
# to the class.
1723
1620
attr[attrname] = (
1724
1621
dbus_interface_annotations(alt_interface)
1725
(copy_function(attribute)))
1622
(types.FunctionType(attribute.func_code,
1623
attribute.func_globals,
1624
attribute.func_name,
1625
attribute.func_defaults,
1626
attribute.func_closure)))
1726
1627
if deprecate:
1727
1628
# Deprecate all alternate interfaces
1728
iname = "_AlternateDBusNames_interface_annotation{}"
1629
iname="_AlternateDBusNames_interface_annotation{}"
1729
1630
for interface_name in interface_names:
1730
1631
1731
1632
@dbus_interface_annotations(interface_name)
1732
1633
def func(self):
1733
return {"org.freedesktop.DBus.Deprecated":
1734
"true"}
1634
return { "org.freedesktop.DBus.Deprecated":
1635
"true" }
1735
1636
# Find an unused name
1736
1637
for aname in (iname.format(i)
1737
1638
for i in itertools.count()):
1741
1642
if interface_names:
1742
1643
# Replace the class with a new subclass of it with
1743
1644
# methods, signals, etc. as created above.
1744
if sys.version_info.major == 2:
1745
cls = type(b"{}Alternate".format(cls.__name__),
1746
(cls, ), attr)
1747
else:
1748
cls = type("{}Alternate".format(cls.__name__),
1749
(cls, ), attr)
1645
cls = type(b"{}Alternate".format(cls.__name__),
1646
(cls, ), attr)
1750
1647
return cls
1751
1648
1752
1649
return wrapper
1753
1650
1754
1651
1756
1653
"se.bsnet.fukt.Mandos"})
1757
1654
class ClientDBus(Client, DBusObjectWithProperties):
1758
1655
"""A Client class using D-Bus
1759
1656
1760
1657
Attributes:
1761
1658
dbus_object_path: dbus.ObjectPath
1762
1659
bus: dbus.SystemBus()
1763
1660
"""
1764
1661
1765
1662
runtime_expansions = (Client.runtime_expansions
1766
1663
+ ("dbus_object_path", ))
1767
1664
1768
1665
_interface = "se.recompile.Mandos.Client"
1769
1666
1770
1667
# dbus.service.Object doesn't use super(), so we can't either.
1771
1772
def __init__(self, bus=None, *args, **kwargs):
1668
1669
def __init__(self, bus = None, *args, **kwargs):
1773
1670
self.bus = bus
1774
1671
Client.__init__(self, *args, **kwargs)
1775
1672
# Only now, when this client is initialized, can it show up on
1781
1678
"/clients/" + client_object_name)
1782
1679
DBusObjectWithProperties.__init__(self, self.bus,
1783
1680
self.dbus_object_path)
1784
1681
1785
1682
def notifychangeproperty(transform_func, dbus_name,
1786
1683
type_func=lambda x: x,
1787
1684
variant_level=1,
1789
1686
_interface=_interface):
1790
1687
""" Modify a variable so that it's a property which announces
1791
1688
its changes to DBus.
1792
1689
1793
1690
transform_fun: Function that takes a value and a variant_level
1794
1691
and transforms it to a D-Bus type.
1795
1692
dbus_name: D-Bus name of the variable
1798
1695
variant_level: D-Bus variant level. Default: 1
1799
1696
"""
1800
1697
attrname = "_{}".format(dbus_name)
1801
1698
1802
1699
def setter(self, value):
1803
1700
if hasattr(self, "dbus_object_path"):
1804
1701
if (not hasattr(self, attrname) or
1811
1708
else:
1812
1709
dbus_value = transform_func(
1813
1710
type_func(value),
1814
variant_level=variant_level)
1711
variant_level = variant_level)
1815
1712
self.PropertyChanged(dbus.String(dbus_name),
1816
1713
dbus_value)
1817
1714
self.PropertiesChanged(
1818
1715
_interface,
1819
dbus.Dictionary({dbus.String(dbus_name):
1820
dbus_value}),
1716
dbus.Dictionary({ dbus.String(dbus_name):
1717
dbus_value }),
1821
1718
dbus.Array())
1822
1719
setattr(self, attrname, value)
1823
1720
1824
1721
return property(lambda self: getattr(self, attrname), setter)
1825
1722
1826
1723
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1827
1724
approvals_pending = notifychangeproperty(dbus.Boolean,
1828
1725
"ApprovalPending",
1829
type_func=bool)
1726
type_func = bool)
1830
1727
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1831
1728
last_enabled = notifychangeproperty(datetime_to_dbus,
1832
1729
"LastEnabled")
1833
1730
checker = notifychangeproperty(
1834
1731
dbus.Boolean, "CheckerRunning",
1835
type_func=lambda checker: checker is not None)
1732
type_func = lambda checker: checker is not None)
1836
1733
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1837
1734
"LastCheckedOK")
1838
1735
last_checker_status = notifychangeproperty(dbus.Int16,
1843
1740
"ApprovedByDefault")
1844
1741
approval_delay = notifychangeproperty(
1845
1742
dbus.UInt64, "ApprovalDelay",
1846
type_func=lambda td: td.total_seconds() * 1000)
1743
type_func = lambda td: td.total_seconds() * 1000)
1847
1744
approval_duration = notifychangeproperty(
1848
1745
dbus.UInt64, "ApprovalDuration",
1849
type_func=lambda td: td.total_seconds() * 1000)
1746
type_func = lambda td: td.total_seconds() * 1000)
1850
1747
host = notifychangeproperty(dbus.String, "Host")
1851
1748
timeout = notifychangeproperty(
1852
1749
dbus.UInt64, "Timeout",
1853
type_func=lambda td: td.total_seconds() * 1000)
1750
type_func = lambda td: td.total_seconds() * 1000)
1854
1751
extended_timeout = notifychangeproperty(
1855
1752
dbus.UInt64, "ExtendedTimeout",
1856
type_func=lambda td: td.total_seconds() * 1000)
1753
type_func = lambda td: td.total_seconds() * 1000)
1857
1754
interval = notifychangeproperty(
1858
1755
dbus.UInt64, "Interval",
1859
type_func=lambda td: td.total_seconds() * 1000)
1756
type_func = lambda td: td.total_seconds() * 1000)
1860
1757
checker_command = notifychangeproperty(dbus.String, "Checker")
1861
1758
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1862
1759
invalidate_only=True)
1863
1760
1864
1761
del notifychangeproperty
1865
1762
1866
1763
def __del__(self, *args, **kwargs):
1867
1764
try:
1868
1765
self.remove_from_connection()
1871
1768
if hasattr(DBusObjectWithProperties, "__del__"):
1872
1769
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1873
1770
Client.__del__(self, *args, **kwargs)
1874
1771
1875
1772
def checker_callback(self, source, condition,
1876
1773
connection, command, *args, **kwargs):
1877
1774
ret = Client.checker_callback(self, source, condition,
1893
1790
| self.last_checker_signal),
1894
1791
dbus.String(command))
1895
1792
return ret
1896
1793
1897
1794
def start_checker(self, *args, **kwargs):
1898
1795
old_checker_pid = getattr(self.checker, "pid", None)
1899
1796
r = Client.start_checker(self, *args, **kwargs)
1903
1800
# Emit D-Bus signal
1904
1801
self.CheckerStarted(self.current_checker_command)
1905
1802
return r
1906
1803
1907
1804
def _reset_approved(self):
1908
1805
self.approved = None
1909
1806
return False
1910
1807
1911
1808
def approve(self, value=True):
1912
1809
self.approved = value
1913
GLib.timeout_add(int(self.approval_duration.total_seconds()
1914
* 1000), self._reset_approved)
1810
GObject.timeout_add(int(self.approval_duration.total_seconds()
1811
* 1000), self._reset_approved)
1915
1812
self.send_changedstate()
1916
1917
# D-Bus methods, signals & properties
1918
1919
# Interfaces
1920
1921
# Signals
1922
1813
1814
## D-Bus methods, signals & properties
1815
1816
## Interfaces
1817
1818
## Signals
1819
1923
1820
# CheckerCompleted - signal
1924
1821
@dbus.service.signal(_interface, signature="nxs")
1925
1822
def CheckerCompleted(self, exitcode, waitstatus, command):
1926
1823
"D-Bus signal"
1927
1824
pass
1928
1825
1929
1826
# CheckerStarted - signal
1930
1827
@dbus.service.signal(_interface, signature="s")
1931
1828
def CheckerStarted(self, command):
1932
1829
"D-Bus signal"
1933
1830
pass
1934
1831
1935
1832
# PropertyChanged - signal
1936
1833
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1937
1834
@dbus.service.signal(_interface, signature="sv")
1938
1835
def PropertyChanged(self, property, value):
1939
1836
"D-Bus signal"
1940
1837
pass
1941
1838
1942
1839
# GotSecret - signal
1943
1840
@dbus.service.signal(_interface)
1944
1841
def GotSecret(self):
1947
1844
server to mandos-client
1948
1845
"""
1949
1846
pass
1950
1847
1951
1848
# Rejected - signal
1952
1849
@dbus.service.signal(_interface, signature="s")
1953
1850
def Rejected(self, reason):
1954
1851
"D-Bus signal"
1955
1852
pass
1956
1853
1957
1854
# NeedApproval - signal
1958
1855
@dbus.service.signal(_interface, signature="tb")
1959
1856
def NeedApproval(self, timeout, default):
1960
1857
"D-Bus signal"
1961
1858
return self.need_approval()
1962
1963
# Methods
1964
1859
1860
## Methods
1861
1965
1862
# Approve - method
1966
1863
@dbus.service.method(_interface, in_signature="b")
1967
1864
def Approve(self, value):
1968
1865
self.approve(value)
1969
1866
1970
1867
# CheckedOK - method
1971
1868
@dbus.service.method(_interface)
1972
1869
def CheckedOK(self):
1973
1870
self.checked_ok()
1974
1871
1975
1872
# Enable - method
1976
1873
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1977
1874
@dbus.service.method(_interface)
1978
1875
def Enable(self):
1979
1876
"D-Bus method"
1980
1877
self.enable()
1981
1878
1982
1879
# StartChecker - method
1983
1880
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1984
1881
@dbus.service.method(_interface)
1985
1882
def StartChecker(self):
1986
1883
"D-Bus method"
1987
1884
self.start_checker()
1988
1885
1989
1886
# Disable - method
1990
1887
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1991
1888
@dbus.service.method(_interface)
1992
1889
def Disable(self):
1993
1890
"D-Bus method"
1994
1891
self.disable()
1995
1892
1996
1893
# StopChecker - method
1997
1894
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1998
1895
@dbus.service.method(_interface)
1999
1896
def StopChecker(self):
2000
1897
self.stop_checker()
2001
2002
# Properties
2003
1898
1899
## Properties
1900
2004
1901
# ApprovalPending - property
2005
1902
@dbus_service_property(_interface, signature="b", access="read")
2006
1903
def ApprovalPending_dbus_property(self):
2007
1904
return dbus.Boolean(bool(self.approvals_pending))
2008
1905
2009
1906
# ApprovedByDefault - property
2010
1907
@dbus_service_property(_interface,
2011
1908
signature="b",
2014
1911
if value is None: # get
2015
1912
return dbus.Boolean(self.approved_by_default)
2016
1913
self.approved_by_default = bool(value)
2017
1914
2018
1915
# ApprovalDelay - property
2019
1916
@dbus_service_property(_interface,
2020
1917
signature="t",
2024
1921
return dbus.UInt64(self.approval_delay.total_seconds()
2025
1922
* 1000)
2026
1923
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2027
1924
2028
1925
# ApprovalDuration - property
2029
1926
@dbus_service_property(_interface,
2030
1927
signature="t",
2034
1931
return dbus.UInt64(self.approval_duration.total_seconds()
2035
1932
* 1000)
2036
1933
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2037
1934
2038
1935
# Name - property
2039
1936
@dbus_annotations(
2040
1937
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2041
1938
@dbus_service_property(_interface, signature="s", access="read")
2042
1939
def Name_dbus_property(self):
2043
1940
return dbus.String(self.name)
2044
2045
# KeyID - property
2046
@dbus_annotations(
2047
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2048
@dbus_service_property(_interface, signature="s", access="read")
2049
def KeyID_dbus_property(self):
2050
return dbus.String(self.key_id)
2051
1941
2052
1942
# Fingerprint - property
2053
1943
@dbus_annotations(
2054
1944
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2055
1945
@dbus_service_property(_interface, signature="s", access="read")
2056
1946
def Fingerprint_dbus_property(self):
2057
1947
return dbus.String(self.fingerprint)
2058
1948
2059
1949
# Host - property
2060
1950
@dbus_service_property(_interface,
2061
1951
signature="s",
2064
1954
if value is None: # get
2065
1955
return dbus.String(self.host)
2066
1956
self.host = str(value)
2067
1957
2068
1958
# Created - property
2069
1959
@dbus_annotations(
2070
1960
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2071
1961
@dbus_service_property(_interface, signature="s", access="read")
2072
1962
def Created_dbus_property(self):
2073
1963
return datetime_to_dbus(self.created)
2074
1964
2075
1965
# LastEnabled - property
2076
1966
@dbus_service_property(_interface, signature="s", access="read")
2077
1967
def LastEnabled_dbus_property(self):
2078
1968
return datetime_to_dbus(self.last_enabled)
2079
1969
2080
1970
# Enabled - property
2081
1971
@dbus_service_property(_interface,
2082
1972
signature="b",
2088
1978
self.enable()
2089
1979
else:
2090
1980
self.disable()
2091
1981
2092
1982
# LastCheckedOK - property
2093
1983
@dbus_service_property(_interface,
2094
1984
signature="s",
2098
1988
self.checked_ok()
2099
1989
return
2100
1990
return datetime_to_dbus(self.last_checked_ok)
2101
1991
2102
1992
# LastCheckerStatus - property
2103
1993
@dbus_service_property(_interface, signature="n", access="read")
2104
1994
def LastCheckerStatus_dbus_property(self):
2105
1995
return dbus.Int16(self.last_checker_status)
2106
1996
2107
1997
# Expires - property
2108
1998
@dbus_service_property(_interface, signature="s", access="read")
2109
1999
def Expires_dbus_property(self):
2110
2000
return datetime_to_dbus(self.expires)
2111
2001
2112
2002
# LastApprovalRequest - property
2113
2003
@dbus_service_property(_interface, signature="s", access="read")
2114
2004
def LastApprovalRequest_dbus_property(self):
2115
2005
return datetime_to_dbus(self.last_approval_request)
2116
2006
2117
2007
# Timeout - property
2118
2008
@dbus_service_property(_interface,
2119
2009
signature="t",
2134
2024
if (getattr(self, "disable_initiator_tag", None)
2135
2025
is None):
2136
2026
return
2137
GLib.source_remove(self.disable_initiator_tag)
2138
self.disable_initiator_tag = GLib.timeout_add(
2027
GObject.source_remove(self.disable_initiator_tag)
2028
self.disable_initiator_tag = GObject.timeout_add(
2139
2029
int((self.expires - now).total_seconds() * 1000),
2140
2030
self.disable)
2141
2031
2142
2032
# ExtendedTimeout - property
2143
2033
@dbus_service_property(_interface,
2144
2034
signature="t",
2148
2038
return dbus.UInt64(self.extended_timeout.total_seconds()
2149
2039
* 1000)
2150
2040
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2151
2041
2152
2042
# Interval - property
2153
2043
@dbus_service_property(_interface,
2154
2044
signature="t",
2161
2051
return
2162
2052
if self.enabled:
2163
2053
# Reschedule checker run
2164
GLib.source_remove(self.checker_initiator_tag)
2165
self.checker_initiator_tag = GLib.timeout_add(
2054
GObject.source_remove(self.checker_initiator_tag)
2055
self.checker_initiator_tag = GObject.timeout_add(
2166
2056
value, self.start_checker)
2167
self.start_checker() # Start one now, too
2168
2057
self.start_checker() # Start one now, too
2058
2169
2059
# Checker - property
2170
2060
@dbus_service_property(_interface,
2171
2061
signature="s",
2174
2064
if value is None: # get
2175
2065
return dbus.String(self.checker_command)
2176
2066
self.checker_command = str(value)
2177
2067
2178
2068
# CheckerRunning - property
2179
2069
@dbus_service_property(_interface,
2180
2070
signature="b",
2186
2076
self.start_checker()
2187
2077
else:
2188
2078
self.stop_checker()
2189
2079
2190
2080
# ObjectPath - property
2191
2081
@dbus_annotations(
2192
2082
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2193
2083
"org.freedesktop.DBus.Deprecated": "true"})
2194
2084
@dbus_service_property(_interface, signature="o", access="read")
2195
2085
def ObjectPath_dbus_property(self):
2196
return self.dbus_object_path # is already a dbus.ObjectPath
2197
2086
return self.dbus_object_path # is already a dbus.ObjectPath
2087
2198
2088
# Secret = property
2199
2089
@dbus_annotations(
2200
2090
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2205
2095
byte_arrays=True)
2206
2096
def Secret_dbus_property(self, value):
2207
2097
self.secret = bytes(value)
2208
2098
2209
2099
del _interface
2210
2100
2211
2101
2212
2102
class ProxyClient(object):
2213
def __init__(self, child_pipe, key_id, fpr, address):
2103
def __init__(self, child_pipe, fpr, address):
2214
2104
self._pipe = child_pipe
2215
self._pipe.send(('init', key_id, fpr, address))
2105
self._pipe.send(('init', fpr, address))
2216
2106
if not self._pipe.recv():
2217
raise KeyError(key_id or fpr)
2218
2107
raise KeyError(fpr)
2108
2219
2109
def __getattribute__(self, name):
2220
2110
if name == '_pipe':
2221
2111
return super(ProxyClient, self).__getattribute__(name)
2224
2114
if data[0] == 'data':
2225
2115
return data[1]
2226
2116
if data[0] == 'function':
2227
2117
2228
2118
def func(*args, **kwargs):
2229
2119
self._pipe.send(('funcall', name, args, kwargs))
2230
2120
return self._pipe.recv()[1]
2231
2121
2232
2122
return func
2233
2123
2234
2124
def __setattr__(self, name, value):
2235
2125
if name == '_pipe':
2236
2126
return super(ProxyClient, self).__setattr__(name, value)
2239
2129
2240
2130
class ClientHandler(socketserver.BaseRequestHandler, object):
2241
2131
"""A class to handle client connections.
2242
2132
2243
2133
Instantiated once for each connection to handle it.
2244
2134
Note: This will run in its own forked process."""
2245
2135
2246
2136
def handle(self):
2247
2137
with contextlib.closing(self.server.child_pipe) as child_pipe:
2248
2138
logger.info("TCP connection from: %s",
2249
2139
str(self.client_address))
2250
2140
logger.debug("Pipe FD: %d",
2251
2141
self.server.child_pipe.fileno())
2252
2142
2253
2143
session = gnutls.ClientSession(self.request)
2254
2255
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2256
# "+AES-256-CBC", "+SHA1",
2257
# "+COMP-NULL", "+CTYPE-OPENPGP",
2258
# "+DHE-DSS"))
2144
2145
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
2146
# "+AES-256-CBC", "+SHA1",
2147
# "+COMP-NULL", "+CTYPE-OPENPGP",
2148
# "+DHE-DSS"))
2259
2149
# Use a fallback default, since this MUST be set.
2260
2150
priority = self.server.gnutls_priority
2261
2151
if priority is None:
2262
2152
priority = "NORMAL"
2263
gnutls.priority_set_direct(session._c_object,
2264
priority.encode("utf-8"),
2153
gnutls.priority_set_direct(session._c_object, priority,
2265
2154
None)
2266
2155
2267
2156
# Start communication using the Mandos protocol
2268
2157
# Get protocol number
2269
2158
line = self.request.makefile().readline()
2274
2163
except (ValueError, IndexError, RuntimeError) as error:
2275
2164
logger.error("Unknown protocol version: %s", error)
2276
2165
return
2277
2166
2278
2167
# Start GnuTLS connection
2279
2168
try:
2280
2169
session.handshake()
2284
2173
# established. Just abandon the request.
2285
2174
return
2286
2175
logger.debug("Handshake succeeded")
2287
2176
2288
2177
approval_required = False
2289
2178
try:
2290
if gnutls.has_rawpk:
2291
fpr = b""
2292
try:
2293
key_id = self.key_id(
2294
self.peer_certificate(session))
2295
except (TypeError, gnutls.Error) as error:
2296
logger.warning("Bad certificate: %s", error)
2297
return
2298
logger.debug("Key ID: %s", key_id)
2299
2300
else:
2301
key_id = b""
2302
try:
2303
fpr = self.fingerprint(
2304
self.peer_certificate(session))
2305
except (TypeError, gnutls.Error) as error:
2306
logger.warning("Bad certificate: %s", error)
2307
return
2308
logger.debug("Fingerprint: %s", fpr)
2309
2310
try:
2311
client = ProxyClient(child_pipe, key_id, fpr,
2179
try:
2180
fpr = self.fingerprint(
2181
self.peer_certificate(session))
2182
except (TypeError, gnutls.Error) as error:
2183
logger.warning("Bad certificate: %s", error)
2184
return
2185
logger.debug("Fingerprint: %s", fpr)
2186
2187
try:
2188
client = ProxyClient(child_pipe, fpr,
2312
2189
self.client_address)
2313
2190
except KeyError:
2314
2191
return
2315
2192
2316
2193
if client.approval_delay:
2317
2194
delay = client.approval_delay
2318
2195
client.approvals_pending += 1
2319
2196
approval_required = True
2320
2197
2321
2198
while True:
2322
2199
if not client.enabled:
2323
2200
logger.info("Client %s is disabled",
2326
2203
# Emit D-Bus signal
2327
2204
client.Rejected("Disabled")
2328
2205
return
2329
2206
2330
2207
if client.approved or not client.approval_delay:
2331
# We are approved or approval is disabled
2208
#We are approved or approval is disabled
2332
2209
break
2333
2210
elif client.approved is None:
2334
2211
logger.info("Client %s needs approval",
2345
2222
# Emit D-Bus signal
2346
2223
client.Rejected("Denied")
2347
2224
return
2348
2349
# wait until timeout or approved
2225
2226
#wait until timeout or approved
2350
2227
time = datetime.datetime.now()
2351
2228
client.changedstate.acquire()
2352
2229
client.changedstate.wait(delay.total_seconds())
2365
2242
break
2366
2243
else:
2367
2244
delay -= time2 - time
2368
2245
2369
2246
try:
2370
2247
session.send(client.secret)
2371
2248
except gnutls.Error as error:
2372
2249
logger.warning("gnutls send failed",
2373
exc_info=error)
2250
exc_info = error)
2374
2251
return
2375
2252
2376
2253
logger.info("Sending secret to %s", client.name)
2377
2254
# bump the timeout using extended_timeout
2378
2255
client.bump_timeout(client.extended_timeout)
2379
2256
if self.server.use_dbus:
2380
2257
# Emit D-Bus signal
2381
2258
client.GotSecret()
2382
2259
2383
2260
finally:
2384
2261
if approval_required:
2385
2262
client.approvals_pending -= 1
2388
2265
except gnutls.Error as error:
2389
2266
logger.warning("GnuTLS bye failed",
2390
2267
exc_info=error)
2391
2268
2392
2269
@staticmethod
2393
2270
def peer_certificate(session):
2394
"Return the peer's certificate as a bytestring"
2395
try:
2396
cert_type = gnutls.certificate_type_get2(session._c_object,
2397
gnutls.CTYPE_PEERS)
2398
except AttributeError:
2399
cert_type = gnutls.certificate_type_get(session._c_object)
2400
if gnutls.has_rawpk:
2401
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2402
else:
2403
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2404
# If not a valid certificate type...
2405
if cert_type not in valid_cert_types:
2406
logger.info("Cert type %r not in %r", cert_type,
2407
valid_cert_types)
2271
"Return the peer's OpenPGP certificate as a bytestring"
2272
# If not an OpenPGP certificate...
2273
if (gnutls.certificate_type_get(session._c_object)
2274
!= gnutls.CRT_OPENPGP):
2408
2275
# ...return invalid data
2409
2276
return b""
2410
2277
list_size = ctypes.c_uint(1)
2416
2283
return None
2417
2284
cert = cert_list[0]
2418
2285
return ctypes.string_at(cert.data, cert.size)
2419
2420
@staticmethod
2421
def key_id(certificate):
2422
"Convert a certificate bytestring to a hexdigit key ID"
2423
# New GnuTLS "datum" with the public key
2424
datum = gnutls.datum_t(
2425
ctypes.cast(ctypes.c_char_p(certificate),
2426
ctypes.POINTER(ctypes.c_ubyte)),
2427
ctypes.c_uint(len(certificate)))
2428
# XXX all these need to be created in the gnutls "module"
2429
# New empty GnuTLS certificate
2430
pubkey = gnutls.pubkey_t()
2431
gnutls.pubkey_init(ctypes.byref(pubkey))
2432
# Import the raw public key into the certificate
2433
gnutls.pubkey_import(pubkey,
2434
ctypes.byref(datum),
2435
gnutls.X509_FMT_DER)
2436
# New buffer for the key ID
2437
buf = ctypes.create_string_buffer(32)
2438
buf_len = ctypes.c_size_t(len(buf))
2439
# Get the key ID from the raw public key into the buffer
2440
gnutls.pubkey_get_key_id(pubkey,
2441
gnutls.KEYID_USE_SHA256,
2442
ctypes.cast(ctypes.byref(buf),
2443
ctypes.POINTER(ctypes.c_ubyte)),
2444
ctypes.byref(buf_len))
2445
# Deinit the certificate
2446
gnutls.pubkey_deinit(pubkey)
2447
2448
# Convert the buffer to a Python bytestring
2449
key_id = ctypes.string_at(buf, buf_len.value)
2450
# Convert the bytestring to hexadecimal notation
2451
hex_key_id = binascii.hexlify(key_id).upper()
2452
return hex_key_id
2453
2286
2454
2287
@staticmethod
2455
2288
def fingerprint(openpgp):
2456
2289
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2471
2304
ctypes.byref(crtverify))
2472
2305
if crtverify.value != 0:
2473
2306
gnutls.openpgp_crt_deinit(crt)
2474
raise gnutls.CertificateSecurityError(code
2475
=crtverify.value)
2307
raise gnutls.CertificateSecurityError("Verify failed")
2476
2308
# New buffer for the fingerprint
2477
2309
buf = ctypes.create_string_buffer(20)
2478
2310
buf_len = ctypes.c_size_t()
2490
2322
2491
2323
class MultiprocessingMixIn(object):
2492
2324
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2493
2325
2494
2326
def sub_process_main(self, request, address):
2495
2327
try:
2496
2328
self.finish_request(request, address)
2497
2329
except Exception:
2498
2330
self.handle_error(request, address)
2499
2331
self.close_request(request)
2500
2332
2501
2333
def process_request(self, request, address):
2502
2334
"""Start a new process to process the request."""
2503
proc = multiprocessing.Process(target=self.sub_process_main,
2504
args=(request, address))
2335
proc = multiprocessing.Process(target = self.sub_process_main,
2336
args = (request, address))
2505
2337
proc.start()
2506
2338
return proc
2507
2339
2508
2340
2509
2341
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2510
2342
""" adds a pipe to the MixIn """
2511
2343
2512
2344
def process_request(self, request, client_address):
2513
2345
"""Overrides and wraps the original process_request().
2514
2346
2515
2347
This function creates a new pipe in self.pipe
2516
2348
"""
2517
2349
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2518
2350
2519
2351
proc = MultiprocessingMixIn.process_request(self, request,
2520
2352
client_address)
2521
2353
self.child_pipe.close()
2522
2354
self.add_pipe(parent_pipe, proc)
2523
2355
2524
2356
def add_pipe(self, parent_pipe, proc):
2525
2357
"""Dummy function; override as necessary"""
2526
2358
raise NotImplementedError()
2529
2361
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2530
2362
socketserver.TCPServer, object):
2531
2363
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2532
2364
2533
2365
Attributes:
2534
2366
enabled: Boolean; whether this server is activated yet
2535
2367
interface: None or a network interface name (string)
2536
2368
use_ipv6: Boolean; to use IPv6 or not
2537
2369
"""
2538
2370
2539
2371
def __init__(self, server_address, RequestHandlerClass,
2540
2372
interface=None,
2541
2373
use_ipv6=True,
2551
2383
self.socketfd = socketfd
2552
2384
# Save the original socket.socket() function
2553
2385
self.socket_socket = socket.socket
2554
2555
2386
# To implement --socket, we monkey patch socket.socket.
2556
#
2387
#
2557
2388
# (When socketserver.TCPServer is a new-style class, we
2558
2389
# could make self.socket into a property instead of monkey
2559
2390
# patching socket.socket.)
2560
#
2391
#
2561
2392
# Create a one-time-only replacement for socket.socket()
2562
2393
@functools.wraps(socket.socket)
2563
2394
def socket_wrapper(*args, **kwargs):
2575
2406
# socket_wrapper(), if socketfd was set.
2576
2407
socketserver.TCPServer.__init__(self, server_address,
2577
2408
RequestHandlerClass)
2578
2409
2579
2410
def server_bind(self):
2580
2411
"""This overrides the normal server_bind() function
2581
2412
to bind to an interface if one was specified, and also NOT to
2582
2413
bind to an address or port if they were not specified."""
2583
global SO_BINDTODEVICE
2584
2414
if self.interface is not None:
2585
2415
if SO_BINDTODEVICE is None:
2586
# Fall back to a hard-coded value which seems to be
2587
# common enough.
2588
logger.warning("SO_BINDTODEVICE not found, trying 25")
2589
SO_BINDTODEVICE = 25
2590
try:
2591
self.socket.setsockopt(
2592
socket.SOL_SOCKET, SO_BINDTODEVICE,
2593
(self.interface + "\0").encode("utf-8"))
2594
except socket.error as error:
2595
if error.errno == errno.EPERM:
2596
logger.error("No permission to bind to"
2597
" interface %s", self.interface)
2598
elif error.errno == errno.ENOPROTOOPT:
2599
logger.error("SO_BINDTODEVICE not available;"
2600
" cannot bind to interface %s",
2601
self.interface)
2602
elif error.errno == errno.ENODEV:
2603
logger.error("Interface %s does not exist,"
2604
" cannot bind", self.interface)
2605
else:
2606
raise
2416
logger.error("SO_BINDTODEVICE does not exist;"
2417
" cannot bind to interface %s",
2418
self.interface)
2419
else:
2420
try:
2421
self.socket.setsockopt(
2422
socket.SOL_SOCKET, SO_BINDTODEVICE,
2423
(self.interface + "\0").encode("utf-8"))
2424
except socket.error as error:
2425
if error.errno == errno.EPERM:
2426
logger.error("No permission to bind to"
2427
" interface %s", self.interface)
2428
elif error.errno == errno.ENOPROTOOPT:
2429
logger.error("SO_BINDTODEVICE not available;"
2430
" cannot bind to interface %s",
2431
self.interface)
2432
elif error.errno == errno.ENODEV:
2433
logger.error("Interface %s does not exist,"
2434
" cannot bind", self.interface)
2435
else:
2436
raise
2607
2437
# Only bind(2) the socket if we really need to.
2608
2438
if self.server_address[0] or self.server_address[1]:
2609
if self.server_address[1]:
2610
self.allow_reuse_address = True
2611
2439
if not self.server_address[0]:
2612
2440
if self.address_family == socket.AF_INET6:
2613
any_address = "::" # in6addr_any
2441
any_address = "::" # in6addr_any
2614
2442
else:
2615
any_address = "0.0.0.0" # INADDR_ANY
2443
any_address = "0.0.0.0" # INADDR_ANY
2616
2444
self.server_address = (any_address,
2617
2445
self.server_address[1])
2618
2446
elif not self.server_address[1]:
2628
2456
2629
2457
class MandosServer(IPv6_TCPServer):
2630
2458
"""Mandos server.
2631
2459
2632
2460
Attributes:
2633
2461
clients: set of Client objects
2634
2462
gnutls_priority GnuTLS priority string
2635
2463
use_dbus: Boolean; to emit D-Bus signals or not
2636
2637
Assumes a GLib.MainLoop event loop.
2464
2465
Assumes a GObject.MainLoop event loop.
2638
2466
"""
2639
2467
2640
2468
def __init__(self, server_address, RequestHandlerClass,
2641
2469
interface=None,
2642
2470
use_ipv6=True,
2652
2480
self.gnutls_priority = gnutls_priority
2653
2481
IPv6_TCPServer.__init__(self, server_address,
2654
2482
RequestHandlerClass,
2655
interface=interface,
2656
use_ipv6=use_ipv6,
2657
socketfd=socketfd)
2658
2483
interface = interface,
2484
use_ipv6 = use_ipv6,
2485
socketfd = socketfd)
2486
2659
2487
def server_activate(self):
2660
2488
if self.enabled:
2661
2489
return socketserver.TCPServer.server_activate(self)
2662
2490
2663
2491
def enable(self):
2664
2492
self.enabled = True
2665
2493
2666
2494
def add_pipe(self, parent_pipe, proc):
2667
2495
# Call "handle_ipc" for both data and EOF events
2668
GLib.io_add_watch(
2496
GObject.io_add_watch(
2669
2497
parent_pipe.fileno(),
2670
GLib.IO_IN | GLib.IO_HUP,
2498
GObject.IO_IN | GObject.IO_HUP,
2671
2499
functools.partial(self.handle_ipc,
2672
parent_pipe=parent_pipe,
2673
proc=proc))
2674
2500
parent_pipe = parent_pipe,
2501
proc = proc))
2502
2675
2503
def handle_ipc(self, source, condition,
2676
2504
parent_pipe=None,
2677
proc=None,
2505
proc = None,
2678
2506
client_object=None):
2679
2507
# error, or the other end of multiprocessing.Pipe has closed
2680
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2508
if condition & (GObject.IO_ERR | GObject.IO_HUP):
2681
2509
# Wait for other process to exit
2682
2510
proc.join()
2683
2511
return False
2684
2512
2685
2513
# Read a request from the child
2686
2514
request = parent_pipe.recv()
2687
2515
command = request[0]
2688
2516
2689
2517
if command == 'init':
2690
key_id = request[1].decode("ascii")
2691
fpr = request[2].decode("ascii")
2692
address = request[3]
2693
2694
for c in self.clients.values():
2695
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2696
continue
2697
if key_id and c.key_id == key_id:
2698
client = c
2699
break
2700
if fpr and c.fingerprint == fpr:
2518
fpr = request[1]
2519
address = request[2]
2520
2521
for c in self.clients.itervalues():
2522
if c.fingerprint == fpr:
2701
2523
client = c
2702
2524
break
2703
2525
else:
2704
logger.info("Client not found for key ID: %s, address"
2705
": %s", key_id or fpr, address)
2526
logger.info("Client not found for fingerprint: %s, ad"
2527
"dress: %s", fpr, address)
2706
2528
if self.use_dbus:
2707
2529
# Emit D-Bus signal
2708
mandos_dbus_service.ClientNotFound(key_id or fpr,
2530
mandos_dbus_service.ClientNotFound(fpr,
2709
2531
address[0])
2710
2532
parent_pipe.send(False)
2711
2533
return False
2712
2713
GLib.io_add_watch(
2534
2535
GObject.io_add_watch(
2714
2536
parent_pipe.fileno(),
2715
GLib.IO_IN | GLib.IO_HUP,
2537
GObject.IO_IN | GObject.IO_HUP,
2716
2538
functools.partial(self.handle_ipc,
2717
parent_pipe=parent_pipe,
2718
proc=proc,
2719
client_object=client))
2539
parent_pipe = parent_pipe,
2540
proc = proc,
2541
client_object = client))
2720
2542
parent_pipe.send(True)
2721
2543
# remove the old hook in favor of the new above hook on
2722
2544
# same fileno
2725
2547
funcname = request[1]
2726
2548
args = request[2]
2727
2549
kwargs = request[3]
2728
2550
2729
2551
parent_pipe.send(('data', getattr(client_object,
2730
2552
funcname)(*args,
2731
2553
**kwargs)))
2732
2554
2733
2555
if command == 'getattr':
2734
2556
attrname = request[1]
2735
2557
if isinstance(client_object.__getattribute__(attrname),
2738
2560
else:
2739
2561
parent_pipe.send((
2740
2562
'data', client_object.__getattribute__(attrname)))
2741
2563
2742
2564
if command == 'setattr':
2743
2565
attrname = request[1]
2744
2566
value = request[2]
2745
2567
setattr(client_object, attrname, value)
2746
2568
2747
2569
return True
2748
2570
2749
2571
2750
2572
def rfc3339_duration_to_delta(duration):
2751
2573
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2752
2574
2753
2575
>>> rfc3339_duration_to_delta("P7D")
2754
2576
datetime.timedelta(7)
2755
2577
>>> rfc3339_duration_to_delta("PT60S")
2765
2587
>>> rfc3339_duration_to_delta("P1DT3M20S")
2766
2588
datetime.timedelta(1, 200)
2767
2589
"""
2768
2590
2769
2591
# Parsing an RFC 3339 duration with regular expressions is not
2770
2592
# possible - there would have to be multiple places for the same
2771
2593
# values, like seconds. The current code, while more esoteric, is
2772
2594
# cleaner without depending on a parsing library. If Python had a
2773
2595
# built-in library for parsing we would use it, but we'd like to
2774
2596
# avoid excessive use of external libraries.
2775
2597
2776
2598
# New type for defining tokens, syntax, and semantics all-in-one
2777
2599
Token = collections.namedtuple("Token", (
2778
2600
"regexp", # To match token; if "value" is not None, must have
2811
2633
frozenset((token_year, token_month,
2812
2634
token_day, token_time,
2813
2635
token_week)))
2814
# Define starting values:
2815
# Value so far
2816
value = datetime.timedelta()
2636
# Define starting values
2637
value = datetime.timedelta() # Value so far
2817
2638
found_token = None
2818
# Following valid tokens
2819
followers = frozenset((token_duration, ))
2820
# String left to parse
2821
s = duration
2639
followers = frozenset((token_duration, )) # Following valid tokens
2640
s = duration # String left to parse
2822
2641
# Loop until end token is found
2823
2642
while found_token is not token_end:
2824
2643
# Search for any currently valid tokens
2848
2667
2849
2668
def string_to_delta(interval):
2850
2669
"""Parse a string and return a datetime.timedelta
2851
2670
2852
2671
>>> string_to_delta('7d')
2853
2672
datetime.timedelta(7)
2854
2673
>>> string_to_delta('60s')
2862
2681
>>> string_to_delta('5m 30s')
2863
2682
datetime.timedelta(0, 330)
2864
2683
"""
2865
2684
2866
2685
try:
2867
2686
return rfc3339_duration_to_delta(interval)
2868
2687
except ValueError:
2869
2688
pass
2870
2689
2871
2690
timevalue = datetime.timedelta(0)
2872
2691
for s in interval.split():
2873
2692
try:
2891
2710
return timevalue
2892
2711
2893
2712
2894
def daemon(nochdir=False, noclose=False):
2713
def daemon(nochdir = False, noclose = False):
2895
2714
"""See daemon(3). Standard BSD Unix function.
2896
2715
2897
2716
This should really exist as os.daemon, but it doesn't (yet)."""
2898
2717
if os.fork():
2899
2718
sys.exit()
2917
2736
2918
2737
2919
2738
def main():
2920
2739
2921
2740
##################################################################
2922
2741
# Parsing of options, both command line and config file
2923
2742
2924
2743
parser = argparse.ArgumentParser()
2925
2744
parser.add_argument("-v", "--version", action="version",
2926
version="%(prog)s {}".format(version),
2745
version = "%(prog)s {}".format(version),
2927
2746
help="show version number and exit")
2928
2747
parser.add_argument("-i", "--interface", metavar="IF",
2929
2748
help="Bind to interface IF")
2965
2784
parser.add_argument("--no-zeroconf", action="store_false",
2966
2785
dest="zeroconf", help="Do not use Zeroconf",
2967
2786
default=None)
2968
2787
2969
2788
options = parser.parse_args()
2970
2789
2971
2790
if options.check:
2972
2791
import doctest
2973
2792
fail_count, test_count = doctest.testmod()
2974
2793
sys.exit(os.EX_OK if fail_count == 0 else 1)
2975
2794
2976
2795
# Default values for config file for server-global settings
2977
if gnutls.has_rawpk:
2978
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
2979
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
2980
else:
2981
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2982
":+SIGN-DSA-SHA256")
2983
server_defaults = {"interface": "",
2984
"address": "",
2985
"port": "",
2986
"debug": "False",
2987
"priority": priority,
2988
"servicename": "Mandos",
2989
"use_dbus": "True",
2990
"use_ipv6": "True",
2991
"debuglevel": "",
2992
"restore": "True",
2993
"socket": "",
2994
"statedir": "/var/lib/mandos",
2995
"foreground": "False",
2996
"zeroconf": "True",
2997
}
2998
del priority
2999
2796
server_defaults = { "interface": "",
2797
"address": "",
2798
"port": "",
2799
"debug": "False",
2800
"priority":
2801
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2802
":+SIGN-DSA-SHA256",
2803
"servicename": "Mandos",
2804
"use_dbus": "True",
2805
"use_ipv6": "True",
2806
"debuglevel": "",
2807
"restore": "True",
2808
"socket": "",
2809
"statedir": "/var/lib/mandos",
2810
"foreground": "False",
2811
"zeroconf": "True",
2812
}
2813
3000
2814
# Parse config file for server-global settings
3001
2815
server_config = configparser.SafeConfigParser(server_defaults)
3002
2816
del server_defaults
3004
2818
# Convert the SafeConfigParser object to a dict
3005
2819
server_settings = server_config.defaults()
3006
2820
# Use the appropriate methods on the non-string config options
3007
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3008
"foreground", "zeroconf"):
2821
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
3009
2822
server_settings[option] = server_config.getboolean("DEFAULT",
3010
2823
option)
3011
2824
if server_settings["port"]:
3021
2834
server_settings["socket"] = os.dup(server_settings
3022
2835
["socket"])
3023
2836
del server_config
3024
2837
3025
2838
# Override the settings from the config file with command line
3026
2839
# options, if set.
3027
2840
for option in ("interface", "address", "port", "debug",
3045
2858
if server_settings["debug"]:
3046
2859
server_settings["foreground"] = True
3047
2860
# Now we have our good server settings in "server_settings"
3048
2861
3049
2862
##################################################################
3050
2863
3051
2864
if (not server_settings["zeroconf"]
3052
2865
and not (server_settings["port"]
3053
2866
or server_settings["socket"] != "")):
3054
2867
parser.error("Needs port or socket to work without Zeroconf")
3055
2868
3056
2869
# For convenience
3057
2870
debug = server_settings["debug"]
3058
2871
debuglevel = server_settings["debuglevel"]
3062
2875
stored_state_file)
3063
2876
foreground = server_settings["foreground"]
3064
2877
zeroconf = server_settings["zeroconf"]
3065
2878
3066
2879
if debug:
3067
2880
initlogger(debug, logging.DEBUG)
3068
2881
else:
3071
2884
else:
3072
2885
level = getattr(logging, debuglevel.upper())
3073
2886
initlogger(debug, level)
3074
2887
3075
2888
if server_settings["servicename"] != "Mandos":
3076
2889
syslogger.setFormatter(
3077
2890
logging.Formatter('Mandos ({}) [%(process)d]:'
3078
2891
' %(levelname)s: %(message)s'.format(
3079
2892
server_settings["servicename"])))
3080
2893
3081
2894
# Parse config file with clients
3082
2895
client_config = configparser.SafeConfigParser(Client
3083
2896
.client_defaults)
3084
2897
client_config.read(os.path.join(server_settings["configdir"],
3085
2898
"clients.conf"))
3086
2899
3087
2900
global mandos_dbus_service
3088
2901
mandos_dbus_service = None
3089
2902
3090
2903
socketfd = None
3091
2904
if server_settings["socket"] != "":
3092
2905
socketfd = server_settings["socket"]
3108
2921
except IOError as e:
3109
2922
logger.error("Could not open file %r", pidfilename,
3110
2923
exc_info=e)
3111
2924
3112
2925
for name, group in (("_mandos", "_mandos"),
3113
2926
("mandos", "mandos"),
3114
2927
("nobody", "nogroup")):
3124
2937
try:
3125
2938
os.setgid(gid)
3126
2939
os.setuid(uid)
3127
if debug:
3128
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3129
gid))
3130
2940
except OSError as error:
3131
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3132
.format(uid, gid, os.strerror(error.errno)))
3133
2941
if error.errno != errno.EPERM:
3134
2942
raise
3135
2943
3136
2944
if debug:
3137
2945
# Enable all possible GnuTLS debugging
3138
2946
3139
2947
# "Use a log level over 10 to enable all debugging options."
3140
2948
# - GnuTLS manual
3141
2949
gnutls.global_set_log_level(11)
3142
2950
3143
2951
@gnutls.log_func
3144
2952
def debug_gnutls(level, string):
3145
2953
logger.debug("GnuTLS: %s", string[:-1])
3146
2954
3147
2955
gnutls.global_set_log_function(debug_gnutls)
3148
2956
3149
2957
# Redirect stdin so all checkers get /dev/null
3150
2958
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3151
2959
os.dup2(null, sys.stdin.fileno())
3152
2960
if null > 2:
3153
2961
os.close(null)
3154
2962
3155
2963
# Need to fork before connecting to D-Bus
3156
2964
if not foreground:
3157
2965
# Close all input and output, do double fork, etc.
3158
2966
daemon()
3159
3160
# multiprocessing will use threads, so before we use GLib we need
3161
# to inform GLib that threads will be used.
3162
GLib.threads_init()
3163
2967
2968
# multiprocessing will use threads, so before we use GObject we
2969
# need to inform GObject that threads will be used.
2970
GObject.threads_init()
2971
3164
2972
global main_loop
3165
2973
# From the Avahi example code
3166
2974
DBusGMainLoop(set_as_default=True)
3167
main_loop = GLib.MainLoop()
2975
main_loop = GObject.MainLoop()
3168
2976
bus = dbus.SystemBus()
3169
2977
# End of Avahi example code
3170
2978
if use_dbus:
3183
2991
if zeroconf:
3184
2992
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3185
2993
service = AvahiServiceToSyslog(
3186
name=server_settings["servicename"],
3187
servicetype="_mandos._tcp",
3188
protocol=protocol,
3189
bus=bus)
2994
name = server_settings["servicename"],
2995
servicetype = "_mandos._tcp",
2996
protocol = protocol,
2997
bus = bus)
3190
2998
if server_settings["interface"]:
3191
2999
service.interface = if_nametoindex(
3192
3000
server_settings["interface"].encode("utf-8"))
3193
3001
3194
3002
global multiprocessing_manager
3195
3003
multiprocessing_manager = multiprocessing.Manager()
3196
3004
3197
3005
client_class = Client
3198
3006
if use_dbus:
3199
client_class = functools.partial(ClientDBus, bus=bus)
3200
3007
client_class = functools.partial(ClientDBus, bus = bus)
3008
3201
3009
client_settings = Client.config_parser(client_config)
3202
3010
old_client_settings = {}
3203
3011
clients_data = {}
3204
3012
3205
3013
# This is used to redirect stdout and stderr for checker processes
3206
3014
global wnull
3207
wnull = open(os.devnull, "w") # A writable /dev/null
3015
wnull = open(os.devnull, "w") # A writable /dev/null
3208
3016
# Only used if server is running in foreground but not in debug
3209
3017
# mode
3210
3018
if debug or not foreground:
3211
3019
wnull.close()
3212
3020
3213
3021
# Get client data and settings from last running state.
3214
3022
if server_settings["restore"]:
3215
3023
try:
3216
3024
with open(stored_state_path, "rb") as stored_state:
3217
if sys.version_info.major == 2:
3218
clients_data, old_client_settings = pickle.load(
3219
stored_state)
3220
else:
3221
bytes_clients_data, bytes_old_client_settings = (
3222
pickle.load(stored_state, encoding="bytes"))
3223
# Fix bytes to strings
3224
# clients_data
3225
# .keys()
3226
clients_data = {(key.decode("utf-8")
3227
if isinstance(key, bytes)
3228
else key): value
3229
for key, value in
3230
bytes_clients_data.items()}
3231
del bytes_clients_data
3232
for key in clients_data:
3233
value = {(k.decode("utf-8")
3234
if isinstance(k, bytes) else k): v
3235
for k, v in
3236
clients_data[key].items()}
3237
clients_data[key] = value
3238
# .client_structure
3239
value["client_structure"] = [
3240
(s.decode("utf-8")
3241
if isinstance(s, bytes)
3242
else s) for s in
3243
value["client_structure"]]
3244
# .name & .host
3245
for k in ("name", "host"):
3246
if isinstance(value[k], bytes):
3247
value[k] = value[k].decode("utf-8")
3248
if "key_id" not in value:
3249
value["key_id"] = ""
3250
elif "fingerprint" not in value:
3251
value["fingerprint"] = ""
3252
# old_client_settings
3253
# .keys()
3254
old_client_settings = {
3255
(key.decode("utf-8")
3256
if isinstance(key, bytes)
3257
else key): value
3258
for key, value in
3259
bytes_old_client_settings.items()}
3260
del bytes_old_client_settings
3261
# .host
3262
for value in old_client_settings.values():
3263
if isinstance(value["host"], bytes):
3264
value["host"] = (value["host"]
3265
.decode("utf-8"))
3025
clients_data, old_client_settings = pickle.load(
3026
stored_state)
3266
3027
os.remove(stored_state_path)
3267
3028
except IOError as e:
3268
3029
if e.errno == errno.ENOENT:
3276
3037
logger.warning("Could not load persistent state: "
3277
3038
"EOFError:",
3278
3039
exc_info=e)
3279
3040
3280
3041
with PGPEngine() as pgp:
3281
3042
for client_name, client in clients_data.items():
3282
3043
# Skip removed clients
3283
3044
if client_name not in client_settings:
3284
3045
continue
3285
3046
3286
3047
# Decide which value to use after restoring saved state.
3287
3048
# We have three different values: Old config file,
3288
3049
# new config file, and saved state.
3299
3060
client[name] = value
3300
3061
except KeyError:
3301
3062
pass
3302
3063
3303
3064
# Clients who has passed its expire date can still be
3304
3065
# enabled if its last checker was successful. A Client
3305
3066
# whose checker succeeded before we stored its state is
3338
3099
client_name))
3339
3100
client["secret"] = (client_settings[client_name]
3340
3101
["secret"])
3341
3102
3342
3103
# Add/remove clients based on new changes made to config
3343
3104
for client_name in (set(old_client_settings)
3344
3105
- set(client_settings)):
3346
3107
for client_name in (set(client_settings)
3347
3108
- set(old_client_settings)):
3348
3109
clients_data[client_name] = client_settings[client_name]
3349
3110
3350
3111
# Create all client objects
3351
3112
for client_name, client in clients_data.items():
3352
3113
tcp_server.clients[client_name] = client_class(
3353
name=client_name,
3354
settings=client,
3355
server_settings=server_settings)
3356
3114
name = client_name,
3115
settings = client,
3116
server_settings = server_settings)
3117
3357
3118
if not tcp_server.clients:
3358
3119
logger.warning("No clients defined")
3359
3120
3360
3121
if not foreground:
3361
3122
if pidfile is not None:
3362
3123
pid = os.getpid()
3368
3129
pidfilename, pid)
3369
3130
del pidfile
3370
3131
del pidfilename
3371
3372
for termsig in (signal.SIGHUP, signal.SIGTERM):
3373
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3374
lambda: main_loop.quit() and False)
3375
3132
3133
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
3134
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3135
3376
3136
if use_dbus:
3377
3137
3378
3138
@alternate_dbus_interfaces(
3379
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3139
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3380
3140
class MandosDBusService(DBusObjectWithObjectManager):
3381
3141
"""A D-Bus proxy object"""
3382
3142
3383
3143
def __init__(self):
3384
3144
dbus.service.Object.__init__(self, bus, "/")
3385
3145
3386
3146
_interface = "se.recompile.Mandos"
3387
3147
3388
3148
@dbus.service.signal(_interface, signature="o")
3389
3149
def ClientAdded(self, objpath):
3390
3150
"D-Bus signal"
3391
3151
pass
3392
3152
3393
3153
@dbus.service.signal(_interface, signature="ss")
3394
def ClientNotFound(self, key_id, address):
3154
def ClientNotFound(self, fingerprint, address):
3395
3155
"D-Bus signal"
3396
3156
pass
3397
3157
3398
3158
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3399
3159
"true"})
3400
3160
@dbus.service.signal(_interface, signature="os")
3401
3161
def ClientRemoved(self, objpath, name):
3402
3162
"D-Bus signal"
3403
3163
pass
3404
3164
3405
3165
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3406
3166
"true"})
3407
3167
@dbus.service.method(_interface, out_signature="ao")
3408
3168
def GetAllClients(self):
3409
3169
"D-Bus method"
3410
3170
return dbus.Array(c.dbus_object_path for c in
3411
tcp_server.clients.values())
3412
3171
tcp_server.clients.itervalues())
3172
3413
3173
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3414
3174
"true"})
3415
3175
@dbus.service.method(_interface,
3417
3177
def GetAllClientsWithProperties(self):
3418
3178
"D-Bus method"
3419
3179
return dbus.Dictionary(
3420
{c.dbus_object_path: c.GetAll(
3180
{ c.dbus_object_path: c.GetAll(
3421
3181
"se.recompile.Mandos.Client")
3422
for c in tcp_server.clients.values()},
3182
for c in tcp_server.clients.itervalues() },
3423
3183
signature="oa{sv}")
3424
3184
3425
3185
@dbus.service.method(_interface, in_signature="o")
3426
3186
def RemoveClient(self, object_path):
3427
3187
"D-Bus method"
3428
for c in tcp_server.clients.values():
3188
for c in tcp_server.clients.itervalues():
3429
3189
if c.dbus_object_path == object_path:
3430
3190
del tcp_server.clients[c.name]
3431
3191
c.remove_from_connection()
3435
3195
self.client_removed_signal(c)
3436
3196
return
3437
3197
raise KeyError(object_path)
3438
3198
3439
3199
del _interface
3440
3200
3441
3201
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3442
out_signature="a{oa{sa{sv}}}")
3202
out_signature = "a{oa{sa{sv}}}")
3443
3203
def GetManagedObjects(self):
3444
3204
"""D-Bus method"""
3445
3205
return dbus.Dictionary(
3446
{client.dbus_object_path:
3447
dbus.Dictionary(
3448
{interface: client.GetAll(interface)
3449
for interface in
3450
client._get_all_interface_names()})
3451
for client in tcp_server.clients.values()})
3452
3206
{ client.dbus_object_path:
3207
dbus.Dictionary(
3208
{ interface: client.GetAll(interface)
3209
for interface in
3210
client._get_all_interface_names()})
3211
for client in tcp_server.clients.values()})
3212
3453
3213
def client_added_signal(self, client):
3454
3214
"""Send the new standard signal and the old signal"""
3455
3215
if use_dbus:
3457
3217
self.InterfacesAdded(
3458
3218
client.dbus_object_path,
3459
3219
dbus.Dictionary(
3460
{interface: client.GetAll(interface)
3461
for interface in
3462
client._get_all_interface_names()}))
3220
{ interface: client.GetAll(interface)
3221
for interface in
3222
client._get_all_interface_names()}))
3463
3223
# Old signal
3464
3224
self.ClientAdded(client.dbus_object_path)
3465
3225
3466
3226
def client_removed_signal(self, client):
3467
3227
"""Send the new standard signal and the old signal"""
3468
3228
if use_dbus:
3473
3233
# Old signal
3474
3234
self.ClientRemoved(client.dbus_object_path,
3475
3235
client.name)
3476
3236
3477
3237
mandos_dbus_service = MandosDBusService()
3478
3479
# Save modules to variables to exempt the modules from being
3480
# unloaded before the function registered with atexit() is run.
3481
mp = multiprocessing
3482
wn = wnull
3483
3238
3484
3239
def cleanup():
3485
3240
"Cleanup function; run on exit"
3486
3241
if zeroconf:
3487
3242
service.cleanup()
3488
3489
mp.active_children()
3490
wn.close()
3243
3244
multiprocessing.active_children()
3245
wnull.close()
3491
3246
if not (tcp_server.clients or client_settings):
3492
3247
return
3493
3248
3494
3249
# Store client before exiting. Secrets are encrypted with key
3495
3250
# based on what config file has. If config file is
3496
3251
# removed/edited, old secret will thus be unrecovable.
3497
3252
clients = {}
3498
3253
with PGPEngine() as pgp:
3499
for client in tcp_server.clients.values():
3254
for client in tcp_server.clients.itervalues():
3500
3255
key = client_settings[client.name]["secret"]
3501
3256
client.encrypted_secret = pgp.encrypt(client.secret,
3502
3257
key)
3503
3258
client_dict = {}
3504
3259
3505
3260
# A list of attributes that can not be pickled
3506
3261
# + secret.
3507
exclude = {"bus", "changedstate", "secret",
3508
"checker", "server_settings"}
3262
exclude = { "bus", "changedstate", "secret",
3263
"checker", "server_settings" }
3509
3264
for name, typ in inspect.getmembers(dbus.service
3510
3265
.Object):
3511
3266
exclude.add(name)
3512
3267
3513
3268
client_dict["encrypted_secret"] = (client
3514
3269
.encrypted_secret)
3515
3270
for attr in client.client_structure:
3516
3271
if attr not in exclude:
3517
3272
client_dict[attr] = getattr(client, attr)
3518
3273
3519
3274
clients[client.name] = client_dict
3520
3275
del client_settings[client.name]["secret"]
3521
3276
3522
3277
try:
3523
3278
with tempfile.NamedTemporaryFile(
3524
3279
mode='wb',
3526
3281
prefix='clients-',
3527
3282
dir=os.path.dirname(stored_state_path),
3528
3283
delete=False) as stored_state:
3529
pickle.dump((clients, client_settings), stored_state,
3530
protocol=2)
3284
pickle.dump((clients, client_settings), stored_state)
3531
3285
tempname = stored_state.name
3532
3286
os.rename(tempname, stored_state_path)
3533
3287
except (IOError, OSError) as e:
3543
3297
logger.warning("Could not save persistent state:",
3544
3298
exc_info=e)
3545
3299
raise
3546
3300
3547
3301
# Delete all clients, and settings from config
3548
3302
while tcp_server.clients:
3549
3303
name, client = tcp_server.clients.popitem()
3555
3309
if use_dbus:
3556
3310
mandos_dbus_service.client_removed_signal(client)
3557
3311
client_settings.clear()
3558
3312
3559
3313
atexit.register(cleanup)
3560
3561
for client in tcp_server.clients.values():
3314
3315
for client in tcp_server.clients.itervalues():
3562
3316
if use_dbus:
3563
3317
# Emit D-Bus signal for adding
3564
3318
mandos_dbus_service.client_added_signal(client)
3565
3319
# Need to initiate checking of clients
3566
3320
if client.enabled:
3567
3321
client.init_checker()
3568
3322
3569
3323
tcp_server.enable()
3570
3324
tcp_server.server_activate()
3571
3325
3572
3326
# Find out what port we got
3573
3327
if zeroconf:
3574
3328
service.port = tcp_server.socket.getsockname()[1]
3579
3333
else: # IPv4
3580
3334
logger.info("Now listening on address %r, port %d",
3581
3335
*tcp_server.socket.getsockname())
3582
3583
# service.interface = tcp_server.socket.getsockname()[3]
3584
3336
3337
#service.interface = tcp_server.socket.getsockname()[3]
3338
3585
3339
try:
3586
3340
if zeroconf:
3587
3341
# From the Avahi example code
3592
3346
cleanup()
3593
3347
sys.exit(1)
3594
3348
# End of Avahi example code
3595
3596
GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3597
lambda *args, **kwargs:
3598
(tcp_server.handle_request
3599
(*args[2:], **kwargs) or True))
3600
3349
3350
GObject.io_add_watch(tcp_server.fileno(), GObject.IO_IN,
3351
lambda *args, **kwargs:
3352
(tcp_server.handle_request
3353
(*args[2:], **kwargs) or True))
3354
3601
3355
logger.debug("Starting main loop")
3602
3356
main_loop.run()
3603
3357
except AvahiError as error:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0