changed the regex; new line at the end is allowed - prevents problems when using cut&paste for the private-key in the interface

Florian Schaal · Florian Schaal · commit cd072acba40b · 2014-01-24T12:21:25.000+01:00
diff --git a/interface/lib/classes/validate_dkim.inc.php b/interface/lib/classes/validate_dkim.inc.php
@@ -87,10 +87,10 @@ function check_template($field_name, $field_value, $validator) {
 	function validate_post($key, $value) {
 		switch ($key) {
 		case 'public':
-			if (preg_match("/(^-----BEGIN PUBLIC KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,221}(-----END PUBLIC KEY-----(\n|\r)$)/", $value) === 1) { return true; } else { return false; }
+			if (preg_match("/(^-----BEGIN PUBLIC KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,221}(-----END PUBLIC KEY-----(\n|\r)?$)/", $value) === 1) { return true; } else { return false; }
 			break;
 		case 'private':
-			if (preg_match("/(^-----BEGIN RSA PRIVATE KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,850}(-----END RSA PRIVATE KEY-----(\n|\r)$)/", $value) === 1) { return true; } else { return false; }
+			if (preg_match("/(^-----BEGIN RSA PRIVATE KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,850}(-----END RSA PRIVATE KEY-----(\n|\r)?$)/", $value) === 1) { return true; } else { return false; }
 			break;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -87,10 +87,10 @@ function check_template($field_name, $field_value, $validator) {`
`87`	`87`	`function validate_post($key, $value) {`
`88`	`88`	`switch ($key) {`
`89`	`89`	`case 'public':`
`90`		`- if (preg_match("/(^-----BEGIN PUBLIC KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,221}(-----END PUBLIC KEY-----(\n\|\r)$)/", $value) === 1) { return true; } else { return false; }`
	`90`	`+ if (preg_match("/(^-----BEGIN PUBLIC KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,221}(-----END PUBLIC KEY-----(\n\|\r)?$)/", $value) === 1) { return true; } else { return false; }`
`91`	`91`	`break;`
`92`	`92`	`case 'private':`
`93`		`- if (preg_match("/(^-----BEGIN RSA PRIVATE KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,850}(-----END RSA PRIVATE KEY-----(\n\|\r)$)/", $value) === 1) { return true; } else { return false; }`
	`93`	`+ if (preg_match("/(^-----BEGIN RSA PRIVATE KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,850}(-----END RSA PRIVATE KEY-----(\n\|\r)?$)/", $value) === 1) { return true; } else { return false; }`
`94`	`94`	`break;`
`95`	`95`	`}`
`96`	`96`	`}`