Skip to content

Commit 3d9ebf9

Browse files
ArtificialOwlArtificialOwl
committed
feat(signature): migrate out of unstable
Signed-off-by: Maxence Lange <[email protected]>
1 parent 2c0f312 commit 3d9ebf9

File tree

54 files changed

+1200
-73
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1200
-73
lines changed

‎apps/cloud_federation_api/lib/Controller/RequestHandlerController.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@
88
namespace OCA\CloudFederationAPI\Controller;
99

1010
use NCU\Federation\ISignedCloudFederationProvider;
11-
use NCU\Security\Signature\Exceptions\IdentityNotFoundException;
12-
use NCU\Security\Signature\Exceptions\IncomingRequestException;
13-
use NCU\Security\Signature\Exceptions\SignatoryNotFoundException;
14-
use NCU\Security\Signature\Exceptions\SignatureException;
15-
use NCU\Security\Signature\Exceptions\SignatureNotFoundException;
16-
use NCU\Security\Signature\IIncomingSignedRequest;
17-
use NCU\Security\Signature\ISignatureManager;
1811
use OC\OCM\OCMSignatoryManager;
1912
use OCA\CloudFederationAPI\Config;
2013
use OCA\CloudFederationAPI\Db\FederatedInviteMapper;
@@ -44,6 +37,13 @@
4437
use OCP\IRequest;
4538
use OCP\IURLGenerator;
4639
use OCP\IUserManager;
40+
use OCP\Security\Signature\Exceptions\IdentityNotFoundException;
41+
use OCP\Security\Signature\Exceptions\IncomingRequestException;
42+
use OCP\Security\Signature\Exceptions\SignatoryNotFoundException;
43+
use OCP\Security\Signature\Exceptions\SignatureException;
44+
use OCP\Security\Signature\Exceptions\SignatureNotFoundException;
45+
use OCP\Security\Signature\IIncomingSignedRequest;
46+
use OCP\Security\Signature\ISignatureManager;
4747
use OCP\Share\Exceptions\ShareNotFound;
4848
use OCP\Util;
4949
use Psr\Log\LoggerInterface;

‎apps/cloud_federation_api/tests/RequestHandlerControllerTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
namespace OCA\CloudFederationApi\Tests;
1111

12-
use NCU\Security\Signature\ISignatureManager;
1312
use OC\OCM\OCMSignatoryManager;
1413
use OCA\CloudFederationAPI\Config;
1514
use OCA\CloudFederationAPI\Controller\RequestHandlerController;
@@ -29,6 +28,7 @@
2928
use OCP\IURLGenerator;
3029
use OCP\IUser;
3130
use OCP\IUserManager;
31+
use OCP\Security\Signature\ISignatureManager;
3232
use PHPUnit\Framework\MockObject\MockObject;
3333
use Psr\Log\LoggerInterface;
3434
use Test\TestCase;

