AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ikev2 test2

Browse source
This commit is contained in:
pokamest 2021-10-13 19:43:37 +03:00
parent b4007038fb
commit 990db5967a
2 changed files with 95 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

172
client/protocols/ikev2_vpn_protocol.cpp
View file

@ -21,6 +21,8 @@ Ikev2Protocol::Ikev2Protocol(const QJsonObject &configuration, QObject* parent)
{ {
//m_configFile.setFileTemplate(QDir::tempPath() + QDir::separator() + serviceName() + ".conf"); //m_configFile.setFileTemplate(QDir::tempPath() + QDir::separator() + serviceName() + ".conf");
readIkev2Configuration(configuration); readIkev2Configuration(configuration);
connect(_conn_state, &QTimer::timeout, this, &Ikev2Protocol::conn_state);
} }
Ikev2Protocol::~Ikev2Protocol() Ikev2Protocol::~Ikev2Protocol()
@ -32,7 +34,6 @@ Ikev2Protocol::~Ikev2Protocol()
#endif #endif
Ikev2Protocol::stop(); Ikev2Protocol::stop();
QThread::msleep(200); QThread::msleep(200);
_th_conn_state->join();
_thr->join(); _thr->join();
} }
@ -120,16 +121,16 @@ ErrorCode Ikev2Protocol::start()
certInstallProcess->start(); certInstallProcess->start();
} }
// /* // /*
{ {
// auto adapterRemoveProcess = new QProcess; // auto adapterRemoveProcess = new QProcess;
// adapterRemoveProcess->setProgram("powershell"); // adapterRemoveProcess->setProgram("powershell");
// QString arguments = QString("-command \"Remove-VpnConnection -Name '%1' -Force\"").arg(tunnelName()); // QString arguments = QString("-command \"Remove-VpnConnection -Name '%1' -Force\"").arg(tunnelName());
// adapterRemoveProcess->setNativeArguments(arguments); // adapterRemoveProcess->setNativeArguments(arguments);
// adapterRemoveProcess->start(); // adapterRemoveProcess->start();
// adapterRemoveProcess->waitForFinished(5000); // adapterRemoveProcess->waitForFinished(5000);
if ( disconnect_vpn()){ if ( disconnect_vpn()){
qDebug()<<"VPN was disconnected"; qDebug()<<"VPN was disconnected";
} }
@ -139,27 +140,29 @@ ErrorCode Ikev2Protocol::start()
} }
{ {
// { {
// if ( !create_new_vpn(tunnelName(), m_config[config_key::hostName].toString())){ if ( !create_new_vpn(tunnelName(), m_config[config_key::hostName].toString())){
// qDebug() <<"Can't create the VPN connect"; qDebug() <<"Can't create the VPN connect";
// } }
// } }
auto adapterInstallProcess = new QProcess;
adapterInstallProcess->setProgram("powershell");
QString arguments = QString("-command \"Add-VpnConnection "
"-ServerAddress '%1' "
"-Name '%2' "
"-TunnelType IKEv2 "
"-AuthenticationMethod MachineCertificate "
"-EncryptionLevel Required "
"-PassThru\"")
.arg(m_config[config_key::hostName].toString())
.arg(tunnelName());
adapterInstallProcess->setNativeArguments(arguments);
adapterInstallProcess->start();
adapterInstallProcess->waitForFinished(5000);
} }
// auto adapterInstallProcess = new QProcess;
// adapterInstallProcess->setProgram("powershell");
// QString arguments = QString("-command \"Add-VpnConnection "
// "-ServerAddress '%1' "
// "-Name '%2' "
// "-TunnelType IKEv2 "
// "-AuthenticationMethod MachineCertificate "
// "-EncryptionLevel Required "
// "-PassThru\"")
// .arg(m_config[config_key::hostName].toString())
// .arg(tunnelName());
// adapterInstallProcess->setNativeArguments(arguments);
// adapterInstallProcess->start();
// adapterInstallProcess->waitForFinished(5000);
// }
{ {
auto adapterConfigProcess = new QProcess; auto adapterConfigProcess = new QProcess;
@ -186,7 +189,7 @@ ErrorCode Ikev2Protocol::start()
} }
//*/ //*/
{ {
if (connect_to_vpn(tunnelName())){ if (connect_to_vpn(tunnelName())){
_thr = std::make_unique<std::thread>(&Ikev2Protocol::_ikev2_states, this); _thr = std::make_unique<std::thread>(&Ikev2Protocol::_ikev2_states, this);
}else{ }else{
qDebug()<<"We can't connect to VPN"; qDebug()<<"We can't connect to VPN";
@ -202,53 +205,55 @@ ErrorCode Ikev2Protocol::start()
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
void Ikev2Protocol::conn_state(){ void Ikev2Protocol::conn_state(){
while ( _stoped != true){ //while ( _stoped != true){
if (hRasConn != nullptr){ if (hRasConn != nullptr){
RASCONNSTATUS cs; RASCONNSTATUS cs;
cs.dwSize = sizeof(RASCONNSTATUS); cs.dwSize = sizeof(RASCONNSTATUS);
RasGetConnectStatus(hRasConn, &cs); RasGetConnectStatus(hRasConn, &cs);
qDebug()<<"Current state RAS= "<< cs.rasconnstate; qDebug()<<"Current state RAS= "<< cs.rasconnstate;
if (cs.rasconnstate == RASCS_DONE)//connected if (cs.rasconnstate == RASCS_DONE)//connected
{ {
setConnectionState(Connected); setConnectionState(Connected);
}
if (cs.rasconnstate == 0)//disconnected
{
setConnectionState(Disconnected);
}
} }
std::this_thread::sleep_for(std::chrono::seconds(5)); if (cs.rasconnstate == 0)//disconnected
{
setConnectionState(Disconnected);
}
}else{
setConnectionState(Disconnected);
} }
// std::this_thread::sleep_for(std::chrono::seconds(5));
//}
} }
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#ifdef Q_OS_WINDOWS #ifdef Q_OS_WINDOWS
//bool Ikev2Protocol::create_new_vpn(const QString & vpn_name, bool Ikev2Protocol::create_new_vpn(const QString & vpn_name,
// const QString & serv_addr){ const QString & serv_addr){
// if ( RasValidateEntryName(nullptr, vpn_name.toStdWString().c_str()) != ERROR_SUCCESS) if ( RasValidateEntryName(nullptr, vpn_name.toStdWString().c_str()) != ERROR_SUCCESS)
// return false; return false;
// DWORD size = 0; DWORD size = 0;
// ::RasGetEntryProperties(nullptr, L"", nullptr, &size, nullptr, nullptr); ::RasGetEntryProperties(nullptr, L"", nullptr, &size, nullptr, nullptr);
// LPRASENTRY pras = static_cast<LPRASENTRY>(malloc(size)); LPRASENTRY pras = static_cast<LPRASENTRY>(malloc(size));
// memset(pras, 0, size); memset(pras, 0, size);
// pras->dwSize = size; pras->dwSize = size;
// pras->dwType = RASET_Vpn; pras->dwType = RASET_Vpn;
// pras->dwRedialCount = 1; pras->dwRedialCount = 1;
// pras->dwRedialPause = 60; pras->dwRedialPause = 60;
// pras->dwfNetProtocols = RASNP_Ip|RASNP_Ipv6; pras->dwfNetProtocols = RASNP_Ip|RASNP_Ipv6;
// pras->dwEncryptionType = ET_RequireMax; pras->dwEncryptionType = ET_RequireMax;
// wcscpy_s(pras->szLocalPhoneNumber, serv_addr.toStdWString().c_str()); wcscpy_s(pras->szLocalPhoneNumber, serv_addr.toStdWString().c_str());
// wcscpy_s(pras->szDeviceType, RASDT_Vpn); wcscpy_s(pras->szDeviceType, RASDT_Vpn);
// pras->dwfOptions = RASEO_RemoteDefaultGateway; pras->dwfOptions = RASEO_RemoteDefaultGateway;
// pras->dwfOptions |= RASEO_RequireDataEncryption; pras->dwfOptions |= RASEO_RequireDataEncryption;
// pras->dwfOptions2 |= RASEO2_RequireMachineCertificates; pras->dwfOptions2 |= RASEO2_RequireMachineCertificates;
// pras->dwVpnStrategy = VS_Ikev2Only; pras->dwVpnStrategy = VS_Ikev2Only;
// const auto nRet = ::RasSetEntryProperties(nullptr, vpn_name.toStdWString().c_str(), pras, pras->dwSize, NULL, 0); const auto nRet = ::RasSetEntryProperties(nullptr, vpn_name.toStdWString().c_str(), pras, pras->dwSize, NULL, 0);
// free(pras); free(pras);
// if (nRet == ERROR_SUCCESS) if (nRet == ERROR_SUCCESS)
// return true; return true;
// return false; return false;
//} }
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bool Ikev2Protocol::delete_vpn_connection(const QString &vpn_name){ bool Ikev2Protocol::delete_vpn_connection(const QString &vpn_name){
@ -267,7 +272,8 @@ bool Ikev2Protocol::connect_to_vpn(const QString & vpn_name){
&Ikev2Protocol::RasDialFuncCallback, &Ikev2Protocol::RasDialFuncCallback,
&hRasConn); &hRasConn);
if (ret == ERROR_SUCCESS){ if (ret == ERROR_SUCCESS){
_th_conn_state = std::make_unique<std::thread>(&Ikev2Protocol::conn_state, this); //_th_conn_state = std::make_unique<std::thread>(&Ikev2Protocol::conn_state, this);
_conn_state->start(5000);
return true; return true;
} }
return false; return false;
@ -278,6 +284,7 @@ bool Ikev2Protocol::disconnect_vpn(){
if ( RasHangUp(hRasConn) != ERROR_SUCCESS) if ( RasHangUp(hRasConn) != ERROR_SUCCESS)
return false; return false;
} }
std::this_thread::sleep_for(std::chrono::seconds(3));
return true; return true;
} }
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -293,49 +300,49 @@ void Ikev2Protocol::_ikev2_states(){
switch (_connection_state) switch (_connection_state)
{ {
case RASCS_OpenPort: case RASCS_OpenPort:
setConnectionState(Preparing); //setConnectionState(Preparing);
qDebug()<<__LINE__; qDebug()<<__LINE__;
//printf ("RASCS_OpenPort = %d\n", _connection_state); //printf ("RASCS_OpenPort = %d\n", _connection_state);
//printf ("Opening port...\n"); //printf ("Opening port...\n");
break; break;
case RASCS_PortOpened: case RASCS_PortOpened:
setConnectionState(Preparing); //setConnectionState(Preparing);
qDebug()<<__LINE__; qDebug()<<__LINE__;
//printf ("RASCS_PortOpened = %d\n", _connection_state); //printf ("RASCS_PortOpened = %d\n", _connection_state);
//printf ("Port opened.\n"); //printf ("Port opened.\n");
break; break;
case RASCS_ConnectDevice: case RASCS_ConnectDevice:
setConnectionState(Preparing); //setConnectionState(Preparing);
qDebug()<<__LINE__; qDebug()<<__LINE__;
//printf ("RASCS_ConnectDevice = %d\n", _connection_state); //printf ("RASCS_ConnectDevice = %d\n", _connection_state);
//printf ("Connecting device...\n"); //printf ("Connecting device...\n");
break; break;
case RASCS_DeviceConnected: case RASCS_DeviceConnected:
setConnectionState(Preparing); //setConnectionState(Preparing);
qDebug()<<__LINE__; qDebug()<<__LINE__;
//printf ("RASCS_DeviceConnected = %d\n", _connection_state); //printf ("RASCS_DeviceConnected = %d\n", _connection_state);
//printf ("Device connected.\n"); //printf ("Device connected.\n");
break; break;
case RASCS_AllDevicesConnected: case RASCS_AllDevicesConnected:
setConnectionState(Preparing); //setConnectionState(Preparing);
qDebug()<<__LINE__; qDebug()<<__LINE__;
//printf ("RASCS_AllDevicesConnected = %d\n", _connection_state); //printf ("RASCS_AllDevicesConnected = %d\n", _connection_state);
//printf ("All devices connected.\n"); //printf ("All devices connected.\n");
break; break;
case RASCS_Authenticate: case RASCS_Authenticate:
setConnectionState(Preparing); // setConnectionState(Preparing);
qDebug()<<__LINE__; qDebug()<<__LINE__;
//printf ("RASCS_Authenticate = %d\n", _connection_state); //printf ("RASCS_Authenticate = %d\n", _connection_state);
// printf ("Authenticating...\n"); // printf ("Authenticating...\n");
break; break;
case RASCS_AuthNotify: case RASCS_AuthNotify:
setConnectionState(Disconnected); //setConnectionState(Disconnected);
qDebug()<<__LINE__; qDebug()<<__LINE__;
//printf ("RASCS_AuthNotify = %d\n", _connection_state); //printf ("RASCS_AuthNotify = %d\n", _connection_state);
// printf ("Authentication notify.\n"); // printf ("Authentication notify.\n");
break; break;
case RASCS_AuthRetry: case RASCS_AuthRetry:
setConnectionState(Preparing); // setConnectionState(Preparing);
qDebug()<<__LINE__; qDebug()<<__LINE__;
//printf ("RASCS_AuthRetry = %d\n", _connection_state); //printf ("RASCS_AuthRetry = %d\n", _connection_state);
//printf ("Retrying authentication...\n"); //printf ("Retrying authentication...\n");
@ -447,14 +454,16 @@ void Ikev2Protocol::_ikev2_states(){
break; break;
case RASCS_Connected: // = RASCS_DONE: case RASCS_Connected: // = RASCS_DONE:
setConnectionState(Connected); //setConnectionState(Connected);
qDebug()<<__LINE__; qDebug()<<__LINE__;
//printf ("RASCS_Connected = %d\n", _connection_state); //printf ("RASCS_Connected = %d\n", _connection_state);
//printf ("Connection completed.\n"); //printf ("Connection completed.\n");
//SetEvent(gEvent_handle); //SetEvent(gEvent_handle);
newEvent = false;
return;
break; break;
case RASCS_Disconnected: case RASCS_Disconnected:
setConnectionState(Disconnected); //setConnectionState(Disconnected);
qDebug()<<__LINE__; qDebug()<<__LINE__;
//printf ("RASCS_Disconnected = %d\n", _connection_state); //printf ("RASCS_Disconnected = %d\n", _connection_state);
//printf ("Disconnecting...\n"); //printf ("Disconnecting...\n");
@ -475,9 +484,8 @@ void Ikev2Protocol::_ikev2_states(){
#ifdef Q_OS_WINDOWS #ifdef Q_OS_WINDOWS
void WINAPI Ikev2Protocol::RasDialFuncCallback(UINT /*unMsg*/, void WINAPI Ikev2Protocol::RasDialFuncCallback(UINT /*unMsg*/,
RASCONNSTATE rasconnstate, RASCONNSTATE rasconnstate,
DWORD dwError ){ DWORD /*dwError*/ ){
qDebug() << "Ikev2Protocol::RasDialFuncCallback" << rasconnstate << dwError;
_connection_state = rasconnstate; _connection_state = rasconnstate;
newEvent = true; newEvent = true;
cv.notify_all(); cv.notify_all();

8
client/protocols/ikev2_vpn_protocol.h
View file

@ -59,8 +59,8 @@ private:
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
//RAS functions and parametrs //RAS functions and parametrs
HRASCONN hRasConn{nullptr}; HRASCONN hRasConn{nullptr};
// bool create_new_vpn(const QString & vpn_name, bool create_new_vpn(const QString & vpn_name,
// const QString & serv_addr); const QString & serv_addr);
bool delete_vpn_connection(const QString &vpn_name); bool delete_vpn_connection(const QString &vpn_name);
bool connect_to_vpn(const QString & vpn_name); bool connect_to_vpn(const QString & vpn_name);
@ -73,8 +73,10 @@ private:
std::unique_ptr<std::thread> _thr{nullptr}; std::unique_ptr<std::thread> _thr{nullptr};
void _ikev2_states(); void _ikev2_states();
std::atomic_bool _stoped{false}; std::atomic_bool _stoped{false};
QTimer *_conn_state{new QTimer(this)};
std::unique_ptr<std::thread>_th_conn_state{nullptr}; //std::unique_ptr<std::thread>_th_conn_state{nullptr};
private slots:
void conn_state(); void conn_state();
signals: signals:
//void Ikev2_connected(); //void Ikev2_connected();