Skip to content

Commit

Permalink
v2.11.9
Browse files Browse the repository at this point in the history
  • Loading branch information
jaxu committed Sep 3, 2024
1 parent 2406fb8 commit f6392c1
Show file tree
Hide file tree
Showing 27 changed files with 124 additions and 97 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ SplitTunneling::SplitTunneling(FwpmWrapper& fwpmWrapper)
{
connectStatus_.isConnected = false;
detectWindscribeExecutables();
FirewallFilter::instance().setWindscribeAppsIds(windscribeExecutableIds_);

AppsIds appsIds;
appsIds.addFrom(windscribeMainExecutableId_);
appsIds.addFrom(windscribeOtherExecutablesId_);
FirewallFilter::instance().setWindscribeAppsIds(appsIds);
}

void SplitTunneling::release()
Expand Down Expand Up @@ -63,26 +67,29 @@ void SplitTunneling::detectWindscribeExecutables()
return;
}

std::vector<std::wstring> windscribeExefiles;
std::vector<std::wstring> windscribeCtrldFiles;
std::vector<std::wstring> windscribeMainExecutable;
std::vector<std::wstring> windscribeOtherExecutables;
std::vector<std::wstring> ctrldExecutable;
do {
if (!(ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
std::wstring fileName = ffd.cFileName;
std::wstring fullPath = exePath + L"\\" + ffd.cFileName;

// For ctrld utility and Windscribe.exe we need special rules for inclusive mode
if (fileName == L"windscribectrld.exe" || fileName == L"Windscribe.exe") {
windscribeCtrldFiles.push_back(fullPath);
if (fileName == L"Windscribe.exe") {
windscribeMainExecutable.push_back(fullPath);
} else if (fileName == L"windscribectrld.exe") {
ctrldExecutable.push_back(fullPath);
} else if (fileName != L"WindscribeService.exe") { // skip WindscribeService.exe
windscribeExefiles.push_back(fullPath);
windscribeOtherExecutables.push_back(fullPath);
}
}
} while (FindNextFile(hFind, &ffd) != 0);

FindClose(hFind);

windscribeExecutableIds_.setFromList(windscribeExefiles);
ctrldExecutableId_.setFromList(windscribeCtrldFiles);
windscribeMainExecutableId_.setFromList(windscribeMainExecutable);
windscribeOtherExecutablesId_.setFromList(windscribeOtherExecutables);
ctrldExecutableId_.setFromList(ctrldExecutable);
}

bool SplitTunneling::updateState()
Expand Down Expand Up @@ -119,10 +126,18 @@ bool SplitTunneling::updateState()
if (isExclude_) {
hostnamesManager_.enable(connectStatus_.defaultAdapter.gatewayIp, connectStatus_.defaultAdapter.ifIndex);
} else {
appsIds.addFrom(windscribeExecutableIds_);
appsIds.addFrom(windscribeOtherExecutablesId_);
hostnamesManager_.enable(connectStatus_.vpnAdapter.gatewayIp, connectStatus_.vpnAdapter.ifIndex);
}
calloutFilter_.enable(localIp, vpnIp, appsIds, isExclude_ ? AppsIds() : ctrldExecutableId_, isExclude_, isAllowLanTraffic_);

// For ctrld utility and Windscribe.exe we need special rules for inclusive mode
AppsIds windscribeExecutablesForInclusive;
if (!isExclude_) {
windscribeExecutablesForInclusive.addFrom(windscribeMainExecutableId_);
windscribeExecutablesForInclusive.addFrom(ctrldExecutableId_);
}
calloutFilter_.enable(localIp, vpnIp, appsIds, windscribeExecutablesForInclusive, isExclude_, isAllowLanTraffic_);

} else {
calloutFilter_.disable();
hostnamesManager_.disable();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ class SplitTunneling
HostnamesManager hostnamesManager_;
SplitTunnelServiceManager splitTunnelServiceManager_;

AppsIds windscribeExecutableIds_;
AppsIds windscribeMainExecutableId_;
AppsIds windscribeOtherExecutablesId_;
AppsIds ctrldExecutableId_;

CMD_CONNECT_STATUS connectStatus_;
Expand Down
8 changes: 8 additions & 0 deletions client/common/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2.11.9 (03/09/2024)
All:
* Improved dialog verbiage when secure hotspot is enabled without Wi-Fi. #1005
* Fixed the error message when the remember checkbox wasn't ticked on the wrong credentials. #1081
Windows:
* Fixed tunnel tests don't work for WireGuard with firewall enabled. #1094


2.11.8 (26/08/2024)
All:
* Added the new parameter language to wsnet library. #1098
Expand Down
6 changes: 3 additions & 3 deletions client/common/version/windscribe_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

#define WINDSCRIBE_MAJOR_VERSION 2
#define WINDSCRIBE_MINOR_VERSION 11
#define WINDSCRIBE_BUILD_VERSION 7
#define WINDSCRIBE_BUILD_VERSION 9

// only one of these should be enabled; neither -> stable
//#define WINDSCRIBE_IS_BETA
#define WINDSCRIBE_IS_GUINEA_PIG
#define WINDSCRIBE_IS_BETA
//#define WINDSCRIBE_IS_GUINEA_PIG

#define STR_HELPER(x) #x
#define STR(x) STR_HELPER(x)
Expand Down
3 changes: 2 additions & 1 deletion client/engine/engine/engine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1102,6 +1102,7 @@ void Engine::continueWithUsernameAndPasswordImpl(const QString &username, const
if (bSave) {
customOvpnAuthCredentialsStorage_->setAuthCredentials(connectionManager_->getCustomOvpnConfigFileName(), username, password);
}
lastUsernameForCustomConfig_ = username;
connectionManager_->continueWithUsernameAndPassword(username, password, isNeedReconnectAfterRequestAuth_);
}
}
Expand Down Expand Up @@ -1557,7 +1558,7 @@ void Engine::onConnectionManagerError(CONNECT_ERROR err)
customOvpnAuthCredentialsStorage_->removeCredentials(connectionManager_->getCustomOvpnConfigFileName());

