Merge branch 'ticket/187' into develop
| | |
| | | * @param user |
| | | */ |
| | | @Override |
| | | @Deprecated |
| | | public void setCookie(HttpServletResponse response, UserModel user) { |
| | | setCookie(null, response, user); |
| | | } |
| | | |
| | | /** |
| | | * Sets a cookie for the specified user. |
| | | * |
| | | * @param request |
| | | * @param response |
| | | * @param user |
| | | */ |
| | | @Override |
| | | public void setCookie(HttpServletRequest request, HttpServletResponse response, UserModel user) { |
| | | if (settings.getBoolean(Keys.web.allowCookieAuthentication, true)) { |
| | | GitBlitWebSession session = GitBlitWebSession.get(); |
| | | boolean standardLogin = session.authenticationType.isStandard(); |
| | |
| | | userCookie.setMaxAge((int) TimeUnit.DAYS.toSeconds(7)); |
| | | } |
| | | } |
| | | userCookie.setPath("/"); |
| | | String path = "/"; |
| | | if (request != null) { |
| | | if (!StringUtils.isEmpty(request.getContextPath())) { |
| | | path = request.getContextPath(); |
| | | } |
| | | } |
| | | userCookie.setPath(path); |
| | | response.addCookie(userCookie); |
| | | } |
| | | } |
| | |
| | | /** |
| | | * Logout a user. |
| | | * |
| | | * @param response |
| | | * @param user |
| | | */ |
| | | @Override |
| | | @Deprecated |
| | | public void logout(HttpServletResponse response, UserModel user) { |
| | | setCookie(response, null); |
| | | setCookie(null, response, null); |
| | | } |
| | | |
| | | /** |
| | | * Logout a user. |
| | | * |
| | | * @param request |
| | | * @param response |
| | | * @param user |
| | | */ |
| | | @Override |
| | | public void logout(HttpServletRequest request, HttpServletResponse response, UserModel user) { |
| | | setCookie(request, response, null); |
| | | } |
| | | |
| | | /** |
| | |
| | | } |
| | | |
| | | @Override |
| | | @Deprecated |
| | | public void setCookie(HttpServletResponse response, UserModel user) { |
| | | authenticationManager.setCookie(response, user); |
| | | } |
| | | |
| | | @Override |
| | | public void setCookie(HttpServletRequest request, HttpServletResponse response, UserModel user) { |
| | | authenticationManager.setCookie(request, response, user); |
| | | } |
| | | |
| | | @Override |
| | | @Deprecated |
| | | public void logout(HttpServletResponse response, UserModel user) { |
| | | authenticationManager.logout(response, user); |
| | | } |
| | | |
| | | @Override |
| | | public void logout(HttpServletRequest request, HttpServletResponse response, UserModel user) { |
| | | authenticationManager.logout(request, response, user); |
| | | } |
| | | |
| | | @Override |
| | | public boolean supportsCredentialChanges(UserModel user) { |
| | | return authenticationManager.supportsCredentialChanges(user); |
| | | } |
| | |
| | | * @param user |
| | | * @since 1.4.0 |
| | | */ |
| | | @Deprecated |
| | | void setCookie(HttpServletResponse response, UserModel user); |
| | | |
| | | /** |
| | | * Sets a cookie for the specified user. |
| | | * |
| | | * @param request |
| | | * @param response |
| | | * @param user |
| | | * @since 1.6.1 |
| | | */ |
| | | void setCookie(HttpServletRequest request, HttpServletResponse response, UserModel user); |
| | | |
| | | /** |
| | | * Logout a user. |
| | |
| | | * @param user |
| | | * @since 1.4.0 |
| | | */ |
| | | @Deprecated |
| | | void logout(HttpServletResponse response, UserModel user); |
| | | |
| | | /** |
| | | * Logout a user. |
| | | * |
| | | * @param request |
| | | * @param response |
| | | * @param user |
| | | * @since 1.6.1 |
| | | */ |
| | | void logout(HttpServletRequest request, HttpServletResponse response, UserModel user); |
| | | |
| | | /** |
| | | * Does the user service support changes to credentials? |
| | | * |
| | | * @return true or false |
| | |
| | | import org.apache.wicket.markup.html.form.StatelessForm;
|
| | | import org.apache.wicket.model.IModel;
|
| | | import org.apache.wicket.model.Model;
|
| | | import org.apache.wicket.protocol.http.WebRequest;
|
| | | import org.apache.wicket.protocol.http.WebResponse;
|
| | |
|
| | | import com.gitblit.GitBlitException;
|
| | |
| | | try {
|
| | | app().gitblit().reviseUser(user.username, user);
|
| | | if (app().settings().getBoolean(Keys.web.allowCookieAuthentication, false)) {
|
| | | WebRequest request = (WebRequest) getRequestCycle().getRequest();
|
| | | WebResponse response = (WebResponse) getRequestCycle().getResponse();
|
| | | app().authentication().setCookie(response.getHttpServletResponse(), user);
|
| | | app().authentication().setCookie(request.getHttpServletRequest(),
|
| | | response.getHttpServletResponse(), user);
|
| | | }
|
| | | } catch (GitBlitException e) {
|
| | | error(e.getMessage());
|
| | |
| | | super();
|
| | | GitBlitWebSession session = GitBlitWebSession.get();
|
| | | UserModel user = session.getUser();
|
| | | app().authentication().logout(((WebResponse) getResponse()).getHttpServletResponse(), user);
|
| | | app().authentication().logout(((WebRequest) getRequest()).getHttpServletRequest(),
|
| | | ((WebResponse) getResponse()).getHttpServletResponse(), user);
|
| | | session.invalidate();
|
| | |
|
| | | /*
|
| | |
| | | import org.apache.wicket.markup.repeater.data.ListDataProvider; |
| | | import org.apache.wicket.model.IModel; |
| | | import org.apache.wicket.model.Model; |
| | | import org.apache.wicket.protocol.http.WebRequest; |
| | | import org.apache.wicket.protocol.http.WebResponse; |
| | | |
| | | import com.gitblit.Constants; |
| | |
| | | |
| | | // Set Cookie |
| | | if (app().settings().getBoolean(Keys.web.allowCookieAuthentication, false)) { |
| | | WebRequest request = (WebRequest) getRequestCycle().getRequest(); |
| | | WebResponse response = (WebResponse) getRequestCycle().getResponse(); |
| | | app().authentication().setCookie(response.getHttpServletResponse(), user); |
| | | app().authentication().setCookie(request.getHttpServletRequest(), |
| | | response.getHttpServletResponse(), user); |
| | | } |
| | | |
| | | if (!session.continueRequest()) { |
| | |
| | |
|
| | | if (user == null || user.disabled) {
|
| | | // user was deleted/disabled during session
|
| | | HttpServletRequest request = ((WebRequest) getRequestCycle().getRequest())
|
| | | .getHttpServletRequest();
|
| | | HttpServletResponse response = ((WebResponse) getRequestCycle().getResponse())
|
| | | .getHttpServletResponse();
|
| | | app().authentication().logout(response, user);
|
| | | app().authentication().logout(request, response, user);
|
| | | session.setUser(null);
|
| | | session.invalidateNow();
|
| | | return;
|
| | |
| | | // cookie was changed during our session
|
| | | HttpServletResponse response = ((WebResponse) getRequestCycle().getResponse())
|
| | | .getHttpServletResponse();
|
| | | app().authentication().logout(response, user);
|
| | | app().authentication().logout(request, response, user);
|
| | | session.setUser(null);
|
| | | session.invalidateNow();
|
| | | return;
|
| | |
| | | session.setUser(user);
|
| | |
|
| | | // Set Cookie
|
| | | WebRequest request = (WebRequest) getRequestCycle().getRequest();
|
| | | WebResponse response = (WebResponse) getRequestCycle().getResponse();
|
| | | app().authentication().setCookie(response.getHttpServletResponse(), user);
|
| | | app().authentication().setCookie(request.getHttpServletRequest(),
|
| | | response.getHttpServletResponse(), user);
|
| | |
|
| | | session.continueRequest();
|
| | | }
|