/mandos/release : revision 237.23.5

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

Committer: Teddy Hogeborn
Date: 2014-07-25 23:32:04 UTC
mto: (237.7.272 trunk)
mto: This revision was merged to the branch mainline in revision 321.
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): - '' -

Show diffs side-by-side

added added

removed removed

mandos-ctl

# 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)

from future_builtins import *

try:

from future_builtins import *

except ImportError:

pass

import sys

import argparse

import dbus

if sys.version_info[0] == 2:

str = unicode

locale.setlocale(locale.LC_ALL, "")

tablewords = {

server_path = "/"

server_interface = domain + ".Mandos"

client_interface = domain + ".Mandos.Client"

version = "1.6.4"

version = "1.6.7"

def timedelta_to_milliseconds(td):

"""Convert a datetime.timedelta object to milliseconds"""

def milliseconds_to_string(ms):

td = datetime.timedelta(0, 0, 0, ms)

return ("{days}{hours:02}:{minutes:02}:{seconds:02}"

.format(days = "{0}T".format(td.days) if td.days else "",

.format(days = "{}T".format(td.days) if td.days else "",

hours = td.seconds // 3600,

minutes = (td.seconds % 3600) // 60,

seconds = td.seconds % 60,

151

157

token_duration = Token(re.compile(r"P"), None,

152

158

frozenset((token_year, token_month,

153

159

token_day, token_time,

154

token_week))),

160

token_week)))

155

161

# Define starting values

156

162

value = datetime.timedelta() # Value so far

157

163

found_token = None

158

followers = frozenset(token_duration,) # Following valid tokens

164

followers = frozenset((token_duration,)) # Following valid tokens

159

165

s = duration # String left to parse

160

166

# Loop until end token is found

161

167

while found_token is not token_end:

230

236

if keyword in ("Timeout", "Interval", "ApprovalDelay",

231

237

"ApprovalDuration", "ExtendedTimeout"):

232

238

return milliseconds_to_string(value)

233

return unicode(value)

239

return str(value)

234

240

235

241

# Create format string to print table rows

236

242

format_string = " ".join("{{{key}:{width}}}".format(

243

249

# Print header line

244

250

print(format_string.format(**tablewords))

245

251

for client in clients:

246

print(format_string.format(**dict((key,

252

print(format_string.format(**{ key:

247

253

valuetostring(client[key],

248

key))

249

for key in keywords)))

254

key)

255

for key in keywords }))

250

256

251

257

def has_actions(options):

252

258

return any((options.enable,

271

277

def main():

272

278

parser = argparse.ArgumentParser()

273

279

parser.add_argument("--version", action="version",

274

version = "%(prog)s {0}".format(version),

280

version = "%(prog)s {}".format(version),

275

281

help="show version number and exit")

276

282

parser.add_argument("-a", "--all", action="store_true",

277

283

help="Select all clients")

310

316

parser.add_argument("--approval-duration",

311

317

help="Set duration of one client approval")

312

318

parser.add_argument("-H", "--host", help="Set host for client")

313

parser.add_argument("-s", "--secret", type=file,

319

parser.add_argument("-s", "--secret",

320

type=argparse.FileType(mode="rb"),

314

321

help="Set password blob (file) for client")

315

322

parser.add_argument("-A", "--approve", action="store_true",

316

323

help="Approve any current client request")

365

372

clients={}

366

373

367

374

if options.all or not options.client:

368

clients = dict((bus.get_object(busname, path), properties)

369

for path, properties in

370

mandos_clients.iteritems())

375

clients = { bus.get_object(busname, path): properties

376

for path, properties in mandos_clients.items() }

371

377

else:

372

378

for name in options.client:

373

for path, client in mandos_clients.iteritems():

379

for path, client in mandos_clients.items():

374

380

if client["Name"] == name:

375

381

client_objc = bus.get_object(busname, path)

376

382

clients[client_objc] = client

377

383

break

378

384

else:

379

print("Client not found on server: {0!r}"

385

print("Client not found on server: {!r}"

380

386

.format(name), file=sys.stderr)

381

387

sys.exit(1)

382

388

Older »