Bump version to 1.11.31

(cherry picked from commit c14ff8fee8)
Signed-off-by: Andras Timar <andras.timar@collabora.com>

CHANGELOG.md

@@ -1,3 +1,30 @@
+**1.11.31**
+- Bug: Guard encryption support
+
+**1.11.30**
+- Feature: Support opening encrypted files
+- Bug: Respect OOXML settings again
+- Bug: Register the change under user’s name when saving the document
+
+**1.11.29**
+- Bug: Fix undefined instanceId
+
+**1.11.28**
+- Bug: Allow full screen
+- Updated screenshots
+
+**1.11.27**
+- Bug: Fix revision history
+
+**1.1.25.1**
+- Bug: Fix height for revision history viewer
+- Bug: Set the correct language tag expected by JS
+- Bug: Replace trailing slash of WOPI URL
+- Bug: Try opening readonly documents too
+- Bug: Fix revision history
+- Feature: Add rtf and txt as supported file formats
+- Feature: Support for multitenancy installations of LibreOffice Online
+
 **1.1.24**
 - Bug: Fix undefined PHP notices
-- Security: Properly check for password on password protected shares
+- Security: Properly check for password on password protected shares

appinfo/info.xml

@@ -5,7 +5,7 @@
 	<description>Collabora Online allows you to to work with all kinds of office documents directly in your browser. This application requires Collabora Cloudsuite to be installed on one of your servers, please read the documentation to learn more about that.</description>
 	<summary>Edit office documents directly in your browser.</summary>
 	<licence>AGPL</licence>
-	<version>1.1.24</version>
+	<version>1.11.31</version>
 	<author>Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk</author>
 	<bugs>https://github.com/nextcloud/richdocuments/issues</bugs>
 	<repository type="git">https://github.com/nextcloud/richdocuments.git</repository>
@@ -22,7 +22,6 @@
 		<prevent_group_restriction/>
 	</types>
 	<screenshot>https://nextcloud.com/wp-content/themes/next/assets/img/features/collabora-document.png</screenshot>
-	<screenshot>https://nextcloud.com/wp-content/themes/next/assets/img/features/collabora-app.png</screenshot>
 	<screenshot>https://nextcloud.com/wp-content/themes/next/assets/img/features/collabora-presentation.png</screenshot>
 	<screenshot>https://nextcloud.com/wp-content/themes/next/assets/img/features/collabora-spreadsheet.png</screenshot>
 	<settings>

appinfo/routes.php

@@ -25,5 +25,6 @@ return [
 
 		//settings
 		['name' => 'settings#setSettings', 'url' => 'ajax/admin.php', 'verb' => 'POST'],
+		['name' => 'settings#getSettings', 'url' => 'ajax/settings.php', 'verb' => 'GET'],
 	]
 ];

css/style.css

@@ -133,7 +133,7 @@
 	width: 100%;
 	z-index: 600;
 	background-color: #ddd !important;
-	top: 45px;
+	top: 0px;
 	bottom: 0;
 }
 
@@ -149,7 +149,7 @@
 	z-index: 600;
 	background-color: #efefef !important;
 	right: 0;
-	top: 45px;
+	top: 0px;
 	bottom: 0;
 	box-sizing: border-box;
 	overflow-x: hidden;

js/admin.js

