From d7ab27a147d2a54e7c937c81fb6963b7b5678a65 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sat, 22 Jun 2013 21:58:12 +0200
Subject: [PATCH] prevent use of proxy if option is disabled

---
 .../com/commafeed/frontend/rest/resources/ServerREST.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/commafeed/frontend/rest/resources/ServerREST.java b/src/main/java/com/commafeed/frontend/rest/resources/ServerREST.java
index b95cc15f..d4df7350 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/ServerREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/ServerREST.java
@@ -34,6 +34,10 @@ public class ServerREST extends AbstractResourceREST {
 	@ApiOperation(value = "proxy image")
 	@Produces("image/png")
 	public Response get(@QueryParam("u") String url) {
+		if (!applicationSettingsService.get().isImageProxyEnabled()) {
+			return Response.status(Status.UNAUTHORIZED).build();
+		}
+		
 		url = FeedUtils.imageProxyDecoder(url);
 		try {
 			HttpResult result = httpGetter.getBinary(url);