Bugfix/enforce enterprise update channel #9139

Aiiaiiio · 2025-11-26T16:24:49Z

Solves #9004

The idea is:

On startup, the enterprise update channel is set to invalid. Every time we get server capabilities we'll set the most stable enterprise update channel.
When getting the update channel for the updater, we also check the enterprise channel, and use the most stable option.

src/libsync/updatechannel.cpp

src/libsync/configfile.cpp

nilsding · 2025-11-27T14:14:00Z

src/libsync/configfile.cpp

+    const auto currentChannel = UpdateChannel::fromString(settings.value(QLatin1String(updateChannelC), defaultUpdateChannel()).toString());
+    const auto enterpriseChannel = UpdateChannel::fromString(desktopEnterpriseChannel());
+    return UpdateChannel::mostStable(currentChannel, enterpriseChannel).toString();
 }


IMO these methods should return the values for the corresponding keys in the config file.
Keep in mind that the value of the desired enterprise channel should only be considered for unbranded clients connected to a server with a valid subscription, while branded clients only have the stable channel available.

also, since there is now a separate UpdateChannel class I think it would be cleaner to:

move the methods related to the update channel that are not really modifying the configuration from ConfigFile to that one (e.g. defaultUpdateChannel and validUpdateChannels)

add a function that determines the desired update channel (pretty much what defaultUpdateChannel does), and pass that as the channel query parameter in OCC::Updater

perhaps add some unit tests to verify which updater channel should be used

nilsding · 2025-11-27T14:21:02Z

src/gui/application.cpp

+    // In the config, set the enterprise update channel to invalid, so it can be bumped up
+    // when recieving server capabilites.
+    ConfigFile configFile;
+    configFile.setDesktopEnterpriseChannel(UpdateChannel::fromString("invalid").toString());


with the current implementation of ConfigFile::setDesktopEnterpriseChannel this won't have any effect if the update channel is already set to enterprise

You're right. The info shown by the client mislead me.

mgallien · 2025-11-27T13:48:03Z

src/gui/application.cpp

+    // In the config, set the enterprise update channel to invalid, so it can be bumped up
+    // when recieving server capabilites.
+    ConfigFile configFile;
+    configFile.setDesktopEnterpriseChannel(UpdateChannel::fromString("invalid").toString());
+


so on every start, we will force override the value of the setting
why are we storing it if we are doing that ?

That is a good question. It was already there. But you're right it doesn't need to be in the config actually... I'll think some more about this.

Now I think it's best to leave this config option in the config file. I cannot use a plain member in this class, because we create a new instance every time we want to access the config. I cannot really think of good place to put it either, because it is needed from multiple places. To leave it here is convenient.

src/libsync/updatechannel.h

nilsding · 2025-12-02T09:57:42Z

src/libsync/updatechannel.cpp

@@ -0,0 +1,60 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 ownCloud GmbH


This is a new class not originally present in the forked-from codebase

Suggested change

* SPDX-FileCopyrightText: 2025 ownCloud GmbH

nilsding · 2025-12-02T09:57:47Z

src/libsync/updatechannel.h

@@ -0,0 +1,44 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 ownCloud GmbH


This is a new class not originally present in the forked-from codebase

Suggested change

* SPDX-FileCopyrightText: 2025 ownCloud GmbH

nilsding · 2025-12-02T10:12:31Z

