Fixed xss and non https issues

RC1140 · Sep 9, 2012 · e826625 · e826625
1 parent e323a71
commit e826625
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/chromeExtension/content_script.js b/chromeExtension/content_script.js
@@ -14,16 +14,11 @@ $(document).ready(function(){
                 if(response.message.indexOf('decryption failed') == -1){
                     if(response.message.indexOf('no valid OpenPGP data found') == -1){
                         var messageElement = $('#canvas_frame').contents().find('#'+response.domid.toString()).closest('.gs').find('.ii.gt');
-                        var tempMessage = response.message.replace(/\n/g, '<br>');
-                        if(tempMessage.indexOf('^') != -1){
-                            tempMessage = tempMessage.replace(/\^/g, '<br>');
-                            tempMessage = tempMessage.substring(1,tempMessage.length -1);
-                        }
-
                         if($.trim(response.message).length == 0){
                             alert('Invalid Passphrase'); 
                         }else{
-                            $($(messageElement).children()[0]).html(tempMessage); 
+                            $($(messageElement).children()[0]).css('white-space','pre');
+                            $($(messageElement).children()[0]).text(response.message); 
                         }
                     }else{
                         alert(response.message);

diff --git a/chromeExtension/manifest.json b/chromeExtension/manifest.json
@@ -27,7 +27,6 @@
   ],
   "permissions": [
       "tabs",
-      "http://mail.google.com/*", 
       "https://mail.google.com/*"
     ],
   "background": {