returning 404 on every error which is caused by adding an attachment via

providing URL

changed message to "Page not found" if 404 with an HTML page is returned

apps/jetpack/tests/attachment_test.py

@@ -300,12 +300,12 @@ class TestViews(TestCase):
         response = self.client.post(self.get_add_url(revision), {
                     "filename": "some.txt",
                     "url": "abc"})
-        eq_(response.status_code, 400)
+        eq_(response.status_code, 404)
         # not existing url
         response = self.client.post(self.get_add_url(revision), {
                     "filename": "some.txt",
                     "url": "http://notexistingurl.pl/some.txt"})
-        eq_(response.status_code, 400)
+        eq_(response.status_code, 404)
         # malicious input
         response = self.client.post(self.get_add_url(revision), {
                     "filename": "",

apps/jetpack/views.py

@@ -691,12 +691,16 @@ def revision_add_attachment(request, pk):
         except ValidationError, err:
             log.warning('[%s] Invalid url provided\n%s' % (url,
                 '\n'.join(err.messages)))
-            return HttpResponseBadRequest(("Loading attachment failed\n"
-                "%s") % parse_validation_messages(err))
+            raise Http404()
         except Exception, err:
             log.warning('[%s] Exception raised\n%s' % (url, str(err)))
-            return HttpResponseBadRequest(str(err))
-        att = urllib2.urlopen(url, timeout=settings.URLOPEN_TIMEOUT)
+            raise Http404()
+        try:
+            att = urllib2.urlopen(url, timeout=settings.URLOPEN_TIMEOUT)
+        except Exception, err:
+            log.warning('[%s] Exception raised by opening url\n%s' % (url, str(err)))
+            raise Http404()
+
         # validate filesize
         att_info = att.info()
         if 'content-length' in att_info.dict:
@@ -707,7 +711,12 @@ def revision_add_attachment(request, pk):
                         "File is too big")
         # download attachment's content
         log.debug('[%s] Downloading' % url)
-        content = att.read(settings.ATTACHMENT_MAX_FILESIZE + 1)
+        try:
+            content = att.read(settings.ATTACHMENT_MAX_FILESIZE + 1)
+        except Exception, err:
+            log.warning('[%s] Exception raised by reading url\n%s' % (url, str(err)))
+            raise Http404()
+
         # work out the contenttype
         basename, ext = os.path.splitext(filename)
         unicode_contenttypes = ('utf-8',)

media/base/js/flightdeck/request.js

@@ -21,8 +21,12 @@ var defaultFailure = function(text) {
             log.warn('Response error is not valid JSON');
             if (text.indexOf('<html') !== -1) {
                 // We somehow got a full HTML page. Bad!
-                log.error('Response is an HTML page!');
-                response = 'Something aweful happened.';
+                if (this.status == 404) {
+                  response = 'Page not found';
+                } else {
+                  log.error('Response is an HTML page!');
+                  response = 'Something aweful happened.' + this.status;
+                }
             } else {
                 // A simple text message
                 response = text;