Disable file provider on macOS 13 Ventura

src/gui/accountsettings.cpp

@@ -1,3 +1,3 @@
 /*
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2014 ownCloud GmbH
@@ -65,7 +65,7 @@
     #define BACKGROUND_PALETTE "alternate-base"
 #else
     // ...and "alternate-base" looks too bright on macOS only.  On Linux/Plasma either one looked fine ...
     #define BACKGROUND_PALETTE "light"
 #endif
 
 #ifdef BUILD_FILE_PROVIDER_MODULE
@@ -78,7 +78,7 @@
 #include "common/macsandboxpersistentaccess.h"
 #endif
 
 #include "account.h"
 
 namespace {
 constexpr auto propertyFolder = "folder";
@@ -87,7 +87,7 @@
 constexpr auto e2EeUiActionSetupEncryptionId = "setup_encryption";
 constexpr auto e2EeUiActionForgetEncryptionId = "forget_encryption";
 constexpr auto e2EeUiActionDisplayMnemonicId = "display_mnemonic";
 constexpr auto e2EeUiActionMigrateCertificateId = "migrate_certificate";
 }
 
 namespace OCC {
@@ -179,7 +179,7 @@
 AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent)
     : QWidget(parent)
     , _ui(new Ui::AccountSettings)
     , _model(new FolderStatusModel)
     , _accountState(accountState)
     , _userInfo(accountState, false, true)
 {
@@ -216,21 +216,27 @@
     new ToolTipUpdater(_ui->_folderList);
 
 #if defined(BUILD_FILE_PROVIDER_MODULE)
-    const auto fileProviderPanelContents = _ui->fileProviderPanelContents;
-    const auto fpSettingsLayout = new QVBoxLayout(fileProviderPanelContents);
-    const auto fpAccountUserIdAtHost = _accountState->account()->userIdAtHostWithPort();
-    const auto fpSettingsController = Mac::FileProviderSettingsController::instance();
-    const auto fpSettingsWidget = fpSettingsController->settingsViewWidget(fpAccountUserIdAtHost, fileProviderPanelContents,
-                                                                           QQuickWidget::SizeRootObjectToView);
-    fpSettingsLayout->setContentsMargins(0, 0, 0, 0);
-    fpSettingsLayout->setSpacing(0);
-
-    fpSettingsWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    if (const auto fpSettingsWidgetLayout = fpSettingsWidget->layout()) {
-        fpSettingsWidgetLayout->setContentsMargins(0, 0, 0, 0);
+    if (Mac::FileProvider::available()) {
+        const auto fileProviderPanelContents = _ui->fileProviderPanelContents;
+        const auto fpSettingsLayout = new QVBoxLayout(fileProviderPanelContents);
+        const auto fpAccountUserIdAtHost = _accountState->account()->userIdAtHostWithPort();
+        const auto fpSettingsController = Mac::FileProviderSettingsController::instance();
+        const auto fpSettingsWidget = fpSettingsController->settingsViewWidget(fpAccountUserIdAtHost, fileProviderPanelContents,
+                                                                               QQuickWidget::SizeRootObjectToView);
+        fpSettingsLayout->setContentsMargins(0, 0, 0, 0);
+        fpSettingsLayout->setSpacing(0);
+
+        fpSettingsWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+        if (const auto fpSettingsWidgetLayout = fpSettingsWidget->layout()) {
+            fpSettingsWidgetLayout->setContentsMargins(0, 0, 0, 0);
+        }
+        fpSettingsLayout->addWidget(fpSettingsWidget, 1);
+        fileProviderPanelContents->setLayout(fpSettingsLayout);
+    } else {
+        // macOS 13 Ventura: the file provider feature is unsupported there.
+        // This branch can be removed once Ventura is no longer supported.
+        _ui->fileProviderPanel->setVisible(false);
     }
-    fpSettingsLayout->addWidget(fpSettingsWidget, 1);
-    fileProviderPanelContents->setLayout(fpSettingsLayout);
 #else
     _ui->fileProviderPanel->setVisible(false);
 #endif
@@ -473,7 +479,7 @@
     return true;
 }
 
 void AccountSettings::slotMarkSubfolderEncrypted(FolderStatusModel::SubFolderInfo* folderInfo)
 {
     if (!canEncryptOrDecrypt(folderInfo)) {
         return;
@@ -483,8 +489,8 @@
     Q_ASSERT(folder);
 
     const auto folderAlias = folder->alias();
     const auto path = folderInfo->_path;
     const auto fileId = folderInfo->_fileId;
     const auto encryptFolder = [this, fileId, path, folderAlias] {
         const auto folder = FolderMan::instance()->folder(folderAlias);
         if (!folder) {
@@ -497,7 +503,7 @@
         Q_ASSERT(!path.startsWith('/') && path.endsWith('/'));
         // But EncryptFolderJob expects directory path Foo/Bar convention
         const auto choppedPath = path.chopped(1);
         auto job = new OCC::EncryptFolderJob(accountsState()->account(), folder->journalDb(), choppedPath, choppedPath, folder->remotePath(), fileId);
         job->setParent(this);
         job->setProperty(propertyFolder, QVariant::fromValue(folder));
         job->setProperty(propertyPath, QVariant::fromValue(path));
@@ -754,7 +760,7 @@
     if (const auto mode = bestAvailableVfsMode();
         !Theme::instance()->disableVirtualFilesSyncFolder() &&
         Theme::instance()->showVirtualFilesOption() && !folder->virtualFilesEnabled() && Vfs::checkAvailability(folder->path(), mode)) {
         if (mode == Vfs::WindowsCfApi || ConfigFile().showExperimentalOptions()) {
             ac = menu->addAction(tr("Enable virtual file support %1 …").arg(mode == Vfs::WindowsCfApi ? QString() : tr("(experimental)")));
             // TODO: remove when UX decision is made
             ac->setEnabled(!Utility::isPathWindowsDrivePartitionRoot(folder->path()));
@@ -1220,7 +1226,7 @@
     widget.exec();
 }
 
 void AccountSettings::forgetEncryptionOnDeviceForAccount(const AccountPtr &account) const
 {
     QMessageBox dialog;
     dialog.setWindowTitle(tr("Forget the end-to-end encryption on this device"));
@@ -1386,7 +1392,7 @@
     slotAccountStateChanged();
 }
 
 void AccountSettings::slotAccountStateChanged()
 {
     const auto state = _accountState ? _accountState->state() : AccountState::Disconnected;
     if (state != AccountState::Disconnected) {
@@ -1509,7 +1515,7 @@
     const auto li = link.split(QLatin1String("?folder="));
     if (li.count() > 1) {
         auto myFolder = li[0];
         const auto alias = li[1];
         if (myFolder.endsWith(QLatin1Char('/'))) {
             myFolder.chop(1);
         }
@@ -1637,7 +1643,7 @@
     }
 }
 
 void AccountSettings::slotE2eEncryptionCertificateNeedMigration()
 {
     const auto actionMigrateCertificate = addActionToEncryptionMessage(tr("Migrate certificate to a new one"), e2EeUiActionMigrateCertificateId);
     connect(actionMigrateCertificate, &QAction::triggered, this, [this] {
@@ -1824,9 +1830,9 @@
 
 void AccountSettings::removeActionFromEncryptionMessage(const QString &actionId)
 {
     const auto foundEnableEncryptionActionIt = std::find_if(std::cbegin(_ui->encryptionMessage->actions()), std::cend(_ui->encryptionMessage->actions()), [&actionId](const QAction *action) {
         return action->property(e2eUiActionIdKey).toString() == actionId;
     });
     if (foundEnableEncryptionActionIt != std::cend(_ui->encryptionMessage->actions())) {
         _ui->encryptionMessage->removeAction(*foundEnableEncryptionActionIt);
         (*foundEnableEncryptionActionIt)->deleteLater();
@@ -1863,7 +1869,7 @@
     setEncryptionMessageIcon(Theme::createColorAwareIcon(QStringLiteral(":/client/theme/info.svg")));
     _ui->encryptionMessage->hide();
 
     auto *const actionSetupE2e = addActionToEncryptionMessage(tr("Set up encryption"), e2EeUiActionSetupEncryptionId);
     connect(actionSetupE2e, &QAction::triggered, this, &AccountSettings::slotE2eEncryptionGenerateKeys);
 }
 
@@ -1889,7 +1895,7 @@
     _encryptionMessageButtons.clear();
 
     const auto actions = _ui->encryptionMessage->actions();
     auto *layout = _ui->encryptionMessageButtonsLayout;
     int stretchIndex = -1;
     for (int i = 0; i < layout->count(); ++i) {
         if (layout->itemAt(i)->spacerItem()) {
@@ -1902,8 +1908,8 @@
         stretchIndex = layout->count() - 1;
     }
 
     for (QAction *action : actions) {
         auto *button = new QPushButton(_ui->encryptionMessage);
         button->setText(action->text());
         button->setIcon(action->icon());
         button->setEnabled(action->isEnabled());

src/gui/application.cpp

@@ -39,6 +39,7 @@
 #include "shellextensionsserver.h"
 #elif defined(Q_OS_MACOS)
 #include "macOS/fileprovider.h"
+#include "macOS/fileprovidersettingscontroller.h"
 #include "macOS/findersyncxpc.h"
 #include "macOS/findersyncservice.h"
 #endif
@@ -124,7 +125,7 @@
 {
     ConfigFile configFile;
     const auto shouldTryToMigrate = configFile.shouldTryToMigrate();
     if (!shouldTryToMigrate) {
         qCInfo(lcApplication) << "This is not an upgrade/downgrade/migration. Proceed to read current application config file.";
         configFile.setMigrationPhase(ConfigFile::MigrationPhase::Done);
         return false;
@@ -300,7 +301,7 @@
                 qCDebug(lcApplication) << "Failed to move the old config directory to its new location (" << legacyDir << "to" << confDir << ")";
 
                 // Try to move the files one by one
                 if (QFileInfo(confDir).isDir() || QDir().mkdir(confDir)) {
                     const QStringList filesList = QDir(legacyDir).entryList(QDir::Files);
                     qCDebug(lcApplication) << "Will move the individual files" << filesList;
                     for (const auto &name : filesList) {
@@ -312,7 +313,7 @@
             } else {
 #ifndef Q_OS_WIN
                 // Create a symbolic link so a downgrade of the client would still find the config.
                 QFile::link(confDir, legacyDir);
 #endif
             }
         }
@@ -320,7 +321,7 @@
         setupConfigFile();
     }
 
     if (_theme->doNotUseProxy()) {
         ConfigFile().setProxyType(QNetworkProxy::NoProxy);
         const auto &allAccounts = AccountManager::instance()->accounts();
         for (const auto &accountState : allAccounts) {
@@ -418,7 +419,7 @@
     _gui->setupCloudProviders();
 #endif
 
     if (_theme->doNotUseProxy()) {
         ConfigFile().setProxyType(QNetworkProxy::NoProxy);
         const auto &allAccounts = AccountManager::instance()->accounts();
         for (const auto &accountState : allAccounts) {
@@ -497,7 +498,15 @@
 
 #if defined(BUILD_FILE_PROVIDER_MODULE)
     Mac::FileProvider::instance();
-    Mac::FileProvider::instance()->configureXPC();
+    if (Mac::FileProvider::available()) {
+        Mac::FileProvider::instance()->configureXPC();
+    } else {
+        // macOS 13 Ventura: instantiating the settings controller triggers the
+        // one-time cleanup that gracefully tears down any pre-existing VFS
+        // domains. The check (and this branch) can be removed once Ventura is
+        // no longer supported.
+        Mac::FileProviderSettingsController::instance();
+    }
 #endif
 
 #if defined(Q_OS_MACOS)
@@ -600,7 +609,7 @@
         const auto foldersRestoreMessage = foldersListSize > 1
             ? tr("%1 folders", "number of folders imported").arg(QString::number(foldersListSize))
             : tr("1 folder");
         const auto messageBox = new QMessageBox(QMessageBox::Information,
                                                 tr("Legacy import"),
                                                 tr("Imported %1 and %2 from a legacy desktop client.\n%3",
                                                    "number of accounts and folders imported. list of users.")
@@ -617,7 +626,7 @@
     qCWarning(lcApplication) << accountsListSize << "account(s) migrated:" << prettyNamesList(accounts);
 }
 
 void Application::setupConfigFile()
 {
     // Migrate from version <= 2.4
     setApplicationName(_theme->appNameGUI());
@@ -652,11 +661,11 @@
         qCDebug(lcApplication) << "Failed to move the old config directory to its new location (" << oldDir << "to" << confDir << ")";
 
         // Try to move the files one by one
         if (QFileInfo(confDir).isDir() || QDir().mkdir(confDir)) {
             const QStringList filesList = QDir(oldDir).entryList(QDir::Files);
             qCDebug(lcApplication) << "Will move the individual files" << filesList;
             for (const auto &name : filesList) {
                 if (!QFile::rename(oldDir + "/" + name,  confDir + "/" + name)) {
                     qCDebug(lcApplication) << "Fallback move of " << name << "also failed";
                 }
             }
@@ -669,9 +678,9 @@
     }
 }
 
 AccountManager::AccountsRestoreResult Application::restoreLegacyAccount()
 {
     ConfigFile cfg;
     const auto tryMigrate = cfg.overrideServerUrl().isEmpty();
     auto accountsRestoreResult = AccountManager::AccountsRestoreFailure;
     if (accountsRestoreResult = AccountManager::instance()->restore(tryMigrate);
@@ -748,7 +757,7 @@
 // FIXME: This is not ideal yet since a ConnectionValidator might already be running and is in
 // progress of timing out in some seconds.
 // Maybe we need 2 validators, one triggered by timer, one by network configuration changes?
 void Application::slotSystemOnlineConfigurationChanged()
 {
     if (QNetworkInformation::instance()->reachability() == QNetworkInformation::Reachability::Site ||
             QNetworkInformation::instance()->reachability() == QNetworkInformation::Reachability::Online) {
@@ -942,7 +951,7 @@
             }
         } else if (option == QStringLiteral("--overrideserverurl")) {
             if (it.hasNext() && !it.peekNext().startsWith(QLatin1String("--"))) {
                 const auto overrideUrl = it.next();
                 const auto isUrlValid = (overrideUrl.startsWith(QStringLiteral("http://")) || overrideUrl.startsWith(QStringLiteral("https://")))
                     && QUrl::fromUserInput(overrideUrl).isValid();
                 if (!isUrlValid) {
@@ -1085,7 +1094,7 @@
 {
     const ConfigFile cfg;
     const auto configLanguage = cfg.language();
     if (!configLanguage.isEmpty()) {
         // always prefer value from configuration
         return configLanguage;
     }
@@ -1137,8 +1146,8 @@
         const QString qtBaseTrFile = QLatin1String("qtbase_") + choosenLanguage;
         if (!qtTranslator->load(qtTrFile, qtTrPath)) {
             if (!qtTranslator->load(qtTrFile, trPath)) {
                 if (!qtTranslator->load(qtBaseTrFile, qtTrPath)) {
                     if (!qtTranslator->load(qtBaseTrFile, trPath)) {
                         qCDebug(lcApplication()) << "impossible to load Qt translation catalog" << qtBaseTrFile;
                     }
                 }
@@ -1146,7 +1155,7 @@
         }
         const QString qtkeychainTrFile = QLatin1String("qtkeychain_") + choosenLanguage;
         if (!qtkeychainTranslator->load(qtkeychainTrFile, qtTrPath)) {
             if (!qtkeychainTranslator->load(qtkeychainTrFile, trPath)) {
                 qCDebug(lcApplication()) << "impossible to load QtKeychain translation catalog" << qtkeychainTrFile;
             }
         }
@@ -1196,7 +1205,7 @@
 
 void Application::openVirtualFile(const QString &filename)
 {
     QString virtualFileExt = QStringLiteral(APPLICATION_DOTVIRTUALFILE_SUFFIX);
     if (!filename.endsWith(virtualFileExt)) {
         qWarning(lcApplication) << "Can only handle file ending in .owncloud. Unable to open" << filename;
         return;

src/gui/macOS/fileprovider.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
 #include <QObject>
 
 #include "fileproviderdomainmanager.h"
 #include "fileproviderservice.h"
@@ -28,6 +28,15 @@
     static FileProvider *instance();
     ~FileProvider() override;
 
+    /**
+     * @brief Whether the macOS file provider feature is usable on the current OS.
+     *
+     * Returns false on macOS 13 Ventura, where the extension is incompatible
+     * (see nextcloud/desktop#9927). This runtime check can be removed once
+     * macOS 13 Ventura is no longer supported.
+     */
+    [[nodiscard]] static bool available();
+
     void configureXPC();
     [[nodiscard]] FileProviderXPC *xpc() const;
     [[nodiscard]] FileProviderDomainManager *domainManager() const;

