openstack/cinder
Code Issues Proposed changes

Merge "Do not use api-paste.ini osprofiler options"

Browse Source
This commit is contained in:
Jenkins 2015-12-28 23:24:05 +00:00 committed by Gerrit Code Review
commit 429b45dbd9
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cinder/service.py
View File

@ -73,7 +73,9 @@ profiler_opts = [
cfg.BoolOpt("profiler_enabled", default=False, cfg.BoolOpt("profiler_enabled", default=False,
help=_('If False fully disable profiling feature.')), help=_('If False fully disable profiling feature.')),
cfg.BoolOpt("trace_sqlalchemy", default=False, cfg.BoolOpt("trace_sqlalchemy", default=False,
help=_("If False doesn't trace SQL requests.")) help=_("If False doesn't trace SQL requests.")),
cfg.StrOpt("hmac_keys", default="SECRET_KEY",
help=_("Secret key to use to sign tracing messages."))
] ]
CONF = cfg.CONF CONF = cfg.CONF
@ -87,16 +89,17 @@ def setup_profiler(binary, host):
"Messaging", messaging, context.get_admin_context().to_dict(), "Messaging", messaging, context.get_admin_context().to_dict(),
rpc.TRANSPORT, "cinder", binary, host) rpc.TRANSPORT, "cinder", binary, host)
osprofiler.notifier.set(_notifier) osprofiler.notifier.set(_notifier)
osprofiler.web.enable(CONF.profiler.hmac_keys)
LOG.warning( LOG.warning(
_LW("OSProfiler is enabled.\nIt means that person who knows " _LW("OSProfiler is enabled.\nIt means that person who knows "
"any of hmac_keys that are specified in " "any of hmac_keys that are specified in "
"/etc/cinder/api-paste.ini can trace his requests. \n" "/etc/cinder/cinder.conf can trace his requests. \n"
"In real life only operator can read this file so there " "In real life only operator can read this file so there "
"is no security issue. Note that even if person can " "is no security issue. Note that even if person can "
"trigger profiler, only admin user can retrieve trace " "trigger profiler, only admin user can retrieve trace "
"information.\n" "information.\n"
"To disable OSprofiler set in cinder.conf:\n" "To disable OSprofiler set in cinder.conf:\n"
"[profiler]\nenabled=false")) "[profiler]\nprofiler_enabled=false"))
else: else:
osprofiler.web.disable() osprofiler.web.disable()

2
etc/cinder/api-paste.ini
View File

@ -32,8 +32,6 @@ paste.filter_factory = cinder.api.middleware.fault:FaultWrapper.factory
[filter:osprofiler] [filter:osprofiler]
paste.filter_factory = osprofiler.web:WsgiMiddleware.factory paste.filter_factory = osprofiler.web:WsgiMiddleware.factory
hmac_keys = SECRET_KEY
enabled = yes
[filter:noauth] [filter:noauth]
paste.filter_factory = cinder.api.middleware.auth:NoAuthMiddleware.factory paste.filter_factory = cinder.api.middleware.auth:NoAuthMiddleware.factory