Owncloud 10.2.1 incompatibility

Jenkinsfile

@@ -0,0 +1,36 @@
+pipeline {
+    agent {
+        node {
+            label 'nodejs-agent-v1'
+        }
+    }
+    options {
+        buildDiscarder(logRotator(numToKeepStr: '50'))
+    }
+    stages {
+        stage('Node version') {
+            steps {
+                sh '. /usr/bin/load_nvm && nvm use 6'
+            }
+        }
+        stage('Make') {
+            steps {
+                sh '. /usr/bin/load_nvm && make clean all'
+                archiveArtifacts artifacts: "dist/zimbra_drive.tgz", fingerprint: true
+                archiveArtifacts artifacts: "dist/zimbradrive.tar.gz", fingerprint: true
+                archiveArtifacts artifacts: "dist/zimbra_drive.md5", fingerprint: true
+            }
+        }
+    }
+    post {
+        always {
+            script {
+                GIT_COMMIT_EMAIL = sh (
+                    script: 'git --no-pager show -s --format=\'%ae\'',
+                    returnStdout: true
+                ).trim()
+            }
+            emailext attachLog: true, body: '$DEFAULT_CONTENT', recipientProviders: [requestor()], subject: '$DEFAULT_SUBJECT',  to: "${GIT_COMMIT_EMAIL}"
+        }
+    }
+}

README.md

@@ -1,6 +1,13 @@
-Zimbra Drive
+Open Drive
 ============
 
+Open Drive is not not a fully fledged Zextras product under active support and development, but a contribution provided to the Zimbra Community "as is". 
+
+Anyone is free to download it and to clone the repository to apply any change complying with the project's licensing but there is no official commitment on updates, on the inclusion of features and/or the approval of pull requests. 
+
+---
+
+
 Zimbra and Nextcloud / ownCloud integration.
 
 Features:
@@ -10,7 +17,7 @@ Features:
 - Attach Nextcloud / ownCloud files to email.
 
 Supported Versions:
-- Nextcloud: 9, 10, 11, 12
+- Nextcloud: 9, 10, 11, 12, 13
 - ownCloud: 9, 9.1, 10
 
 ## Install
