namespace Friendica\Model;
+use DivineOmega\DOFileCachePSR6\CacheItemPool;
use DivineOmega\PasswordExposed;
+use ErrorException;
use Exception;
use Friendica\Content\Pager;
use Friendica\Core\Hook;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\TwoFactor\AppSpecificPassword;
-use Friendica\Network\HTTPException\InternalServerErrorException;
+use Friendica\Network\HTTPException;
use Friendica\Object\Image;
use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Worker\Delivery;
+use ImagickException;
use LightOpenID;
/**
/**
* Fetch the system account
*
- * @return return system account
+ * @return array system account
*/
public static function getSystemAccount()
{
}
}
- $system['spubkey'] = $system['uprvkey'] = $system['prvkey'];
- $system['username'] = $system['name'];
+ $system['sprvkey'] = $system['uprvkey'] = $system['prvkey'];
+ $system['spubkey'] = $system['upubkey'] = $system['pubkey'];
$system['nickname'] = $system['nick'];
return $system;
}
*/
private static function createSystemAccount()
{
- $system_actor_name = DI::config()->get('system', 'actor_name');
+ $system_actor_name = self::getActorName();
if (empty($system_actor_name)) {
- $system_actor_name = self::getActorName();
- if (empty($system_actor_name)) {
- return;
- }
+ return;
}
$keys = Crypto::newKeypair(4096);
*/
public static function getActorName()
{
+ $system_actor_name = DI::config()->get('system', 'actor_name');
+ if (!empty($system_actor_name)) {
+ $self = Contact::selectFirst(['nick'], ['uid' => 0, 'self' => true]);
+ if (!empty($self['nick'])) {
+ if ($self['nick'] != $system_actor_name) {
+ // Reset the actor name to the already used name
+ DI::config()->set('system', 'actor_name', $self['nick']);
+ $system_actor_name = $self['nick'];
+ }
+ }
+ return $system_actor_name;
+ }
+
// List of possible actor names
$possible_accounts = ['friendica', 'actor', 'system', 'internal'];
foreach ($possible_accounts as $name) {
*/
public static function getOwnerDataById(int $uid, bool $check_valid = true)
{
+ if ($uid == 0) {
+ return self::getSystemAccount();
+ }
+
if (!empty(self::$owner[$uid])) {
return self::$owner[$uid];
}
if (!$repair) {
// Check if "addr" is present and correct
$addr = $owner['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
- $repair = ($addr != $owner['addr']);
+ $repair = ($addr != $owner['addr']) || empty($owner['prvkey']) || empty($owner['pubkey']);
}
if (!$repair) {
/**
* Returns the default group for a given user and network
*
- * @param int $uid User id
+ * @param int $uid User id
* @param string $network network name
*
* @return int group id
- * @throws InternalServerErrorException
+ * @throws Exception
*/
public static function getDefaultGroup($uid, $network = '')
{
* @param string $password
* @param bool $third_party
* @return int User Id if authentication is successful
- * @throws Exception
+ * @throws HTTPException\ForbiddenException
+ * @throws HTTPException\NotFoundException
*/
public static function getIdFromPasswordAuthentication($user_info, $password, $third_party = false)
{
return $user['uid'];
}
- throw new Exception(DI::l10n()->t('Login failed'));
+ throw new HTTPException\ForbiddenException(DI::l10n()->t('Login failed'));
}
/**
*
* @param mixed $user_info
* @return array
- * @throws Exception
+ * @throws HTTPException\NotFoundException
*/
private static function getAuthenticationInfo($user_info)
{
}
if (!DBA::isResult($user)) {
- throw new Exception(DI::l10n()->t('User not found'));
+ throw new HTTPException\NotFoundException(DI::l10n()->t('User not found'));
}
}
* Generates a human-readable random password
*
* @return string
+ * @throws Exception
*/
public static function generateNewPassword()
{
*/
public static function isPasswordExposed($password)
{
- $cache = new \DivineOmega\DOFileCachePSR6\CacheItemPool();
+ $cache = new CacheItemPool();
$cache->changeConfig([
'cacheDirectory' => get_temppath() . '/password-exposed-cache/',
]);
$passwordExposedChecker = new PasswordExposed\PasswordExposedChecker(null, $cache);
return $passwordExposedChecker->passwordExposed($password) === PasswordExposed\PasswordStatus::EXPOSED;
- } catch (\Exception $e) {
+ } catch (Exception $e) {
Logger::error('Password Exposed Exception: ' . $e->getMessage(), [
'code' => $e->getCode(),
'file' => $e->getFile(),
*
* @param string $nickname The nickname that should be checked
* @return boolean True is the nickname is blocked on the node
- * @throws InternalServerErrorException
*/
public static function isNicknameBlocked($nickname)
{
$forbidden_nicknames = DI::config()->get('system', 'forbidden_nicknames', '');
if (!empty($forbidden_nicknames)) {
- // check if the nickname is in the list of blocked nicknames
$forbidden = explode(',', $forbidden_nicknames);
$forbidden = array_map('trim', $forbidden);
} else {
}
// Add the name of the internal actor to the "forbidden" list
- $actor_name = DI::config()->get('system', 'actor_name');
+ $actor_name = self::getActorName();
if (!empty($actor_name)) {
$forbidden[] = $actor_name;
}
return false;
}
+ // check if the nickname is in the list of blocked nicknames
if (in_array(strtolower($nickname), $forbidden)) {
return true;
}
*
* @param array $data
* @return array
- * @throws \ErrorException
- * @throws InternalServerErrorException
- * @throws \ImagickException
+ * @throws ErrorException
+ * @throws HTTPException\InternalServerErrorException
+ * @throws ImagickException
* @throws Exception
*/
public static function create(array $data)
$nickname = $data['nickname'] = strtolower($nickname);
- if (!preg_match('/^[a-z0-9][a-z0-9\_]*$/', $nickname)) {
+ if (!preg_match('/^[a-z0-9][a-z0-9_]*$/', $nickname)) {
throw new Exception(DI::l10n()->t('Your nickname can only contain a-z, 0-9 and _.'));
}
*
* @return bool True, if the allow was successful
*
- * @throws InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
* @throws Exception
*/
public static function allow(string $hash)
* @param string $lang The user's language (default is english)
*
* @return bool True, if the user was created successfully
- * @throws InternalServerErrorException
- * @throws \ErrorException
- * @throws \ImagickException
+ * @throws HTTPException\InternalServerErrorException
+ * @throws ErrorException
+ * @throws ImagickException
*/
public static function createMinimal(string $name, string $email, string $nick, string $lang = L10n::DEFAULT)
{
if (empty($name) ||
empty($email) ||
empty($nick)) {
- throw new InternalServerErrorException('Invalid arguments.');
+ throw new HTTPException\InternalServerErrorException('Invalid arguments.');
}
$result = self::create([
* @param string $siteurl
* @param string $password Plaintext password
* @return NULL|boolean from notification() and email() inherited
- * @throws InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
*/
public static function sendRegisterPendingEmail($user, $sitename, $siteurl, $password)
{
*
* It's here as a function because the mail is sent from different parts
*
- * @param \Friendica\Core\L10n $l10n The used language
- * @param array $user User record array
- * @param string $sitename
- * @param string $siteurl
- * @param string $password Plaintext password
+ * @param L10n $l10n The used language
+ * @param array $user User record array
+ * @param string $sitename
+ * @param string $siteurl
+ * @param string $password Plaintext password
*
* @return NULL|boolean from notification() and email() inherited
- * @throws InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
*/
- public static function sendRegisterOpenEmail(\Friendica\Core\L10n $l10n, $user, $sitename, $siteurl, $password)
+ public static function sendRegisterOpenEmail(L10n $l10n, $user, $sitename, $siteurl, $password)
{
$preamble = Strings::deindent($l10n->t(
'
/**
* @param int $uid user to remove
* @return bool
- * @throws InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
*/
public static function remove(int $uid)
{
projects / friendica.git / blobdiff