Skip to content

[stable32] limit event to configured interface #2218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArtificialOwl merged 1 commit into from
Nov 11, 2025
Merged

[stable32] limit event to configured interface #2218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions lib/Controller/RemoteController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,13 @@ public function memberships(string $circleId): DataResponse {
* @throws MalformedArrayException
* @throws SignatoryException
* @throws SignatureException
* @throws UnknownInterfaceException
*/
private function extractEventFromRequest(): FederatedEvent {
// will throw exception if instance is not configured for this event.
$this->interfaceService->setCurrentInterfaceFromRequest($this->request);
$this->interfaceService->getCurrentInterface();

$signed = $this->remoteStreamService->incomingSignedRequest();
$this->confirmRemoteInstance($signed);

Expand Down
3 changes: 3 additions & 0 deletions lib/Service/RemoteStreamService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
use OCA\Circles\Tools\Traits\TNCWellKnown;
use OCA\Circles\Tools\Traits\TStringTools;
use OCP\AppFramework\Http;
use OCP\IConfig;
use OCP\IURLGenerator;
use ReflectionClass;
use ReflectionException;
Expand Down Expand Up @@ -83,6 +84,7 @@ class RemoteStreamService extends NCSignature {
* @param ConfigService $configService
*/
public function __construct(
private readonly IConfig $config,
IURLGenerator $urlGenerator,
RemoteRequest $remoteRequest,
InterfaceService $interfaceService,
Expand Down Expand Up @@ -364,6 +366,7 @@ public function retrieveSignatory(string $keyId, bool $refresh = true): NCSignat
$request = new NCRequest();
$this->configService->configureRequest($request);

$request->setLocalAddressAllowed($this->config->getSystemValueBool('allow_local_remote_servers'));
$this->downloadSignatory($remoteInstance, $keyId, ['auth' => $confirm], $request);
$remoteInstance->setUidFromKey();

Expand Down
Loading