src/gui/macOS/fileprovider_mac.mm

@@ -6,6 +6,7 @@
 #include "fileprovider.h"
 
 #include <QLoggingCategory>
+#include <QOperatingSystemVersion>
 
 #include "libsync/configfile.h"
 #include "gui/macOS/fileproviderxpc.h"
@@ -48,13 +49,23 @@
     return _instance;
 }
 
+bool FileProvider::available()
+{
+    return QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSSonoma;
+}
+
 FileProvider::~FileProvider()
 {
     _instance = nullptr;
 }
 
 void FileProvider::configureXPC()
 {
+    if (!available()) {
+        qCInfo(lcMacFileProvider) << "Skipping file provider XPC configuration on unsupported macOS version.";
+        return;
+    }
+
     _xpc = std::make_unique<FileProviderXPC>(new FileProviderXPC(this));
 
     if (_xpc) {

src/gui/macOS/fileprovidersettingscontroller_mac.mm

@@ -57,9 +57,14 @@ explicit MacImplementation(FileProviderSettingsController *const parent)
 
         migrateToAppSandbox();
         removeOrphanedDomains();
-        restoreMissingDomains();
-        Mac::FileProvider::instance()->domainManager()->reconnectAll();
-        Mac::FileProvider::instance()->configureXPC();
+
+        if (Mac::FileProvider::available()) {
+            restoreMissingDomains();
+            Mac::FileProvider::instance()->domainManager()->reconnectAll();
+            Mac::FileProvider::instance()->configureXPC();
+        } else {
+            disableFileProviderForAllEnabledAccountsOnUnsupportedOS();
+        }
     };
 
     ~MacImplementation() override = default;
@@ -286,6 +291,32 @@ void removeOrphanedDomains()
         qCInfo(lcFileProviderSettingsController) << "Finished removing orphaned domains.";
     }
 
