/mandos/trunk : revision 594.1.4

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-monitor

Committer: Teddy Hogeborn
Date: 2012-06-13 22:06:57 UTC
mto: This revision was merged to the branch mainline in revision 596.
Revision ID: teddy@recompile.se-20120613220657-qvq7c7nrndl3t413

* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
  (up_interface): Removed; replaced with "interface_is_up".
  (interface_is_up, interface_is_running,
   lower_privileges_permanently, take_down_interface): New.
  (bring_up_interface): Return "error_t".  Use new functions
                        "interface_is_up", "get_flags", and
                        "interface_is_running".
  (main): Save all interfaces either autodetected or specified with
          --interface in argz vector "interfaces".  Save interfaces to
          take down on exit in argz vector "interfaces_to_take_down".
          Save interface names for DEVICE variable to network hooks as
          argz_vector "interfaces_hooks".  Bug fix: Be privileged
          while stopping network hooks.
* plugins.d/mandos-client.xml (SYNOPSIS): Changed --interface synopsis.
  (DESCRIPTION): Updated to document use of all interfaces.
  (OPTIONS): Updated description of "--interface".
* network-hooks.d/bridge: Parse comma-separated DEVICE environment
                          variable.
* network-hooks.d/openvpn: - '' -
* network-hooks.d/wireless: - '' -

Show diffs side-by-side

added added

removed removed

mandos-monitor

# Mandos Monitor - Control and monitor the Mandos server

# 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

from __future__ import (division, absolute_import, print_function,

unicode_literals)

try:

from future_builtins import *

except ImportError:

pass

from future_builtins import *

import sys

import os

import urwid

from dbus.mainloop.glib import DBusGMainLoop

try:

import gobject

except ImportError:

from gi.repository import GObject as gobject

import gobject

import dbus

import UserList

import locale

if sys.version_info[0] == 2:

str = unicode

locale.setlocale(locale.LC_ALL, '')

import logging

domain = 'se.recompile'

server_interface = domain + '.Mandos'

client_interface = domain + '.Mandos.Client'

version = "1.6.1"

version = "1.5.5"

# Always run in monochrome mode

urwid.curses_display.curses.has_colors = lambda : False

# Urwid doesn't support blinking, but we want it. Since we have no

# use for underline on its own, we make underline also always blink.

urwid.curses_display.curses.A_UNDERLINE |= (

urwid.curses_display.curses.A_BLINK)

def isoformat_to_datetime(iso):

"Parse an ISO 8601 date string to a datetime.datetime()"

208

210

to log in the future. """

209

211

#self.logger('Client {0} started checker "{1}"'

210

212

# .format(self.properties["Name"],

211

# str(command)))

213

# unicode(command)))

212

214

pass

213

215

214

216

def got_secret(self):

277

279

message = "Approval in {0}. (d)eny?"

278

280

else:

279

281

message = "Denial in {0}. (a)pprove?"

280

message = message.format(str(timer).rsplit(".", 1)[0])

282

message = message.format(unicode(timer).rsplit(".", 1)[0])

281

283

self.using_timer(True)

282

284

elif self.properties["LastCheckerStatus"] != 0:

283

285

# When checker has failed, show timer until client expires

291

293

datetime.timedelta())

292

294

message = ('A checker has failed! Time until client'

293

295

' gets disabled: {0}'

294

.format(str(timer).rsplit(".", 1)[0]))

296

.format(unicode(timer).rsplit(".", 1)[0]))

295

297

self.using_timer(True)

296

298

else:

297

299

message = "enabled"

380

382

def property_changed(self, property=None, **kwargs):

381

383

"""Call self.update() if old value is not new value.

382

384

This overrides the method from MandosClientPropertyCache"""

383

property_name = str(property)

385

property_name = unicode(property)

384

386

old_value = self.properties.get(property_name)

385

387

super(MandosClientWidget, self).property_changed(

386

388

property=property, **kwargs)

413

415

("normal",

414

416

"default", "default", None),

415

417

("bold",

416

"bold", "default", "bold"),

418

"default", "default", "bold"),

417

419

("underline-blink",

418

"underline,blink", "default", "underline,blink"),

420

"default", "default", "underline"),

419

421

("standout",

420

"standout", "default", "standout"),

422

"default", "default", "standout"),

421

423

("bold-underline-blink",

422

"bold,underline,blink", "default", "bold,underline,blink"),

424

"default", "default", ("bold", "underline")),

423

425

("bold-standout",

424

"bold,standout", "default", "bold,standout"),

426

"default", "default", ("bold", "standout")),

425

427

("underline-blink-standout",

426

"underline,blink,standout", "default",

427

"underline,blink,standout"),

428

"default", "default", ("underline", "standout")),

428

429

("bold-underline-blink-standout",

429

"bold,underline,blink,standout", "default",

430

"bold,underline,blink,standout"),

430

"default", "default", ("bold", "underline",

431

"standout")),

431

432

))

432

433

434

if urwid.supports_unicode():

488

489

self.topwidget = urwid.Pile(self.uilist)

489

490

491

def log_message(self, message):

491

"""Log message formatted with timestamp"""

492

timestamp = datetime.datetime.now().isoformat()

493

self.log_message_raw(timestamp + ": " + message)

494

507

self.log_visible = not self.log_visible

508

self.rebuild()

509

#self.log_message("Log visibility changed to: "

510

# + str(self.log_visible))

510

# + unicode(self.log_visible))

511

512

def change_log_display(self):

513

"""Change type of log display.

553

if path is None:

554

path = client.proxy.object_path

555

self.clients_dict[path] = client

556

self.clients.sort(key=lambda c: c.properties["Name"])

556

self.clients.sort(None, lambda c: c.properties["Name"])

557

self.refresh()

558

559

def remove_client(self, client, path=None):

561

if path is None:

562

path = client.proxy.object_path

563

del self.clients_dict[path]

564

if not self.clients_dict:

565

# Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker

566

# is completely emptied, we need to recreate it.

567

self.clients = urwid.SimpleListWalker([])

568

self.rebuild()

564

569

self.refresh()

565

570

566

571

def refresh(self):

579

584

try:

580

585

mandos_clients = (self.mandos_serv

581

586

.GetAllClientsWithProperties())

582

if not mandos_clients:

583

self.log_message_raw(("bold", "Note: Server has no clients."))

584

587

except dbus.exceptions.DBusException:

585

self.log_message_raw(("bold", "Note: No Mandos server running."))

586

588

mandos_clients = dbus.Dictionary()

587

589

588

590

(self.mandos_serv

600

602

self.client_not_found,

601

603

dbus_interface=server_interface,

602

604

byte_arrays=True))

603

for path, client in mandos_clients.items():

605

for path, client in mandos_clients.iteritems():

604

606

client_proxy_object = self.bus.get_object(self.busname,

605

607

path)

606

608

self.add_client(MandosClientWidget(server_proxy_object

718

720

ui.run()

719

721

except KeyboardInterrupt:

720

722

ui.screen.stop()

721

except Exception as e:

722

ui.log_message(str(e))

723

except Exception, e:

724

ui.log_message(unicode(e))

723

725

ui.screen.stop()

724

726

raise

Older »