/mandos/trunk : revision 423

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: 2010-09-12 03:00:40 UTC
Revision ID: teddy@fukt.bsnet.se-20100912030040-b0uopyennste9fdh

Documentation changes:

* DBUS-API: New file documenting the server D-Bus interface.

* clients.conf: Add examples of new approval settings.

* debian/mandos.docs: Added "DBUS-API".

* mandos-clients.conf.xml (OPTIONS): Added "approved_by_default",
                                     "approval_delay", and
                                     "approval_duration".
* mandos.xml (D-BUS INTERFACE): Refer to the "DBUS-API" file.
  (BUGS): Remove mention of lack of a remote query interface.

Show diffs side-by-side

added added

removed removed

mandos-ctl

locale.setlocale(locale.LC_ALL, u'')

tablewords = {

'name': u'Name',

'enabled': u'Enabled',

'timeout': u'Timeout',

'last_checked_ok': u'Last Successful Check',

'created': u'Created',

'interval': u'Interval',

'host': u'Host',

'fingerprint': u'Fingerprint',

'checker_running': u'Check Is Running',

'last_enabled': u'Last Enabled',

'checker': u'Checker',

'Name': u'Name',

'Enabled': u'Enabled',

'Timeout': u'Timeout',

'LastCheckedOK': u'Last Successful Check',

'Created': u'Created',

'Interval': u'Interval',

'Host': u'Host',

'Fingerprint': u'Fingerprint',

'CheckerRunning': u'Check Is Running',

'LastEnabled': u'Last Enabled',

'Checker': u'Checker',

}

defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok',

'checker')

defaultkeywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK')

domain = 'se.bsnet.fukt'

busname = domain + '.Mandos'

server_path = '/'

server_interface = domain + '.Mandos'

client_interface = domain + '.Mandos.Client'

version = "1.0.14"

bus = dbus.SystemBus()

mandos_dbus_objc = bus.get_object(busname, server_path)

try:

bus = dbus.SystemBus()

mandos_dbus_objc = bus.get_object(busname, server_path)

except dbus.exceptions.DBusException:

sys.exit(1)

mandos_serv = dbus.Interface(mandos_dbus_objc,

dbus_interface = server_interface)

mandos_clients = mandos_serv.GetAllClientsWithProperties()

105

108

# Create format string to print table rows

106

109

format_string = u' '.join(u'%%-%ds' %

107

110

max(len(tablewords[key]),

108

max(len(valuetostring(client[key], key))

111

max(len(valuetostring(client[key],

112

key))

109

113

for client in

110

114

clients))

111

115

for key in keywords)

128

132

help="Start checker for client")

129

133

parser.add_option("--stop-checker", action="store_true",

130

134

help="Stop checker for client")

131

parser.add_option("-V", "--is-valid", action="store_true",

132

help="Check if client is still valid")

135

parser.add_option("-V", "--is-enabled", action="store_true",

136

help="Check if client is enabled")

133

137

parser.add_option("-r", "--remove", action="store_true",

134

138

help="Remove client")

135

139

parser.add_option("-c", "--checker", type="string",

142

146

help="Set host for client")

143

147

parser.add_option("-s", "--secret", type="string",

144

148

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

149

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

150

help="Approve any current client request")

151

parser.add_option("-D", "--deny", action="store_true",

152

help="Deny any current client request")

145

153

options, client_names = parser.parse_args()

146

154

147

155

# Compile list of clients to process

159

167

if not clients and mandos_clients.values():

160

168

keywords = defaultkeywords

161

169

if options.all:

162

keywords = ('name', 'enabled', 'timeout', 'last_checked_ok',

163

'created', 'interval', 'host', 'fingerprint',

164

'checker_running', 'last_enabled', 'checker')

170

keywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK',

171

'Created', 'Interval', 'Host', 'Fingerprint',

172

'CheckerRunning', 'LastEnabled', 'Checker')

165

173

print_clients(mandos_clients.values())

166

174

167

175

# Process each client in the list by all selected options

178

186

client.StartChecker(dbus_interface=client_interface)

179

187

if options.stop_checker:

180

188

client.StopChecker(dbus_interface=client_interface)

181

if options.is_valid:

189

if options.is_enabled:

182

190

sys.exit(0 if client.Get(client_interface,

183

u"enabled",

191

u"Enabled",

184

192

dbus_interface=dbus.PROPERTIES_IFACE)

185

193

else 1)

186

194

if options.checker:

187

client.Set(client_interface, u"checker", options.checker,

195

client.Set(client_interface, u"Checker", options.checker,

188

196

dbus_interface=dbus.PROPERTIES_IFACE)

189

197

if options.host:

190

client.Set(client_interface, u"host", options.host,

198

client.Set(client_interface, u"Host", options.host,

191

199

dbus_interface=dbus.PROPERTIES_IFACE)

192

200

if options.interval:

193

client.Set(client_interface, u"interval",

201

client.Set(client_interface, u"Interval",

194

202

timedelta_to_milliseconds

195

203

(string_to_delta(options.interval)),

196

204

dbus_interface=dbus.PROPERTIES_IFACE)

197

205

if options.timeout:

198

client.Set(client_interface, u"timeout",

206

client.Set(client_interface, u"Timeout",

199

207

timedelta_to_milliseconds(string_to_delta

200

208

(options.timeout)),

201

209

dbus_interface=dbus.PROPERTIES_IFACE)

202

210

if options.secret:

203

client.Set(client_interface, u"secret",

211

client.Set(client_interface, u"Secret",

204

212

dbus.ByteArray(open(options.secret, u'rb').read()),

205

213

dbus_interface=dbus.PROPERTIES_IFACE)

214

if options.approve:

215

client.Approve(dbus.Boolean(True),

216

dbus_interface=client_interface)

217

if options.deny:

218

client.Approve(dbus.Boolean(False),

219

dbus_interface=client_interface)

Older »