openstack/designate
Code Issues Proposed changes

Merge "Added HTTP_X_FORWARDED_PROTO/HOST support to API"

Browse Source
This commit is contained in:
Jenkins
2015-11-24 16:55:09 +00:00
committed by Gerrit Code Review
parent e0d8c65958 deb622eb4b
commit bb9de39180
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
designate/api/middleware.py
View File

@@ -13,6 +13,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from debtcollector import removals
import flask
import webob.dec
from oslo_config import cfg
@@ -377,6 +378,8 @@ class SSLMiddleware(base.Middleware):
Code nabbed from Heat.
"""
# Replaced by oslo.middleware's http_proxy_to_wsgi middleware
@removals.remove
def __init__(self, application):
super(SSLMiddleware, self).__init__(application)
LOG.info(_LI('Starting designate ssl middleware'))

2
designate/api/versions.py
View File

@@ -28,7 +28,7 @@ def factory(global_config, **local_conf):
def _host_header_links():
del versions[:]
host_url = flask.request.host_url
host_url = flask.request.host_url.rstrip('/')
_version('v1', 'DEPRECATED', host_url)
_version('v2', 'CURRENT', host_url)

25
etc/designate/api-paste.ini
View File

@@ -5,32 +5,35 @@ use = egg:Paste#urlmap
/v2: osapi_dns_v2
/admin: osapi_dns_admin
[pipeline:osapi_dns_versions]
pipeline = cors maintenance faultwrapper ssl osapi_dns_app_versions
[composite:osapi_dns_versions]
use = call:designate.api.middleware:auth_pipeline_factory
noauth = http_proxy_to_wsgi cors maintenance faultwrapper osapi_dns_app_versions
keystone = http_proxy_to_wsgi cors maintenance faultwrapper osapi_dns_app_versions
[app:osapi_dns_app_versions]
paste.app_factory = designate.api.versions:factory
[composite:osapi_dns_v1]
use = call:designate.api.middleware:auth_pipeline_factory
noauth = cors request_id noauthcontext maintenance validation_API_v1 faultwrapper ssl normalizeuri osapi_dns_app_v1
keystone = cors request_id authtoken keystonecontext maintenance validation_API_v1 faultwrapper ssl normalizeuri osapi_dns_app_v1
noauth = http_proxy_to_wsgi cors request_id noauthcontext maintenance validation_API_v1 faultwrapper normalizeuri osapi_dns_app_v1
keystone = http_proxy_to_wsgi cors request_id authtoken keystonecontext maintenance validation_API_v1 faultwrapper normalizeuri osapi_dns_app_v1
[app:osapi_dns_app_v1]
paste.app_factory = designate.api.v1:factory
[composite:osapi_dns_v2]
use = call:designate.api.middleware:auth_pipeline_factory
noauth = cors request_id faultwrapper ssl validation_API_v2 noauthcontext maintenance normalizeuri osapi_dns_app_v2
keystone = cors request_id faultwrapper ssl validation_API_v2 authtoken keystonecontext maintenance normalizeuri osapi_dns_app_v2
noauth = http_proxy_to_wsgi cors request_id faultwrapper validation_API_v2 noauthcontext maintenance normalizeuri osapi_dns_app_v2
keystone = http_proxy_to_wsgi cors request_id faultwrapper validation_API_v2 authtoken keystonecontext maintenance normalizeuri osapi_dns_app_v2
[app:osapi_dns_app_v2]
paste.app_factory = designate.api.v2:factory
[composite:osapi_dns_admin]
use = call:designate.api.middleware:auth_pipeline_factory
noauth = cors request_id faultwrapper ssl noauthcontext maintenance normalizeuri osapi_dns_app_admin
keystone = cors request_id faultwrapper ssl authtoken keystonecontext maintenance normalizeuri osapi_dns_app_admin
noauth = http_proxy_to_wsgi cors request_id faultwrapper noauthcontext maintenance normalizeuri osapi_dns_app_admin
keystone = http_proxy_to_wsgi cors request_id faultwrapper authtoken keystonecontext maintenance normalizeuri osapi_dns_app_admin
[app:osapi_dns_app_admin]
paste.app_factory = designate.api.admin:factory
@@ -42,6 +45,9 @@ oslo_config_project = designate
[filter:request_id]
paste.filter_factory = oslo_middleware:RequestId.factory
[filter:http_proxy_to_wsgi]
paste.filter_factory = oslo_middleware:HTTPProxyToWSGI.factory
[filter:noauthcontext]
paste.filter_factory = designate.api.middleware:NoAuthContextMiddleware.factory
@@ -65,6 +71,3 @@ paste.filter_factory = designate.api.middleware:APIv1ValidationErrorMiddleware.f
[filter:validation_API_v2]
paste.filter_factory = designate.api.middleware:APIv2ValidationErrorMiddleware.factory
[filter:ssl]
paste.filter_factory = designate.api.middleware:SSLMiddleware.factory

1
requirements.txt
View File

@@ -46,3 +46,4 @@ oslo.policy>=0.5.0 # Apache-2.0
Werkzeug>=0.7 # BSD License
python-memcached>=1.56
tooz>=1.19.0 # Apache-2.0
debtcollector>=0.3.0 # Apache-2.0