feat: resolve overrideServerUrl and overrideLocalDir via managed sett… by cw-nvdael · Pull Request #11043 · nextcloud/desktop

cw-nvdael · 2026-10-09T11:02:22Z

Resolves

Part of #5497.

overrideServerUrl and overrideLocalDir now resolve through the managed settings framework (ConfigFile::getConfig). They can be set by device policy (registry / managed plist) or as a device default, in addition to the existing --overrideserverurl / --overridelocaldir command-line options.

Summary

Wizard behaviour per source

Source	Wizard behaviour
Device default	Prefilled and editable; applies to every new account setup
Device policy	Locked; login flow starts automatically
Command line	Locked; login flow starts automatically, one-shot (removed after the account is added)

Details

The server cannot set these keys, since they are needed before an account exists.
Values are validated against the schema: http(s) URL or JSON list of {name, url} for overrideServerUrl, absolute path for overrideLocalDir. Empty or invalid values are skipped, including empty user values that older clients wrote after account setup.
A JSON server list offers a choice only when the URL is locked. This is existing upstream behaviour (initialiseOverrideServerChoices).
New ConfigFile::clearConfig() removes a user value so the next source applies again.
Legacy account migration (restoreLegacyAccount, nextcloudcmd) is skipped only for an override from the user config.
Docs: doc/settings/managed-settings.md.

Deliberate choices

The wizard never sets forceOverrideServerUrl to false. Otherwise branded builds with APPLICATION_SERVER_URL_ENFORCE would lose their lock.
Test names follow the camelCase style of the existing test files, not the testUnit_state_expected pattern from the Coding Style wiki.
Out of scope: overrideServerUrl parameter not cleared from running client after account setup #10640. The Theme keeps the override in memory, so "Add account" in the same session uses the old value.

Testing

Linux CI container (client-qt6:client-sid-6.10.2-4, -Werror):

ManagedSettingsTest 84/84
AccountWizardControllerTest 39/39
MigrationTest 21/21
UriSchemeHandlerTest 16/16

The new tests fail without the fix: the wizard default test fails without the lock change, and 10 value-check cases fail without the validator.

Manual test on Windows (Craft build), six scenarios: device default, policy, policy with server list, invalid policy value, empty legacy user value, command line.

macOS and Linux were not tested manually.

TODO

Building ADMX Templates

Checklist

Sign-off message is added to all commits.
The commit messages are following The Conventional Commits specification.
The commit history is clean with no merge commits.
- How to rebase your commits
- How to squash commits with rebase
Uploaded screenshots from before and after for UI changes.
Test(s) added to branch, with before/after results included in PR description, for performance improvements where applicable.
Documentation has been updated or is not required.
Backports requested where applicable (critical bugfixes).
Labels added where applicable (bug/enhancement).
Milestone added for target version.

AI (if applicable)

The content of this PR was partly or fully generated using AI
- I have read the guidelines for AI-assisted contributions.
- I have read Nextcloud's AI Contribution Policy.

…ings Signed-off-by: Nathan van Dael <n.vandael@cloudwise.nl>

camilasan · 2026-10-13T17:12:55Z

+    cfg.clearOverrideServerUrl();
+    cfg.clearOverrideLocalDir();


This only clears the user value. A device default or policy overrideLocalDir stays e.g. Nextcloud, so it applies to every account added later. For a second account, initialiseLocalSyncFolder() gets the first account folder, findGoodPathForNewSyncFolder() rejects it and falls back to e.g Nextcloud2.
However, with a policy enforced URL, the auto finish skips the sync options step, so the user never sees this. Should a overrideLocalDir only apply to the first account, or should this be handled explicitly?

Assisted-by: Claude:claude-opus-5-5

- Return whether setOverrideServerUrl() and setOverrideLocalDir() wrote the value, and show a hint when a policy blocks --overrideserverurl or --overridelocaldir. - Reject a --overridelocaldir path that is not absolute while parsing the command line, using the schema validator. - Add ConfigFile::isOverrideServerUrlLocked(), shared by the wizard and the nc:// URI scheme handler, so only a policy or command line value locks the server URL and restricts login links. Builds enable APPLICATION_SERVER_URL_ENFORCE by default, so the wizard now clears the lock for a device default. - Apply an overrideLocalDir from device default or policy only to the first account, in the wizard and for account setup from the command line. A command line value still applies to the next account. Skip the sync options step only for a locked folder. - Update the docs and add tests. Assisted-by: ClaudeCode:claude-opus-5-5 Signed-off-by: Nathan van Dael <n.vandael@cloudwise.nl>

