feat: unify v20 and v25 DConfig support

[18202781743]

Summary

• cherry-pick selected eagle Authorized, OEM, root-check, and Qt5 compatibility commits with original metadata
• support C++17 builds with DTK5/Qt5 and DTK6/Qt6
• select Qt5 or v25 runtime systemd, D-Bus activation/config, and policy resources by Qt major version
• document the comparison, integration design, cache behavior, and validation results

Dependency

• depends on fix: preserve legacy DConfig cache with prefixed cache dtkcore#582

Validation

• DTK5 Release full build against the staged dtkcore change: passed (-j6)
• DTK6 Release full build against the staged dtkcore change: passed (-j6)
• non-environment-dependent unit tests: 27/27 passed on both builds
• install selection: Qt5 resources and policy verified; Qt6 v25 resources verified with no v20 policy

The five remaining removeUserData* tests require UID 1001-1004, which are absent in the current container. v20 runtime service and Debian package validation are intentionally out of scope.

Summary by Sourcery

Unify DConfig support across v20 and v25 by adding authorized access controls, Qt5/Qt6 runtime selection, and cross-version build compatibility.

New Features:

• Add authorized read-only and read-write DConfig permissions with root and SID2 caller validation.
• Support Qt5 and Qt6 builds with version-specific D-Bus, systemd, and PolicyKit resources.
• Preserve OEM-exported JSON arrays and improve OEM dialog resizing and usability.

Bug Fixes:

• Fix Qt5 compatibility for file timestamp handling and prevent unauthorized access to authorized configuration items.

Enhancements:

• Adopt C++17 for the dconfig-center build and select canonical runtime resources according to the Qt major version.
• Unify v20 and v25 integration while retaining compatible Qt5 runtime resources and existing Qt6 resources.

Deployment:

• Install the appropriate Qt5 or Qt6 D-Bus activation, configuration, systemd, and PolicyKit resources based on the selected Qt version.

Documentation:

• Document the v20/v25 integration approach, cache compatibility behavior, implementation decisions, and validation results.

Tests:

• Validate DTK5 and DTK6 release builds, unit tests, cache and permission behavior, and version-specific installation contents.

[deepin-ci-robot]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: 18202781743

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

• debian/deepin/OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[github-actions]

Warning

[Debian检查]

• 检测到敏感词export变动

详情

    {
    "export": {
        "dconfig-center/dde-dconfig-editor/oemdialog.cpp": {
            "b": [
                "    m_exportView->header()->setSectionResizeMode(QHeaderView::Interactive);",
                "    m_exportView->header()->resizeSection(0, 250);"
            ]
        }
    }
}

[sourcery-ai]

Reviewer's Guide

This PR integrates selected v20/eagle functionality into the mainline while preserving Qt6/v25 behavior: it adds authorized SID2-validated configuration access, builds under C++17 for both Qt generations, chooses matching runtime resources at install time, improves OEM JSON export/UI behavior, and documents the cache/integration design and validation.

Sequence diagram for authorized D-Bus configuration access

sequenceDiagram
    participant Caller
    participant DBus as D-Bus
    participant Conn as DSGConfigConn
    participant Proc as Linux procfs

    Caller->>DBus: setValue(key, value)
    D-Bus->>Conn: dispatch setValue(key, value)
    Conn->>Conn: checkValid(key)
    Conn->>Conn: getPermissions(key)
    alt authorizedreadonly or authorizedreadwrite
        Conn->>DBus: serviceUid(service)
        Conn->>DBus: servicePid(service)
        Conn->>Proc: read /proc/pid/attr/sid2
        Proc-->>Conn: SID2 security label
        alt valid root and deepin SID2 label
            Conn->>Conn: hasPermissionByUid(key)
            Conn-->>DBus: apply configuration change
        else unauthorized caller
            Conn-->>DBus: sendErrorReply(QDBusError::Failed, errorMsg)
        end
    else readonly or readwrite
        Conn->>Conn: hasPermissionByUid(key)
    end

Loading

Flow diagram for Qt-version runtime resource installation

flowchart TD
    A[Configure project] --> B{QT_VERSION_MAJOR}
    B -->|5| C[Select services/qt5 resources]
    C --> D[Install D-Bus config and activation]
    C --> E[Install systemd service]
    C --> F[Install PolicyKit policy]
    B -->|6| G[Select v25 resources]
    G --> H[Install D-Bus config and activation]
    G --> I[Install systemd service]
    G --> J[Skip v20 PolicyKit policy]

Loading

Flow diagram for compatible DConfig cache loading

flowchart LR
    A[DConfigCache::load] --> B{cachePathPrefix set?}
    B -->|No| C[Load default cache]
    B -->|Yes| D[Load old default cache]
    D --> E[Load new prefixed cache]
    E --> F[Merge contents]
    F --> G[New cache values overwrite same keys]
    G --> H[DConfigCache::save writes prefixed cache]

Loading

File-Level Changes

