Feature/firewall sso refactor

Barracuda