cache the home folder of a User

This commit is contained in:
Robin Appelman 2013-12-11 16:22:26 +01:00
parent 050f87c9e4
commit 366d75e947
2 changed files with 73 additions and 67 deletions

View File

@ -42,13 +42,13 @@ class OC_User_Database extends OC_User_Backend {
/** /**
* @var PasswordHash * @var PasswordHash
*/ */
static private $hasher=null; static private $hasher = null;
private function getHasher() { private function getHasher() {
if(!self::$hasher) { if (!self::$hasher) {
//we don't want to use DES based crypt(), since it doesn't return a hash with a recognisable prefix //we don't want to use DES based crypt(), since it doesn't return a hash with a recognisable prefix
$forcePortable=(CRYPT_BLOWFISH!=1); $forcePortable = (CRYPT_BLOWFISH != 1);
self::$hasher=new PasswordHash(8, $forcePortable); self::$hasher = new PasswordHash(8, $forcePortable);
} }
return self::$hasher; return self::$hasher;
@ -63,14 +63,14 @@ class OC_User_Database extends OC_User_Backend {
* Creates a new user. Basic checking of username is done in OC_User * Creates a new user. Basic checking of username is done in OC_User
* itself, not in its subclasses. * itself, not in its subclasses.
*/ */
public function createUser( $uid, $password ) { public function createUser($uid, $password) {
if( $this->userExists($uid) ) { if ($this->userExists($uid)) {
return false; return false;
}else{ } else {
$hasher=$this->getHasher(); $hasher = $this->getHasher();
$hash = $hasher->HashPassword($password.OC_Config::getValue('passwordsalt', '')); $hash = $hasher->HashPassword($password . OC_Config::getValue('passwordsalt', ''));
$query = OC_DB::prepare( 'INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )' ); $query = OC_DB::prepare('INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )');
$result = $query->execute( array( $uid, $hash)); $result = $query->execute(array($uid, $hash));
return $result ? true : false; return $result ? true : false;
} }
@ -83,10 +83,10 @@ class OC_User_Database extends OC_User_Backend {
* *
* Deletes a user * Deletes a user
*/ */
public function deleteUser( $uid ) { public function deleteUser($uid) {
// Delete user-group-relation // Delete user-group-relation
$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*users` WHERE `uid` = ?' ); $query = OC_DB::prepare('DELETE FROM `*PREFIX*users` WHERE `uid` = ?');
$query->execute( array( $uid )); $query->execute(array($uid));
return true; return true;
} }
@ -98,15 +98,15 @@ class OC_User_Database extends OC_User_Backend {
* *
* Change the password of a user * Change the password of a user
*/ */
public function setPassword( $uid, $password ) { public function setPassword($uid, $password) {
if( $this->userExists($uid) ) { if ($this->userExists($uid)) {
$hasher=$this->getHasher(); $hasher = $this->getHasher();
$hash = $hasher->HashPassword($password.OC_Config::getValue('passwordsalt', '')); $hash = $hasher->HashPassword($password . OC_Config::getValue('passwordsalt', ''));
$query = OC_DB::prepare( 'UPDATE `*PREFIX*users` SET `password` = ? WHERE `uid` = ?' ); $query = OC_DB::prepare('UPDATE `*PREFIX*users` SET `password` = ? WHERE `uid` = ?');
$query->execute( array( $hash, $uid )); $query->execute(array($hash, $uid));
return true; return true;
}else{ } else {
return false; return false;
} }
} }
@ -119,12 +119,12 @@ class OC_User_Database extends OC_User_Backend {
* *
* Change the display name of a user * Change the display name of a user
*/ */
public function setDisplayName( $uid, $displayName ) { public function setDisplayName($uid, $displayName) {
if( $this->userExists($uid) ) { if ($this->userExists($uid)) {
$query = OC_DB::prepare( 'UPDATE `*PREFIX*users` SET `displayname` = ? WHERE `uid` = ?' ); $query = OC_DB::prepare('UPDATE `*PREFIX*users` SET `displayname` = ? WHERE LOWER(`uid`) = ?');
$query->execute( array( $displayName, $uid )); $query->execute(array($displayName, $uid));
return true; return true;
}else{ } else {
return false; return false;
} }
} }
@ -132,18 +132,16 @@ class OC_User_Database extends OC_User_Backend {
/** /**
* @brief get display name of the user * @brief get display name of the user
* @param $uid user ID of the user * @param $uid user ID of the user
* @return display name * @return string display name
*/ */
public function getDisplayName($uid) { public function getDisplayName($uid) {
if( $this->userExists($uid) ) { $query = OC_DB::prepare('SELECT `displayname` FROM `*PREFIX*users` WHERE `uid` = ?');
$query = OC_DB::prepare( 'SELECT `displayname` FROM `*PREFIX*users` WHERE `uid` = ?' ); $result = $query->execute(array($uid))->fetchAll();
$result = $query->execute( array( $uid ))->fetchAll(); $displayName = trim($result[0]['displayname'], ' ');
$displayName = trim($result[0]['displayname'], ' '); if (!empty($displayName)) {
if ( !empty($displayName) ) { return $displayName;
return $displayName; } else {
} else { return $uid;
return $uid;
}
} }
} }
@ -156,9 +154,9 @@ class OC_User_Database extends OC_User_Backend {
public function getDisplayNames($search = '', $limit = null, $offset = null) { public function getDisplayNames($search = '', $limit = null, $offset = null) {
$displayNames = array(); $displayNames = array();
$query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users`' $query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users`'
.' WHERE LOWER(`displayname`) LIKE LOWER(?) OR ' . ' WHERE LOWER(`displayname`) LIKE LOWER(?) OR '
.'LOWER(`uid`) LIKE LOWER(?)', $limit, $offset); . 'LOWER(`uid`) LIKE LOWER(?)', $limit, $offset);
$result = $query->execute(array($search.'%', $search.'%')); $result = $query->execute(array($search . '%', $search . '%'));
$users = array(); $users = array();
while ($row = $result->fetchRow()) { while ($row = $result->fetchRow()) {
$displayNames[$row['uid']] = $row['displayname']; $displayNames[$row['uid']] = $row['displayname'];
@ -176,30 +174,30 @@ class OC_User_Database extends OC_User_Backend {
* Check if the password is correct without logging in the user * Check if the password is correct without logging in the user
* returns the user id or false * returns the user id or false
*/ */
public function checkPassword( $uid, $password ) { public function checkPassword($uid, $password) {
$query = OC_DB::prepare( 'SELECT `uid`, `password` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)' ); $query = OC_DB::prepare('SELECT `uid`, `password` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)');
$result = $query->execute( array( $uid)); $result = $query->execute(array($uid));
$row=$result->fetchRow(); $row = $result->fetchRow();
if($row) { if ($row) {
$storedHash=$row['password']; $storedHash = $row['password'];
if ($storedHash[0]=='$') {//the new phpass based hashing if ($storedHash[0] == '$') { //the new phpass based hashing
$hasher=$this->getHasher(); $hasher = $this->getHasher();
if($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $storedHash)) { if ($hasher->CheckPassword($password . OC_Config::getValue('passwordsalt', ''), $storedHash)) {
return $row['uid']; return $row['uid'];
}else{ } else {
return false; return false;
} }
}else{//old sha1 based hashing } else { //old sha1 based hashing
if(sha1($password)==$storedHash) { if (sha1($password) == $storedHash) {
//upgrade to new hashing //upgrade to new hashing
$this->setPassword($row['uid'], $password); $this->setPassword($row['uid'], $password);
return $row['uid']; return $row['uid'];
}else{ } else {
return false; return false;
} }
} }
}else{ } else {
return false; return false;
} }
} }
@ -212,7 +210,7 @@ class OC_User_Database extends OC_User_Backend {
*/ */
public function getUsers($search = '', $limit = null, $offset = null) { public function getUsers($search = '', $limit = null, $offset = null) {
$query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?)', $limit, $offset); $query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?)', $limit, $offset);
$result = $query->execute(array($search.'%')); $result = $query->execute(array($search . '%'));
$users = array(); $users = array();
while ($row = $result->fetchRow()) { while ($row = $result->fetchRow()) {
$users[] = $row['uid']; $users[] = $row['uid'];
@ -226,8 +224,8 @@ class OC_User_Database extends OC_User_Backend {
* @return boolean * @return boolean
*/ */
public function userExists($uid) { public function userExists($uid) {
$query = OC_DB::prepare( 'SELECT COUNT(*) FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)' ); $query = OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)');
$result = $query->execute( array( $uid )); $result = $query->execute(array($uid));
if (OC_DB::isError($result)) { if (OC_DB::isError($result)) {
OC_Log::write('core', OC_DB::getErrorMessage($result), OC_Log::ERROR); OC_Log::write('core', OC_DB::getErrorMessage($result), OC_Log::ERROR);
return false; return false;
@ -236,14 +234,14 @@ class OC_User_Database extends OC_User_Backend {
} }
/** /**
* @brief get the user's home directory * @brief get the user's home directory
* @param string $uid the username * @param string $uid the username
* @return boolean * @return boolean
*/ */
public function getHome($uid) { public function getHome($uid) {
if($this->userExists($uid)) { if ($this->userExists($uid)) {
return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid; return OC_Config::getValue("datadirectory", OC::$SERVERROOT . "/data") . '/' . $uid;
}else{ } else {
return false; return false;
} }
} }

View File

@ -37,6 +37,11 @@ class User {
*/ */
private $emitter; private $emitter;
/**
* @var string $home
*/
private $home;
/** /**
* @param string $uid * @param string $uid
* @param \OC_User_Backend $backend * @param \OC_User_Backend $backend
@ -133,10 +138,13 @@ class User {
* @return string * @return string
*/ */
public function getHome() { public function getHome() {
if ($this->backend->implementsActions(\OC_USER_BACKEND_GET_HOME) and $home = $this->backend->getHome($this->uid)) { if (!$this->home) {
return $home; if ($this->backend->implementsActions(\OC_USER_BACKEND_GET_HOME) and $home = $this->backend->getHome($this->uid)) {
$this->home = $home;
}
$this->home = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data") . '/' . $this->uid; //TODO switch to Config object once implemented
} }
return \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data") . '/' . $this->uid; //TODO switch to Config object once implemented return $this->home;
} }
/** /**
@ -145,7 +153,7 @@ class User {
* @return bool * @return bool
*/ */
public function canChangeAvatar() { public function canChangeAvatar() {
if($this->backend->implementsActions(\OC_USER_BACKEND_PROVIDE_AVATAR)) { if ($this->backend->implementsActions(\OC_USER_BACKEND_PROVIDE_AVATAR)) {
return $this->backend->canChangeAvatar($this->uid); return $this->backend->canChangeAvatar($this->uid);
} }
return true; return true;