Skip to content

Commit 2a5953c

Browse files
ClearlyClaireMage
authored andcommitted
Fix functional user requirements in whitelist mode (mastodon#14093)
Fixes mastodon#14092
1 parent 5d86399 commit 2a5953c

9 files changed

Lines changed: 9 additions & 9 deletions

app/controllers/accounts_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class AccountsController < ApplicationController
1212
before_action :set_body_classes
1313

1414
skip_around_action :set_locale, if: -> { [:json, :rss].include?(request.format&.to_sym) }
15-
skip_before_action :require_functional!
15+
skip_before_action :require_functional!, unless: :whitelist_mode?
1616

1717
def show
1818
respond_to do |format|

app/controllers/api/base_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class Api::BaseController < ApplicationController
77
include RateLimitHeaders
88

99
skip_before_action :store_current_location
10-
skip_before_action :require_functional!
10+
skip_before_action :require_functional!, unless: :whitelist_mode?
1111

1212
before_action :require_authenticated_user!, if: :disallow_unauthenticated_api_access?
1313
before_action :set_cache_headers

app/controllers/directories_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class DirectoriesController < ApplicationController
99
before_action :set_tag, only: :show
1010
before_action :set_accounts
1111

12-
skip_before_action :require_functional!
12+
skip_before_action :require_functional!, unless: :whitelist_mode?
1313

1414
def index
1515
render :index

app/controllers/follower_accounts_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class FollowerAccountsController < ApplicationController
99
before_action :set_cache_headers
1010

1111
skip_around_action :set_locale, if: -> { request.format == :json }
12-
skip_before_action :require_functional!
12+
skip_before_action :require_functional!, unless: :whitelist_mode?
1313

1414
def index
1515
respond_to do |format|

app/controllers/following_accounts_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class FollowingAccountsController < ApplicationController
99
before_action :set_cache_headers
1010

1111
skip_around_action :set_locale, if: -> { request.format == :json }
12-
skip_before_action :require_functional!
12+
skip_before_action :require_functional!, unless: :whitelist_mode?
1313

1414
def index
1515
respond_to do |format|

app/controllers/media_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class MediaController < ApplicationController
44
include Authorization
55

66
skip_before_action :store_current_location
7-
skip_before_action :require_functional!
7+
skip_before_action :require_functional!, unless: :whitelist_mode?
88

99
before_action :authenticate_user!, if: :whitelist_mode?
1010
before_action :set_media_attachment

app/controllers/remote_interaction_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class RemoteInteractionController < ApplicationController
1010
before_action :set_status
1111
before_action :set_body_classes
1212

13-
skip_before_action :require_functional!
13+
skip_before_action :require_functional!, unless: :whitelist_mode?
1414

1515
def new
1616
@remote_follow = RemoteFollow.new(session_params)

app/controllers/statuses_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class StatusesController < ApplicationController
2020
before_action :set_autoplay, only: :embed
2121

2222
skip_around_action :set_locale, if: -> { request.format == :json }
23-
skip_before_action :require_functional!, only: [:show, :embed]
23+
skip_before_action :require_functional!, only: [:show, :embed], unless: :whitelist_mode?
2424

2525
content_security_policy only: :embed do |p|
2626
p.frame_ancestors(false)

app/controllers/tags_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class TagsController < ApplicationController
1515
before_action :set_body_classes
1616
before_action :set_instance_presenter
1717

18-
skip_before_action :require_functional!
18+
skip_before_action :require_functional!, unless: :whitelist_mode?
1919

2020
def show
2121
respond_to do |format|

0 commit comments

Comments
 (0)