‎lib/composer/composer/autoload_classmap.php‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,7 @@
380380
'OCP\\Federation\\ICloudId' => $baseDir . '/lib/public/Federation/ICloudId.php',
381381
'OCP\\Federation\\ICloudIdManager' => $baseDir . '/lib/public/Federation/ICloudIdManager.php',
382382
'OCP\\Federation\\ICloudIdResolver' => $baseDir . '/lib/public/Federation/ICloudIdResolver.php',
383+
'OCP\\Federation\\ISignedCloudFederationProvider' => $baseDir . '/lib/public/Federation/ISignedCloudFederationProvider.php',
383384
'OCP\\Files' => $baseDir . '/lib/public/Files.php',
384385
'OCP\\FilesMetadata\\AMetadataEvent' => $baseDir . '/lib/public/FilesMetadata/AMetadataEvent.php',
385386
'OCP\\FilesMetadata\\Event\\MetadataBackgroundEvent' => $baseDir . '/lib/public/FilesMetadata/Event/MetadataBackgroundEvent.php',
@@ -776,6 +777,26 @@
776777
'OCP\\Security\\PasswordContext' => $baseDir . '/lib/public/Security/PasswordContext.php',
777778
'OCP\\Security\\RateLimiting\\ILimiter' => $baseDir . '/lib/public/Security/RateLimiting/ILimiter.php',
778779
'OCP\\Security\\RateLimiting\\IRateLimitExceededException' => $baseDir . '/lib/public/Security/RateLimiting/IRateLimitExceededException.php',
780+
'OCP\\Security\\Signature\\Enum\\DigestAlgorithm' => $baseDir . '/lib/public/Security/Signature/Enum/DigestAlgorithm.php',
781+
'OCP\\Security\\Signature\\Enum\\SignatoryStatus' => $baseDir . '/lib/public/Security/Signature/Enum/SignatoryStatus.php',
782+
'OCP\\Security\\Signature\\Enum\\SignatoryType' => $baseDir . '/lib/public/Security/Signature/Enum/SignatoryType.php',
783+
'OCP\\Security\\Signature\\Enum\\SignatureAlgorithm' => $baseDir . '/lib/public/Security/Signature/Enum/SignatureAlgorithm.php',
784+
'OCP\\Security\\Signature\\Exceptions\\IdentityNotFoundException' => $baseDir . '/lib/public/Security/Signature/Exceptions/IdentityNotFoundException.php',
785+
'OCP\\Security\\Signature\\Exceptions\\IncomingRequestException' => $baseDir . '/lib/public/Security/Signature/Exceptions/IncomingRequestException.php',
786+
'OCP\\Security\\Signature\\Exceptions\\InvalidKeyOriginException' => $baseDir . '/lib/public/Security/Signature/Exceptions/InvalidKeyOriginException.php',
787+
'OCP\\Security\\Signature\\Exceptions\\InvalidSignatureException' => $baseDir . '/lib/public/Security/Signature/Exceptions/InvalidSignatureException.php',
788+
'OCP\\Security\\Signature\\Exceptions\\SignatoryConflictException' => $baseDir . '/lib/public/Security/Signature/Exceptions/SignatoryConflictException.php',
789+
'OCP\\Security\\Signature\\Exceptions\\SignatoryException' => $baseDir . '/lib/public/Security/Signature/Exceptions/SignatoryException.php',
790+
'OCP\\Security\\Signature\\Exceptions\\SignatoryNotFoundException' => $baseDir . '/lib/public/Security/Signature/Exceptions/SignatoryNotFoundException.php',
791+
'OCP\\Security\\Signature\\Exceptions\\SignatureElementNotFoundException' => $baseDir . '/lib/public/Security/Signature/Exceptions/SignatureElementNotFoundException.php',
792+
'OCP\\Security\\Signature\\Exceptions\\SignatureException' => $baseDir . '/lib/public/Security/Signature/Exceptions/SignatureException.php',
793+
'OCP\\Security\\Signature\\Exceptions\\SignatureNotFoundException' => $baseDir . '/lib/public/Security/Signature/Exceptions/SignatureNotFoundException.php',
794+
'OCP\\Security\\Signature\\IIncomingSignedRequest' => $baseDir . '/lib/public/Security/Signature/IIncomingSignedRequest.php',
795+
'OCP\\Security\\Signature\\IOutgoingSignedRequest' => $baseDir . '/lib/public/Security/Signature/IOutgoingSignedRequest.php',
796+
'OCP\\Security\\Signature\\ISignatoryManager' => $baseDir . '/lib/public/Security/Signature/ISignatoryManager.php',
797+
'OCP\\Security\\Signature\\ISignatureManager' => $baseDir . '/lib/public/Security/Signature/ISignatureManager.php',
798+
'OCP\\Security\\Signature\\ISignedRequest' => $baseDir . '/lib/public/Security/Signature/ISignedRequest.php',
799+
'OCP\\Security\\Signature\\Model\\Signatory' => $baseDir . '/lib/public/Security/Signature/Model/Signatory.php',
779800
'OCP\\Security\\VerificationToken\\IVerificationToken' => $baseDir . '/lib/public/Security/VerificationToken/IVerificationToken.php',
780801
'OCP\\Security\\VerificationToken\\InvalidTokenException' => $baseDir . '/lib/public/Security/VerificationToken/InvalidTokenException.php',
781802
'OCP\\Server' => $baseDir . '/lib/public/Server.php',

