webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

BUG10963: implement a better email verification

Browse Source 
We now check all allowed chars in the address before the @ sign.
The domainpart after the '@' sign is just checked for valid chars, so that user@ipfire is valid, too

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Alexander Marx
2015-11-19 11:09:49 +01:00
committed by Michael Tremer
parent 915c88931a
commit b00797e260
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
config/cfgroot/general-functions.pl
View File

@@ -655,7 +655,7 @@ sub validfqdn
my @parts = split (/\./, $fqdn); # Split hostname at the '.' my @parts = split (/\./, $fqdn); # Split hostname at the '.'
if (scalar(@parts) < 2) { # At least two parts should if (scalar(@parts) < 2) { # At least two parts should
return 0;} # exist in a FQDN return 0;} # exist in a FQDN
# (i.e. hostname.domain) # (i.e.hostname.domain)
foreach $part (@parts) { foreach $part (@parts) {
# Each part should be at least one character in length # Each part should be at least one character in length
# but no more than 63 characters # but no more than 63 characters
@@ -747,14 +747,25 @@ sub ipcidr2msk {
} }
sub validemail { sub validemail {
my $mail = shift; my $address = shift;
return 0 if ( $mail !~ /^[0-9a-zA-Z\.\-\_]+\@[0-9a-zA-Z\.\-]+$/ ); my @parts = split( /\@/, $address );
return 0 if ( $mail =~ /^[^0-9a-zA-Z]|[^0-9a-zA-Z]$/); my $count=@parts;
return 0 if ( $mail !~ /([0-9a-zA-Z]{1})\@./ );
return 0 if ( $mail !~ /.\@([0-9a-zA-Z]{1})/ ); #check if we have one part before and after '@'
return 0 if ( $mail =~ /.\.\-.|.\-\..|.\.\..|.\-\-./g ); return 0 if ( $count != 2 );
return 0 if ( $mail =~ /.\.\_.|.\-\_.|.\_\..|.\_\-.|.\_\_./g );
return 0 if ( $mail !~ /\.([a-zA-Z]{2,4})$/ ); #check if one of the parts starts or ends with a dot
return 0 if ( substr($parts[0],0,1) eq '.' );
return 0 if ( substr($parts[0],-1,1) eq '.' );
return 0 if ( substr($parts[1],0,1) eq '.' );
return 0 if ( substr($parts[1],-1,1) eq '.' );
#check first addresspart (before '@' sign)
return 0 if ( $parts[0] !~ m/^[a-zA-Z0-9\.!\-\+#]+$/ );
#check second addresspart (after '@' sign)
return 0 if ( $parts[1] !~ m/^[a-zA-Z0-9\.\-]+$/ );
return 1; return 1;
} }