Merge pull request #1183 from PyBossa/issue-https-rackspace-cdn-usage

use ssl for rackspace cdn. See #1182

cli.py

@@ -305,11 +305,11 @@ def resize_avatars():
             try:
                 if u.info.get('container'):
                     cont = cf.get_container(u.info['container'])
-                    if cont.cdn_uri:
-                    	avatar_url = "%s/%s" % (cont.cdn_uri, u.info['avatar'])
+                    if cont.cdn_ssl_uri:
+                    	avatar_url = "%s/%s" % (cont.cdn_ssl_uri, u.info['avatar'])
                     else:
                         cont.make_public()
-                        avatar_url = "%s/%s" % (cont.cdn_uri, u.info['avatar'])
+                        avatar_url = "%s/%s" % (cont.cdn_ssl_uri, u.info['avatar'])
                     r = requests.get(avatar_url, stream=True)
                     if r.status_code == 200:
                         print "Downloading avatar for %s ..." % u.name
@@ -399,7 +399,7 @@ def resize_project_avatars():
             try:
                 if a.info.get('container'):
                    cont = cf.get_container(a.info['container'])
-                   avatar_url = "%s/%s" % (cont.cdn_uri, a.info['thumbnail'])
+                   avatar_url = "%s/%s" % (cont.cdn_ssl_uri, a.info['thumbnail'])
                    r = requests.get(avatar_url, stream=True)
                    if r.status_code == 200:
                        print "Downloading avatar for %s ..." % a.short_name

pybossa/uploader/rackspace.py

@@ -110,13 +110,13 @@ def _lookup_url(self, endpoint, values):
                                        filename='img/placeholder.project.png')
             cont = self.get_container(values['container'])
             if cont.cdn_enabled:
-                return "%s/%s" % (cont.cdn_uri, values['filename'])
+                return "%s/%s" % (cont.cdn_ssl_uri, values['filename'])
             else:
                 msg = ("Rackspace Container %s was not public"
                        % values['container'])
                 current_app.logger.warning(msg)
                 cont.make_public()
-                return "%s/%s" % (cont.cdn_uri, values['filename'])
+                return "%s/%s" % (cont.cdn_ssl_uri, values['filename'])
         except:
             current_app.logger.error(traceback.print_exc())
             return failover_url

test/test_uploader/__init__.py

@@ -23,8 +23,8 @@
 
 fake_container = MagicMock()
 fake_container.make_public.return_value = True
-cdn_uri_mock = PropertyMock(return_value='http://rackspace.com')
-type(fake_container).cdn_uri = cdn_uri_mock
+cdn_ssl_uri_mock = PropertyMock(return_value='https://rackspace.com')
+type(fake_container).cdn_ssl_uri = cdn_ssl_uri_mock
 cdn_enabled_mock = PropertyMock(return_value=True)
 type(fake_container).cdn_enabled = cdn_enabled_mock
 

test/test_uploader/test_rackspace_uploader.py

@@ -158,7 +158,7 @@ def test_rackspace_uploader_upload_wrong_file(self, mock, mock2):
     @patch('pybossa.uploader.rackspace.url_for', return_value='/static/img/placeholder.user.png')
     def test_rackspace_uploader_lookup_url(self, mock1, mock2):
         """Test RACKSPACE UPLOADER lookup returns a valid link."""
-        uri = 'http://rackspace.com'
+        uri = 'https://rackspace.com'
         filename = 'test.jpg'
         with patch('pybossa.uploader.rackspace.pyrax.cloudfiles') as mycf:
             cdn_enabled_mock = PropertyMock(return_value=True)
@@ -189,7 +189,7 @@ def test_rackspace_uploader_lookup_url_enable_cdn(self, mock1, mock2):
             u.init_app(self.flask_app)
             res = u._lookup_url('rackspace', {'filename': filename,
                                               'container': 'user_3'})
-            url = 'http://rackspace.com/test.jpg'
+            url = 'https://rackspace.com/test.jpg'
             err_msg = "We should get the %s but we got %s " % (url, res)
             assert res == url, err_msg
             calls = [call.make_public()]