Merge pull request #16 from pajavyskocil/EPTID_timeOptimalization

Time Optimalization

Author: tauceti2

lib/Disco.php

@@ -11,13 +11,17 @@
  * comment them out or in case of automated metadata fetching configure blacklist in config-metarefresh.php
  *
  * @author Ondrej Velisek <ondrejvelisek@gmail.com>
+ * @author Pavel Vyskocil <vyskocilpavel@muni.cz>
  */
 class sspmod_perun_Disco extends sspmod_discopower_PowerIdPDisco
 {
 	const CONFIG_FILE_NAME = 'module_perun.php';
 	const PROPNAME_DISABLE_WHITELISTING = 'disco.disableWhitelisting';
 
 	private $originalsp;
+	private $whitelist;
+	private $greylist;
+	private $service;
 
 	public function __construct(array $metadataSets, $instance)
 	{
@@ -27,6 +31,9 @@ public function __construct(array $metadataSets, $instance)
 		$id = explode(":", $query['AuthID'])[0];
 		$state = SimpleSAML_Auth_State::loadState($id, 'saml:sp:sso');
 		$this->originalsp = $state['SPMetadata'];
+		$this->service = new sspmod_perun_IdpListsServiceCsv();
+		$this->whitelist = $this->service->listToArray("whitelist");
+		$this->greylist = $this->service->listToArray("greylist");
 	}
 
 
@@ -115,10 +122,10 @@ protected function scoping($list)
 
 	protected function whitelisting($list)
 	{
-		$service = new sspmod_perun_IdpListsServiceCsv();
 		foreach ($list as $entityId => $idp) {
 			$unset = true;
-			if ($service->isWhitelisted($entityId)) {
+
+			if (in_array($entityId, $this->whitelist)){
 				$unset = false;
 			}
 			if (isset($idp['EntityAttributes']['http://macedir.org/entity-category-support'])) {
@@ -149,9 +156,8 @@ protected function whitelisting($list)
 
 	protected function greylisting($list)
 	{
-		$service = new sspmod_perun_IdpListsServiceCsv();
 		foreach ($list as $entityId => $idp) {
-			if ($service->isGreylisted($entityId)) {
+			if (in_array($entityId, $this->greylist)) {
 				unset($list[$entityId]);
 			}
 		}

lib/IdpListsService.php

@@ -12,6 +12,7 @@
  * Note that implementation should be thread/concurrency safe.
  *
  * @author Ondrej Velisek <ondrejvelisek@gmail.com>
+ * @author Pavel Vyskocil <vyskocilpavel@muni.cz>
  */
 interface sspmod_perun_IdpListsService
 {
@@ -49,4 +50,10 @@ function isGreylisted($entityID);
 	 * @param null|string $reason
 	 */
 	function whitelistIdp($entityID, $reason = null);
+
+	/**
+	 * @param string $listName "whitelist" or "greylist"
+	 * @return array of entityIdPs
+	 */
+	function listToArray($listName);
 }

lib/IdpListsServiceCsv.php

@@ -5,6 +5,7 @@
  * first column is timestamp, second entityid and third reason
  *
  * @author Ondrej Velisek <ondrejvelisek@gmail.com>
+ * @author Pavel Vyskocil <vyskocilpavel@muni.cz>
  */
 class sspmod_perun_IdpListsServiceCsv implements sspmod_perun_IdpListsService
 {
@@ -174,6 +175,36 @@ function whitelistIdp($entityID, $reason = null)
 
 	}
 
+	function listToArray($listName){
+		if ($listName === "whitelist"){
+			$list = $this->whitelistFile;
+		} else{
+			$list = $this->greylistFile;
+		}
+
+		$resultList = array();
+
+		if (!file_exists($list)) {
+			return $resultList;
+		}
+
+		$f = fopen($list, 'r');
+		if (flock($f, LOCK_SH)) {
+
+			while (($idp = $this->arrayToIdp(fgetcsv($f))) !== false) {
+				array_push($resultList, $idp['entityid']);
+			}
+
+			fflush($f);
+			flock($f, LOCK_UN);
+		} else {
+			throw new SimpleSAML_Error_Exception("IdpListsServiceCsv - unable to get file lock. Hint: Try to create folder config/idplists and add write rights.");
+		}
+		fclose($f);
+
+		return $resultList;
+	}
+
 	private function arrayToIdp($csv) {
 		if (!is_array($csv)) return false;