nextcloud / server

lib/private/Authentication/TwoFactorAuth/Manager.php

Spacing +1 added lines, -1 removed lines

@@ -159,7 +159,7 @@
 			}
 		}
 
-		return array_filter($providers, function ($provider) use ($user) {
+		return array_filter($providers, function($provider) use ($user) {
 			/* @var $provider IProvider */
 			return $provider->isTwoFactorAuthEnabledForUser($user);
 		});

Indentation +145 added lines, -145 removed lines

@@ -34,150 +34,150 @@
 
 class Manager {
 
-	const SESSION_UID_KEY = 'two_factor_auth_uid';
-
-	/** @var AppManager */
-	private $appManager;
-
-	/** @var ISession */
-	private $session;
-
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * @param AppManager $appManager
-	 * @param ISession $session
-	 * @param IConfig $config
-	 */
-	public function __construct(AppManager $appManager, ISession $session, IConfig $config) {
-		$this->appManager = $appManager;
-		$this->session = $session;
-		$this->config = $config;
-	}
-
-	/**
-	 * Determine whether the user must provide a second factor challenge
-	 *
-	 * @param IUser $user
-	 * @return boolean
-	 */
-	public function isTwoFactorAuthenticated(IUser $user) {
-		$twoFactorEnabled = ((int) $this->config->getUserValue($user->getUID(), 'core', 'two_factor_auth_disabled', 0)) === 0;
-		return $twoFactorEnabled && count($this->getProviders($user)) > 0;
-	}
-
-	/**
-	 * Disable 2FA checks for the given user
-	 *
-	 * @param IUser $user
-	 */
-	public function disableTwoFactorAuthentication(IUser $user) {
-		$this->config->setUserValue($user->getUID(), 'core', 'two_factor_auth_disabled', 1);
-	}
-
-	/**
-	 * Enable all 2FA checks for the given user
-	 *
-	 * @param IUser $user
-	 */
-	public function enableTwoFactorAuthentication(IUser $user) {
-		$this->config->deleteUserValue($user->getUID(), 'core', 'two_factor_auth_disabled');
-	}
-
-	/**
-	 * Get a 2FA provider by its ID
-	 *
-	 * @param IUser $user
-	 * @param string $challengeProviderId
-	 * @return IProvider|null
-	 */
-	public function getProvider(IUser $user, $challengeProviderId) {
-		$providers = $this->getProviders($user);
-		return isset($providers[$challengeProviderId]) ? $providers[$challengeProviderId] : null;
-	}
-
-	/**
-	 * Get the list of 2FA providers for the given user
-	 *
-	 * @param IUser $user
-	 * @return IProvider[]
-	 */
-	public function getProviders(IUser $user) {
-		$allApps = $this->appManager->getEnabledAppsForUser($user);
-		$providers = [];
-
-		foreach ($allApps as $appId) {
-			$info = $this->appManager->getAppInfo($appId);
-			if (isset($info['two-factor-providers'])) {
-				$providerClasses = $info['two-factor-providers'];
-				foreach ($providerClasses as $class) {
-					try {
-						$this->loadTwoFactorApp($appId);
-						$provider = OC::$server->query($class);
-						$providers[$provider->getId()] = $provider;
-					} catch (QueryException $exc) {
-						// Provider class can not be resolved
-						throw new Exception("Could not load two-factor auth provider $class");
-					}
-				}
-			}
-		}
-
-		return array_filter($providers, function ($provider) use ($user) {
-			/* @var $provider IProvider */
-			return $provider->isTwoFactorAuthEnabledForUser($user);
-		});
-	}
-
-	/**
-	 * Load an app by ID if it has not been loaded yet
-	 *
-	 * @param string $appId
-	 */
-	protected function loadTwoFactorApp($appId) {
-		if (!OC_App::isAppLoaded($appId)) {
-			OC_App::loadApp($appId);
-		}
-	}
-
-	/**
-	 * Verify the given challenge
-	 *
-	 * @param string $providerId
-	 * @param IUser $user
-	 * @param string $challenge
-	 * @return boolean
-	 */
-	public function verifyChallenge($providerId, IUser $user, $challenge) {
-		$provider = $this->getProvider($user, $providerId);
-		if (is_null($provider)) {
-			return false;
-		}
-
-		$result = $provider->verifyChallenge($user, $challenge);
-		if ($result) {
-			$this->session->remove(self::SESSION_UID_KEY);
-		}
-		return $result;
-	}
-
-	/**
-	 * Check if the currently logged in user needs to pass 2FA
-	 *
-	 * @return boolean
-	 */
-	public function needsSecondFactor() {
-		return $this->session->exists(self::SESSION_UID_KEY);
-	}
-
-	/**
-	 * Prepare the 2FA login (set session value)
-	 *
-	 * @param IUser $user
-	 */
-	public function prepareTwoFactorLogin(IUser $user) {
-		$this->session->set(self::SESSION_UID_KEY, $user->getUID());
-	}
+    const SESSION_UID_KEY = 'two_factor_auth_uid';
+
+    /** @var AppManager */
+    private $appManager;
+
+    /** @var ISession */
+    private $session;
+
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * @param AppManager $appManager
+     * @param ISession $session
+     * @param IConfig $config
+     */
+    public function __construct(AppManager $appManager, ISession $session, IConfig $config) {
+        $this->appManager = $appManager;
+        $this->session = $session;
+        $this->config = $config;
+    }
+
+    /**
+     * Determine whether the user must provide a second factor challenge
+     *
+     * @param IUser $user
+     * @return boolean
+     */
+    public function isTwoFactorAuthenticated(IUser $user) {
+        $twoFactorEnabled = ((int) $this->config->getUserValue($user->getUID(), 'core', 'two_factor_auth_disabled', 0)) === 0;
+        return $twoFactorEnabled && count($this->getProviders($user)) > 0;
+    }
+
+    /**
+     * Disable 2FA checks for the given user
+     *
+     * @param IUser $user
+     */
+    public function disableTwoFactorAuthentication(IUser $user) {
+        $this->config->setUserValue($user->getUID(), 'core', 'two_factor_auth_disabled', 1);
+    }
+
+    /**
+     * Enable all 2FA checks for the given user
+     *
+     * @param IUser $user
+     */
+    public function enableTwoFactorAuthentication(IUser $user) {
+        $this->config->deleteUserValue($user->getUID(), 'core', 'two_factor_auth_disabled');
+    }
+
+    /**
+     * Get a 2FA provider by its ID
+     *
+     * @param IUser $user
+     * @param string $challengeProviderId
+     * @return IProvider|null
+     */
+    public function getProvider(IUser $user, $challengeProviderId) {
+        $providers = $this->getProviders($user);
+        return isset($providers[$challengeProviderId]) ? $providers[$challengeProviderId] : null;
+    }
+
+    /**
+     * Get the list of 2FA providers for the given user
+     *
+     * @param IUser $user
+     * @return IProvider[]
+     */
+    public function getProviders(IUser $user) {
+        $allApps = $this->appManager->getEnabledAppsForUser($user);
+        $providers = [];
+
+        foreach ($allApps as $appId) {
+            $info = $this->appManager->getAppInfo($appId);
+            if (isset($info['two-factor-providers'])) {
+                $providerClasses = $info['two-factor-providers'];
+                foreach ($providerClasses as $class) {
+                    try {
+                        $this->loadTwoFactorApp($appId);
+                        $provider = OC::$server->query($class);
+                        $providers[$provider->getId()] = $provider;
+                    } catch (QueryException $exc) {
+                        // Provider class can not be resolved
+                        throw new Exception("Could not load two-factor auth provider $class");
+                    }
+                }
+            }
+        }
+
+        return array_filter($providers, function ($provider) use ($user) {
+            /* @var $provider IProvider */
+            return $provider->isTwoFactorAuthEnabledForUser($user);
+        });
+    }
+
+    /**
+     * Load an app by ID if it has not been loaded yet
+     *
+     * @param string $appId
+     */
+    protected function loadTwoFactorApp($appId) {
+        if (!OC_App::isAppLoaded($appId)) {
+            OC_App::loadApp($appId);
+        }
+    }
+
+    /**
+     * Verify the given challenge
+     *
+     * @param string $providerId
+     * @param IUser $user
+     * @param string $challenge
+     * @return boolean
+     */
+    public function verifyChallenge($providerId, IUser $user, $challenge) {
+        $provider = $this->getProvider($user, $providerId);
+        if (is_null($provider)) {
+            return false;
+        }
+
+        $result = $provider->verifyChallenge($user, $challenge);
+        if ($result) {
+            $this->session->remove(self::SESSION_UID_KEY);
+        }
+        return $result;
+    }
+
+    /**
+     * Check if the currently logged in user needs to pass 2FA
+     *
+     * @return boolean
+     */
+    public function needsSecondFactor() {
+        return $this->session->exists(self::SESSION_UID_KEY);
+    }
+
+    /**
+     * Prepare the 2FA login (set session value)
+     *
+     * @param IUser $user
+     */
+    public function prepareTwoFactorLogin(IUser $user) {
+        $this->session->set(self::SESSION_UID_KEY, $user->getUID());
+    }
 
 }

lib/private/Authentication/Token/DefaultTokenMapper.php

Spacing +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 		$data = $result->fetchAll();
 		$result->closeCursor();
 
-		$entities = array_map(function ($row) {
+		$entities = array_map(function($row) {
 			return DefaultToken::fromRow($row);
 		}, $data);
 

Indentation +86 added lines, -86 removed lines

@@ -30,99 +30,99 @@
 
 class DefaultTokenMapper extends Mapper {
 
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'authtoken');
-	}
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'authtoken');
+    }
 
-	/**
-	 * Invalidate (delete) a given token
-	 *
-	 * @param string $token
-	 */
-	public function invalidate($token) {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete('authtoken')
-			->andWhere($qb->expr()->eq('token', $qb->createParameter('token')))
-			->setParameter('token', $token)
-			->execute();
-	}
+    /**
+     * Invalidate (delete) a given token
+     *
+     * @param string $token
+     */
+    public function invalidate($token) {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete('authtoken')
+            ->andWhere($qb->expr()->eq('token', $qb->createParameter('token')))
+            ->setParameter('token', $token)
+            ->execute();
+    }
 
-	/**
-	 * @param int $olderThan
-	 */
-	public function invalidateOld($olderThan) {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete('authtoken')
-			->where($qb->expr()->lt('last_activity', $qb->createParameter('last_activity')))
-			->andWhere($qb->expr()->eq('type', $qb->createParameter('type')))
-			->setParameter('last_activity', $olderThan, IQueryBuilder::PARAM_INT)
-			->setParameter('type', IToken::TEMPORARY_TOKEN, IQueryBuilder::PARAM_INT)
-			->execute();
-	}
+    /**
+     * @param int $olderThan
+     */
+    public function invalidateOld($olderThan) {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete('authtoken')
+            ->where($qb->expr()->lt('last_activity', $qb->createParameter('last_activity')))
+            ->andWhere($qb->expr()->eq('type', $qb->createParameter('type')))
+            ->setParameter('last_activity', $olderThan, IQueryBuilder::PARAM_INT)
+            ->setParameter('type', IToken::TEMPORARY_TOKEN, IQueryBuilder::PARAM_INT)
+            ->execute();
+    }
 
-	/**
-	 * Get the user UID for the given token
-	 *
-	 * @param string $token
-	 * @throws DoesNotExistException
-	 * @return DefaultToken
-	 */
-	public function getToken($token) {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$result = $qb->select('id', 'uid', 'login_name', 'password', 'name', 'type', 'token', 'last_activity', 'last_check')
-			->from('authtoken')
-			->where($qb->expr()->eq('token', $qb->createParameter('token')))
-			->setParameter('token', $token)
-			->execute();
+    /**
+     * Get the user UID for the given token
+     *
+     * @param string $token
+     * @throws DoesNotExistException
+     * @return DefaultToken
+     */
+    public function getToken($token) {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $result = $qb->select('id', 'uid', 'login_name', 'password', 'name', 'type', 'token', 'last_activity', 'last_check')
+            ->from('authtoken')
+            ->where($qb->expr()->eq('token', $qb->createParameter('token')))
+            ->setParameter('token', $token)
+            ->execute();
 
-		$data = $result->fetch();
-		$result->closeCursor();
-		if ($data === false) {
-			throw new DoesNotExistException('token does not exist');
-		}
-		return DefaultToken::fromRow($data);
-	}
+        $data = $result->fetch();
+        $result->closeCursor();
+        if ($data === false) {
+            throw new DoesNotExistException('token does not exist');
+        }
+        return DefaultToken::fromRow($data);
+    }
 
-	/**
-	 * Get all token of a user
-	 *
-	 * The provider may limit the number of result rows in case of an abuse
-	 * where a high number of (session) tokens is generated
-	 *
-	 * @param IUser $user
-	 * @return DefaultToken[]
-	 */
-	public function getTokenByUser(IUser $user) {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('id', 'uid', 'login_name', 'password', 'name', 'type', 'token', 'last_activity', 'last_check')
-			->from('authtoken')
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
-			->setMaxResults(1000);
-		$result = $qb->execute();
-		$data = $result->fetchAll();
-		$result->closeCursor();
+    /**
+     * Get all token of a user
+     *
+     * The provider may limit the number of result rows in case of an abuse
+     * where a high number of (session) tokens is generated
+     *
+     * @param IUser $user
+     * @return DefaultToken[]
+     */
+    public function getTokenByUser(IUser $user) {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('id', 'uid', 'login_name', 'password', 'name', 'type', 'token', 'last_activity', 'last_check')
+            ->from('authtoken')
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
+            ->setMaxResults(1000);
+        $result = $qb->execute();
+        $data = $result->fetchAll();
+        $result->closeCursor();
 
-		$entities = array_map(function ($row) {
-			return DefaultToken::fromRow($row);
-		}, $data);
+        $entities = array_map(function ($row) {
+            return DefaultToken::fromRow($row);
+        }, $data);
 
-		return $entities;
-	}
+        return $entities;
+    }
 
-	/**
-	 * @param IUser $user
-	 * @param int $id
-	 */
-	public function deleteById(IUser $user, $id) {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete('authtoken')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())));
-		$qb->execute();
-	}
+    /**
+     * @param IUser $user
+     * @param int $id
+     */
+    public function deleteById(IUser $user, $id) {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete('authtoken')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())));
+        $qb->execute();
+    }
 
 }