@@ -4,7 +4,7 @@ var documentsSettings = {
 	save : function() {
 		$('#wopi_apply').attr('disabled', true);
 		var data = {
-			wopi_url  : $('#wopi_url').val()
+			wopi_url  : $('#wopi_url').val().replace(/\/$/, '')
 		};
 
 		OC.msg.startAction('#documents-admin-msg', t('richdocuments', 'Saving...'));

js/documents.js

@@ -72,7 +72,6 @@ var documentsMain = {
 	loadErrorHint : '',
 	renderComplete: false, // false till page is rendered with all required data about the document(s)
 	toolbar : '<div id="ocToolbar"><div id="ocToolbarInside"></div><span id="toolbar" class="claro"></span></div>',
-	returnToDir : null, // directory where we started from in the 'Files' app
 
 	UI : {
 		/* Editor wrapper HTML */
@@ -129,7 +128,7 @@ var documentsMain = {
 			var urlsrc = documentsMain.urlsrc +
 			  "WOPISrc=" + wopisrc +
 			  "&title=" + encodeURIComponent(title) +
-			  "&lang=" + OC.getLocale() +
+			  "&lang=" + OC.getLocale().replace('_', '-') + // loleaflet expects a BCP47 language tag syntax
 			  "&permission=readonly";
 
 			// access_token - must be passed via a form post
@@ -163,7 +162,6 @@ var documentsMain = {
 			if (version === 0) {
 				formattedTimestamp = t('richdocuments', 'Latest revision');
 				downloadUrl = OC.generateUrl('apps/files/download'+ documentPath);
-				fileId = fileId.replace(/_.*/, '');
 			} else {
 				downloadUrl = OC.generateUrl('apps/files_versions/download.php?file={file}&revision={revision}',
 				                             {file: documentPath, revision: version});
@@ -268,12 +266,8 @@ var documentsMain = {
 								documentsMain.UI.notify(t('richdocuments', 'Failed to revert the document to older version'));
 							}
 
-							// generate file id with returnToDir information in it, if any
-							var fileid = e.currentTarget.parentElement.dataset.fileid.replace(/_.*/, '') +
-							    (documentsMain.returnToDir ? '_' + documentsMain.returnToDir : '');
-
 							// load the file again, it should get reverted now
-							window.location = OC.generateUrl('apps/richdocuments/index#{fileid}', {fileid: fileid});
+							window.location = OC.generateUrl('apps/richdocuments/index#{fileid}', {fileid: e.currentTarget.parentElement.dataset.fileid});
 							window.location.reload();
 							documentsMain.overlay.documentOverlay('hide');
 						}
@@ -320,7 +314,7 @@ var documentsMain = {
 			var urlsrc = documentsMain.urlsrc +
 				"WOPISrc=" + wopisrc +
 				"&title=" + encodeURIComponent(title) +
-				"&lang=" + OC.getLocale() +
+				"&lang=" + OC.getLocale().replace('_', '-') + // loleaflet expects a BCP47 language tag syntax
 				"&closebutton=1" +
 				"&revisionhistory=1";
 			if (!documentsMain.canEdit || action === "view") {
@@ -426,11 +420,6 @@ var documentsMain = {
 		// Does anything indicate that we need to autostart a session?
 		fileId = getURLParameter('fileid').replace(/^\W*/, '');
 
-		if (fileId.indexOf('_') >= 0) {
-			documentsMain.returnToDir = unescape(fileId.replace(/^[^_]*_/, ''));
-			fileId = fileId.replace(/_.*/, '');
-		}
-
 		documentsMain.show(fileId);
 
 		if (fileId) {

js/viewer/viewer.js

@@ -1,7 +1,7 @@
 /* globals FileList, OCA.Files.fileActions, oc_debug */
 var odfViewer = {
 	isDocuments : false,
-	supportedMimesReadWrite: [
+	supportedMimes: [
 		'application/vnd.oasis.opendocument.text',
 		'application/vnd.oasis.opendocument.spreadsheet',
 		'application/vnd.oasis.opendocument.graphics',
@@ -12,6 +12,9 @@ var odfViewer = {
 		'application/vnd.wordperfect',
 		'application/msonenote',
 		'application/msword',
+		'application/rtf',
+		'text/rtf',
+		'text/plain',
 		'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
 		'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
 		'application/vnd.ms-word.document.macroEnabled.12',
@@ -35,34 +38,19 @@ var odfViewer = {
 
 	register : function() {
 		var i,
-			mimeReadOnly,
-			mimeReadWrite;
+		    mime;
 
-		for (i = 0; i < odfViewer.supportedMimesReadWrite.length; ++i) {
-			mimeReadOnly = odfViewer.supportedMimesReadWrite[i];
-			OCA.Files.fileActions.register(mimeReadOnly, 'View', OC.PERMISSION_READ, '', odfViewer.onEdit);
-			OCA.Files.fileActions.setDefault(mimeReadOnly, 'View');
-		}
-		for (i = 0; i < odfViewer.supportedMimesReadWrite.length; ++i) {
-			mimeReadWrite = odfViewer.supportedMimesReadWrite[i];
+		for (i = 0; i < odfViewer.supportedMimes.length; ++i) {
+			mime = odfViewer.supportedMimes[i];
 			OCA.Files.fileActions.register(
-					mimeReadWrite,
+				    mime,
 					'Edit',
-					OC.PERMISSION_UPDATE,
+				    OC.PERMISSION_UPDATE | OC.PERMISSION_READ,
 					OC.imagePath('core', 'actions/rename'),
 					odfViewer.onEdit,
 					t('richdocuments', 'Edit')
 			);
-			OCA.Files.fileActions.register(
-				mimeReadWrite,
-				'View',
-				OC.PERMISSION_READ,
-				OC.imagePath('core', 'actions/rename'),
-				odfViewer.onEdit,
-				t('richdocuments', 'View')
-			);
-			OCA.Files.fileActions.setDefault(mimeReadWrite, 'View');
-			OCA.Files.fileActions.setDefault(mimeReadWrite, 'Edit');
+			OCA.Files.fileActions.setDefault(mime, 'Edit');
 		}
 	},
 
@@ -89,7 +77,7 @@ var odfViewer = {
 			);
 		} else {
 			viewer = OC.generateUrl(
-				'apps/richdocuments/index?fileId={fileId}_{dir}&requesttoken={requesttoken}',
+				'apps/richdocuments/index?fileId={fileId}&requesttoken={requesttoken}',
 				{
 					fileId: fileId,
 					dir: fileDir,
@@ -102,7 +90,7 @@ var odfViewer = {
 			FileList.setViewerMode(true);
 		}
 
-		var $iframe = $('<iframe id="richdocumentsframe" style="width:100%;height:100%;display:block;position:absolute;top:0;" src="'+viewer+'" />');
+		var $iframe = $('<iframe id="richdocumentsframe" allowfullscreen style="width:100%;height:100%;display:block;position:absolute;top:0;z-index:5;" src="'+viewer+'" />');
 		if ($('#isPublic').val()) {
 			// force the preview to adjust its height
 			$('#preview').append($iframe).css({height: '100%'});
@@ -131,8 +119,8 @@ var odfViewer = {
 		$('#richdocumentsframe').remove();
 	},
 
-	registerFilesMenu: function() {
-		var ooxml = false;
+	registerFilesMenu: function(response) {
+		var ooxml = response.doc_format === 'ooxml';
 
 		var docExt, spreadsheetExt, presentationExt;
 		var docMime, spreadsheetMime, presentationMime;
@@ -220,14 +208,19 @@ $(document).ready(function() {
 		&& typeof OCA.Files.fileActions !== 'undefined'
 	) {
 		odfViewer.register();
-		odfViewer.registerFilesMenu();
+
+		$.get(
+			OC.filePath('richdocuments', 'ajax', 'settings.php'),
+			{},
+			odfViewer.registerFilesMenu
+		);
 	}
 });
 
 // FIXME: Hack for single public file view since it is not attached to the fileslist
 $(document).ready(function(){
 	// FIXME: FIlter compatible mime types
-	if ($('#isPublic').val() && odfViewer.supportedMimesReadWrite.indexOf($('#mimetype').val()) !== -1) {
+	if ($('#isPublic').val() && odfViewer.supportedMimes.indexOf($('#mimetype').val()) !== -1) {
 		odfViewer.onEdit($('#filename').val());
 	}
 });
@@ -244,4 +237,4 @@ $(document).ready(function() {
 			$('#content').removeClass('loading');
 		}
 	}, false);
-});
+});

lib/Controller/DocumentController.php

@@ -104,12 +104,24 @@ class DocumentController extends Controller {
 			$params = [
 				'permissions' => $item->getPermissions(),
 				'title' => $item->getName(),
-				'fileId' => $item->getId(),
+				'fileId' => $item->getId() . '_' . $this->settings->getSystemValue('instanceid'),
 				'token' => $token,
 				'urlsrc' => $urlSrc,
-				'path' => '/',
+				'path' => $folder->getRelativePath($item->getPath()),
+				'instanceId' => $this->settings->getSystemValue('instanceid'),
 			];
 
+			$encryptionManager = \OC::$server->getEncryptionManager();
+			if ($encryptionManager->isEnabled())
+			{
+				// Update the current file to be accessible with system public shared key
+				$owner = $item->getOwner()->getUID();
+				$absPath = '/' . $owner . '/' .  $item->getInternalPath();
+				$accessList = \OC::$server->getEncryptionFilesHelper()->getAccessList($absPath);
+				$accessList['public'] = true;
+				$encryptionManager->getEncryptionModule()->update($absPath, $owner, $accessList);
+			}
+
 			$response = new TemplateResponse('richdocuments', 'documents', $params, 'empty');
 			$policy = new ContentSecurityPolicy();
 			$policy->addAllowedFrameDomain($this->appConfig->getAppValue('wopi_url'));
@@ -153,10 +165,11 @@ class DocumentController extends Controller {
 				$params = [
 					'permissions' => $share->getPermissions(),
 					'title' => $item->getName(),
-					'fileId' => $item->getId(),
+					'fileId' => $item->getId() . '_' . $this->settings->getSystemValue('instanceid'),
 					'token' => $token,
 					'urlsrc' => $urlSrc,
 					'path' => '/',
+					'instanceId' => $this->settings->getSystemValue('instanceid'),
 				];
 
 				$response = new TemplateResponse('richdocuments', 'documents', $params, 'empty');
@@ -231,12 +244,13 @@ class DocumentController extends Controller {
 		if ($content && $view->file_put_contents($path, $content)) {
 			$info = $view->getFileInfo($path);
 			$ret = $this->wopiParser->getUrlSrc($mimetype);
+			$lolang = strtolower(str_replace('_', '-', $this->settings->getUserValue($this->uid, 'core', 'lang', 'en')));
 			$response =  array(
 				'status' => 'success',
-				'fileid' => $info['fileid'],
+				'fileid' => $info['fileid'] . '_' . $this->settings->getSystemValue('instanceid'),
 				'urlsrc' => $ret['urlsrc'],
 				'action' => $ret['action'],
-				'lolang' => $this->settings->getUserValue($this->uid, 'core', 'lang', 'en'),
+				'lolang' => $lolang,
 				'data' => \OCA\Files\Helper::formatFileInfo($info)
 			);
 		} else {

lib/Controller/SettingsController.php

@@ -45,6 +45,18 @@ class SettingsController extends Controller{
 		$this->discoveryManager = $discoveryManager;
 	}
 
+	/**
+	 * @NoAdminRequired
+	 *
+	 * @return JSONResponse
+	 */
+	public function getSettings() {
+		return new JSONResponse([
+			'doc_format' => $this->appConfig->getAppValue('doc_format'),
+			'wopi_url' => $this->appConfig->getAppValue('wopi_url'),
+		]);
+	}
+
 	/**
 	 * @param string $wopi_url
 	 * @param string $doc_format

lib/Controller/WopiController.php

@@ -21,7 +21,9 @@
 
 namespace OCA\Richdocuments\Controller;
 
+use OC\Files\View;
 use OCA\Richdocuments\Db\Wopi;
+use OCA\Richdocuments\Helper;
 use OCA\Richdocuments\WOPI\Parser;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
@@ -35,32 +37,19 @@ use OCP\AppFramework\Http\StreamResponse;
 class WopiController extends Controller {
 	/** @var IRootFolder */
 	private $rootFolder;
-	/** @var string */
-	private $userId;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var Parser */
-	private $wopiParser;
 
 	/**
 	 * @param string $appName
 	 * @param IRequest $request
 	 * @param IRootFolder $rootFolder
 	 * @param string $UserId
-	 * @param IUserManager $userManager
-	 * @param Parser $wopiParser
 	 */
 	public function __construct($appName,
 								$UserId,
 								IRequest $request,
-								IRootFolder $rootFolder,
-								IUserManager $userManager,
-								Parser $wopiParser) {
+								IRootFolder $rootFolder) {
 		parent::__construct($appName, $request);
 		$this->rootFolder = $rootFolder;
-		$this->userId = $UserId;
-		$this->userManager = $userManager;
-		$this->wopiParser = $wopiParser;
 	}
 
 	/**
@@ -76,16 +65,9 @@ class WopiController extends Controller {
 	public function checkFileInfo($fileId) {
 		$token = $this->request->getParam('access_token');
 
-		$arr = explode('_', $fileId, 2);
-		$version = '0';
-		if (count($arr) === 2) {
-			list($fileId, $version) = $arr;
-		}
-
-		$row = new Wopi();
-		$row->loadBy('token', $token);
-
-		$res = $row->getPathForToken($fileId, $version, $token);
+		list($fileId, , $version) = Helper::parseFileId($fileId);
+		$db = new Wopi();
+		$res = $db->getPathForToken($fileId, $token);
 		if ($res === false) {
 			return new JSONResponse([], Http::STATUS_FORBIDDEN);
 		}
@@ -130,22 +112,32 @@ class WopiController extends Controller {
 	 */
 	public function getFile($fileId,
 							$access_token) {
-		$arr = explode('_', $fileId, 2);
-		$version = '0';
-		if (count($arr) === 2) {
-			list($fileId, $version) = $arr;
-		}
-
+		list($fileId, , $version) = Helper::parseFileId($fileId);
 		$row = new Wopi();
 		$row->loadBy('token', $access_token);
-
-		$res = $row->getPathForToken($fileId, $version, $access_token);
-
+		$res = $row->getPathForToken($fileId, $access_token);
 		try {
 			/** @var File $file */
 			$userFolder = $this->rootFolder->getUserFolder($res['owner']);
 			$file = $userFolder->getById($fileId)[0];
-			$response = new StreamResponse($file->fopen('rb'));
+			\OC_User::setIncognitoMode(true);
+			if ($version !== '0')
+			{
+				$view = new View('/' . $res['owner'] . '/files');
+				$relPath = $view->getRelativePath($file->getPath());
+				$versionPath = '/files_versions/' . $relPath . '.v' . $version;
+				$view = new View('/' . $res['owner']);
+				if ($view->file_exists($versionPath)){
+					$response = new StreamResponse($view->fopen($versionPath, 'rb'));
+				}
+				else {
+					$response->setStatus(Http::STATUS_NOT_FOUND);
+				}
+			}
+			else
+			{
+				$response = new StreamResponse($file->fopen('rb'));
+			}
 			$response->addHeader('Content-Disposition', 'attachment');
 			$response->addHeader('Content-Type', 'application/octet-stream');
 			return $response;
@@ -165,17 +157,14 @@ class WopiController extends Controller {
 	 * @param string $access_token
 	 * @return JSONResponse
 	 */
-	public function putFile($fileId, $access_token) {
-		$arr = explode('_', $fileId, 2);
-		$version = '0';
-		if (count($arr) === 2) {
-			list($fileId, $version) = $arr;
-		}
+	public function putFile($fileId,
+							$access_token) {
+		list($fileId, , $version) = Helper::parseFileId($fileId);
 
 		$row = new Wopi();
 		$row->loadBy('token', $access_token);
 
-		$res = $row->getPathForToken($fileId, $version, $access_token);
+		$res = $row->getPathForToken($fileId, $access_token);
 		if (!$res['canwrite']) {
 			return new JSONResponse([], Http::STATUS_FORBIDDEN);
 		}
@@ -185,6 +174,17 @@ class WopiController extends Controller {
 			$userFolder = $this->rootFolder->getUserFolder($res['owner']);
 			$file = $userFolder->getById($fileId)[0];
 			$content = fopen('php://input', 'rb');
+			// Setup the FS which is needed to emit hooks (versioning).
+			\OC_Util::tearDownFS();
+			\OC_Util::setupFS($res['owner']);
+
+			// Set the user to register the change under his name
+			$editor = \OC::$server->getUserManager()->get($res['editor']);
+			if (is_null($editor)) {
+				throw new \OC\User\NoUserException("User " . $res['editor'] . "not found.");
+			}
+			\OC::$server->getUserSession()->setUser($editor);
+
 			$file->putContent($content);
 			return new JSONResponse();
 		} catch (\Exception $e) {

lib/TokenManager.php

@@ -22,6 +22,7 @@
 namespace OCA\Richdocuments;
 
 use OC\Share\Constants;
+use OCA\Richdocuments\Helper;
 use OCA\Richdocuments\Db\Wopi;
 use OCA\Richdocuments\WOPI\Parser;
 use OCP\Files\File;
@@ -64,12 +65,7 @@ class TokenManager {
 	 * @throws \Exception
 	 */
 	public function getToken($fileId, $shareToken = null) {
-		$arr = explode('_', $fileId, 2);
-		$version = '0';
-		if (count($arr) === 2) {
-			list($fileId, $version) = $arr;
-		}
-
+		list($fileId,, $version) = Helper::parseFileId($fileId);
 		// if the user is not logged-in do use the sharers storage
 		if($shareToken !== null) {
 			/** @var File $file */

lib/db/wopi.php

@@ -56,12 +56,12 @@ class Wopi extends \OCA\Richdocuments\Db{
 	 * constructs and validates the path.
 	 * Returns the path, if valid, else false.
 	 */
-	public function getPathForToken($fileId, $version, $token){
+	public function getPathForToken($fileId, $token){
 
 		$wopi = new Wopi();
 		$row = $wopi->loadBy('token', $token)->getData();
 		\OC::$server->getLogger()->debug('Loaded WOPI Token record: {row}.', [ 'row' => $row ]);
-		if (count($row) == 0)
+		if (count($row) === 0)
 		{
 			// Invalid token.
 			http_response_code(401);
@@ -75,11 +75,6 @@ class Wopi extends \OCA\Richdocuments\Db{
 			//$wopi->deleteBy('id', $row['id']);
 			//return false;
 		}
-		if ($row['fileid'] != $fileId || $row['version'] != $version){
-			// File unknown / user unauthorized (for the requested file).
-			http_response_code(404);
-			return false;
-		}
 
 		return array(
 			'owner' => $row['owner_uid'],

lib/helper.php

@@ -14,6 +14,34 @@ namespace OCA\Richdocuments;
 class Helper {
 	const APP_ID = 'richdocuments';
 
+	/**
+	 * @param string $fileId
+	 * @return array
+	 * @throws \Exception
+	 */
+	public static function parseFileId($fileId) {
+		$arr = explode('_', $fileId);
+		if (count($arr) === 1) {
+			$fileId = $arr[0];
+			$instanceId = '';
+			$version = '0';
+		} else if (count($arr) === 2) {
+			list($fileId, $instanceId) = $arr;
+			$version = '0';
+		} else if (count($arr) === 3) {
+			list($fileId, $instanceId, $version) = $arr;
+		} else {
+			throw new \Exception('$fileId has not the expected format');
+		}
+
+		return [
+			$fileId,
+			$instanceId,
+			$version,
+		];
+	}
+
+
 	public static function getNewFileName($view, $path, $prepend = ' '){
 		$fileNum = 1;
 

templates/documents.php

@@ -5,6 +5,7 @@
 	var richdocuments_token = '<?php p($_['token']) ?>';
 	var richdocuments_urlsrc = '<?php p($_['urlsrc']) ?>';
 	var richdocuments_path = '<?php p($_['path']) ?>';
+	var instanceId = '<?php p($_['instanceId']) ?>';
 </script>
 
 <?php