camilasan · 2026-10-15T14:44:34Z

+            Theme::instance()->setForceOverrideServerUrl(true);
+            Theme::instance()->setStartLoginFlowAutomatically(true);
+        } else {
+            Theme::instance()->setForceOverrideServerUrl(false);


the false in this line should depend on the boolean set in APPLICATION_SERVER_URL_ENFORCE.
the way this is now, a branded client with APPLICATION_SERVER_URL_ENFORCE set to true will not enforce the server url as expected.

camilasan · 2026-10-15T14:45:48Z

+                    _overrideLocalDir = overrideLocalDir;
+                }
            } else {
                showHint("Invalid URL passed to --overridelocaldir");


Suggested change

showHint("Invalid URL passed to --overridelocaldir");

showHint("Invalid path passed to --overridelocaldir");

camilasan

After this round, I think it will be good enough to merge it.
thanks for the contribution!

- A device default no longer unlocks the server URL in a build that sets APPLICATION_SERVER_URL together with APPLICATION_SERVER_URL_ENFORCE. Standard builds enable APPLICATION_SERVER_URL_ENFORCE without a URL, so a device default stays editable there. - Say "Invalid path" when --overridelocaldir is given without a path. Assisted-by: ClaudeCode:claude-opus-5-5 Signed-off-by: Nathan van Dael <n.vandael@cloudwise.nl>

cw-nvdael · 2026-10-20T15:00:02Z

Hi @camilasan . I've implemented your feedback, thanks for giving this to me.

github-actions · 2026-10-24T01:59:45Z

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.)

feat: resolve overrideServerUrl and overrideLocalDir via managed sett…

2fbca9e

…ings Signed-off-by: Nathan van Dael <n.vandael@cloudwise.nl>

cw-nvdael requested review from camilasan, claucambra, i2h3, mgallien and nilsding as code owners October 9, 2026 11:02

camilasan requested changes Oct 13, 2026

View reviewed changes

camilasan reviewed Oct 15, 2026

View reviewed changes

camilasan requested changes Oct 15, 2026

View reviewed changes

camilasan self-assigned this Oct 19, 2026

camilasan approved these changes Oct 20, 2026

View reviewed changes

github-actions Bot added the feedback-requested label Oct 24, 2026

Navigation Menu

Repository navigation

feat: resolve overrideServerUrl and overrideLocalDir via managed sett… - #11043

feat: resolve overrideServerUrl and overrideLocalDir via managed sett…#11043
cw-nvdael wants to merge 3 commits into
nextcloud:masterfrom
cw-nvdael:feat/managed-override-server-url

cw-nvdael commented Oct 9, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

camilasan Oct 13, 2026

Uh oh!

Uh oh!

camilasan Oct 15, 2026

Uh oh!

camilasan Oct 15, 2026

Uh oh!

camilasan left a comment

Uh oh!

cw-nvdael commented Oct 20, 2026

Uh oh!

github-actions Bot commented Oct 24, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	showHint("Invalid URL passed to --overridelocaldir");
	showHint("Invalid path passed to --overridelocaldir");

Conversation

cw-nvdael commented Oct 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Resolves

Summary

Wizard behaviour per source

Details

Deliberate choices

Testing

TODO

Checklist

AI (if applicable)

Uh oh!

Uh oh!

Uh oh!

Uh oh!

camilasan Oct 13, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

camilasan Oct 15, 2026

Choose a reason for hiding this comment

Uh oh!

camilasan Oct 15, 2026

Choose a reason for hiding this comment

Uh oh!

camilasan left a comment

Choose a reason for hiding this comment

Uh oh!

cw-nvdael commented Oct 20, 2026

Uh oh!

github-actions Bot commented Oct 24, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

cw-nvdael commented Oct 9, 2026 •

edited

Loading