Skip to content

Conversation

@calsys456
Copy link
Contributor

@calsys456 calsys456 commented Jan 6, 2026

We manually stop the auth before terminating logind session, so that the session can be closed properly by PAM without being left in an undetermined state.

Summary by Sourcery

Ensure user sessions are cleanly stopped before terminating the corresponding logind session to prevent login issues after logout.

Bug Fixes:

  • Stop the associated auth session before calling logind TerminateSession to avoid leaving PAM sessions in an inconsistent state that blocks subsequent logins.

Enhancements:

  • Reuse stored environment variables for VT and display when recording logout in utmp/wtmp instead of querying the session process environment at logout time.

We manually stop the auth before terminating logind session, so that the
session can be closed properly by PAM without being left in an
undetermined state.
@sourcery-ai
Copy link

sourcery-ai bot commented Jan 6, 2026

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Ensures user sessions are cleanly stopped and logged out by explicitly stopping the associated Auth before terminating the logind session, and by reusing existing environment data instead of querying the child process environment after it may have been stopped.

Sequence diagram for logout flow with explicit Auth stop before logind TerminateSession

sequenceDiagram
    actor User
    participant Display
    participant Auth
    participant SessionProcess as SessionProcess
    participant PAM as PAMSession
    participant Logind as LogindManager
    participant Utmp as UtmpLogger

    User ->> Display: requestLogout(id)
    activate Display
    Display ->> Display: logout(id)

    loop for each auth in auths
        Display ->> Auth: check xdgSessionId
        alt matching xdgSessionId
            Display ->> Auth: stop()
            activate Auth
            Auth ->> SessionProcess: stop()
            SessionProcess -->> Auth: processStopped
            Auth ->> PAM: closeSession()
            PAM -->> Auth: sessionClosed
            Auth ->> Utmp: utmpLogout(vt, displayId, pid)
            Utmp -->> Auth: logoutRecorded
            deactivate Auth
        end
    end

    Display ->> Logind: TerminateSession(id)
    Logind -->> Display: sessionTerminated
    deactivate Display
Loading

Class diagram for updated Auth and Display logout behavior

classDiagram
    class Auth {
        +QString xdgSessionId
        -QProcess *m_session
        -QProcessEnvironment m_env
        -PamHandle *m_pam
        +void stop()
    }

    class Display {
        -QList~Auth*~ auths
        +void logout(QLocalSocket *socket, int id)
    }

    class PamHandle {
        +bool sessionOpened
        +void closeSession()
    }

    class QProcessEnvironment {
        +QString value(QString name)
    }

    class QProcess {
        +qint64 processId()
        +QProcessEnvironment processEnvironment()
        +QProcess::ProcessState state()
        +void stop()
    }

    Auth --> QProcess : uses m_session
    Auth --> QProcessEnvironment : uses m_env
    Auth --> PamHandle : uses m_pam
    Display "1" o-- "*" Auth : manages auths
Loading

File-Level Changes

Change Details Files
Ensure utmp/wtmp logout uses environment values captured before stopping the session process.
  • Store XDG_VTNR and DISPLAY from the existing m_env member before stopping the session process.
  • Remove fetching XDG_VTNR and DISPLAY from the session process environment immediately before utmpLogout.
  • Keep using the process ID and call utmpLogout only when pid is greater than zero.
src/daemon/Auth.cpp
Ensure the auth session is explicitly stopped before terminating the corresponding logind session.
  • Iterate over tracked Auth instances during logout.
  • Find the Auth whose xdgSessionId matches the session being logged out.
  • Call stop() on the matching Auth before invoking Logind's TerminateSession.
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

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

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 left some high level feedback:

  • In Display::logout, once you find an Auth with a matching xdgSessionId and call stop(), you can break out of the loop to avoid redundant stop() calls in the unlikely event of multiple matches and make the intent clearer.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- In `Display::logout`, once you find an `Auth` with a matching `xdgSessionId` and call `stop()`, you can `break` out of the loop to avoid redundant `stop()` calls in the unlikely event of multiple matches and make the intent clearer.

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.

@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 e767ff2 into linuxdeepin:master Jan 6, 2026
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