@@ -6,14 +6,14 @@ |
||
6 | 6 | |
7 | 7 | namespace flipbox\saml\core\services\messages; |
8 | 8 | |
9 | +use SAML2\Constants; |
|
10 | +use SAML2\LogoutRequest as SamlLogoutRequest; |
|
11 | +use SAML2\XML\saml\NameID; |
|
9 | 12 | use craft\base\Component; |
10 | 13 | use flipbox\saml\core\models\SettingsInterface; |
11 | 14 | use flipbox\saml\core\records\AbstractProvider; |
12 | 15 | use flipbox\saml\core\records\AbstractProviderIdentity; |
13 | -use SAML2\Constants; |
|
14 | -use SAML2\XML\saml\NameID; |
|
15 | 16 | use yii\base\Event; |
16 | -use SAML2\LogoutRequest as SamlLogoutRequest; |
|
17 | 17 | |
18 | 18 | /** |
19 | 19 | * Class LogoutRequest |
@@ -6,12 +6,12 @@ |
||
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 | 9 | use SAML2\Constants; |
13 | 10 | use SAML2\LogoutRequest; |
14 | 11 | use SAML2\LogoutResponse as SamlLogoutResponse; |
12 | +use craft\base\Component; |
|
13 | +use flipbox\saml\core\models\SettingsInterface; |
|
14 | +use flipbox\saml\core\records\AbstractProvider; |
|
15 | 15 | use yii\base\Event; |
16 | 16 | |
17 | 17 | /** |
@@ -2,10 +2,6 @@ discard block |
||
2 | 2 | |
3 | 3 | namespace flipbox\saml\core\services; |
4 | 4 | |
5 | -use craft\base\Component; |
|
6 | -use flipbox\keychain\records\KeyChainRecord; |
|
7 | -use flipbox\saml\core\helpers\SecurityHelper; |
|
8 | -use flipbox\saml\core\models\SettingsInterface; |
|
9 | 5 | use SAML2\Certificate\Key; |
10 | 6 | use SAML2\Constants; |
11 | 7 | use SAML2\XML\ds\KeyInfo; |
@@ -17,6 +13,10 @@ discard block |
||
17 | 13 | use SAML2\XML\md\KeyDescriptor; |
18 | 14 | use SAML2\XML\md\SPSSODescriptor; |
19 | 15 | use SAML2\XML\md\SSODescriptorType; |
16 | +use craft\base\Component; |
|
17 | +use flipbox\keychain\records\KeyChainRecord; |
|
18 | +use flipbox\saml\core\helpers\SecurityHelper; |
|
19 | +use flipbox\saml\core\models\SettingsInterface; |
|
20 | 20 | use yii\base\Event; |
21 | 21 | use yii\base\InvalidConfigException; |
22 | 22 |
@@ -3,13 +3,13 @@ |
||
3 | 3 | |
4 | 4 | namespace flipbox\saml\core\validators; |
5 | 5 | |
6 | -use flipbox\saml\core\records\AbstractProvider; |
|
6 | +use SAML2\Assertion\Validation\Result as AssertionResult; |
|
7 | 7 | use SAML2\Configuration\Destination; |
8 | +use SAML2\Response as SamlResponse; |
|
8 | 9 | use SAML2\Response\Validation\ConstraintValidator\DestinationMatches; |
9 | 10 | use SAML2\Response\Validation\ConstraintValidator\IsSuccessful; |
10 | 11 | use SAML2\Response\Validation\Result as ResponseResult; |
11 | -use SAML2\Assertion\Validation\Result as AssertionResult; |
|
12 | -use SAML2\Response as SamlResponse; |
|
12 | +use flipbox\saml\core\records\AbstractProvider; |
|
13 | 13 | |
14 | 14 | class Response |
15 | 15 | { |
@@ -7,11 +7,9 @@ |
||
7 | 7 | namespace flipbox\saml\core\controllers\cp\view\metadata; |
8 | 8 | |
9 | 9 | use Craft; |
10 | -use craft\elements\User; |
|
11 | 10 | use craft\helpers\UrlHelper; |
12 | 11 | use flipbox\keychain\KeyChain; |
13 | 12 | use flipbox\saml\core\AbstractPlugin; |
14 | -use flipbox\saml\core\helpers\MappingHelper; |
|
15 | 13 | use flipbox\saml\core\models\SettingsInterface; |
16 | 14 | use flipbox\saml\core\records\ProviderInterface; |
17 | 15 |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use craft\db\Migration; |
6 | 6 | use flipbox\saml\core\records\AbstractProvider; |
7 | -use yii\db\Query; |
|
8 | 7 | |
9 | 8 | /** |
10 | 9 | * mm190516_200148_attribute_typo migration. |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | /** |
83 | 83 | * @param SSODescriptorType[] $roleDescriptors |
84 | 84 | * @param string $binding |
85 | - * @return EndpointType|null |
|
85 | + * @return IndexedEndpointType|null |
|
86 | 86 | */ |
87 | 87 | public static function getFirstArtifactResolutionService(array $roleDescriptors, string $binding = null) |
88 | 88 | { |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | /** |
93 | 93 | * @param SSODescriptorType[] $roleDescriptors |
94 | 94 | * @param string $binding |
95 | - * @return EndpointType|null |
|
95 | + * @return IndexedEndpointType|null |
|
96 | 96 | */ |
97 | 97 | public static function getFirstSLOService(array $roleDescriptors, string $binding = null) |
98 | 98 | { |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | /** |
103 | 103 | * @param SSODescriptorType[] $roleDescriptors |
104 | 104 | * @param string $binding |
105 | - * @return EndpointType|null |
|
105 | + * @return IndexedEndpointType|null |
|
106 | 106 | */ |
107 | 107 | public static function getFirstManageNameIDService(array $roleDescriptors, string $binding = null) |
108 | 108 | { |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | /** |
117 | 117 | * @param SPSSODescriptor[] $roleDescriptors |
118 | 118 | * @param string $binding |
119 | - * @return EndpointType|null |
|
119 | + * @return IndexedEndpointType|null |
|
120 | 120 | */ |
121 | 121 | public static function getFirstSpAssertionConsumerService(array $roleDescriptors, string $binding = null) |
122 | 122 | { |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | /** |
127 | 127 | * @param SPSSODescriptor[] $roleDescriptors |
128 | 128 | * @param string $binding |
129 | - * @return EndpointType|null |
|
129 | + * @return IndexedEndpointType|null |
|
130 | 130 | */ |
131 | 131 | public static function getFirstSpAttributeConsumingService(array $roleDescriptors, string $binding = null) |
132 | 132 | { |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | /** |
141 | 141 | * @param IDPSSODescriptor[] $roleDescriptors |
142 | 142 | * @param string $binding |
143 | - * @return EndpointType|null |
|
143 | + * @return IndexedEndpointType|null |
|
144 | 144 | */ |
145 | 145 | public static function getFirstIdpSSOService(array $roleDescriptors, string $binding = null) |
146 | 146 | { |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | /** |
151 | 151 | * @param IDPSSODescriptor[] $roleDescriptors |
152 | 152 | * @param string $binding |
153 | - * @return EndpointType|null |
|
153 | + * @return IndexedEndpointType|null |
|
154 | 154 | */ |
155 | 155 | public static function getFirstIdpAssertionIdRequestService(array $roleDescriptors, string $binding = null) |
156 | 156 | { |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | /** |
161 | 161 | * @param IDPSSODescriptor[] $roleDescriptors |
162 | 162 | * @param string $binding |
163 | - * @return EndpointType|null |
|
163 | + * @return IndexedEndpointType|null |
|
164 | 164 | */ |
165 | 165 | public static function getFirstIdpNameIDMappingService(array $roleDescriptors, string $binding = null) |
166 | 166 | { |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | * @param SSODescriptorType[] $roleDescriptors |
172 | 172 | * @param string $binding |
173 | 173 | * @param string $service |
174 | - * @return EndpointType|null |
|
174 | + * @return IndexedEndpointType|null |
|
175 | 175 | */ |
176 | 176 | protected static function getFirstService(string $service, array $roleDescriptors, string $binding = null) |
177 | 177 | { |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | /** |
213 | 213 | * @param IndexedEndpointType[] $endpointTypes |
214 | 214 | * @param $binding |
215 | - * @return EndpointType|null |
|
215 | + * @return null|IndexedEndpointType |
|
216 | 216 | */ |
217 | 217 | protected static function getFirstIndexedEndpointType(array $endpointTypes, string $binding = null) |
218 | 218 | { |
@@ -3,7 +3,6 @@ |
||
3 | 3 | |
4 | 4 | namespace flipbox\saml\core\helpers; |
5 | 5 | |
6 | -use flipbox\saml\core\AbstractPlugin; |
|
7 | 6 | use SAML2\XML\md\EndpointType; |
8 | 7 | use SAML2\XML\md\EntityDescriptor; |
9 | 8 | use SAML2\XML\md\IDPSSODescriptor; |
@@ -6,11 +6,11 @@ |
||
6 | 6 | |
7 | 7 | namespace flipbox\saml\core\helpers; |
8 | 8 | |
9 | -use craft\helpers\StringHelper; |
|
10 | 9 | use SAML2\Message as SamlMessage; |
11 | 10 | use SAML2\Request as SamlRequest; |
12 | 11 | use SAML2\StatusResponse as SamlResponse; |
13 | 12 | use SAML2\XML\saml\Issuer; |
13 | +use craft\helpers\StringHelper; |
|
14 | 14 | |
15 | 15 | /** |
16 | 16 | * Class MessageHelper |
@@ -2,15 +2,15 @@ |
||
2 | 2 | |
3 | 3 | namespace flipbox\saml\core\services\bindings; |
4 | 4 | |
5 | +use SAML2\Constants; |
|
6 | +use SAML2\HTTPPost; |
|
7 | +use SAML2\HTTPRedirect; |
|
8 | +use SAML2\Message as SamlMessage; |
|
5 | 9 | use craft\base\Component; |
6 | 10 | use flipbox\saml\core\exceptions\InvalidMetadata; |
7 | 11 | use flipbox\saml\core\helpers\MessageHelper; |
8 | 12 | use flipbox\saml\core\records\AbstractProvider; |
9 | 13 | use flipbox\saml\core\records\ProviderInterface; |
10 | -use SAML2\Constants; |
|
11 | -use SAML2\HTTPPost; |
|
12 | -use SAML2\HTTPRedirect; |
|
13 | -use SAML2\Message as SamlMessage; |
|
14 | 14 | |
15 | 15 | /** |
16 | 16 | * Class Factory |