/mandos/trunk

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

  • Committer: Teddy Hogeborn
  • Date: 2009-09-21 21:39:25 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090921213925-jbpt6tzu99otseng
Use D-Bus properties instead of our own methods.

* mandos (Client._datetime_to_milliseconds): Renamed to
                                             "_timedelta_to_milliseconds".
                                             All callers changed.
  (dbus_service_property): New decorator for D-Bus properties.
  (DBusPropertyException, DBusPropertyAccessException,
  DBusPropertyNotFound): New D-Bus exception classes.
  (DBusObjectWithProperties): New; extends "dbus.service.Object" with
                              support for properties.
  (ClientDBus): Inherit from, and call up to, "DBusObjectWithProperties".
  (ClientDBus.CheckedOK, ClientDBus.GetAllProperties,
  ClientDBus.SetChecker, ClientDBus.SetHost, ClientDBus.SetInterval,
  ClientDBus.SetSecret, ClientDBus.SetTimeout, ClientDBus.Enable,
  ClientDBus.StartChecker, ClientDBus.Disable,
  ClientDBus.StopChecker): Removed, replaced with properties.
  (ClientDBus.IsStillValid): Removed, superfluous.
  (ClientDBus.name_dbus_property,
  ClientDBus.fingerprint_dbus_property, ClientDBus.host_dbus_property,
  ClientDBus.created_dbus_property,
  ClientDBus.last_enabled_dbus_property,
  ClientDBus.enabled_dbus_property,
  ClientDBus.last_checked_ok_dbus_property,
  ClientDBus.timeout_dbus_property, ClientDBus.interval_dbus_property,
  ClientDBus.checker_dbus_property,
  ClientDBus.checker_running_dbus_property,
  ClientDBus.object_path_dbus_property,
  ClientDBus.secret_dbus_property): New D-Bus properties.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
26
26
    }
27
27
defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
28
28
                   'checker')
29
 
busname = 'org.mandos-system.Mandos'
30
 
server_path = '/Mandos'
31
 
server_interface = 'org.mandos_system.Mandos'
32
 
client_interface = 'org.mandos_system.Mandos.Client'
33
 
version = "1.0.4"
34
 
 
 
29
domain = 'se.bsnet.fukt'
 
30
busname = domain + '.Mandos'
 
31
server_path = '/'
 
32
server_interface = domain + '.Mandos'
 
33
client_interface = domain + '.Mandos.Client'
 
34
version = "1.0.12"
35
35
bus = dbus.SystemBus()
36
36
mandos_dbus_objc = bus.get_object(busname, server_path)
37
37
mandos_serv = dbus.Interface(mandos_dbus_objc,
106
106
                                      for client in
107
107
                                      clients))
108
108
                              for key in keywords)
109
 
    print format_string % tuple(tablewords[key] for key in keywords) 
 
109
    print format_string % tuple(tablewords[key] for key in keywords)
110
110
    for client in clients:
111
111
        print format_string % tuple(valuetostring(client[key], key)
112
112
                                    for key in keywords)
115
115
parser.add_option("-a", "--all", action="store_true",
116
116
                  help="Print all fields")
117
117
parser.add_option("-e", "--enable", action="store_true",
118
 
                  help="Enable specified client")
 
118
                  help="Enable client")
119
119
parser.add_option("-d", "--disable", action="store_true",
120
 
                  help="disable specified client")
 
120
                  help="disable client")
121
121
parser.add_option("-b", "--bump-timeout", action="store_true",
122
 
                  help="Bump timeout of specified client")
 
122
                  help="Bump timeout for client")
123
123
parser.add_option("--start-checker", action="store_true",
124
 
                  help="Start checker for specified client")
 
124
                  help="Start checker for client")
125
125
parser.add_option("--stop-checker", action="store_true",
126
 
                  help="Stop checker for specified client")
127
 
parser.add_option("-v", "--is-valid", action="store_true",
128
 
                  help="Stop checker for specified client")
 
126
                  help="Stop checker for client")
 
127
parser.add_option("-V", "--is-valid", action="store_true",
 
128
                  help="Check if client is still valid")
 
129
parser.add_option("-r", "--remove", action="store_true",
 
130
                  help="Remove client")
129
131
parser.add_option("-c", "--checker", type="string",
130
 
                  help="Set checker command for specified client")
 
132
                  help="Set checker command for client")
131
133
parser.add_option("-t", "--timeout", type="string",
132
 
                  help="Set timeout for specified client")
 
134
                  help="Set timeout for client")
133
135
parser.add_option("-i", "--interval", type="string",
134
 
                  help="Set checker interval for specified client")
 
136
                  help="Set checker interval for client")
135
137
parser.add_option("-H", "--host", type="string",
136
 
                  help="Set host for specified client")
 
138
                  help="Set host for client")
137
139
parser.add_option("-s", "--secret", type="string",
138
 
                  help="Set password blob (file) for specified client")
 
140
                  help="Set password blob (file) for client")
139
141
options, client_names = parser.parse_args()
140
142
 
 
143
# Compile list of clients to process
141
144
clients=[]
142
145
for name in client_names:
143
146
    for path, client in mandos_clients.iteritems():
151
154
        print >> sys.stderr, "Client not found on server: %r" % name
152
155
        sys.exit(1)
153
156
 
154
 
if not clients:
 
157
if not clients and mandos_clients.values():
155
158
    keywords = defaultkeywords
156
159
    if options.all:
157
160
        keywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
158
161
                    'created', 'interval', 'host', 'fingerprint',
159
162
                    'checker_running', 'last_enabled', 'checker')
160
163
    print_clients(mandos_clients.values())
161
 
    
 
164
 
 
165
# Process each client in the list by all selected options
162
166
for client in clients:
 
167
    if options.remove:
 
168
        mandos_serv.RemoveClient(client.__dbus_object_path__)
163
169
    if options.enable:
164
170
        client.Enable()
165
171
    if options.disable: