Merge lp:~f-kalsbeek/openobject-client-web/mindswitch into lp:openobject-client-web/trunk

[Freerk Kalsbeek (Mindswitch BV)]

[Fabien (Open ERP) (fp-tinyerp)]

Amit, I propose that you give a small explanation when you reject a
merge proposal.

ame (Tiny/Axelor) wrote:
> The proposal to merge lp:~f-kalsbeek/openobject-client-web/mindswitch into lp:openobject-client-web has been updated.
>
> Status: Needs review => Rejected

--
Fabien Pinckaers
CEO Tiny - OpenERP Editor
Chaussée de Namur 40
B-1367 Grand-Rosière
Belgium
Phone: [phone]
Fax: [phone]
Web: http://openerp.com

Great Achievements Start With Tiny Investments
   -- Marty, 2005

[Amit Mendapara (cristatus)]

Fabien (Open ERP) wrote:
> Amit, I propose that you give a small explanation when you reject a
> merge proposal.
>
> ame (Tiny/Axelor) wrote:
>> The proposal to merge lp:~f-kalsbeek/openobject-client-web/mindswitch into lp:openobject-client-web has been updated.
>>
>> Status: Needs review => Rejected
>
>

The proposed feature has already been implemented. Please see the
README.txt section 5.

Unmerged revisions

2342. By Freerk Kalsbeek (Mindswitch BV) on 2009-04-02

Merged Trunk

2341. By Freerk Kalsbeek (Mindswitch BV) on 2009-04-02

HTTPS Filter added for proxying webclient by Apache SSL

2340. By Freerk Kalsbeek (Mindswitch BV) on 2009-04-01

Added HTTPSFilter, so redirects are sent to the https URL instead of
HTTP when proxied by apache
To activate:
1. put the following in your .cfg
   https_filter.on = True

2. Put the following in your Apache VirtualHost config
   RequestHeader add X-Requested-Ssl "Yes"

mod_headers must be active for apache. To activate use a2enmod headers

2339. By Freerk Kalsbeek (Mindswitch BV) on 2009-03-29

Implemented a feature that allows to select a database based on the
exact hostname used in the proxy request. Eg. sample.domain.com lists
only database 'sample' where sample1.domain.com will only list 'sample1'
This feature is activated through the new config value
dblist.filter.exact. If set to True, the function will work. Requires
dblist.filter to be set to True as well.

=== modified file 'openerp/controllers.py'
--- openerp/controllers.py	2009-03-27 08:38:21 +0000
+++ openerp/controllers.py	2009-04-02 18:29:47 +0000
@@ -53,6 +53,8 @@
 from openerp.tinyres import TinyResource, unsecured
 from openerp.tinyres import login as tiny_login
 
+from openerp.httpsfilter import HTTPSFilter
+
 import pkg_resources
 from turbogears.widgets import register_static_directory
 
@@ -71,6 +73,8 @@
     """Turbogears root controller, see TG docs for more info.
     """
 
+    _cp_filters = [HTTPSFilter()]
+
     def user_action(self, id='action_id'):
         """Perform default user action.
 

=== added file 'openerp/httpsfilter.py'
--- openerp/httpsfilter.py	1970-01-01 00:00:00 +0000
+++ openerp/httpsfilter.py	2009-04-02 06:45:51 +0000
@@ -0,0 +1,24 @@
+from cherrypy.filters.basefilter import BaseFilter
+import cherrypy
+from turbogears import config
+
+class HTTPSFilter(BaseFilter):
+
+    def before_request_body(self):
+        # if the filter isn't turned on, exit immediately
+        if not config.get('https_filter.on', False):
+            return
+
+        request = cherrypy.request
+
+        # Check for a special header 'X-Requested-Ssl'.  If we have it,
+        # then we substitute the secure base url
+        requested_ssl = request.headers.get('X-Requested-Ssl', 'NO').upper()
+        if requested_ssl == 'YES':
+            base = config.get('https_filter.secure_base_url', None)
+            if base == None:
+                if config.get('base_url_filter.use_x_forwarded_host', False):
+                    base = request.headers.get('X-Forwarded-Host', 'localhost')
+                else:
+                    base = 'localhost'
+            request.base = 'https://' + base

=== modified file 'openerp/tinyres.py'
--- openerp/tinyres.py	2009-03-12 18:00:36 +0000
+++ openerp/tinyres.py	2009-03-29 22:23:26 +0000
@@ -60,8 +60,11 @@
         host = headers.get('X-Forwarded-Host', headers.get('Host'))
 
         base = re.split('\.|:|/', host)[0]                
-        base = base + '_'                
-        dblist = [d for d in dblist if d.startswith(base)]
+        if config.get('dblist.filter.exact', path='openerp-web'):
+	    dblist = [d for d in dblist if d == base]
+	else: 
+            base = base + '_'                
+            dblist = [d for d in dblist if d.startswith(base)]
 
     return dict(target=target, url=url, dblist=dblist, db=db, user=user, password=password, 
             action=action, message=message, origArgs=origArgs)

=== modified file 'openerp_web.egg-info/SOURCES.txt'
--- openerp_web.egg-info/SOURCES.txt	2009-03-19 06:54:04 +0000
+++ openerp_web.egg-info/SOURCES.txt	2009-04-02 18:29:47 +0000
@@ -33,8 +33,6 @@
 openerp/config/log.cfg
 openerp/static/open-flash-chart.swf
 openerp/static/css/dashboard.css
-openerp/static/css/iepngfix.css
-openerp/static/css/iepngfix.htc
 openerp/static/css/listgrid.css
 openerp/static/css/menu.css
 openerp/static/css/modalbox.css
@@ -705,6 +703,7 @@
 openerp/templates/__init__.py
 openerp/templates/about.kid
 openerp/templates/login.kid
+openerp/templates/login_ajax.kid
 openerp/templates/master.kid
 openerp/tests/__init__.py
 openerp/tests/test_controllers.py
@@ -790,4 +789,4 @@
 openerp_web.egg-info/requires.txt
 openerp_web.egg-info/sqlobject.txt
 openerp_web.egg-info/top_level.txt
-scripts/openerp-web
+scripts/openerp-web
\ No newline at end of file