zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

check tag input

Browse source
This commit is contained in:
Kyle Drake 2024-02-17 10:55:51 -06:00
parent 6444fe7e94
commit 9800a4ad4b
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/browse.rb
View file

@ -4,7 +4,7 @@ get '/browse/?' do
@page = params[:page] @page = params[:page]
@page = 1 if @page.not_an_integer? @page = 1 if @page.not_an_integer?
params.delete 'tag' if params[:tag].nil? || params[:tag].strip.empty? params.delete 'tag' if params[:tag].nil? || !params[:tag].is_a?(String) || params[:tag].strip.empty? || params[:tag].match?(Tag::INVALID_TAG_REGEX)
if is_education? if is_education?
ds = education_sites_dataset ds = education_sites_dataset

2
models/site.rb
View file

@ -1093,7 +1093,7 @@ class Site < Sequel::Model
new_tags.each do |tag| new_tags.each do |tag|
tag.strip! tag.strip!
if tag.match(/[^a-zA-Z0-9 ]/) if tag.match(Tag::INVALID_TAG_REGEX)
errors.add :new_tags_string, "Tag \"#{tag}\" can only contain letters (A-Z) and numbers (0-9)." errors.add :new_tags_string, "Tag \"#{tag}\" can only contain letters (A-Z) and numbers (0-9)."
break break
end end

1
models/tag.rb
View file

@ -2,6 +2,7 @@
class Tag < Sequel::Model class Tag < Sequel::Model
NAME_LENGTH_MAX = 25 NAME_LENGTH_MAX = 25
NAME_WORDS_MAX = 1 NAME_WORDS_MAX = 1
INVALID_TAG_REGEX = /[^a-zA-Z0-9 ]/
many_to_many :sites many_to_many :sites
def before_create def before_create