Skip to content

Generalized fetching of uid and add support for DBUS_UID env var #76

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.

Sign up for GitHub

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Generalized fetching of uid and add support for DBUS_UID env var #76

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions lib/handshake.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,15 @@ function sha1 (input) {
return shasum.digest('hex');
}

function getUserHome () {
function getUid() {
if ('DBUS_UID' in process.env)
return Number(process.env.DBUS_UID);
if ('getuid' in process)
return process.getuid();
return null
}

function getUserHome() {
return process.env[process.platform.match(/$win/) ? 'USERPROFILE' : 'HOME'];
}

Expand All @@ -33,7 +41,8 @@ function getCookie (context, id, cb) {
)
);
}
if ('getuid' in process && stat.uid !== process.getuid()) {
const uid = getUid();
if (uid !== null && stat.uid !== uid) {
return cb(
new Error(
'Keyrings directory is not owned by the current user. Aborting authentication!'
Expand Down Expand Up @@ -74,7 +83,7 @@ function tryAuth (stream, methods, cb) {
}

const authMethod = methods.shift();
const uid = 'getuid' in process ? process.getuid() : 0;
const uid = getUid() || 0;
const id = hexlify(uid);

function beginOrNextAuth () {
Expand Down