/mandos/release : revision 237.7.280

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-08-10 14:13:02 UTC
mto: (237.7.304 trunk)
mto: This revision was merged to the branch mainline in revision 323.
Revision ID: teddy@recompile.se-20140810141302-8q1xaaxlh8ho5joz

Emit D-Bus "org.freedesktop.DBus.Properties.PropertiesChanged" signal.

This deprecates the "se.recompile.Mandos.Client.PropertyChanged"
signal.  The new signal also adds support for noticing changes to the
"se.recompile.Mandos.Client.Secret" write-only property.

* mandos (dbus_annotations): Fix usage example in doc string.
  (DBusObjectWithProperties.PropertiesChanged): New; from D-Bus
                                                standard.
  (ClientDBus._interface): Set early instead of later.
  (ClientDBus.notifychangeproperty): Take new "invalidate_only"
                                     parameter, and pass in _interface
                                     as a default keyword argument.
  (ClientDBus.notifychangeproperty/setter): Also emit
                                            PropertiesChanged signal;
                                            emit new value or
                                            invalidation depending on
                                            "invalidate_only".
  (ClientDBus.secret): Apply notifychangeproperty with
                       "invalidate_only=True".
  (ClientDBus._foo): Removed defunct interface annotation.
  (ClientDBus.PropertyChanged): Add annotation; this method is now
                                deprecated.
  (main/MandosDBusService.GetAllClientsWithProperties): Use dictionary
                                                        comprehension.
* DBUS-API (Mandos Client Interface/Signals/PropertyChanged): Removed.
* mandos-monitor: Use standard "PropertiesChanged" signal instead of
                  old signal "PropertyChanged".
  (MandosClientPropertyCache.__init__): Connect to signal
                                        PropertiesChanged instead of
                                        PropertyChanged.
  (MandosClientPropertyCache._property_changed): Removed.
  (MandosClientPropertyCache.property_changed): Renamed to
                                                "properties_changed"
                                                and adapted to new
                                                call signature.
  (MandosClientWidget.properties_changed): - '' -

Show diffs side-by-side

added added

removed removed

mandos-ctl

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.major == 2:

str = unicode

locale.setlocale(locale.LC_ALL, "")

tablewords = {

server_path = "/"

server_interface = domain + ".Mandos"

client_interface = domain + ".Mandos.Client"

version = "1.6.5"

def timedelta_to_milliseconds(td):

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

return ((td.days * 24 * 60 * 60 * 1000)

+ (td.seconds * 1000)

+ (td.microseconds // 1000))

version = "1.6.8"

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

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

152

frozenset((token_year, token_month,

153

token_day, token_time,

154

token_week))),

154

token_week)))

155

# Define starting values

156

value = datetime.timedelta() # Value so far

157

found_token = None

158

followers = frozenset(token_duration,) # Following valid tokens

158

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

159

s = duration # String left to parse

160

# Loop until end token is found

161

while found_token is not token_end:

230

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

231

"ApprovalDuration", "ExtendedTimeout"):

232

return milliseconds_to_string(value)

233

return unicode(value)

233

return str(value)

234

235

# Create format string to print table rows

236

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

243

# Print header line

244

print(format_string.format(**tablewords))

245

for client in clients:

246

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

246

print(format_string.format(**{ key:

247

valuetostring(client[key],

248

key))

249

for key in keywords)))

248

key)

249

for key in keywords }))

250

251

def has_actions(options):

252

return any((options.enable,

271

def main():

272

parser = argparse.ArgumentParser()

273

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

274

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

274

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

275

help="show version number and exit")

276

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

277

help="Select all clients")

310

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

311

help="Set duration of one client approval")

312

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

313

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

313

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

314

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

314

315

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

315

316

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

316

317

help="Approve any current client request")

365

366

clients={}

366

367

368

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

369

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

370

for path, properties in mandos_clients.items() }

371

else:

372

for name in options.client:

373

for path, client in mandos_clients.iteritems():

373

for path, client in mandos_clients.items():

374

if client["Name"] == name:

375

client_objc = bus.get_object(busname, path)

376

clients[client_objc] = client

377

break

378

else:

379

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

379

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

380

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

381

sys.exit(1)

382

405

"""Set a Client D-Bus property, converted

406

from a string to milliseconds."""

407

set_client_prop(prop,

408

timedelta_to_milliseconds

409

(string_to_delta(value)))

408

string_to_delta(value).total_seconds()

409

* 1000)

410

if options.remove:

411

mandos_serv.RemoveClient(client.__dbus_object_path__)

412

if options.enable:

Older »