zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Fix /api/v1/tags/:id route constraints (#18854) 

The constraint was applied prior to decoding, and rejected anything containing
the '%' character, which would be used for anything with non-ASCII unicode
characters.
This commit is contained in:
Claire 2022-07-20 17:06:52 +02:00 committed by GitHub
parent f8b3e36929
commit 726931fe4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/api/v1/tags_controller.rb
View File

@ -24,6 +24,7 @@ class Api::V1::TagsController < Api::BaseController
private private
def set_or_create_tag def set_or_create_tag
return not_found unless /\A(#{Tag::HASHTAG_NAME_RE})\z/.match?(params[:id])
@tag = Tag.find_normalized(params[:id]) || Tag.new(name: Tag.normalize(params[:id]), display_name: params[:id]) @tag = Tag.find_normalized(params[:id]) || Tag.new(name: Tag.normalize(params[:id]), display_name: params[:id])
end end
end end

2
config/routes.rb
View File

@ -530,7 +530,7 @@ Rails.application.routes.draw do
resource :note, only: :create, controller: 'accounts/notes' resource :note, only: :create, controller: 'accounts/notes'
end end
resources :tags, only: [:show], constraints: { id: /#{Tag::HASHTAG_NAME_RE}/ } do resources :tags, only: [:show] do
member do member do
post :follow post :follow
post :unfollow post :unfollow