isNeedReconnectAfterRequestAuth_ = true;
emit requestUsernameAndPassword(credentials.username);
emit requestUsernameAndPassword(credentials.username.isEmpty() ? lastUsernameForCustomConfig_ : credentials.username);
}
else
{
Expand Down
2 changes: 2 additions & 0 deletions client/engine/engine/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -400,4 +400,6 @@ private slots:
bool isLoggedIn_ = false;
bool isFetchingServerCredentials_ = false;
bool tryLoginNextConnectOrDisconnect_ = false;

QString lastUsernameForCustomConfig_;
};
2 changes: 1 addition & 1 deletion client/gui/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2303,7 +2303,7 @@ void MainWindow::onBackendWifiSharingFailed(WIFI_SHARING_ERROR error)
GeneralMessageController::instance().showMessage(
"WARNING_WHITE",
tr("Wi-Fi is off"),
tr("Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi should be turned on."),
tr("Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi must be turned on."),
GeneralMessageController::tr(GeneralMessageController::kOk),
"",
"",
Expand Down
8 changes: 4 additions & 4 deletions client/gui/translations/ws_desktop_ar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -794,10 +794,6 @@ If the problem persists after a restart, please send a debug log and open a supp
<source>Wi-Fi is off</source>
<translation>شبكة Wi-Fi متوقفة</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi should be turned on.</source>
<translation>اكتشف Windscribe أن شبكة Wi-Fi متوقفة عن التشغيل حاليا. لاستخدام نقطة الاتصال الآمنة ، يجب تشغيل Wi-Fi.</translation>
</message>
<message>
<source>Could not start Secure Hotspot</source>
<translation>تعذر بدء تشغيل نقطة اتصال آمنة</translation>
Expand All @@ -810,6 +806,10 @@ If the problem persists after a restart, please send a debug log and open a supp
<source>...hmm are you sure this is correct?</source>
<translation>... حسنا ، هل أنت متأكد من صحة ذلك؟</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi must be turned on.</source>
<translation>اكتشف Windscribe أن شبكة Wi-Fi متوقفة عن التشغيل حاليا. لاستخدام نقطة الاتصال الآمنة، يجب تشغيل Wi-Fi.</translation>
</message>
</context>
<context>
<name>MainWindowController</name>
Expand Down
8 changes: 4 additions & 4 deletions client/gui/translations/ws_desktop_cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -794,10 +794,6 @@ Pokud problém přetrvává i po restartování, odešlete protokol ladění, ot
<source>Wi-Fi is off</source>
<translation>Wi-Fi je vypnutá</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi should be turned on.</source>
<translation>Windscribe zjistil, že Wi-Fi je momentálně vypnutá. Chcete-li používat funkci Secure Hotspot, musí být zapnutá funkce Wi-Fi.</translation>
</message>
<message>
<source>Could not start Secure Hotspot</source>
<translation>Nelze spustit Secure Hotspot</translation>
Expand All @@ -810,6 +806,10 @@ Pokud problém přetrvává i po restartování, odešlete protokol ladění, ot
<source>...hmm are you sure this is correct?</source>
<translation>... Hmm, jsi si jistý, že je to správně?</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi must be turned on.</source>
<translation>Společnost Windscribe zjistila, že Wi-Fi je aktuálně vypnutá. Abyste mohli používat Zabezpečený hotspot, musí být zapnutá Wi-Fi.</translation>
</message>
</context>
<context>
<name>MainWindowController</name>
Expand Down
8 changes: 4 additions & 4 deletions client/gui/translations/ws_desktop_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -794,10 +794,6 @@ Wenn das Problem nach einem Neustart weiterhin besteht, senden Sie bitte ein Deb
<source>Wi-Fi is off</source>
<translation>WLAN ist ausgeschaltet</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi should be turned on.</source>
<translation>Windscribe hat festgestellt, dass das WLAN derzeit ausgeschaltet ist. Um Secure Hotspot verwenden zu können, sollte Wi-Fi aktiviert sein.</translation>
</message>
<message>
<source>Could not start Secure Hotspot</source>
<translation>Secure Hotspot konnte nicht gestartet werden</translation>
Expand All @@ -810,6 +806,10 @@ Wenn das Problem nach einem Neustart weiterhin besteht, senden Sie bitte ein Deb
<source>...hmm are you sure this is correct?</source>
<translation>... Hmm, bist du sicher, dass das richtig ist?</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi must be turned on.</source>
<translation>Windscribe hat festgestellt, dass das WLAN derzeit ausgeschaltet ist. Um Secure Hotspot verwenden zu können, muss Wi-Fi aktiviert sein.</translation>
</message>
</context>
<context>
<name>MainWindowController</name>
Expand Down
8 changes: 4 additions & 4 deletions client/gui/translations/ws_desktop_en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -794,10 +794,6 @@ If the problem persists after a restart, please send a debug log and open a supp
<source>Wi-Fi is off</source>
<translation>Wi-Fi is off</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi should be turned on.</source>
<translation>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi should be turned on.</translation>
</message>
<message>
<source>Could not start Secure Hotspot</source>
<translation>Could not start Secure Hotspot</translation>
Expand All @@ -810,6 +806,10 @@ If the problem persists after a restart, please send a debug log and open a supp
<source>...hmm are you sure this is correct?</source>
<translation>... hmm are you sure this is correct?</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi must be turned on.</source>
<translation>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi must be turned on.</translation>
</message>
</context>
<context>
<name>MainWindowController</name>
Expand Down
8 changes: 4 additions & 4 deletions client/gui/translations/ws_desktop_es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -794,10 +794,6 @@ Si el problema persiste después de un reinicio, envía un registro de depuraci
<source>Wi-Fi is off</source>
<translation>La conexión Wi-Fi está apagada</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi should be turned on.</source>
<translation>Windscribe ha detectado que la conexión Wi-Fi está desactivada. Para usar Secure Hotspot, Wi-Fi debe estar activado.</translation>
</message>
<message>
<source>Could not start Secure Hotspot</source>
<translation>No se pudo iniciar Secure Hotspot</translation>
Expand All @@ -810,6 +806,10 @@ Si el problema persiste después de un reinicio, envía un registro de depuraci
<source>...hmm are you sure this is correct?</source>
<translation>... Hmm, ¿estás seguro de que esto es correcto?</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi must be turned on.</source>
<translation>Windscribe ha detectado que la conexión Wi-Fi está desactivada. Para usar Secure Hotspot, la conexión Wi-Fi debe estar activada.</translation>
</message>
</context>
<context>
<name>MainWindowController</name>
Expand Down
8 changes: 4 additions & 4 deletions client/gui/translations/ws_desktop_fa.ts
Original file line number Diff line number Diff line change
Expand Up @@ -794,10 +794,6 @@ If the problem persists after a restart, please send a debug log and open a supp
<source>Wi-Fi is off</source>
<translation>Wi-Fi خاموش است</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi should be turned on.</source>
<translation>Windscribe تشخیص داده است که Wi-Fi در حال حاضر خاموش است. برای استفاده از نقطه اتصال امن، Wi-Fi باید روشن باشد.</translation>
</message>
<message>
<source>Could not start Secure Hotspot</source>
<translation>Secure Hotspot راه اندازی نشد</translation>
Expand All @@ -810,6 +806,10 @@ If the problem persists after a restart, please send a debug log and open a supp
<source>...hmm are you sure this is correct?</source>
<translation>... مطمئنی درسته؟</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi must be turned on.</source>
<translation>Windscribe تشخیص داده است که Wi-Fi در حال حاضر خاموش است. برای استفاده از نقطه اتصال امن، Wi-Fi باید روشن باشد.</translation>
</message>
</context>
<context>
<name>MainWindowController</name>
Expand Down
8 changes: 4 additions & 4 deletions client/gui/translations/ws_desktop_fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -794,10 +794,6 @@ Si le problème persiste après un redémarrage, envoyez un journal de débogage
<source>Wi-Fi is off</source>
<translation>Le Wi-Fi est désactivé</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi should be turned on.</source>
<translation>Windscribe a détecté que le Wi-Fi est actuellement désactivé. Pour utiliser le point d’accès sécurisé, le Wi-Fi doit être activé.</translation>
</message>
<message>
<source>Could not start Secure Hotspot</source>
<translation>Impossible de démarrer le point d’accès sécurisé</translation>
Expand All @@ -810,6 +806,10 @@ Si le problème persiste après un redémarrage, envoyez un journal de débogage
<source>...hmm are you sure this is correct?</source>
<translation>... Hmm êtes-vous sûr que c’est correct?</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi must be turned on.</source>
<translation>Windscribe a détecté que le Wi-Fi est actuellement désactivé. Pour utiliser le point d’accès sécurisé, le Wi-Fi doit être activé.</translation>
</message>
</context>
<context>
<name>MainWindowController</name>
Expand Down
8 changes: 4 additions & 4 deletions client/gui/translations/ws_desktop_hi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -794,10 +794,6 @@ If the problem persists after a restart, please send a debug log and open a supp
<source>Wi-Fi is off</source>
<translation>वाई-फ़ाई बंद है</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi should be turned on.</source>
<translation>विंडसाइड ने पाया है कि वाई-फाई वर्तमान में बंद है। सुरक्षित हॉटस्पॉट का उपयोग करने के लिए, वाई-फाई चालू होना चाहिए।</translation>
</message>
<message>
<source>Could not start Secure Hotspot</source>
<translation>सुरक्षित हॉटस्पॉट प्रारंभ नहीं कर सका</translation>
Expand All @@ -810,6 +806,10 @@ If the problem persists after a restart, please send a debug log and open a supp
<source>...hmm are you sure this is correct?</source>
<translation>... हम्म क्या आपको यकीन है कि यह सही है?</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi must be turned on.</source>
<translation>विंडसाइड ने पाया है कि वाई-फाई वर्तमान में बंद है। सुरक्षित हॉटस्पॉट का उपयोग करने के लिए, वाई-फ़ाई चालू होना चाहिए.</translation>
</message>
</context>
<context>
<name>MainWindowController</name>
Expand Down
8 changes: 4 additions & 4 deletions client/gui/translations/ws_desktop_id.ts
Original file line number Diff line number Diff line change
Expand Up @@ -794,10 +794,6 @@ Jika masalah berlanjut setelah restart, silakan kirim log debug dan buka tiket d
<source>Wi-Fi is off</source>
<translation>Wi-Fi mati</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi should be turned on.</source>
<translation>Windscribe telah mendeteksi bahwa Wi-Fi saat ini dimatikan. Untuk menggunakan Hotspot Aman, Wi-Fi harus diaktifkan.</translation>
</message>
<message>
<source>Could not start Secure Hotspot</source>
<translation>Tidak dapat memulai Hotspot Aman</translation>
Expand All @@ -810,6 +806,10 @@ Jika masalah berlanjut setelah restart, silakan kirim log debug dan buka tiket d
<source>...hmm are you sure this is correct?</source>
<translation>... Hmm apakah Anda yakin ini benar?</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi must be turned on.</source>
<translation>Windscribe telah mendeteksi bahwa Wi-Fi saat ini dimatikan. Untuk menggunakan Hotspot Aman, Wi-Fi harus diaktifkan.</translation>
</message>
</context>
<context>
<name>MainWindowController</name>
Expand Down
8 changes: 4 additions & 4 deletions client/gui/translations/ws_desktop_it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -794,10 +794,6 @@ Se il problema persiste dopo un riavvio, inviare un registro di debug e aprire u
<source>Wi-Fi is off</source>
<translation>Il Wi-Fi è disattivato</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi should be turned on.</source>
<translation>Windscribe ha rilevato che il Wi-Fi è attualmente disattivato. Per utilizzare Secure Hotspot, il Wi-Fi deve essere attivato.</translation>
</message>
<message>
<source>Could not start Secure Hotspot</source>
<translation>Impossibile avviare Secure Hotspot</translation>
Expand All @@ -810,6 +806,10 @@ Se il problema persiste dopo un riavvio, inviare un registro di debug e aprire u
<source>...hmm are you sure this is correct?</source>
<translation>... hmm sei sicuro che questo sia corretto?</translation>
</message>
<message>
<source>Windscribe has detected that Wi-Fi is currently turned off. To use Secure Hotspot, Wi-Fi must be turned on.</source>
<translation>Windscribe ha rilevato che il Wi-Fi è attualmente disattivato. Per utilizzare Secure Hotspot, il Wi-Fi deve essere attivato.</translation>
</message>
</context>
<context>
<name>MainWindowController</name>
Expand Down
Loading

0 comments on commit f6392c1

Please sign in to comment.