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

fix login bug with enabled anonymous access

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-01-13 20:26:20 +01:00
parent f9dcf08f31
commit f7b9803b20
1 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,7 @@ import com.google.inject.Singleton;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import sonia.scm.SCMContext;
import sonia.scm.ScmState; import sonia.scm.ScmState;
import sonia.scm.Type; import sonia.scm.Type;
import sonia.scm.repository.RepositoryManager; import sonia.scm.repository.RepositoryManager;
@@ -78,6 +79,40 @@ public class AuthenticationResource
//~--- methods -------------------------------------------------------------- //~--- methods --------------------------------------------------------------
/**
* Method description
*
*
* @param request
* @param response
* @param username
* @param password
*
* @return
*/
@POST
@Path("login")
public ScmState authenticate(@Context HttpServletRequest request,
@Context HttpServletResponse response,
@FormParam("username") String username,
@FormParam("password") String password)
{
ScmState state = null;
User user = securityContext.authenticate(request, response, username,
password);
if ((user != null) &&!SCMContext.USER_ANONYMOUS.equals(user.getName()))
{
state = new ScmState(securityContext, repositoryManger.getTypes());
}
else
{
throw new WebApplicationException(Response.Status.UNAUTHORIZED);
}
return state;
}
/** /**
* Method description * Method description
* *
@@ -112,40 +147,6 @@ public class AuthenticationResource
//~--- get methods ---------------------------------------------------------- //~--- get methods ----------------------------------------------------------
/**
* Method description
*
*
* @param request
* @param response
* @param username
* @param password
*
* @return
*/
@POST
@Path("login")
public ScmState getState(@Context HttpServletRequest request,
@Context HttpServletResponse response,
@FormParam("username") String username,
@FormParam("password") String password)
{
ScmState state = null;
User user = securityContext.authenticate(request, response, username,
password);
if (user != null)
{
state = new ScmState(securityContext, repositoryManger.getTypes());
}
else
{
throw new WebApplicationException(Response.Status.UNAUTHORIZED);
}
return state;
}
/** /**
* Method description * Method description
* *