Gracefully handle invalid or unset denylist

carlbennett · carlbennett · commit 6971ae42b7f6 · 2021-05-09T05:22:58.000-05:00
diff --git a/src/controllers/User/Register.php b/src/controllers/User/Register.php
@@ -127,11 +127,13 @@ protected function tryRegister(Router &$router, UserRegisterModel &$model) {
     }
     $denylist = Common::$config->bnetdocs->user_password_denylist_map;
     $denylist = json_decode(file_get_contents('./' . $denylist));
-    foreach ($denylist as $denylist_pw) {
-      if (strtolower($denylist_pw->password) == strtolower($pw1)) {
-        $model->error = 'PASSWORD_BLACKLIST';
-        $model->error_extra = $denylist_pw->reason;
-        return;
+    if ($denylist) {
+      foreach ($denylist as $denylist_pw) {
+        if (strtolower($denylist_pw->password) == strtolower($pw1)) {
+          $model->error = 'PASSWORD_BLACKLIST';
+          $model->error_extra = $denylist_pw->reason;
+          return;
+        }
       }
     }
     if (function_exists('geoip_country_code_by_name')) {

Original file line number	Diff line number	Diff line change
`@@ -127,11 +127,13 @@ protected function tryRegister(Router &$router, UserRegisterModel &$model) {`
`127`	`127`	`}`
`128`	`128`	`$denylist = Common::$config->bnetdocs->user_password_denylist_map;`
`129`	`129`	`$denylist = json_decode(file_get_contents('./' . $denylist));`
`130`		`- foreach ($denylist as $denylist_pw) {`
`131`		`- if (strtolower($denylist_pw->password) == strtolower($pw1)) {`
`132`		`- $model->error = 'PASSWORD_BLACKLIST';`
`133`		`- $model->error_extra = $denylist_pw->reason;`
`134`		`- return;`
	`130`	`+ if ($denylist) {`
	`131`	`+ foreach ($denylist as $denylist_pw) {`
	`132`	`+ if (strtolower($denylist_pw->password) == strtolower($pw1)) {`
	`133`	`+ $model->error = 'PASSWORD_BLACKLIST';`
	`134`	`+ $model->error_extra = $denylist_pw->reason;`
	`135`	`+ return;`
	`136`	`+ }`
`135`	`137`	`}`
`136`	`138`	`}`
`137`	`139`	`if (function_exists('geoip_country_code_by_name')) {`