X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=debian%2Fovs-monitor-ipsec;h=5aca0f7c9e26930181c656ec408868a10108a00b;hb=b54bdbe993b89829aa33b7a207c61274b953faa5;hp=10b278d5017844d81fba8d2ad6e4fb94831be448;hpb=98c50f96801d3159aad2de02407305463c68f51a;p=sliver-openvswitch.git diff --git a/debian/ovs-monitor-ipsec b/debian/ovs-monitor-ipsec index 10b278d50..5aca0f7c9 100755 --- a/debian/ovs-monitor-ipsec +++ b/debian/ovs-monitor-ipsec @@ -53,7 +53,9 @@ try: except socket.error, e: logging.basicConfig() s_log.warn("failed to connect to syslog (%s)" % e) +s_log.addHandler(logging.StreamHandler()) +root_prefix = '' # Prefix for absolute file names, for testing. setkey = "/usr/sbin/setkey" @@ -123,11 +125,12 @@ path certificate "%s"; self.psk_hosts = {} self.cert_hosts = {} - if not os.path.isdir(self.cert_dir): + if not os.path.isdir(root_prefix + self.cert_dir): os.mkdir(self.cert_dir) # Clean out stale peer certs from previous runs - for ovs_cert in glob.glob("%s/ovs-*.pem" % self.cert_dir): + for ovs_cert in glob.glob("%s%s/ovs-*.pem" + % (root_prefix, self.cert_dir)): try: os.remove(ovs_cert) except OSError: @@ -137,20 +140,22 @@ path certificate "%s"; self.commit() def reload(self): - exitcode = subprocess.call(["/etc/init.d/racoon", "reload"]) + exitcode = subprocess.call([root_prefix + "/etc/init.d/racoon", + "reload"]) if exitcode != 0: # Racoon is finicky about its configuration file and will # refuse to start if it sees something it doesn't like # (e.g., a certificate file doesn't exist). Try restarting # the process before giving up. s_log.warning("attempting to restart racoon") - exitcode = subprocess.call(["/etc/init.d/racoon", "restart"]) + exitcode = subprocess.call([root_prefix + "/etc/init.d/racoon", + "restart"]) if exitcode != 0: s_log.warning("couldn't reload racoon") def commit(self): # Rewrite the Racoon configuration file - conf_file = open(self.conf_file, 'w') + conf_file = open(root_prefix + self.conf_file, 'w') conf_file.write(Racoon.conf_header % (self.psk_file, self.cert_dir)) for host, vals in self.cert_hosts.iteritems(): @@ -165,7 +170,7 @@ path certificate "%s"; # Rewrite the pre-shared keys file; it must only be readable by root. orig_umask = os.umask(0077) - psk_file = open(Racoon.psk_file, 'w') + psk_file = open(root_prefix + Racoon.psk_file, 'w') os.umask(orig_umask) psk_file.write("# Generated by Open vSwitch...do not modify by hand!") @@ -186,10 +191,10 @@ path certificate "%s"; def _verify_certs(self, vals): # Racoon will refuse to start if the certificate files don't # exist, so verify that they're there. - if not os.path.isfile(vals["certificate"]): + if not os.path.isfile(root_prefix + vals["certificate"]): raise error.Error("'certificate' file does not exist: %s" % vals["certificate"]) - elif not os.path.isfile(vals["private_key"]): + elif not os.path.isfile(root_prefix + vals["private_key"]): raise error.Error("'private_key' file does not exist: %s" % vals["private_key"]) @@ -199,11 +204,11 @@ path certificate "%s"; if vals["peer_cert"].find("-----BEGIN CERTIFICATE-----") == -1: raise error.Error("'peer_cert' is not in valid PEM format") - cert = open(vals["certificate"]).read() + cert = open(root_prefix + vals["certificate"]).read() if cert.find("-----BEGIN CERTIFICATE-----") == -1: raise error.Error("'certificate' is not in valid PEM format") - cert = open(vals["private_key"]).read() + cert = open(root_prefix + vals["private_key"]).read() if cert.find("-----BEGIN RSA PRIVATE KEY-----") == -1: raise error.Error("'private_key' is not in valid PEM format") @@ -227,7 +232,7 @@ path certificate "%s"; # The peer's certificate comes to us in PEM format as a string. # Write that string to a file for Racoon to use. peer_cert_file = "%s/ovs-%s.pem" % (self.cert_dir, host) - f = open(peer_cert_file, "w") + f = open(root_prefix + peer_cert_file, "w") f.write(vals["peer_cert"]) f.close() @@ -241,7 +246,7 @@ path certificate "%s"; del self.cert_hosts[host] self.commit() try: - os.remove(peer_cert_file) + os.remove(root_prefix + peer_cert_file) except OSError: pass @@ -271,10 +276,11 @@ class IPsec: def call_setkey(self, cmds): try: - p = subprocess.Popen([setkey, "-c"], stdin=subprocess.PIPE, - stdout=subprocess.PIPE) + p = subprocess.Popen([root_prefix + setkey, "-c"], + stdin=subprocess.PIPE, + stdout=subprocess.PIPE) except: - s_log.error("could not call setkey") + s_log.error("could not call %s%s" % (root_prefix, setkey)) sys.exit(1) # xxx It is safer to pass the string into the communicate() @@ -290,7 +296,7 @@ class IPsec: # older entry could be in a "dying" state. spi_list = [] host_line = "%s %s" % (local_ip, remote_ip) - results = self.call_setkey("dump ;").split("\n") + results = self.call_setkey("dump ;\n").split("\n") for i in range(len(results)): if results[i].strip() == host_line: # The SPI is in the line following the host pair @@ -301,7 +307,7 @@ class IPsec: return spi_list def sad_flush(self): - self.call_setkey("flush;") + self.call_setkey("flush;\n") def sad_del(self, local_ip, remote_ip): # To delete all SAD entries, we should be able to use setkey's @@ -323,18 +329,18 @@ class IPsec: self.call_setkey(cmds) def spd_flush(self): - self.call_setkey("spdflush;") + self.call_setkey("spdflush;\n") def spd_add(self, local_ip, remote_ip): cmds = ("spdadd %s %s gre -P out ipsec esp/transport//require;\n" % (local_ip, remote_ip)) - cmds += ("spdadd %s %s gre -P in ipsec esp/transport//require;" % + cmds += ("spdadd %s %s gre -P in ipsec esp/transport//require;\n" % (remote_ip, local_ip)) self.call_setkey(cmds) def spd_del(self, local_ip, remote_ip): cmds = "spddelete %s %s gre -P out;\n" % (local_ip, remote_ip) - cmds += "spddelete %s %s gre -P in;" % (remote_ip, local_ip) + cmds += "spddelete %s %s gre -P in;\n" % (remote_ip, local_ip) self.call_setkey(cmds) def add_entry(self, local_ip, remote_ip, vals): @@ -403,8 +409,10 @@ def usage(): print "usage: %s [OPTIONS] DATABASE" % sys.argv[0] print "where DATABASE is a socket on which ovsdb-server is listening." ovs.daemon.usage() - print "Other options:" - print " -h, --help display this help message" + print """\ +Other options: + --root-prefix=DIR Use DIR as alternate root directory (for testing). + -h, --help Display this help message.""" sys.exit(0) @@ -441,7 +449,7 @@ def get_ssl_cert(data): def main(argv): try: options, args = getopt.gnu_getopt( - argv[1:], 'h', ['help'] + ovs.daemon.LONG_OPTIONS) + argv[1:], 'h', ['help', 'root-prefix='] + ovs.daemon.LONG_OPTIONS) except getopt.GetoptError, geo: sys.stderr.write("%s: %s\n" % (ovs.util.PROGRAM_NAME, geo.msg)) sys.exit(1) @@ -449,6 +457,9 @@ def main(argv): for key, value in options: if key in ['-h', '--help']: usage() + elif key == "--root-prefix": + global root_prefix + root_prefix = value elif not ovs.daemon.parse_opt(key, value): sys.stderr.write("%s: unhandled option %s\n" % (ovs.util.PROGRAM_NAME, key))