honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode

This commit is contained in:
jamesagnew 2014-03-10 12:44:33 -04:00
parent c830d5f45d 1adfa2a246
commit 6140e73034
3 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/ISecurityManager.java
View File

@ -1,10 +1,12 @@
package ca.uhn.fhir.rest.server;
import ca.uhn.fhir.rest.server.exceptions.AuthenticationException;
import javax.servlet.http.HttpServletRequest;
/**
* Created by dsotnikov on 3/7/2014.
*/
public interface ISecurityManager {
public boolean authenticate(HttpServletRequest request);
public void authenticate(HttpServletRequest request) throws AuthenticationException;
}

16
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
View File

@ -16,6 +16,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import ca.uhn.fhir.rest.server.exceptions.*;
import org.apache.commons.lang3.StringUtils;
import ca.uhn.fhir.context.FhirContext;
@ -26,10 +27,6 @@ import ca.uhn.fhir.model.api.IResource;
import ca.uhn.fhir.model.primitive.IdDt;
import ca.uhn.fhir.rest.common.BaseMethodBinding;
import ca.uhn.fhir.rest.common.SearchMethodBinding;
import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import ca.uhn.fhir.rest.server.exceptions.MethodNotFoundException;
import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
public abstract class RestfulServer extends HttpServlet {
@ -107,6 +104,11 @@ public abstract class RestfulServer extends HttpServlet {
protected void handleRequest(SearchMethodBinding.RequestType requestType, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
try {
if (null != securityManager) {
securityManager.authenticate(request);
}
String resourceName = null;
Long identity = null;
@ -178,7 +180,11 @@ public abstract class RestfulServer extends HttpServlet {
}
// resourceMethod.get
} catch (BaseServerResponseException e) {
} catch (AuthenticationException e) {
response.setStatus(e.getStatusCode());
response.getWriter().write(e.getMessage());
}
catch (BaseServerResponseException e) {
if (e instanceof InternalErrorException) {
ourLog.error("Failure during REST processing", e);

23
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/AuthenticationException.java Normal file
View File

@ -0,0 +1,23 @@
package ca.uhn.fhir.rest.server.exceptions;
import javax.servlet.ServletException;
/**
* Created by dsotnikov on 3/10/2014.
*/
public class AuthenticationException extends BaseServerResponseException {
private static final long serialVersionUID = 1L;
public AuthenticationException() {
super(401, "Client unauthorized");
}
public AuthenticationException(String theMessage) {
super(401, theMessage);
}
public AuthenticationException(int theStatusCode, String theMessage) {
super(theStatusCode, theMessage);
}
}