-
Notifications
You must be signed in to change notification settings - Fork 16
feat: Upgrade treeland_ddm protocol to version 2 #85
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
calsys456
wants to merge
3
commits into
linuxdeepin:master
Choose a base branch
from
calsys456:new
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -218,17 +218,19 @@ namespace DDM { | |
| return true; | ||
| } | ||
|
|
||
| int Auth::openSession(const QString &command, | ||
| QProcessEnvironment env, | ||
| const QByteArray &cookie) { | ||
| QString Auth::openSession(const QString &command, | ||
| QProcessEnvironment env, | ||
| const QByteArray &cookie) { | ||
| Q_ASSERT(authenticated); | ||
|
|
||
| int pipefd[2]; | ||
| if (pipe(pipefd) == -1) { | ||
| qWarning() << "[Auth] pipe failed:" << strerror(errno); | ||
| return -1; | ||
| return {}; | ||
| } | ||
|
|
||
| char xdgSessionId[128] = {}; | ||
|
|
||
| // Here is most safe place to jump VT | ||
| VirtualTerminal::jumpToVt(tty, false, false); | ||
|
|
||
|
|
@@ -239,7 +241,7 @@ namespace DDM { | |
| qWarning() << "[Auth] fork failed:" << strerror(errno); | ||
| close(pipefd[0]); | ||
| close(pipefd[1]); | ||
| return -1; | ||
| return {}; | ||
| } | ||
| case 0: { | ||
| // Child (session leader) process | ||
|
|
@@ -275,57 +277,57 @@ namespace DDM { | |
| env = *sessionEnv; | ||
|
|
||
| // Retrieve XDG_SESSION_ID | ||
| xdgSessionId = env.value(QStringLiteral("XDG_SESSION_ID")).toInt(); | ||
| if (xdgSessionId <= 0) { | ||
| qCritical() << "[SessionLeader] Invalid XDG_SESSION_ID from pam_open_session()"; | ||
| exit(1); | ||
| } | ||
| if (write(pipefd[1], &xdgSessionId, sizeof(int)) != sizeof(int)) { | ||
| session = env.value(QStringLiteral("XDG_SESSION_ID")); | ||
| QByteArray sessionBa = session.toLocal8Bit(); | ||
| strcpy(xdgSessionId, sessionBa.constData()); | ||
| if (write(pipefd[1], &xdgSessionId, sizeof(char) * 128) != sizeof(char) * 128) { | ||
| qCritical() << "[SessionLeader] Failed to write XDG_SESSION_ID to parent process!"; | ||
| exit(1); | ||
|
Comment on lines
279
to
285
|
||
| } | ||
|
|
||
| // RUN!!! | ||
| UserSession session(this); | ||
| session.setProcessEnvironment(env); | ||
| session.start(command, type, cookie); | ||
| if (!session.waitForStarted()) { | ||
| UserSession desktop(this); | ||
| desktop.setProcessEnvironment(env); | ||
| desktop.start(command, type, cookie); | ||
| if (!desktop.waitForStarted()) { | ||
| qCritical() << "[SessionLeader] Failed to start session process. Exit now."; | ||
| exit(1); | ||
| } | ||
|
|
||
| // Send session PID to parent | ||
| sessionPid = session.processId(); | ||
| sessionPid = desktop.processId(); | ||
| if (write(pipefd[1], &sessionPid, sizeof(qint64)) != sizeof(qint64)) { | ||
| qCritical() << "[SessionLeader] Failed to write session PID to parent process!"; | ||
| exit(1); | ||
| } | ||
| qInfo() << "[SessionLeader] Session started with PID" << sessionPid; | ||
|
|
||
| session.waitForFinished(-1); | ||
| desktop.waitForFinished(-1); | ||
|
|
||
| // Handle session end | ||
| if (session.exitStatus() == QProcess::CrashExit) { | ||
| if (desktop.exitStatus() == QProcess::CrashExit) { | ||
| qCritical() << "[SessionLeader] Session process crashed. Exit now."; | ||
| exit(1); | ||
| } | ||
| qInfo() << "[SessionLeader] Session process finished with exit code" | ||
| << session.exitCode() << ". Exiting."; | ||
| exit(session.exitCode()); | ||
| << desktop.exitCode() << ". Exiting."; | ||
| exit(desktop.exitCode()); | ||
| } | ||
| default: { | ||
| // Parent process | ||
| close(pipefd[1]); | ||
|
|
||
| if (read(pipefd[0], &xdgSessionId, sizeof(int)) < 0) { | ||
| if (read(pipefd[0], &xdgSessionId, sizeof(char) * 128) != sizeof(char) * 128) { | ||
| qWarning() << "[Auth] Failed to read XDG_SESSION_ID from child process:" << strerror(errno); | ||
| close(pipefd[0]); | ||
| return -1; | ||
| return {}; | ||
| } | ||
| session = QString::fromLocal8Bit(xdgSessionId); | ||
|
|
||
| if (read(pipefd[0], &sessionPid, sizeof(qint64)) < 0) { | ||
| qWarning() << "[Auth] Failed to read session PID from child process:" << strerror(errno); | ||
| close(pipefd[0]); | ||
| return -1; | ||
| return {}; | ||
| } | ||
| utmpLogin(true); | ||
|
|
||
|
|
@@ -339,7 +341,7 @@ namespace DDM { | |
| }); | ||
|
|
||
| sessionOpened = true; | ||
| return xdgSessionId; | ||
| return session; | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.