summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/lib/cryptstream.php
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files_encryption/lib/cryptstream.php')
-rw-r--r--apps/files_encryption/lib/cryptstream.php54
1 files changed, 27 insertions, 27 deletions
diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index 75ad62659d7..721a1b955df 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -36,18 +36,18 @@ class OC_CryptStream{
private $size;
private static $rootView;
- public function stream_open($path, $mode, $options, &$opened_path){
- if(!self::$rootView){
+ public function stream_open($path, $mode, $options, &$opened_path) {
+ if(!self::$rootView) {
self::$rootView=new OC_FilesystemView('');
}
$path=str_replace('crypt://','',$path);
- if(dirname($path)=='streams' and isset(self::$sourceStreams[basename($path)])){
+ if(dirname($path)=='streams' and isset(self::$sourceStreams[basename($path)])) {
$this->source=self::$sourceStreams[basename($path)]['stream'];
$this->path=self::$sourceStreams[basename($path)]['path'];
$this->size=self::$sourceStreams[basename($path)]['size'];
}else{
$this->path=$path;
- if($mode=='w' or $mode=='w+' or $mode=='wb' or $mode=='wb+'){
+ if($mode=='w' or $mode=='w+' or $mode=='wb' or $mode=='wb+') {
$this->size=0;
}else{
$this->size=self::$rootView->filesize($path,$mode);
@@ -55,55 +55,55 @@ class OC_CryptStream{
OC_FileProxy::$enabled=false;//disable fileproxies so we can open the source file
$this->source=self::$rootView->fopen($path,$mode);
OC_FileProxy::$enabled=true;
- if(!is_resource($this->source)){
+ if(!is_resource($this->source)) {
OCP\Util::writeLog('files_encryption','failed to open '.$path,OCP\Util::ERROR);
}
}
- if(is_resource($this->source)){
+ if(is_resource($this->source)) {
$this->meta=stream_get_meta_data($this->source);
}
return is_resource($this->source);
}
- public function stream_seek($offset, $whence=SEEK_SET){
+ public function stream_seek($offset, $whence=SEEK_SET) {
$this->flush();
fseek($this->source,$offset,$whence);
}
- public function stream_tell(){
+ public function stream_tell() {
return ftell($this->source);
}
- public function stream_read($count){
+ public function stream_read($count) {
//$count will always be 8192 https://bugs.php.net/bug.php?id=21641
//This makes this function a lot simpler but will breake everything the moment it's fixed
$this->writeCache='';
- if($count!=8192){
+ if($count!=8192) {
OCP\Util::writeLog('files_encryption','php bug 21641 no longer holds, decryption will not work',OCP\Util::FATAL);
die();
}
$pos=ftell($this->source);
$data=fread($this->source,8192);
- if(strlen($data)){
+ if(strlen($data)) {
$result=OC_Crypt::decrypt($data);
}else{
$result='';
}
$length=$this->size-$pos;
- if($length<8192){
+ if($length<8192) {
$result=substr($result,0,$length);
}
return $result;
}
- public function stream_write($data){
+ public function stream_write($data) {
$length=strlen($data);
$currentPos=ftell($this->source);
- if($this->writeCache){
+ if($this->writeCache) {
$data=$this->writeCache.$data;
$this->writeCache='';
}
- if($currentPos%8192!=0){
+ if($currentPos%8192!=0) {
//make sure we always start on a block start
fseek($this->source,-($currentPos%8192),SEEK_CUR);
$encryptedBlock=fread($this->source,8192);
@@ -113,8 +113,8 @@ class OC_CryptStream{
fseek($this->source,-($currentPos%8192),SEEK_CUR);
}
$currentPos=ftell($this->source);
- while($remainingLength=strlen($data)>0){
- if($remainingLength<8192){
+ while($remainingLength=strlen($data)>0) {
+ if($remainingLength<8192) {
$this->writeCache=$data;
$data='';
}else{
@@ -127,8 +127,8 @@ class OC_CryptStream{
return $length;
}
- public function stream_set_option($option,$arg1,$arg2){
- switch($option){
+ public function stream_set_option($option,$arg1,$arg2) {
+ switch($option) {
case STREAM_OPTION_BLOCKING:
stream_set_blocking($this->source,$arg1);
break;
@@ -140,33 +140,33 @@ class OC_CryptStream{
}
}
- public function stream_stat(){
+ public function stream_stat() {
return fstat($this->source);
}
- public function stream_lock($mode){
+ public function stream_lock($mode) {
flock($this->source,$mode);
}
- public function stream_flush(){
+ public function stream_flush() {
return fflush($this->source);
}
- public function stream_eof(){
+ public function stream_eof() {
return feof($this->source);
}
- private function flush(){
- if($this->writeCache){
+ private function flush() {
+ if($this->writeCache) {
$encrypted=OC_Crypt::encrypt($this->writeCache);
fwrite($this->source,$encrypted);
$this->writeCache='';
}
}
- public function stream_close(){
+ public function stream_close() {
$this->flush();
- if($this->meta['mode']!='r' and $this->meta['mode']!='rb'){
+ if($this->meta['mode']!='r' and $this->meta['mode']!='rb') {
OC_FileCache::put($this->path,array('encrypted'=>true,'size'=>$this->size),'');
}
return fclose($this->source);