upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-21 22:27:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

write keyfiles to server

Browse source
This commit is contained in:
Bjoern Schiessle 2012-07-27 14:00:41 +02:00
parent 931c4695a6
commit f752a27605
3 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files_encryption/lib/keymanager.php
View file

@ -118,7 +118,7 @@ class Keymanager {
\OC_FileProxy::$enabled = false;
$view = new \OC_FilesystemView( '/' . $userId . '/' . 'files_encryption' );
$view = new \OC_FilesystemView( '/' . $userId . '/' . 'files_encryption/keyfiles' );
$path_parts = pathinfo($path);
if (!$view->file_exists($path_parts['dirname'])) $view->mkdir($path_parts['dirname']);
$result = $view->file_put_contents( '/' . $path . '.key', $key );

2
lib/filestorage/local.php
View file

@ -12,7 +12,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
}
}
public function mkdir($path){
return @mkdir($this->datadir.$path);
return @mkdir($this->datadir.$path, 0755, true);
}
public function rmdir($path){
return @rmdir($this->datadir.$path);

42
lib/ocs.php
View file

@ -183,11 +183,24 @@ class OC_OCS {
}elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'privatekey')){
$user=$ex[$paracount-3];
OC_OCS::privateKeyGet($format,$user);
//keysetprivate
}elseif(($method=='post') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'privatekey')){
$user=$ex[$paracount-3];
$key = self::readData('post', 'key', 'string');
OC_OCS::privateKeySet($format,$user, $key);
// keygetfiles
}elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'filekey')){
$user=$ex[$paracount-3];
OC_OCS::fileKeyGet($format,$user);
//keysetfiles
}elseif(($method=='post') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'filekey')){
$user=$ex[$paracount-3];
$key = self::readData('post', 'key', 'string');
$file = self::readData('post', 'file', 'string');
OC_OCS::fileKeySet($format,$user, $file, $key);
// add more calls here
// please document all the call in the draft spec
@ -766,7 +779,7 @@ class OC_OCS {
$login=OC_OCS::checkpassword();
if(OC_Group::inGroup($login, 'admin') or ($login==$user)) {
if(OC_User::userExists($user)){
//TODO: GET file key
//TODO: GET file key, check needed if it is a shared file or not
$xml=array();
$xml['key']="this is the key for $file";
$txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'cloud', '', 1, 0, 0);
@ -787,18 +800,25 @@ class OC_OCS {
* @param string $key
* @return string xml/json
*/
private static function fileKeySet($format, $user, $file, $key) {
private static function fileKeySet($format, $user, $file, $key) {
$login=OC_OCS::checkpassword();
if($login == $user) {
if(OC_User::userExists($user)){
//TODO: SET file key
echo self::generateXml('', 'ok', 100, 'File key uploaded');
}else{
echo self::generateXml('', 'fail', 300, 'User does not exist');
if(($login==$user)) {
if(OC_App::isEnabled('files_encryption') && OCA_Encryption\Crypt::mode($user) === 'client') {
if (($key = OCA_Encryption\Keymanager::setFileKey($user, $file, $key))) {
// TODO: emit hook to move file from tmp location to the right place
echo self::generateXml('', 'ok', 100, '');
return true;
} else {
echo self::generateXml('', 'fail', 404, 'could not write key file');
}
} else {
echo self::generateXml('', 'fail', 300, 'Client side encryption not enabled for user ' . $user);
}
}else{
echo self::generateXml('', 'fail', 300, 'You don´t have permission to access this ressource.');
}
}
}
//TODO: emit signal to remove file from tmp location
return false;
}
}