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

improve security

Browse Source
This commit is contained in:
Sebastian Sdorra
2010-10-15 17:58:16 +02:00
parent e891d762fb
commit d0825b25c8
9 changed files with 469 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,11 +16,12 @@ import sonia.scm.ScmState;
import sonia.scm.User;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.RepositoryType;
import sonia.scm.web.security.Authenticator;
import sonia.scm.web.security.SecurityContext;
//~--- JDK imports ------------------------------------------------------------
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
@@ -47,6 +48,7 @@ public class AuthenticationResource
*
*
* @param request
* @param response
* @param username
* @param password
*
@@ -54,11 +56,13 @@ public class AuthenticationResource
*/
@POST
public ScmState getState(@Context HttpServletRequest request,
@Context HttpServletResponse response,
@FormParam("username") String username,
@FormParam("password") String password)
{
ScmState state = null;
User user = authenticator.authenticate(request, username, password);
User user = securityContext.authenticate(request, response, username,
password);
if (user != null)
{
@@ -84,7 +88,7 @@ public class AuthenticationResource
public ScmState getState(@Context HttpServletRequest request)
{
ScmState state = null;
User user = authenticator.getUser(request);
User user = securityContext.getUser();
if (user != null)
{
@@ -122,9 +126,9 @@ public class AuthenticationResource
/** Field description */
@Inject
private Authenticator authenticator;
private RepositoryManager repositoryManger;
/** Field description */
@Inject
private RepositoryManager repositoryManger;
private SecurityContext securityContext;
}