Transform auth.cas into an authfront plugin. Expand CAS feature

pydio · Jun 9, 2014 · 3c20fbb · 3c20fbb
1 parent b7f6a93
commit 3c20fbb
Show file tree

Hide file tree

Showing 39 changed files with 234 additions and 182 deletions.
diff --git a/core/src/plugins/auth.cas/class.casAuthDriver.php b/core/src/plugins/auth.cas/class.casAuthDriver.php
diff --git a/core/src/plugins/auth.cas/manifest.xml b/core/src/plugins/auth.cas/manifest.xml
diff --git a/core/src/plugins/auth.cas/CAS.php → core/src/plugins/authfront.cas/CAS.php b/core/src/plugins/auth.cas/CAS.php → core/src/plugins/authfront.cas/CAS.php
@@ -302,7 +302,7 @@
 // ########################################################################
 
 // include client class
-include_once (dirname(__FILE__) . '/CAS/Client.php');
+include_once(dirname(__FILE__) . '/CAS/Client.php');
 
 // ########################################################################
 //  INTERFACE CLASS

diff --git a/core/src/plugins/auth.cas/CAS/Client.php → .../src/plugins/authfront.cas/CAS/Client.php b/core/src/plugins/auth.cas/CAS/Client.php → .../src/plugins/authfront.cas/CAS/Client.php
@@ -35,26 +35,26 @@
  */
 
 // include internationalization stuff
-include_once(dirname(__FILE__).'/languages/languages.php');
+include_once(dirname(__FILE__) . '/languages/languages.php');
 
 // include PGT storage classes
-include_once(dirname(__FILE__).'/PGTStorage/AbstractStorage.php');
+include_once(dirname(__FILE__) . '/PGTStorage/AbstractStorage.php');
 
 // include class for storing service cookies.
-include_once(dirname(__FILE__).'/CookieJar.php');
+include_once(dirname(__FILE__) . '/CookieJar.php');
 
 // include class for fetching web requests.
-include_once(dirname(__FILE__).'/Request/CurlRequest.php');
+include_once(dirname(__FILE__) . '/Request/CurlRequest.php');
 
 // include classes for proxying access to services
-include_once(dirname(__FILE__).'/ProxiedService/Http/Get.php');
-include_once(dirname(__FILE__).'/ProxiedService/Http/Post.php');
-include_once(dirname(__FILE__).'/ProxiedService/Imap.php');
+include_once(dirname(__FILE__) . '/ProxiedService/Http/Get.php');
+include_once(dirname(__FILE__) . '/ProxiedService/Http/Post.php');
+include_once(dirname(__FILE__) . '/ProxiedService/Imap.php');
 
 // include Exception classes
