Merge branch 'master' into offline

* master:
  Enforcing user agents for windows client apps.
  Showing username on blocked api logins.
This commit is contained in:
Samuel Clay 2013-06-15 17:33:39 -07:00
commit be5c9fe389

View file

@ -25,9 +25,9 @@ def login(request):
errors = None errors = None
user_agent = request.environ.get('HTTP_USER_AGENT', '') user_agent = request.environ.get('HTTP_USER_AGENT', '')
if not user_agent: if not user_agent or user_agent.lower() in ['nativehost']:
errors = dict(user_agent="You must set a user agent to login.") errors = dict(user_agent="You must set a user agent to login.")
logging.user(request, "~FG~BB~SK~FRBlocked ~FGAPI Login~SN~FW: %s" % user_agent) logging.user(request, "~FG~BB~SK~FRBlocked ~FGAPI Login (%s)~SN~FW: %s" % (request.REQUEST.get('username', ''), user_agent))
elif request.method == "POST": elif request.method == "POST":
form = LoginForm(data=request.POST) form = LoginForm(data=request.POST)
if form.errors: if form.errors: