Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 00:15:44 +01:00
Code Issues Packages Projects Releases Activity

merge with branch issue-384

Browse Source
This commit is contained in:
Sebastian Sdorra
2013-04-26 14:46:37 +02:00
parent 6ca57dc2e8 c9dfd62db1
commit 1726bb0bc0
17 changed files with 65 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-core/src/main/java/sonia/scm/repository/PermissionUtil.java
View File

@@ -183,7 +183,7 @@ public final class PermissionUtil
Subject subject = SecurityUtils.getSubject();
if (subject.isAuthenticated())
if (subject.isAuthenticated() || subject.isRemembered())
{
String username = subject.getPrincipal().toString();

25
scm-core/src/main/java/sonia/scm/security/Tokens.java
View File

@@ -69,12 +69,33 @@ public final class Tokens
* @param username username of the user to authenticate
* @param password password of the user to authenticate
*
* @return
* @return authentication token
*/
public static AuthenticationToken createAuthenticationToken(
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());
}
}

2
scm-core/src/main/java/sonia/scm/util/SecurityUtil.java
View File

@@ -87,7 +87,7 @@ public final class SecurityUtil
{
Subject subject = SecurityUtils.getSubject();
if (!subject.isAuthenticated())
if (!subject.hasRole(Role.USER))
{
throw new ScmSecurityException("user is not authenticated");
}

2
scm-core/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java
View File

@@ -156,7 +156,7 @@ public class BasicAuthenticationFilter extends HttpFilter
}
}
}
else if (subject.isAuthenticated())
else if (subject.isAuthenticated() || subject.isRemembered())
{
if (logger.isTraceEnabled())
{

3
scm-core/src/main/java/sonia/scm/web/filter/PermissionFilter.java
View File

@@ -65,6 +65,7 @@ import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import sonia.scm.security.Role;
/**
* Abstract http filter to check repository permissions.
@@ -255,7 +256,7 @@ public abstract class PermissionFilter extends HttpFilter
private void sendAccessDenied(HttpServletResponse response, Subject subject)
throws IOException
{
if (subject.isAuthenticated())
if (subject.hasRole(Role.USER))
{
response.sendError(HttpServletResponse.SC_FORBIDDEN);
}

4
scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/SubjectWrapper.java
View File

@@ -73,7 +73,7 @@ public class SubjectWrapper
{
String name;
if (subject.isAuthenticated())
if (subject.isAuthenticated() || subject.isRemembered())
{
name = (String) subject.getPrincipal();
}
@@ -104,7 +104,7 @@ public class SubjectWrapper
*/
public boolean isAuthenticated()
{
return subject.isAuthenticated();
return subject.isAuthenticated() || subject.isRemembered();
}
//~--- fields ---------------------------------------------------------------

2
scm-samples/scm-sample-hello/src/main/java/sample/hello/HelloResource.java
View File

@@ -66,7 +66,7 @@ public class HelloResource
Subject subject = SecurityUtils.getSubject();
String displayName = "Unknown";
if (subject.isAuthenticated())
if (subject.isAuthenticated() || subject.isRemembered())
{
displayName =
subject.getPrincipals().oneByType(User.class).getDisplayName();

4
scm-test/src/main/java/sonia/scm/util/MockUtil.java
View File

@@ -62,6 +62,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import sonia.scm.security.Role;
/**
*
@@ -116,7 +117,8 @@ public final class MockUtil
when(subject.isPermittedAll(anyCollectionOf(Permission.class))).thenReturn(
Boolean.TRUE);
when(subject.isPermittedAll()).thenReturn(Boolean.TRUE);
when(subject.hasRole("admin")).thenReturn(Boolean.TRUE);
when(subject.hasRole(Role.ADMIN)).thenReturn(Boolean.TRUE);
when(subject.hasRole(Role.USER)).thenReturn(Boolean.TRUE);
PrincipalCollection collection = mock(PrincipalCollection.class);

16
scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
View File

@@ -68,6 +68,7 @@ import java.util.Collections;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
@@ -131,6 +132,7 @@ public class AuthenticationResource
* @param response the current http response
* @param username the username for the authentication
* @param password the password for the authentication
* @param rememberMe true to remember the user across sessions
*
* @return
*/
@@ -139,7 +141,8 @@ public class AuthenticationResource
@TypeHint(ScmState.class)
public ScmState authenticate(@Context HttpServletRequest request,
@FormParam("username") String username,
@FormParam("password") String password)
@FormParam("password") String password, @FormParam("rememberMe")
@DefaultValue("false") boolean rememberMe)
{
ScmState state = null;
@@ -148,7 +151,7 @@ public class AuthenticationResource
try
{
subject.login(Tokens.createAuthenticationToken(request, username,
password));
password, rememberMe));
state = createState(subject);
}
catch (AuthenticationException ex)
@@ -253,11 +256,16 @@ public class AuthenticationResource
Response response = null;
Subject subject = SecurityUtils.getSubject();
if (subject.isAuthenticated())
if (subject.isAuthenticated() || subject.isRemembered())
{
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);

3
scm-webapp/src/main/java/sonia/scm/api/rest/resources/ChangePasswordResource.java
View File

@@ -65,6 +65,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import sonia.scm.security.Role;
/**
*
@@ -137,7 +138,7 @@ public class ChangePasswordResource
Response response = null;
Subject subject = SecurityUtils.getSubject();
if (!subject.isAuthenticated())
if (!subject.hasRole(Role.USER))
{
throw new ScmSecurityException("user is not authenticated");
}

7
scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java
View File

@@ -111,7 +111,7 @@ public class SecurityFilter extends HttpFilter
chain.doFilter(new SecurityHttpServletRequestWrapper(request,
getUser(subject)), response);
}
else if (subject.isAuthenticated())
else if (subject.isAuthenticated() || subject.isRemembered())
{
response.sendError(HttpServletResponse.SC_FORBIDDEN);
}
@@ -142,8 +142,7 @@ public class SecurityFilter extends HttpFilter
*/
protected boolean hasPermission(Subject subject)
{
return ((configuration != null)
&& configuration.isAnonymousAccessEnabled()) || subject.isAuthenticated();
return ((configuration != null) && configuration.isAnonymousAccessEnabled()) || subject.isAuthenticated() || subject.isRemembered();
}
/**
@@ -158,7 +157,7 @@ public class SecurityFilter extends HttpFilter
{
User user = null;
if (subject.isAuthenticated())
if (subject.isAuthenticated() || subject.isRemembered())
{
user = subject.getPrincipals().oneByType(User.class);
}

3
scm-webapp/src/main/java/sonia/scm/search/SearchHandler.java
View File

@@ -55,6 +55,7 @@ import java.util.Collection;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response.Status;
import sonia.scm.security.Role;
/**
*
@@ -112,7 +113,7 @@ public class SearchHandler<T>
{
Subject subject = SecurityUtils.getSubject();
if (!subject.isAuthenticated())
if (!subject.hasRole(Role.USER))
{
throw new ScmSecurityException("Authentication is required");
}

2
scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
View File

@@ -169,7 +169,7 @@ public class DefaultUserManager extends AbstractUserManager
Subject subject = SecurityUtils.getSubject();
if (!subject.isAuthenticated())
if (!subject.hasRole(Role.USER))
{
throw new ScmSecurityException("user is not authenticated");
}

2
scm-webapp/src/main/java/sonia/scm/web/security/BasicSecurityContext.java
View File

@@ -227,7 +227,7 @@ public class BasicSecurityContext implements WebSecurityContext
T result = null;
Subject subject = SecurityUtils.getSubject();
if (subject.isAuthenticated())
if (subject.isAuthenticated() || subject.isRemembered())
{
PrincipalCollection pc = subject.getPrincipals();

2
scm-webapp/src/main/java/sonia/scm/web/security/DefaultAdministrationContext.java
View File

@@ -242,7 +242,7 @@ public class DefaultAdministrationContext implements AdministrationContext
{
String username = null;
if (subject.isAuthenticated())
if (subject.hasRole(Role.USER))
{
username = principal;
}

3
scm-webapp/src/main/webapp/resources/js/i18n/de.js
View File

@@ -88,7 +88,8 @@ if (Sonia.login.Form){
WaitMsgText: 'Übertrage Daten...',
failedMsgText: 'Anmeldung fehlgeschlagen!',
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'
});
}

8
scm-webapp/src/main/webapp/resources/js/login/sonia.login.form.js
View File

@@ -39,11 +39,12 @@ Sonia.login.Form = Ext.extend(Ext.FormPanel,{
WaitMsgText: 'Sending data...',
failedMsgText: 'Login failed!',
failedDescriptionText: 'Incorrect username, password or not enough permission. Please Try again.',
rememberMeText: 'Remember me',
initComponent: function(){
var config = {
labelWidth: 80,
labelWidth: 120,
url: restUrl + "authentication/login.json",
frame: true,
title: this.titleText,
@@ -76,6 +77,11 @@ Sonia.login.Form = Ext.extend(Ext.FormPanel,{
scope: this
}
}
},{
xtype: 'checkbox',
fieldLabel: this.rememberMeText,
name: 'rememberMe',
inputValue: 'true'
}],
buttons:[{
text: this.cancelText,