CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-30 17:00:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix email validation for unicode characters

Browse Source 
Also fix format validation for lists with excess whitespace (6494#issuecomment-499620002).
This commit is contained in:
SilentSpike
2019-06-07 16:19:05 +01:00
committed by Quincy Morgan
parent 9d1a085d05
commit f402748706
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/validations/invalid_format.js
View File

@@ -9,9 +9,9 @@ export function validationFormatting() {
var issues = [];
function isValidEmail(email) {
// Same regex as used by HTML5 "email" inputs
// Emails in OSM are going to be official so they should be pretty simple
var valid_email = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
// Using negated lists to better support all possible unicode characters (#6494)
var valid_email = /^[^\(\)\\,":;<>@\[\]]+@[^\(\)\\,":;<>@\[\]\.]+(?:\.[a-z0-9-]+)*$/i;
// An empty value is also acceptable
return (!email || valid_email.test(email));
@@ -43,7 +43,10 @@ export function validationFormatting() {
if (entity.tags.website) {
// Multiple websites are possible
// If ever we support ES6, arrow functions make this nicer
var websites = entity.tags.website.split(';').filter(function(x) { return !isSchemePresent(x); });
var websites = entity.tags.website
.split(';')
.map(function(s) { return s.trim(); })
.filter(function(x) { return !isSchemePresent(x); });
if (websites.length) {
issues.push(new validationIssue({
@@ -65,7 +68,10 @@ export function validationFormatting() {
if (entity.tags.email) {
// Multiple emails are possible
var emails = entity.tags.email.split(';').filter(function(x) { return !isValidEmail(x); });
var emails = entity.tags.email
.split(';')
.map(function(s) { return s.trim(); })
.filter(function(x) { return !isValidEmail(x); });
if (emails.length) {
issues.push(new validationIssue({
@@ -91,4 +97,4 @@ export function validationFormatting() {
validation.type = type;
return validation;
}
}