From 1ba9d32c9f212ff4095dca0ec770561336d14b3d Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Fri, 19 Apr 2013 10:39:13 +0200
Subject: [PATCH] use basic authentication if cookie is not found

---
 .../frontend/rest/resources/AbstractREST.java | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java b/src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java
index 6f17f39d..2bf81e6b 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java
@@ -12,6 +12,7 @@ import javax.ws.rs.Consumes;
 import javax.ws.rs.Produces;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
@@ -22,6 +23,7 @@ import org.apache.wicket.authroles.authorization.strategies.role.Roles;
 import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
 import org.apache.wicket.protocol.http.servlet.ServletWebResponse;
 import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.util.crypt.Base64;
 
 import com.commafeed.backend.MetricsBean;
 import com.commafeed.backend.dao.FeedCategoryDAO;
@@ -48,6 +50,7 @@ import com.commafeed.frontend.SecurityCheck;
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
 public abstract class AbstractREST {
+
 	@Context
 	HttpServletRequest request;
 
@@ -74,7 +77,7 @@ public abstract class AbstractREST {
 
 	@Inject
 	FeedEntryStatusDAO feedEntryStatusDAO;
-	
+
 	@Inject
 	FeedEntryService feedEntryService;
 
@@ -118,9 +121,18 @@ public abstract class AbstractREST {
 			String[] data = authenticationStrategy.load();
 			if (data != null && data.length > 1) {
 				session.signIn(data[0], data[1]);
+			} else {
+				String value = swreq.getHeader(HttpHeaders.AUTHORIZATION);
+				if (value != null && value.startsWith("Basic ")) {
+					value = value.substring(6);
+					String decoded = new String(Base64.decodeBase64(value));
+					data = decoded.split(":");
+					if (data != null && data.length > 1) {
+						session.signIn(data[0], data[1]);
+					}
+				}
 			}
 		}
-
 	}
 
 	protected User getUser() {
@@ -144,8 +156,18 @@ public abstract class AbstractREST {
 							SecurityCheck.class));
 		}
 		if (!allowed) {
-			throw new WebApplicationException(Response.status(Status.FORBIDDEN)
-					.entity("You are not authorized to do this.").build());
+			if (user == null) {
+				throw new WebApplicationException(Response
+						.status(Status.UNAUTHORIZED)
+						.entity("You are not authorized to do this.")
+						.header(HttpHeaders.WWW_AUTHENTICATE,
+								"Basic realm=\"CommaFeed\"").build());
+			} else {
+				throw new WebApplicationException(Response
+						.status(Status.FORBIDDEN)
+						.entity("You are not authorized to do this.").build());
+			}
+
 		}
 
 		return context.proceed();