[Netpass-devel] NetPass/www/htdocs/Admin mr.mhtml,1.12,1.13

[jeff m. <jef...@us...>]

Update of /cvsroot/netpass/NetPass/www/htdocs/Admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19250/www/htdocs/Admin

Modified Files:
	mr.mhtml 
Log Message:
bug#1465448  Input validation on manual register form

Index: mr.mhtml
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/mr.mhtml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mr.mhtml	19 Jan 2006 21:41:48 -0000	1.12
+++ mr.mhtml	7 Apr 2006 20:44:11 -0000	1.13
@@ -125,17 +125,23 @@
 		$err = "The network ($nw) that the address ($ip) is a part of, is not managed by NetPass.";
 	}
 
+	if ($mac !~ /^[a-f0-9:]+$/) {
+		$err .= "<BR>The MAC address you gave doesn't look right.";
+	}
+
 	if ( ! $isRoot ) {
 		my $netgroup = $np->cfg->getNetgroup(-network => $nw);
 		if ( !grep(/^default$/, @$rwGroups) && !grep(/^$nw$/, @$rwGroups) && !grep(/^$netgroup$/, @$rwGroups) ) {
-			$err = "You don't have permission to register an IP address on the $nw network.";
+			$err .= "<BR>You don't have permission to register an IP address on the $nw network.";
 		}
 	}
 
-	$err = saveReg($np->db->{'dbh'}, NetPass::padMac($mac), $ip, $uid) if ($err eq "");
+	if ($err eq '') {
+		$err = saveReg($np->db->{'dbh'}, NetPass::padMac($mac), $ip, $uid) if ($err eq "");
 
-	$err = "This MAC address (".NetPass::padMac($mac).") is already registered."
-		if ($err =~ /duplicate/i);
+		$err = "This MAC address (".NetPass::padMac($mac).") is already registered."
+			if ($err =~ /duplicate/i);
+	}
 
 	if ($err ne "") {
 		print $q->p({-class => "error"}, $err);