mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-14 09:25:43 +01:00
start implementation of a remember me system
This commit is contained in:
@@ -69,12 +69,33 @@ public final class Tokens
|
|||||||
* @param username username of the user to authenticate
|
* @param username username of the user to authenticate
|
||||||
* @param password password of the user to authenticate
|
* @param password password of the user to authenticate
|
||||||
*
|
*
|
||||||
* @return
|
* @return authentication token
|
||||||
*/
|
*/
|
||||||
public static AuthenticationToken createAuthenticationToken(
|
public static AuthenticationToken createAuthenticationToken(
|
||||||
HttpServletRequest request, String username, String password)
|
HttpServletRequest request, String username, String password)
|
||||||
{
|
{
|
||||||
return new UsernamePasswordToken(username, password,
|
return createAuthenticationToken(request, username, password, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Build an {@link AuthenticationToken} for use with
|
||||||
|
* {@link Subject#login(org.apache.shiro.authc.AuthenticationToken)}.
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @param request servlet request
|
||||||
|
* @param username username of the user to authenticate
|
||||||
|
* @param password password of the user to authenticate
|
||||||
|
* @param rememberMe true to remember the user across sessions
|
||||||
|
*
|
||||||
|
* @return authentication token
|
||||||
|
*
|
||||||
|
* @since 1.31
|
||||||
|
*/
|
||||||
|
public static AuthenticationToken createAuthenticationToken(
|
||||||
|
HttpServletRequest request, String username, String password,
|
||||||
|
boolean rememberMe)
|
||||||
|
{
|
||||||
|
return new UsernamePasswordToken(username, password, rememberMe,
|
||||||
request.getRemoteAddr());
|
request.getRemoteAddr());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -156,7 +156,7 @@ public class BasicAuthenticationFilter extends HttpFilter
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (subject.isAuthenticated())
|
else if (subject.isAuthenticated() || subject.isRemembered())
|
||||||
{
|
{
|
||||||
if (logger.isTraceEnabled())
|
if (logger.isTraceEnabled())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ import java.util.Collections;
|
|||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import javax.ws.rs.DefaultValue;
|
||||||
import javax.ws.rs.FormParam;
|
import javax.ws.rs.FormParam;
|
||||||
import javax.ws.rs.GET;
|
import javax.ws.rs.GET;
|
||||||
import javax.ws.rs.POST;
|
import javax.ws.rs.POST;
|
||||||
@@ -131,6 +132,7 @@ public class AuthenticationResource
|
|||||||
* @param response the current http response
|
* @param response the current http response
|
||||||
* @param username the username for the authentication
|
* @param username the username for the authentication
|
||||||
* @param password the password for the authentication
|
* @param password the password for the authentication
|
||||||
|
* @param rememberMe true to remember the user across sessions
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -139,7 +141,8 @@ public class AuthenticationResource
|
|||||||
@TypeHint(ScmState.class)
|
@TypeHint(ScmState.class)
|
||||||
public ScmState authenticate(@Context HttpServletRequest request,
|
public ScmState authenticate(@Context HttpServletRequest request,
|
||||||
@FormParam("username") String username,
|
@FormParam("username") String username,
|
||||||
@FormParam("password") String password)
|
@FormParam("password") String password, @FormParam("rememberMe")
|
||||||
|
@DefaultValue("false") boolean rememberMe)
|
||||||
{
|
{
|
||||||
ScmState state = null;
|
ScmState state = null;
|
||||||
|
|
||||||
@@ -148,7 +151,7 @@ public class AuthenticationResource
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
subject.login(Tokens.createAuthenticationToken(request, username,
|
subject.login(Tokens.createAuthenticationToken(request, username,
|
||||||
password));
|
password, rememberMe));
|
||||||
state = createState(subject);
|
state = createState(subject);
|
||||||
}
|
}
|
||||||
catch (AuthenticationException ex)
|
catch (AuthenticationException ex)
|
||||||
@@ -253,11 +256,16 @@ public class AuthenticationResource
|
|||||||
Response response = null;
|
Response response = null;
|
||||||
Subject subject = SecurityUtils.getSubject();
|
Subject subject = SecurityUtils.getSubject();
|
||||||
|
|
||||||
if (subject.isAuthenticated())
|
if (subject.isAuthenticated() || subject.isRemembered())
|
||||||
{
|
{
|
||||||
if (logger.isDebugEnabled())
|
if (logger.isDebugEnabled())
|
||||||
{
|
{
|
||||||
logger.debug("return state for user {}", subject.getPrincipal());
|
String auth = subject.isRemembered()
|
||||||
|
? "remembered"
|
||||||
|
: "authenticated";
|
||||||
|
|
||||||
|
logger.debug("return state for {} user {}", auth,
|
||||||
|
subject.getPrincipal());
|
||||||
}
|
}
|
||||||
|
|
||||||
ScmState state = createState(subject);
|
ScmState state = createState(subject);
|
||||||
|
|||||||
@@ -88,7 +88,8 @@ if (Sonia.login.Form){
|
|||||||
WaitMsgText: 'Übertrage Daten...',
|
WaitMsgText: 'Übertrage Daten...',
|
||||||
failedMsgText: 'Anmeldung fehlgeschlagen!',
|
failedMsgText: 'Anmeldung fehlgeschlagen!',
|
||||||
failedDescriptionText: 'Falscher Benutzername, Passwort oder sie haben nicht\n\
|
failedDescriptionText: 'Falscher Benutzername, Passwort oder sie haben nicht\n\
|
||||||
genug Berechtigungen. Bitte versuchen sie es erneut.'
|
genug Berechtigungen. Bitte versuchen sie es erneut.',
|
||||||
|
rememberMeText: 'Angemeldet bleiben'
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,11 +39,12 @@ Sonia.login.Form = Ext.extend(Ext.FormPanel,{
|
|||||||
WaitMsgText: 'Sending data...',
|
WaitMsgText: 'Sending data...',
|
||||||
failedMsgText: 'Login failed!',
|
failedMsgText: 'Login failed!',
|
||||||
failedDescriptionText: 'Incorrect username, password or not enough permission. Please Try again.',
|
failedDescriptionText: 'Incorrect username, password or not enough permission. Please Try again.',
|
||||||
|
rememberMeText: 'Remember me',
|
||||||
|
|
||||||
initComponent: function(){
|
initComponent: function(){
|
||||||
|
|
||||||
var config = {
|
var config = {
|
||||||
labelWidth: 80,
|
labelWidth: 120,
|
||||||
url: restUrl + "authentication/login.json",
|
url: restUrl + "authentication/login.json",
|
||||||
frame: true,
|
frame: true,
|
||||||
title: this.titleText,
|
title: this.titleText,
|
||||||
@@ -76,6 +77,11 @@ Sonia.login.Form = Ext.extend(Ext.FormPanel,{
|
|||||||
scope: this
|
scope: this
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},{
|
||||||
|
xtype: 'checkbox',
|
||||||
|
fieldLabel: this.rememberMeText,
|
||||||
|
name: 'rememberMe',
|
||||||
|
inputValue: 'true'
|
||||||
}],
|
}],
|
||||||
buttons:[{
|
buttons:[{
|
||||||
text: this.cancelText,
|
text: this.cancelText,
|
||||||
|
|||||||
Reference in New Issue
Block a user