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

Support hidden wifi on windows #183

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

Support hidden wifi on windows #183

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
14fe263
feat: Support Wifi with hidden SSID on Windows
Ichag Sep 16, 2022
f2750d9
feat: Fix profile xml formatting
Ichag Sep 16, 2022
4c300d3
feat: Write profile file async and continue to connect
Ichag Sep 16, 2022
bf9e01c
feat: Remove sync file writing
Ichag Sep 16, 2022
f9179f3
fix: Rename parameter
Ichag Sep 19, 2022
a7cc818
fix: Form promise also from hidden network
Ichag Sep 19, 2022
f077236
fix: Wifi selection
Ichag Sep 20, 2022
e1560c3
fix: Handle profile writing using a Promise to sync file write operation
Ichag Sep 20, 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
117 changes: 67 additions & 50 deletions src/windows-connect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const fs = require('fs');
const fs = require('fs').promises;
const execFile = require('child_process').execFile;
const env = require('./env');
const scan = require('./windows-scan');
Expand All @@ -22,59 +22,74 @@ function execCommand(cmd, params) {
});
}

function connectToWifi(config, ap, callback) {
scan(config)()
.then(networks => {
const selectedAp = networks.find(network => {
return network.ssid === ap.ssid;
function connectToWifi(config, givenAP, callback) {
let selectedAp = null;
let profile;
if (givenAP.isHidden) {
selectedAp = {
ssid: givenAP.ssid,
security: ['WPA2']
};
profile = new Promise(resolve => resolve(selectedAp));
} else {
profile = scan(config)().then(networks => {
selectedAp = networks.find(network => {
return network.ssid === givenAP.ssid;
});
return Promise.resolve(selectedAp);
});
}

if (selectedAp === undefined) {
throw 'SSID not found';
profile
.then(resolvedAP => {
if (resolvedAP == null) {
return Promise.reject('SSID not found');
}

fs.writeFileSync(
fs.writeFile(
profileFilename,
win32WirelessProfileBuilder(selectedAp, ap.password)
);
win32WirelessProfileBuilder(
resolvedAP,
givenAP.password,
givenAP.isHidden
)
)
.then(() => {
return execCommand('netsh', [
'wlan',
'add',
'profile',
`filename=${profileFilename}`
])
.then(() => {
const cmd = 'netsh';
const params = [
'wlan',
'connect',
`ssid="${givenAP.ssid}"`,
`name="${givenAP.ssid}"`
];
if (config.iface) {
params.push(`interface="${config.iface}"`);
}
return execCommand(cmd, params);
})
.then(() => execCommand(`del ${profileFilename}`))
.then(() => callback && callback())
.catch(err => {
execFile(
'netsh',
['wlan', 'delete', `profile "${givenAP.ssid}"`],
{ env },
() => {
callback && callback(err);
}
);
});
})
.catch(e => Promise.reject(e));
})
.then(() => {
return execCommand('netsh', [
'wlan',
'add',
'profile',
`filename=${profileFilename}`
]);
})
.then(() => {
const cmd = 'netsh';
const params = [
'wlan',
'connect',
`ssid="${ap.ssid}"`,
`name="${ap.ssid}"`
];
if (config.iface) {
params.push(`interface="${config.iface}"`);
}
return execCommand(cmd, params);
})
.then(() => {
return execCommand(`del ${profileFilename}`);
})
.then(() => {
callback && callback();
})
.catch(err => {
execFile(
'netsh',
['wlan', 'delete', `profile "${ap.ssid}"`],
{ env },
() => {
callback && callback(err);
}
);
});
.catch(e => Promise.reject(e));
}

function getHexSsid(plainTextSsid) {
Expand All @@ -93,12 +108,14 @@ function getHexSsid(plainTextSsid) {
return hex;
}

function win32WirelessProfileBuilder(selectedAp, key) {
function win32WirelessProfileBuilder(selectedAp, key, isHidden = false) {
let profile_content = `<?xml version="1.0"?> <WLANProfile xmlns="http://www.microsoft.com/networking/WLAN/profile/v1"> <name>${
selectedAp.ssid
}</name> <SSIDConfig> <SSID> <hex>${getHexSsid(
selectedAp.ssid
)}</hex> <name>${selectedAp.ssid}</name> </SSID> </SSIDConfig>`;
)}</hex> <name>${selectedAp.ssid}</name> </SSID> ${
isHidden ? '<nonBroadcast>true</nonBroadcast>' : ''
} </SSIDConfig>`;

if (selectedAp.security.includes('WPA2')) {
profile_content += `<connectionType>ESS</connectionType> <connectionMode>auto</connectionMode> <autoSwitch>true</autoSwitch> <MSM> <security> <authEncryption> <authentication>WPA2PSK</authentication> <encryption>AES</encryption> <useOneX>false</useOneX> </authEncryption> <sharedKey> <keyType>passPhrase</keyType> <protected>false</protected> <keyMaterial>${key}</keyMaterial> </sharedKey> </security> </MSM>`;
Expand Down