Fix owner of the OS log dir

[ganeti-local] / lib / tools / prepare_node_join.py

diff --git a/lib/tools/prepare_node_join.py b/lib/tools/prepare_node_join.py
index 37bd0bc..c14f410 100644 (file)
--- a/lib/tools/prepare_node_join.py
+++ b/lib/tools/prepare_node_join.py
@@ -27,7 +27,6 @@ import os.path
 import optparse
 import sys
 import logging
-import errno
 import OpenSSL
 
 from ganeti import cli
@@ -94,69 +93,28 @@ def VerifyOptions(parser, opts, args):
   return opts
 
 
-def SetupLogging(opts):
-  """Configures the logging module.
-
-  """
-  formatter = logging.Formatter("%(asctime)s: %(message)s")
-
-  stderr_handler = logging.StreamHandler()
-  stderr_handler.setFormatter(formatter)
-  if opts.debug:
-    stderr_handler.setLevel(logging.NOTSET)
-  elif opts.verbose:
-    stderr_handler.setLevel(logging.INFO)
-  else:
-    stderr_handler.setLevel(logging.WARNING)
-
-  root_logger = logging.getLogger("")
-  root_logger.setLevel(logging.NOTSET)
-  root_logger.addHandler(stderr_handler)
-
-
-def _VerifyCertificate(cert, _noded_cert_file=pathutils.NODED_CERT_FILE):
+def _VerifyCertificate(cert_pem, _check_fn=utils.CheckNodeCertificate):
   """Verifies a certificate against the local node daemon certificate.
 
-  @type cert: string
-  @param cert: Certificate in PEM format (no key)
+  @type cert_pem: string
+  @param cert_pem: Certificate in PEM format (no key)
 
   """
   try:
-    OpenSSL.crypto.load_privatekey(OpenSSL.crypto.FILETYPE_PEM, cert)
+    OpenSSL.crypto.load_privatekey(OpenSSL.crypto.FILETYPE_PEM, cert_pem)
   except OpenSSL.crypto.Error, err:
     pass
   else:
     raise JoinError("No private key may be given")
 
   try:
-    cert = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, cert)
+    cert = \
+      OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, cert_pem)
   except Exception, err:
     raise errors.X509CertError("(stdin)",
                                "Unable to load certificate: %s" % err)
 
-  try:
-    noded_pem = utils.ReadFile(_noded_cert_file)
-  except EnvironmentError, err:
-    if err.errno != errno.ENOENT:
-      raise
-
-    logging.debug("Local node certificate was not found (file %s)",
-                  _noded_cert_file)
-    return
-
-  try:
-    key = OpenSSL.crypto.load_privatekey(OpenSSL.crypto.FILETYPE_PEM, noded_pem)
-  except Exception, err:
-    raise errors.X509CertError(_noded_cert_file,
-                               "Unable to load private key: %s" % err)
-
-  ctx = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD)
-  ctx.use_privatekey(key)
-  ctx.use_certificate(cert)
-  try:
-    ctx.check_privatekey()
-  except OpenSSL.SSL.Error:
-    raise JoinError("Given cluster certificate does not match local key")
+  _check_fn(cert)
 
 
 def VerifyCertificate(data, _verify_fn=_VerifyCertificate):
@@ -170,31 +128,7 @@ def VerifyCertificate(data, _verify_fn=_VerifyCertificate):
     _verify_fn(cert)
 
 
-def _VerifyClusterName(name, _ss_cluster_name_file=None):
-  """Verifies cluster name against a local cluster name.
-
-  @type name: string
-  @param name: Cluster name
-
-  """
-  if _ss_cluster_name_file is None:
-    _ss_cluster_name_file = \
-      ssconf.SimpleStore().KeyToFilename(constants.SS_CLUSTER_NAME)
-
-  try:
-    local_name = utils.ReadOneLineFile(_ss_cluster_name_file)
-  except EnvironmentError, err:
-    if err.errno != errno.ENOENT:
-      raise
-
-    logging.debug("Local cluster name was not found (file %s)",
-                  _ss_cluster_name_file)
-  else:
-    if name != local_name:
-      raise JoinError("Current cluster name is '%s'" % local_name)
-
-
-def VerifyClusterName(data, _verify_fn=_VerifyClusterName):
+def VerifyClusterName(data, _verify_fn=ssconf.VerifyClusterName):
   """Verifies cluster name.
 
   @type data: dict
@@ -301,16 +235,7 @@ def LoadData(raw):
   @rtype: dict
 
   """
-  try:
-    data = serializer.LoadJson(raw)
-  except Exception, err:
-    raise errors.ParseError("Can't parse input data: %s" % err)
-
-  if not _DATA_CHECK(data):
-    raise errors.ParseError("Input data does not match expected format: %s" %
-                            _DATA_CHECK)
-
-  return data
+  return serializer.LoadAndVerifyJson(raw, _DATA_CHECK)
 
 
 def Main():
@@ -319,7 +244,7 @@ def Main():
   """
   opts = ParseOptions()
 
-  SetupLogging(opts)
+  utils.SetupToolLogging(opts.debug, opts.verbose)
 
   try:
     data = LoadData(sys.stdin.read())