federated key

pull/178/head
Sergey Linnik 7 years ago
parent 0ed99b0d8f
commit 73f2012e7d
  1. 3
      appinfo/application.php
  2. 3
      appinfo/routes.php
  3. 7
      controller/editorcontroller.php
  4. 125
      controller/federationcontroller.php
  5. 35
      lib/fileutility.php

@ -137,7 +137,8 @@ class Application extends App {
$this->appConfig,
$this->crypt,
$c->query("IManager"),
$c->query("Session")
$c->query("Session"),
$c->query("ClientService")
);
});

@ -43,5 +43,8 @@ return [
["name" => "settings#save_common", "url" => "/ajax/settings/common", "verb" => "PUT"],
["name" => "settings#save_watermark", "url" => "/ajax/settings/watermark", "verb" => "PUT"],
["name" => "settings#get_settings", "url" => "/ajax/settings", "verb" => "GET"],
],
"ocs" => [
["name" => "federation#key", "url" => "/api/v1/key", "verb" => "POST"]
]
];

@ -336,7 +336,7 @@ class EditorController extends Controller {
try {
$newData = $documentService->Request($newFileUri);
} catch (\Exception $e) {
$this->logger->error("Failed to download converted file: $newFileUri" . " " . $e->getMessage(), array("app" => $this->appName));
$this->logger->error("Failed to download converted file: $newFileUri " . $e->getMessage(), array("app" => $this->appName));
return ["error" => $this->trans->t("Failed to download converted file")];
}
@ -577,12 +577,13 @@ class EditorController extends Controller {
}
$fileUrl = $this->getUrl($file, $shareToken);
$key = $this->fileUtility->getKey($file);
$key = $this->fileUtility->getKey($file, true);
$key = DocumentService::GenerateRevisionId($key);
$params = [
"document" => [
"fileType" => $ext,
"key" => DocumentService::GenerateRevisionId($key),
"key" => $key,
"permissions" => [],
"title" => $fileName,
"url" => $fileUrl,

@ -0,0 +1,125 @@
<?php
/**
*
* (c) Copyright Ascensio System SIA 2019
*
* This program is a free software product.
* You can redistribute it and/or modify it under the terms of the GNU Affero General Public License
* (AGPL) version 3 as published by the Free Software Foundation.
* In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* For details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha street, Riga, Latvia, EU, LV-1050.
*
* The interactive user interfaces in modified source and object code versions of the Program
* must display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product logo when distributing the program.
* Pursuant to Section 7(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as well as technical
* writing content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International.
* See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
namespace OCA\Onlyoffice\Controller;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCSController;
use OCP\IL10N;
use OCP\ILogger;
use OCP\IRequest;
use OCP\ISession;
use OCP\Share\IManager;
use OCA\Onlyoffice\AppConfig;
use OCA\Onlyoffice\FileUtility;
/**
* OCS handler
*/
class FederationController extends OCSController {
/**
* Logger
*
* @var ILogger
*/
private $logger;
/**
* Share manager
*
* @var IManager
*/
private $shareManager;
/**
* Application configuration
*
* @var OCA\Onlyoffice\AppConfig
*/
public $config;
/**
* File utility
*
* @var OCA\Onlyoffice\FileUtility
*/
private $fileUtility;
/**
* @param string $AppName - application name
* @param IRequest $request - request object
* @param IL10N $trans - l10n service
* @param ILogger $logger - logger
* @param IManager $shareManager - Share manager
* @param IManager $ISession - Session
*/
public function __construct($AppName,
IRequest $request,
IL10N $trans,
ILogger $logger,
IManager $shareManager,
ISession $session
) {
parent::__construct($AppName, $request);
$this->logger = $logger;
$this->shareManager = $shareManager;
$this->config = new AppConfig($this->appName);
$this->fileUtility = new FileUtility($AppName, $trans, $logger, $this->config, $shareManager, $session);
}
/**
* Returns the origin document key for editor
*
* @param string $shareToken - access token
*
* @return DataResponse
*
* @NoAdminRequired
* @NoCSRFRequired
* @PublicPage
*/
public function key($shareToken) {
list ($file, $error, $share) = $this->fileUtility->getFileByToken(null, $shareToken);
if (isset($error)) {
$this->logger->error("Federated getFileByToken: $error", array("app" => $this->appName));
return new DataResponse(["error" => $error]);
}
$key = $this->fileUtility->getKey($file, true);
$this->logger->debug("Federated request get for " . $file->getId() . " key $key", array("app" => $this->appName));
return new DataResponse(["key" => $key]);
}
}

@ -37,6 +37,8 @@ use OCP\ILogger;
use OCP\ISession;
use OCP\Share\IManager;
use OCA\Files_Sharing\External\Storage as SharingExternalStorage;
use OCA\Onlyoffice\AppConfig;
/**
@ -210,10 +212,41 @@ class FileUtility {
* Generate unique document identifier
*
* @param File $file - file
* @param bool $origin - request from federated store
*
* @return string
*/
public function getKey($file) {
public function getKey($file, $origin = false) {
if ($origin
&& $file->getStorage()->instanceOfStorage(SharingExternalStorage::class)) {
$remote = $file->getStorage()->getRemote();
$shareToken = $file->getStorage()->getToken();
try {
$httpClientService = \OC::$server->getHTTPClientService();
$client = $httpClientService->newClient();
$response = $client->post($remote . "ocs/v2.php/apps/" . $this->appName . "/api/v1/key?format=json", [
"timeout" => 5,
"body" => [
"shareToken" => $shareToken
]
]);
$body = \json_decode($response->getBody(), true);
$data = $body["ocs"]["data"];
if (!empty($data["error"])) {
$this->logger->error("Error federated key " . $data["error"], array("app" => $this->appName));
} else {
$key = $data["key"];
$this->logger->debug("Federated key: $key", array("app" => $this->appName));
return $key;
}
} catch (\Exception $e) {
$this->logger->error("Failed to request federated key " . $file->getId() . " " . $e->getMessage(), array("app" => $this->appName));
}
}
$instanceId = $this->config->GetSystemValue("instanceid", true);
$fileId = $file->getId();

Loading…
Cancel
Save