Make Bsaic Auth work properly with RW actions
This commit is contained in:
		@@ -295,7 +295,7 @@ class ApiAuthAction extends ApiAction
 | 
			
		||||
            // TRANS: Client error thrown when authentication fails because a user clicked "Cancel".
 | 
			
		||||
            $this->clientError(_('Could not authenticate you.'), 401);
 | 
			
		||||
 | 
			
		||||
        } elseif ($required) {
 | 
			
		||||
        } else {
 | 
			
		||||
            // $this->auth_user_nickname - i.e. PHP_AUTH_USER - will have a value since it was not empty
 | 
			
		||||
 | 
			
		||||
            $user = common_check_user($this->auth_user_nickname,
 | 
			
		||||
@@ -314,10 +314,10 @@ class ApiAuthAction extends ApiAction
 | 
			
		||||
                $this->auth_user = null;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            if ($required && $this->auth_user instanceof User) {
 | 
			
		||||
                // By default, basic auth users have rw access
 | 
			
		||||
                $this->access = self::READ_WRITE;
 | 
			
		||||
 | 
			
		||||
            if (!$this->auth_user instanceof User) {
 | 
			
		||||
            } elseif ($required) {
 | 
			
		||||
                $msg = sprintf(
 | 
			
		||||
                    "basic auth nickname = %s",
 | 
			
		||||
                    $this->auth_user_nickname
 | 
			
		||||
@@ -328,12 +328,12 @@ class ApiAuthAction extends ApiAction
 | 
			
		||||
                header('WWW-Authenticate: Basic realm="' . $realm . '"');
 | 
			
		||||
                // TRANS: Client error thrown when authentication fails.
 | 
			
		||||
                $this->clientError(_('Could not authenticate you.'), 401);
 | 
			
		||||
            }
 | 
			
		||||
            } else {
 | 
			
		||||
                // all get rw access for actions that don't require auth
 | 
			
		||||
                $this->access = self::READ_WRITE;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Read the HTTP headers and set the auth user.  Decodes HTTP_AUTHORIZATION
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user