Skip to content

Tunnel: don't trigger FortiGate password blocking on wrong password. #1306

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

Open
caeies wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Tunnel: don't trigger FortiGate password blocking on wrong password. #1306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ const struct vpn_config invalid_cfg = {
.use_syslog = -1,
.half_internet_routes = -1,
.persistent = -1,
.backoff_sleep = UINT_MAX,
#if HAVE_USR_SBIN_PPPD
.pppd_log = NULL,
.pppd_plugin = NULL,
Expand Down
3 changes: 3 additions & 0 deletions src/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ struct vpn_config {
int half_internet_routes;

unsigned int persistent;
/* Used to store sleep time between attempts (as tunnel struct is cleaned). */
unsigned int backoff_sleep;


#if HAVE_USR_SBIN_PPPD
char *pppd_log;
Expand Down
1 change: 1 addition & 0 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ int main(int argc, char *argv[])
.use_syslog = 0,
.half_internet_routes = 0,
.persistent = 0,
.backoff_sleep = 0,
#if HAVE_RESOLVCONF
.use_resolvconf = USE_RESOLVCONF,
#endif
Expand Down
11 changes: 11 additions & 0 deletions src/tunnel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,11 +1381,22 @@ int run_tunnel(struct vpn_config *config)
if (ret != 1) {
log_error("Could not authenticate to gateway. Please check the password, client certificate, etc.\n");
log_debug("%s (%d)\n", err_http_str(ret), ret);
/* We should do a back off attempt here no ? */
/* As FortiGate kick us after 3 attempts just increase quickly the */
/* tries. */
/* Maybe we should force the exit or reask for password ? */
if (tunnel.config->persistent != 0) {
if (tunnel.config->backoff_sleep <= 3600)
tunnel.config->backoff_sleep += 60;
sleep(tunnel.config->backoff_sleep);
}
ret = 1;
goto err_tunnel;
}
log_info("Authenticated.\n");
log_debug("Cookie: %s\n", tunnel.cookie);
/* Reset backoff timing */
tunnel.config->backoff_sleep = 0;

ret = auth_request_vpn_allocation(&tunnel);
if (ret != 1) {
Expand Down