Skip to content

Commit f2e1b34

Browse files
ArtificialOwlArtificialOwl
committed
feat(signed-request): moving out of unstable
Signed-off-by: Maxence Lange <[email protected]>
1 parent acb3e68 commit f2e1b34

File tree

59 files changed

+1300
-81
lines changed

Some content is hidden

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

59 files changed

+1300
-81
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace OCA\CloudFederationAPI\Controller;
1111

1212
use JsonException;
13-
use NCU\Security\Signature\Exceptions\IncomingRequestException;
1413
use OCP\AppFramework\Controller;
1514
use OCP\AppFramework\Http;
1615
use OCP\AppFramework\Http\Attribute\BruteForceProtection;
@@ -24,6 +23,7 @@
2423
use OCP\OCM\Events\OCMEndpointRequestEvent;
2524
use OCP\OCM\Exceptions\OCMArgumentException;
2625
use OCP\OCM\IOCMDiscoveryService;
26+
use OCP\Security\Signature\Exceptions\IncomingRequestException;
2727
use Psr\Log\LoggerInterface;
2828

2929
class OCMRequestController extends Controller {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@
77

88
namespace OCA\CloudFederationAPI\Controller;
99

10-
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\IIncomingSignedRequest;
15-
use NCU\Security\Signature\ISignatureManager;
1610
use OC\OCM\OCMSignatoryManager;
1711
use OCA\CloudFederationAPI\Config;
1812
use OCA\CloudFederationAPI\Db\FederatedInviteMapper;
@@ -37,12 +31,18 @@
3731
use OCP\Federation\ICloudFederationFactory;
3832
use OCP\Federation\ICloudFederationProviderManager;
3933
use OCP\Federation\ICloudIdManager;
34+
use OCP\Federation\ISignedCloudFederationProvider;
4035
use OCP\IAppConfig;
4136
use OCP\IGroupManager;
4237
use OCP\IRequest;
4338
use OCP\IURLGenerator;
4439
use OCP\IUserManager;
4540
use OCP\OCM\IOCMDiscoveryService;
41+
use OCP\Security\Signature\Exceptions\IdentityNotFoundException;
42+
use OCP\Security\Signature\Exceptions\IncomingRequestException;
43+
use OCP\Security\Signature\Exceptions\SignatoryNotFoundException;
44+
use OCP\Security\Signature\IIncomingSignedRequest;
45+
use OCP\Security\Signature\ISignatureManager;
4646
use OCP\Share\Exceptions\ShareNotFound;
4747
use OCP\Util;
4848
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 OCA\CloudFederationAPI\Config;
1413
use OCA\CloudFederationAPI\Controller\RequestHandlerController;
1514
use OCA\CloudFederationAPI\Db\FederatedInvite;
@@ -29,6 +28,7 @@
2928
use OCP\IUser;
3029
use OCP\IUserManager;
3130
use OCP\OCM\IOCMDiscoveryService;
31+
use OCP\Security\Signature\ISignatureManager;
3232
use PHPUnit\Framework\MockObject\MockObject;
3333
use Psr\Log\LoggerInterface;
3434
use Test\TestCase;

‎apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
namespace OCA\FederatedFileSharing\OCM;
88

9-
use NCU\Federation\ISignedCloudFederationProvider;
109
use OC\AppFramework\Http;
1110
use OC\Files\Filesystem;
1211
use OC\Files\SetupManager;
@@ -30,6 +29,7 @@
3029
use OCP\Federation\ICloudFederationProviderManager;
3130
use OCP\Federation\ICloudFederationShare;
3231
use OCP\Federation\ICloudIdManager;
32+
use OCP\Federation\ISignedCloudFederationProvider;
3333
use OCP\Files\IFilenameValidator;
3434
use OCP\Files\NotFoundException;
3535
use OCP\HintException;

‎lib/composer/composer/autoload_classmap.php‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@
386386
'OCP\\Federation\\ICloudId' => $baseDir . '/lib/public/Federation/ICloudId.php',
387387
'OCP\\Federation\\ICloudIdManager' => $baseDir . '/lib/public/Federation/ICloudIdManager.php',
388388
'OCP\\Federation\\ICloudIdResolver' => $baseDir . '/lib/public/Federation/ICloudIdResolver.php',
389+
'OCP\\Federation\\ISignedCloudFederationProvider' => $baseDir . '/lib/public/Federation/ISignedCloudFederationProvider.php',
389390
'OCP\\Files' => $baseDir . '/lib/public/Files.php',
390391
'OCP\\FilesMetadata\\AMetadataEvent' => $baseDir . '/lib/public/FilesMetadata/AMetadataEvent.php',
391392
'OCP\\FilesMetadata\\Event\\MetadataBackgroundEvent' => $baseDir . '/lib/public/FilesMetadata/Event/MetadataBackgroundEvent.php',
@@ -792,6 +793,26 @@
792793
'OCP\\Security\\PasswordContext' => $baseDir . '/lib/public/Security/PasswordContext.php',
793794
'OCP\\Security\\RateLimiting\\ILimiter' => $baseDir . '/lib/public/Security/RateLimiting/ILimiter.php',
794795
'OCP\\Security\\RateLimiting\\IRateLimitExceededException' => $baseDir . '/lib/public/Security/RateLimiting/IRateLimitExceededException.php',
796+
'OCP\\Security\\Signature\\Enum\\DigestAlgorithm' => $baseDir . '/lib/public/Security/Signature/Enum/DigestAlgorithm.php',
797+
'OCP\\Security\\Signature\\Enum\\SignatoryStatus' => $baseDir . '/lib/public/Security/Signature/Enum/SignatoryStatus.php',
798+
'OCP\\Security\\Signature\\Enum\\SignatoryType' => $baseDir . '/lib/public/Security/Signature/Enum/SignatoryType.php',
799+
'OCP\\Security\\Signature\\Enum\\SignatureAlgorithm' => $baseDir . '/lib/public/Security/Signature/Enum/SignatureAlgorithm.php',
800+
'OCP\\Security\\Signature\\Exceptions\\IdentityNotFoundException' => $baseDir . '/lib/public/Security/Signature/Exceptions/IdentityNotFoundException.php',
801+
'OCP\\Security\\Signature\\Exceptions\\IncomingRequestException' => $baseDir . '/lib/public/Security/Signature/Exceptions/IncomingRequestException.php',
802+
'OCP\\Security\\Signature\\Exceptions\\InvalidKeyOriginException' => $baseDir . '/lib/public/Security/Signature/Exceptions/InvalidKeyOriginException.php',
803+
'OCP\\Security\\Signature\\Exceptions\\InvalidSignatureException' => $baseDir . '/lib/public/Security/Signature/Exceptions/InvalidSignatureException.php',
804+
'OCP\\Security\\Signature\\Exceptions\\SignatoryConflictException' => $baseDir . '/lib/public/Security/Signature/Exceptions/SignatoryConflictException.php',
805+
'OCP\\Security\\Signature\\Exceptions\\SignatoryException' => $baseDir . '/lib/public/Security/Signature/Exceptions/SignatoryException.php',
806+
'OCP\\Security\\Signature\\Exceptions\\SignatoryNotFoundException' => $baseDir . '/lib/public/Security/Signature/Exceptions/SignatoryNotFoundException.php',
807+
'OCP\\Security\\Signature\\Exceptions\\SignatureElementNotFoundException' => $baseDir . '/lib/public/Security/Signature/Exceptions/SignatureElementNotFoundException.php',
808+
'OCP\\Security\\Signature\\Exceptions\\SignatureException' => $baseDir . '/lib/public/Security/Signature/Exceptions/SignatureException.php',
809+
'OCP\\Security\\Signature\\Exceptions\\SignatureNotFoundException' => $baseDir . '/lib/public/Security/Signature/Exceptions/SignatureNotFoundException.php',
810+
'OCP\\Security\\Signature\\IIncomingSignedRequest' => $baseDir . '/lib/public/Security/Signature/IIncomingSignedRequest.php',
811+
'OCP\\Security\\Signature\\IOutgoingSignedRequest' => $baseDir . '/lib/public/Security/Signature/IOutgoingSignedRequest.php',
812+
'OCP\\Security\\Signature\\ISignatoryManager' => $baseDir . '/lib/public/Security/Signature/ISignatoryManager.php',
813+
'OCP\\Security\\Signature\\ISignatureManager' => $baseDir . '/lib/public/Security/Signature/ISignatureManager.php',
814+
'OCP\\Security\\Signature\\ISignedRequest' => $baseDir . '/lib/public/Security/Signature/ISignedRequest.php',
815+
'OCP\\Security\\Signature\\Model\\Signatory' => $baseDir . '/lib/public/Security/Signature/Model/Signatory.php',
795816
'OCP\\Security\\VerificationToken\\IVerificationToken' => $baseDir . '/lib/public/Security/VerificationToken/IVerificationToken.php',
796817
'OCP\\Security\\VerificationToken\\InvalidTokenException' => $baseDir . '/lib/public/Security/VerificationToken/InvalidTokenException.php',
797818
'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
@@ -427,6 +427,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
427427
'OCP\\Federation\\ICloudId' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudId.php',
428428
'OCP\\Federation\\ICloudIdManager' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudIdManager.php',
429429
'OCP\\Federation\\ICloudIdResolver' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudIdResolver.php',
430+
'OCP\\Federation\\ISignedCloudFederationProvider' => __DIR__ . '/../../..' . '/lib/public/Federation/ISignedCloudFederationProvider.php',
430431
'OCP\\Files' => __DIR__ . '/../../..' . '/lib/public/Files.php',
431432
'OCP\\FilesMetadata\\AMetadataEvent' => __DIR__ . '/../../..' . '/lib/public/FilesMetadata/AMetadataEvent.php',
432433
'OCP\\FilesMetadata\\Event\\MetadataBackgroundEvent' => __DIR__ . '/../../..' . '/lib/public/FilesMetadata/Event/MetadataBackgroundEvent.php',
@@ -833,6 +834,26 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
833834
'OCP\\Security\\PasswordContext' => __DIR__ . '/../../..' . '/lib/public/Security/PasswordContext.php',
834835
'OCP\\Security\\RateLimiting\\ILimiter' => __DIR__ . '/../../..' . '/lib/public/Security/RateLimiting/ILimiter.php',
835836
'OCP\\Security\\RateLimiting\\IRateLimitExceededException' => __DIR__ . '/../../..' . '/lib/public/Security/RateLimiting/IRateLimitExceededException.php',
837+
'OCP\\Security\\Signature\\Enum\\DigestAlgorithm' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Enum/DigestAlgorithm.php',
838+
'OCP\\Security\\Signature\\Enum\\SignatoryStatus' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Enum/SignatoryStatus.php',
839+
'OCP\\Security\\Signature\\Enum\\SignatoryType' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Enum/SignatoryType.php',
840+
'OCP\\Security\\Signature\\Enum\\SignatureAlgorithm' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Enum/SignatureAlgorithm.php',
841+
'OCP\\Security\\Signature\\Exceptions\\IdentityNotFoundException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/IdentityNotFoundException.php',
842+
'OCP\\Security\\Signature\\Exceptions\\IncomingRequestException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/IncomingRequestException.php',
843+
'OCP\\Security\\Signature\\Exceptions\\InvalidKeyOriginException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/InvalidKeyOriginException.php',
844+
'OCP\\Security\\Signature\\Exceptions\\InvalidSignatureException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/InvalidSignatureException.php',
845+
'OCP\\Security\\Signature\\Exceptions\\SignatoryConflictException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/SignatoryConflictException.php',
846+
'OCP\\Security\\Signature\\Exceptions\\SignatoryException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/SignatoryException.php',
847+
'OCP\\Security\\Signature\\Exceptions\\SignatoryNotFoundException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/SignatoryNotFoundException.php',
848+
'OCP\\Security\\Signature\\Exceptions\\SignatureElementNotFoundException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/SignatureElementNotFoundException.php',
849+
'OCP\\Security\\Signature\\Exceptions\\SignatureException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/SignatureException.php',
850+
'OCP\\Security\\Signature\\Exceptions\\SignatureNotFoundException' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Exceptions/SignatureNotFoundException.php',
851+
'OCP\\Security\\Signature\\IIncomingSignedRequest' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/IIncomingSignedRequest.php',
852+
'OCP\\Security\\Signature\\IOutgoingSignedRequest' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/IOutgoingSignedRequest.php',
853+
'OCP\\Security\\Signature\\ISignatoryManager' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/ISignatoryManager.php',
854+
'OCP\\Security\\Signature\\ISignatureManager' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/ISignatureManager.php',
855+
'OCP\\Security\\Signature\\ISignedRequest' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/ISignedRequest.php',
856+
'OCP\\Security\\Signature\\Model\\Signatory' => __DIR__ . '/../../..' . '/lib/public/Security/Signature/Model/Signatory.php',
836857
'OCP\\Security\\VerificationToken\\IVerificationToken' => __DIR__ . '/../../..' . '/lib/public/Security/VerificationToken/IVerificationToken.php',
837858
'OCP\\Security\\VerificationToken\\InvalidTokenException' => __DIR__ . '/../../..' . '/lib/public/Security/VerificationToken/InvalidTokenException.php',
838859
'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;
@@ -26,6 +25,7 @@
2625
use OCP\OCM\Exceptions\OCMCapabilityException;
2726
use OCP\OCM\Exceptions\OCMProviderException;
2827
use OCP\OCM\IOCMDiscoveryService;
28+
use OCP\Security\Signature\ISignatureManager;
2929
use Psr\Log\LoggerInterface;
3030

3131
/**

‎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\IOCMProvider;
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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@
1212
use Exception;
1313
use GuzzleHttp\Exception\ConnectException;
1414
use JsonException;
15-
use NCU\Security\Signature\Exceptions\IdentityNotFoundException;
16-
use NCU\Security\Signature\Exceptions\IncomingRequestException;
17-
use NCU\Security\Signature\Exceptions\SignatoryException;
18-
use NCU\Security\Signature\Exceptions\SignatoryNotFoundException;
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;
2315
use OC\Core\AppInfo\ConfigLexicon;
2416
use OC\OCM\Model\OCMProvider;
2517
use OCP\AppFramework\Attribute\Consumable;
@@ -40,6 +32,14 @@
4032
use OCP\OCM\Exceptions\OCMRequestException;
4133
use OCP\OCM\IOCMDiscoveryService;
4234
use OCP\OCM\IOCMProvider;
35+
use OCP\Security\Signature\Exceptions\IdentityNotFoundException;
36+
use OCP\Security\Signature\Exceptions\IncomingRequestException;
37+
use OCP\Security\Signature\Exceptions\SignatoryException;
38+
use OCP\Security\Signature\Exceptions\SignatoryNotFoundException;
39+
use OCP\Security\Signature\Exceptions\SignatureException;
40+
use OCP\Security\Signature\Exceptions\SignatureNotFoundException;
41+
use OCP\Security\Signature\IIncomingSignedRequest;
42+
use OCP\Security\Signature\ISignatureManager;
4343
use Psr\Log\LoggerInterface;
4444

4545
/**

‎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;

0 commit comments

Comments
 (0)