[calsys456]

Some child processes may linger (e.g. gnome-keyring-daemon), kill them to avoid the whole session stuck in closing state. Send SIGKILL directly may make systemd-logind be left in a bad state and cannot handle future login, so send SIGTERM instead.

TODO: Find out why

Summary by Sourcery

Ensure lingering login sessions are cleanly terminated by sending SIGTERM to processes that do not exit after TerminateSession, and improve session lookup error handling in authentication.

Bug Fixes:

• Send SIGTERM to all processes in a session that remains after TerminateSession to prevent sessions from getting stuck in a closing state.
• Use the DBus reply error helper to reliably detect failures when resolving a session by PID during authentication.

[sourcery-ai]

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Adds a follow-up SIGTERM-based KillSession call after TerminateSession to ensure lingering child processes are cleaned up without destabilizing logind, and simplifies the D-Bus error check for GetSessionByPID.

Sequence diagram for session termination with follow-up SIGTERM KillSession

sequenceDiagram
    participant Display
    participant QTimer
    participant ManagerInterface as OrgFreedesktopLogin1ManagerInterface
    participant Logind as systemd_logind

    Display->>ManagerInterface: TerminateSession(id)
    ManagerInterface->>Logind: TerminateSession(id)
    Logind-->>ManagerInterface: Session_termination_started
    ManagerInterface-->>Display: D-Bus_reply

    Display->>QTimer: singleShot(2000ms, callback)
    Note over QTimer,Display: 2 second delay

    QTimer-->>Display: invoke_callback(id)
    Display->>ManagerInterface: KillSession(id, all, 15)
    ManagerInterface->>Logind: KillSession(id, all, SIGTERM)
    Logind-->>ManagerInterface: Remaining_child_processes_killed
    ManagerInterface-->>Display: D-Bus_reply

Loading

File-Level Changes

Change	Details	Files
Add a delayed SIGTERM KillSession fallback after TerminateSession to clean up lingering session processes more safely than SIGKILL.	Wrap a QDBus TerminateSession call with a QTimer::singleShot 2-second callback that re-creates the logind manager interface. In the timeout handler, invoke KillSession with the session id, target "all", and signal 15 (SIGTERM) to terminate lingering child processes. Document rationale in comments: some child processes (e.g., gnome-keyring-daemon) may linger and SIGKILL can leave systemd-logind in a bad state, so SIGTERM is used instead, with a TODO to investigate further.	src/daemon/Display.cpp
Improve D-Bus reply error handling for GetSessionByPID by using the higher-level isError() check.	Replace reply.error().isValid() condition with reply.isError() when checking the result of GetSessionByPID. Keep existing warning log and error handling path unchanged aside from the condition expression.	src/daemon/Auth.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

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

[deepin-ci-robot]

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]

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

• The hard-coded values for the 2-second delay and signal 15 in the KillSession call would be clearer and easier to adjust if they were defined as named constants (e.g., kSessionTerminateGracePeriodMs, kSigTerm).
• Since this KillSession fallback is addressing a subtle stuck-session issue, consider logging when the timer triggers and when KillSession fails, so it’s easier to diagnose lingering processes or regressions in production.
• The TODO about understanding why SIGKILL leaves logind in a bad state should ideally reference a tracking issue or be expanded with current hypotheses, so future maintainers know how to follow up.

Prompt for AI Agents

Please address the comments from this code review:

## Overall Comments
- The hard-coded values for the 2-second delay and signal 15 in the KillSession call would be clearer and easier to adjust if they were defined as named constants (e.g., kSessionTerminateGracePeriodMs, kSigTerm).
- Since this KillSession fallback is addressing a subtle stuck-session issue, consider logging when the timer triggers and when KillSession fails, so it’s easier to diagnose lingering processes or regressions in production.
- The TODO about understanding why SIGKILL leaves logind in a bad state should ideally reference a tracking issue or be expanded with current hypotheses, so future maintainers know how to follow up.

## Individual Comments

### Comment 1
<location> `src/daemon/Display.cpp:381` </location>
<code_context>
+            // instead.
+
+            // TODO: Find out why
+            manager.KillSession(QString::number(id), "all", 15);
+        });
     }
</code_context>

<issue_to_address>
**nitpick:** Use a named constant or symbolic value instead of the magic number `15` for the signal.

For example, you could pass `SIGTERM` directly or define a local `constexpr int kSigTerm = 15;`. This keeps the call self-documenting and consistent with the surrounding SIGTERM/SIGKILL comment.
</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.}

[deepin-ci-robot]

[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:

• 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