SECURITY: XSS in "Account Suspended" Messages and Badge Descriptions

app/assets/javascripts/discourse/components/badge-card.js.es6

@@ -36,10 +36,10 @@ export default Ember.Component.extend({
     if (size === 'large') {
       const longDescription = this.get('badge.long_description');
       if (!_.isEmpty(longDescription)) {
-        return Discourse.Emoji.unescape(longDescription);
+        return Discourse.Emoji.unescape(Discourse.Utilities.escapeExpression(longDescription));
       }
     }
-    return this.get('badge.description');
+    return Discourse.Utilities.escapeExpression(this.get('badge.description'));
   }
 
 });

app/controllers/session_controller.rb

@@ -271,7 +271,8 @@ class SessionController < ApplicationController
     message = user.suspend_reason ? "login.suspended_with_reason" : "login.suspended"
 
     render json: {
-      error: I18n.t(message, { date: I18n.l(user.suspended_till, format: :date_only), reason: user.suspend_reason}),
+      error: I18n.t(message, { date: I18n.l(user.suspended_till, format: :date_only),
+                               reason: Rack::Utils.escape_html(user.suspend_reason) }),
       reason: 'suspended'
     }
   end

spec/controllers/session_controller_spec.rb

@@ -407,10 +407,16 @@ describe SessionController do
 
       describe 'suspended user' do
         it 'should return an error' do
-          User.any_instance.stubs(:suspended?).returns(true)
+          user.suspended_till = 2.days.from_now
-          User.any_instance.stubs(:suspended_till).returns(2.days.from_now)
+          user.suspended_at = Time.now
+          user.save!
+          StaffActionLogger.new(user).log_user_suspend(user, "<strike>banned</strike>")
           xhr :post, :create, login: user.username, password: 'myawesomepassword'
-          expect(::JSON.parse(response.body)['error']).to be_present
+
+          error = ::JSON.parse(response.body)['error']
+          expect(error).to be_present
+          expect(error).to match(/banned/)
+          expect(error).not_to match(/<strike>/)
         end
       end
 

test/javascripts/acceptance/badges-test.js.es6

@@ -12,5 +12,6 @@ test("Visit Badge Pages", () => {
   andThen(() => {
     ok(exists('.badge-card'), "has the badge in the listing");
     ok(exists('.user-info'), "has the list of users with that badge");
+    ok(!exists('.badge-card:eq(0) strike'));
   });
 });