mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed todos: undefined vars and unreachable code

This commit is contained in:
Sam Tuke 2013-02-05 13:12:34 +00:00
parent 8ded07dd5c
commit 927d4c98a1
3 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/files_encryption/lib/crypt.php
View File

@ -615,24 +615,6 @@ class Crypt {
}
public static function changekeypasscode($oldPassword, $newPassword) {
//
// TODO: UNDEFINED VARIABLES: $user, $view
//
if(\OCP\User::isLoggedIn()){
$key = Keymanager::getPrivateKey( $user, $view );
if ( ($key = Crypt::symmetricDecryptFileContent($key,$oldPassword)) ) {
if ( ($key = Crypt::symmetricEncryptFileContent($key, $newPassword)) ) {
Keymanager::setPrivateKey($key);
return true;
}
}
}
return false;
}
/**
* @brief Get the blowfish encryption handeler for a key
* @param $key string (optional)

25
apps/files_encryption/lib/keymanager.php
View File

@ -85,15 +85,11 @@ class Keymanager {
* @note Checks that the sharing app is enabled should be performed
* by client code, that isn't checked here
*/
public static function getPublicKeys( \OC_FilesystemView $view, $userId, $filePath ) {
public static function getPublicKeys( \OC_FilesystemView $view, $userId, $path ) {
//
// TODO: UNDEFINED VARIABLE: $path
//
$trimmed = ltrim( $path, '/' );
$path = ltrim( $path, '/' );
$filepath = '/' . $userId . '/files/' . $filePath;
$filepath = '/' . $userId . '/files/' . $trimmed;
// Check if sharing is enabled
if ( OC_App::isEnabled( 'files_sharing' ) ) {
@ -242,13 +238,11 @@ class Keymanager {
if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
return $view->file_put_contents( $user . '.private.key', $key );
//
// TODO: UNREACHABLE CODE
//
$result = $view->file_put_contents( $user . '.private.key', $key );
\OC_FileProxy::$enabled = true;
return $result;
}
@ -279,12 +273,11 @@ class Keymanager {
if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
return $view->file_put_contents( \OCP\User::getUser() . '.public.key', $key );
$result = $view->file_put_contents( \OCP\User::getUser() . '.public.key', $key );
//
// TODO: UNREACHED CODE !!!
//
\OC_FileProxy::$enabled = true;
return $result;
}

24
apps/files_encryption/lib/util.php
View File

@ -289,6 +289,30 @@ class Util {
}
public static function changekeypasscode( $oldPassword, $newPassword ) {
if( \OCP\User::isLoggedIn() ) {
$key = Keymanager::getPrivateKey( $this->userId, $this->view );
if ( ( $key = Crypt::symmetricDecryptFileContent( $key, $oldPassword ) ) ) {
if ( ( $key = Crypt::symmetricEncryptFileContent( $key, $newPassword )) ) {
Keymanager::setPrivateKey( $key );
return true;
}
}
}
return false;
}
public function getPath( $pathName ) {
switch ( $pathName ) {