lib/private/RedisFactory.php

Indentation +52 added lines, -52 removed lines

@@ -23,64 +23,64 @@
 namespace OC;
 
 class RedisFactory {
-	/** @var  \Redis */
-	private $instance;
+    /** @var  \Redis */
+    private $instance;
 
-	/** @var  SystemConfig */
-	private $config;
+    /** @var  SystemConfig */
+    private $config;
 
-	/**
-	 * RedisFactory constructor.
-	 *
-	 * @param SystemConfig $config
-	 */
-	public function __construct(SystemConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * RedisFactory constructor.
+     *
+     * @param SystemConfig $config
+     */
+    public function __construct(SystemConfig $config) {
+        $this->config = $config;
+    }
 
-	private function create() {
-		$this->instance = new \Redis();
-		// TODO allow configuring a RedisArray, see https://github.com/nicolasff/phpredis/blob/master/arrays.markdown#redis-arrays
-		$config = $this->config->getValue('redis', array());
-		if (isset($config['host'])) {
-			$host = $config['host'];
-		} else {
-			$host = '127.0.0.1';
-		}
-		if (isset($config['port'])) {
-			$port = $config['port'];
-		} else {
-			$port = 6379;
-		}
-		if (isset($config['timeout'])) {
-			$timeout = $config['timeout'];
-		} else {
-			$timeout = 0.0; // unlimited
-		}
+    private function create() {
+        $this->instance = new \Redis();
+        // TODO allow configuring a RedisArray, see https://github.com/nicolasff/phpredis/blob/master/arrays.markdown#redis-arrays
+        $config = $this->config->getValue('redis', array());
+        if (isset($config['host'])) {
+            $host = $config['host'];
+        } else {
+            $host = '127.0.0.1';
+        }
+        if (isset($config['port'])) {
+            $port = $config['port'];
+        } else {
+            $port = 6379;
+        }
+        if (isset($config['timeout'])) {
+            $timeout = $config['timeout'];
+        } else {
+            $timeout = 0.0; // unlimited
+        }
 
-		$this->instance->connect($host, $port, $timeout);
-		if (isset($config['password']) && $config['password'] !== '') {
-			$this->instance->auth($config['password']);
-		}
+        $this->instance->connect($host, $port, $timeout);
+        if (isset($config['password']) && $config['password'] !== '') {
+            $this->instance->auth($config['password']);
+        }
 
-		if (isset($config['dbindex'])) {
-			$this->instance->select($config['dbindex']);
-		}
-	}
+        if (isset($config['dbindex'])) {
+            $this->instance->select($config['dbindex']);
+        }
+    }
 
-	public function getInstance() {
-		if (!$this->isAvailable()) {
-			throw new \Exception('Redis support is not available');
-		}
-		if (!$this->instance instanceof \Redis) {
-			$this->create();
-		}
+    public function getInstance() {
+        if (!$this->isAvailable()) {
+            throw new \Exception('Redis support is not available');
+        }
+        if (!$this->instance instanceof \Redis) {
+            $this->create();
+        }
 
-		return $this->instance;
-	}
+        return $this->instance;
+    }
 
-	public function isAvailable() {
-		return extension_loaded('redis')
-		&& version_compare(phpversion('redis'), '2.2.5', '>=');
-	}
+    public function isAvailable() {
+        return extension_loaded('redis')
+        && version_compare(phpversion('redis'), '2.2.5', '>=');
+    }
 }

lib/private/SubAdmin.php

Spacing +11 added lines, -11 removed lines

@@ -119,9 +119,9 @@ 
 			->execute();
 
 		$groups = [];
-		while($row = $result->fetch()) {
+		while ($row = $result->fetch()) {
 			$group = $this->groupManager->get($row['gid']);
-			if(!is_null($group)) {
+			if (!is_null($group)) {
 				$groups[] = $group;
 			}
 		}
@@ -144,9 +144,9 @@ 
 			->execute();
 
 		$users = [];
-		while($row = $result->fetch()) {
+		while ($row = $result->fetch()) {
 			$user = $this->userManager->get($row['uid']);
-			if(!is_null($user)) {
+			if (!is_null($user)) {
 				$users[] = $user;
 			}
 		}
@@ -167,10 +167,10 @@ 
 			->execute();
 
 		$subadmins = [];
-		while($row = $result->fetch()) {
+		while ($row = $result->fetch()) {
 			$user = $this->userManager->get($row['uid']);
 			$group = $this->groupManager->get($row['gid']);
-			if(!is_null($user) && !is_null($group)) {
+			if (!is_null($user) && !is_null($group)) {
 				$subadmins[] = [
 					'user'  => $user,
 					'group' => $group
@@ -200,7 +200,7 @@ 
 			->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
 			->execute();
 
-		$fetch =  $result->fetch();
+		$fetch = $result->fetch();
 		$result->closeCursor();
 		$result = !empty($fetch) ? true : false;
 
@@ -241,15 +241,15 @@ 
 	 * @return bool
 	 */
 	public function isUserAccessible($subadmin, $user) {
-		if(!$this->isSubAdmin($subadmin)) {
+		if (!$this->isSubAdmin($subadmin)) {
 			return false;
 		}
-		if($this->groupManager->isAdmin($user->getUID())) {
+		if ($this->groupManager->isAdmin($user->getUID())) {
 			return false;
 		}
 		$accessibleGroups = $this->getSubAdminsGroups($subadmin);
-		foreach($accessibleGroups as $accessibleGroup) {
-			if($accessibleGroup->inGroup($user)) {
+		foreach ($accessibleGroups as $accessibleGroup) {
+			if ($accessibleGroup->inGroup($user)) {
 				return true;
 			}
 		}

Indentation +247 added lines, -247 removed lines

@@ -36,253 +36,253 @@
 
 class SubAdmin extends PublicEmitter {
 
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var IDBConnection */
-	private $dbConn;
-
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IDBConnection $dbConn
-	 */
-	public function __construct(IUserManager $userManager,
-	                            IGroupManager $groupManager,
-								IDBConnection $dbConn) {
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->dbConn = $dbConn;
-
-		$this->userManager->listen('\OC\User', 'postDelete', function($user) {
-			$this->post_deleteUser($user);
-		});
-		$this->groupManager->listen('\OC\Group', 'postDelete', function($group) {
-			$this->post_deleteGroup($group);	
-		});
-	}
-
-	/**
-	 * add a SubAdmin
-	 * @param IUser $user user to be SubAdmin
-	 * @param IGroup $group group $user becomes subadmin of
-	 * @return bool
-	 */
-	public function createSubAdmin(IUser $user, IGroup $group) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->insert('group_admin')
-			->values([
-				'gid' => $qb->createNamedParameter($group->getGID()),
-				'uid' => $qb->createNamedParameter($user->getUID())
-			])
-			->execute();
-
-		$this->emit('\OC\SubAdmin', 'postCreateSubAdmin', [$user, $group]);
-		\OC_Hook::emit("OC_SubAdmin", "post_createSubAdmin", ["gid" => $group->getGID()]);
-		return true;
-	}
-
-	/**
-	 * delete a SubAdmin
-	 * @param IUser $user the user that is the SubAdmin
-	 * @param IGroup $group the group
-	 * @return bool
-	 */
-	public function deleteSubAdmin(IUser $user, IGroup $group) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->delete('group_admin')
-			->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
-			->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
-			->execute();
-
-		$this->emit('\OC\SubAdmin', 'postDeleteSubAdmin', [$user, $group]);
-		\OC_Hook::emit("OC_SubAdmin", "post_deleteSubAdmin", ["gid" => $group->getGID()]);
-		return true;
-	}
-
-	/**
-	 * get groups of a SubAdmin
-	 * @param IUser $user the SubAdmin
-	 * @return IGroup[]
-	 */
-	public function getSubAdminsGroups(IUser $user) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$result = $qb->select('gid')
-			->from('group_admin')
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
-			->execute();
-
-		$groups = [];
-		while($row = $result->fetch()) {
-			$group = $this->groupManager->get($row['gid']);
-			if(!is_null($group)) {
-				$groups[] = $group;
-			}
-		}
-		$result->closeCursor();
-
-		return $groups;
-	}
-
-	/**
-	 * get SubAdmins of a group
-	 * @param IGroup $group the group
-	 * @return IUser[]
-	 */
-	public function getGroupsSubAdmins(IGroup $group) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$result = $qb->select('uid')
-			->from('group_admin')
-			->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
-			->execute();
-
-		$users = [];
-		while($row = $result->fetch()) {
-			$user = $this->userManager->get($row['uid']);
-			if(!is_null($user)) {
-				$users[] = $user;
-			}
-		}
-		$result->closeCursor();
-
-		return $users;
-	}
-
-	/**
-	 * get all SubAdmins
-	 * @return array
-	 */
-	public function getAllSubAdmins() {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$result = $qb->select('*')
-			->from('group_admin')
-			->execute();
-
-		$subadmins = [];
-		while($row = $result->fetch()) {
-			$user = $this->userManager->get($row['uid']);
-			$group = $this->groupManager->get($row['gid']);
-			if(!is_null($user) && !is_null($group)) {
-				$subadmins[] = [
-					'user'  => $user,
-					'group' => $group
-				];
-			}
-		}
-		$result->closeCursor();
-
-		return $subadmins;
-	}
-
-	/**
-	 * checks if a user is a SubAdmin of a group
-	 * @param IUser $user 
-	 * @param IGroup $group
-	 * @return bool
-	 */
-	public function isSubAdminofGroup(IUser $user, IGroup $group) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		/*
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var IDBConnection */
+    private $dbConn;
+
+    /**
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IDBConnection $dbConn
+     */
+    public function __construct(IUserManager $userManager,
+                                IGroupManager $groupManager,
+                                IDBConnection $dbConn) {
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->dbConn = $dbConn;
+
+        $this->userManager->listen('\OC\User', 'postDelete', function($user) {
+            $this->post_deleteUser($user);
+        });
+        $this->groupManager->listen('\OC\Group', 'postDelete', function($group) {
+            $this->post_deleteGroup($group);	
+        });
+    }
+
+    /**
+     * add a SubAdmin
+     * @param IUser $user user to be SubAdmin
+     * @param IGroup $group group $user becomes subadmin of
+     * @return bool
+     */
+    public function createSubAdmin(IUser $user, IGroup $group) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->insert('group_admin')
+            ->values([
+                'gid' => $qb->createNamedParameter($group->getGID()),
+                'uid' => $qb->createNamedParameter($user->getUID())
+            ])
+            ->execute();
+
+        $this->emit('\OC\SubAdmin', 'postCreateSubAdmin', [$user, $group]);
+        \OC_Hook::emit("OC_SubAdmin", "post_createSubAdmin", ["gid" => $group->getGID()]);
+        return true;
+    }
+
+    /**
+     * delete a SubAdmin
+     * @param IUser $user the user that is the SubAdmin
+     * @param IGroup $group the group
+     * @return bool
+     */
+    public function deleteSubAdmin(IUser $user, IGroup $group) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->delete('group_admin')
+            ->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
+            ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
+            ->execute();
+
+        $this->emit('\OC\SubAdmin', 'postDeleteSubAdmin', [$user, $group]);
+        \OC_Hook::emit("OC_SubAdmin", "post_deleteSubAdmin", ["gid" => $group->getGID()]);
+        return true;
+    }
+
+    /**
+     * get groups of a SubAdmin
+     * @param IUser $user the SubAdmin
+     * @return IGroup[]
+     */
+    public function getSubAdminsGroups(IUser $user) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $result = $qb->select('gid')
+            ->from('group_admin')
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
+            ->execute();
+
+        $groups = [];
+        while($row = $result->fetch()) {
+            $group = $this->groupManager->get($row['gid']);
+            if(!is_null($group)) {
+                $groups[] = $group;
+            }
+        }
+        $result->closeCursor();
+
+        return $groups;
+    }
+
+    /**
+     * get SubAdmins of a group
+     * @param IGroup $group the group
+     * @return IUser[]
+     */
+    public function getGroupsSubAdmins(IGroup $group) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $result = $qb->select('uid')
+            ->from('group_admin')
+            ->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
+            ->execute();
+
+        $users = [];
+        while($row = $result->fetch()) {
+            $user = $this->userManager->get($row['uid']);
+            if(!is_null($user)) {
+                $users[] = $user;
+            }
+        }
+        $result->closeCursor();
+
+        return $users;
+    }
+
+    /**
+     * get all SubAdmins
+     * @return array
+     */
+    public function getAllSubAdmins() {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $result = $qb->select('*')
+            ->from('group_admin')
+            ->execute();
+
+        $subadmins = [];
+        while($row = $result->fetch()) {
+            $user = $this->userManager->get($row['uid']);
+            $group = $this->groupManager->get($row['gid']);
+            if(!is_null($user) && !is_null($group)) {
+                $subadmins[] = [
+                    'user'  => $user,
+                    'group' => $group
+                ];
+            }
+        }
+        $result->closeCursor();
+
+        return $subadmins;
+    }
+
+    /**
+     * checks if a user is a SubAdmin of a group
+     * @param IUser $user 
+     * @param IGroup $group
+     * @return bool
+     */
+    public function isSubAdminofGroup(IUser $user, IGroup $group) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        /*
 		 * Primary key is ('gid', 'uid') so max 1 result possible here
 		 */
-		$result = $qb->select('*')
-			->from('group_admin')
-			->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
-			->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
-			->execute();
-
-		$fetch =  $result->fetch();
-		$result->closeCursor();
-		$result = !empty($fetch) ? true : false;
-
-		return $result;
-	}
-
-	/**
-	 * checks if a user is a SubAdmin
-	 * @param IUser $user 
-	 * @return bool
-	 */
-	public function isSubAdmin(IUser $user) {
-		// Check if the user is already an admin
-		if ($this->groupManager->isAdmin($user->getUID())) {
-			return true;
-		}
-
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$result = $qb->select('gid')
-			->from('group_admin')
-			->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
-			->setMaxResults(1)
-			->execute();
-
-		$isSubAdmin = $result->fetch();
-		$result->closeCursor();
-
-		$result = $isSubAdmin === false ? false : true;
-
-		return $result;
-	}
-
-	/**
-	 * checks if a user is a accessible by a subadmin
-	 * @param IUser $subadmin
-	 * @param IUser $user
-	 * @return bool
-	 */
-	public function isUserAccessible($subadmin, $user) {
-		if(!$this->isSubAdmin($subadmin)) {
-			return false;
-		}
-		if($this->groupManager->isAdmin($user->getUID())) {
-			return false;
-		}
-		$accessibleGroups = $this->getSubAdminsGroups($subadmin);
-		foreach($accessibleGroups as $accessibleGroup) {
-			if($accessibleGroup->inGroup($user)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * delete all SubAdmins by $user
-	 * @param IUser $user
-	 * @return boolean
-	 */
-	private function post_deleteUser($user) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->delete('group_admin')
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
-			->execute();
-
-		return true;
-	}
-
-	/**
-	 * delete all SubAdmins by $group
-	 * @param IGroup $group
-	 * @return boolean
-	 */
-	private function post_deleteGroup($group) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->delete('group_admin')
-			->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
-			->execute();
-
-		return true;
-	}
+        $result = $qb->select('*')
+            ->from('group_admin')
+            ->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
+            ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
+            ->execute();
+
+        $fetch =  $result->fetch();
+        $result->closeCursor();
+        $result = !empty($fetch) ? true : false;
+
+        return $result;
+    }
+
+    /**
+     * checks if a user is a SubAdmin
+     * @param IUser $user 
+     * @return bool
+     */
+    public function isSubAdmin(IUser $user) {
+        // Check if the user is already an admin
+        if ($this->groupManager->isAdmin($user->getUID())) {
+            return true;
+        }
+
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $result = $qb->select('gid')
+            ->from('group_admin')
+            ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
+            ->setMaxResults(1)
+            ->execute();
+
+        $isSubAdmin = $result->fetch();
+        $result->closeCursor();
+
+        $result = $isSubAdmin === false ? false : true;
+
+        return $result;
+    }
+
+    /**
+     * checks if a user is a accessible by a subadmin
+     * @param IUser $subadmin
+     * @param IUser $user
+     * @return bool
+     */
+    public function isUserAccessible($subadmin, $user) {
+        if(!$this->isSubAdmin($subadmin)) {
+            return false;
+        }
+        if($this->groupManager->isAdmin($user->getUID())) {
+            return false;
+        }
+        $accessibleGroups = $this->getSubAdminsGroups($subadmin);
+        foreach($accessibleGroups as $accessibleGroup) {
+            if($accessibleGroup->inGroup($user)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * delete all SubAdmins by $user
+     * @param IUser $user
+     * @return boolean
+     */
+    private function post_deleteUser($user) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->delete('group_admin')
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
+            ->execute();
+
+        return true;
+    }
+
+    /**
+     * delete all SubAdmins by $group
+     * @param IGroup $group
+     * @return boolean
+     */
+    private function post_deleteGroup($group) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->delete('group_admin')
+            ->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
+            ->execute();
+
+        return true;
+    }
 }

lib/private/Activity/Manager.php

Spacing +3 added lines, -3 removed lines

@@ -112,7 +112,7 @@ 
 		}
 
 		$this->consumers = [];
-		foreach($this->consumersClosures as $consumer) {
+		foreach ($this->consumersClosures as $consumer) {
 			$c = $consumer();
 			if ($c instanceof IConsumer) {
 				$this->consumers[] = $c;
@@ -133,7 +133,7 @@ 
 		}
 
 		$this->extensions = [];
-		foreach($this->extensionsClosures as $extension) {
+		foreach ($this->extensionsClosures as $extension) {
 			$e = $extension();
 			if ($e instanceof IExtension) {
 				$this->extensions[] = $e;
@@ -669,7 +669,7 @@ 
 			return array(null, null);
 		}
 
-		return array(' and ((' . implode(') or (', $conditions) . '))', $parameters);
+		return array(' and (('.implode(') or (', $conditions).'))', $parameters);
 	}
 
 	/**

Indentation +497 added lines, -497 removed lines

@@ -34,501 +34,501 @@
 use OCP\IUserSession;
 
 class Manager implements IManager {
-	/** @var IRequest */
-	protected $request;
-
-	/** @var IUserSession */
-	protected $session;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var string */
-	protected $formattingObjectType;
-
-	/** @var int */
-	protected $formattingObjectId;
-
-	/** @var string */
-	protected $currentUserId;
-
-	/**
-	 * constructor of the controller
-	 *
-	 * @param IRequest $request
-	 * @param IUserSession $session
-	 * @param IConfig $config
-	 */
-	public function __construct(IRequest $request,
-								IUserSession $session,
-								IConfig $config) {
-		$this->request = $request;
-		$this->session = $session;
-		$this->config = $config;
-	}
-
-	/** @var \Closure[] */
-	private $consumersClosures = array();
-
-	/** @var IConsumer[] */
-	private $consumers = array();
-
-	/** @var \Closure[] */
-	private $extensionsClosures = array();
-
-	/** @var IExtension[] */
-	private $extensions = array();
-
-	/** @var array list of filters "name" => "is valid" */
-	protected $validFilters = array(
-		'all'	=> true,
-		'by'	=> true,
-		'self'	=> true,
-	);
-
-	/** @var array list of type icons "type" => "css class" */
-	protected $typeIcons = array();
-
-	/** @var array list of special parameters "app" => ["text" => ["parameter" => "type"]] */
-	protected $specialParameters = array();
-
-	/**
-	 * @return \OCP\Activity\IConsumer[]
-	 */
-	protected function getConsumers() {
-		if (!empty($this->consumers)) {
-			return $this->consumers;
-		}
-
-		$this->consumers = [];
-		foreach($this->consumersClosures as $consumer) {
-			$c = $consumer();
-			if ($c instanceof IConsumer) {
-				$this->consumers[] = $c;
-			} else {
-				throw new \InvalidArgumentException('The given consumer does not implement the \OCP\Activity\IConsumer interface');
-			}
-		}
-
-		return $this->consumers;
-	}
-
-	/**
-	 * @return \OCP\Activity\IExtension[]
-	 */
-	protected function getExtensions() {
-		if (!empty($this->extensions)) {
-			return $this->extensions;
-		}
-
-		$this->extensions = [];
-		foreach($this->extensionsClosures as $extension) {
-			$e = $extension();
-			if ($e instanceof IExtension) {
-				$this->extensions[] = $e;
-			} else {
-				throw new \InvalidArgumentException('The given extension does not implement the \OCP\Activity\IExtension interface');
-			}
-		}
-
-		return $this->extensions;
-	}
-
-	/**
-	 * Generates a new IEvent object
-	 *
-	 * Make sure to call at least the following methods before sending it to the
-	 * app with via the publish() method:
-	 *  - setApp()
-	 *  - setType()
-	 *  - setAffectedUser()
-	 *  - setSubject()
-	 *
-	 * @return IEvent
-	 */
-	public function generateEvent() {
-		return new Event();
-	}
-
-	/**
-	 * Publish an event to the activity consumers
-	 *
-	 * Make sure to call at least the following methods before sending an Event:
-	 *  - setApp()
-	 *  - setType()
-	 *  - setAffectedUser()
-	 *  - setSubject()
-	 *
-	 * @param IEvent $event
-	 * @return null
-	 * @throws \BadMethodCallException if required values have not been set
-	 */
-	public function publish(IEvent $event) {
-		if (!$event->getApp()) {
-			throw new \BadMethodCallException('App not set', 10);
-		}
-		if (!$event->getType()) {
-			throw new \BadMethodCallException('Type not set', 11);
-		}
-		if ($event->getAffectedUser() === null) {
-			throw new \BadMethodCallException('Affected user not set', 12);
-		}
-		if ($event->getSubject() === null || $event->getSubjectParameters() === null) {
-			throw new \BadMethodCallException('Subject not set', 13);
-		}
-
-		if ($event->getAuthor() === null) {
-			if ($this->session->getUser() instanceof IUser) {
-				$event->setAuthor($this->session->getUser()->getUID());
-			}
-		}
-
-		if (!$event->getTimestamp()) {
-			$event->setTimestamp(time());
-		}
-
-		foreach ($this->getConsumers() as $c) {
-			$c->receive($event);
-		}
-	}
-
-	/**
-	 * @param string $app           The app where this event is associated with
-	 * @param string $subject       A short description of the event
-	 * @param array  $subjectParams Array with parameters that are filled in the subject
-	 * @param string $message       A longer description of the event
-	 * @param array  $messageParams Array with parameters that are filled in the message
-	 * @param string $file          The file including path where this event is associated with
-	 * @param string $link          A link where this event is associated with
-	 * @param string $affectedUser  Recipient of the activity
-	 * @param string $type          Type of the notification
-	 * @param int    $priority      Priority of the notification
-	 * @return null
-	 */
-	public function publishActivity($app, $subject, $subjectParams, $message, $messageParams, $file, $link, $affectedUser, $type, $priority) {
-		$event = $this->generateEvent();
-		$event->setApp($app)
-			->setType($type)
-			->setAffectedUser($affectedUser)
-			->setSubject($subject, $subjectParams)
-			->setMessage($message, $messageParams)
-			->setObject('', 0, $file)
-			->setLink($link);
-
-		$this->publish($event);
-	}
-
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be called in case
-	 * activity consumers are actually requested
-	 *
-	 * $callable has to return an instance of OCA\Activity\IConsumer
-	 *
-	 * @param \Closure $callable
-	 */
-	public function registerConsumer(\Closure $callable) {
-		array_push($this->consumersClosures, $callable);
-		$this->consumers = [];
-	}
-
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be called in case
-	 * activity consumers are actually requested
-	 *
-	 * $callable has to return an instance of OCA\Activity\IConsumer
-	 *
-	 * @param \Closure $callable
-	 * @return void
-	 */
-	public function registerExtension(\Closure $callable) {
-		array_push($this->extensionsClosures, $callable);
-		$this->extensions = [];
-	}
-
-	/**
-	 * Will return additional notification types as specified by other apps
-	 *
-	 * @param string $languageCode
-	 * @return array
-	 */
-	public function getNotificationTypes($languageCode) {
-		$filesNotificationTypes = [];
-		$sharingNotificationTypes = [];
-
-		$notificationTypes = array();
-		foreach ($this->getExtensions() as $c) {
-			$result = $c->getNotificationTypes($languageCode);
-			if (is_array($result)) {
-				if (class_exists('\OCA\Files\Activity', false) && $c instanceof \OCA\Files\Activity) {
-					$filesNotificationTypes = $result;
-					continue;
-				}
-				if (class_exists('\OCA\Files_Sharing\Activity', false) && $c instanceof \OCA\Files_Sharing\Activity) {
-					$sharingNotificationTypes = $result;
-					continue;
-				}
-
-				$notificationTypes = array_merge($notificationTypes, $result);
-			}
-		}
-
-		return array_merge($filesNotificationTypes, $sharingNotificationTypes, $notificationTypes);
-	}
-
-	/**
-	 * @param string $method
-	 * @return array
-	 */
-	public function getDefaultTypes($method) {
-		$defaultTypes = array();
-		foreach ($this->getExtensions() as $c) {
-			$types = $c->getDefaultTypes($method);
-			if (is_array($types)) {
-				$defaultTypes = array_merge($types, $defaultTypes);
-			}
-		}
-		return $defaultTypes;
-	}
-
-	/**
-	 * @param string $type
-	 * @return string
-	 */
-	public function getTypeIcon($type) {
-		if (isset($this->typeIcons[$type])) {
-			return $this->typeIcons[$type];
-		}
-
-		foreach ($this->getExtensions() as $c) {
-			$icon = $c->getTypeIcon($type);
-			if (is_string($icon)) {
-				$this->typeIcons[$type] = $icon;
-				return $icon;
-			}
-		}
-
-		$this->typeIcons[$type] = '';
-		return '';
-	}
-
-	/**
-	 * @param string $type
-	 * @param string $id
-	 */
-	public function setFormattingObject($type, $id) {
-		$this->formattingObjectType = $type;
-		$this->formattingObjectId = (string) $id;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isFormattingFilteredObject() {
-		return $this->formattingObjectType !== null && $this->formattingObjectId !== null
-			&& $this->formattingObjectType === $this->request->getParam('object_type')
-			&& $this->formattingObjectId === $this->request->getParam('object_id');
-	}
-
-	/**
-	 * @param string $app
-	 * @param string $text
-	 * @param array $params
-	 * @param boolean $stripPath
-	 * @param boolean $highlightParams
-	 * @param string $languageCode
-	 * @return string|false
-	 */
-	public function translate($app, $text, $params, $stripPath, $highlightParams, $languageCode) {
-		foreach ($this->getExtensions() as $c) {
-			$translation = $c->translate($app, $text, $params, $stripPath, $highlightParams, $languageCode);
-			if (is_string($translation)) {
-				return $translation;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param string $app
-	 * @param string $text
-	 * @return array|false
-	 */
-	public function getSpecialParameterList($app, $text) {
-		if (isset($this->specialParameters[$app][$text])) {
-			return $this->specialParameters[$app][$text];
-		}
-
-		if (!isset($this->specialParameters[$app])) {
-			$this->specialParameters[$app] = array();
-		}
-
-		foreach ($this->getExtensions() as $c) {
-			$specialParameter = $c->getSpecialParameterList($app, $text);
-			if (is_array($specialParameter)) {
-				$this->specialParameters[$app][$text] = $specialParameter;
-				return $specialParameter;
-			}
-		}
-
-		$this->specialParameters[$app][$text] = false;
-		return false;
-	}
-
-	/**
-	 * @param array $activity
-	 * @return integer|false
-	 */
-	public function getGroupParameter($activity) {
-		foreach ($this->getExtensions() as $c) {
-			$parameter = $c->getGroupParameter($activity);
-			if ($parameter !== false) {
-				return $parameter;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getNavigation() {
-		$entries = array(
-			'apps' => array(),
-			'top' => array(),
-		);
-		foreach ($this->getExtensions() as $c) {
-			$additionalEntries = $c->getNavigation();
-			if (is_array($additionalEntries)) {
-				$entries['apps'] = array_merge($entries['apps'], $additionalEntries['apps']);
-				$entries['top'] = array_merge($entries['top'], $additionalEntries['top']);
-			}
-		}
-
-		return $entries;
-	}
-
-	/**
-	 * @param string $filterValue
-	 * @return boolean
-	 */
-	public function isFilterValid($filterValue) {
-		if (isset($this->validFilters[$filterValue])) {
-			return $this->validFilters[$filterValue];
-		}
-
-		foreach ($this->getExtensions() as $c) {
-			if ($c->isFilterValid($filterValue) === true) {
-				$this->validFilters[$filterValue] = true;
-				return true;
-			}
-		}
-
-		$this->validFilters[$filterValue] = false;
-		return false;
-	}
-
-	/**
-	 * @param array $types
-	 * @param string $filter
-	 * @return array
-	 */
-	public function filterNotificationTypes($types, $filter) {
-		if (!$this->isFilterValid($filter)) {
-			return $types;
-		}
-
-		foreach ($this->getExtensions() as $c) {
-			$result = $c->filterNotificationTypes($types, $filter);
-			if (is_array($result)) {
-				$types = $result;
-			}
-		}
-		return $types;
-	}
-
-	/**
-	 * @param string $filter
-	 * @return array
-	 */
-	public function getQueryForFilter($filter) {
-		if (!$this->isFilterValid($filter)) {
-			return [null, null];
-		}
-
-		$conditions = array();
-		$parameters = array();
-
-		foreach ($this->getExtensions() as $c) {
-			$result = $c->getQueryForFilter($filter);
-			if (is_array($result)) {
-				list($condition, $parameter) = $result;
-				if ($condition && is_array($parameter)) {
-					$conditions[] = $condition;
-					$parameters = array_merge($parameters, $parameter);
-				}
-			}
-		}
-
-		if (empty($conditions)) {
-			return array(null, null);
-		}
-
-		return array(' and ((' . implode(') or (', $conditions) . '))', $parameters);
-	}
-
-	/**
-	 * Set the user we need to use
-	 *
-	 * @param string|null $currentUserId
-	 * @throws \UnexpectedValueException If the user is invalid
-	 */
-	public function setCurrentUserId($currentUserId) {
-		if (!is_string($currentUserId) && $currentUserId !== null) {
-			throw new \UnexpectedValueException('The given current user is invalid');
-		}
-		$this->currentUserId = $currentUserId;
-	}
-
-	/**
-	 * Get the user we need to use
-	 *
-	 * Either the user is logged in, or we try to get it from the token
-	 *
-	 * @return string
-	 * @throws \UnexpectedValueException If the token is invalid, does not exist or is not unique
-	 */
-	public function getCurrentUserId() {
-		if ($this->currentUserId !== null) {
-			return $this->currentUserId;
-		} else if (!$this->session->isLoggedIn()) {
-			return $this->getUserFromToken();
-		} else {
-			return $this->session->getUser()->getUID();
-		}
-	}
-
-	/**
-	 * Get the user for the token
-	 *
-	 * @return string
-	 * @throws \UnexpectedValueException If the token is invalid, does not exist or is not unique
-	 */
-	protected function getUserFromToken() {
-		$token = (string) $this->request->getParam('token', '');
-		if (strlen($token) !== 30) {
-			throw new \UnexpectedValueException('The token is invalid');
-		}
-
-		$users = $this->config->getUsersForUserValue('activity', 'rsstoken', $token);
-
-		if (sizeof($users) !== 1) {
-			// No unique user found
-			throw new \UnexpectedValueException('The token is invalid');
-		}
-
-		// Token found login as that user
-		return array_shift($users);
-	}
+    /** @var IRequest */
+    protected $request;
+
+    /** @var IUserSession */
+    protected $session;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var string */
+    protected $formattingObjectType;
+
+    /** @var int */
+    protected $formattingObjectId;
+
+    /** @var string */
+    protected $currentUserId;
+
+    /**
+     * constructor of the controller
+     *
+     * @param IRequest $request
+     * @param IUserSession $session
+     * @param IConfig $config
+     */
+    public function __construct(IRequest $request,
+                                IUserSession $session,
+                                IConfig $config) {
+        $this->request = $request;
+        $this->session = $session;
+        $this->config = $config;
+    }
+
+    /** @var \Closure[] */
+    private $consumersClosures = array();
+
+    /** @var IConsumer[] */
+    private $consumers = array();
+
+    /** @var \Closure[] */
+    private $extensionsClosures = array();
+
+    /** @var IExtension[] */
+    private $extensions = array();
+
+    /** @var array list of filters "name" => "is valid" */
+    protected $validFilters = array(
+        'all'	=> true,
+        'by'	=> true,
+        'self'	=> true,
+    );
+
+    /** @var array list of type icons "type" => "css class" */
+    protected $typeIcons = array();
+
+    /** @var array list of special parameters "app" => ["text" => ["parameter" => "type"]] */
+    protected $specialParameters = array();
+
+    /**
+     * @return \OCP\Activity\IConsumer[]
+     */
+    protected function getConsumers() {
+        if (!empty($this->consumers)) {
+            return $this->consumers;
+        }
+
+        $this->consumers = [];
+        foreach($this->consumersClosures as $consumer) {
+            $c = $consumer();
+            if ($c instanceof IConsumer) {
+                $this->consumers[] = $c;
+            } else {
+                throw new \InvalidArgumentException('The given consumer does not implement the \OCP\Activity\IConsumer interface');
+            }
+        }
+
+        return $this->consumers;
+    }
+
+    /**
+     * @return \OCP\Activity\IExtension[]
+     */
+    protected function getExtensions() {
+        if (!empty($this->extensions)) {
+            return $this->extensions;
+        }
+
+        $this->extensions = [];
+        foreach($this->extensionsClosures as $extension) {
+            $e = $extension();
+            if ($e instanceof IExtension) {
+                $this->extensions[] = $e;
+            } else {
+                throw new \InvalidArgumentException('The given extension does not implement the \OCP\Activity\IExtension interface');
+            }
+        }
+
+        return $this->extensions;
+    }
+
+    /**
+     * Generates a new IEvent object
+     *
+     * Make sure to call at least the following methods before sending it to the
+     * app with via the publish() method:
+     *  - setApp()
+     *  - setType()
+     *  - setAffectedUser()
+     *  - setSubject()
+     *
+     * @return IEvent
+     */
+    public function generateEvent() {
+        return new Event();
+    }
+
+    /**
+     * Publish an event to the activity consumers
+     *
+     * Make sure to call at least the following methods before sending an Event:
+     *  - setApp()
+     *  - setType()
+     *  - setAffectedUser()
+     *  - setSubject()
+     *
+     * @param IEvent $event
+     * @return null
+     * @throws \BadMethodCallException if required values have not been set
+     */
+    public function publish(IEvent $event) {
+        if (!$event->getApp()) {
+            throw new \BadMethodCallException('App not set', 10);
+        }
+        if (!$event->getType()) {
+            throw new \BadMethodCallException('Type not set', 11);
+        }
+        if ($event->getAffectedUser() === null) {
+            throw new \BadMethodCallException('Affected user not set', 12);
+        }
+        if ($event->getSubject() === null || $event->getSubjectParameters() === null) {
+            throw new \BadMethodCallException('Subject not set', 13);
+        }
+
+        if ($event->getAuthor() === null) {
+            if ($this->session->getUser() instanceof IUser) {
+                $event->setAuthor($this->session->getUser()->getUID());
+            }
+        }
+
+        if (!$event->getTimestamp()) {
+            $event->setTimestamp(time());
+        }
+
+        foreach ($this->getConsumers() as $c) {
+            $c->receive($event);
+        }
+    }
+
+    /**
+     * @param string $app           The app where this event is associated with
+     * @param string $subject       A short description of the event
+     * @param array  $subjectParams Array with parameters that are filled in the subject
+     * @param string $message       A longer description of the event
+     * @param array  $messageParams Array with parameters that are filled in the message
+     * @param string $file          The file including path where this event is associated with
+     * @param string $link          A link where this event is associated with
+     * @param string $affectedUser  Recipient of the activity
+     * @param string $type          Type of the notification
+     * @param int    $priority      Priority of the notification
+     * @return null
+     */
+    public function publishActivity($app, $subject, $subjectParams, $message, $messageParams, $file, $link, $affectedUser, $type, $priority) {
+        $event = $this->generateEvent();
+        $event->setApp($app)
+            ->setType($type)
+            ->setAffectedUser($affectedUser)
+            ->setSubject($subject, $subjectParams)
+            ->setMessage($message, $messageParams)
+            ->setObject('', 0, $file)
+            ->setLink($link);
+
+        $this->publish($event);
+    }
+
+    /**
+     * In order to improve lazy loading a closure can be registered which will be called in case
+     * activity consumers are actually requested
+     *
+     * $callable has to return an instance of OCA\Activity\IConsumer
+     *
+     * @param \Closure $callable
+     */
+    public function registerConsumer(\Closure $callable) {
+        array_push($this->consumersClosures, $callable);
+        $this->consumers = [];
+    }
+
+    /**
+     * In order to improve lazy loading a closure can be registered which will be called in case
+     * activity consumers are actually requested
+     *
+     * $callable has to return an instance of OCA\Activity\IConsumer
+     *
+     * @param \Closure $callable
+     * @return void
+     */
+    public function registerExtension(\Closure $callable) {
+        array_push($this->extensionsClosures, $callable);
+        $this->extensions = [];
+    }
+
+    /**
+     * Will return additional notification types as specified by other apps
+     *
+     * @param string $languageCode
+     * @return array
+     */
+    public function getNotificationTypes($languageCode) {
+        $filesNotificationTypes = [];
+        $sharingNotificationTypes = [];
+
+        $notificationTypes = array();
+        foreach ($this->getExtensions() as $c) {
+            $result = $c->getNotificationTypes($languageCode);
+            if (is_array($result)) {
+                if (class_exists('\OCA\Files\Activity', false) && $c instanceof \OCA\Files\Activity) {
+                    $filesNotificationTypes = $result;
+                    continue;
+                }
+                if (class_exists('\OCA\Files_Sharing\Activity', false) && $c instanceof \OCA\Files_Sharing\Activity) {
+                    $sharingNotificationTypes = $result;
+                    continue;
+                }
+
+                $notificationTypes = array_merge($notificationTypes, $result);
+            }
+        }
+
+        return array_merge($filesNotificationTypes, $sharingNotificationTypes, $notificationTypes);
+    }
+
+    /**
+     * @param string $method
+     * @return array
+     */
+    public function getDefaultTypes($method) {
+        $defaultTypes = array();
+        foreach ($this->getExtensions() as $c) {
+            $types = $c->getDefaultTypes($method);
+            if (is_array($types)) {
+                $defaultTypes = array_merge($types, $defaultTypes);
+            }
+        }
+        return $defaultTypes;
+    }
+
+    /**
+     * @param string $type
+     * @return string
+     */
+    public function getTypeIcon($type) {
+        if (isset($this->typeIcons[$type])) {
+            return $this->typeIcons[$type];
+        }
+
+        foreach ($this->getExtensions() as $c) {
+            $icon = $c->getTypeIcon($type);
+            if (is_string($icon)) {
+                $this->typeIcons[$type] = $icon;
+                return $icon;
+            }
+        }
+
+        $this->typeIcons[$type] = '';
+        return '';
+    }
+
+    /**
+     * @param string $type
+     * @param string $id
+     */
+    public function setFormattingObject($type, $id) {
+        $this->formattingObjectType = $type;
+        $this->formattingObjectId = (string) $id;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isFormattingFilteredObject() {
+        return $this->formattingObjectType !== null && $this->formattingObjectId !== null
+            && $this->formattingObjectType === $this->request->getParam('object_type')
+            && $this->formattingObjectId === $this->request->getParam('object_id');
+    }
+
+    /**
+     * @param string $app
+     * @param string $text
+     * @param array $params
+     * @param boolean $stripPath
+     * @param boolean $highlightParams
+     * @param string $languageCode
+     * @return string|false
+     */
+    public function translate($app, $text, $params, $stripPath, $highlightParams, $languageCode) {
+        foreach ($this->getExtensions() as $c) {
+            $translation = $c->translate($app, $text, $params, $stripPath, $highlightParams, $languageCode);
+            if (is_string($translation)) {
+                return $translation;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $app
+     * @param string $text
+     * @return array|false
+     */
+    public function getSpecialParameterList($app, $text) {
+        if (isset($this->specialParameters[$app][$text])) {
+            return $this->specialParameters[$app][$text];
+        }
+
+        if (!isset($this->specialParameters[$app])) {
+            $this->specialParameters[$app] = array();
+        }
+
+        foreach ($this->getExtensions() as $c) {
+            $specialParameter = $c->getSpecialParameterList($app, $text);
+            if (is_array($specialParameter)) {
+                $this->specialParameters[$app][$text] = $specialParameter;
+                return $specialParameter;
+            }
+        }
+
+        $this->specialParameters[$app][$text] = false;
+        return false;
+    }
+
+    /**
+     * @param array $activity
+     * @return integer|false
+     */
+    public function getGroupParameter($activity) {
+        foreach ($this->getExtensions() as $c) {
+            $parameter = $c->getGroupParameter($activity);
+            if ($parameter !== false) {
+                return $parameter;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @return array
+     */
+    public function getNavigation() {
+        $entries = array(
+            'apps' => array(),
+            'top' => array(),
+        );
+        foreach ($this->getExtensions() as $c) {
+            $additionalEntries = $c->getNavigation();
+            if (is_array($additionalEntries)) {
+                $entries['apps'] = array_merge($entries['apps'], $additionalEntries['apps']);
+                $entries['top'] = array_merge($entries['top'], $additionalEntries['top']);
+            }
+        }
+
+        return $entries;
+    }
+
+    /**
+     * @param string $filterValue
+     * @return boolean
+     */
+    public function isFilterValid($filterValue) {
+        if (isset($this->validFilters[$filterValue])) {
+            return $this->validFilters[$filterValue];
+        }
+
+        foreach ($this->getExtensions() as $c) {
+            if ($c->isFilterValid($filterValue) === true) {
+                $this->validFilters[$filterValue] = true;
+                return true;
+            }
+        }
+
+        $this->validFilters[$filterValue] = false;
+        return false;
+    }
+
+    /**
+     * @param array $types
+     * @param string $filter
+     * @return array
+     */
+    public function filterNotificationTypes($types, $filter) {
+        if (!$this->isFilterValid($filter)) {
+            return $types;
+        }
+
+        foreach ($this->getExtensions() as $c) {
+            $result = $c->filterNotificationTypes($types, $filter);
+            if (is_array($result)) {
+                $types = $result;
+            }
+        }
+        return $types;
+    }
+
+    /**
+     * @param string $filter
+     * @return array
+     */
+    public function getQueryForFilter($filter) {
+        if (!$this->isFilterValid($filter)) {
+            return [null, null];
+        }
+
+        $conditions = array();
+        $parameters = array();
+
+        foreach ($this->getExtensions() as $c) {
+            $result = $c->getQueryForFilter($filter);
+            if (is_array($result)) {
+                list($condition, $parameter) = $result;
+                if ($condition && is_array($parameter)) {
+                    $conditions[] = $condition;
+                    $parameters = array_merge($parameters, $parameter);
+                }
+            }
+        }
+
+        if (empty($conditions)) {
+            return array(null, null);
+        }
+
+        return array(' and ((' . implode(') or (', $conditions) . '))', $parameters);
+    }
+
+    /**
+     * Set the user we need to use
+     *
+     * @param string|null $currentUserId
+     * @throws \UnexpectedValueException If the user is invalid
+     */
+    public function setCurrentUserId($currentUserId) {
+        if (!is_string($currentUserId) && $currentUserId !== null) {
+            throw new \UnexpectedValueException('The given current user is invalid');
+        }
+        $this->currentUserId = $currentUserId;
+    }
+
+    /**
+     * Get the user we need to use
+     *
+     * Either the user is logged in, or we try to get it from the token
+     *
+     * @return string
+     * @throws \UnexpectedValueException If the token is invalid, does not exist or is not unique
+     */
+    public function getCurrentUserId() {
+        if ($this->currentUserId !== null) {
+            return $this->currentUserId;
+        } else if (!$this->session->isLoggedIn()) {
+            return $this->getUserFromToken();
+        } else {
+            return $this->session->getUser()->getUID();
+        }
+    }
+
+    /**
+     * Get the user for the token
+     *
+     * @return string
+     * @throws \UnexpectedValueException If the token is invalid, does not exist or is not unique
+     */
+    protected function getUserFromToken() {
+        $token = (string) $this->request->getParam('token', '');
+        if (strlen($token) !== 30) {
+            throw new \UnexpectedValueException('The token is invalid');
+        }
+
+        $users = $this->config->getUsersForUserValue('activity', 'rsstoken', $token);
+
+        if (sizeof($users) !== 1) {
+            // No unique user found
+            throw new \UnexpectedValueException('The token is invalid');
+        }
+
+        // Token found login as that user
+        return array_shift($users);
+    }
 }

lib/private/Security/CSP/ContentSecurityPolicy.php

Indentation +167 added lines, -167 removed lines

@@ -29,172 +29,172 @@
  * @package OC\Security\CSP
  */
 class ContentSecurityPolicy extends \OCP\AppFramework\Http\ContentSecurityPolicy {
-	/**
-	 * @return boolean
-	 */
-	public function isInlineScriptAllowed() {
-		return $this->inlineScriptAllowed;
-	}
-
-	/**
-	 * @param boolean $inlineScriptAllowed
-	 */
-	public function setInlineScriptAllowed($inlineScriptAllowed) {
-		$this->inlineScriptAllowed = $inlineScriptAllowed;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public function isEvalScriptAllowed() {
-		return $this->evalScriptAllowed;
-	}
-
-	/**
-	 * @param boolean $evalScriptAllowed
-	 */
-	public function setEvalScriptAllowed($evalScriptAllowed) {
-		$this->evalScriptAllowed = $evalScriptAllowed;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedScriptDomains() {
-		return $this->allowedScriptDomains;
-	}
-
-	/**
-	 * @param array $allowedScriptDomains
-	 */
-	public function setAllowedScriptDomains($allowedScriptDomains) {
-		$this->allowedScriptDomains = $allowedScriptDomains;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public function isInlineStyleAllowed() {
-		return $this->inlineStyleAllowed;
-	}
-
-	/**
-	 * @param boolean $inlineStyleAllowed
-	 */
-	public function setInlineStyleAllowed($inlineStyleAllowed) {
-		$this->inlineStyleAllowed = $inlineStyleAllowed;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedStyleDomains() {
-		return $this->allowedStyleDomains;
-	}
-
-	/**
-	 * @param array $allowedStyleDomains
-	 */
-	public function setAllowedStyleDomains($allowedStyleDomains) {
-		$this->allowedStyleDomains = $allowedStyleDomains;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedImageDomains() {
-		return $this->allowedImageDomains;
-	}
-
-	/**
-	 * @param array $allowedImageDomains
-	 */
-	public function setAllowedImageDomains($allowedImageDomains) {
-		$this->allowedImageDomains = $allowedImageDomains;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedConnectDomains() {
-		return $this->allowedConnectDomains;
-	}
-
-	/**
-	 * @param array $allowedConnectDomains
-	 */
-	public function setAllowedConnectDomains($allowedConnectDomains) {
-		$this->allowedConnectDomains = $allowedConnectDomains;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedMediaDomains() {
-		return $this->allowedMediaDomains;
-	}
-
-	/**
-	 * @param array $allowedMediaDomains
-	 */
-	public function setAllowedMediaDomains($allowedMediaDomains) {
-		$this->allowedMediaDomains = $allowedMediaDomains;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedObjectDomains() {
-		return $this->allowedObjectDomains;
-	}
-
-	/**
-	 * @param array $allowedObjectDomains
-	 */
-	public function setAllowedObjectDomains($allowedObjectDomains) {
-		$this->allowedObjectDomains = $allowedObjectDomains;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedFrameDomains() {
-		return $this->allowedFrameDomains;
-	}
-
-	/**
-	 * @param array $allowedFrameDomains
-	 */
-	public function setAllowedFrameDomains($allowedFrameDomains) {
-		$this->allowedFrameDomains = $allowedFrameDomains;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedFontDomains() {
-		return $this->allowedFontDomains;
-	}
-
-	/**
-	 * @param array $allowedFontDomains
-	 */
-	public function setAllowedFontDomains($allowedFontDomains) {
-		$this->allowedFontDomains = $allowedFontDomains;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedChildSrcDomains() {
-		return $this->allowedChildSrcDomains;
-	}
-
-	/**
-	 * @param array $allowedChildSrcDomains
-	 */
-	public function setAllowedChildSrcDomains($allowedChildSrcDomains) {
-		$this->allowedChildSrcDomains = $allowedChildSrcDomains;
-	}
+    /**
+     * @return boolean
+     */
+    public function isInlineScriptAllowed() {
+        return $this->inlineScriptAllowed;
+    }
+
+    /**
+     * @param boolean $inlineScriptAllowed
+     */
+    public function setInlineScriptAllowed($inlineScriptAllowed) {
+        $this->inlineScriptAllowed = $inlineScriptAllowed;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function isEvalScriptAllowed() {
+        return $this->evalScriptAllowed;
+    }
+
+    /**
+     * @param boolean $evalScriptAllowed
+     */
+    public function setEvalScriptAllowed($evalScriptAllowed) {
+        $this->evalScriptAllowed = $evalScriptAllowed;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedScriptDomains() {
+        return $this->allowedScriptDomains;
+    }
+
+    /**
+     * @param array $allowedScriptDomains
+     */
+    public function setAllowedScriptDomains($allowedScriptDomains) {
+        $this->allowedScriptDomains = $allowedScriptDomains;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function isInlineStyleAllowed() {
+        return $this->inlineStyleAllowed;
+    }
+
+    /**
+     * @param boolean $inlineStyleAllowed
+     */
+    public function setInlineStyleAllowed($inlineStyleAllowed) {
+        $this->inlineStyleAllowed = $inlineStyleAllowed;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedStyleDomains() {
+        return $this->allowedStyleDomains;
+    }
+
+    /**
+     * @param array $allowedStyleDomains
+     */
+    public function setAllowedStyleDomains($allowedStyleDomains) {
+        $this->allowedStyleDomains = $allowedStyleDomains;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedImageDomains() {
+        return $this->allowedImageDomains;
+    }
+
+    /**
+     * @param array $allowedImageDomains
+     */
+    public function setAllowedImageDomains($allowedImageDomains) {
+        $this->allowedImageDomains = $allowedImageDomains;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedConnectDomains() {
+        return $this->allowedConnectDomains;
+    }
+
+    /**
+     * @param array $allowedConnectDomains
+     */
+    public function setAllowedConnectDomains($allowedConnectDomains) {
+        $this->allowedConnectDomains = $allowedConnectDomains;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedMediaDomains() {
+        return $this->allowedMediaDomains;
+    }
+
+    /**
+     * @param array $allowedMediaDomains
+     */
+    public function setAllowedMediaDomains($allowedMediaDomains) {
+        $this->allowedMediaDomains = $allowedMediaDomains;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedObjectDomains() {
+        return $this->allowedObjectDomains;
+    }
+
+    /**
+     * @param array $allowedObjectDomains
+     */
+    public function setAllowedObjectDomains($allowedObjectDomains) {
+        $this->allowedObjectDomains = $allowedObjectDomains;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedFrameDomains() {
+        return $this->allowedFrameDomains;
+    }
+
+    /**
+     * @param array $allowedFrameDomains
+     */
+    public function setAllowedFrameDomains($allowedFrameDomains) {
+        $this->allowedFrameDomains = $allowedFrameDomains;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedFontDomains() {
+        return $this->allowedFontDomains;
+    }
+
+    /**
+     * @param array $allowedFontDomains
+     */
+    public function setAllowedFontDomains($allowedFontDomains) {
+        $this->allowedFontDomains = $allowedFontDomains;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedChildSrcDomains() {
+        return $this->allowedChildSrcDomains;
+    }
+
+    /**
+     * @param array $allowedChildSrcDomains
+     */
+    public function setAllowedChildSrcDomains($allowedChildSrcDomains) {
+        $this->allowedChildSrcDomains = $allowedChildSrcDomains;
+    }
 
 }

lib/private/Security/CSP/ContentSecurityPolicyManager.php

Indentation +40 added lines, -40 removed lines

@@ -27,48 +27,48 @@
 use OCP\Security\IContentSecurityPolicyManager;
 
 class ContentSecurityPolicyManager implements IContentSecurityPolicyManager {
-	/** @var ContentSecurityPolicy[] */
-	private $policies = [];
+    /** @var ContentSecurityPolicy[] */
+    private $policies = [];
 
-	/** {@inheritdoc} */
-	public function addDefaultPolicy(EmptyContentSecurityPolicy $policy) {
-		$this->policies[] = $policy;
-	}
+    /** {@inheritdoc} */
+    public function addDefaultPolicy(EmptyContentSecurityPolicy $policy) {
+        $this->policies[] = $policy;
+    }
 
-	/**
-	 * Get the configured default policy. This is not in the public namespace
-	 * as it is only supposed to be used by core itself.
-	 *
-	 * @return ContentSecurityPolicy
-	 */
-	public function getDefaultPolicy() {
-		$defaultPolicy = new \OC\Security\CSP\ContentSecurityPolicy();
-		foreach($this->policies as $policy) {
-			$defaultPolicy = $this->mergePolicies($defaultPolicy, $policy);
-		}
-		return $defaultPolicy;
-	}
+    /**
+     * Get the configured default policy. This is not in the public namespace
+     * as it is only supposed to be used by core itself.
+     *
+     * @return ContentSecurityPolicy
+     */
+    public function getDefaultPolicy() {
+        $defaultPolicy = new \OC\Security\CSP\ContentSecurityPolicy();
+        foreach($this->policies as $policy) {
+            $defaultPolicy = $this->mergePolicies($defaultPolicy, $policy);
+        }
+        return $defaultPolicy;
+    }
 
-	/**
-	 * Merges the first given policy with the second one
-	 *
-	 * @param ContentSecurityPolicy $defaultPolicy
-	 * @param EmptyContentSecurityPolicy $originalPolicy
-	 * @return ContentSecurityPolicy
-	 */
-	public function mergePolicies(ContentSecurityPolicy $defaultPolicy,
-								  EmptyContentSecurityPolicy $originalPolicy) {
-		foreach((object)(array)$originalPolicy as $name => $value) {
-			$setter = 'set'.ucfirst($name);
-			if(is_array($value)) {
-				$getter = 'get'.ucfirst($name);
-				$currentValues = is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : [];
-				$defaultPolicy->$setter(array_values(array_unique(array_merge($currentValues, $value))));
-			} elseif (is_bool($value)) {
-				$defaultPolicy->$setter($value);
-			}
-		}
+    /**
+     * Merges the first given policy with the second one
+     *
+     * @param ContentSecurityPolicy $defaultPolicy
+     * @param EmptyContentSecurityPolicy $originalPolicy
+     * @return ContentSecurityPolicy
+     */
+    public function mergePolicies(ContentSecurityPolicy $defaultPolicy,
+                                    EmptyContentSecurityPolicy $originalPolicy) {
+        foreach((object)(array)$originalPolicy as $name => $value) {
+            $setter = 'set'.ucfirst($name);
+            if(is_array($value)) {
+                $getter = 'get'.ucfirst($name);
+                $currentValues = is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : [];
+                $defaultPolicy->$setter(array_values(array_unique(array_merge($currentValues, $value))));
+            } elseif (is_bool($value)) {
+                $defaultPolicy->$setter($value);
+            }
+        }
 
-		return $defaultPolicy;
-	}
+        return $defaultPolicy;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
 	 */
 	public function getDefaultPolicy() {
 		$defaultPolicy = new \OC\Security\CSP\ContentSecurityPolicy();
-		foreach($this->policies as $policy) {
+		foreach ($this->policies as $policy) {
 			$defaultPolicy = $this->mergePolicies($defaultPolicy, $policy);
 		}
 		return $defaultPolicy;
@@ -58,9 +58,9 @@ 
 	 */
 	public function mergePolicies(ContentSecurityPolicy $defaultPolicy,
 								  EmptyContentSecurityPolicy $originalPolicy) {
-		foreach((object)(array)$originalPolicy as $name => $value) {
+		foreach ((object) (array) $originalPolicy as $name => $value) {
 			$setter = 'set'.ucfirst($name);
-			if(is_array($value)) {
+			if (is_array($value)) {
 				$getter = 'get'.ucfirst($name);
 				$currentValues = is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : [];
 				$defaultPolicy->$setter(array_values(array_unique(array_merge($currentValues, $value))));

lib/private/Security/TrustedDomainHelper.php

Indentation +59 added lines, -59 removed lines

@@ -32,68 +32,68 @@
  * @package OC\Security
  */
 class TrustedDomainHelper {
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * Strips a potential port from a domain (in format domain:port)
-	 * @param string $host
-	 * @return string $host without appended port
-	 */
-	private function getDomainWithoutPort($host) {
-		$pos = strrpos($host, ':');
-		if ($pos !== false) {
-			$port = substr($host, $pos + 1);
-			if (is_numeric($port)) {
-				$host = substr($host, 0, $pos);
-			}
-		}
-		return $host;
-	}
+    /**
+     * Strips a potential port from a domain (in format domain:port)
+     * @param string $host
+     * @return string $host without appended port
+     */
+    private function getDomainWithoutPort($host) {
+        $pos = strrpos($host, ':');
+        if ($pos !== false) {
+            $port = substr($host, $pos + 1);
+            if (is_numeric($port)) {
+                $host = substr($host, 0, $pos);
+            }
+        }
+        return $host;
+    }
 
-	/**
-	 * Checks whether a domain is considered as trusted from the list
-	 * of trusted domains. If no trusted domains have been configured, returns
-	 * true.
-	 * This is used to prevent Host Header Poisoning.
-	 * @param string $domainWithPort
-	 * @return bool true if the given domain is trusted or if no trusted domains
-	 * have been configured
-	 */
-	public function isTrustedDomain($domainWithPort) {
-		$domain = $this->getDomainWithoutPort($domainWithPort);
+    /**
+     * Checks whether a domain is considered as trusted from the list
+     * of trusted domains. If no trusted domains have been configured, returns
+     * true.
+     * This is used to prevent Host Header Poisoning.
+     * @param string $domainWithPort
+     * @return bool true if the given domain is trusted or if no trusted domains
+     * have been configured
+     */
+    public function isTrustedDomain($domainWithPort) {
+        $domain = $this->getDomainWithoutPort($domainWithPort);
 
-		// Read trusted domains from config
-		$trustedList = $this->config->getSystemValue('trusted_domains', []);
-		if (!is_array($trustedList)) {
-			return false;
-		}
+        // Read trusted domains from config
+        $trustedList = $this->config->getSystemValue('trusted_domains', []);
+        if (!is_array($trustedList)) {
+            return false;
+        }
 
-		// Always allow access from localhost
-		if (preg_match(Request::REGEX_LOCALHOST, $domain) === 1) {
-			return true;
-		}
-		// Reject misformed domains in any case
-		if (strpos($domain,'-') === 0 || strpos($domain,'..') !== false) {
-			return false;
-		}
-		// Match, allowing for * wildcards
-		foreach ($trustedList as $trusted) {
-			if (gettype($trusted) !== 'string') {
-				break;
-			}
-			$regex = '/^' . join('[-\.a-zA-Z0-9]*', array_map(function($v) { return preg_quote($v, '/'); }, explode('*', $trusted))) . '$/';
-			if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
- 				return true;
- 			}
- 		}
- 		return false;
-	}
+        // Always allow access from localhost
+        if (preg_match(Request::REGEX_LOCALHOST, $domain) === 1) {
+            return true;
+        }
+        // Reject misformed domains in any case
+        if (strpos($domain,'-') === 0 || strpos($domain,'..') !== false) {
+            return false;
+        }
+        // Match, allowing for * wildcards
+        foreach ($trustedList as $trusted) {
+            if (gettype($trusted) !== 'string') {
+                break;
+            }
+            $regex = '/^' . join('[-\.a-zA-Z0-9]*', array_map(function($v) { return preg_quote($v, '/'); }, explode('*', $trusted))) . '$/';
+            if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
+                    return true;
+                }
+            }
+            return false;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 			return true;
 		}
 		// Reject misformed domains in any case
-		if (strpos($domain,'-') === 0 || strpos($domain,'..') !== false) {
+		if (strpos($domain, '-') === 0 || strpos($domain, '..') !== false) {
 			return false;
 		}
 		// Match, allowing for * wildcards
@@ -89,7 +89,7 @@ 
 			if (gettype($trusted) !== 'string') {
 				break;
 			}
-			$regex = '/^' . join('[-\.a-zA-Z0-9]*', array_map(function($v) { return preg_quote($v, '/'); }, explode('*', $trusted))) . '$/';
+			$regex = '/^'.join('[-\.a-zA-Z0-9]*', array_map(function($v) { return preg_quote($v, '/'); }, explode('*', $trusted))).'$/';
 			if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
  				return true;
  			}

lib/private/Security/Hasher.php

Indentation +111 added lines, -111 removed lines

@@ -46,116 +46,116 @@
  * @package OC\Security
  */
 class Hasher implements IHasher {
-	/** @var IConfig */
-	private $config;
-	/** @var array Options passed to password_hash and password_needs_rehash */
-	private $options = array();
-	/** @var string Salt used for legacy passwords */
-	private $legacySalt = null;
-	/** @var int Current version of the generated hash */
-	private $currentVersion = 1;
-
-	/**
-	 * @param IConfig $config
-	 */
-	function __construct(IConfig $config) {
-		$this->config = $config;
-
-		$hashingCost = $this->config->getSystemValue('hashingCost', null);
-		if(!is_null($hashingCost)) {
-			$this->options['cost'] = $hashingCost;
-		}
-	}
-
-	/**
-	 * Hashes a message using PHP's `password_hash` functionality.
-	 * Please note that the size of the returned string is not guaranteed
-	 * and can be up to 255 characters.
-	 *
-	 * @param string $message Message to generate hash from
-	 * @return string Hash of the message with appended version parameter
-	 */
-	public function hash($message) {
-		return $this->currentVersion . '|' . password_hash($message, PASSWORD_DEFAULT, $this->options);
-	}
-
-	/**
-	 * Get the version and hash from a prefixedHash
-	 * @param string $prefixedHash
-	 * @return null|array Null if the hash is not prefixed, otherwise array('version' => 1, 'hash' => 'foo')
-	 */
-	protected function splitHash($prefixedHash) {
-		$explodedString = explode('|', $prefixedHash, 2);
-		if(sizeof($explodedString) === 2) {
-			if((int)$explodedString[0] > 0) {
-				return array('version' => (int)$explodedString[0], 'hash' => $explodedString[1]);
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Verify legacy hashes
-	 * @param string $message Message to verify
-	 * @param string $hash Assumed hash of the message
-	 * @param null|string &$newHash Reference will contain the updated hash
-	 * @return bool Whether $hash is a valid hash of $message
-	 */
-	protected function legacyHashVerify($message, $hash, &$newHash = null) {
-		if(empty($this->legacySalt)) {
-			$this->legacySalt = $this->config->getSystemValue('passwordsalt', '');
-		}
-
-		// Verify whether it matches a legacy PHPass or SHA1 string
-		$hashLength = strlen($hash);
-		if($hashLength === 60 && password_verify($message.$this->legacySalt, $hash) ||
-			$hashLength === 40 && hash_equals($hash, sha1($message))) {
-			$newHash = $this->hash($message);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Verify V1 hashes
-	 * @param string $message Message to verify
-	 * @param string $hash Assumed hash of the message
-	 * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
-	 * @return bool Whether $hash is a valid hash of $message
-	 */
-	protected function verifyHashV1($message, $hash, &$newHash = null) {
-		if(password_verify($message, $hash)) {
-			if(password_needs_rehash($hash, PASSWORD_DEFAULT, $this->options)) {
-				$newHash = $this->hash($message);
-			}
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param string $message Message to verify
-	 * @param string $hash Assumed hash of the message
-	 * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
-	 * @return bool Whether $hash is a valid hash of $message
-	 */
-	public function verify($message, $hash, &$newHash = null) {
-		$splittedHash = $this->splitHash($hash);
-
-		if(isset($splittedHash['version'])) {
-			switch ($splittedHash['version']) {
-				case 1:
-					return $this->verifyHashV1($message, $splittedHash['hash'], $newHash);
-			}
-		} else {
-			return $this->legacyHashVerify($message, $hash, $newHash);
-		}
-
-
-		return false;
-	}
+    /** @var IConfig */
+    private $config;
+    /** @var array Options passed to password_hash and password_needs_rehash */
+    private $options = array();
+    /** @var string Salt used for legacy passwords */
+    private $legacySalt = null;
+    /** @var int Current version of the generated hash */
+    private $currentVersion = 1;
+
+    /**
+     * @param IConfig $config
+     */
+    function __construct(IConfig $config) {
+        $this->config = $config;
+
+        $hashingCost = $this->config->getSystemValue('hashingCost', null);
+        if(!is_null($hashingCost)) {
+            $this->options['cost'] = $hashingCost;
+        }
+    }
+
+    /**
+     * Hashes a message using PHP's `password_hash` functionality.
+     * Please note that the size of the returned string is not guaranteed
+     * and can be up to 255 characters.
+     *
+     * @param string $message Message to generate hash from
+     * @return string Hash of the message with appended version parameter
+     */
+    public function hash($message) {
+        return $this->currentVersion . '|' . password_hash($message, PASSWORD_DEFAULT, $this->options);
+    }
+
+    /**
+     * Get the version and hash from a prefixedHash
+     * @param string $prefixedHash
+     * @return null|array Null if the hash is not prefixed, otherwise array('version' => 1, 'hash' => 'foo')
+     */
+    protected function splitHash($prefixedHash) {
+        $explodedString = explode('|', $prefixedHash, 2);
+        if(sizeof($explodedString) === 2) {
+            if((int)$explodedString[0] > 0) {
+                return array('version' => (int)$explodedString[0], 'hash' => $explodedString[1]);
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Verify legacy hashes
+     * @param string $message Message to verify
+     * @param string $hash Assumed hash of the message
+     * @param null|string &$newHash Reference will contain the updated hash
+     * @return bool Whether $hash is a valid hash of $message
+     */
+    protected function legacyHashVerify($message, $hash, &$newHash = null) {
+        if(empty($this->legacySalt)) {
+            $this->legacySalt = $this->config->getSystemValue('passwordsalt', '');
+        }
+
+        // Verify whether it matches a legacy PHPass or SHA1 string
+        $hashLength = strlen($hash);
+        if($hashLength === 60 && password_verify($message.$this->legacySalt, $hash) ||
+            $hashLength === 40 && hash_equals($hash, sha1($message))) {
+            $newHash = $this->hash($message);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Verify V1 hashes
+     * @param string $message Message to verify
+     * @param string $hash Assumed hash of the message
+     * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
+     * @return bool Whether $hash is a valid hash of $message
+     */
+    protected function verifyHashV1($message, $hash, &$newHash = null) {
+        if(password_verify($message, $hash)) {
+            if(password_needs_rehash($hash, PASSWORD_DEFAULT, $this->options)) {
+                $newHash = $this->hash($message);
+            }
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $message Message to verify
+     * @param string $hash Assumed hash of the message
+     * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
+     * @return bool Whether $hash is a valid hash of $message
+     */
+    public function verify($message, $hash, &$newHash = null) {
+        $splittedHash = $this->splitHash($hash);
+
+        if(isset($splittedHash['version'])) {
+            switch ($splittedHash['version']) {
+                case 1:
+                    return $this->verifyHashV1($message, $splittedHash['hash'], $newHash);
+            }
+        } else {
+            return $this->legacyHashVerify($message, $hash, $newHash);
+        }
+
+
+        return false;
+    }
 
 }

Spacing +10 added lines, -10 removed lines

@@ -62,7 +62,7 @@ 
 		$this->config = $config;
 
 		$hashingCost = $this->config->getSystemValue('hashingCost', null);
-		if(!is_null($hashingCost)) {
+		if (!is_null($hashingCost)) {
 			$this->options['cost'] = $hashingCost;
 		}
 	}
@@ -76,7 +76,7 @@ 
 	 * @return string Hash of the message with appended version parameter
 	 */
 	public function hash($message) {
-		return $this->currentVersion . '|' . password_hash($message, PASSWORD_DEFAULT, $this->options);
+		return $this->currentVersion.'|'.password_hash($message, PASSWORD_DEFAULT, $this->options);
 	}
 
 	/**
@@ -86,9 +86,9 @@ 
 	 */
 	protected function splitHash($prefixedHash) {
 		$explodedString = explode('|', $prefixedHash, 2);
-		if(sizeof($explodedString) === 2) {
-			if((int)$explodedString[0] > 0) {
-				return array('version' => (int)$explodedString[0], 'hash' => $explodedString[1]);
+		if (sizeof($explodedString) === 2) {
+			if ((int) $explodedString[0] > 0) {
+				return array('version' => (int) $explodedString[0], 'hash' => $explodedString[1]);
 			}
 		}
 
@@ -103,13 +103,13 @@ 
 	 * @return bool Whether $hash is a valid hash of $message
 	 */
 	protected function legacyHashVerify($message, $hash, &$newHash = null) {
-		if(empty($this->legacySalt)) {
+		if (empty($this->legacySalt)) {
 			$this->legacySalt = $this->config->getSystemValue('passwordsalt', '');
 		}
 
 		// Verify whether it matches a legacy PHPass or SHA1 string
 		$hashLength = strlen($hash);
-		if($hashLength === 60 && password_verify($message.$this->legacySalt, $hash) ||
+		if ($hashLength === 60 && password_verify($message.$this->legacySalt, $hash) ||
 			$hashLength === 40 && hash_equals($hash, sha1($message))) {
 			$newHash = $this->hash($message);
 			return true;
@@ -126,8 +126,8 @@ 
 	 * @return bool Whether $hash is a valid hash of $message
 	 */
 	protected function verifyHashV1($message, $hash, &$newHash = null) {
-		if(password_verify($message, $hash)) {
-			if(password_needs_rehash($hash, PASSWORD_DEFAULT, $this->options)) {
+		if (password_verify($message, $hash)) {
+			if (password_needs_rehash($hash, PASSWORD_DEFAULT, $this->options)) {
 				$newHash = $this->hash($message);
 			}
 			return true;
@@ -145,7 +145,7 @@ 
 	public function verify($message, $hash, &$newHash = null) {
 		$splittedHash = $this->splitHash($hash);
 
-		if(isset($splittedHash['version'])) {
+		if (isset($splittedHash['version'])) {
 			switch ($splittedHash['version']) {
 				case 1:
 					return $this->verifyHashV1($message, $splittedHash['hash'], $newHash);