nocebo/diaspora_federation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disallow uppercased usernames and hostnames

Browse source 
Drive-by: replaced some of the parts by named POSIX character classes to
make the regex easier to read.
This commit is contained in:
Dennis Schubert 2017-09-13 12:00:10 +02:00
parent 4f87ab1582
commit b83619cd2c
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/diaspora_federation/validators/rules/diaspora_id.rb
View file

@ -6,17 +6,14 @@ module Validation
class DiasporaId class DiasporaId
# The Regex for a valid diaspora* ID # The Regex for a valid diaspora* ID
DIASPORA_ID_REGEX = begin DIASPORA_ID_REGEX = begin
letter = "a-zA-Z" username = "[[:lower:]\\d\\-\\.\\_]+"
digit = "0-9" hostname_part = "[[:lower:]\\d\\-]"
hexadecimal = "[a-fA-F#{digit}]"
username = "[#{letter}#{digit}\\-\\_\\.]+"
hostname_part = "[#{letter}#{digit}\\-]"
hostname = "#{hostname_part}+(?:[.]#{hostname_part}*)*" hostname = "#{hostname_part}+(?:[.]#{hostname_part}*)*"
ipv4 = "(?:[#{digit}]{1,3}\\.){3}[#{digit}]{1,3}" ipv4 = "(?:[\\d]{1,3}\\.){3}[\\d]{1,3}"
ipv6 = "\\[(?:#{hexadecimal}{0,4}:){0,7}#{hexadecimal}{1,4}\\]" ipv6 = "\\[(?:[[:xdigit:]]{0,4}:){0,7}[[:xdigit:]]{1,4}\\]"
ip_addr = "(?:#{ipv4}|#{ipv6})" ip_addr = "(?:#{ipv4}|#{ipv6})"
domain = "(?:#{hostname}|#{ip_addr})" domain = "(?:#{hostname}|#{ip_addr})"
port = "(?::[#{digit}]+)?" port = "(?::[\\d]+)?"
"#{username}\\@#{domain}#{port}" "#{username}\\@#{domain}#{port}"
end end