‎lib/composer/composer/autoload_static.php‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
421421
'OCP\\Federation\\ICloudId' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudId.php',
422422
'OCP\\Federation\\ICloudIdManager' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudIdManager.php',
423423
'OCP\\Federation\\ICloudIdResolver' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudIdResolver.php',
424+
'OCP\\Federation\\ISignedCloudFederationProvider' => __DIR__ . '/../../..' . '/lib/public/Federation/ISignedCloudFederationProvider.php',
424425
'OCP\\Files' => __DIR__ . '/../../..' . '/lib/public/Files.php',
425426
'OCP\\FilesMetadata\\AMetadataEvent' => __DIR__ . '/../../..' . '/lib/public/FilesMetadata/AMetadataEvent.php',
426427
'OCP\\FilesMetadata\\Event\\MetadataBackgroundEvent' => __DIR__ . '/../../..' . '/lib/public/FilesMetadata/Event/MetadataBackgroundEvent.php',
@@ -817,6 +818,26 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
817818
'OCP\\Security\\PasswordContext' => __DIR__ . '/../../..' . '/lib/public/Security/PasswordContext.php',
818819
'OCP\\Security\\RateLimiting\\ILimiter' => __DIR__ . '/../../..' . '/lib/public/Security/RateLimiting/ILimiter.php',
819820
'OCP\\Security\\RateLimiting\\IRateLimitExceededException' => __DIR__ . '/../../..' . '/lib/public/Security/RateLimiting/IRateLimitExceededException.php',
821+
'OCP\\Security\\Signature\\Enum\\DigestAlgorithm' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Enum/DigestAlgorithm.php',
822+
'OCP\\Security\\Signature\\Enum\\SignatoryStatus' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Enum/SignatoryStatus.php',
823+
'OCP\\Security\\Signature\\Enum\\SignatoryType' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Enum/SignatoryType.php',
824+
'OCP\\Security\\Signature\\Enum\\SignatureAlgorithm' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Enum/SignatureAlgorithm.php',
825+
'OCP\\Security\\Signature\\Exceptions\\IdentityNotFoundException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/IdentityNotFoundException.php',
826+
'OCP\\Security\\Signature\\Exceptions\\IncomingRequestException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/IncomingRequestException.php',
827+
'OCP\\Security\\Signature\\Exceptions\\InvalidKeyOriginException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/InvalidKeyOriginException.php',
828+
'OCP\\Security\\Signature\\Exceptions\\InvalidSignatureException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/InvalidSignatureException.php',
829+
'OCP\\Security\\Signature\\Exceptions\\SignatoryConflictException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/SignatoryConflictException.php',
830+
'OCP\\Security\\Signature\\Exceptions\\SignatoryException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/SignatoryException.php',
831+
'OCP\\Security\\Signature\\Exceptions\\SignatoryNotFoundException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/SignatoryNotFoundException.php',
832+
'OCP\\Security\\Signature\\Exceptions\\SignatureElementNotFoundException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/SignatureElementNotFoundException.php',
833+
'OCP\\Security\\Signature\\Exceptions\\SignatureException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/SignatureException.php',
834+
'OCP\\Security\\Signature\\Exceptions\\SignatureNotFoundException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/SignatureNotFoundException.php',
835+
'OCP\\Security\\Signature\\IIncomingSignedRequest' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/IIncomingSignedRequest.php',
836+
'OCP\\Security\\Signature\\IOutgoingSignedRequest' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/IOutgoingSignedRequest.php',
837+
'OCP\\Security\\Signature\\ISignatoryManager' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/ISignatoryManager.php',
838+
'OCP\\Security\\Signature\\ISignatureManager' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/ISignatureManager.php',
839+
'OCP\\Security\\Signature\\ISignedRequest' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/ISignedRequest.php',
840+
'OCP\\Security\\Signature\\Model\\Signatory' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Model/Signatory.php',
820841
'OCP\\Security\\VerificationToken\\IVerificationToken' => __DIR__ . '/../../..' . '/lib/public/Security/VerificationToken/IVerificationToken.php',
821842
'OCP\\Security\\VerificationToken\\InvalidTokenException' => __DIR__ . '/../../..' . '/lib/public/Security/VerificationToken/InvalidTokenException.php',
822843
'OCP\\Server' => __DIR__ . '/../../..' . '/lib/public/Server.php',

‎lib/private/Federation/CloudFederationProviderManager.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*/
99
namespace OC\Federation;
1010

11-
use NCU\Security\Signature\ISignatureManager;
1211
use OC\AppFramework\Http;
1312
use OC\OCM\OCMSignatoryManager;
1413
use OCP\App\IAppManager;
@@ -25,6 +24,7 @@
2524
use OCP\IConfig;
2625
use OCP\OCM\Exceptions\OCMProviderException;
2726
use OCP\OCM\IOCMDiscoveryService;
27+
use OCP\Security\Signature\ISignatureManager;
2828
use Psr\Log\LoggerInterface;
2929

