Add new parameter for signature - Add Frankfurt & Seoul Regions. Close …

…#846
pydio · Jan 12, 2016 · 7c7036b · 7c7036b
1 parent 98362d9
commit 7c7036b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/core/src/plugins/access.s3/class.s3AccessDriver.php b/core/src/plugins/access.s3/class.s3AccessDriver.php
@@ -60,6 +60,10 @@ public function detectStreamWrapper($register = false){
                 'key'    => $this->repository->getOption("API_KEY"),
                 'secret' => $this->repository->getOption("SECRET_KEY")
             );
+            $signatureVersion = $this->repository->getOption("SIGNATURE_VERSION");
+            if(!empty($signatureVersion) && $signatureVersion != "-1"){
+                $options['signature'] = $signatureVersion;
+            }
             $baseURL = $this->repository->getOption("STORAGE_URL");
             if(!empty($baseURL)){
                 $options["base_url"] = $baseURL;

diff --git a/core/src/plugins/access.s3/class.s3AccessWrapper.php b/core/src/plugins/access.s3/class.s3AccessWrapper.php
@@ -223,6 +223,10 @@ public function rename($from, $to){
                 'key'    => $repoObject->getOption("API_KEY"),
                 'secret' => $repoObject->getOption("SECRET_KEY")
             );
+            $signatureVersion = $repoObject->getOption("SIGNATURE_VERSION");
+            if(!empty($signatureVersion)){
+                $options['signature'] = $signatureVersion;
+            }
             $baseURL = $repoObject->getOption("STORAGE_URL");
             if(!empty($baseURL)){
                 $options["base_url"] = $baseURL;

diff --git a/core/src/plugins/access.s3/manifest.xml b/core/src/plugins/access.s3/manifest.xml
@@ -10,7 +10,8 @@
 	<server_settings>
 		<param name="API_KEY" type="string" label="CONF_MESSAGE[Key]" description="CONF_MESSAGE[S3 Api Key]" mandatory="true" default=""/>
 		<param name="SECRET_KEY" type="string" label="CONF_MESSAGE[Secret Key]" description="CONF_MESSAGE[S3 secret key]" mandatory="true"/>
-		<param name="REGION" type="select" choices="us-east-1|US Standard (Virginia),us-west-1|US West 1 (Northern California),us-west-2|US West 2 (Oregon),eu-west-1|EU (Ireland), ap-southeast-2|South-East (Sydney), ap-southeast-1|South-East (Singapore),ap-northeast-1|Asia Pacific (Japan),sa-east-1|South America (Sao Paulo),us-gov-west-1|EU Governement Cloud" label="CONF_MESSAGE[Region]" description="CONF_MESSAGE[S3 storage region]" mandatory="true"/>
+		<param name="REGION" type="select" choices="us-east-1|US Standard (Virginia),us-west-1|US West 1 (Northern California),us-west-2|US West 2 (Oregon),eu-west-1|EU (Ireland),eu-central-1|EU (Frankfurt - signature v4 only), ap-southeast-2|South-East (Sydney), ap-southeast-1|South-East (Singapore),ap-northeast-1|Asia Pacific (Japan),ap-northeast-2|Asia Pacific (Seoul - signature v4 only),sa-east-1|South America (Sao Paulo),us-gov-west-1|EU Governement Cloud" label="CONF_MESSAGE[Region]" description="CONF_MESSAGE[S3 storage region]" mandatory="true"/>
+		<param name="SIGNATURE_VERSION" type="select" choices="v2|Version 2,v4|Version 4" label="CONF_MESSAGE[Signature Version]" description="CONF_MESSAGE[API Signature Version. Leave empty if you are not sure, EU Frankfurt and AP Seoul should use v4 only.]" mandatory="false"/>
         <param name="STORAGE_URL" type="string" label="CONF_MESSAGE[Storage URL]" description="CONF_MESSAGE[Replace default AWS access points (built from region). Set a full URL, including protocol]" mandatory="false"/>
 		<param name="CONTAINER" type="string" label="CONF_MESSAGE[Container]" description="CONF_MESSAGE[Root container in the S3 storage]" mandatory="true"/>
         <param name="PROXY" type="string" label="CONF_MESSAGE[Proxy]" description="CONF_MESSAGE[If you are using a proxy, for example:  127.0.0.1:80 or username:password@127.0.0.1:8080]" mandatory="false"/>