Migrate AmazonS3 external storage to new API

4 files changed, 109 insertions, 27 deletions

diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 3d8e610db4d..241e29be402 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -70,33 +70,6 @@ if (OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') == '
 OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\OC_Mount_Config', 'initMountPointsHook');
 OCP\Util::connectHook('OC_User', 'post_login', 'OC\Files\Storage\SMB_OC', 'login');
 
-OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', [
-	'backend' => (string)$l->t('Amazon S3'),
-	'priority' => 100,
-	'configuration' => [
-		'key' => (string)$l->t('Key'),
-		'secret' => '*'.$l->t('Secret'),
-		'bucket' => (string)$l->t('Bucket'),
-	],
-	'has_dependencies' => true,
-]);
-
-OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', [
-	'backend' => (string)$l->t('Amazon S3 and compliant'),
-	'priority' => 100,
-	'configuration' => [
-		'key' => (string)$l->t('Access Key'),
-		'secret' => '*'.$l->t('Secret Key'),
-		'bucket' => (string)$l->t('Bucket'),
-		'hostname' => '&'.$l->t('Hostname'),
-		'port' => '&'.$l->t('Port'),
-		'region' => '&'.$l->t('Region'),
-		'use_ssl' => '!'.$l->t('Enable SSL'),
-		'use_path_style' => '!'.$l->t('Enable Path Style')
-	],
-	'has_dependencies' => true,
-]);
-
 OC_Mount_Config::registerBackend('\OC\Files\Storage\Dropbox', [
 	'backend' => 'Dropbox',
 	'priority' => 100,
diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/appinfo/application.php
index 4520a8737be..5f83e1bf91c 100644
--- a/apps/files_external/appinfo/application.php
+++ b/apps/files_external/appinfo/application.php
@@ -65,6 +65,7 @@ class Application extends App {
 			$container->query('OCA\Files_External\Lib\Backend\DAV'),
 			$container->query('OCA\Files_External\Lib\Backend\OwnCloud'),
 			$container->query('OCA\Files_External\Lib\Backend\SFTP'),
+			$container->query('OCA\Files_External\Lib\Backend\AmazonS3'),
 		]);
 
 		if (!\OC_Util::runningOnWindows()) {
@@ -91,6 +92,9 @@ class Application extends App {
 			// AuthMechanism::SCHEME_PASSWORD mechanisms
 			$container->query('OCA\Files_External\Lib\Auth\Password\Password'),
 			$container->query('OCA\Files_External\Lib\Auth\Password\SessionCredentials'),
+
+			// Specialized mechanisms
+			$container->query('OCA\Files_External\Lib\Auth\AmazonS3\AccessKey'),
 		]);
 	}
 
diff --git a/apps/files_external/lib/auth/amazons3/accesskey.php b/apps/files_external/lib/auth/amazons3/accesskey.php
new file mode 100644
index 00000000000..9e3aab374b9
--- /dev/null
+++ b/apps/files_external/lib/auth/amazons3/accesskey.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Auth\AmazonS3;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+
+/**
+ * Amazon S3 access key authentication
+ */
+class AccessKey extends AuthMechanism {
+
+	const SCHEME_AMAZONS3_ACCESSKEY = 'amazons3_accesskey';
+
+	public function __construct(IL10N $l) {
+		$this
+			->setIdentifier('amazons3::accesskey')
+			->setScheme(self::SCHEME_AMAZONS3_ACCESSKEY)
+			->setText($l->t('Access key'))
+			->addParameters([
+				(new DefinitionParameter('key', $l->t('Access key'))),
+				(new DefinitionParameter('secret', $l->t('Secret key')))
+					->setType(DefinitionParameter::VALUE_PASSWORD),
+			]);
+	}
+
+}
diff --git a/apps/files_external/lib/backend/amazons3.php b/apps/files_external/lib/backend/amazons3.php
new file mode 100644
index 00000000000..880d47621f3
--- /dev/null
+++ b/apps/files_external/lib/backend/amazons3.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Backend;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\Backend\Backend;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\Auth\AmazonS3\AccessKey;
+
+class AmazonS3 extends Backend {
+
+	public function __construct(IL10N $l, AccessKey $legacyAuth) {
+		$this
+			->setIdentifier('amazons3')
+			->addIdentifierAlias('\OC\Files\Storage\AmazonS3') // legacy compat
+			->setStorageClass('\OC\Files\Storage\AmazonS3')
+			->setText($l->t('Amazon S3'))
+			->addParameters([
+				(new DefinitionParameter('bucket', $l->t('Bucket'))),
+				(new DefinitionParameter('hostname', $l->t('Hostname')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('port', $l->t('Port')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('region', $l->t('Region')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('use_ssl', $l->t('Enable SSL')))
+					->setType(DefinitionParameter::VALUE_BOOLEAN),
+				(new DefinitionParameter('use_path_style', $l->t('Enable Path Style')))
+					->setType(DefinitionParameter::VALUE_BOOLEAN),
+			])
+			->setDependencyCheck('\OC\Files\Storage\AmazonS3::checkDependencies')
+			->addAuthScheme(AccessKey::SCHEME_AMAZONS3_ACCESSKEY)
+			->setLegacyAuthMechanism($legacyAuth)
+		;
+	}
+
+}