/mandos/trunk : revision 723.1.5

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: 2014-07-25 23:32:04 UTC
mto: This revision was merged to the branch mainline in revision 724.
Revision ID: teddy@recompile.se-20140725233204-arvlsqrpfkfcwo10

Use the new auto-numbered "{}" syntax for the .format() string method.

* mandos (AvahiService.entry_group_state_changed): Use auto-numbering
                                                   for .format().
  (AvahiServiceToSyslog.rename): - '' -
  (Client.config_parser): - '' -
  (dbus_service_property): - '' -
  (DBusObjectWithProperties._is_dbus_thing): - '' -
  (DBusObjectWithProperties.Set): - '' -
  (alternate_dbus_interfaces/wrapper): - '' -
  (ClientDBus.notifychangeproperty): - '' -
  (string_to_delta): - '' -
  (daemon): - '' -
  (main): - '' -
  (main/cleanup): - '' -
* mandos-ctl (milliseconds_to_string): - '' -
  (main): - '' -
* mandos-monitor (MandosClientWidget.__init__): - '' -
  (MandosClientWidget.checker_completed): - '' -
  (MandosClientWidget.update): - '' -
  (UserInterface.client_not_found): - '' -
  (UserInterface.log_message): - '' -
  (UserInterface.toggle_log_display): - '' -
  (UserInterface.change_log_display): - '' -
  (UserInterface.find_and_remove_client): - '' -

files modified:
mandos

mandos-ctl

mandos-monitor

Show diffs side-by-side

added added

removed removed

mandos-monitor

161

self.rejected,

162

client_interface,

163

byte_arrays=True))

164

self.logger('Created client {0}'

164

self.logger('Created client {}'

165

.format(self.properties["Name"]), level=0)

166

167

def using_timer(self, flag):

179

180

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

181

if exitstatus == 0:

182

self.logger('Checker for client {0} (command "{1}")'

182

self.logger('Checker for client {} (command "{}")'

183

' succeeded'.format(self.properties["Name"],

184

command), level=0)

185

self.update()

186

return

187

# Checker failed

188

if os.WIFEXITED(condition):

189

self.logger('Checker for client {0} (command "{1}")'

190

' failed with exit code {2}'

189

self.logger('Checker for client {} (command "{}") failed'

190

' with exit code {}'

191

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

192

os.WEXITSTATUS(condition)))

193

elif os.WIFSIGNALED(condition):

194

self.logger('Checker for client {0} (command "{1}") was'

195

' killed by signal {2}'

194

self.logger('Checker for client {} (command "{}") was'

195

' killed by signal {}'

196

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

197

os.WTERMSIG(condition)))

198

elif os.WCOREDUMP(condition):

199

self.logger('Checker for client {0} (command "{1}")'

200

' dumped core'

201

.format(self.properties["Name"], command))

199

self.logger('Checker for client {} (command "{}") dumped'

200

' core'.format(self.properties["Name"],

201

command))

202

else:

203

self.logger('Checker for client {0} completed'

203

self.logger('Checker for client {} completed'

204

' mysteriously'

205

.format(self.properties["Name"]))

206

self.update()

207

208

def checker_started(self, command):

209

"""Server signals that a checker started."""

210

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

210

self.logger('Client {} started checker "{}"'

211

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

212

command), level=0)

213

214

def got_secret(self):

215

self.logger('Client {0} received its secret'

215

self.logger('Client {} received its secret'

216

.format(self.properties["Name"]))

217

218

def need_approval(self, timeout, default):

219

if not default:

220

message = 'Client {0} needs approval within {1} seconds'

220

message = 'Client {} needs approval within {} seconds'

221

else:

222

message = 'Client {0} will get its secret in {1} seconds'

222

message = 'Client {} will get its secret in {} seconds'

223

self.logger(message.format(self.properties["Name"],

224

timeout/1000))

225

226

def rejected(self, reason):

227

self.logger('Client {0} was rejected; reason: {1}'

227

self.logger('Client {} was rejected; reason: {}'

228

.format(self.properties["Name"], reason))

229

230

def selectable(self):

274

else:

275

timer = datetime.timedelta()

276

if self.properties["ApprovedByDefault"]:

277

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

277

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

278

else:

279

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

279

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

280

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

281

self.using_timer(True)

282

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

290

timer = max(expires - datetime.datetime.utcnow(),

291

datetime.timedelta())

292

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

293

' gets disabled: {0}'

293

' gets disabled: {}'

294

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

295

self.using_timer(True)

296

else:

297

message = "enabled"

298

self.using_timer(False)

299

self._text = "{0}{1}".format(base, message)

299

self._text = "{}{}".format(base, message)

300

301

if not urwid.supports_unicode():

302

self._text = self._text.encode("ascii", "replace")

469

self.main_loop = gobject.MainLoop()

470

471

def client_not_found(self, fingerprint, address):

472

self.log_message("Client with address {0} and fingerprint"

473

" {1} could not be found"

472

self.log_message("Client with address {} and fingerprint {}"

473

" could not be found"

474

.format(address, fingerprint))

475

476

def rebuild(self):

494

if level < self.log_level:

495

return

496

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

497

self.log_message_raw("{0}: {1}".format(timestamp, message),

497

self.log_message_raw("{}: {}".format(timestamp, message),

498

level=level)

499

500

def log_message_raw(self, markup, level=1):

513

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

514

self.log_visible = not self.log_visible

515

self.rebuild()

516

self.log_message("Log visibility changed to: {0}"

516

self.log_message("Log visibility changed to: {}"

517

.format(self.log_visible), level=0)

518

519

def change_log_display(self):

525

self.log_wrap = "clip"

526

for textwidget in self.log:

527

textwidget.set_wrap_mode(self.log_wrap)

528

self.log_message("Wrap mode: {0}".format(self.log_wrap),

528

self.log_message("Wrap mode: {}".format(self.log_wrap),

529

level=0)

530

531

def find_and_remove_client(self, path, name):

537

client = self.clients_dict[path]

538

except KeyError:

539

# not found?

540

self.log_message("Unknown client {0!r} ({1!r}) removed"

540

self.log_message("Unknown client {!r} ({!r}) removed"

541

.format(name, path))

542

return

543

client.delete()

Older »