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.174
- compare with another revision
- download diff
- download tarball
- view history from revision 237.7.174
- Committer: Teddy Hogeborn
- Date: 2013-10-20 15:25:09 UTC
- mto: (237.7.272 trunk)
- mto: This revision was merged to the branch mainline in revision 305.
- Revision ID: teddy@recompile.se-20131020152509-zkhuy2yse76w10hg
* Makefile (CFLAGS, LDFLAGS): Keep default flags from environment.
(purge-server): PID file changed to "/run/mandos.pid".
* debian/compat: Changed to "9".
* debian/control (Standards-Version): Updated to "3.9.4".
(DM-Upload-Allowed): Removed.
(mandos/Depends): Add "initscripts (>= 2.88dsf-13.3)" to be able to
use the "/run" directory (for mandos.pid).
* debian/copyright (Copyright): Update year.
* init.d-mandos (PIDFILE): Changed to "/run/mandos.pid".
* mandos: Update copyright year.
(pidfilename): Changed to "/run/mandos.pid".
* mandos-clients.conf.xml (OPTIONS/approval_delay): Bug fix: default
is "PT0S" - using
the new RFC 3339
duration syntax.
* mandos-keygen: Update copyright year.
* mandos-monitor: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
(FILES): PID file changed to "/run/mandos.pid".
* plugin-runner.c: Update copyright year.
* plugins.d/mandos-client.c: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.c: - '' -
* plugins.d/plymouth.c: - '' -
(purge-server): PID file changed to "/run/mandos.pid".
* debian/compat: Changed to "9".
* debian/control (Standards-Version): Updated to "3.9.4".
(DM-Upload-Allowed): Removed.
(mandos/Depends): Add "initscripts (>= 2.88dsf-13.3)" to be able to
use the "/run" directory (for mandos.pid).
* debian/copyright (Copyright): Update year.
* init.d-mandos (PIDFILE): Changed to "/run/mandos.pid".
* mandos: Update copyright year.
(pidfilename): Changed to "/run/mandos.pid".
* mandos-clients.conf.xml (OPTIONS/approval_delay): Bug fix: default
is "PT0S" - using
the new RFC 3339
duration syntax.
* mandos-keygen: Update copyright year.
* mandos-monitor: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
(FILES): PID file changed to "/run/mandos.pid".
* plugin-runner.c: Update copyright year.
* plugins.d/mandos-client.c: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.c: - '' -
* plugins.d/plymouth.c: - '' -
- files removed:
- debian/upstream
- files modified:
- INSTALL
added
removed
mandos
1
#!/usr/bin/python2.7
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2014 Teddy Hogeborn
15
# Copyright © 2008-2014 Björn Påhlsson
14
# Copyright © 2008-2013 Teddy Hogeborn
15
# Copyright © 2008-2013 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
88
88
except ImportError:
89
89
SO_BINDTODEVICE = None
90
90
91
version = "1.6.7"
91
version = "1.6.1"
92
92
stored_state_file = "clients.pickle"
93
93
94
94
logger = logging.getLogger()
95
syslogger = None
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
96
98
97
99
try:
98
100
if_nametoindex = (ctypes.cdll.LoadLibrary
114
116
def initlogger(debug, level=logging.WARNING):
115
117
"""init logger and add loglevel"""
116
118
117
global syslogger
118
syslogger = (logging.handlers.SysLogHandler
119
(facility =
120
logging.handlers.SysLogHandler.LOG_DAEMON,
121
address = str("/dev/log")))
122
119
syslogger.setFormatter(logging.Formatter
123
120
('Mandos [%(process)d]: %(levelname)s:'
124
121
' %(message)s'))
175
172
def password_encode(self, password):
176
173
# Passphrase can not be empty and can not contain newlines or
177
174
# NUL bytes. So we prefix it and hex encode it.
178
encoded = b"mandos" + binascii.hexlify(password)
179
if len(encoded) > 2048:
180
# GnuPG can't handle long passwords, so encode differently
181
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
182
.replace(b"\n", b"\\n")
183
.replace(b"\0", b"\\x00"))
184
return encoded
175
return b"mandos" + binascii.hexlify(password)
185
176
186
177
def encrypt(self, data, password):
187
178
passphrase = self.password_encode(password)
338
329
elif state == avahi.ENTRY_GROUP_FAILURE:
339
330
logger.critical("Avahi: Error in group state changed %s",
340
331
unicode(error))
341
raise AvahiGroupError("State changed: {!s}"
332
raise AvahiGroupError("State changed: {0!s}"
342
333
.format(error))
343
334
344
335
def cleanup(self):
395
386
"""Add the new name to the syslog messages"""
396
387
ret = AvahiService.rename(self)
397
388
syslogger.setFormatter(logging.Formatter
398
('Mandos ({}) [%(process)d]:'
389
('Mandos ({0}) [%(process)d]:'
399
390
' %(levelname)s: %(message)s'
400
391
.format(self.name)))
401
392
return ret
402
393
403
394
395
def timedelta_to_milliseconds(td):
396
"Convert a datetime.timedelta() to milliseconds"
397
return ((td.days * 24 * 60 * 60 * 1000)
398
+ (td.seconds * 1000)
399
+ (td.microseconds // 1000))
400
401
404
402
class Client(object):
405
403
"""A representation of a client host served by this server.
406
404
461
459
"enabled": "True",
462
460
}
463
461
462
def timeout_milliseconds(self):
463
"Return the 'timeout' attribute in milliseconds"
464
return timedelta_to_milliseconds(self.timeout)
465
466
def extended_timeout_milliseconds(self):
467
"Return the 'extended_timeout' attribute in milliseconds"
468
return timedelta_to_milliseconds(self.extended_timeout)
469
470
def interval_milliseconds(self):
471
"Return the 'interval' attribute in milliseconds"
472
return timedelta_to_milliseconds(self.interval)
473
474
def approval_delay_milliseconds(self):
475
return timedelta_to_milliseconds(self.approval_delay)
476
464
477
@staticmethod
465
478
def config_parser(config):
466
479
"""Construct a new dict of client settings of this form:
491
504
"rb") as secfile:
492
505
client["secret"] = secfile.read()
493
506
else:
494
raise TypeError("No secret or secfile for section {}"
507
raise TypeError("No secret or secfile for section {0}"
495
508
.format(section))
496
509
client["timeout"] = string_to_delta(section["timeout"])
497
510
client["extended_timeout"] = string_to_delta(
514
527
server_settings = {}
515
528
self.server_settings = server_settings
516
529
# adding all client settings
517
for setting, value in settings.items():
530
for setting, value in settings.iteritems():
518
531
setattr(self, setting, value)
519
532
520
533
if self.enabled:
603
616
if self.checker_initiator_tag is not None:
604
617
gobject.source_remove(self.checker_initiator_tag)
605
618
self.checker_initiator_tag = (gobject.timeout_add
606
(int(self.interval
607
.total_seconds() * 1000),
619
(self.interval_milliseconds(),
608
620
self.start_checker))
609
621
# Schedule a disable() when 'timeout' has passed
610
622
if self.disable_initiator_tag is not None:
611
623
gobject.source_remove(self.disable_initiator_tag)
612
624
self.disable_initiator_tag = (gobject.timeout_add
613
(int(self.timeout
614
.total_seconds() * 1000),
615
self.disable))
625
(self.timeout_milliseconds(),
626
self.disable))
616
627
# Also start a new checker *right now*.
617
628
self.start_checker()
618
629
649
660
self.disable_initiator_tag = None
650
661
if getattr(self, "enabled", False):
651
662
self.disable_initiator_tag = (gobject.timeout_add
652
(int(timeout.total_seconds()
653
* 1000), self.disable))
663
(timedelta_to_milliseconds
664
(timeout), self.disable))
654
665
self.expires = datetime.datetime.utcnow() + timeout
655
666
656
667
def need_approval(self):
673
684
# If a checker exists, make sure it is not a zombie
674
685
try:
675
686
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
676
except AttributeError:
677
pass
678
except OSError as error:
679
if error.errno != errno.ECHILD:
680
raise
687
except (AttributeError, OSError) as error:
688
if (isinstance(error, OSError)
689
and error.errno != errno.ECHILD):
690
raise error
681
691
else:
682
692
if pid:
683
693
logger.warning("Checker was a zombie")
687
697
# Start a new checker if needed
688
698
if self.checker is None:
689
699
# Escape attributes for the shell
690
escaped_attrs = { attr:
691
re.escape(unicode(getattr(self,
692
attr)))
693
for attr in self.runtime_expansions }
700
escaped_attrs = dict(
701
(attr, re.escape(unicode(getattr(self, attr))))
702
for attr in
703
self.runtime_expansions)
694
704
try:
695
705
command = self.checker_command % escaped_attrs
696
706
except TypeError as error:
777
787
# "Set" method, so we fail early here:
778
788
if byte_arrays and signature != "ay":
779
789
raise ValueError("Byte arrays not supported for non-'ay'"
780
" signature {!r}".format(signature))
790
" signature {0!r}".format(signature))
781
791
def decorator(func):
782
792
func._dbus_is_property = True
783
793
func._dbus_interface = dbus_interface
862
872
If called like _is_dbus_thing("method") it returns a function
863
873
suitable for use as predicate to inspect.getmembers().
864
874
"""
865
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
875
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
866
876
False)
867
877
868
878
def _get_all_dbus_things(self, thing):
917
927
# The byte_arrays option is not supported yet on
918
928
# signatures other than "ay".
919
929
if prop._dbus_signature != "ay":
920
raise ValueError("Byte arrays not supported for non-"
921
"'ay' signature {!r}"
922
.format(prop._dbus_signature))
930
raise ValueError
923
931
value = dbus.ByteArray(b''.join(chr(byte)
924
932
for byte in value))
925
933
prop(value)
989
997
(prop,
990
998
"_dbus_annotations",
991
999
{}))
992
for name, value in annots.items():
1000
for name, value in annots.iteritems():
993
1001
ann_tag = document.createElement(
994
1002
"annotation")
995
1003
ann_tag.setAttribute("name", name)
998
1006
# Add interface annotation tags
999
1007
for annotation, value in dict(
1000
1008
itertools.chain.from_iterable(
1001
annotations().items()
1009
annotations().iteritems()
1002
1010
for name, annotations in
1003
1011
self._get_all_dbus_things("interface")
1004
1012
if name == if_tag.getAttribute("name")
1005
)).items():
1013
)).iteritems():
1006
1014
ann_tag = document.createElement("annotation")
1007
1015
ann_tag.setAttribute("name", annotation)
1008
1016
ann_tag.setAttribute("value", value)
1064
1072
"""
1065
1073
def wrapper(cls):
1066
1074
for orig_interface_name, alt_interface_name in (
1067
alt_interface_names.items()):
1075
alt_interface_names.iteritems()):
1068
1076
attr = {}
1069
1077
interface_names = set()
1070
1078
# Go though all attributes of the class
1187
1195
attribute.func_closure)))
1188
1196
if deprecate:
1189
1197
# Deprecate all alternate interfaces
1190
iname="_AlternateDBusNames_interface_annotation{}"
1198
iname="_AlternateDBusNames_interface_annotation{0}"
1191
1199
for interface_name in interface_names:
1192
1200
@dbus_interface_annotations(interface_name)
1193
1201
def func(self):
1202
1210
if interface_names:
1203
1211
# Replace the class with a new subclass of it with
1204
1212
# methods, signals, etc. as created above.
1205
cls = type(b"{}Alternate".format(cls.__name__),
1213
cls = type(b"{0}Alternate".format(cls.__name__),
1206
1214
(cls,), attr)
1207
1215
return cls
1208
1216
return wrapper
1249
1257
to the D-Bus. Default: no transform
1250
1258
variant_level: D-Bus variant level. Default: 1
1251
1259
"""
1252
attrname = "_{}".format(dbus_name)
1260
attrname = "_{0}".format(dbus_name)
1253
1261
def setter(self, value):
1254
1262
if hasattr(self, "dbus_object_path"):
1255
1263
if (not hasattr(self, attrname) or
1285
1293
approval_delay = notifychangeproperty(dbus.UInt64,
1286
1294
"ApprovalDelay",
1287
1295
type_func =
1288
lambda td: td.total_seconds()
1289
* 1000)
1296
timedelta_to_milliseconds)
1290
1297
approval_duration = notifychangeproperty(
1291
1298
dbus.UInt64, "ApprovalDuration",
1292
type_func = lambda td: td.total_seconds() * 1000)
1299
type_func = timedelta_to_milliseconds)
1293
1300
host = notifychangeproperty(dbus.String, "Host")
1294
1301
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1295
type_func = lambda td:
1296
td.total_seconds() * 1000)
1302
type_func =
1303
timedelta_to_milliseconds)
1297
1304
extended_timeout = notifychangeproperty(
1298
1305
dbus.UInt64, "ExtendedTimeout",
1299
type_func = lambda td: td.total_seconds() * 1000)
1306
type_func = timedelta_to_milliseconds)
1300
1307
interval = notifychangeproperty(dbus.UInt64,
1301
1308
"Interval",
1302
1309
type_func =
1303
lambda td: td.total_seconds()
1304
* 1000)
1310
timedelta_to_milliseconds)
1305
1311
checker_command = notifychangeproperty(dbus.String, "Checker")
1306
1312
1307
1313
del notifychangeproperty
1335
1341
*args, **kwargs)
1336
1342
1337
1343
def start_checker(self, *args, **kwargs):
1338
old_checker_pid = getattr(self.checker, "pid", None)
1344
old_checker = self.checker
1345
if self.checker is not None:
1346
old_checker_pid = self.checker.pid
1347
else:
1348
old_checker_pid = None
1339
1349
r = Client.start_checker(self, *args, **kwargs)
1340
1350
# Only if new checker process was started
1341
1351
if (self.checker is not None
1350
1360
1351
1361
def approve(self, value=True):
1352
1362
self.approved = value
1353
gobject.timeout_add(int(self.approval_duration.total_seconds()
1354
* 1000), self._reset_approved)
1363
gobject.timeout_add(timedelta_to_milliseconds
1364
(self.approval_duration),
1365
self._reset_approved)
1355
1366
self.send_changedstate()
1356
1367
1357
1368
## D-Bus methods, signals & properties
1460
1471
access="readwrite")
1461
1472
def ApprovalDelay_dbus_property(self, value=None):
1462
1473
if value is None: # get
1463
return dbus.UInt64(self.approval_delay.total_seconds()
1464
* 1000)
1474
return dbus.UInt64(self.approval_delay_milliseconds())
1465
1475
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1466
1476
1467
1477
# ApprovalDuration - property
1469
1479
access="readwrite")
1470
1480
def ApprovalDuration_dbus_property(self, value=None):
1471
1481
if value is None: # get
1472
return dbus.UInt64(self.approval_duration.total_seconds()
1473
* 1000)
1482
return dbus.UInt64(timedelta_to_milliseconds(
1483
self.approval_duration))
1474
1484
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1475
1485
1476
1486
# Name - property
1542
1552
access="readwrite")
1543
1553
def Timeout_dbus_property(self, value=None):
1544
1554
if value is None: # get
1545
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1555
return dbus.UInt64(self.timeout_milliseconds())
1546
1556
old_timeout = self.timeout
1547
1557
self.timeout = datetime.timedelta(0, 0, 0, value)
1548
1558
# Reschedule disabling
1559
1569
gobject.source_remove(self.disable_initiator_tag)
1560
1570
self.disable_initiator_tag = (
1561
1571
gobject.timeout_add(
1562
int((self.expires - now).total_seconds()
1563
* 1000), self.disable))
1572
timedelta_to_milliseconds(self.expires - now),
1573
self.disable))
1564
1574
1565
1575
# ExtendedTimeout - property
1566
1576
@dbus_service_property(_interface, signature="t",
1567
1577
access="readwrite")
1568
1578
def ExtendedTimeout_dbus_property(self, value=None):
1569
1579
if value is None: # get
1570
return dbus.UInt64(self.extended_timeout.total_seconds()
1571
* 1000)
1580
return dbus.UInt64(self.extended_timeout_milliseconds())
1572
1581
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1573
1582
1574
1583
# Interval - property
1576
1585
access="readwrite")
1577
1586
def Interval_dbus_property(self, value=None):
1578
1587
if value is None: # get
1579
return dbus.UInt64(self.interval.total_seconds() * 1000)
1588
return dbus.UInt64(self.interval_milliseconds())
1580
1589
self.interval = datetime.timedelta(0, 0, 0, value)
1581
1590
if getattr(self, "checker_initiator_tag", None) is None:
1582
1591
return
1687
1696
logger.debug("Protocol version: %r", line)
1688
1697
try:
1689
1698
if int(line.strip().split()[0]) > 1:
1690
raise RuntimeError(line)
1699
raise RuntimeError
1691
1700
except (ValueError, IndexError, RuntimeError) as error:
1692
1701
logger.error("Unknown protocol version: %s", error)
1693
1702
return
1742
1751
if self.server.use_dbus:
1743
1752
# Emit D-Bus signal
1744
1753
client.NeedApproval(
1745
client.approval_delay.total_seconds()
1746
* 1000, client.approved_by_default)
1754
client.approval_delay_milliseconds(),
1755
client.approved_by_default)
1747
1756
else:
1748
1757
logger.warning("Client %s was not approved",
1749
1758
client.name)
1755
1764
#wait until timeout or approved
1756
1765
time = datetime.datetime.now()
1757
1766
client.changedstate.acquire()
1758
client.changedstate.wait(delay.total_seconds())
1767
client.changedstate.wait(
1768
float(timedelta_to_milliseconds(delay)
1769
/ 1000))
1759
1770
client.changedstate.release()
1760
1771
time2 = datetime.datetime.now()
1761
1772
if (time2 - time) >= delay:
1898
1909
1899
1910
def add_pipe(self, parent_pipe, proc):
1900
1911
"""Dummy function; override as necessary"""
1901
raise NotImplementedError()
1912
raise NotImplementedError
1902
1913
1903
1914
1904
1915
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2169
2180
token_duration = Token(re.compile(r"P"), None,
2170
2181
frozenset((token_year, token_month,
2171
2182
token_day, token_time,
2172
token_week)))
2183
token_week))),
2173
2184
# Define starting values
2174
2185
value = datetime.timedelta() # Value so far
2175
2186
found_token = None
2176
followers = frozenset((token_duration,)) # Following valid tokens
2187
followers = frozenset(token_duration,) # Following valid tokens
2177
2188
s = duration # String left to parse
2178
2189
# Loop until end token is found
2179
2190
while found_token is not token_end:
2239
2250
elif suffix == "w":
2240
2251
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2241
2252
else:
2242
raise ValueError("Unknown suffix {!r}"
2253
raise ValueError("Unknown suffix {0!r}"
2243
2254
.format(suffix))
2244
except IndexError as e:
2255
except (ValueError, IndexError) as e:
2245
2256
raise ValueError(*(e.args))
2246
2257
timevalue += delta
2247
2258
return timevalue
2262
2273
# Close all standard open file descriptors
2263
2274
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2264
2275
if not stat.S_ISCHR(os.fstat(null).st_mode):
2265
raise OSError(errno.ENODEV, "{} not a character device"
2276
raise OSError(errno.ENODEV,
2277
"{0} not a character device"
2266
2278
.format(os.devnull))
2267
2279
os.dup2(null, sys.stdin.fileno())
2268
2280
os.dup2(null, sys.stdout.fileno())
2278
2290
2279
2291
parser = argparse.ArgumentParser()
2280
2292
parser.add_argument("-v", "--version", action="version",
2281
version = "%(prog)s {}".format(version),
2293
version = "%(prog)s {0}".format(version),
2282
2294
help="show version number and exit")
2283
2295
parser.add_argument("-i", "--interface", metavar="IF",
2284
2296
help="Bind to interface IF")
2317
2329
help="Directory to save/restore state in")
2318
2330
parser.add_argument("--foreground", action="store_true",
2319
2331
help="Run in foreground", default=None)
2320
parser.add_argument("--no-zeroconf", action="store_false",
2321
dest="zeroconf", help="Do not use Zeroconf",
2322
default=None)
2323
2332
2324
2333
options = parser.parse_args()
2325
2334
2326
2335
if options.check:
2327
2336
import doctest
2328
fail_count, test_count = doctest.testmod()
2329
sys.exit(os.EX_OK if fail_count == 0 else 1)
2337
doctest.testmod()
2338
sys.exit()
2330
2339
2331
2340
# Default values for config file for server-global settings
2332
2341
server_defaults = { "interface": "",
2334
2343
"port": "",
2335
2344
"debug": "False",
2336
2345
"priority":
2337
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2346
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
2338
2347
"servicename": "Mandos",
2339
2348
"use_dbus": "True",
2340
2349
"use_ipv6": "True",
2343
2352
"socket": "",
2344
2353
"statedir": "/var/lib/mandos",
2345
2354
"foreground": "False",
2346
"zeroconf": "True",
2347
2355
}
2348
2356
2349
2357
# Parse config file for server-global settings
2376
2384
for option in ("interface", "address", "port", "debug",
2377
2385
"priority", "servicename", "configdir",
2378
2386
"use_dbus", "use_ipv6", "debuglevel", "restore",
2379
"statedir", "socket", "foreground", "zeroconf"):
2387
"statedir", "socket", "foreground"):
2380
2388
value = getattr(options, option)
2381
2389
if value is not None:
2382
2390
server_settings[option] = value
2387
2395
server_settings[option] = unicode(server_settings[option])
2388
2396
# Force all boolean options to be boolean
2389
2397
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2390
"foreground", "zeroconf"):
2398
"foreground"):
2391
2399
server_settings[option] = bool(server_settings[option])
2392
2400
# Debug implies foreground
2393
2401
if server_settings["debug"]:
2396
2404
2397
2405
##################################################################
2398
2406
2399
if (not server_settings["zeroconf"] and
2400
not (server_settings["port"]
2401
or server_settings["socket"] != "")):
2402
parser.error("Needs port or socket to work without"
2403
" Zeroconf")
2404
2405
2407
# For convenience
2406
2408
debug = server_settings["debug"]
2407
2409
debuglevel = server_settings["debuglevel"]
2410
2412
stored_state_path = os.path.join(server_settings["statedir"],
2411
2413
stored_state_file)
2412
2414
foreground = server_settings["foreground"]
2413
zeroconf = server_settings["zeroconf"]
2414
2415
2415
2416
if debug:
2416
2417
initlogger(debug, logging.DEBUG)
2423
2424
2424
2425
if server_settings["servicename"] != "Mandos":
2425
2426
syslogger.setFormatter(logging.Formatter
2426
('Mandos ({}) [%(process)d]:'
2427
('Mandos ({0}) [%(process)d]:'
2427
2428
' %(levelname)s: %(message)s'
2428
2429
.format(server_settings
2429
2430
["servicename"])))
2437
2438
global mandos_dbus_service
2438
2439
mandos_dbus_service = None
2439
2440
2440
socketfd = None
2441
if server_settings["socket"] != "":
2442
socketfd = server_settings["socket"]
2443
2441
tcp_server = MandosServer((server_settings["address"],
2444
2442
server_settings["port"]),
2445
2443
ClientHandler,
2449
2447
gnutls_priority=
2450
2448
server_settings["priority"],
2451
2449
use_dbus=use_dbus,
2452
socketfd=socketfd)
2450
socketfd=(server_settings["socket"]
2451
or None))
2453
2452
if not foreground:
2454
2453
pidfilename = "/run/mandos.pid"
2455
if not os.path.isdir("/run/."):
2456
pidfilename = "/var/run/mandos.pid"
2457
2454
pidfile = None
2458
2455
try:
2459
2456
pidfile = open(pidfilename, "w")
2476
2473
os.setuid(uid)
2477
2474
except OSError as error:
2478
2475
if error.errno != errno.EPERM:
2479
raise
2476
raise error
2480
2477
2481
2478
if debug:
2482
2479
# Enable all possible GnuTLS debugging
2525
2522
use_dbus = False
2526
2523
server_settings["use_dbus"] = False
2527
2524
tcp_server.use_dbus = False
2528
if zeroconf:
2529
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2530
service = AvahiServiceToSyslog(name =
2531
server_settings["servicename"],
2532
servicetype = "_mandos._tcp",
2533
protocol = protocol, bus = bus)
2534
if server_settings["interface"]:
2535
service.interface = (if_nametoindex
2536
(str(server_settings["interface"])))
2525
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2526
service = AvahiServiceToSyslog(name =
2527
server_settings["servicename"],
2528
servicetype = "_mandos._tcp",
2529
protocol = protocol, bus = bus)
2530
if server_settings["interface"]:
2531
service.interface = (if_nametoindex
2532
(str(server_settings["interface"])))
2537
2533
2538
2534
global multiprocessing_manager
2539
2535
multiprocessing_manager = multiprocessing.Manager()
2563
2559
os.remove(stored_state_path)
2564
2560
except IOError as e:
2565
2561
if e.errno == errno.ENOENT:
2566
logger.warning("Could not load persistent state: {}"
2562
logger.warning("Could not load persistent state: {0}"
2567
2563
.format(os.strerror(e.errno)))
2568
2564
else:
2569
2565
logger.critical("Could not load persistent state:",
2574
2570
"EOFError:", exc_info=e)
2575
2571
2576
2572
with PGPEngine() as pgp:
2577
for client_name, client in clients_data.items():
2573
for client_name, client in clients_data.iteritems():
2578
2574
# Skip removed clients
2579
2575
if client_name not in client_settings:
2580
2576
continue
2605
2601
if datetime.datetime.utcnow() >= client["expires"]:
2606
2602
if not client["last_checked_ok"]:
2607
2603
logger.warning(
2608
"disabling client {} - Client never "
2604
"disabling client {0} - Client never "
2609
2605
"performed a successful checker"
2610
2606
.format(client_name))
2611
2607
client["enabled"] = False
2612
2608
elif client["last_checker_status"] != 0:
2613
2609
logger.warning(
2614
"disabling client {} - Client last"
2615
" checker failed with error code {}"
2610
"disabling client {0} - Client "
2611
"last checker failed with error code {1}"
2616
2612
.format(client_name,
2617
2613
client["last_checker_status"]))
2618
2614
client["enabled"] = False
2621
2617
.utcnow()
2622
2618
+ client["timeout"])
2623
2619
logger.debug("Last checker succeeded,"
2624
" keeping {} enabled"
2620
" keeping {0} enabled"
2625
2621
.format(client_name))
2626
2622
try:
2627
2623
client["secret"] = (
2630
2626
["secret"]))
2631
2627
except PGPError:
2632
2628
# If decryption fails, we use secret from new settings
2633
logger.debug("Failed to decrypt {} old secret"
2629
logger.debug("Failed to decrypt {0} old secret"
2634
2630
.format(client_name))
2635
2631
client["secret"] = (
2636
2632
client_settings[client_name]["secret"])
2644
2640
clients_data[client_name] = client_settings[client_name]
2645
2641
2646
2642
# Create all client objects
2647
for client_name, client in clients_data.items():
2643
for client_name, client in clients_data.iteritems():
2648
2644
tcp_server.clients[client_name] = client_class(
2649
2645
name = client_name, settings = client,
2650
2646
server_settings = server_settings)
2733
2729
2734
2730
def cleanup():
2735
2731
"Cleanup function; run on exit"
2736
if zeroconf:
2737
service.cleanup()
2732
service.cleanup()
2738
2733
2739
2734
multiprocessing.active_children()
2740
2735
wnull.close()
2754
2749
2755
2750
# A list of attributes that can not be pickled
2756
2751
# + secret.
2757
exclude = { "bus", "changedstate", "secret",
2758
"checker", "server_settings" }
2752
exclude = set(("bus", "changedstate", "secret",
2753
"checker", "server_settings"))
2759
2754
for name, typ in (inspect.getmembers
2760
2755
(dbus.service.Object)):
2761
2756
exclude.add(name)
2784
2779
except NameError:
2785
2780
pass
2786
2781
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2787
logger.warning("Could not save persistent state: {}"
2782
logger.warning("Could not save persistent state: {0}"
2788
2783
.format(os.strerror(e.errno)))
2789
2784
else:
2790
2785
logger.warning("Could not save persistent state:",
2791
2786
exc_info=e)
2792
raise
2787
raise e
2793
2788
2794
2789
# Delete all clients, and settings from config
2795
2790
while tcp_server.clients:
2819
2814
tcp_server.server_activate()
2820
2815
2821
2816
# Find out what port we got
2822
if zeroconf:
2823
service.port = tcp_server.socket.getsockname()[1]
2817
service.port = tcp_server.socket.getsockname()[1]
2824
2818
if use_ipv6:
2825
2819
logger.info("Now listening on address %r, port %d,"
2826
2820
" flowinfo %d, scope_id %d",
2832
2826
#service.interface = tcp_server.socket.getsockname()[3]
2833
2827
2834
2828
try:
2835
if zeroconf:
2836
# From the Avahi example code
2837
try:
2838
service.activate()
2839
except dbus.exceptions.DBusException as error:
2840
logger.critical("D-Bus Exception", exc_info=error)
2841
cleanup()
2842
sys.exit(1)
2843
# End of Avahi example code
2829
# From the Avahi example code
2830
try:
2831
service.activate()
2832
except dbus.exceptions.DBusException as error:
2833
logger.critical("D-Bus Exception", exc_info=error)
2834
cleanup()
2835
sys.exit(1)
2836
# End of Avahi example code
2844
2837
2845
2838
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2846
2839
lambda *args, **kwargs:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0