From 03ba9920d031b4874e9b52560d9266eb43753e9f Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Wed, 22 May 2024 08:23:44 +0200 Subject: [PATCH 1/3] fix(autoconfig): Disable bugy DNS query Signed-off-by: Christoph Wurst --- lib/Service/AutoConfig/IspDb.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/Service/AutoConfig/IspDb.php b/lib/Service/AutoConfig/IspDb.php index 53c601266a..d01fdb0730 100644 --- a/lib/Service/AutoConfig/IspDb.php +++ b/lib/Service/AutoConfig/IspDb.php @@ -50,7 +50,8 @@ public function getUrls(): array { ]; } - public function __construct(IClientService $clientService, LoggerInterface $logger) { + public function __construct(IClientService $clientService, + LoggerInterface $logger) { $this->client = $clientService->newClient(); $this->logger = $logger; } @@ -122,7 +123,7 @@ private function convertServerElement(\SimpleXMLElement $server): array { * @param bool $tryMx * @return array */ - public function query(string $domain, string $email, bool $tryMx = true): array { + public function query(string $domain, string $email): array { $this->logger->debug("IsbDb: querying <$domain>"); if (strpos($domain, '@') !== false) { // TODO: use horde mail address parsing instead @@ -149,14 +150,6 @@ public function query(string $domain, string $email, bool $tryMx = true): array } } } - - if ($tryMx && ($dns = dns_get_record($domain, DNS_MX))) { - $domain = $dns[0]['target']; - if (!($provider = $this->query($domain, $email, false))) { - [, $domain] = explode('.', $domain, 2); - $provider = $this->query($domain, $email, false); - } - } return $provider; } } From 6b7369f3bd26c3ad2392c6e7eb141caaa3b3f78f Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Wed, 7 Aug 2024 10:42:06 +0200 Subject: [PATCH 2/3] ci: Do not test against master Signed-off-by: Christoph Wurst --- .github/workflows/static-analysis.yml | 2 +- .github/workflows/test.yml | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 4ee74ff1d1..c158a00c8b 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ocp-version: [ 'dev-master', 'dev-stable24', 'dev-stable23', 'dev-stable22', 'dev-stable21' ] + ocp-version: [ 'dev-stable24', 'dev-stable23', 'dev-stable22', 'dev-stable21' ] name: Nextcloud ${{ matrix.ocp-version }} steps: - name: Checkout diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0dde0a1f35..bde66d824c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,10 +19,6 @@ jobs: nextcloud-versions: stable24 - php-versions: 8.0 nextcloud-versions: stable24 - - php-versions: 7.4 - nextcloud-versions: master - - php-versions: 8.0 - nextcloud-versions: master name: Nextcloud ${{ matrix.nextcloud-versions }} php${{ matrix.php-versions }} unit tests steps: - name: Set up php${{ matrix.php-versions }} From 90cd76338899b05a682ef1cc604df13674aaef7b Mon Sep 17 00:00:00 2001 From: Anna Larch Date: Thu, 20 Oct 2022 12:26:48 +0200 Subject: [PATCH 3/3] ci: Specify postgres 14 in test workflows Backport of #7443 Signed-off-by: Anna Larch --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bde66d824c..6795b82e03 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -91,7 +91,7 @@ jobs: --health-timeout=5s --health-retries=3 postgres-service: - image: postgres + image: postgres:14 env: POSTGRES_USER: nextcloud POSTGRES_DB: nextcloud