/mandos/release : revision 237.7.174

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

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: - '' -

Show diffs side-by-side

added added

removed removed

mandos

# "AvahiService" class, and some lines in "main".

# Everything else is

# This program is free software: you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

except ImportError:

SO_BINDTODEVICE = None

version = "1.6.3"

version = "1.6.1"

stored_state_file = "clients.pickle"

logger = logging.getLogger()

172

def password_encode(self, password):

173

# Passphrase can not be empty and can not contain newlines or

174

# NUL bytes. So we prefix it and hex encode it.

175

encoded = b"mandos" + binascii.hexlify(password)

176

if len(encoded) > 2048:

177

# GnuPG can't handle long passwords, so encode differently

178

encoded = (b"mandos" + password.replace(b"\\", b"\\\\")

179

.replace(b"\n", b"\\n")

180

.replace(b"\0", b"\\x00"))

181

return encoded

175

return b"mandos" + binascii.hexlify(password)

182

176

183

177

def encrypt(self, data, password):

184

178

passphrase = self.password_encode(password)

690

684

# If a checker exists, make sure it is not a zombie

691

685

try:

692

686

pid, status = os.waitpid(self.checker.pid, os.WNOHANG)

693

except AttributeError:

694

pass

695

except OSError as error:

696

if error.errno != errno.ECHILD:

697

raise

687

except (AttributeError, OSError) as error:

688

if (isinstance(error, OSError)

689

and error.errno != errno.ECHILD):

690

raise error

698

691

else:

699

692

if pid:

700

693

logger.warning("Checker was a zombie")

934

927

# The byte_arrays option is not supported yet on

935

928

# signatures other than "ay".

936

929

if prop._dbus_signature != "ay":

937

raise ValueError("Byte arrays not supported for non-"

938

"'ay' signature {0!r}"

939

.format(prop._dbus_signature))

930

raise ValueError

940

931

value = dbus.ByteArray(b''.join(chr(byte)

941

932

for byte in value))

942

933

prop(value)

1705

1696

logger.debug("Protocol version: %r", line)

1706

1697

try:

1707

1698

if int(line.strip().split()[0]) > 1:

1708

raise RuntimeError(line)

1699

raise RuntimeError

1709

1700

except (ValueError, IndexError, RuntimeError) as error:

1710

1701

logger.error("Unknown protocol version: %s", error)

1711

1702

return

1918

1909

1919

1910

def add_pipe(self, parent_pipe, proc):

1920

1911

"""Dummy function; override as necessary"""

1921

raise NotImplementedError()

1912

raise NotImplementedError

1922

1913

1923

1914

1924

1915

class IPv6_TCPServer(MultiprocessingMixInWithPipe,

2261

2252

else:

2262

2253

raise ValueError("Unknown suffix {0!r}"

2263

2254

.format(suffix))

2264

except IndexError as e:

2255

except (ValueError, IndexError) as e:

2265

2256

raise ValueError(*(e.args))

2266

2257

timevalue += delta

2267

2258

return timevalue

2343

2334

2344

2335

if options.check:

2345

2336

import doctest

2346

fail_count, test_count = doctest.testmod()

2347

sys.exit(os.EX_OK if fail_count == 0 else 1)

2337

doctest.testmod()

2338

sys.exit()

2348

2339

2349

2340

# Default values for config file for server-global settings

2350

2341

server_defaults = { "interface": "",

2352

2343

"port": "",

2353

2344

"debug": "False",

2354

2345

"priority":

2355

"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",

2346

"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",

2356

2347

"servicename": "Mandos",

2357

2348

"use_dbus": "True",

2358

2349

"use_ipv6": "True",

2460

2451

or None))

2461

2452

if not foreground:

2462

2453

pidfilename = "/run/mandos.pid"

2463

if not os.path.isdir("/run/."):

2464

pidfilename = "/var/run/mandos.pid"

2465

2454

pidfile = None

2466

2455

try:

2467

2456

pidfile = open(pidfilename, "w")

2484

2473

os.setuid(uid)

2485

2474

except OSError as error:

2486

2475

if error.errno != errno.EPERM:

2487

raise

2476

raise error

2488

2477

2489

2478

if debug:

2490

2479

# Enable all possible GnuTLS debugging

2795

2784

else:

2796

2785

logger.warning("Could not save persistent state:",

2797

2786

exc_info=e)

2798

raise

2787

raise e

2799

2788

2800

2789

# Delete all clients, and settings from config

2801

2790

while tcp_server.clients:

Older »