Merge remote-tracking branch 'origin/develop' into develop

Author: cdujeu

core/src/core/src/pydio/Core/Http/Dav/AuthBackendBasic.php

@@ -131,7 +131,6 @@ public function authenticate(Sabre\DAV\Server $server, $realm)
             //AJXP_Logger::debug("Using Cached Password");
         }
 
-
         if (!$cachedPasswordValid && (!$this->validateUserPass($userpass[0],$userpass[1]))) {
             Logger::warning(__CLASS__, "Login failed", array("user" => $userpass[0], "error" => "Invalid WebDAV user or password"));
             $auth->requireLogin();

core/src/core/src/pydio/Core/Http/Wopi/AuthFrontend.php

@@ -27,6 +27,7 @@
 use Pydio\Core\Services\ApiKeysService;
 use Pydio\Auth\Frontend\Core\AbstractAuthFrontend;
 use Pydio\Conf\Sql\SqlConfDriver;
+use Pydio\Log\Core\Logger;
 use Zend\Diactoros\UploadedFile;
 
 defined('AJXP_EXEC') or die('Access not allowed');
@@ -85,9 +86,11 @@ function retrieveParams(ServerRequestInterface &$request, ResponseInterface &$re
         if ($action == "upload") {
             $stream = $request->getBody();
 
+            $size = (int)$request->getHeader("Content-Length")[0];
+
             $uploadedFile = new UploadedFile(
                 $stream,
-                (int)$request->getHeader("content-length"),
+                $size,
                 0,
                 basename($path)
             );

core/src/plugins/access.fs/FsAccessDriver.php

@@ -485,10 +485,10 @@ public function uploadAction(ServerRequestInterface &$request, ResponseInterface
             }
 
             // PARTIAL UPLOAD CASE - PREPPEND .dlpart extension
-            if(isSet($httpVars["partial_upload"]) && $httpVars["partial_upload"] == 'true' && isSet($httpVars["partial_target_bytesize"])){
+            if(isSet($httpVars["partial_upload"]) && $httpVars["partial_upload"] == 'true' && isSet($httpVars["partial_target_bytesize"])) {
                 $partialUpload = true;
                 $partialTargetSize = intval($httpVars["partial_target_bytesize"]);
-                if(!isSet($httpVars["appendto_urlencoded_part"])){
+                if(!isSet($httpVars["appendto_urlencoded_part"])) {
                     $userfile_name .= ".dlpart";
                     $targetUrl = $destination."/".$userfile_name;
                 }

core/src/plugins/authfront.cas/CasAuthFrontend.php

@@ -349,6 +349,10 @@ function loadConfig()
         if (!empty($this->pluginConf["PHPCAS_MODE"]["casmode"])) {
             $this->cas_mode = $this->pluginConf["PHPCAS_MODE"]["casmode"];
         }
+        else{
+            $this->cas_mode = PHPCAS_MODE_CLIENT;
+        }
+        
         if (!empty($this->pluginConf["CERTIFICATE_PATH"])) {
             $this->cas_certificate_path = trim($this->pluginConf["CERTIFICATE_PATH"]);
         }

core/src/plugins/core.access/src/Stream/StreamWrapper.php

@@ -70,10 +70,6 @@ public static function register($protocol) {
     public function stream_open($path, $mode, $options, &$opened_path) {
         $this->stream = self::createStream($path, $mode);
 
-        if ($this->stream->isWritable() && !$this->stream->isReadable()) {
-            $a = 1;
-        }
-
         return true;
     }
 
@@ -341,7 +337,7 @@ public static function getResolvedOptionsForNode($node)
      */
     public function stream_flush()
     {
-        // TODO: Implement stream_flush() method.
+        //$this->stream->flush();
     }
 
     /**

core/src/plugins/core.access/src/Stream/WriteBufferStream.php

@@ -56,7 +56,6 @@ public function getContents() {
     }
 
     public function close() {
-        //$this->bufferStream->close();
         if ($this->size > 0) {
             $this->stream->write($this->bufferStream);
         }

core/src/plugins/core.ocs/src/Server/Dav/AuthSharingBackend.php

@@ -68,17 +68,17 @@ public function __construct(ContextInterface $context){
      *
      * @param string $username
      * @param string $password
-     * @return bool
+     * @return mixed AJXP_User|bool
      */
     protected function validateUserPass($username, $password)
     {
         try{
             if(isSet($this->shareData["PRESET_LOGIN"])){
-                AuthService::logUser($this->shareData["PRESET_LOGIN"], $password, false, false);
+                $user = AuthService::logUser($this->shareData["PRESET_LOGIN"], $password, false, false);
             }else{
-                AuthService::logUser($this->shareData["PRELOG_USER"], "", true);
+                $user = AuthService::logUser($this->shareData["PRELOG_USER"], "", true);
             }
-            return true;
+            return $user;
         }catch (LoginException $l){
             return false;
         }
@@ -119,7 +119,9 @@ public function authenticate(DAV\Server $server, $realm) {
             $auth->requireLogin();
             throw new DAV\Exception\NotAuthenticated('Username or password does not match');
         }
-        if (!$this->validateUserPass($userpass[0],$userpass[1])) {
+
+        $user = $this->validateUserPass($userpass[0],$userpass[1]);
+        if (!$user) {
             $auth->requireLogin();
             throw new DAV\Exception\NotAuthenticated('Username or password does not match');
         }
@@ -136,7 +138,7 @@ public function authenticate(DAV\Server $server, $realm) {
         }
 
         $this->currentUser = $userpass[0];
-        $this->context->setUserId($this->currentUser);
+        $this->context->setUserObject($user);
 
         Logger::updateContext($this->context);
         TextEncoder::updateContext($this->context);