Merge branch 'develop' into Azure

Conflicts:
	pom.xml

Author: giovannifs

pom.xml

@@ -250,6 +250,11 @@
 	    <artifactId>azure-management</artifactId>
 	    <version>0.8.0</version>
 	</dependency>
+    <dependency>
+		<groupId>org.opensaml</groupId>
+		<artifactId>opensaml</artifactId>
+		<version>2.6.4</version>
+	</dependency>
   </dependencies>
 
 </project>

src/main/java/org/fogbowcloud/manager/core/ManagerController.java

@@ -1497,6 +1497,12 @@ public List<Resource> getAllResouces(String accessId) {
 		return ResourceRepository.getInstance().getAll();
 	}
 
+	/**
+	 * This method will not be supported in next releases.
+	 * @param request
+	 * @param response
+	 */
+	@Deprecated
 	public void bypass(org.restlet.Request request, Response response) {
 		LOGGER.debug("Bypassing request: " + request);
 		computePlugin.bypass(request, response);

src/main/java/org/fogbowcloud/manager/core/plugins/ComputePlugin.java

@@ -37,6 +37,12 @@ public String requestInstance(Token token,List<Category> categories,
 	 */
 	public ResourcesInfo getResourcesInfo(Token token);
 
+	/**
+	 * This method will not be supported in next releases.
+	 * @param request
+	 * @param response
+	 */
+	@Deprecated
 	public void bypass(Request request, Response response);
 
 	public void uploadImage(Token token, String imagePath, String imageName, String diskFormat);

src/main/java/org/fogbowcloud/manager/core/plugins/authorization/eduperson/EduPersonWhitelistAuthorizationPlugin.java

@@ -0,0 +1,43 @@
+package org.fogbowcloud.manager.core.plugins.authorization.eduperson;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.log4j.Logger;
+import org.fogbowcloud.manager.core.plugins.AuthorizationPlugin;
+import org.fogbowcloud.manager.occi.model.Token;
+
+public class EduPersonWhitelistAuthorizationPlugin implements AuthorizationPlugin {
+
+	private static final Logger LOGGER = Logger.getLogger(EduPersonWhitelistAuthorizationPlugin.class);
+	private List<String> institutionWhiteList;
+	
+	public EduPersonWhitelistAuthorizationPlugin(Properties properties) {
+		String whiteListStr = properties.getProperty("authorization_eduperson_whitelist");
+		if (whiteListStr == null) {
+			LOGGER.error("Property authorization_eduperson_whitelist must be set.");
+			throw new IllegalArgumentException(
+					"Property authorization_eduperson_whitelist must be set.");
+		}
+		this.institutionWhiteList = Arrays.asList(whiteListStr.split(","));
+	}
+	
+	@Override
+	public boolean isAuthorized(Token token) {
+		if (token == null) {
+			return false;
+		}
+		String eduPersonPrincipalName = token.get("eduPersonPrincipalName");
+		if (eduPersonPrincipalName == null) {
+			return false;
+		}
+		String[] eduPersonPrincipalNameSplit = eduPersonPrincipalName.split("@");
+		if (eduPersonPrincipalNameSplit.length != 2) {
+			return false;
+		}
+		String institutionIdP = eduPersonPrincipalNameSplit[1];
+		return institutionWhiteList.contains(institutionIdP);
+	}
+
+}

src/main/java/org/fogbowcloud/manager/core/plugins/compute/ec2/EC2ComputePlugin.java

@@ -507,8 +507,10 @@ private Map<String, Flavor> getFlavors() {
 		try {
 			content = new JSONObject(response.getContent());
 		} catch (JSONException e) {
-			
+			LOGGER.error("Couldn't retrieve flavours from AWS.", e);
+			throw new OCCIException(ErrorType.BAD_REQUEST, ResponseConstants.INVALID_STATE);
 		}
+		
 		JSONArray regionsAr = content.optJSONObject("config").optJSONArray("regions");
 		JSONObject regionJson = null;
 		for (int i = 0; i < regionsAr.length(); i++) {