odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] restore poxy-mode command line option to prevent ip address impersonation 

bzr revid: al@openerp.com-20120924105622-nb3iwe1vnuffqrbm
This commit is contained in:
Antony Lesuisse 2012-09-24 12:56:22 +02:00
parent feb66a13c3
commit d77fe9c185
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp/service/wsgi_server.py
View File

@ -402,7 +402,7 @@ def application_unproxied(environ, start_response):
return [response]
def application(environ, start_response):
if 'HTTP_X_FORWARDED_HOST' in environ:
if config['proxy_mode'] and 'HTTP_X_FORWARDED_HOST' in environ:
return werkzeug.contrib.fixers.ProxyFix(application_unproxied)(environ, start_response)
else:
return application_unproxied(environ, start_response)

4
openerp/tools/config.py
View File

@ -116,6 +116,8 @@ class configmanager(object):
help="specify the TCP port for the XML-RPC protocol", type="int")
group.add_option("--no-xmlrpc", dest="xmlrpc", action="store_false", my_default=True,
help="disable the XML-RPC protocol")
group.add_option("--proxy-mode", dest="proxy_mode", action="store_true", my_default=False,
help="Enable correct behavior when behind a reverse proxy")
parser.add_option_group(group)
# XML-RPC / HTTPS
@ -394,7 +396,7 @@ class configmanager(object):
'language', 'translate_out', 'translate_in', 'overwrite_existing_translations',
'debug_mode', 'smtp_ssl', 'load_language',
'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog',
'list_db', 'xmlrpcs',
'list_db', 'xmlrpcs', 'proxy_mode',
'test_file', 'test_enable', 'test_commit', 'test_report_directory',
'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', 'unaccent',
'workers', 'limit_memory_hard', 'limit_memory_soft', 'limit_time_cpu', 'limit_time_real', 'limit_request'