+    // macOS 13 Ventura cleanup: removes any pre-existing file provider domain
+    // gracefully (preserving dirty user data) for each account that still has
+    // VFS enabled. Can be deleted once Ventura is no longer supported.
+    void disableFileProviderForAllEnabledAccountsOnUnsupportedOS()
+    {
+        qCInfo(lcFileProviderSettingsController) << "macOS 13 Ventura: disabling file provider for all enabled accounts.";
+
+        const auto accountStates = AccountManager::instance()->accounts();
+
+        for (const auto &accountState : accountStates) {
+            const auto account = accountState->account();
+
+            if (!account) {
+                continue;
+            }
+
+            if (account->fileProviderDomainIdentifier().isEmpty()) {
+                continue;
+            }
+
+            const auto userIdAtHost = account->userIdAtHostWithPort();
+            qCInfo(lcFileProviderSettingsController) << "Disabling file provider for account" << userIdAtHost;
+            (void)setVfsEnabledForAccount(userIdAtHost, false);
+        }
+    }
+
 private:
     [[maybe_unused]] FileProviderSettingsController *q = nullptr;
 };

src/gui/wizard/owncloudadvancedsetuppage.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <QDir>
 #include <QFileDialog>
 #include <QUrl>
 #include <QTimer>
@@ -106,7 +106,7 @@
 #ifdef Q_OS_WIN
         bestAvailableVfsMode() == Vfs::WindowsCfApi
 #elif defined(BUILD_FILE_PROVIDER_MODULE)
