Merge pull request #133 from arclyte/master

markstory · markstory · commit 1fef158801a6 · 2013-12-03T10:23:40.000-08:00
Update HtmlToolbarHelper to use ‘sha1’ for the explain_sql hash
diff --git a/Controller/ToolbarAccessController.php b/Controller/ToolbarAccessController.php
@@ -108,7 +108,7 @@ public function sql_explain() {
 		) {
 			throw new BadRequestException('Invalid parameters');
 		}
-		$hash = Security::hash($this->request->data['log']['sql'] . $this->request->data['log']['ds'], null, true);
+		$hash = Security::hash($this->request->data['log']['sql'] . $this->request->data['log']['ds'], 'sha1', true);
 		if ($hash !== $this->request->data['log']['hash']) {
 			throw new BadRequestException('Invalid parameters');
 		}

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public function sql_explain() {`
`108`	`108`	`) {`
`109`	`109`	`throw new BadRequestException('Invalid parameters');`
`110`	`110`	`}`
`111`		`- $hash = Security::hash($this->request->data['log']['sql'] . $this->request->data['log']['ds'], null, true);`
	`111`	`+ $hash = Security::hash($this->request->data['log']['sql'] . $this->request->data['log']['ds'], 'sha1', true);`
`112`	`112`	`if ($hash !== $this->request->data['log']['hash']) {`
`113`	`113`	`throw new BadRequestException('Invalid parameters');`
`114`	`114`	`}`