Refactor SOCKS5 user/pass authentication support.

- Rename event "socks_login_userpass" to "socks_login_userpass_request"
- Rename event "socks_login_reply" to "socks_login_userpass_reply"
- Split unsupported authN weird into 2 types: method vs. version

Addresses BIT-1011
This commit is contained in:
Jon Siwek 2015-02-12 17:06:38 -06:00
parent 9592f64225
commit 961fd06cad
6 changed files with 82 additions and 27 deletions

View file

@ -94,7 +94,7 @@ event socks_reply(c: connection, version: count, reply: count, sa: SOCKS::Addres
Log::write(SOCKS::LOG, c$socks);
}
event socks_login_userpass(c: connection, user: string, password: string) &priority=5
event socks_login_userpass_request(c: connection, user: string, password: string) &priority=5
{
# Authentication only possible with the version 5.
set_session(c, 5);
@ -103,7 +103,7 @@ event socks_login_userpass(c: connection, user: string, password: string) &prior
c$socks$password = password;
}
event socks_login_reply(c: connection, code: count) &priority=5
event socks_login_userpass_reply(c: connection, code: count) &priority=5
{
# Authentication only possible with the version 5.
set_session(c, 5);