-include_once(dirname(__FILE__).'/ProxiedService/Exception.php');
-include_once(dirname(__FILE__).'/ProxyTicketException.php');
-include_once(dirname(__FILE__).'/InvalidArgumentException.php');
+include_once(dirname(__FILE__) . '/ProxiedService/Exception.php');
+include_once(dirname(__FILE__) . '/ProxyTicketException.php');
+include_once(dirname(__FILE__) . '/InvalidArgumentException.php');
 
 
 /**
@@ -1146,7 +1146,7 @@ public function isAuthenticated()
 					header('Location: '.$this->getURL());
 					phpCAS::trace( "Prepare redirect to : ".$this->getURL() );
 					phpCAS::traceExit();
-					exit();
+					//exit();
 				}
 			}
 		}
@@ -1271,6 +1271,7 @@ public function redirectToCas($gateway=false,$renew=false){
 	 * @params $params an array that contains the optional url and service parameters that will be passed to the CAS server
 	 */
 	public function logout($params) {
+        $res = array();
 		phpCAS::traceBegin();
 		$cas_url = $this->getServerLogoutURL();
 		$paramSeparator = '?';
@@ -1281,16 +1282,34 @@ public function logout($params) {
 		if (isset($params['service'])) {
 			$cas_url = $cas_url . $paramSeparator . "service=" . urlencode($params['service']);
 		}
-		header('Location: '.$cas_url);
-		phpCAS::trace( "Prepare redirect to : ".$cas_url );
+
+        flush();
+        error_reporting(E_ALL);
+        ini_set('display_errors','On');
+        ob_start(null, 0, PHP_OUTPUT_HANDLER_STDFLAGS ^ PHP_OUTPUT_HANDLER_REMOVABLE);
+        header('Refresh: 5; url='.$cas_url);
+        die();
+		phpCAS::trace( "Prepare redirect logout to : ".$cas_url );
 
 		session_unset();
 		session_destroy();
 
+        /*
+         *
+         *
+         *
+         * */
+
 		$this->printHTMLHeader($this->getString(CAS_STR_LOGOUT));
 		printf('<p>'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'</p>',$cas_url);
 		$this->printHTMLFooter();
 
+
+        $loggingResult = 2;
+        AJXP_XMLWriter::header();
+        AJXP_XMLWriter::loggingResult($loggingResult, null, null, null);
+        AJXP_XMLWriter::close();
+
 		phpCAS::traceExit();
 		exit();
 	}

diff --git a/core/src/plugins/auth.cas/CAS/CookieJar.php → ...c/plugins/authfront.cas/CAS/CookieJar.php b/core/src/plugins/auth.cas/CAS/CookieJar.php → ...c/plugins/authfront.cas/CAS/CookieJar.php
@@ -28,7 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-include_once(dirname(__FILE__).'/InvalidArgumentException.php');
+include_once(dirname(__FILE__) . '/InvalidArgumentException.php');
 
 /**
  * This class provides access to service cookies and handles parsing of response

diff --git a/core/src/plugins/auth.cas/CAS/Exception.php → ...c/plugins/authfront.cas/CAS/Exception.php b/core/src/plugins/auth.cas/CAS/Exception.php → ...c/plugins/authfront.cas/CAS/Exception.php
diff --git a/...auth.cas/CAS/InvalidArgumentException.php → ...ront.cas/CAS/InvalidArgumentException.php b/...auth.cas/CAS/InvalidArgumentException.php → ...ront.cas/CAS/InvalidArgumentException.php
@@ -28,7 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-require_once(dirname(__FILE__).'/Exception.php');
+require_once(dirname(__FILE__) . '/Exception.php');
 
 /**
  * Exception that denotes invalid arguments were passed. 

diff --git a/core/src/plugins/auth.cas/CAS/LICENSE.txt → ...src/plugins/authfront.cas/CAS/LICENSE.txt b/core/src/plugins/auth.cas/CAS/LICENSE.txt → ...src/plugins/authfront.cas/CAS/LICENSE.txt
diff --git a/...s/auth.cas/CAS/OutOfSequenceException.php → ...hfront.cas/CAS/OutOfSequenceException.php b/...s/auth.cas/CAS/OutOfSequenceException.php → ...hfront.cas/CAS/OutOfSequenceException.php
@@ -28,7 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-require_once(dirname(__FILE__).'/Exception.php');
+require_once(dirname(__FILE__) . '/Exception.php');
 
 /**
  * This class defines Exceptions that should be thrown when the sequence of operations

diff --git a/...th.cas/CAS/PGTStorage/AbstractStorage.php → ...nt.cas/CAS/PGTStorage/AbstractStorage.php b/...th.cas/CAS/PGTStorage/AbstractStorage.php → ...nt.cas/CAS/PGTStorage/AbstractStorage.php
@@ -209,7 +209,7 @@ function read($pgt_iou)
 }
 
 // include specific PGT storage classes
-include_once(dirname(__FILE__).'/Db.php');
-include_once(dirname(__FILE__).'/File.php');
+include_once(dirname(__FILE__) . '/Db.php');
+include_once(dirname(__FILE__) . '/File.php');
 
 ?>
diff --git a/...rc/plugins/auth.cas/CAS/PGTStorage/Db.php → ...ugins/authfront.cas/CAS/PGTStorage/Db.php b/...rc/plugins/auth.cas/CAS/PGTStorage/Db.php → ...ugins/authfront.cas/CAS/PGTStorage/Db.php
diff --git a/.../plugins/auth.cas/CAS/PGTStorage/File.php → ...ins/authfront.cas/CAS/PGTStorage/File.php b/.../plugins/auth.cas/CAS/PGTStorage/File.php → ...ins/authfront.cas/CAS/PGTStorage/File.php
diff --git a/...c/plugins/auth.cas/CAS/ProxiedService.php → ...gins/authfront.cas/CAS/ProxiedService.php b/...c/plugins/auth.cas/CAS/ProxiedService.php → ...gins/authfront.cas/CAS/ProxiedService.php
diff --git a/.../auth.cas/CAS/ProxiedService/Abstract.php → ...front.cas/CAS/ProxiedService/Abstract.php b/.../auth.cas/CAS/ProxiedService/Abstract.php → ...front.cas/CAS/ProxiedService/Abstract.php
@@ -28,10 +28,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-require_once(dirname(__FILE__).'/../ProxiedService.php');
-require_once(dirname(__FILE__).'/Testable.php');
-include_once(dirname(__FILE__).'/../InvalidArgumentException.php');
-include_once(dirname(__FILE__).'/../OutOfSequenceException.php');
+require_once(dirname(__FILE__) . '/../ProxiedService.php');
+require_once(dirname(__FILE__) . '/Testable.php');
+include_once(dirname(__FILE__) . '/../InvalidArgumentException.php');
+include_once(dirname(__FILE__) . '/../OutOfSequenceException.php');
 
 
 /**

diff --git a/...auth.cas/CAS/ProxiedService/Exception.php → ...ront.cas/CAS/ProxiedService/Exception.php b/...auth.cas/CAS/ProxiedService/Exception.php → ...ront.cas/CAS/ProxiedService/Exception.php
@@ -28,7 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-require_once(dirname(__FILE__).'/../Exception.php');
+require_once(dirname(__FILE__) . '/../Exception.php');
 
 /**
  * An Exception for problems communicating with a proxied service.

diff --git a/...gins/auth.cas/CAS/ProxiedService/Http.php → ...authfront.cas/CAS/ProxiedService/Http.php b/...gins/auth.cas/CAS/ProxiedService/Http.php → ...authfront.cas/CAS/ProxiedService/Http.php
diff --git a/....cas/CAS/ProxiedService/Http/Abstract.php → ....cas/CAS/ProxiedService/Http/Abstract.php b/....cas/CAS/ProxiedService/Http/Abstract.php → ....cas/CAS/ProxiedService/Http/Abstract.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright © 2003-2010, The ESUP-Portail consortium & the JA-SIG Collaborative.
+ * Copyright � 2003-2010, The ESUP-Portail consortium & the JA-SIG Collaborative.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,11 +28,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-require_once(dirname(__FILE__).'/../Abstract.php');
-require_once(dirname(__FILE__).'/../Http.php');
-include_once(dirname(__FILE__).'/../Exception.php');
-include_once(dirname(__FILE__).'/../../InvalidArgumentException.php');
-include_once(dirname(__FILE__).'/../../OutOfSequenceException.php');
+require_once(dirname(__FILE__) . '/../Abstract.php');
+require_once(dirname(__FILE__) . '/../Http.php');
+include_once(dirname(__FILE__) . '/../Exception.php');
+include_once(dirname(__FILE__) . '/../../InvalidArgumentException.php');
+include_once(dirname(__FILE__) . '/../../OutOfSequenceException.php');
 
 
 /**

diff --git a/.../auth.cas/CAS/ProxiedService/Http/Get.php → ...front.cas/CAS/ProxiedService/Http/Get.php b/.../auth.cas/CAS/ProxiedService/Http/Get.php → ...front.cas/CAS/ProxiedService/Http/Get.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright © 2003-2010, The ESUP-Portail consortium & the JA-SIG Collaborative.
+ * Copyright � 2003-2010, The ESUP-Portail consortium & the JA-SIG Collaborative.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-require_once(dirname(__FILE__).'/Abstract.php');
+require_once(dirname(__FILE__) . '/Abstract.php');
 
 /**
  * This class is used to make proxied service requests via the HTTP GET method.

diff --git a/...auth.cas/CAS/ProxiedService/Http/Post.php → ...ront.cas/CAS/ProxiedService/Http/Post.php b/...auth.cas/CAS/ProxiedService/Http/Post.php → ...ront.cas/CAS/ProxiedService/Http/Post.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright © 2003-2010, The ESUP-Portail consortium & the JA-SIG Collaborative.
+ * Copyright � 2003-2010, The ESUP-Portail consortium & the JA-SIG Collaborative.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,10 +28,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-require_once(dirname(__FILE__).'/Abstract.php');
-include_once(dirname(__FILE__).'/../Exception.php');
-include_once(dirname(__FILE__).'/../../InvalidArgumentException.php');
-include_once(dirname(__FILE__).'/../../OutOfSequenceException.php');
+require_once(dirname(__FILE__) . '/Abstract.php');
+include_once(dirname(__FILE__) . '/../Exception.php');
+include_once(dirname(__FILE__) . '/../../InvalidArgumentException.php');
+include_once(dirname(__FILE__) . '/../../OutOfSequenceException.php');
 
 /**
  * This class is used to make proxied service requests via the HTTP POST method.

diff --git a/...gins/auth.cas/CAS/ProxiedService/Imap.php → ...authfront.cas/CAS/ProxiedService/Imap.php b/...gins/auth.cas/CAS/ProxiedService/Imap.php → ...authfront.cas/CAS/ProxiedService/Imap.php
@@ -28,10 +28,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-require_once(dirname(__FILE__).'/Abstract.php');
-include_once(dirname(__FILE__).'/../Exception.php');
-include_once(dirname(__FILE__).'/../InvalidArgumentException.php');
-include_once(dirname(__FILE__).'/../OutOfSequenceException.php');
+require_once(dirname(__FILE__) . '/Abstract.php');
+include_once(dirname(__FILE__) . '/../Exception.php');
+include_once(dirname(__FILE__) . '/../InvalidArgumentException.php');
+include_once(dirname(__FILE__) . '/../OutOfSequenceException.php');
 
 /**
  * Provides access to a proxy-authenticated IMAP stream

diff --git a/.../auth.cas/CAS/ProxiedService/Testable.php → ...front.cas/CAS/ProxiedService/Testable.php b/.../auth.cas/CAS/ProxiedService/Testable.php → ...front.cas/CAS/ProxiedService/Testable.php
diff --git a/...ins/auth.cas/CAS/ProxyTicketException.php → ...uthfront.cas/CAS/ProxyTicketException.php b/...ins/auth.cas/CAS/ProxyTicketException.php → ...uthfront.cas/CAS/ProxyTicketException.php
@@ -28,7 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-require_once(dirname(__FILE__).'/Exception.php');
+require_once(dirname(__FILE__) . '/Exception.php');
 
 /**
  * An Exception for errors related to fetching or validating proxy tickets.