/mandos/trunk : revision 93

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

Committer: Teddy Hogeborn
Date: 2008-08-20 03:22:45 UTC
Revision ID: teddy@fukt.bsnet.se-20080820032245-ue341vdvzqdsg68l

* mandos (string_to_delta): Accept a whitespace-separated sequence of
                            intervals and return the sum.  This allows
                            "5m 30s" to be valid.
  (main): Provide an empty default value for the "host" option for
          "clients.conf", making it no longer a required option.

* mandos-clients.conf.xml: Removed <?xml-stylesheet>.
  (DESCRIPTION): Improved text.
  (DEFAULTS): Renamed to "OPTIONS".  Improved text for "timeout" and
              "interval".
  (CLIENTS): Removed; content moved to "OPTIONS".
  (EXPANSION): New section; document %(foo)s and %%(foo)s expansion.
  (FILES): Moved to before "EXAMPLES".
  (BUGS): New section.
  (EXAMPLES): Renamed to "EXAMPLE", as per man-pages(7).  Renamed
              example section "example_client" to "foo".  Changed
              example "host" setting to a more reasonable example host
              name.  Added additional example client "bar".

* mandos-conf.xml: Removed OVERVIEW entity.

Show diffs side-by-side

added added

removed removed

mandos

# GNU General Public License for more details.

# You should have received a copy of the GNU General Public License

# along with this program. If not, see

# <http://www.gnu.org/licenses/>.

# along with this program. If not, see <http://www.gnu.org/licenses/>.

# Contact the authors at <mandos@fukt.bsnet.se>.

124

123

def rename(self):

125

124

"""Derived from the Avahi example code"""

126

125

if self.rename_count >= self.max_renames:

127

logger.critical(u"No suitable Zeroconf service name found"

128

u" after %i retries, exiting.",

129

rename_count)

126

logger.critical(u"No suitable service name found after %i"

127

u" retries, exiting.", rename_count)

130

128

raise AvahiServiceError("Too many renames")

131

129

self.name = server.GetAlternativeServiceName(self.name)

132

logger.info(u"Changing Zeroconf service name to %r ...",

133

str(self.name))

130

logger.info(u"Changing name to %r ...", str(self.name))

134

131

syslogger.setFormatter(logging.Formatter\

135

132

('Mandos (%s): %%(levelname)s:'

136

133

' %%(message)s' % self.name))

151

148

avahi.DBUS_INTERFACE_ENTRY_GROUP)

152

149

group.connect_to_signal('StateChanged',

153

150

entry_group_state_changed)

154

logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",

151

logger.debug(u"Adding service '%s' of type '%s' ...",

155

152

service.name, service.type)

156

153

group.AddService(

157

154

self.interface, # interface

340

337

try:

341

338

logger.info(u"Starting checker %r for %s",

342

339

command, self.name)

343

# We don't need to redirect stdout and stderr, since

344

# in normal mode, that is already done by daemon(),

345

# and in debug mode we don't want to. (Stdin is

346

# always replaced by /dev/null.)

347

340

self.checker = subprocess.Popen(command,

348

341

close_fds=True,

349

342

shell=True, cwd="/")

350

343

self.checker_callback_tag = gobject.child_watch_add\

351

344

(self.checker.pid,

352

345

self.checker_callback)

353

except OSError, error:

346

except subprocess.OSError, error:

354

347

logger.error(u"Failed to start subprocess: %s",

355

348

error)

356

349

# Re-run this periodically if run by gobject.timeout_add

413

406

gnutls.library.functions.gnutls_openpgp_crt_import\

414

407

(crt, ctypes.byref(datum),

415

408

gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)

416

# Verify the self signature in the key

417

crtverify = ctypes.c_uint();

418

gnutls.library.functions.gnutls_openpgp_crt_verify_self\

419

(crt, 0, ctypes.byref(crtverify))

420

if crtverify.value != 0:

421

gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)

422

raise gnutls.errors.CertificateSecurityError("Verify failed")

423

409

# New buffer for the fingerprint

424

410

buffer = ctypes.create_string_buffer(20)

425

411

buffer_length = ctypes.c_size_t()

606

592

def server_state_changed(state):

607

593

"""Derived from the Avahi example code"""

608

594

if state == avahi.SERVER_COLLISION:

609

logger.error(u"Zeroconf server name collision")

595

logger.error(u"Server name collision")

610

596

service.remove()

611

597

elif state == avahi.SERVER_RUNNING:

612

598

service.add()

614

600

615

601

def entry_group_state_changed(state, error):

616

602

"""Derived from the Avahi example code"""

617

logger.debug(u"Avahi state change: %i", state)

603

logger.debug(u"state change: %i", state)

618

604

619

605

if state == avahi.ENTRY_GROUP_ESTABLISHED:

620

logger.debug(u"Zeroconf service established.")

606

logger.debug(u"Service established.")

621

607

elif state == avahi.ENTRY_GROUP_COLLISION:

622

logger.warning(u"Zeroconf service name collision.")

608

logger.warning(u"Service name collision.")

623

609

service.rename()

624

610

elif state == avahi.ENTRY_GROUP_FAILURE:

625

logger.critical(u"Avahi: Error in group state changed %s",

611

logger.critical(u"Error in group state changed %s",

626

612

unicode(error))

627

613

raise AvahiGroupError("State changed: %s", str(error))

628

614

751

737

# Parse config file with clients

752

738

client_defaults = { "timeout": "1h",

753

739

"interval": "5m",

754

"checker": "fping -q -- %(host)s",

740

"checker": "fping -q -- %%(host)s",

755

741

"host": "",

756

742

}

757

743

client_config = ConfigParser.SafeConfigParser(client_defaults)

762

748

service = AvahiService(name = server_settings["servicename"],

763

749

type = "_mandos._tcp", );

764

750

if server_settings["interface"]:

765

service.interface = if_nametoindex\

766

(server_settings["interface"])

751

service.interface = if_nametoindex(server_settings["interface"])

767

752

768

753

global main_loop

769

754

global bus

772

757

DBusGMainLoop(set_as_default=True )

773

758

main_loop = gobject.MainLoop()

774

759

bus = dbus.SystemBus()

775

server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,

776

avahi.DBUS_PATH_SERVER),

777

avahi.DBUS_INTERFACE_SERVER)

760

server = dbus.Interface(

761

bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),

762

avahi.DBUS_INTERFACE_SERVER )

778

763

# End of Avahi example code

779

764

780

765

clients = Set()

793

778

logger.critical(u"No clients defined")

794

779

sys.exit(1)

795

780

796

if debug:

797

# Redirect stdin so all checkers get /dev/null

798

null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)

799

os.dup2(null, sys.stdin.fileno())

800

if null > 2:

801

os.close(null)

802

else:

803

# No console logging

781

if not debug:

804

782

logger.removeHandler(console)

805

# Close all input and output, do double fork, etc.

806

783

daemon()

807

784

808

785

pidfilename = "/var/run/mandos/mandos.pid"

Older »