/mandos/release : revision 237.7.41

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

Committer: Teddy Hogeborn
Date: 2011-08-08 21:12:37 UTC
mto: (24.1.178 mandos) (237.12.2 mandos-persistent) (299.1.1 release) (300.1.1 release) (301.1.1 release)
mto: This revision was merged to the branch mainline in revision 286.
Revision ID: teddy@fukt.bsnet.se-20110808211237-jejsz5brjytrjot8

* Makefile (DOCS): Added "intro.8mandos".
(intro.8mandos, intro.8mandos.xhtml): New.
* README: Replaced text with link, reference and short summary.
* intro.xml: New.
* mandos-clients.conf.xml (SEE ALSO): Added "intro(8mandos)".
* mandos-ctl.xml (SEE ALSO): - '' -
* mandos-keygen.xml (SEE ALSO): - '' -
* mandos-monitor.xml (SEE ALSO): - '' -
* mandos.conf.xml (SEE ALSO): - '' -
* mandos.xml (SEE ALSO): - '' -
* plugin-runner.xml (SEE ALSO): - '' -
* plugins.d/askpass-fifo.xml (SEE ALSO): - '' -
* plugins.d/mandos-client.xml (SEE ALSO): - '' -
* plugins.d/password-prompt.xml (SEE ALSO): - '' -
* plugins.d/plymouth.xml (SEE ALSO): - '' -
* plugins.d/splashy.xml (SEE ALSO): - '' -
* plugins.d/usplash.xml (SEE ALSO): - '' -

Show diffs side-by-side

added added

removed removed

mandos-monitor

# Contact the authors at <mandos@fukt.bsnet.se>.

from __future__ import division, absolute_import, print_function, unicode_literals

from __future__ import (division, absolute_import, print_function,

unicode_literals)

import sys

import os

domain = 'se.bsnet.fukt'

server_interface = domain + '.Mandos'

client_interface = domain + '.Mandos.Client'

version = "1.3.0"

version = "1.3.1"

# Always run in monochrome mode

urwid.curses_display.curses.has_colors = lambda : False

self.proxy = proxy_object # Mandos Client proxy object

self.properties = dict()

self.proxy.connect_to_signal("PropertyChanged",

self.property_changed,

client_interface,

byte_arrays=True)

self.property_changed_match = (

self.proxy.connect_to_signal("PropertyChanged",

self.property_changed,

client_interface,

byte_arrays=True))

self.properties.update(

self.proxy.GetAll(client_interface,

dbus_interface = dbus.PROPERTIES_IFACE))

#XXX This break good super behaviour!

100

#XXX This breaks good super behaviour

101

# super(MandosClientPropertyCache, self).__init__(

100

102

# *args, **kwargs)

101

103

105

107

"""

106

108

# Update properties dict with new value

107

109

self.properties[property] = value

110

111

def delete(self, *args, **kwargs):

112

self.property_changed_match.remove()

113

super(MandosClientPropertyCache, self).__init__(

114

*args, **kwargs)

108

115

109

116

110

117

class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):

154

161

if self.need_approval:

155

162

self.using_timer(True)

156

163

157

self.proxy.connect_to_signal("CheckerCompleted",

158

self.checker_completed,

159

client_interface,

160

byte_arrays=True)

161

self.proxy.connect_to_signal("CheckerStarted",

162

self.checker_started,

163

client_interface,

164

byte_arrays=True)

165

self.proxy.connect_to_signal("GotSecret",

166

self.got_secret,

167

client_interface,

168

byte_arrays=True)

169

self.proxy.connect_to_signal("NeedApproval",

170

self.need_approval,

171

client_interface,

172

byte_arrays=True)

173

self.proxy.connect_to_signal("Rejected",

174

self.rejected,

175

client_interface,

176

byte_arrays=True)

164

self.match_objects = (

165

self.proxy.connect_to_signal("CheckerCompleted",

166

self.checker_completed,

167

client_interface,

168

byte_arrays=True),

169

self.proxy.connect_to_signal("CheckerStarted",

170

self.checker_started,

171

client_interface,

172

byte_arrays=True),

173

self.proxy.connect_to_signal("GotSecret",

174

self.got_secret,

175

client_interface,

176

byte_arrays=True),

177

self.proxy.connect_to_signal("NeedApproval",

178

self.need_approval,

179

client_interface,

180

byte_arrays=True),

181

self.proxy.connect_to_signal("Rejected",

182

self.rejected,

183

client_interface,

184

byte_arrays=True))

185

#self.logger('Created client %s' % (self.properties["Name"]))

177

186

178

187

def property_changed(self, property=None, value=None):

179

188

super(self, MandosClientWidget).property_changed(property,

341

350

self.update()

342

351

return True # Keep calling this

343

352

344

def delete(self):

353

def delete(self, *args, **kwargs):

345

354

if self._update_timer_callback_tag is not None:

346

355

gobject.source_remove(self._update_timer_callback_tag)

347

356

self._update_timer_callback_tag = None

357

for match in self.match_objects:

358

match.remove()

359

self.match_objects = ()

348

360

if self.delete_hook is not None:

349

361

self.delete_hook(self)

362

return super(MandosClientWidget, self).delete(*args, **kwargs)

350

363

351

364

def render(self, maxcolrow, focus=False):

352

365

"""Render differently if we have focus.

580

593

#self.log_message("Wrap mode: " + self.log_wrap)

581

594

582

595

def find_and_remove_client(self, path, name):

583

"""Find an client from its object path and remove it.

596

"""Find a client by its object path and remove it.

584

597

585

598

This is connected to the ClientRemoved signal from the

586

599

Mandos server object."""

588

601

client = self.clients_dict[path]

589

602

except KeyError:

590

603

# not found?

604

self.log_message("Unknown client %r (%r) removed", name,

605

path)

591

606

return

592

self.remove_client(client, path)

607

client.delete()

593

608

594

609

def add_new_client(self, path):

595

610

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

Older »