@@ -19,7 +19,6 @@ |
||
19 | 19 | use flipbox\saml\core\models\SettingsInterface; |
20 | 20 | use flipbox\saml\core\records\AbstractProvider; |
21 | 21 | use flipbox\saml\core\records\ProviderInterface; |
22 | -use SAML2\XML\md\EntityDescriptor; |
|
23 | 22 | use yii\web\NotFoundHttpException; |
24 | 23 | |
25 | 24 | abstract class AbstractMetadataController extends AbstractController implements \flipbox\saml\core\EnsureSAMLPlugin |
@@ -11,7 +11,6 @@ |
||
11 | 11 | use Craft; |
12 | 12 | use craft\helpers\ArrayHelper; |
13 | 13 | use flipbox\saml\core\AbstractPlugin; |
14 | -use yii\base\Action; |
|
15 | 14 | |
16 | 15 | /** |
17 | 16 | * Class AbstractGeneralController |
@@ -8,15 +8,15 @@ |
||
8 | 8 | |
9 | 9 | namespace flipbox\saml\core\controllers\cp\view; |
10 | 10 | |
11 | +use SAML2\XML\md\IDPSSODescriptor; |
|
12 | +use SAML2\XML\md\IndexedEndpointType; |
|
13 | +use SAML2\XML\md\SPSSODescriptor; |
|
11 | 14 | use flipbox\saml\core\AbstractPlugin; |
12 | -use flipbox\saml\core\controllers\AbstractController as BaseController; |
|
13 | 15 | use flipbox\saml\core\EnsureSAMLPlugin; |
16 | +use flipbox\saml\core\controllers\AbstractController as BaseController; |
|
14 | 17 | use flipbox\saml\core\models\AbstractSettings; |
15 | 18 | use flipbox\saml\core\records\ProviderInterface; |
16 | 19 | use flipbox\saml\core\web\assets\bundles\SamlCore; |
17 | -use SAML2\XML\md\IDPSSODescriptor; |
|
18 | -use SAML2\XML\md\IndexedEndpointType; |
|
19 | -use SAML2\XML\md\SPSSODescriptor; |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * Class AbstractController |
@@ -9,8 +9,8 @@ |
||
9 | 9 | use Craft; |
10 | 10 | use craft\helpers\UrlHelper; |
11 | 11 | use flipbox\saml\core\AbstractPlugin; |
12 | -use flipbox\saml\core\controllers\cp\view\AbstractController; |
|
13 | 12 | use flipbox\saml\core\EnsureSAMLPlugin; |
13 | +use flipbox\saml\core\controllers\cp\view\AbstractController; |
|
14 | 14 | use flipbox\saml\core\models\SettingsInterface; |
15 | 15 | |
16 | 16 | /** |
@@ -6,13 +6,12 @@ |
||
6 | 6 | |
7 | 7 | namespace flipbox\saml\core\controllers\messages; |
8 | 8 | |
9 | -use craft\web\Controller; |
|
9 | +use SAML2\LogoutRequest; |
|
10 | +use SAML2\LogoutResponse; |
|
10 | 11 | use flipbox\saml\core\helpers\MessageHelper; |
11 | 12 | use flipbox\saml\core\records\AbstractProvider; |
12 | 13 | use flipbox\saml\core\records\ProviderInterface; |
13 | 14 | use flipbox\saml\core\services\bindings\Factory; |
14 | -use SAML2\LogoutRequest; |
|
15 | -use SAML2\LogoutResponse; |
|
16 | 15 | use yii\web\HttpException; |
17 | 16 | |
18 | 17 | /** |
@@ -10,7 +10,6 @@ |
||
10 | 10 | use craft\base\Field; |
11 | 11 | use craft\elements\User; |
12 | 12 | use craft\helpers\UrlHelper; |
13 | -use flipbox\saml\core\records\ProviderIdentityInterface; |
|
14 | 13 | use yii\db\Query; |
15 | 14 | |
16 | 15 | abstract class AbstractExternalIdentity extends Field implements \flipbox\saml\core\EnsureSAMLPlugin |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | |
44 | 44 | /** |
45 | 45 | * @param string $certificate |
46 | - * @return string|string[]|null |
|
46 | + * @return string |
|
47 | 47 | */ |
48 | 48 | public static function cleanCertificate(string $certificate) |
49 | 49 | { |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | |
57 | 57 | /** |
58 | 58 | * @param string $certificate |
59 | - * @return string|string[]|null |
|
59 | + * @return string |
|
60 | 60 | */ |
61 | 61 | public static function cleanCertificateWhiteSpace(string $certificate) |
62 | 62 | { |
@@ -64,8 +64,8 @@ discard block |
||
64 | 64 | } |
65 | 65 | |
66 | 66 | /** |
67 | - * @param $pem |
|
68 | - * @return mixed|string|null |
|
67 | + * @param string $pem |
|
68 | + * @return string |
|
69 | 69 | * @throws \Exception |
70 | 70 | * Thank you lightsaml/lightsaml |
71 | 71 | */ |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | |
116 | 116 | /** |
117 | 117 | * @param EncryptedAssertion $encryptedAssertion |
118 | - * @param $pemString |
|
118 | + * @param boolean|string $pemString |
|
119 | 119 | * @param array $blacklist |
120 | 120 | * @return \SAML2\Assertion |
121 | 121 | * @throws \Exception |
@@ -2,10 +2,10 @@ |
||
2 | 2 | |
3 | 3 | namespace flipbox\saml\core\helpers; |
4 | 4 | |
5 | -use flipbox\saml\core\AbstractPlugin; |
|
6 | 5 | use RobRichards\XMLSecLibs\XMLSecurityKey; |
7 | 6 | use SAML2\EncryptedAssertion; |
8 | 7 | use SAML2\Utilities\Certificate; |
8 | +use flipbox\saml\core\AbstractPlugin; |
|
9 | 9 | |
10 | 10 | class SecurityHelper |
11 | 11 | { |
@@ -2,11 +2,11 @@ |
||
2 | 2 | |
3 | 3 | namespace flipbox\saml\core\records; |
4 | 4 | |
5 | +use SAML2\DOMDocumentFactory; |
|
6 | +use SAML2\XML\md\EntityDescriptor; |
|
5 | 7 | use flipbox\ember\records\ActiveRecord; |
6 | 8 | use flipbox\keychain\records\KeyChainRecord; |
7 | 9 | use flipbox\saml\core\models\GroupOptions; |
8 | -use SAML2\DOMDocumentFactory; |
|
9 | -use SAML2\XML\md\EntityDescriptor; |
|
10 | 10 | use yii\db\ActiveQuery; |
11 | 11 | |
12 | 12 | /** |
@@ -3,9 +3,6 @@ discard block |
||
3 | 3 | |
4 | 4 | namespace flipbox\saml\core\records\traits; |
5 | 5 | |
6 | -use flipbox\saml\core\helpers\EntityDescriptorHelper; |
|
7 | -use flipbox\saml\core\helpers\SecurityHelper; |
|
8 | -use flipbox\saml\core\records\AbstractProvider; |
|
9 | 6 | use RobRichards\XMLSecLibs\XMLSecurityKey; |
10 | 7 | use SAML2\Certificate\Key; |
11 | 8 | use SAML2\Utilities\Certificate; |
@@ -16,6 +13,9 @@ discard block |
||
16 | 13 | use SAML2\XML\md\IndexedEndpointType; |
17 | 14 | use SAML2\XML\md\KeyDescriptor; |
18 | 15 | use SAML2\XML\md\SPSSODescriptor; |
16 | +use flipbox\saml\core\helpers\EntityDescriptorHelper; |
|
17 | +use flipbox\saml\core\helpers\SecurityHelper; |
|
18 | +use flipbox\saml\core\records\AbstractProvider; |
|
19 | 19 | |
20 | 20 | /** |
21 | 21 | * Trait EntityDescriptor |