@@ -123,3 +130,6 @@ mysql -u root --password="${mysql_pwd}" "${occ_db}" -N -s \
             -e "DELETE FROM oc_accounts WHERE uid = '${uid}' LIMIT 1"; \
       done
 ```
+
+## Issues
+Zimbra Drive is an official Zimbra product - support is provided through the official Zimbra channels to both Open Source and Network Edition customers.

nextcloud-app/appinfo/info.xml

@@ -28,7 +28,7 @@
     </description>
     <licence>AGPL</licence>
     <author>ZeXtras</author>
-    <version>0.8.18</version>
+    <version>0.8.23</version>
     <namespace>ZimbraDrive</namespace>
     <category>auth</category>
     <category>integration</category>
@@ -42,7 +42,7 @@
 
     <dependencies>
         <owncloud min-version="9.0" max-version="10.0"/>
-        <nextcloud min-version="9" max-version="13"/>
+        <nextcloud min-version="9" max-version="15"/>
     </dependencies>
     <types>
         <authentication/>

nextcloud-app/appinfo/routes.php

@@ -29,8 +29,8 @@
 return [
     'routes' => [
         ['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
-        ['name' => 'zimbra_drive_api#searchRequest', 'url' => '/api/1.0/SearchRequest', 'verb' => 'POST'],
-        ['name' => 'zimbra_drive_api#getAllFolders', 'url' => '/api/1.0/GetAllFolders', 'verb' => 'POST'],
+        ['name' => 'zimbra_drive_api#searchRequestShareItemFiltered', 'url' => '/api/1.0/SearchRequest', 'verb' => 'POST'],
+        ['name' => 'zimbra_drive_api#getAllFoldersShareItemFiltered', 'url' => '/api/1.0/GetAllFolders', 'verb' => 'POST'],
         ['name' => 'zimbra_drive_api#getFile', 'url' => '/api/1.0/GetFile', 'verb' => 'POST'],
         ['name' => 'zimbra_drive_api#uploadFile', 'url' => '/api/1.0/UploadFile', 'verb' => 'POST'],
         ['name' => 'zimbra_drive_api#delete', 'url' => '/api/1.0/Delete', 'verb' => 'POST'],
@@ -41,5 +41,9 @@
         ['name' => 'admin_api#disableZimbraAuthentication', 'url' => '/admin/DisableZimbraAuthentication', 'verb' => 'POST'],
         ['name' => 'test#all', 'url' => '/test/All', 'verb' => 'GET'],
         ['name' => 'test#connectivityTest', 'url' => '/test/ConnectivityTest', 'verb' => 'GET'],
+
+        ['name' => 'zimbra_drive_api#getVersion', 'url' => '/api/2.0/GetVersion', 'verb' => 'POST'],
+        ['name' => 'zimbra_drive_api#searchRequest', 'url' => '/api/2.0/SearchRequest', 'verb' => 'POST'],
+        ['name' => 'zimbra_drive_api#getAllFolders', 'url' => '/api/2.0/GetAllFolders', 'verb' => 'POST'],
     ]
 ];

nextcloud-app/js/admin.js

@@ -87,6 +87,10 @@ var documentsSettings = {
         documentsSettings.setValue('allow_zimbra_users_login', isEnabled);
     },
 
+    setZimbraGroupToUsers: function (isEnabled) {
+        documentsSettings.setValue('set_zimbra_group', isEnabled);
+    },
+
     initialize: function () {
         setEnableZimbrasUsersUpdateHandler();
         setAllowZimbrasUsersLoginUpdateHandler();
@@ -95,6 +99,7 @@ var documentsSettings = {
         setZimbraUrlChangeHandler();
         setZimbraPortChangeHandler();
         setPreAuthKeyChangeHandler();
+        setZimbraGroupToUsersUpdateHandler();
 
 
         function setEnableZimbrasUsersUpdateHandler() {
@@ -145,6 +150,10 @@ var documentsSettings = {
                 documentsSettings.setValue(this.name, this.value);
             }
         }
+
+        function setZimbraGroupToUsersUpdateHandler() {
+            addClickHandlerToCheckableItem("set_zimbra_group", documentsSettings.setZimbraGroupToUsers);
+        }
     }
 };
 

nextcloud-app/lib/auth/abstractzimbrausersbackend.php

@@ -33,6 +33,7 @@ abstract class AbstractZimbraUsersBackend extends RetroCompatibleBackend
     protected $userManager;
     protected $groupManager;
     protected $allow_zimbra_users_login;
+    protected $setZimbraGroupToUsers;
     /** @var AccountManager */
     private $accountManager;
     /** @var ZimbraAuthenticationBackend  */
@@ -72,6 +73,7 @@ public function __construct($server = null, $zimbraAuthenticationBackend = null)
 
         $appSettings = new AppSettings($this->config);
         $this->allow_zimbra_users_login = $appSettings->allowZimbraUsersLogin();
+        $this->setZimbraGroupToUsers = $appSettings->setZimbraGroupToUsers();
     }
 
     /**
@@ -121,7 +123,10 @@ private function setDefaultUserAttributes($zimbraUser){
      */
     private function setDefaultGroups($user)
     {
-        $this->insertUserInGroup($user, self::ZIMBRA_GROUP);
+        if ($this->setZimbraGroupToUsers)
+        {
+            $this->insertUserInGroup($user, self::ZIMBRA_GROUP);
+        }
         $this->insertUserInGroup($user, $this->getEmailDomain($user->getEMailAddress()));
     }
 
@@ -144,17 +149,33 @@ protected abstract function createUser($userId, $userDisplayName);
      */
     private function restoreUserEmailIfChanged(User $user, $userEmail)
     {
-        if( $user->getEMailAddress() !== $userEmail)
+        if( $this->getUserEmailAddress($user) !== $userEmail)
         {
-            if(!is_null($this->accountManager)) //Nextcloud 11
-            {
-                $userData = $this->accountManager->getUser($user);
-                $userData[AccountManager::PROPERTY_EMAIL]['value'] = $userEmail;
-                $this->accountManager->updateUser($user, $userData);
-            } else
-            {
-                $user->setEMailAddress($userEmail);
-            }
+            $this->setUserEmailAddress($user, $userEmail);
+        }
+    }
+
+    private function getUserEmailAddress(User $user){
+        if(!is_null($this->accountManager)) //Nextcloud 11
+        {
+            $userData = $this->accountManager->getUser($user);
+            $userEmailAddress = $userData[AccountManager::PROPERTY_EMAIL]['value'];
+        } else
+        {
+            $userEmailAddress = $user->getEMailAddress();
+        }
+        return $userEmailAddress;
+    }
+
+    private function setUserEmailAddress(User $user, $userEmail){
+        if(!is_null($this->accountManager)) //Nextcloud 11
+        {
+            $userData = $this->accountManager->getUser($user);
+            $userData[AccountManager::PROPERTY_EMAIL]['value'] = $userEmail;
+            $this->accountManager->updateUser($user, $userData);
+        } else
+        {
+            $user->setEMailAddress($userEmail);
         }
     }
 

nextcloud-app/lib/auth/zimbrausersbackend.php

@@ -41,7 +41,7 @@ public function __construct()
     private function initializeOcUserZimbraBackend()
     {
         if (class_exists('OC\\User\\Account')) { //ownCloud 10 all user backend will be 'degraded' to authentication backend
-            $this->oc_user_zimbra_backend = new ZimbraUsersBackendPassword();
+            $this->oc_user_zimbra_backend = new ZimbraUsersBackendPassword($this);
         } else {
             $this->oc_user_zimbra_backend = new ZimbraUsersBackendInDb();
         }

nextcloud-app/lib/auth/zimbrausersbackendindb.php

@@ -215,7 +215,7 @@ protected function createUser($uid, $display_name)
      */
     public function userExists($uid)
     {
-        $sql='SELECT COUNT(*) FROM `*PREFIX*zimbradrive_users`'
+        $sql='SELECT COUNT(*) AS users_find FROM `*PREFIX*zimbradrive_users`'
             . ' WHERE LOWER(`uid`) = LOWER(?)';
 
         $statement = $this->databaseConnection->prepare($sql);
@@ -224,8 +224,7 @@ public function userExists($uid)
 
         $row = $statement->fetch();
         $statement->closeCursor();
-
-        return $row['COUNT(*)'] !== "0";
+        return $row['users_find'] != 0; //$row['users_find'] in mysql is a string, in postgresql is a integer
     }
 }
 

nextcloud-app/lib/auth/zimbrausersbackendpassword.php

@@ -24,6 +24,13 @@
 
 class ZimbraUsersBackendPassword extends AbstractZimbraUsersBackend
 {
+    /** @var ZimbraUsersBackend */
+    private $backend;
+    public function __construct($backend, $server = null, $zimbraAuthenticationBackend = null)
+    {
+        parent::__construct($server, $zimbraAuthenticationBackend);
+        $this->backend = $backend;
+    }
 
     /**
      * @param $userId
@@ -33,7 +40,7 @@ protected function createUser($userId, $userDisplayName)
     {
         parent::__construct();
 
-        $user = $this->userManager->createUser($userId, Random::string(255));
+        $user = $this->userManager->createUserFromBackend($userId, Random::string(255), $this->backend);
         $user->setDisplayName($userDisplayName);
     }
 

nextcloud-app/lib/controller/zimbradriveapicontroller.php

@@ -86,9 +86,9 @@ public function __construct(
      * @param $caseSensitive bool
      * @return Response
      */
-    public function searchRequest($username, $token, $query, $types, $caseSensitive)
+    public function searchRequestShareItemFiltered($username, $token, $query, $types, $caseSensitive)
     {
-        $this->logger->debug($username . ' call searchRequest.');
+        $this->logger->debug($username . ' call searchRequestShareItemFiltered.');
         try {
             $this->loginService->login($username, $token);
         } catch (UnauthorizedException $unauthorizedException) {
@@ -119,6 +119,49 @@ public function searchRequest($username, $token, $query, $types, $caseSensitive)
         return new JSONResponse($resultsNoShares);
     }
 
+    /**
+     * @CORS
+     * @NoCSRFRequired
+     * @PublicPage
+     * @param $username
+     * @param $token
+     * @param $query
+     * @param $types
+     * @param $caseSensitive bool
+     * @return Response
+     */
+    public function searchRequest($username, $token, $query, $types, $caseSensitive)
+    {
+        $this->logger->debug($username . ' call searchRequest.');
+        try {
+            $this->loginService->login($username, $token);
+        } catch (UnauthorizedException $unauthorizedException) {
+            $this->logUnauthorizedLogin($unauthorizedException);
+            return new EmptyResponse(Http::STATUS_UNAUTHORIZED);
+        }
+
+        $types = json_decode($types, false);
+        if($types === array('document'))
+        {
+            $types = array('file');
+        }
+        $caseSensitive = $caseSensitive === "true";
+
+        try {
+            $wantedFiles =  $this->searchService->search($query, $caseSensitive);
+        } catch (BadRequestException $badRequestException) {
+            $this->logger->info($badRequestException->getMessage());
+            return new EmptyResponse(Http::STATUS_BAD_REQUEST);
+        }
+        catch (MethodNotAllowedException $methodNotAllowedException) {
+            $this->logger->info($methodNotAllowedException->getMessage());
+            return new EmptyResponse(Http::STATUS_METHOD_NOT_ALLOWED);
+        }
+
+        $results = $this->filterNodesByType($wantedFiles, $types);
+        return new JSONResponse($results);
+    }
+
     /**
      * @param $nodes array
      * @param $allowedTypes array of string
@@ -138,6 +181,45 @@ private function filterNodesByType($nodes, $allowedTypes)
 
     }
 
+    /**
+     * @param $node Node
+     * @param $validTypes array
+     * @return bool
+     */
+    private function nodeHasAValidTypeShareItemFiltered($node, $validTypes)
+    {
+        return in_array($node[ResponseVarName::NODE_TYPE_VAR_NAME], $validTypes, true);
+    }
+
+    /**
+     * @CORS
+     * @NoCSRFRequired
+     * @PublicPage
+     * @param $username
+     * @param $token
+     * @return \OCP\AppFramework\Http\Response
+     */
+    public function getAllFoldersShareItemFiltered($username, $token)
+    {
+        $this->logger->debug($username . ' call getAllFoldersShareItemFiltered.');
+        try {
+            $this->loginService->login($username, $token);
+        } catch (UnauthorizedException $unauthorizedException) {
+            $this->logUnauthorizedLogin($unauthorizedException);
+            return new EmptyResponse(Http::STATUS_UNAUTHORIZED);
+        }
+
+        try {
+            $searchedFolder = $this->storageService->getFolder(StorageService::ROOT);
+        } catch (Exception $exception) {
+            $this->logger->info($exception->getMessage());
+            return new EmptyResponse(Http::STATUS_FORBIDDEN);
+        }
+        $folderTree = $this->storageService->getFolderTreeAttributes($searchedFolder);
+        $folderTreeNoShare = $this->filterShareTreeNodes($folderTree);
+        return new JSONResponse($folderTreeNoShare);
+    }
+
     /**
      * @param $node Node
      * @param $validTypes array
@@ -173,8 +255,7 @@ public function getAllFolders($username, $token)
             return new EmptyResponse(Http::STATUS_FORBIDDEN);
         }
         $folderTree = $this->storageService->getFolderTreeAttributes($searchedFolder);
-        $folderTreeNoShare = $this->filterShareTreeNodes($folderTree);
-        return new JSONResponse($folderTreeNoShare);
+        return new JSONResponse($folderTree);
     }
 
     /**
@@ -275,7 +356,7 @@ public function move($username, $token, $source_path, $target_path)
         catch (NotPermittedException $exception)
         {
             $this->logger->info($exception->getMessage());
-            return new EmptyResponse(Http::STATUS_METHOD_NOT_ALLOWED);
+            return new EmptyResponse(Http::STATUS_FORBIDDEN);
         }
 //        catch (Exception $exception) {
 //            $this->logger->info($exception->getMessage());