From 51947575c22b7645ae94803ca5524a72c4c5fe33 Mon Sep 17 00:00:00 2001 From: Yeuoly <45712896+Yeuoly@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:37:33 +0800 Subject: [PATCH] feat: add skip signature verification (#12627) --- .github/workflows/style.yml | 2 +- docker/.env.example | 1 + docker/docker-compose-template.yaml | 1 + docker/docker-compose.middleware.yaml | 1 + docker/docker-compose.yaml | 9 ++++----- docker/middleware.env.example | 2 ++ 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 9956d7c22c..c35d4c3e4b 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -66,7 +66,7 @@ jobs: uses: tj-actions/changed-files@v45 with: files: web/** - + - name: Install pnpm uses: pnpm/action-setup@v4 with: diff --git a/docker/.env.example b/docker/.env.example index 80508fbf72..02e80db9ac 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -958,3 +958,4 @@ ENDPOINT_URL_TEMPLATE=http://localhost/e/{hook_id} MARKETPLACE_ENABLED=true MARKETPLACE_API_URL=https://marketplace-plugin.dify.dev +FORCE_VERIFYING_SIGNATURE=true diff --git a/docker/docker-compose-template.yaml b/docker/docker-compose-template.yaml index 8e52046510..cc1f55a6af 100644 --- a/docker/docker-compose-template.yaml +++ b/docker/docker-compose-template.yaml @@ -151,6 +151,7 @@ services: PLUGIN_REMOTE_INSTALLING_HOST: ${PLUGIN_REMOTE_INSTALL_HOST:-0.0.0.0} PLUGIN_REMOTE_INSTALLING_PORT: ${PLUGIN_REMOTE_INSTALL_PORT:-5003} PLUGIN_WORKING_PATH: ${PLUGIN_WORKING_PATH:-/app/storage/cwd} + FORCE_VERIFYING_SIGNATURE: ${FORCE_VERIFYING_SIGNATURE:-true} ports: - "${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}:${PLUGIN_DEBUGGING_PORT:-5003}" volumes: diff --git a/docker/docker-compose.middleware.yaml b/docker/docker-compose.middleware.yaml index 8a20fff150..01879c4238 100644 --- a/docker/docker-compose.middleware.yaml +++ b/docker/docker-compose.middleware.yaml @@ -87,6 +87,7 @@ services: PLUGIN_REMOTE_INSTALLING_HOST: ${PLUGIN_DEBUGGING_HOST:-0.0.0.0} PLUGIN_REMOTE_INSTALLING_PORT: ${PLUGIN_DEBUGGING_PORT:-5003} PLUGIN_WORKING_PATH: ${PLUGIN_WORKING_PATH:-/app/storage/cwd} + FORCE_VERIFYING_SIGNATURE: ${FORCE_VERIFYING_SIGNATURE:-true} ports: - "${EXPOSE_PLUGIN_DAEMON_PORT:-5002}:${PLUGIN_DAEMON_PORT:-5002}" - "${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}:${PLUGIN_DEBUGGING_PORT:-5003}" diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index d9c393e193..b5c8a0b9fb 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -5,9 +5,9 @@ # ================================================================== x-shared-env: &shared-api-worker-env - CONSOLE_API_URL: ${CONSOLE_API_URL:-} - CONSOLE_WEB_URL: ${CONSOLE_WEB_URL:-} - SERVICE_API_URL: ${SERVICE_API_URL:-} + CONSOLE_API_URL: ${CONSOLE_API_URL:-http://localhost} + CONSOLE_WEB_URL: ${CONSOLE_WEB_URL:-http://localhost} + SERVICE_API_URL: ${SERVICE_API_URL:-http://localhost} APP_API_URL: ${APP_API_URL:-} APP_WEB_URL: ${APP_WEB_URL:-} FILES_URL: ${FILES_URL:-} @@ -416,8 +416,6 @@ services: <<: *shared-api-worker-env # Startup mode, 'api' starts the API server. MODE: api - CONSOLE_API_URL: ${CONSOLE_API_URL:-http://localhost:5001} - CONSOLE_WEB_URL: ${CONSOLE_WEB_URL:-http://localhost:3000} SENTRY_DSN: ${API_SENTRY_DSN:-} SENTRY_TRACES_SAMPLE_RATE: ${API_SENTRY_TRACES_SAMPLE_RATE:-1.0} SENTRY_PROFILES_SAMPLE_RATE: ${API_SENTRY_PROFILES_SAMPLE_RATE:-1.0} @@ -558,6 +556,7 @@ services: PLUGIN_REMOTE_INSTALLING_HOST: ${PLUGIN_REMOTE_INSTALL_HOST:-0.0.0.0} PLUGIN_REMOTE_INSTALLING_PORT: ${PLUGIN_REMOTE_INSTALL_PORT:-5003} PLUGIN_WORKING_PATH: ${PLUGIN_WORKING_PATH:-/app/storage/cwd} + FORCE_VERIFYING_SIGNATURE: ${FORCE_VERIFYING_SIGNATURE:-true} ports: - "${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}:${PLUGIN_DEBUGGING_PORT:-5003}" volumes: diff --git a/docker/middleware.env.example b/docker/middleware.env.example index 357a60fe13..558ad46428 100644 --- a/docker/middleware.env.example +++ b/docker/middleware.env.example @@ -113,3 +113,5 @@ PLUGIN_DIFY_INNER_API_URL=http://api:5001 MARKETPLACE_ENABLED=true MARKETPLACE_API_URL=https://marketplace-plugin.dify.dev + +FORCE_VERIFYING_SIGNATURE=true \ No newline at end of file