src/libsync/account.cpp

 {
+    const auto capabilityEnterpriseChannel = UpdateChannel::fromString(_capabilities.desktopEnterpriseChannel());
+    _enterpriseUpdateChannel = capabilityEnterpriseChannel;
+    qCInfo(lcAccount()) << "lulu | enterp chn updated: " << _enterpriseUpdateChannel.toString() << "  str: " << _capabilities.desktopEnterpriseChannel();


Suggested change

qCInfo(lcAccount()) << "lulu | enterp chn updated: " << _enterpriseUpdateChannel.toString() << " str: " << _capabilities.desktopEnterpriseChannel();

qCInfo(lcAccount()) << "Account" << id() << "received enterprise channel:" << _enterpriseUpdateChannel.toString();

nilsding · 2025-12-02T10:20:35Z

src/gui/accountmanager.cpp

+{
+    UpdateChannel most_stable_channel = UpdateChannel::Invalid;
+    for (const auto &account : std::as_const(_accounts)) {
+        if (auto accounts_channel = account->account()->enterpriseUpdateChannel(); accounts_channel > most_stable_channel) {


might want to exclude accounts not having a valid subscription here as well

nilsding

test itself looks fine to me, thanks :)

nilsding · 2025-12-02T15:43:03Z

test/testupdatechannel.cpp

+                FileInfo fi;
+                reply = new FakeFakeDeleteReply(this);
+                return reply;


please add a comment why this QNAM override is required (e.g. side-effect of AccountManager::deleteAccount)

wouldn't an empty FakePayloadReply be enough here?

Suggested change

FileInfo fi;

reply = new FakeFakeDeleteReply(this);

return reply;

reply = new FakePayloadReply(op, req, {}, this);

[issue 9004] Signed-off-by: Tamás Bari <[email protected]>

But only if it's more stable. Signed-off-by: Tamás Bari <[email protected]>

but override it. Signed-off-by: Tamás Bari <[email protected]>

Force set the enterprise channel to invalid on startup. Only provide the enterprise update channel is the server has a valid subscription. Signed-off-by: Tamás Bari <[email protected]>

This approach integrates better into the current mechanisms. Signed-off-by: Tamás Bari <[email protected]>

According to review suggetsions. Signed-off-by: Tamás Bari <[email protected]>

…annel. Signed-off-by: Tamás Bari <[email protected]>

Signed-off-by: Tamás Bari <[email protected]>

…has a valid subscription Signed-off-by: Tamás Bari <[email protected]>

Signed-off-by: Tamás Bari <[email protected]>

Also removing the new one which did the same thing. Signed-off-by: Tamás Bari <[email protected]>

Signed-off-by: Tamás Bari <[email protected]>

github-actions · 2025-12-03T12:59:41Z

Artifact containing the AppImage: nextcloud-appimage-pr-9139.zip

Digest: sha256:839c72ed2ae10217d7aef2243f18f2eb8194d3c37319ccdbdf1f3cc78bbadefc

To test this change/fix you can download the above artifact file, unzip it, and run it.

Please make sure to quit your existing Nextcloud app and backup your data.

sonarqubecloud · 2025-12-03T13:52:38Z

Quality Gate failed

Failed conditions
74.1% Coverage on New Code (required ≥ 80%)
160 New Code Smells (required ≤ 0)
D Security Rating on New Code (required ≥ A)
D Maintainability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

mgallien · 2025-12-03T14:29:09Z

/backport to stable-4.0

github-actions · 2025-12-11T02:17:32Z

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

Aiiaiiio requested review from camilasan, i2h3, mgallien and nilsding as code owners November 26, 2025 16:24

nilsding requested changes Nov 27, 2025

View reviewed changes

mgallien requested changes Nov 27, 2025

View reviewed changes

Rello added this to the 4.0.3 milestone Nov 28, 2025

nilsding requested changes Dec 2, 2025

View reviewed changes

Aiiaiiio requested review from mgallien and nilsding December 2, 2025 15:52

Aiiaiiio force-pushed the bugfix/enforceEnterpriseUpdateChannel branch from 65b9865 to 116de06 Compare December 2, 2025 21:11

nilsding modified the milestones: 4.0.3, 4.0.4 Dec 3, 2025

mgallien approved these changes Dec 3, 2025

View reviewed changes

nilsding approved these changes Dec 3, 2025

View reviewed changes

Aiiaiiio added 14 commits December 3, 2025 13:49

fix: Enforce enterprise update channel

5feb837

[issue 9004] Signed-off-by: Tamás Bari <[email protected]>

fix: Set the current update channel together with the enterprise channel

883fa35

But only if it's more stable. Signed-off-by: Tamás Bari <[email protected]>

fix: Do not overwrite the update channel with enterprise

9cfa617

but override it. Signed-off-by: Tamás Bari <[email protected]>

fix: proper update channels

41f5906

Force set the enterprise channel to invalid on startup. Only provide the enterprise update channel is the server has a valid subscription. Signed-off-by: Tamás Bari <[email protected]>

fix: Per-account enterprise update channel

f823ebc

This approach integrates better into the current mechanisms. Signed-off-by: Tamás Bari <[email protected]>

fix: Making UpdateChannel more consistent

23461ad

According to review suggetsions. Signed-off-by: Tamás Bari <[email protected]>

fix: Taking branded clients into account when selecting the update ch…

aa58da3

…annel. Signed-off-by: Tamás Bari <[email protected]>

chore: Adding a test case to test update channel selection

6eb1c3e

Signed-off-by: Tamás Bari <[email protected]>

fix: Moving default update channel lists and constants to UpdateChannel

6764f17

Signed-off-by: Tamás Bari <[email protected]>

fix: consider enterprise update channel only if the account's server …

2719c8f

…has a valid subscription Signed-off-by: Tamás Bari <[email protected]>

fix: Removing debug log clutter

cac440f

Signed-off-by: Tamás Bari <[email protected]>

fix: Fixing license header in new files

daec362

Signed-off-by: Tamás Bari <[email protected]>

fix: Using FakePayloadReply in unit test

61562f1

Also removing the new one which did the same thing. Signed-off-by: Tamás Bari <[email protected]>

fix: adding missing export directive

9123e7d

Signed-off-by: Tamás Bari <[email protected]>

fix: Fixing the license in testupdatechannel.cpp

8463862

Signed-off-by: Tamás Bari <[email protected]>

Aiiaiiio force-pushed the bugfix/enforceEnterpriseUpdateChannel branch from bf94adf to 8463862 Compare December 3, 2025 12:50

Aiiaiiio enabled auto-merge December 3, 2025 12:51

Aiiaiiio merged commit 848f6a1 into master Dec 3, 2025
20 checks passed

Aiiaiiio deleted the bugfix/enforceEnterpriseUpdateChannel branch December 3, 2025 13:31

mgallien modified the milestones: 4.0.4, 4.1.0 Dec 3, 2025

backportbot bot added the backport-request label Dec 3, 2025

backportbot bot mentioned this pull request Dec 3, 2025

[stable-4.0] Bugfix/enforce enterprise update channel #9174

Merged

backportbot bot removed the backport-request label Dec 3, 2025

Rello moved this to ☑️ Done in 💻 Desktop Clients team Dec 5, 2025

Rello added this to 💻 Desktop Clients team Dec 5, 2025

Rello removed this from 💻 Desktop Clients team Dec 5, 2025

github-actions bot added the feedback-requested label Dec 11, 2025

	qCInfo(lcAccount()) << "lulu \| enterp chn updated: " << _enterpriseUpdateChannel.toString() << " str: " << _capabilities.desktopEnterpriseChannel();
	qCInfo(lcAccount()) << "Account" << id() << "received enterprise channel:" << _enterpriseUpdateChannel.toString();

Bugfix/enforce enterprise update channel #9139

Bugfix/enforce enterprise update channel #9139

Uh oh!

Conversation

Aiiaiiio commented Nov 26, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nilsding left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Dec 3, 2025

Uh oh!

Uh oh!

sonarqubecloud bot commented Dec 3, 2025

Quality Gate failed

Uh oh!

mgallien commented Dec 3, 2025

Uh oh!

github-actions bot commented Dec 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants