Skip to content

Conversation

@calsys456
Copy link
Contributor

@calsys456 calsys456 commented Dec 30, 2025

This will work as intended.

Summary by Sourcery

Bug Fixes:

  • Fix an incorrect hardcoded username string in the XDG session validation logic to ensure proper handling for the intended user.

This will work as intended.
@deepin-ci-robot
Copy link

Hi @calsys456. Thanks for your PR.

I'm waiting for a linuxdeepin member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@sourcery-ai
Copy link

sourcery-ai bot commented Dec 30, 2025

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Adjusts the session activation guard to validate against the correct system user name when no valid XDG session ID is present.

File-Level Changes

Change Details Files
Correct the hard-coded username used to validate session activation when xdgSessionId is non-positive.
  • Update the username string literal in the activateSession guard from the old value to the corrected system username
  • Keep the validation logic structure and logging behavior unchanged while relying on the new username
src/daemon/Display.cpp

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

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey - I've found 1 issue, and left some high level feedback:

  • Consider replacing the hard-coded username string ("dde") with a named constant or configuration value so that any future username changes are easier to manage and less error-prone.
  • It may be worth double-checking that all related code paths using the special ddm/dde user are updated consistently so this behavioral change does not introduce inconsistencies elsewhere.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- Consider replacing the hard-coded username string ("dde") with a named constant or configuration value so that any future username changes are easier to manage and less error-prone.
- It may be worth double-checking that all related code paths using the special ddm/dde user are updated consistently so this behavioral change does not introduce inconsistencies elsewhere.

## Individual Comments

### Comment 1
<location> `src/daemon/Display.cpp:133` </location>
<code_context>

     void Display::activateSession(const QString &user, int xdgSessionId) {
-        if (xdgSessionId <= 0 && user != QStringLiteral("ddm")) {
+        if (xdgSessionId <= 0 && user != QStringLiteral("dde")) {
             qCritical() << "Invalid xdg session id" << xdgSessionId << "for user" << user;
             return;
</code_context>

<issue_to_address>
**suggestion:** Consider centralizing the special user name instead of hardcoding the string literal here.

This condition now relies on the literal "dde". If this is a well-known system user, define it once (e.g., as a constant or config value) and reference it here to avoid future mismatches and make the special handling explicit.

Suggested implementation:

```cpp
    }

    namespace {
    const QString kDisplayManagerUser = QStringLiteral("dde");
    }

    void Display::activateSession(const QString &user, int xdgSessionId) {
        if (xdgSessionId <= 0 && user != kDisplayManagerUser) {
            qCritical() << "Invalid xdg session id" << xdgSessionId << "for user" << user;
            return;
        }

```

If there are other occurrences of the literal `"dde"` (or the previous `"ddm"`) in this file representing the same special system user, they should also be replaced with `kDisplayManagerUser` for consistency.
</issue_to_address>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@calsys456 calsys456 changed the title fix: fix username spell error fix: fix flash black on login Dec 30, 2025
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: calsys456, zccrs

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

Details Needs approval from an approver in each of these files:

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

@zccrs zccrs merged commit ef8f106 into linuxdeepin:master Dec 31, 2025
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants