/mandos/trunk : revision 1167

To get this branch, use:

bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

Committer: Teddy Hogeborn
Date: 2019-08-24 14:52:59 UTC
Revision ID: teddy@recompile.se-20190824145259-ifatm1r12kyp4z25

Server: Use new GLib.io_add_watch() call signature

* INSTALL: Increase version requirement of PyGObject to 3.8.
* mandos: When calling GLib.io_add_watch(), always pass priority as
the second argument, which is supported by PyGObject 3.8 or
later.

files removed:
debian/po/pt.po

files modified:
INSTALL

Makefile

NEWS

common.ent

debian/changelog

debian/control

debian/tests/control

dracut-module/password-agent.c

mandos

mandos-ctl

mandos-keygen

mandos-monitor

mandos.lsm

Show diffs side-by-side

added added

removed removed

mandos

#!/usr/bin/python3 -bI

#!/usr/bin/python

# -*- mode: python; after-save-hook: (lambda () (let ((command (if (fboundp 'file-local-name) (file-local-name (buffer-file-name)) (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name))))) (if (= (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (format "%s --check" (shell-quote-argument command)) nil "*Test*")) 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w))) (progn (with-current-buffer "*Test*" (compilation-mode)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); coding: utf-8 -*-

# Mandos server - give out binary blobs to connecting clients.

128

if sys.version_info < (3, 2):

129

configparser.Configparser = configparser.SafeConfigParser

130

131

version = "1.8.9"

131

version = "1.8.8"

132

stored_state_file = "clients.pickle"

133

134

logger = logging.getLogger()

203

output = subprocess.check_output(["gpgconf"])

204

for line in output.splitlines():

205

name, text, path = line.split(b":")

206

if name == b"gpg":

206

if name == "gpg":

207

self.gpg = path

208

break

209

except OSError as e:

214

'--force-mdc',

215

'--quiet']

216

# Only GPG version 1 has the --no-use-agent option.

217

if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):

217

if self.gpg == "gpg" or self.gpg.endswith("/gpg"):

218

self.gnupgargs.append("--no-use-agent")

219

220

def __enter__(self):

1053

# Read return code from connection (see call_pipe)

1054

returncode = connection.recv()

1055

connection.close()

1056

if self.checker is not None:

1057

self.checker.join()

1056

self.checker.join()

1058

1057

self.checker_callback_tag = None

1059

1058

self.checker = None

1060

1059

1151

1150

kwargs=popen_args)

1152

1151

self.checker.start()

1153

1152

self.checker_callback_tag = GLib.io_add_watch(

1154

GLib.IOChannel.unix_new(pipe[0].fileno()),

1155

GLib.PRIORITY_DEFAULT, GLib.IO_IN,

1153

pipe[0].fileno(), GLib.PRIORITY_DEFAULT, GLib.IO_IN,

1156

1154

self.checker_callback, pipe[0], command)

1157

1155

# Re-run this periodically if run by GLib.timeout_add

1158

1156

return True

2682

2680

def add_pipe(self, parent_pipe, proc):

2683

2681

# Call "handle_ipc" for both data and EOF events

2684

2682

GLib.io_add_watch(

2685

GLib.IOChannel.unix_new(parent_pipe.fileno()),

2686

GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,

2683

parent_pipe.fileno(), GLib.PRIORITY_DEFAULT,

2684

GLib.IO_IN | GLib.IO_HUP,

2687

2685

functools.partial(self.handle_ipc,

2688

2686

parent_pipe=parent_pipe,

2689

2687

proc=proc))

2727

2725

return False

2728

2726

2729

2727

