Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit 073bd591 by Ryo Committed by GitHub
Options

fix: skip allowed extensions (#6854) 

* fix: skip allowed extensions

* action preview repo

---------

Co-authored-by: archer <545436317@qq.com>
parent 109a1f18
Showing with 25 additions and 24 deletions
.github/workflows/preview-admin-push.yml
...@@ -44,19 +44,19 @@ jobs: ...@@ -44,19 +44,19 @@ jobs:
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
- name: Login to Aliyun Container Registry - name: Login to GitHub Container Registry
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: registry.cn-hangzhou.aliyuncs.com registry: ghcr.io
username: ${{ secrets.FASTGPT_ALI_IMAGE_USER }} username: ${{ github.repository_owner }}
password: ${{ secrets.FASTGPT_ALI_IMAGE_PSW }} password: ${{ secrets.GITHUB_TOKEN }}
- name: Tag and push Docker image - name: Tag and push Docker image
run: | run: |
SHA="${{ steps.pr.outputs.sha }}" SHA="${{ steps.pr.outputs.sha }}"
docker tag fastgpt-pro-pr:${SHA} \ docker tag fastgpt-pro-pr:${SHA} \
${{ secrets.FASTGPT_ALI_IMAGE_PREFIX }}/fastgpt-pro-pr:${SHA} ghcr.io/${{ github.repository_owner }}/fastgpt-pr:admin_${SHA}
docker push ${{ secrets.FASTGPT_ALI_IMAGE_PREFIX }}/fastgpt-pro-pr:${SHA} docker push ghcr.io/${{ github.repository_owner }}/fastgpt-pr:admin_${SHA}
- name: Add PR comment on success - name: Add PR comment on success
if: success() && steps.pr.outputs.number != '' if: success() && steps.pr.outputs.number != ''
...@@ -80,7 +80,7 @@ jobs: ...@@ -80,7 +80,7 @@ jobs:
✅ **Admin Preview Image Ready!** ✅ **Admin Preview Image Ready!**
\`\`\` \`\`\`
${{ secrets.FASTGPT_ALI_IMAGE_PREFIX }}/fastgpt-pro-pr:${{ steps.pr.outputs.sha }} ghcr.io/${{ github.repository_owner }}/fastgpt-pr:admin_${{ steps.pr.outputs.sha }}
\`\`\` \`\`\`
`; `;
......
.github/workflows/preview-docs-push.yml
...@@ -46,18 +46,18 @@ jobs: ...@@ -46,18 +46,18 @@ jobs:
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
- name: Login to Aliyun Container Registry - name: Login to GitHub Container Registry
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: registry.cn-hangzhou.aliyuncs.com registry: ghcr.io
username: ${{ secrets.FASTGPT_ALI_IMAGE_USER }} username: ${{ github.repository_owner }}
password: ${{ secrets.FASTGPT_ALI_IMAGE_PSW }} password: ${{ secrets.GITHUB_TOKEN }}
- name: Tag and push Docker image - name: Tag and push Docker image
run: | run: |
docker tag fastgpt-docs-pr:${{ steps.pr.outputs.sha }} \ docker tag fastgpt-docs-pr:${{ steps.pr.outputs.sha }} \
${{ secrets.FASTGPT_ALI_IMAGE_PREFIX }}/fastgpt-docs-pr:${{ steps.pr.outputs.sha }} ghcr.io/${{ github.repository_owner }}/fastgpt-docs-pr:${{ steps.pr.outputs.sha }}
docker push ${{ secrets.FASTGPT_ALI_IMAGE_PREFIX }}/fastgpt-docs-pr:${{ steps.pr.outputs.sha }} docker push ghcr.io/${{ github.repository_owner }}/fastgpt-docs-pr:${{ steps.pr.outputs.sha }}
- name: Update deployment image - name: Update deployment image
env: env:
...@@ -69,10 +69,10 @@ jobs: ...@@ -69,10 +69,10 @@ jobs:
chmod 600 "$KUBECONFIG_FILE" chmod 600 "$KUBECONFIG_FILE"
kubectl --kubeconfig "$KUBECONFIG_FILE" set image deployment/fastgpt-docs-preview \ kubectl --kubeconfig "$KUBECONFIG_FILE" set image deployment/fastgpt-docs-preview \
fastgpt-docs-preview=${{ secrets.FASTGPT_ALI_IMAGE_PREFIX }}/fastgpt-docs-pr:${{ steps.pr.outputs.sha }} fastgpt-docs-preview=ghcr.io/${{ github.repository_owner }}/fastgpt-docs-pr:${{ steps.pr.outputs.sha }}
kubectl --kubeconfig "$KUBECONFIG_FILE" annotate deployment/fastgpt-docs-preview \ kubectl --kubeconfig "$KUBECONFIG_FILE" annotate deployment/fastgpt-docs-preview \
originImageName="${{ secrets.FASTGPT_ALI_IMAGE_PREFIX }}/fastgpt-docs-pr:${{ steps.pr.outputs.sha }}" --overwrite originImageName="ghcr.io/${{ github.repository_owner }}/fastgpt-docs-pr:${{ steps.pr.outputs.sha }}" --overwrite
- name: Add PR comment on success - name: Add PR comment on success
if: success() && steps.pr.outputs.number != '' if: success() && steps.pr.outputs.number != ''
...@@ -98,7 +98,7 @@ jobs: ...@@ -98,7 +98,7 @@ jobs:
🔗 [👀 Click here to visit preview](https://pueuoharpgcl.sealoshzh.site) 🔗 [👀 Click here to visit preview](https://pueuoharpgcl.sealoshzh.site)
\`\`\` \`\`\`
${{ secrets.FASTGPT_ALI_IMAGE_PREFIX }}/fastgpt-docs-pr:${{ steps.pr.outputs.sha }} ghcr.io/${{ github.repository_owner }}/fastgpt-docs-pr:${{ steps.pr.outputs.sha }}
\`\`\` \`\`\`
`; `;
......
.github/workflows/preview-fastgpt-push.yml
...@@ -61,19 +61,19 @@ jobs: ...@@ -61,19 +61,19 @@ jobs:
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
- name: Login to Aliyun Container Registry - name: Login to GitHub Container Registry
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: registry.cn-hangzhou.aliyuncs.com registry: ghcr.io
username: ${{ secrets.FASTGPT_ALI_IMAGE_USER }} username: ${{ github.repository_owner }}
password: ${{ secrets.FASTGPT_ALI_IMAGE_PSW }} password: ${{ secrets.GITHUB_TOKEN }}
- name: Tag and push Docker image - name: Tag and push Docker image
run: | run: |
SHA="${{ steps.pr.outputs.sha }}" SHA="${{ steps.pr.outputs.sha }}"
docker tag ${{ steps.config.outputs.IMAGE_NAME }}-pr:${SHA} \ docker tag ${{ steps.config.outputs.IMAGE_NAME }}-pr:${SHA} \
${{ secrets.FASTGPT_ALI_IMAGE_PREFIX }}/fastgpt-pr:${{ matrix.image }}_${SHA} ghcr.io/${{ github.repository_owner }}/fastgpt-pr:${{ matrix.image }}_${SHA}
docker push ${{ secrets.FASTGPT_ALI_IMAGE_PREFIX }}/fastgpt-pr:${{ matrix.image }}_${SHA} docker push ghcr.io/${{ github.repository_owner }}/fastgpt-pr:${{ matrix.image }}_${SHA}
- name: Add PR comment on success - name: Add PR comment on success
if: success() && steps.pr.outputs.number != '' if: success() && steps.pr.outputs.number != ''
...@@ -97,7 +97,7 @@ jobs: ...@@ -97,7 +97,7 @@ jobs:
✅ **Build Successful** - Preview ${{ matrix.image }} Image for this PR: ✅ **Build Successful** - Preview ${{ matrix.image }} Image for this PR:
\`\`\` \`\`\`
${{ secrets.FASTGPT_ALI_IMAGE_PREFIX }}/fastgpt-pr:${{ matrix.image }}_${{ steps.pr.outputs.sha }} ghcr.io/${{ github.repository_owner }}/fastgpt-pr:${{ matrix.image }}_${{ steps.pr.outputs.sha }}
\`\`\` \`\`\`
`; `;
......
projects/app/src/pages/api/core/chat/file/presignChatFilePostUrl.ts
...@@ -13,6 +13,7 @@ import { authApp } from '@fastgpt/service/support/permission/app/auth'; ...@@ -13,6 +13,7 @@ import { authApp } from '@fastgpt/service/support/permission/app/auth';
import { WritePermissionVal } from '@fastgpt/global/support/permission/constant'; import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
import { S3ErrEnum } from '@fastgpt/global/common/error/code/s3'; import { S3ErrEnum } from '@fastgpt/global/common/error/code/s3';
import { MongoChatSetting } from '@fastgpt/service/core/chat/setting/schema'; import { MongoChatSetting } from '@fastgpt/service/core/chat/setting/schema';
import { env } from '@fastgpt/service/env';
async function handler(req: ApiRequestProps): Promise<CreatePostPresignedUrlResponseType> { async function handler(req: ApiRequestProps): Promise<CreatePostPresignedUrlResponseType> {
const { filename, appId, chatId, outLinkAuthData, fileSelectConfig } = const { filename, appId, chatId, outLinkAuthData, fileSelectConfig } =
...@@ -47,7 +48,7 @@ async function handler(req: ApiRequestProps): Promise<CreatePostPresignedUrlResp ...@@ -47,7 +48,7 @@ async function handler(req: ApiRequestProps): Promise<CreatePostPresignedUrlResp
: app?.chatConfig?.fileSelectConfig; : app?.chatConfig?.fileSelectConfig;
const allowedExtensions = getAllowedExtensionsFromFileSelectConfig(effectiveFileSelectConfig); const allowedExtensions = getAllowedExtensionsFromFileSelectConfig(effectiveFileSelectConfig);
if (allowedExtensions.length === 0) { if (!env.SKIP_FILE_TYPE_CHECK && allowedExtensions.length === 0) {
return Promise.reject(S3ErrEnum.fileUploadDisabled); return Promise.reject(S3ErrEnum.fileUploadDisabled);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment