x
/
gce-api
Code Issues Proposed changes

Merge "Don't attempt to escalate gce-api-manage privileges"

This commit is contained in:
Jenkins 2016-10-25 13:15:24 +00:00 committed by Gerrit Code Review
parent f1d1a00847 1e7910cc08
commit 5a52de298d
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gceapi/cmd/manage.py
View File

@ -17,7 +17,6 @@
CLI interface for GCE API management.
"""
import os
import sys
from oslo_config import cfg
@ -25,7 +24,6 @@ from oslo_log import log
from gceapi import config
from gceapi.db import migration
from gceapi.i18n import _
CONF = cfg.CONF
@ -61,22 +59,10 @@ command_opt = cfg.SubCommandOpt('command',
def main():
"""Parse options and call the appropriate class/method."""
CONF.register_cli_opt(command_opt)
try:
config.parse_args(sys.argv)
log.setup(CONF, "gceapi")
except cfg.ConfigFilesNotFoundError:
cfgfile = CONF.config_file[-1] if CONF.config_file else None
if cfgfile and not os.access(cfgfile, os.R_OK):
st = os.stat(cfgfile)
print(_("Could not read %s. Re-running with sudo") % cfgfile)
try:
os.execvp('sudo', ['sudo', '-u', '#%s' % st.st_uid] + sys.argv)
except Exception:
print(_('sudo failed, continuing as if nothing happened'))
print(_('Please re-run gce-api-manage as root.'))
return(2)
config.parse_args(sys.argv)
log.setup(CONF, "gceapi")
try:
CONF.command.func()