diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3883e1838..e52f108de6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -306,7 +306,19 @@ jobs: - name: Load and Start Appwrite timeout-minutes: 5 run: | - docker compose pull --quiet --ignore-buildable + # Docker Hub registry timeouts are a common transient CI failure + # (e.g. a traefik manifest fetch timing out). Retry the image pull; + # keep `up` single-shot so genuine container health failures still surface. + for attempt in 1 2 3; do + if docker compose pull --quiet --ignore-buildable; then + break + elif [ "$attempt" -eq 3 ]; then + echo "::error::docker compose pull failed after 3 attempts; aborting" + exit 1 + fi + echo "::warning::docker compose pull failed (attempt ${attempt}/3); retrying in 15s" + sleep 15 + done docker compose up -d --quiet-pull --wait - name: Environment Variables @@ -353,7 +365,19 @@ jobs: - name: Load and Start Appwrite timeout-minutes: 5 run: | - docker compose pull --quiet --ignore-buildable + # Docker Hub registry timeouts are a common transient CI failure + # (e.g. a traefik manifest fetch timing out). Retry the image pull; + # keep `up` single-shot so genuine container health failures still surface. + for attempt in 1 2 3; do + if docker compose pull --quiet --ignore-buildable; then + break + elif [ "$attempt" -eq 3 ]; then + echo "::error::docker compose pull failed after 3 attempts; aborting" + exit 1 + fi + echo "::warning::docker compose pull failed (attempt ${attempt}/3); retrying in 15s" + sleep 15 + done docker compose up -d --quiet-pull --wait - name: Wait for Open Runtimes @@ -443,7 +467,19 @@ jobs: _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'documentsdb_db_main' || '' }} _APP_DATABASE_VECTORSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'vectorsdb_db_main' || '' }} run: | - docker compose pull --quiet --ignore-buildable + # Docker Hub registry timeouts are a common transient CI failure + # (e.g. a traefik manifest fetch timing out). Retry the image pull; + # keep `up` single-shot so genuine container health failures still surface. + for attempt in 1 2 3; do + if docker compose pull --quiet --ignore-buildable; then + break + elif [ "$attempt" -eq 3 ]; then + echo "::error::docker compose pull failed after 3 attempts; aborting" + exit 1 + fi + echo "::warning::docker compose pull failed (attempt ${attempt}/3); retrying in 15s" + sleep 15 + done docker compose up -d --quiet-pull --wait - name: Wait for Open Runtimes @@ -526,7 +562,19 @@ jobs: _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'documentsdb_db_main' || '' }} _APP_DATABASE_VECTORSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'vectorsdb_db_main' || '' }} run: | - docker compose pull --quiet --ignore-buildable + # Docker Hub registry timeouts are a common transient CI failure + # (e.g. a traefik manifest fetch timing out). Retry the image pull; + # keep `up` single-shot so genuine container health failures still surface. + for attempt in 1 2 3; do + if docker compose pull --quiet --ignore-buildable; then + break + elif [ "$attempt" -eq 3 ]; then + echo "::error::docker compose pull failed after 3 attempts; aborting" + exit 1 + fi + echo "::warning::docker compose pull failed (attempt ${attempt}/3); retrying in 15s" + sleep 15 + done docker compose up -d --quiet-pull --wait - name: Run tests @@ -584,7 +632,19 @@ jobs: _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'documentsdb_db_main' || '' }} _APP_DATABASE_VECTORSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'vectorsdb_db_main' || '' }} run: | - docker compose pull --quiet --ignore-buildable + # Docker Hub registry timeouts are a common transient CI failure + # (e.g. a traefik manifest fetch timing out). Retry the image pull; + # keep `up` single-shot so genuine container health failures still surface. + for attempt in 1 2 3; do + if docker compose pull --quiet --ignore-buildable; then + break + elif [ "$attempt" -eq 3 ]; then + echo "::error::docker compose pull failed after 3 attempts; aborting" + exit 1 + fi + echo "::warning::docker compose pull failed (attempt ${attempt}/3); retrying in 15s" + sleep 15 + done docker compose up -d --quiet-pull --wait - name: Wait for Open Runtimes diff --git a/app/config/roles.php b/app/config/roles.php index 04718f65d2..fbed21f0f8 100644 --- a/app/config/roles.php +++ b/app/config/roles.php @@ -59,12 +59,12 @@ $admins = [ 'tables.write', 'platforms.read', 'platforms.write', - 'oauth2.read', - 'oauth2.write', 'mocks.read', 'mocks.write', 'project.policies.read', 'project.policies.write', + 'project.oauth2.read', + 'project.oauth2.write', 'templates.read', 'templates.write', 'projects.write', diff --git a/app/config/scopes/project.php b/app/config/scopes/project.php index bfafebb5fb..af6d00aa6b 100644 --- a/app/config/scopes/project.php +++ b/app/config/scopes/project.php @@ -65,6 +65,16 @@ return [ "Access to update project\'s policies", "category" => "Project", ], + "project.oauth2.read" => [ + "description" => + "Access to read project\'s OAuth2 configuration.", + "category" => "Project", + ], + "project.oauth2.write" => [ + "description" => + "Access to update project\'s OAuth2 configuration.", + "category" => "Project", + ], "templates.read" => [ "description" => "Access to read project\'s templates", @@ -87,13 +97,15 @@ return [ ], "oauth2.read" => [ "description" => - "Access to read project\'s OAuth2 configuration", + "Access to read project\'s OAuth2 configuration. Use 'project.oauth2.read' instead.", "category" => "Project", + 'deprecated' => true, ], "oauth2.write" => [ "description" => - "Access to update project\'s OAuth2 configuration", + "Access to update project\'s OAuth2 configuration. Use 'project.oauth2.write' instead.", "category" => "Project", + 'deprecated' => true, ], // Auth diff --git a/docker-compose.yml b/docker-compose.yml index 71457cc82e..258608eb00 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1326,7 +1326,7 @@ services: interval: 10s timeout: 10s retries: 10 - start_period: 30s + start_period: 60s postgresql: image: appwrite/postgres:0.1.0 container_name: appwrite-postgresql diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Apple/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Apple/Update.php index dc9eede2b4..5efa935c39 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Apple/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Apple/Update.php @@ -112,7 +112,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', 'oauth2.write') + ->label('scope', ['oauth2.write', 'project.oauth2.write']) ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Auth0/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Auth0/Update.php index aa5f39b213..88f20501ef 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Auth0/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Auth0/Update.php @@ -86,7 +86,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', 'oauth2.write') + ->label('scope', ['oauth2.write', 'project.oauth2.write']) ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Authentik/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Authentik/Update.php index af6b12618a..d466920636 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Authentik/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Authentik/Update.php @@ -86,7 +86,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', 'oauth2.write') + ->label('scope', ['oauth2.write', 'project.oauth2.write']) ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Base.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Base.php index b439e7fdf7..956339cb4d 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Base.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Base.php @@ -238,7 +238,7 @@ abstract class Base extends Action ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', 'oauth2.write') + ->label('scope', ['oauth2.write', 'project.oauth2.write']) ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/FusionAuth/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/FusionAuth/Update.php index 3cdf0eeb89..9496a0edcf 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/FusionAuth/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/FusionAuth/Update.php @@ -86,7 +86,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', 'oauth2.write') + ->label('scope', ['oauth2.write', 'project.oauth2.write']) ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Get.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Get.php index 58e8259fc5..9b6b04b164 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Get.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Get.php @@ -30,7 +30,7 @@ class Get extends Action ->setHttpPath('/v1/project/oauth2/:provider') ->desc('Get project OAuth2 provider') ->groups(['api', 'project']) - ->label('scope', 'oauth2.read') + ->label('scope', ['oauth2.read', 'project.oauth2.read']) ->label('sdk', new Method( namespace: 'project', group: 'oauth2', diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Gitlab/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Gitlab/Update.php index 804f6354ae..46cd464ce1 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Gitlab/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Gitlab/Update.php @@ -97,7 +97,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', 'oauth2.write') + ->label('scope', ['oauth2.write', 'project.oauth2.write']) ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Google/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Google/Update.php index 5623f2bdf9..8ca9499c17 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Google/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Google/Update.php @@ -90,7 +90,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', 'oauth2.write') + ->label('scope', ['oauth2.write', 'project.oauth2.write']) ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Keycloak/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Keycloak/Update.php index aa41e8a5e9..267aab6ae9 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Keycloak/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Keycloak/Update.php @@ -92,7 +92,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', 'oauth2.write') + ->label('scope', ['oauth2.write', 'project.oauth2.write']) ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Microsoft/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Microsoft/Update.php index 811819a05c..e571c57692 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Microsoft/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Microsoft/Update.php @@ -96,7 +96,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', 'oauth2.write') + ->label('scope', ['oauth2.write', 'project.oauth2.write']) ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Oidc/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Oidc/Update.php index 697b306be8..05ad535899 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Oidc/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Oidc/Update.php @@ -106,7 +106,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', 'oauth2.write') + ->label('scope', ['oauth2.write', 'project.oauth2.write']) ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Okta/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Okta/Update.php index 0344b6a14a..f0f4fba3e7 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Okta/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Okta/Update.php @@ -94,7 +94,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', 'oauth2.write') + ->label('scope', ['oauth2.write', 'project.oauth2.write']) ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/XList.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/XList.php index 9a0739e0e6..5368316aa1 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/XList.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/XList.php @@ -34,7 +34,7 @@ class XList extends Action ->setHttpPath('/v1/project/oauth2') ->desc('List project OAuth2 providers') ->groups(['api', 'project']) - ->label('scope', 'oauth2.read') + ->label('scope', ['oauth2.read', 'project.oauth2.read']) ->label('sdk', new Method( namespace: 'project', group: 'oauth2', diff --git a/src/Appwrite/Platform/Workers/Migrations.php b/src/Appwrite/Platform/Workers/Migrations.php index 825caf764d..60deaa2f00 100644 --- a/src/Appwrite/Platform/Workers/Migrations.php +++ b/src/Appwrite/Platform/Workers/Migrations.php @@ -433,12 +433,12 @@ class Migrations extends Action 'keys.write', 'platforms.read', 'platforms.write', - 'oauth2.read', - 'oauth2.write', 'mocks.read', 'mocks.write', 'project.policies.read', 'project.policies.write', + 'project.oauth2.read', + 'project.oauth2.write', 'templates.read', 'templates.write', ]; diff --git a/tests/benchmarks/http.js b/tests/benchmarks/http.js index a41b4778df..c28cb03d9b 100644 --- a/tests/benchmarks/http.js +++ b/tests/benchmarks/http.js @@ -90,8 +90,8 @@ const API_SCOPES = [ 'tokens.write', 'platforms.read', 'platforms.write', - 'oauth2.read', - 'oauth2.write', + 'project.oauth2.read', + 'project.oauth2.write', ]; const BASE_PERMISSIONS = [ diff --git a/tests/e2e/Scopes/ProjectCustom.php b/tests/e2e/Scopes/ProjectCustom.php index c8a3704d57..57c5990475 100644 --- a/tests/e2e/Scopes/ProjectCustom.php +++ b/tests/e2e/Scopes/ProjectCustom.php @@ -169,12 +169,12 @@ trait ProjectCustom 'keys.write', 'platforms.read', 'platforms.write', - 'oauth2.read', - 'oauth2.write', 'mocks.read', 'mocks.write', 'project.policies.read', 'project.policies.write', + 'project.oauth2.read', + 'project.oauth2.write', 'templates.read', 'templates.write', 'insights.read',