From e69804d4001796a49476089bcbe8f67c3c700497 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gmail.com> Date: Mon, 26 Oct 2015 15:09:25 -0400 Subject: [PATCH] Merge pull request #947 from paulsputer/LogUpdateForAllAuthentication --- src/main/java/com/gitblit/wicket/pages/RootPage.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java index 93d44fc..b48f722 100644 --- a/src/main/java/com/gitblit/wicket/pages/RootPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java @@ -36,6 +36,7 @@ import org.apache.wicket.MarkupContainer; import org.apache.wicket.PageParameters; +import org.apache.wicket.RequestCycle; import org.apache.wicket.behavior.HeaderContributor; import org.apache.wicket.markup.html.IHeaderContributor; import org.apache.wicket.markup.html.IHeaderResponse; @@ -566,7 +567,9 @@ String username = RootPage.this.username.getObject(); char[] password = RootPage.this.password.getObject().toCharArray(); - UserModel user = app().authentication().authenticate(username, password); + HttpServletRequest request = ((WebRequest)RequestCycle.get().getRequest()).getHttpServletRequest(); + + UserModel user = app().authentication().authenticate(username, password, request.getRemoteAddr()); if (user == null) { error(getString("gb.invalidUsernameOrPassword")); } else if (user.username.equals(Constants.FEDERATION_USER)) { -- Gitblit v1.9.1