Skip to content
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

Detects if running in an electron asar file. #894

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Detects if running in an electron asar file. #894

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d4235c
Detects if running in an electron asar file, and if so, switches to u…
rathboma May 21, 2020
7bfc718
merge and update
rathboma Dec 16, 2021
fee62cf
const
rathboma Dec 16, 2021
fceea2c
revert to regular resolve method
rathboma Mar 8, 2022
dd37550
Merge branch 'mscdex:master' into electron-detection
rathboma Mar 21, 2022
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
4 changes: 2 additions & 2 deletions lib/agent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,9 @@ if (process.platform === 'win32') {
var RET_ERR_BINSTDIN = 13;
var RET_ERR_BINSTDOUT = 14;
var RET_ERR_BADLEN = 15;

var RAWPATH = path.resolve(__dirname, '..', 'util/pagent.exe');
var ERROR = {};
var EXEPATH = path.resolve(__dirname, '..', 'util/pagent.exe');
var EXEPATH = RAWPATH.includes('app.asar') ? RAWPATH.replace('app.asar', 'app.asar.unpacked') : RAWPATH;
Copy link

@mofux mofux May 21, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

This check looks incorrect. What if the path already is inside app.asar.unpacked? It will still hit this code path and result in app.asar.unpacked.unpacked

Copy link
Author

Choose a reason for hiding this comment

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

I mostly added this code as a proof of concept to start the discussion. I agree it needs a little tuning, but figured you might want a more general solution.

ERROR[RET_ERR_BADARGS] = new Error('Invalid pagent.exe arguments');
ERROR[RET_ERR_UNAVAILABLE] = new Error('Pageant is not running');
ERROR[RET_ERR_NOMAP] = new Error('pagent.exe could not create an mmap');
Expand Down