/mandos/trunk : revision 446

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 at bsnet
Date: 2010-09-27 16:27:13 UTC
Revision ID: teddy@fukt.bsnet.se-20100927162713-jucnyd63612ximvw

* mandos-monitor: Change key for removing a client from "r" to "R".

Show diffs side-by-side

added added

removed removed

mandos-monitor

#!/usr/bin/python

# -*- mode: python; coding: utf-8 -*-

# 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

# the Free Software Foundation, either version 3 of the License, or

# (at your option) any later version.

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

# GNU General Public License for more details.

# You should have received a copy of the GNU General Public License

# along with this program. If not, see <http://www.gnu.org/licenses/>.

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

from __future__ import division, absolute_import, with_statement

102

123

self.logger = logger

103

124

104

125

self._update_timer_callback_tag = None

126

self._update_timer_callback_lock = 0

105

127

self.last_checker_failed = False

106

128

107

129

# The widget shown normally

113

135

*args, **kwargs)

114

136

self.update()

115

137

self.opened = False

138

139

last_checked_ok = isoformat_to_datetime(self.properties

140

[u"LastCheckedOK"])

141

if last_checked_ok is None:

142

self.last_checker_failed = True

143

else:

144

self.last_checker_failed = ((datetime.datetime.utcnow()

145

- last_checked_ok)

146

> datetime.timedelta

147

(milliseconds=

148

self.properties

149

[u"Interval"]))

150

151

if self.last_checker_failed:

152

self.using_timer(True)

153

154

if self.need_approval:

155

self.using_timer(True)

156

116

157

self.proxy.connect_to_signal(u"CheckerCompleted",

117

158

self.checker_completed,

118

159

client_interface,

133

174

self.rejected,

134

175

client_interface,

135

176

byte_arrays=True)

136

last_checked_ok = isoformat_to_datetime(self.properties

137

[u"LastCheckedOK"])

138

if last_checked_ok is None:

139

self.last_checker_failed = True

177

178

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

179

super(self, MandosClientWidget).property_changed(property,

180

value)

181

if property == u"ApprovalPending":

182

using_timer(bool(value))

183

184

def using_timer(self, flag):

185

"""Call this method with True or False when timer should be

186

activated or deactivated.

187

"""

188

old = self._update_timer_callback_lock

189

if flag:

190

self._update_timer_callback_lock += 1

140

191

else:

141

self.last_checker_failed = ((datetime.datetime.utcnow()

142

- last_checked_ok)

143

> datetime.timedelta

144

(milliseconds=

145

self.properties

146

[u"Interval"]))

147

if self.last_checker_failed:

192

self._update_timer_callback_lock -= 1

193

if old == 0 and self._update_timer_callback_lock:

148

194

self._update_timer_callback_tag = (gobject.timeout_add

149

195

(1000,

150

196

self.update_timer))

197

elif old and self._update_timer_callback_lock == 0:

198

gobject.source_remove(self._update_timer_callback_tag)

199

self._update_timer_callback_tag = None

151

200

152

201

def checker_completed(self, exitstatus, condition, command):

153

202

if exitstatus == 0:

154

203

if self.last_checker_failed:

155

204

self.last_checker_failed = False

156

gobject.source_remove(self._update_timer_callback_tag)

157

self._update_timer_callback_tag = None

158

self.logger(u'Checker for client %s (command "%s")'

159

u' was successful'

160

% (self.properties[u"Name"], command))

205

self.using_timer(False)

206

#self.logger(u'Checker for client %s (command "%s")'

207

# u' was successful'

208

# % (self.properties[u"Name"], command))

161

209

self.update()

162

210

return

163

211

# Checker failed

164

212

if not self.last_checker_failed:

165

213

self.last_checker_failed = True

166

self._update_timer_callback_tag = (gobject.timeout_add

167

(1000,

168

self.update_timer))

214

self.using_timer(True)

169

215

if os.WIFEXITED(condition):

170

216

self.logger(u'Checker for client %s (command "%s")'

171

217

u' failed with exit code %s'

202

248

message = u'Client %s will get its secret in %s seconds'

203

249

self.logger(message

204

250

% (self.properties[u"Name"], timeout/1000))

251

self.using_timer(True)

205

252

206

253

def rejected(self, reason):

207

254

self.logger(u'Client %s was rejected; reason: %s'

242

289

if not self.properties[u"Enabled"]:

243

290

message = u"DISABLED"

244

291

elif self.properties[u"ApprovalPending"]:

292

timeout = datetime.timedelta(milliseconds

293

= self.properties

294

[u"ApprovalDelay"])

295

last_approval_request = isoformat_to_datetime(

296

self.properties[u"LastApprovalRequest"])

297

if last_approval_request is not None:

298

timer = timeout - (datetime.datetime.utcnow()

299

- last_approval_request)

300

else:

301

timer = datetime.timedelta()

245

302

if self.properties[u"ApprovedByDefault"]:

246

message = u"Connection established to client. (d)eny?"

303

message = u"Approval in %s. (d)eny?"

247

304

else:

248

message = u"Seeks approval to send secret. (a)pprove?"

305

message = u"Denial in %s. (a)pprove?"

306

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

249

307

elif self.last_checker_failed:

250

308

timeout = datetime.timedelta(milliseconds

251

309

= self.properties

256

314

self.properties[u"LastEnabled"]))

257

315

timer = timeout - (datetime.datetime.utcnow() - last_ok)

258

316

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

259

u' gets diabled: %s'

317

u' gets disabled: %s'

260

318

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

261

319

else:

262

320

message = u"enabled"

309

367

elif key == u"d":

310

368

self.proxy.Approve(dbus.Boolean(False, variant_level=1),

311

369

dbus_interface = client_interface)

312

elif key == u"r" or key == u"_" or key == u"ctrl k":

370

elif key == u"R" or key == u"_" or key == u"ctrl k":

313

371

self.server_proxy_object.RemoveClient(self.proxy

314

372

.object_path)

315

373

elif key == u"s":

325

383

# self.proxy.unpause()

326

384

# elif key == u"RET":

327

385

# self.open()

328

# elif key == u"+":

329

# self.proxy.Approve(True)

330

# elif key == u"-":

331

# self.proxy.Approve(False)

332

386

else:

333

387

return key

334

388

504

558

"""Toggle visibility of the log buffer."""

505

559

self.log_visible = not self.log_visible

506

560

self.rebuild()

507

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

508

+ unicode(self.log_visible))

561

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

562

# + unicode(self.log_visible))

509

563

510

564

def change_log_display(self):

511

565

"""Change type of log display.

516

570

self.log_wrap = u"clip"

517

571

for textwidget in self.log:

518

572

textwidget.set_wrap_mode(self.log_wrap)

519

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

573

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

520

574

521

575

def find_and_remove_client(self, path, name):

522

576

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

632

686

.join((u"Clients:",

633

687

u"+: Enable",

634

688

u"-: Disable",

635

u"r: Remove",

689

u"R: Remove",

636

690

u"s: Start new checker",

637

691

u"S: Stop checker",

638

692

u"C: Checker OK",

Older »