A blank username should never be allowed.

diff --git a/lib/apiauth.php b/lib/apiauth.php
index f63c84d8f38d768e950c6b65b3b0361bbe45b989..32502399f9f836bbd2d0607440a72200e14f4cd1 100644 (file)
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -241,7 +241,7 @@ class ApiAuthAction extends ApiAction
             $realm = common_config('site', 'name') . ' API';
         }
 
-        if (!isset($this->auth_user_nickname) && $required) {
+        if (empty($this->auth_user_nickname) && $required) {
             header('WWW-Authenticate: Basic realm="' . $realm . '"');
 
             // show error if the user clicks 'cancel'

diff --git a/lib/util.php b/lib/util.php
index 76639e2d40298bed935e2e9bc8658132d00576ef..44ccc0deff546d7c15d107010911fbe706789e37 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -159,6 +159,11 @@ function common_munge_password($password, $id)
 
 function common_check_user($nickname, $password)
 {
+    // empty nickname always unacceptable
+    if (empty($nickname)) {
+        return false;
+    }
+
     $authenticatedUser = false;
 
     if (Event::handle('StartCheckPassword', array($nickname, $password, &$authenticatedUser))) {