/mandos/trunk : revision 738.1.2

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: 2015-07-01 20:01:26 UTC
mto: This revision was merged to the branch mainline in revision 759.
Revision ID: teddy@recompile.se-20150701200126-qb3f6c3jcas2f4og

mandos-client: Try to start a plugin to add and remove a local route.

* debian/mandos-client.README.Debian: Add setting of environment
                                      variable MANDOSPLUGINHELPERDIR
                                      to command line testing
                                      mandos-client.
* mandos-client.c (raise_privileges): Moved to top of file.
                  (raise_privileges_permanently): - '' -
                  (lower_privileges): - '' -
                  (lower_privileges_permanently): - '' -
  (add_remove_local_route, add_local_route, remove_local_route): New.
  (start_mandos_communication): Set SOCK_CLOEXEC flag on socket.  Run
                                the above functions to add (and
                                remove) local route, if the conditions
                                indicates it could help.
  (run_network_hooks): Use O_DIRECTORY, O_PATH, and O_CLOEXEC flags
                       when opening network hook directory. Do
                       TEMP_FAILURE_RETRY around opening of /dev/null
                       and network hook executables.  Move redirecting
                       of stdout and stderr to as late as possible
                       before fexecve().
  (main): Use O_DIRECTORY and O_PATH when opening temporary directory.
* plugins.d/mandos-client.xml (ENVIRONMENT): Document usage of the
                                             MANDOSPLUGINHELPERDIR
                                             environment variable.

Show diffs side-by-side

added added

removed removed

mandos-monitor

# 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

173

gobject.source_remove(self._update_timer_callback_tag)

174

self._update_timer_callback_tag = None

175

176

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

176

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

177

if exitstatus == 0:

178

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

179

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

181

self.update()

182

return

183

# Checker failed

184

if exitstatus >= 0:

184

if os.WIFEXITED(condition):

185

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

186

' with exit code {}'

187

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

188

exitstatus))

189

elif signal != 0:

188

os.WEXITSTATUS(condition)))

189

elif os.WIFSIGNALED(condition):

190

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

191

' killed by signal {}'

192

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

193

signal))

193

os.WTERMSIG(condition)))

194

elif os.WCOREDUMP(condition):

195

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

196

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

197

command))

194

198

else:

195

199

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

196

200

' mysteriously'

Older »