]> cat aescling's git repositories - mastodon.git/commitdiff
status: preserve visibility attribute when reblogging (infoleak fix) (#5789)
authorWilliam Pitcock <nenolod@dereferenced.org>
Sat, 25 Nov 2017 00:36:08 +0000 (18:36 -0600)
committerEugen Rochko <eugen@zeonfederated.com>
Sat, 25 Nov 2017 00:36:08 +0000 (01:36 +0100)
this should fix *all* remaining visibility-related mastodon ostatus infoleaks.
thanks to @csaurus@gnusocial.de for pointing out the infoleak.

app/models/status.rb

index d6810941a602cf2bc6f2b4ad70766f4fbf29b91f..8579ff9e45a1e3db00498f604955f911af0003ef 100644 (file)
@@ -278,6 +278,7 @@ class Status < ApplicationRecord
 
   def set_visibility
     self.visibility = (account.locked? ? :private : :public) if visibility.nil?
+    self.visibility = reblog.visibility if reblog?
     self.sensitive  = false if sensitive.nil?
   end