mirror/openvpn3
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn3.git synced 2024-09-20 20:13:05 +02:00
Code

Added AUTH_FAILED to HaltRestart::Type.

Browse Source 
In ServerProto::Session (servproto.hpp),
push_halt_restart_msg() can now push AUTH_FAILED messages
as well.

In fact ServerProto::Session::auth_failed() is now defined
in terms of push_halt_restart_msg().
This commit is contained in:
James Yonan 2016-01-26 23:32:49 -07:00
parent 030ede7a96
commit 958d27d0c2
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openvpn/server/servhalt.hpp
View File

@ -28,6 +28,7 @@ namespace openvpn {
HALT, // disconnect
RESTART, // restart, don't preserve session token
RESTART_PSID, // restart, preserve session token
AUTH_FAILED, // auth fail, don't preserve session token
};
}
}

26
openvpn/server/servproto.hpp
View File

@ -353,23 +353,7 @@ namespace openvpn {
virtual void auth_failed(const std::string& reason,
const bool tell_client)
{
if (halt)
return;
BufferPtr buf(new BufferAllocated(128, BufferAllocated::GROW));
BufferStreamOut os(*buf);
OPENVPN_LOG("Auth failed: " << reason);
os << "AUTH_FAILED";
if (tell_client && !reason.empty())
os << ',' << reason;
disconnect_in(Time::Duration::seconds(1));
buf->push_back(0); // null-terminate
Base::control_send(buf);
Base::flush(true);
set_housekeeping_timer();
push_halt_restart_msg(HaltRestart::AUTH_FAILED, reason, tell_client);
}
virtual void push_reply(BufferPtr& push_data,
@ -433,9 +417,15 @@ namespace openvpn {
else
os << "server requested a client reconnect";
break;
case HaltRestart::AUTH_FAILED:
ts = "AUTH_FAILED";
os << ts;
if (tell_client && !reason.empty())
os << ',' << reason;
break;
}
OPENVPN_LOG("Mid-session Auth failed: " << ts << ' ' << reason);
OPENVPN_LOG("Disconnect: " << ts << ' ' << reason);
disconnect_in(Time::Duration::seconds(1));