Merge lp:~rlane/nova/lp773690 into lp:~hudson-openstack/nova/trunk

[Ryan Lane]

Only uses HTTP_REFERER if HTTP_REFERER has token set. Fix for using ajax console urls in iframes.

[lp:~rlane/nova/lp773690]

406. By Ryan Lane on 2011-05-02

Only parse url if needed.

407. By Ryan Lane on 2011-05-02

Ensure the auth_params are set, even if HTTP_REFERER does not contain a token. Also, document why we must do this check.

[Cory Wright (corywright)]

Straightforward enough. lgtm.

review: Approve

[Vish Ishaya (vishvananda)]

lgtm as well

review: Approve

[Vish Ishaya (vishvananda)]

I suppose we should actually require a test for this, although I'm not totally sure there is one that would make sense here. Ryan, do you see a way to write a simple test here?

[Devin Carlen (devcamcar)]

Setting to work in progress while the testing strategy for this is determined.

[Ryan Lane (rlane)]

Yes. I can write a test for this.

Unmerged revisions

407. By Ryan Lane on 2011-05-02

Ensure the auth_params are set, even if HTTP_REFERER does not contain a token. Also, document why we must do this check.

406. By Ryan Lane on 2011-05-02

Only parse url if needed.

405. By Ryan Lane on 2011-04-29

Only uses HTTP_REFERER if HTTP_REFERER has token set

404. By Ryan Lane on 2011-04-29

Merge from trunk

403. By Ryan Lane on 2011-04-13

Merge from trunk

402. By Ryan Lane on 2011-04-12

Merge from trunk

=== modified file 'bin/nova-ajax-console-proxy'
--- bin/nova-ajax-console-proxy	2011-03-29 23:13:09 +0000
+++ bin/nova-ajax-console-proxy	2011-05-02 20:31:30 +0000
@@ -73,13 +73,20 @@
                                          env['HTTP_HOST'],
                                          env['PATH_INFO'])
 
+            parsed_url = urlparse.urlparse(req_url)
+
+            # If the url is embeded in an iframe, the first HTTP_REFERER
+            # will very likely not contain the token. In this situation
+            # we should use the req_url.
             if 'HTTP_REFERER' in env:
-                auth_url = env['HTTP_REFERER']
+                refer_params = urlparse.parse_qs(urlparse.urlparse(
+                                                 env['HTTP_REFERER']).query)
+                if 'token' in refer_params:
+                    auth_params = refer_params
+                else:
+                    auth_params = urlparse.parse_qs(parsed_url.query)
             else:
-                auth_url = req_url
-
-            auth_params = urlparse.parse_qs(urlparse.urlparse(auth_url).query)
-            parsed_url = urlparse.urlparse(req_url)
+                auth_params = urlparse.parse_qs(parsed_url.query)
 
             auth_info = AjaxConsoleProxy.tokens[auth_params['token'][0]]
             args = auth_info['args']