"""
-import errno
import os
import os.path
import optparse
import sys
-import stat
import logging
from ganeti import constants
])
-class EnsureError(errors.GenericError):
- """Top-level error class related to this script.
-
- """
-
-
-def EnsurePermission(path, mode, uid=-1, gid=-1, must_exist=True,
- _chmod_fn=os.chmod, _chown_fn=os.chown):
- """Ensures that given path has given mode.
-
- @param path: The path to the file
- @param mode: The mode of the file
- @param uid: The uid of the owner of this file
- @param gid: The gid of the owner of this file
- @param must_exist: Specifies if non-existance of path will be an error
- @param _chmod_fn: chmod function to use (unittest only)
- @param _chown_fn: chown function to use (unittest only)
-
- """
- logging.debug("Checking %s", path)
- try:
- _chmod_fn(path, mode)
-
- if max(uid, gid) > -1:
- _chown_fn(path, uid, gid)
- except EnvironmentError, err:
- if err.errno == errno.ENOENT:
- if must_exist:
- raise EnsureError("Path %s does not exists, but should" % path)
- else:
- raise EnsureError("Error while changing permission on %s: %s" %
- (path, err))
-
-
-def EnsureDir(path, mode, uid, gid, _stat_fn=os.lstat, _mkdir_fn=os.mkdir,
- _ensure_fn=EnsurePermission):
- """Ensures that given path is a dir and has given mode, uid and gid set.
-
- @param path: The path to the file
- @param mode: The mode of the file
- @param uid: The uid of the owner of this file
- @param gid: The gid of the owner of this file
- @param _stat_fn: Stat function to use (unittest only)
- @param _mkdir_fn: mkdir function to use (unittest only)
- @param _ensure_fn: ensure function to use (unittest only)
-
- """
- logging.debug("Checking directory %s", path)
- try:
- # We don't want to follow symlinks
- st_mode = _stat_fn(path)[stat.ST_MODE]
-
- if not stat.S_ISDIR(st_mode):
- raise EnsureError("Path %s is expected to be a directory, but it's not" %
- path)
- except EnvironmentError, err:
- if err.errno == errno.ENOENT:
- _mkdir_fn(path)
- else:
- raise EnsureError("Error while do a stat() on %s: %s" % (path, err))
-
- _ensure_fn(path, mode, uid=uid, gid=gid)
-
-
def RecursiveEnsure(path, uid, gid, dir_perm, file_perm):
"""Ensures permissions recursively down a directory.
for root, dirs, files in os.walk(path):
for subdir in dirs:
- EnsurePermission(os.path.join(root, subdir), dir_perm, uid=uid, gid=gid)
+ utils.EnforcePermission(os.path.join(root, subdir), dir_perm, uid=uid,
+ gid=gid)
for filename in files:
- EnsurePermission(os.path.join(root, filename), file_perm, uid=uid,
- gid=gid)
+ utils.EnforcePermission(os.path.join(root, filename), file_perm, uid=uid,
+ gid=gid)
def EnsureQueueDir(path, mode, uid, gid):
"""
for filename in utils.ListVisibleFiles(path):
if constants.JOB_FILE_RE.match(filename):
- EnsurePermission(utils.PathJoin(path, filename), mode, uid=uid, gid=gid)
+ utils.EnforcePermission(utils.PathJoin(path, filename), mode, uid=uid,
+ gid=gid)
def ProcessPath(path):
# No additional parameters
assert len(path[5:]) == 0
if pathtype == DIR:
- EnsureDir(pathname, mode, uid, gid)
+ utils.MakeDirWithPerm(pathname, mode, uid, gid)
elif pathtype == QUEUE_DIR:
EnsureQueueDir(pathname, mode, uid, gid)
elif pathtype == FILE:
(must_exist, ) = path[5:]
- EnsurePermission(pathname, mode, uid=uid, gid=gid, must_exist=must_exist)
+ utils.EnforcePermission(pathname, mode, uid=uid, gid=gid,
+ must_exist=must_exist)
def GetPaths():
getent.masterd_gid, False),
(constants.RAPI_CERT_FILE, FILE, 0440, getent.rapi_uid,
getent.masterd_gid, False),
+ (constants.SPICE_CERT_FILE, FILE, 0440, getent.noded_uid,
+ getent.masterd_gid, False),
+ (constants.SPICE_CACERT_FILE, FILE, 0440, getent.noded_uid,
+ getent.masterd_gid, False),
(constants.NODED_CERT_FILE, FILE, 0440, getent.masterd_uid,
getent.masterd_gid, False),
]
getent.masterd_uid, getent.masterd_gid, False),
(constants.JOB_QUEUE_SERIAL_FILE, FILE, 0600,
getent.masterd_uid, getent.masterd_gid, False),
+ (constants.JOB_QUEUE_VERSION_FILE, FILE, 0600,
+ getent.masterd_uid, getent.masterd_gid, False),
(constants.JOB_QUEUE_ARCHIVE_DIR, DIR, 0700,
getent.masterd_uid, getent.masterd_gid),
(rapi_dir, DIR, 0750, getent.rapi_uid, getent.masterd_gid),
parser.add_option(cli.DEBUG_OPT)
parser.add_option(cli.VERBOSE_OPT)
parser.add_option("--full-run", "-f", dest="full_run", action="store_true",
- default=False, help=("Make a full run and collect"
- " additional files (time consuming)"))
+ default=False, help=("Make a full run and set permissions"
+ " on archived jobs (time consuming)"))
return parser.parse_args()
if opts.full_run:
RecursiveEnsure(constants.JOB_QUEUE_ARCHIVE_DIR, getent.masterd_uid,
getent.masterd_gid, 0700, 0600)
- except EnsureError, err:
+ except errors.GenericError, err:
logging.error("An error occurred while setting permissions: %s", err)
return constants.EXIT_FAILURE
projects / ganeti-local / blobdiff