From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Marx To: development@lists.ipfire.org Subject: [PATCH] BUG10963: implement a better email verification Date: Thu, 12 Nov 2015 16:27:51 +0100 Message-ID: <1447342071-13161-1-git-send-email-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8420554249579891787==" List-Id: --===============8420554249579891787== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable With this patch the new domains with german umlauts are checked. In addition we check all allowed chars in the address before the @ sign. To check the fqdn of an email the function validfqdn has been adapted as well. Signed-off-by: Alexander Marx --- config/cfgroot/general-functions.pl | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-fun= ctions.pl index 2b5cd19..55ea5b6 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -662,13 +662,13 @@ sub validfqdn if (length ($part) < 1 || length ($part) > 63) { return 0;} # Only valid characters are a-z, A-Z, 0-9 and - - if ($part !~ /^[a-zA-Z0-9-]*$/) { + if ($part !~ /^[a-zA-Z=C3=B6=C3=A4=C3=BC=C3=96=C3=84=C3=9C0-9-]*$/) { return 0;} # First character can only be a letter or a digit - if (substr ($part, 0, 1) !~ /^[a-zA-Z0-9]*$/) { + if (substr ($part, 0, 1) !~ /^[a-zA-Z=C3=B6=C3=A4=C3=BC=C3=96=C3=84=C3=9C0= -9]*$/) { return 0;} # Last character can only be a letter or a digit - if (substr ($part, -1, 1) !~ /^[a-zA-Z0-9]*$/) { + if (substr ($part, -1, 1) !~ /^[a-zA-Z=C3=B6=C3=A4=C3=BC=C3=96=C3=84=C3=9C= 0-9]*$/) { return 0;} } return 1; @@ -747,14 +747,25 @@ sub ipcidr2msk { } =20 sub validemail { - my $mail =3D shift; - return 0 if ( $mail !~ /^[0-9a-zA-Z\.\-\_]+\@[0-9a-zA-Z\.\-]+$/ ); - return 0 if ( $mail =3D~ /^[^0-9a-zA-Z]|[^0-9a-zA-Z]$/); - return 0 if ( $mail !~ /([0-9a-zA-Z]{1})\@./ ); - return 0 if ( $mail !~ /.\@([0-9a-zA-Z]{1})/ ); - return 0 if ( $mail =3D~ /.\.\-.|.\-\..|.\.\..|.\-\-./g ); - return 0 if ( $mail =3D~ /.\.\_.|.\-\_.|.\_\..|.\_\-.|.\_\_./g ); - return 0 if ( $mail !~ /\.([a-zA-Z]{2,4})$/ ); + my $address =3D shift; + my @positionen =3D split( /\@/, $address ); + my $anz=3D@positionen; + + #check if we have one part before and after '@' + return 0 if ( $anz !=3D 2 ); + + #check if one of the parts starts or ends with a dot + return 0 if ( substr($positionen[0],0,1) eq '.' ); + return 0 if ( substr($positionen[0],-1,1) eq '.' ); + return 0 if ( substr($positionen[1],0,1) eq '.' ); + return 0 if ( substr($positionen[1],-1,1) eq '.' ); + + #check first addresspart (before '@' sign) + return 0 if ( $positionen[0] !~ m/^[a-zA-Z0-9\.!\-\+#]+$/ ); + + #check second addresspart (after '@' sign) + return 0 if ( !&validfqdn( $positionen[1] ) ); + return 1; } =20 --=20 1.9.1 --===============8420554249579891787==--