3030
/**

‎lib/private/OCM/Model/OCMProvider.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
namespace OC\OCM\Model;
1111

12-
use NCU\Security\Signature\Model\Signatory;
1312
use OCP\OCM\Exceptions\OCMArgumentException;
1413
use OCP\OCM\Exceptions\OCMProviderException;
1514
use OCP\OCM\ICapabilityAwareOCMProvider;
1615
use OCP\OCM\IOCMResource;
16+
use OCP\Security\Signature\Model\Signatory;
1717

1818
/**
1919
* @since 28.0.0

‎lib/private/OCM/OCMDiscoveryService.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
use GuzzleHttp\Exception\ConnectException;
1313
use JsonException;
14-
use NCU\Security\Signature\Exceptions\IdentityNotFoundException;
15-
use NCU\Security\Signature\Exceptions\SignatoryException;
1614
use OC\Core\AppInfo\ConfigLexicon;
1715
use OC\OCM\Model\OCMProvider;
1816
use OCP\AppFramework\Http;
@@ -27,6 +25,8 @@
2725
use OCP\OCM\Exceptions\OCMProviderException;
2826
use OCP\OCM\ICapabilityAwareOCMProvider;
2927
use OCP\OCM\IOCMDiscoveryService;
28+
use OCP\Security\Signature\Exceptions\IdentityNotFoundException;
29+
use OCP\Security\Signature\Exceptions\SignatoryException;
3030
use Psr\Log\LoggerInterface;
3131

3232
/**

‎lib/private/OCM/OCMSignatoryManager.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99

1010
namespace OC\OCM;
1111

12-
use NCU\Security\Signature\Enum\DigestAlgorithm;
13-
use NCU\Security\Signature\Enum\SignatoryType;
14-
use NCU\Security\Signature\Enum\SignatureAlgorithm;
15-
use NCU\Security\Signature\Exceptions\IdentityNotFoundException;
16-
use NCU\Security\Signature\ISignatoryManager;
17-
use NCU\Security\Signature\ISignatureManager;
18-
use NCU\Security\Signature\Model\Signatory;
1912
use OC\Security\IdentityProof\Manager;
2013
use OCP\IAppConfig;
2114
use OCP\IURLGenerator;
2215
use OCP\OCM\Exceptions\OCMProviderException;
16+
use OCP\Security\Signature\Enum\DigestAlgorithm;
17+
use OCP\Security\Signature\Enum\SignatoryType;
18+
use OCP\Security\Signature\Enum\SignatureAlgorithm;
19+
use OCP\Security\Signature\Exceptions\IdentityNotFoundException;
20+
use OCP\Security\Signature\ISignatoryManager;
21+
use OCP\Security\Signature\ISignatureManager;
22+
use OCP\Security\Signature\Model\Signatory;
2323
use OCP\Server;
2424
use Psr\Container\ContainerExceptionInterface;
2525
use Psr\Container\NotFoundExceptionInterface;

‎lib/private/Security/Signature/Db/SignatoryMapper.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
namespace OC\Security\Signature\Db;
1010

11-
use NCU\Security\Signature\Exceptions\SignatoryNotFoundException;
12-
use NCU\Security\Signature\Model\Signatory;
1311
use OCP\AppFramework\Db\DoesNotExistException;
1412
use OCP\AppFramework\Db\QBMapper;
1513
use OCP\DB\Exception;
1614
use OCP\IDBConnection;
15+
use OCP\Security\Signature\Exceptions\SignatoryNotFoundException;
16+
use OCP\Security\Signature\Model\Signatory;
1717

1818
/**
1919
* @template-extends QBMapper<Signatory>

‎lib/private/Security/Signature/Model/IncomingSignedRequest.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99
namespace OC\Security\Signature\Model;
1010

1111
use JsonSerializable;
12-
use NCU\Security\Signature\Enum\DigestAlgorithm;
13-
use NCU\Security\Signature\Enum\SignatureAlgorithm;
14-
use NCU\Security\Signature\Exceptions\IdentityNotFoundException;
15-
use NCU\Security\Signature\Exceptions\IncomingRequestException;
16-
use NCU\Security\Signature\Exceptions\InvalidSignatureException;
17-
use NCU\Security\Signature\Exceptions\SignatoryNotFoundException;
18-
use NCU\Security\Signature\Exceptions\SignatureElementNotFoundException;
19-
use NCU\Security\Signature\Exceptions\SignatureException;
20-
use NCU\Security\Signature\Exceptions\SignatureNotFoundException;
21-
use NCU\Security\Signature\IIncomingSignedRequest;
22-
use NCU\Security\Signature\ISignatureManager;
23-
use NCU\Security\Signature\Model\Signatory;
2412
use OC\Security\Signature\SignatureManager;
2513
use OCP\IRequest;
14+
use OCP\Security\Signature\Enum\DigestAlgorithm;
15+
use OCP\Security\Signature\Enum\SignatureAlgorithm;
16+
use OCP\Security\Signature\Exceptions\IdentityNotFoundException;
17+
use OCP\Security\Signature\Exceptions\IncomingRequestException;
18+
use OCP\Security\Signature\Exceptions\InvalidSignatureException;
19+
use OCP\Security\Signature\Exceptions\SignatoryNotFoundException;
20+
use OCP\Security\Signature\Exceptions\SignatureElementNotFoundException;
21+
use OCP\Security\Signature\Exceptions\SignatureException;
22+
use OCP\Security\Signature\Exceptions\SignatureNotFoundException;
23+
use OCP\Security\Signature\IIncomingSignedRequest;
24+
use OCP\Security\Signature\ISignatureManager;
25+
use OCP\Security\Signature\Model\Signatory;
2626
use ValueError;
2727

2828
/**

0 commit comments

Comments
 (0)