ZF2-11, ZF2-91 - Remove loadClass in InfoCard

gtoboso · Oct 29, 2011 · ae358ca · ae358ca
1 parent 2815974
commit ae358ca
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 42 deletions.
diff --git a/library/Zend/InfoCard/Adapter/Exception.php b/library/Zend/InfoCard/Adapter/Exception.php
diff --git a/library/Zend/InfoCard/XML/AbstractElement.php b/library/Zend/InfoCard/XML/AbstractElement.php
@@ -82,7 +82,7 @@ static public function convertToDOM(Element $e)
     static public function convertToObject(\DOMElement $e, $classname)
     {
         if (!class_exists($classname)) {
-            \Zend\Loader::loadClass($classname);
+            throw new Exception\InvalidArgumentException('Class provided for converting does not exist');
         }
 
         if(!is_subclass_of($classname, 'Zend\InfoCard\XML\Element')) {

diff --git a/library/Zend/InfoCard/XML/Security/Transform/TransformChain.php b/library/Zend/InfoCard/XML/Security/Transform/TransformChain.php
@@ -102,7 +102,7 @@ public function applyTransforms($strXmlDocument)
     {
         foreach($this->_transformList as $transform) {
             if (!class_exists($transform['class'])) {
-                \Zend\Loader::loadClass($transform['class']);
+                throw new Security\Exception\InvalidArgumentException('Transform Class not exist');
             }
 
             $transformer = new $transform['class'];

diff --git a/tests/Zend/InfoCard/ProcessTest.php b/tests/Zend/InfoCard/ProcessTest.php
@@ -226,6 +226,14 @@ public function testTransforms()
         $this->assertTrue(is_array($trans->getTransformList()));
     }
 
+    public function testTransformsClassLoad()
+    {
+        $trans = new \ZendTest\InfoCard\TestAsset\UserTransformChain();
+        $trans->addTransform('http://www.w3.org/2000/09/xmldsig#enveloped-signature');
+        $this->setExpectedException('Zend\InfoCard\XML\Security\Exception\InvalidArgumentException', 'Transform Class not exist');
+        $trans->applyTransforms('');
+    }
+
     public function testTransformsThrowsExceptionOnInvalidInput()
     {
         $trans = new \Zend\InfoCard\XML\Security\Transform\TransformChain();

diff --git a/tests/Zend/InfoCard/TestAsset/UserTransformChain.php b/tests/Zend/InfoCard/TestAsset/UserTransformChain.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace ZendTest\Infocard\TestAsset;
+use Zend\InfoCard\XML\Security\Transform\TransformChain;
+
+class UserTransformChain extends TransformChain
+{
+    protected function _findClassbyURI($uri)
+    {
+        switch($uri) {
+            case 'http://www.w3.org/2000/09/xmldsig#enveloped-signature':
+                return 'ZendTest\InfoCard\XML\Security\Transform\EnvelopedSignatureUsersNotExists';
+            case 'http://www.w3.org/2001/10/xml-exc-c14n#':
+                return 'ZendTest\InfoCard\XML\Security\Transform\XMLExcC14NUsersNotExists';
+            default:
+                throw new Security\Exception\InvalidArgumentException("Unknown or Unsupported Transformation Requested");
+        }
+    }
+}
diff --git a/tests/Zend/InfoCard/XmlParsingTest.php b/tests/Zend/InfoCard/XmlParsingTest.php
@@ -23,9 +23,10 @@
  * @namespace
  */
 namespace ZendTest\InfoCard;
-use Zend\InfoCard\XML\EncryptedData;
-use Zend\InfoCard\XML\KeyInfo;
-use Zend\InfoCard\XML;
+use Zend\InfoCard\XML\EncryptedData,
+    Zend\InfoCard\XML\KeyInfo,
+    Zend\InfoCard\XML,
+    Zend\InfoCard\XML\Exception;
 
 
 /**
@@ -112,6 +113,18 @@ public function testConversion()
         $this->assertTrue($sxe instanceof KeyInfo\XMLDSig);
     }
 
+    public function testConvertObjectClassLoad()
+    {
+        $encryptedData = EncryptedData\Factory::getInstance($this->_xmlDocument);
+        $keyInfo = $encryptedData->getKeyInfo();
+        $dom = KeyInfo\XMLDSig::convertToDOM($keyInfo);
+
+        try {
+            $sxe = KeyInfo\XMLDSig::convertToObject($dom, '\ZendTest\InfoCard\XML\KeyInfo\InvalidClassName');
+        } catch (Exception\InvalidArgumentException $e) {
+        }
+    }
+
     public function testEncryptedDataKeyInfo()
     {
         $keyinfo = EncryptedData\Factory::getInstance($this->_xmlDocument)->getKeyInfo();