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

change private key passphrase; disable file proxy for keymanager operations

This commit is contained in:
Bjoern Schiessle 2012-08-09 15:45:34 +02:00
parent a969c23e59
commit bd7d566733
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,10 +36,15 @@ class Keymanager {
*/
public static function getPrivateKey() {
\OC_FileProxy::$enabled = false;
$user = \OCP\User::getUser();
$view = new \OC_FilesystemView( '/' . $user . '/' . 'files_encryption' );
$result = $view->file_get_contents( '/' . $user.'.private.key' );
return $view->file_get_contents( '/' . $user.'.private.key' );
\OC_FileProxy::$enabled = true;
return $result;
}
/**
@ -75,6 +80,8 @@ class Keymanager {
}
}
\OC_FileProxy::$enabled = false;
$view = new \OC_FilesystemView( '/public-keys/' );
$keylist = array();
@ -83,6 +90,8 @@ class Keymanager {
$keylist['key'.++$count] = $view->file_get_contents($user.'.public.key');
}
\OC_FileProxy::$enabled = true;
return $keylist;
}
@ -108,8 +117,14 @@ class Keymanager {
$keypath = str_replace('/'.$user.'/files/', '', $keypath);
}
\OC_FileProxy::$enabled = false;
$view = new \OC_FilesystemView('/'.$user.'/files_encryption/keyfiles/');
return $view->file_get_contents($keypath.'.key');
$result = $view->file_get_contents($keypath.'.key');
\OC_FileProxy::$enabled = true;
return $result;
}
/**
@ -208,11 +223,16 @@ class Keymanager {
*/
public static function changePasswd($oldpasswd, $newpasswd) {
if ( \OCP\User::checkPassword(\OCP\User::getUser(), $newpasswd) ) {
return Crypt::changekeypasscode($oldpasswd, $newpasswd);
} else {
$key = Keymanager::getPrivateKey();
if ( ($key = Crypt::symmetricDecryptFileContent($key,$oldpasswd)) ) {
if ( ($key = Crypt::symmetricEncryptFileContent($key, $newpasswd)) ) {
Keymanager::setPrivateKey($key);
return true;
}
}
}
return false;
}
}
}