Merge pull request #5 from seanmadsen/CRM-20906

seamuslee001 · web-flow · commit df685b29ad5e · 2017-09-20T08:01:01.000+10:00
CRM-20906 - Fix regex for validating extension key
diff --git a/CRM/Admin/Form/Extensions.php b/CRM/Admin/Form/Extensions.php
@@ -45,7 +45,7 @@ public function preProcess() {
     $this->_key = CRM_Utils_Request::retrieve('key', 'String',
       $this, FALSE, 0
     );
-    if (!preg_match('/[0-9a-zA-Z._-]+/', $this->_key)) {
+    if (!preg_match('/^[0-9a-zA-Z._-]+$/', $this->_key)) {
       throw new CRM_Core_Exception('Extension Key does not match expected standard');
     }
     $session = CRM_Core_Session::singleton();

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function preProcess() {`
`45`	`45`	`$this->_key = CRM_Utils_Request::retrieve('key', 'String',`
`46`	`46`	`$this, FALSE, 0`
`47`	`47`	`);`
`48`		`- if (!preg_match('/[0-9a-zA-Z._-]+/', $this->_key)) {`
	`48`	`+ if (!preg_match('/^[0-9a-zA-Z._-]+$/', $this->_key)) {`
`49`	`49`	`throw new CRM_Core_Exception('Extension Key does not match expected standard');`
`50`	`50`	`}`
`51`	`51`	`$session = CRM_Core_Session::singleton();`