From: Benny Baumann <BenBE1987@gmx.net>
Date: Sun, 19 Mar 2017 22:56:33 +0000 (+0100)
Subject: Merge changes I34e6379b,I515bdbb5
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=52b4703f262f5d7cb4903d2195b72d296159b1b4;hp=1bcb97fbcb725b4084a8e9439a1e108a1d57943c

Merge changes I34e6379b,I515bdbb5

* changes:
  udp: keep coverity happy by explicitly preventing null-returns
  upd: keep coverity happy by explicitly throwing
---

diff --git a/src/club/wpia/gigi/dbObjects/User.java b/src/club/wpia/gigi/dbObjects/User.java
index 9703fa8f..a4c32014 100644
--- a/src/club/wpia/gigi/dbObjects/User.java
+++ b/src/club/wpia/gigi/dbObjects/User.java
@@ -17,6 +17,7 @@ import club.wpia.gigi.database.GigiResultSet;
 import club.wpia.gigi.dbObjects.CATS.CATSType;
 import club.wpia.gigi.dbObjects.Country.CountryCodeType;
 import club.wpia.gigi.dbObjects.Verification.VerificationType;
+import club.wpia.gigi.email.EmailProvider;
 import club.wpia.gigi.localisation.Language;
 import club.wpia.gigi.output.DateSelector;
 import club.wpia.gigi.pages.PasswordResetPage;
@@ -104,6 +105,11 @@ public class User extends CertificateOwner {
     }
 
     public User(String email, String password, DayDate dob, Locale locale, Country residenceCountry, NamePart... preferred) throws GigiApiException {
+        // Avoid storing information that obviously won't get through
+        if ( !EmailProvider.isValidMailAddress(email)) {
+            throw new IllegalArgumentException("Invalid email.");
+        }
+
         this.email = email;
         this.dob = dob;
         this.locale = locale;
@@ -118,6 +124,7 @@ public class User extends CertificateOwner {
             query.setString(7, residenceCountry == null ? null : residenceCountry.getCode());
             query.execute();
         }
+
         new EmailAddress(this, email, locale);
     }