@@ -124,7 +124,6 @@ discard block |
||
124 | 124 | |
125 | 125 | /** |
126 | 126 | * @param ProviderInterface $provider |
127 | - * @param array $variables |
|
128 | 127 | * @return array |
129 | 128 | */ |
130 | 129 | protected function addUrls(ProviderInterface $provider) |
@@ -196,7 +195,7 @@ discard block |
||
196 | 195 | } |
197 | 196 | |
198 | 197 | /** |
199 | - * @param $endpoints |
|
198 | + * @param EndpointType[] $endpoints |
|
200 | 199 | * @return EndpointType|null |
201 | 200 | */ |
202 | 201 | protected function getFirstEndpoint($endpoints) |
@@ -8,16 +8,16 @@ |
||
8 | 8 | |
9 | 9 | namespace flipbox\saml\core\controllers\cp\view; |
10 | 10 | |
11 | +use SAML2\XML\md\EndpointType; |
|
12 | +use SAML2\XML\md\IDPSSODescriptor; |
|
13 | +use SAML2\XML\md\IndexedEndpointType; |
|
14 | +use SAML2\XML\md\SPSSODescriptor; |
|
11 | 15 | use flipbox\saml\core\AbstractPlugin; |
12 | -use flipbox\saml\core\controllers\AbstractController as BaseController; |
|
13 | 16 | use flipbox\saml\core\EnsureSAMLPlugin; |
17 | +use flipbox\saml\core\controllers\AbstractController as BaseController; |
|
14 | 18 | use flipbox\saml\core\models\AbstractSettings; |
15 | 19 | use flipbox\saml\core\records\ProviderInterface; |
16 | 20 | use flipbox\saml\core\web\assets\bundles\SamlCore; |
17 | -use SAML2\XML\md\EndpointType; |
|
18 | -use SAML2\XML\md\IDPSSODescriptor; |
|
19 | -use SAML2\XML\md\IndexedEndpointType; |
|
20 | -use SAML2\XML\md\SPSSODescriptor; |
|
21 | 21 | |
22 | 22 | /** |
23 | 23 | * Class AbstractController |
@@ -81,7 +81,6 @@ |
||
81 | 81 | } |
82 | 82 | |
83 | 83 | /** |
84 | - * @param SamlMessage $message |
|
85 | 84 | * @param AbstractProvider $provider |
86 | 85 | * @return \SAML2\XML\md\IndexedEndpointType|null |
87 | 86 | */ |
@@ -2,18 +2,18 @@ |
||
2 | 2 | |
3 | 3 | namespace flipbox\saml\core\services\bindings; |
4 | 4 | |
5 | -use craft\base\Component; |
|
6 | -use flipbox\saml\core\exceptions\InvalidMetadata; |
|
7 | -use flipbox\saml\core\records\AbstractProvider; |
|
8 | -use flipbox\saml\core\records\ProviderInterface; |
|
9 | -use SAML2\Constants; |
|
10 | 5 | use SAML2\AuthnRequest; |
6 | +use SAML2\Constants; |
|
11 | 7 | use SAML2\HTTPPost; |
12 | 8 | use SAML2\HTTPRedirect; |
13 | 9 | use SAML2\LogoutRequest; |
14 | 10 | use SAML2\LogoutResponse; |
15 | 11 | use SAML2\Message as SamlMessage; |
16 | 12 | use SAML2\Response; |
13 | +use craft\base\Component; |
|
14 | +use flipbox\saml\core\exceptions\InvalidMetadata; |
|
15 | +use flipbox\saml\core\records\AbstractProvider; |
|
16 | +use flipbox\saml\core\records\ProviderInterface; |
|
17 | 17 | |
18 | 18 | /** |
19 | 19 | * Class Factory |
@@ -6,12 +6,11 @@ |
||
6 | 6 | |
7 | 7 | namespace flipbox\saml\core\services\messages; |
8 | 8 | |
9 | +use SAML2\LogoutRequest; |
|
10 | +use SAML2\LogoutResponse as SamlLogoutResponse; |
|
9 | 11 | use craft\base\Component; |
10 | 12 | use flipbox\saml\core\models\SettingsInterface; |
11 | 13 | use flipbox\saml\core\records\AbstractProvider; |
12 | -use SAML2\Constants; |
|
13 | -use SAML2\LogoutRequest; |
|
14 | -use SAML2\LogoutResponse as SamlLogoutResponse; |
|
15 | 14 | use yii\base\Event; |
16 | 15 | |
17 | 16 | /** |
@@ -7,25 +7,25 @@ |
||
7 | 7 | |
8 | 8 | namespace flipbox\saml\core; |
9 | 9 | |
10 | +use SAML2\Compat\AbstractContainer; |
|
10 | 11 | use craft\base\Plugin; |
11 | 12 | use craft\events\RegisterTemplateRootsEvent; |
12 | 13 | use craft\events\RegisterUrlRulesEvent; |
13 | 14 | use craft\helpers\StringHelper; |
14 | 15 | use craft\helpers\UrlHelper; |
15 | -use craft\web\twig\variables\CraftVariable; |
|
16 | 16 | use craft\web\View; |
17 | +use craft\web\twig\variables\CraftVariable; |
|
17 | 18 | use flipbox\craft\psr3\Logger; |
18 | 19 | use flipbox\saml\core\models\AbstractSettings; |
19 | 20 | use flipbox\saml\core\models\SettingsInterface; |
20 | 21 | use flipbox\saml\core\services\AbstractCp; |
21 | -use flipbox\saml\core\services\bindings\Factory; |
|
22 | 22 | use flipbox\saml\core\services\Cp; |
23 | -use flipbox\saml\core\services\messages\LogoutRequest; |
|
24 | -use flipbox\saml\core\services\messages\LogoutResponse; |
|
25 | 23 | use flipbox\saml\core\services\Metadata; |
26 | 24 | use flipbox\saml\core\services\ProviderIdentityServiceInterface; |
27 | 25 | use flipbox\saml\core\services\ProviderServiceInterface; |
28 | -use SAML2\Compat\AbstractContainer; |
|
26 | +use flipbox\saml\core\services\bindings\Factory; |
|
27 | +use flipbox\saml\core\services\messages\LogoutRequest; |
|
28 | +use flipbox\saml\core\services\messages\LogoutResponse; |
|
29 | 29 | use yii\base\Event; |
30 | 30 | |
31 | 31 | /** |
@@ -152,6 +152,9 @@ |
||
152 | 152 | return $this->getMyType() === self::SP; |
153 | 153 | } |
154 | 154 | |
155 | + /** |
|
156 | + * @param string $url |
|
157 | + */ |
|
155 | 158 | protected function buildEndpointUrl($url) |
156 | 159 | { |
157 | 160 | return sprintf('/%s/%s', $this->getEndpointPrefix(), $url); |
@@ -6,6 +6,8 @@ discard block |
||
6 | 6 | |
7 | 7 | namespace flipbox\saml\core\controllers\messages; |
8 | 8 | |
9 | +use SAML2\LogoutRequest; |
|
10 | +use SAML2\LogoutResponse; |
|
9 | 11 | use craft\db\Table; |
10 | 12 | use flipbox\saml\core\helpers\MessageHelper; |
11 | 13 | use flipbox\saml\core\models\AbstractSettings; |
@@ -13,8 +15,6 @@ discard block |
||
13 | 15 | use flipbox\saml\core\records\AbstractProviderIdentity; |
14 | 16 | use flipbox\saml\core\records\ProviderInterface; |
15 | 17 | use flipbox\saml\core\services\bindings\Factory; |
16 | -use SAML2\LogoutRequest; |
|
17 | -use SAML2\LogoutResponse; |
|
18 | 18 | use yii\web\HttpException; |
19 | 19 | |
20 | 20 | /** |
@@ -6,14 +6,14 @@ |
||
6 | 6 | |
7 | 7 | namespace flipbox\saml\core\services\messages; |
8 | 8 | |
9 | -use craft\base\Component; |
|
10 | -use flipbox\saml\core\models\SettingsInterface; |
|
11 | -use flipbox\saml\core\records\AbstractProvider; |
|
12 | -use flipbox\saml\core\records\AbstractProviderIdentity; |
|
13 | 9 | use SAML2\Constants; |
14 | 10 | use SAML2\HTTPRedirect; |
15 | 11 | use SAML2\LogoutRequest as SamlLogoutRequest; |
16 | 12 | use SAML2\XML\saml\NameID; |
13 | +use craft\base\Component; |
|
14 | +use flipbox\saml\core\models\SettingsInterface; |
|
15 | +use flipbox\saml\core\records\AbstractProvider; |
|
16 | +use flipbox\saml\core\records\AbstractProviderIdentity; |
|
17 | 17 | use yii\base\Event; |
18 | 18 | |
19 | 19 | /** |
@@ -24,6 +24,9 @@ |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | |
27 | + /** |
|
28 | + * @param \SAML2\Assertion\Validation\Result $result |
|
29 | + */ |
|
27 | 30 | public function validate(SamlSignedElement $signedElement, $result) |
28 | 31 | { |
29 | 32 | /** @var \Exception $error */ |
@@ -3,9 +3,9 @@ |
||
3 | 3 | |
4 | 4 | namespace flipbox\saml\core\validators; |
5 | 5 | |
6 | -use flipbox\saml\core\AbstractPlugin; |
|
7 | 6 | use RobRichards\XMLSecLibs\XMLSecurityKey; |
8 | 7 | use SAML2\SignedElement as SamlSignedElement; |
8 | +use flipbox\saml\core\AbstractPlugin; |
|
9 | 9 | |
10 | 10 | class SignedElement |
11 | 11 | { |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | { |
8 | 8 | |
9 | 9 | /** |
10 | - * @return array|mixed |
|
10 | + * @return string |
|
11 | 11 | */ |
12 | 12 | public function __toString() |
13 | 13 | { |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | |
17 | 17 | /** |
18 | 18 | * @param string $json |
19 | - * @return mixed |
|
19 | + * @return JsonModel |
|
20 | 20 | */ |
21 | 21 | public static function jsonUnserialize(string $json) |
22 | 22 | { |