From 890bc519895835fdfd6abd18dfe886ee2240471a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albrecht=20K=C3=B6hnlein?= <ak@koehnlein.eu>
Date: Fri, 20 May 2022 11:45:19 +0200
Subject: [PATCH 1/2] Add alternative SFTP transfer for some cases

---
 Classes/Driver/StorageDriver.php         | 62 ++++++++++++++++++++++--
 Configuration/FlexForms/AzureStorage.xml | 11 +++++
 2 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/Classes/Driver/StorageDriver.php b/Classes/Driver/StorageDriver.php
index b9b93b6..1c057fc 100644
--- a/Classes/Driver/StorageDriver.php
+++ b/Classes/Driver/StorageDriver.php
@@ -218,7 +218,12 @@ public function createFolder($newFolderName, $parentFolderIdentifier = '', $recu
         $parentFolderIdentifier = $this->normalizeFolderName($parentFolderIdentifier);
         $newFolderName = $this->normalizeFolderName($newFolderName);
         $newFolderIdentifier = $this->normalizeFolderName($parentFolderIdentifier . $newFolderName);
-        $this->createBlockBlob($newFolderIdentifier);
+
+        if ($this->supportsSftp()) {
+            $this->executeSftp(sprintf('mkdir "%s"', $newFolderIdentifier));
+        } else {
+            $this->createBlockBlob($newFolderIdentifier);
+        }
 
         return $newFolderIdentifier;
     }
@@ -335,11 +340,27 @@ public function addFile($localFilePath, $targetFolderIdentifier, $newFileName =
             $contentType = $fileExtensionToMimeTypeMapping[$pathInfo['extension']];
         }
 
-        $options = new CreateBlockBlobOptions();
-        $options->setContentType($contentType);
-        $options->setCacheControl($this->cacheControl);
+        if ($this->supportsSftp()) {
+            $this->executeSftp(
+                sprintf(
+                    'put "%s" "%s"',
+                    $localFilePath,
+                    $fileIdentifier
+                )
+            );
+
+            $options = new SetBlobPropertiesOptions();
+            $options->setContentType($contentType);
+            $options->setCacheControl($this->cacheControl);
+
+            $this->blobService->setBlobProperties($this->container, $fileIdentifier, $options);
+        } else {
+            $options = new CreateBlockBlobOptions();
+            $options->setContentType($contentType);
+            $options->setCacheControl($this->cacheControl);
 
-        $this->createBlockBlob($fileIdentifier, fopen($localFilePath, 'rb'), $options);
+            $this->createBlockBlob($fileIdentifier, fopen($localFilePath, 'rb'), $options);
+        }
 
         if ($removeOriginal === true) {
             @unlink($localFilePath);
@@ -1342,4 +1363,35 @@ protected function isSubSubFolder($folderToCheck, $parentFolderIdentifier)
     {
         return substr_count($folderToCheck, '/') > substr_count($parentFolderIdentifier, '/') + 1;
     }
+
+    /**
+     * Check if an "SFTP identifier" is configured
+     *
+     * @return bool
+     */
+    protected function supportsSftp(): bool
+    {
+        return (bool)$this->configuration['sftpIdentifier'];
+    }
+
+    /**
+     * Execute a single SFTP command
+     *
+     * @param string $sftpCommand
+     * @return void
+     * @throws \Throwable
+     */
+    protected function executeSftp(string $sftpCommand)
+    {
+        $cmd = sprintf(
+            'echo %s | sftp %s',
+            escapeshellarg($sftpCommand),
+            $this->configuration['sftpIdentifier']
+        );
+
+        $execReturn = exec($cmd, $output, $result_code);
+        if ($execReturn === false || $result_code !== 0) {
+            throw new \Exception('SFTP error', 1653038631);
+        }
+    }
 }
diff --git a/Configuration/FlexForms/AzureStorage.xml b/Configuration/FlexForms/AzureStorage.xml
index 16e9a50..e65aa7a 100644
--- a/Configuration/FlexForms/AzureStorage.xml
+++ b/Configuration/FlexForms/AzureStorage.xml
@@ -54,6 +54,17 @@
                             </config>
                         </TCEforms>
                     </accountKey>
+                    <sftpIdentifier>
+                        <TCEforms>
+                            <label>SFTP identifier</label>
+                            <description>Optional SFTP identifier (e.g. user@host) to use SFTP via CLI instead of the azure API for some actions</description>
+                            <config>
+                                <type>input</type>
+                                <size>30</size>
+                                <eval>trim</eval>
+                            </config>
+                        </TCEforms>
+                    </sftpIdentifier>
                 </el>
             </ROOT>
         </general>

From 5cfa70112f2fbb923d40ba227ba0e82a41119a05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albrecht=20K=C3=B6hnlein?= <ak@koehnlein.eu>
Date: Thu, 28 Mar 2024 18:18:14 +0100
Subject: [PATCH 2/2] Add logging for SFTP errors

---
 Classes/Driver/StorageDriver.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Classes/Driver/StorageDriver.php b/Classes/Driver/StorageDriver.php
index 1c057fc..54116ba 100644
--- a/Classes/Driver/StorageDriver.php
+++ b/Classes/Driver/StorageDriver.php
@@ -16,6 +16,8 @@
 use MicrosoftAzure\Storage\Blob\Models\SetBlobPropertiesResult;
 use MicrosoftAzure\Storage\Common\Internal\Utilities;
 use Psr\Http\Message\StreamInterface;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerAwareTrait;
 use TYPO3\CMS\Core\Cache\CacheManager;
 use TYPO3\CMS\Core\Cache\Frontend\VariableFrontend;
 use TYPO3\CMS\Core\Resource\Driver\AbstractHierarchicalFilesystemDriver;
@@ -26,8 +28,9 @@
 use TYPO3\CMS\Core\Resource\StorageRepository;
 
 
-class StorageDriver extends AbstractHierarchicalFilesystemDriver
+class StorageDriver extends AbstractHierarchicalFilesystemDriver implements LoggerAwareInterface
 {
+    use LoggerAwareTrait;
 
     /**
      * @var string
@@ -1391,6 +1394,7 @@ protected function executeSftp(string $sftpCommand)
 
         $execReturn = exec($cmd, $output, $result_code);
         if ($execReturn === false || $result_code !== 0) {
+            $this->logger?->error('SFTP error', ['cmd' => $cmd, 'output' => $output]);
             throw new \Exception('SFTP error', 1653038631);
         }
     }