GLib.io_add_watch(

2730

GLib.IOChannel.unix_new(parent_pipe.fileno()),

2731

GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,

2728

parent_pipe.fileno(), GLib.PRIORITY_DEFAULT,

2729

GLib.IO_IN | GLib.IO_HUP,

2732

2730

functools.partial(self.handle_ipc,

2733

2731

parent_pipe=parent_pipe,

2734

2732

proc=proc,

2766

2764

def rfc3339_duration_to_delta(duration):

2767

2765

"""Parse an RFC 3339 "duration" and return a datetime.timedelta

2768

2766

2769

>>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)

2770

True

2771

>>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)

2772

True

2773

>>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)

2774

True

2775

>>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)

2776

True

2777

>>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)

2778

True

2779

>>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)

2780

True

2781

>>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)

2782

True

2767

>>> rfc3339_duration_to_delta("P7D")

2768

datetime.timedelta(7)

2769

>>> rfc3339_duration_to_delta("PT60S")

2770

datetime.timedelta(0, 60)

2771

>>> rfc3339_duration_to_delta("PT60M")

2772

datetime.timedelta(0, 3600)

2773

>>> rfc3339_duration_to_delta("PT24H")

2774

datetime.timedelta(1)

2775

>>> rfc3339_duration_to_delta("P1W")

2776

datetime.timedelta(7)

2777

>>> rfc3339_duration_to_delta("PT5M30S")

2778

datetime.timedelta(0, 330)

2779

>>> rfc3339_duration_to_delta("P1DT3M20S")

2780

datetime.timedelta(1, 200)

2783

2781

"""

2784

2782

2785

2783

# Parsing an RFC 3339 duration with regular expressions is not

2865

2863

def string_to_delta(interval):

2866

2864

"""Parse a string and return a datetime.timedelta

2867

2865

2868

>>> string_to_delta('7d') == datetime.timedelta(7)

2869

True

2870

>>> string_to_delta('60s') == datetime.timedelta(0, 60)

2871

True

2872

>>> string_to_delta('60m') == datetime.timedelta(0, 3600)

2873

True

2874

>>> string_to_delta('24h') == datetime.timedelta(1)

2875

True

2876

>>> string_to_delta('1w') == datetime.timedelta(7)

2877

True

2878

>>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)

2879

True

2866

>>> string_to_delta('7d')

2867

datetime.timedelta(7)

2868

>>> string_to_delta('60s')

2869

datetime.timedelta(0, 60)

2870

>>> string_to_delta('60m')

2871

datetime.timedelta(0, 3600)

2872

>>> string_to_delta('24h')

2873

datetime.timedelta(1)

2874

>>> string_to_delta('1w')

2875

datetime.timedelta(7)

2876

>>> string_to_delta('5m 30s')

2877

datetime.timedelta(0, 330)

2880

2878

"""

2881

2879

2882

2880

try:

3252

3250

if isinstance(s, bytes)

3253

3251

else s) for s in

3254

3252

value["client_structure"]]

3255

# .name, .host, and .checker_command

3256

for k in ("name", "host", "checker_command"):

3253

# .name & .host

3254

for k in ("name", "host"):

3257

3255

if isinstance(value[k], bytes):

3258

3256

value[k] = value[k].decode("utf-8")

3259

3257

if "key_id" not in value:

3269

3267

for key, value in

3270

3268

bytes_old_client_settings.items()}

3271

3269

del bytes_old_client_settings

3272

# .host and .checker_command

3270

# .host

3273

3271

for value in old_client_settings.values():

3274

for attribute in ("host", "checker_command"):

3275

if isinstance(value[attribute], bytes):

3276

value[attribute] = (value[attribute]

3277

.decode("utf-8"))

3272

if isinstance(value["host"], bytes):

3273

value["host"] = (value["host"]

3274

.decode("utf-8"))

3278

3275

os.remove(stored_state_path)

3279

3276

except IOError as e:

3280

3277

if e.errno == errno.ENOENT:

3605

3602

sys.exit(1)

3606

3603

# End of Avahi example code

3607

3604

3608

GLib.io_add_watch(

3609

GLib.IOChannel.unix_new(tcp_server.fileno()),

3610

GLib.PRIORITY_DEFAULT, GLib.IO_IN,

3611

lambda *args, **kwargs: (tcp_server.handle_request

3612

(*args[2:], **kwargs) or True))

3605

GLib.io_add_watch(tcp_server.fileno(), GLib.PRIORITY_DEFAULT,

3606

GLib.IO_IN,

3607

lambda *args, **kwargs:

3608

(tcp_server.handle_request

3609

(*args[2:], **kwargs) or True))

3613

3610

3614

3611

logger.debug("Starting main loop")

3615

3612

main_loop.run()

Older »