diff options
| author | Felix Dörre <felix@dogcraft.de> | 2016-02-23 21:44:45 +0100 |
|---|---|---|
| committer | Felix Dörre <felix@dogcraft.de> | 2016-02-23 21:54:21 +0100 |
| commit | 1374c014b5e396b38fb199da62e5482f300b4737 (patch) | |
| tree | e45fb3b6406a9875122e478daa39b48721e7ade1 | |
| parent | cc8bbdc85730bb8b65f83664385ed7986efda31e (diff) | |
| download | cacert-devel-1374c014b5e396b38fb199da62e5482f300b4737.tar.gz cacert-devel-1374c014b5e396b38fb199da62e5482f300b4737.tar.xz cacert-devel-1374c014b5e396b38fb199da62e5482f300b4737.zip | |
bug 1412: adding check for IPs as domain names
additionally adding check for valid domains on domain registration, not only on certificate issuance.
| -rw-r--r-- | includes/account.php | 7 | ||||
| -rw-r--r-- | includes/general.php | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/includes/account.php b/includes/account.php index b1ab984..5d45602 100644 --- a/includes/account.php +++ b/includes/account.php @@ -535,6 +535,13 @@ function buildSubjectFromSession() { exit; } + if(!isValidWildcard($_REQUEST['newdomain']) || strstr($_REQUEST['newdomain'],"*") !== false) { + showheader(_("My CAcert.org Account!")); + echo _("Your domain is not valid."); + showfooter(); + exit; + } + list($newdomain) = explode(" ", $_REQUEST['newdomain'], 2); // Ignore the rest while($newdomain['0'] == '-') $newdomain = substr($newdomain, 1); diff --git a/includes/general.php b/includes/general.php index f84ae5b..cd6d910 100644 --- a/includes/general.php +++ b/includes/general.php @@ -273,6 +273,9 @@ if(!preg_match('/^(\\.(?!-)[a-z0-9_-]*[a-z0-9])+$/i','.'.$name)){ return false; } + if(preg_match('/^(\\.[0-9]*)+$/i','.'.$name)){ + return false; + } return strpos($name, "*") === false; } |