Change	Details	Files
Unify Qt5/DTK5 and Qt6/DTK6 builds and runtime resource installation.	Raise the project standard to C++17. Select systemd, D-Bus activation/configuration, and PolicyKit files from QT_VERSION_MAJOR while installing canonical filenames. Add Qt5-specific service, activation, and policy resources while retaining the Qt6/v25 resources for Qt6 builds. Update timestamp API usage and includes for Qt5/Qt6 compatibility.	dconfig-center/CMakeLists.txt dconfig-center/dde-dconfig-daemon/CMakeLists.txt dconfig-center/dde-dconfig-daemon/services/qt5/dde-dconfig-daemon.service dconfig-center/dde-dconfig-daemon/services/qt5/org.desktopspec.ConfigManager.conf dconfig-center/dde-dconfig-daemon/services/qt5/org.desktopspec.ConfigManager.policy dconfig-center/dde-dconfig-daemon/services/qt5/org.desktopspec.ConfigManager.service dconfig-center/dde-dconfig-daemon/dconfigserver.cpp dconfig-center/dde-dconfig-daemon/dconfigserver.h
Add authorized configuration permissions backed by D-Bus sender and SID2 validation.	Expose authorized-read-only and authorized-read-write permission names. Route mutating operations through key validation before permission checks or reset. Resolve the D-Bus sender UID/PID and require root plus an accepted Deepin SID2 label for authorized keys. Return D-Bus errors when authorized callers fail validation.	dconfig-center/dde-dconfig-daemon/dconfig_global.h dconfig-center/dde-dconfig-daemon/dconfigconn.cpp dconfig-center/dde-dconfig-daemon/dconfigconn.h
Improve OEM editor behavior and JSON export compatibility.	Allow the OEM dialog to be resized and configure interactive table headers and horizontal scrolling. Convert string-valued JSON arrays into actual JSON arrays during export.	dconfig-center/dde-dconfig-editor/mainwindow.cpp dconfig-center/dde-dconfig-editor/oemdialog.cpp
Document the v20/v25 integration strategy, cache compatibility model, and validation scope.	Record cherry-picked commits and the Qt-major-version resource split. Document dtkcore's old/new cache overlay and save behavior, including its accepted deletion limitation. Capture DTK5/DTK6 build, test, and install verification results and explicitly excluded validation.	dconfig-center/docs/v20-v25-integration-plan.md

---

Tips and commands

Interacting with Sourcery

• Trigger a new review: Comment @sourcery-ai review on the pull request.
• Continue discussions: Reply directly to Sourcery's review comments.
• Generate a GitHub issue from a review comment: Ask Sourcery to create an
  issue from a review comment by replying to it. You can also reply to a
  review comment with @sourcery-ai issue to create an issue from it.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a title at any time. You can also comment
  @sourcery-ai title on the pull request to (re-)generate the title at any time.
• Generate a pull request summary: Write @sourcery-ai summary anywhere in
  the pull request body to generate a PR summary at any time exactly where you
  want it. You can also comment @sourcery-ai summary on the pull request to
  (re-)generate the summary at any time.
• Generate reviewer's guide: Comment @sourcery-ai guide on the pull
  request to (re-)generate the reviewer's guide at any time.
• Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
  pull request to resolve all Sourcery comments. Useful if you've already
  addressed all the comments and don't want to see them anymore.
• Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
  request to dismiss all existing Sourcery reviews. Especially useful if you
  want to start fresh with a new review - don't forget to comment
  @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

• Enable or disable review features such as the Sourcery-generated pull request
  summary, the reviewer's guide, and others.
• Change the review language.
• Add, remove or edit custom review instructions.
• Adjust other review settings.

Getting Help

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[sourcery-ai]

Hey - I've found 1 issue

Prompt for AI Agents

Please address the comments from this code review:

## Individual Comments

### Comment 1
<location path="dconfig-center/dde-dconfig-daemon/dconfigconn.cpp" line_range="135" />
<code_context>
 void DSGConfigConn::setValue(const QString &key, const QDBusVariant &value)
 {
-    if (!contains(key))
+    if (!checkValid(key))
         return;

</code_context>
<issue_to_address>
**issue (bug_risk):** `reset()` validates an `AuthorizedReadOnly` item through `checkValid()`, but `checkValid()` only verifies the SID2/root authorization and `reset()` never calls `hasPermissionByUid()` or otherwise rejects read-only permissions. An authorized root caller can therefore reset a read-only configuration item.

**Triggers:** When a configuration item has the newly supported `AuthorizedReadOnly` permission and a root caller invokes `reset`.

**Suggested fix:** Reject `ReadOnly` and `AuthorizedReadOnly` permissions in `reset()`, or share the same write-permission check used by `setValue()`.
</issue_to_address>

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}

[sourcery-ai]

issue (bug_risk): reset() validates an AuthorizedReadOnly item through checkValid(), but checkValid() only verifies the SID2/root authorization and reset() never calls hasPermissionByUid() or otherwise rejects read-only permissions. An authorized root caller can therefore reset a read-only configuration item.

Triggers: When a configuration item has the newly supported AuthorizedReadOnly permission and a root caller invokes reset.

Suggested fix: Reject ReadOnly and AuthorizedReadOnly permissions in reset(), or share the same write-permission check used by setValue().