-        true
+        Mac::FileProvider::available()
 #else
         false
 #endif
@@ -149,14 +149,14 @@
 {
     WizardCommon::initErrorLabel(_ui.errorLabel);
 
-    if (Theme::instance()->disableVirtualFilesSyncFolder()
-            || !(Theme::instance()->showVirtualFilesOption()
+    const auto hideVfsOption = Theme::instance()->disableVirtualFilesSyncFolder()
 #ifdef BUILD_FILE_PROVIDER_MODULE
-                 || true
+        || !Mac::FileProvider::available();
 #else
-                 && bestAvailableVfsMode() != Vfs::Off
+        || !(Theme::instance()->showVirtualFilesOption() && bestAvailableVfsMode() != Vfs::Off);
 #endif
-    )) {
+
+    if (hideVfsOption) {
         // If the layout were wrapped in a widget, the auto-grouping of the
         // radio buttons no longer works and there are surprising margins.
         // Just manually hide the button and remove the layout.
@@ -200,7 +200,7 @@
     }
 
     ConfigFile cfgFile;
     auto newFolderLimit = cfgFile.newBigFolderSizeLimit();
     _ui.confCheckBoxSize->setChecked(newFolderLimit.first);
     _ui.confSpinBox->setValue(newFolderLimit.second);
     _ui.confCheckBoxExternal->setChecked(cfgFile.confirmExternalStorage());
@@ -305,7 +305,7 @@
     const QString locFolder = localFolder();
 
     // check if the local folder exists. If so, and if its not empty, show a warning.
     const auto pathValidityCheckResult = FolderMan::instance()->checkPathValidityForNewFolder(locFolder, serverUrl());
     auto errorStr = pathValidityCheckResult.second;
     _localFolderValid = errorStr.isEmpty() || pathValidityCheckResult.first == FolderMan::PathValidityResult::ErrorNonEmptyFolder;
 
@@ -423,10 +423,10 @@
     if (useVirtualFileSync()) {
         const auto availability = Vfs::checkAvailability(localFolder(), bestAvailableVfsMode());
         if (!availability) {
             auto msg = new QMessageBox(QMessageBox::Warning,
                                        tr("Virtual files are not supported at the selected location"),
                                        availability.error(),
                                        QMessageBox::Ok, this);
             msg->setAttribute(Qt::WA_DeleteOnClose);
             msg->open();
             return false;
@@ -576,7 +576,7 @@
     updateStatus();
 }
 
 void OwncloudAdvancedSetupPage::slotQuotaRetrievedWithError(QNetworkReply *reply)
 {
     Q_UNUSED(reply)
     _rSize = -1;

src/gui/wizard/owncloudwizard.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "account.h"
 #include "config.h"
 #include "configfile.h"
 #include "theme.h"
@@ -162,11 +162,11 @@
     QList<QSize> pageSizes;
     const auto pIds = pageIds();
 
     std::transform(pIds.cbegin(), pIds.cend(), std::back_inserter(pageSizes), [this](int pageId) {
         auto p = page(pageId);
         p->adjustSize();
         return p->sizeHint();
     });
 
     return pageSizes;
 }
@@ -233,7 +233,7 @@
 bool OwncloudWizard::useVirtualFileSyncByDefault() const
 {
 #ifdef BUILD_FILE_PROVIDER_MODULE
-    return true;
+    return Mac::FileProvider::available();
 #else
     return false;
 #endif
@@ -392,7 +392,7 @@
 
 void OwncloudWizard::displayError(const QString &msg, bool retryHTTPonly)
 {
     switch (static_cast<WizardCommon::Pages>(currentId())) {
     case WizardCommon::Page_Welcome:
     case WizardCommon::Page_Flow2AuthCreds:
 #ifdef WITH_WEBENGINE
@@ -457,7 +457,7 @@
     QWizard::changeEvent(e);
 }
 
 void OwncloudWizard::hideEvent(QHideEvent *event)
 {
     QWizard::hideEvent(event);
 #ifdef Q_OS_MACOS
@@ -466,7 +466,7 @@
 #endif
 }
 
 void OwncloudWizard::closeEvent(QCloseEvent *event)
 {
     emit wizardClosed();
     QWizard::closeEvent(event);