mirror of
https://github.com/penpot/penpot.git
synced 2026-04-28 04:38:14 +00:00
Compare commits
No commits in common. "develop" and "2.11.1" have entirely different histories.
351
.circleci/config.yml
Normal file
351
.circleci/config.yml
Normal file
@ -0,0 +1,351 @@
|
|||||||
|
version: 2.1
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
lint:
|
||||||
|
docker:
|
||||||
|
- image: penpotapp/devenv:latest
|
||||||
|
|
||||||
|
working_directory: ~/repo
|
||||||
|
resource_class: medium+
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- checkout
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: "fmt check"
|
||||||
|
working_directory: "."
|
||||||
|
command: |
|
||||||
|
yarn install
|
||||||
|
yarn run fmt:clj:check
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: "lint clj common"
|
||||||
|
working_directory: "."
|
||||||
|
command: |
|
||||||
|
yarn run lint:clj:common
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: "lint clj frontend"
|
||||||
|
working_directory: "."
|
||||||
|
command: |
|
||||||
|
yarn run lint:clj:frontend
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: "lint clj backend"
|
||||||
|
working_directory: "."
|
||||||
|
command: |
|
||||||
|
yarn run lint:clj:backend
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: "lint clj exporter"
|
||||||
|
working_directory: "."
|
||||||
|
command: |
|
||||||
|
yarn run lint:clj:exporter
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: "lint clj library"
|
||||||
|
working_directory: "."
|
||||||
|
command: |
|
||||||
|
yarn run lint:clj:library
|
||||||
|
|
||||||
|
test-common:
|
||||||
|
docker:
|
||||||
|
- image: penpotapp/devenv:latest
|
||||||
|
|
||||||
|
working_directory: ~/repo
|
||||||
|
resource_class: medium+
|
||||||
|
|
||||||
|
environment:
|
||||||
|
JAVA_OPTS: -Xmx4g -Xms100m -XX:+UseSerialGC
|
||||||
|
NODE_OPTIONS: --max-old-space-size=4096
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- checkout
|
||||||
|
|
||||||
|
# Download and cache dependencies
|
||||||
|
- restore_cache:
|
||||||
|
keys:
|
||||||
|
- v1-dependencies-{{ checksum "common/deps.edn"}}-{{ checksum "common/yarn.lock" }}
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: "JVM tests"
|
||||||
|
working_directory: "./common"
|
||||||
|
command: |
|
||||||
|
clojure -M:dev:test
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: "NODE tests"
|
||||||
|
working_directory: "./common"
|
||||||
|
command: |
|
||||||
|
yarn install
|
||||||
|
yarn run test
|
||||||
|
|
||||||
|
- save_cache:
|
||||||
|
paths:
|
||||||
|
- ~/.m2
|
||||||
|
- ~/.yarn
|
||||||
|
- ~/.gitlibs
|
||||||
|
- ~/.cache/ms-playwright
|
||||||
|
key: v1-dependencies-{{ checksum "common/deps.edn"}}-{{ checksum "common/yarn.lock" }}
|
||||||
|
|
||||||
|
test-frontend:
|
||||||
|
docker:
|
||||||
|
- image: penpotapp/devenv:latest
|
||||||
|
|
||||||
|
working_directory: ~/repo
|
||||||
|
resource_class: medium+
|
||||||
|
|
||||||
|
environment:
|
||||||
|
JAVA_OPTS: -Xmx4g -Xms100m -XX:+UseSerialGC
|
||||||
|
NODE_OPTIONS: --max-old-space-size=4096
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- checkout
|
||||||
|
|
||||||
|
# Download and cache dependencies
|
||||||
|
- restore_cache:
|
||||||
|
keys:
|
||||||
|
- v1-dependencies-{{ checksum "frontend/deps.edn"}}-{{ checksum "frontend/yarn.lock" }}
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: "install dependencies"
|
||||||
|
working_directory: "./frontend"
|
||||||
|
# We install playwright here because the dependent tasks
|
||||||
|
# uses the same cache as this task so we prepopulate it
|
||||||
|
command: |
|
||||||
|
yarn install
|
||||||
|
yarn run playwright install chromium
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: "lint scss on frontend"
|
||||||
|
working_directory: "./frontend"
|
||||||
|
command: |
|
||||||
|
yarn run lint:scss
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: "unit tests"
|
||||||
|
working_directory: "./frontend"
|
||||||
|
command: |
|
||||||
|
yarn run test
|
||||||
|
|
||||||
|
- save_cache:
|
||||||
|
paths:
|
||||||
|
- ~/.m2
|
||||||
|
- ~/.yarn
|
||||||
|
- ~/.gitlibs
|
||||||
|
- ~/.cache/ms-playwright
|
||||||
|
key: v1-dependencies-{{ checksum "frontend/deps.edn"}}-{{ checksum "frontend/yarn.lock" }}
|
||||||
|
|
||||||
|
test-library:
|
||||||
|
docker:
|
||||||
|
- image: penpotapp/devenv:latest
|
||||||
|
|
||||||
|
working_directory: ~/repo
|
||||||
|
resource_class: medium+
|
||||||
|
|
||||||
|
environment:
|
||||||
|
JAVA_OPTS: -Xmx6g
|
||||||
|
NODE_OPTIONS: --max-old-space-size=4096
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- checkout
|
||||||
|
|
||||||
|
# Download and cache dependencies
|
||||||
|
- restore_cache:
|
||||||
|
keys:
|
||||||
|
- v1-dependencies-{{ checksum "frontend/deps.edn"}}-{{ checksum "frontend/yarn.lock" }}
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: Install dependencies and build
|
||||||
|
working_directory: "./library"
|
||||||
|
command: |
|
||||||
|
yarn install
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: Build and Test
|
||||||
|
working_directory: "./library"
|
||||||
|
command: |
|
||||||
|
./scripts/build
|
||||||
|
yarn run test
|
||||||
|
|
||||||
|
test-components:
|
||||||
|
docker:
|
||||||
|
- image: penpotapp/devenv:latest
|
||||||
|
|
||||||
|
working_directory: ~/repo
|
||||||
|
resource_class: medium+
|
||||||
|
|
||||||
|
environment:
|
||||||
|
JAVA_OPTS: -Xmx6g -Xms2g
|
||||||
|
NODE_OPTIONS: --max-old-space-size=4096
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- checkout
|
||||||
|
|
||||||
|
# Download and cache dependencies
|
||||||
|
- restore_cache:
|
||||||
|
keys:
|
||||||
|
- v1-dependencies-{{ checksum "frontend/deps.edn"}}-{{ checksum "frontend/yarn.lock" }}
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: Install dependencies
|
||||||
|
working_directory: "./frontend"
|
||||||
|
command: |
|
||||||
|
yarn install
|
||||||
|
yarn run playwright install chromium
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: Build Storybook
|
||||||
|
working_directory: "./frontend"
|
||||||
|
command: yarn run build:storybook
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: Serve Storybook and run tests
|
||||||
|
working_directory: "./frontend"
|
||||||
|
command: |
|
||||||
|
npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \
|
||||||
|
"npx http-server storybook-static --port 6006 --silent" \
|
||||||
|
"npx wait-on tcp:6006 && yarn test:storybook"
|
||||||
|
|
||||||
|
test-integration:
|
||||||
|
docker:
|
||||||
|
- image: penpotapp/devenv:latest
|
||||||
|
|
||||||
|
working_directory: ~/repo
|
||||||
|
resource_class: large
|
||||||
|
|
||||||
|
environment:
|
||||||
|
JAVA_OPTS: -Xmx6g -Xms2g
|
||||||
|
NODE_OPTIONS: --max-old-space-size=4096
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- checkout
|
||||||
|
|
||||||
|
# Download and cache dependencies
|
||||||
|
- restore_cache:
|
||||||
|
keys:
|
||||||
|
- v1-dependencies-{{ checksum "frontend/deps.edn"}}-{{ checksum "frontend/yarn.lock" }}
|
||||||
|
|
||||||
|
# Build frontend
|
||||||
|
- run:
|
||||||
|
name: "frontend build"
|
||||||
|
working_directory: "./frontend"
|
||||||
|
command: |
|
||||||
|
yarn install
|
||||||
|
yarn run build:app:assets
|
||||||
|
yarn run build:app
|
||||||
|
yarn run build:app:libs
|
||||||
|
|
||||||
|
# Build the wasm bundle
|
||||||
|
- run:
|
||||||
|
name: "wasm build"
|
||||||
|
working_directory: "./render-wasm"
|
||||||
|
command: |
|
||||||
|
EMSDK_QUIET=1 . /opt/emsdk/emsdk_env.sh
|
||||||
|
./build release
|
||||||
|
|
||||||
|
# Run integration tests
|
||||||
|
- run:
|
||||||
|
name: "integration tests"
|
||||||
|
working_directory: "./frontend"
|
||||||
|
command: |
|
||||||
|
yarn run playwright install chromium
|
||||||
|
yarn run test:e2e -x --workers=4
|
||||||
|
|
||||||
|
test-backend:
|
||||||
|
docker:
|
||||||
|
- image: penpotapp/devenv:latest
|
||||||
|
- image: cimg/postgres:14.5
|
||||||
|
environment:
|
||||||
|
POSTGRES_USER: penpot_test
|
||||||
|
POSTGRES_PASSWORD: penpot_test
|
||||||
|
POSTGRES_DB: penpot_test
|
||||||
|
- image: cimg/redis:7.0.5
|
||||||
|
|
||||||
|
working_directory: ~/repo
|
||||||
|
resource_class: medium+
|
||||||
|
|
||||||
|
environment:
|
||||||
|
JAVA_OPTS: -Xmx4g -Xms100m -XX:+UseSerialGC
|
||||||
|
NODE_OPTIONS: --max-old-space-size=4096
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- checkout
|
||||||
|
|
||||||
|
- restore_cache:
|
||||||
|
keys:
|
||||||
|
- v1-dependencies-{{ checksum "backend/deps.edn" }}
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: "tests"
|
||||||
|
working_directory: "./backend"
|
||||||
|
command: |
|
||||||
|
clojure -M:dev:test --reporter kaocha.report/documentation
|
||||||
|
|
||||||
|
environment:
|
||||||
|
PENPOT_TEST_DATABASE_URI: "postgresql://localhost/penpot_test"
|
||||||
|
PENPOT_TEST_DATABASE_USERNAME: penpot_test
|
||||||
|
PENPOT_TEST_DATABASE_PASSWORD: penpot_test
|
||||||
|
PENPOT_TEST_REDIS_URI: "redis://localhost/1"
|
||||||
|
|
||||||
|
- save_cache:
|
||||||
|
paths:
|
||||||
|
- ~/.m2
|
||||||
|
- ~/.gitlibs
|
||||||
|
key: v1-dependencies-{{ checksum "backend/deps.edn" }}
|
||||||
|
|
||||||
|
test-render-wasm:
|
||||||
|
docker:
|
||||||
|
- image: penpotapp/devenv:latest
|
||||||
|
|
||||||
|
working_directory: ~/repo
|
||||||
|
resource_class: medium+
|
||||||
|
environment:
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- checkout
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: "fmt check"
|
||||||
|
working_directory: "./render-wasm"
|
||||||
|
command: |
|
||||||
|
cargo fmt --check
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: "lint"
|
||||||
|
working_directory: "./render-wasm"
|
||||||
|
command: |
|
||||||
|
./lint
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: "cargo tests"
|
||||||
|
working_directory: "./render-wasm"
|
||||||
|
command: |
|
||||||
|
./test
|
||||||
|
|
||||||
|
workflows:
|
||||||
|
penpot:
|
||||||
|
jobs:
|
||||||
|
- test-frontend:
|
||||||
|
requires:
|
||||||
|
- lint: success
|
||||||
|
|
||||||
|
- test-library:
|
||||||
|
requires:
|
||||||
|
- lint: success
|
||||||
|
|
||||||
|
- test-components:
|
||||||
|
requires:
|
||||||
|
- lint: success
|
||||||
|
|
||||||
|
- test-backend:
|
||||||
|
requires:
|
||||||
|
- lint: success
|
||||||
|
|
||||||
|
- test-common:
|
||||||
|
requires:
|
||||||
|
- lint: success
|
||||||
|
|
||||||
|
- lint
|
||||||
|
- test-integration
|
||||||
|
- test-render-wasm
|
||||||
@ -45,15 +45,6 @@
|
|||||||
:potok/reify-type
|
:potok/reify-type
|
||||||
{:level :error}
|
{:level :error}
|
||||||
|
|
||||||
:redundant-primitive-coercion
|
|
||||||
{:level :off}
|
|
||||||
|
|
||||||
:unused-excluded-var
|
|
||||||
{:level :off}
|
|
||||||
|
|
||||||
:unresolved-excluded-var
|
|
||||||
{:level :off}
|
|
||||||
|
|
||||||
:missing-protocol-method
|
:missing-protocol-method
|
||||||
{:level :off}
|
{:level :off}
|
||||||
|
|
||||||
|
|||||||
@ -2,11 +2,6 @@
|
|||||||
:remove-multiple-non-indenting-spaces? false
|
:remove-multiple-non-indenting-spaces? false
|
||||||
:remove-surrounding-whitespace? true
|
:remove-surrounding-whitespace? true
|
||||||
:remove-consecutive-blank-lines? false
|
:remove-consecutive-blank-lines? false
|
||||||
:indent-line-comments? true
|
|
||||||
:parallel? true
|
|
||||||
:align-form-columns? false
|
|
||||||
;; :align-map-columns? false
|
|
||||||
;; :align-single-column-lines? false
|
|
||||||
:extra-indents {rumext.v2/fnc [[:inner 0]]
|
:extra-indents {rumext.v2/fnc [[:inner 0]]
|
||||||
cljs.test/async [[:inner 0]]
|
cljs.test/async [[:inner 0]]
|
||||||
promesa.exec/thread [[:inner 0]]
|
promesa.exec/thread [[:inner 0]]
|
||||||
|
|||||||
38
.github/ISSUE_TEMPLATE/new-render-bug-report.md
vendored
38
.github/ISSUE_TEMPLATE/new-render-bug-report.md
vendored
@ -1,38 +0,0 @@
|
|||||||
---
|
|
||||||
name: New Render Bug Report
|
|
||||||
about: Create a report about the bugs you have found in the new render
|
|
||||||
title: ''
|
|
||||||
labels: new render
|
|
||||||
assignees: claragvinola
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Describe the bug**
|
|
||||||
A clear and concise description of what the bug is.
|
|
||||||
|
|
||||||
**Steps to Reproduce**
|
|
||||||
Steps to reproduce the behavior:
|
|
||||||
1. Go to '...'
|
|
||||||
2. Click on '....'
|
|
||||||
3. Scroll down to '....'
|
|
||||||
4. See error
|
|
||||||
|
|
||||||
**Expected behavior**
|
|
||||||
A clear and concise description of what you expected to happen.
|
|
||||||
|
|
||||||
**Screenshots or screen recordings**
|
|
||||||
If applicable, add screenshots or screen recording to help illustrate your problem.
|
|
||||||
|
|
||||||
**Desktop (please complete the following information):**
|
|
||||||
- OS: [e.g. iOS]
|
|
||||||
- Browser [e.g. chrome, safari]
|
|
||||||
- Version [e.g. 22]
|
|
||||||
|
|
||||||
**Smartphone (please complete the following information):**
|
|
||||||
- Device: [e.g. iPhone6]
|
|
||||||
- OS: [e.g. iOS8.1]
|
|
||||||
- Browser [e.g. stock browser, safari]
|
|
||||||
- Version [e.g. 22]
|
|
||||||
|
|
||||||
**Additional context**
|
|
||||||
Add any other context about the problem here.
|
|
||||||
12
.github/workflows/build-bundle.yml
vendored
12
.github/workflows/build-bundle.yml
vendored
@ -40,7 +40,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
build-bundle:
|
build-bundle:
|
||||||
name: Build and Upload Penpot Bundle
|
name: Build and Upload Penpot Bundle
|
||||||
runs-on: penpot-runner-01
|
runs-on: ubuntu-24.04
|
||||||
env:
|
env:
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
|
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
||||||
@ -48,7 +48,7 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
ref: ${{ inputs.gh_ref }}
|
ref: ${{ inputs.gh_ref }}
|
||||||
@ -57,7 +57,6 @@ jobs:
|
|||||||
id: vars
|
id: vars
|
||||||
run: |
|
run: |
|
||||||
echo "gh_ref=${{ inputs.gh_ref || github.ref_name }}" >> $GITHUB_OUTPUT
|
echo "gh_ref=${{ inputs.gh_ref || github.ref_name }}" >> $GITHUB_OUTPUT
|
||||||
echo "bundle_version=$(git describe --tags --always)" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Build bundle
|
- name: Build bundle
|
||||||
env:
|
env:
|
||||||
@ -77,17 +76,14 @@ jobs:
|
|||||||
|
|
||||||
- name: Upload Penpot bundle to S3
|
- name: Upload Penpot bundle to S3
|
||||||
run: |
|
run: |
|
||||||
aws s3 cp zips/penpot.zip s3://${{ secrets.S3_BUCKET }}/penpot-${{ steps.vars.outputs.gh_ref }}.zip --metadata bundle-version=${{ steps.vars.outputs.bundle_version }}
|
aws s3 cp zips/penpot.zip s3://${{ secrets.S3_BUCKET }}/penpot-${{ steps.vars.outputs.gh_ref }}.zip
|
||||||
|
|
||||||
- name: Notify Mattermost
|
- name: Notify Mattermost
|
||||||
if: failure()
|
if: failure()
|
||||||
uses: mattermost/action-mattermost-notify@master
|
uses: mattermost/action-mattermost-notify@master
|
||||||
with:
|
with:
|
||||||
MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
|
MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
|
||||||
MATTERMOST_CHANNEL: bot-alerts-cicd
|
|
||||||
TEXT: |
|
TEXT: |
|
||||||
❌ 📦 *[PENPOT] Error building penpot bundles.*
|
❌ *[PENPOT] Error during the execution of the job*
|
||||||
📄 Triggered from ref: `${{ steps.vars.outputs.gh_ref }}`
|
📄 Triggered from ref: `${{ steps.vars.outputs.gh_ref }}`
|
||||||
Bundle version: `${{ steps.vars.outputs.bundle_version }}`
|
|
||||||
🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
||||||
@infra
|
|
||||||
|
|||||||
1
.github/workflows/build-develop.yml
vendored
1
.github/workflows/build-develop.yml
vendored
@ -1,7 +1,6 @@
|
|||||||
name: _DEVELOP
|
name: _DEVELOP
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '16 5-20 * * 1-5'
|
- cron: '16 5-20 * * 1-5'
|
||||||
|
|
||||||
|
|||||||
15
.github/workflows/build-docker-devenv.yml
vendored
15
.github/workflows/build-docker-devenv.yml
vendored
@ -7,28 +7,23 @@ jobs:
|
|||||||
build-and-push:
|
build-and-push:
|
||||||
name: Build and push DevEnv Docker image
|
name: Build and push DevEnv Docker image
|
||||||
environment: release-admins
|
environment: release-admins
|
||||||
runs-on: penpot-runner-02
|
runs-on: ubuntu-24.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Set common environment variables
|
|
||||||
run: |
|
|
||||||
# Each job execution will use its own docker configuration.
|
|
||||||
echo "DOCKER_CONFIG=${{ runner.temp }}/.docker-${{ github.run_id }}-${{ github.job }}" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v4
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
- name: Login to Docker Registry
|
- name: Login to Docker Registry
|
||||||
uses: docker/login-action@v4
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.PUB_DOCKER_USERNAME }}
|
username: ${{ secrets.PUB_DOCKER_USERNAME }}
|
||||||
password: ${{ secrets.PUB_DOCKER_PASSWORD }}
|
password: ${{ secrets.PUB_DOCKER_PASSWORD }}
|
||||||
|
|
||||||
- name: Build and push DevEnv Docker image
|
- name: Build and push DevEnv Docker image
|
||||||
uses: docker/build-push-action@v7
|
uses: docker/build-push-action@v6
|
||||||
env:
|
env:
|
||||||
DOCKER_IMAGE: 'penpotapp/devenv'
|
DOCKER_IMAGE: 'penpotapp/devenv'
|
||||||
with:
|
with:
|
||||||
|
|||||||
71
.github/workflows/build-docker.yml
vendored
71
.github/workflows/build-docker.yml
vendored
@ -19,16 +19,11 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
build-and-push:
|
build-and-push:
|
||||||
name: Build and Push Penpot Docker Images
|
name: Build and Push Penpot Docker Images
|
||||||
runs-on: penpot-runner-02
|
runs-on: ubuntu-24.04-arm
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Set common environment variables
|
|
||||||
run: |
|
|
||||||
# Each job execution will use its own docker configuration.
|
|
||||||
echo "DOCKER_CONFIG=${{ runner.temp }}/.docker-${{ github.run_id }}-${{ github.job }}" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
ref: ${{ inputs.gh_ref }}
|
ref: ${{ inputs.gh_ref }}
|
||||||
@ -39,19 +34,12 @@ jobs:
|
|||||||
echo "gh_ref=${{ inputs.gh_ref || github.ref_name }}" >> $GITHUB_OUTPUT
|
echo "gh_ref=${{ inputs.gh_ref || github.ref_name }}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Download Penpot Bundles
|
- name: Download Penpot Bundles
|
||||||
id: bundles
|
|
||||||
env:
|
env:
|
||||||
FILE_NAME: penpot-${{ steps.vars.outputs.gh_ref }}.zip
|
FILE_NAME: penpot-${{ steps.vars.outputs.gh_ref }}.zip
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
|
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
||||||
AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
|
AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
|
||||||
run: |
|
run: |
|
||||||
tmp=$(aws s3api head-object \
|
|
||||||
--bucket ${{ secrets.S3_BUCKET }} \
|
|
||||||
--key "$FILE_NAME" \
|
|
||||||
--query 'Metadata."bundle-version"' \
|
|
||||||
--output text)
|
|
||||||
echo "bundle_version=$tmp" >> $GITHUB_OUTPUT
|
|
||||||
pushd docker/images
|
pushd docker/images
|
||||||
aws s3 cp s3://${{ secrets.S3_BUCKET }}/$FILE_NAME .
|
aws s3 cp s3://${{ secrets.S3_BUCKET }}/$FILE_NAME .
|
||||||
unzip $FILE_NAME > /dev/null
|
unzip $FILE_NAME > /dev/null
|
||||||
@ -59,43 +47,20 @@ jobs:
|
|||||||
mv penpot/frontend bundle-frontend
|
mv penpot/frontend bundle-frontend
|
||||||
mv penpot/exporter bundle-exporter
|
mv penpot/exporter bundle-exporter
|
||||||
mv penpot/storybook bundle-storybook
|
mv penpot/storybook bundle-storybook
|
||||||
mv penpot/mcp bundle-mcp
|
|
||||||
popd
|
popd
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v4
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
- name: Login to Docker Registry
|
- name: Login to Docker Registry
|
||||||
uses: docker/login-action@v4
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
registry: ${{ secrets.DOCKER_REGISTRY }}
|
registry: ${{ secrets.DOCKER_REGISTRY }}
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
username: ${{ secrets.DOCKER_USERNAME }}
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
|
||||||
# To avoid the “429 Too Many Requests” error when downloading
|
|
||||||
# images from DockerHub for unregistered users.
|
|
||||||
# https://docs.docker.com/docker-hub/usage/
|
|
||||||
- name: Login to DockerHub Registry
|
|
||||||
uses: docker/login-action@v4
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.PUB_DOCKER_USERNAME }}
|
|
||||||
password: ${{ secrets.PUB_DOCKER_PASSWORD }}
|
|
||||||
|
|
||||||
- name: Extract metadata (tags, labels)
|
|
||||||
id: meta
|
|
||||||
uses: docker/metadata-action@v6
|
|
||||||
with:
|
|
||||||
images:
|
|
||||||
frontend
|
|
||||||
backend
|
|
||||||
exporter
|
|
||||||
storybook
|
|
||||||
mcp
|
|
||||||
labels: |
|
|
||||||
bundle_version=${{ steps.bundles.outputs.bundle_version }}
|
|
||||||
|
|
||||||
- name: Build and push Backend Docker image
|
- name: Build and push Backend Docker image
|
||||||
uses: docker/build-push-action@v7
|
uses: docker/build-push-action@v6
|
||||||
env:
|
env:
|
||||||
DOCKER_IMAGE: 'backend'
|
DOCKER_IMAGE: 'backend'
|
||||||
BUNDLE_PATH: './bundle-backend'
|
BUNDLE_PATH: './bundle-backend'
|
||||||
@ -105,12 +70,11 @@ jobs:
|
|||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
|
tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
|
||||||
cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
|
cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
|
||||||
cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
|
cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
|
||||||
|
|
||||||
- name: Build and push Frontend Docker image
|
- name: Build and push Frontend Docker image
|
||||||
uses: docker/build-push-action@v7
|
uses: docker/build-push-action@v6
|
||||||
env:
|
env:
|
||||||
DOCKER_IMAGE: 'frontend'
|
DOCKER_IMAGE: 'frontend'
|
||||||
BUNDLE_PATH: './bundle-frontend'
|
BUNDLE_PATH: './bundle-frontend'
|
||||||
@ -120,12 +84,11 @@ jobs:
|
|||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
|
tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
|
||||||
cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
|
cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
|
||||||
cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
|
cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
|
||||||
|
|
||||||
- name: Build and push Exporter Docker image
|
- name: Build and push Exporter Docker image
|
||||||
uses: docker/build-push-action@v7
|
uses: docker/build-push-action@v6
|
||||||
env:
|
env:
|
||||||
DOCKER_IMAGE: 'exporter'
|
DOCKER_IMAGE: 'exporter'
|
||||||
BUNDLE_PATH: './bundle-exporter'
|
BUNDLE_PATH: './bundle-exporter'
|
||||||
@ -135,12 +98,11 @@ jobs:
|
|||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
|
tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
|
||||||
cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
|
cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
|
||||||
cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
|
cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
|
||||||
|
|
||||||
- name: Build and push Storybook Docker image
|
- name: Build and push Storybook Docker image
|
||||||
uses: docker/build-push-action@v7
|
uses: docker/build-push-action@v6
|
||||||
env:
|
env:
|
||||||
DOCKER_IMAGE: 'storybook'
|
DOCKER_IMAGE: 'storybook'
|
||||||
BUNDLE_PATH: './bundle-storybook'
|
BUNDLE_PATH: './bundle-storybook'
|
||||||
@ -150,22 +112,6 @@ jobs:
|
|||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
|
tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
|
||||||
cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
|
|
||||||
cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
|
|
||||||
|
|
||||||
- name: Build and push MCP Docker image
|
|
||||||
uses: docker/build-push-action@v7
|
|
||||||
env:
|
|
||||||
DOCKER_IMAGE: 'mcp'
|
|
||||||
BUNDLE_PATH: './bundle-mcp'
|
|
||||||
with:
|
|
||||||
context: ./docker/images/
|
|
||||||
file: ./docker/images/Dockerfile.mcp
|
|
||||||
platforms: linux/amd64,linux/arm64
|
|
||||||
push: true
|
|
||||||
tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
|
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
|
||||||
cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
|
cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
|
||||||
cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
|
cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
|
||||||
|
|
||||||
@ -178,6 +124,5 @@ jobs:
|
|||||||
TEXT: |
|
TEXT: |
|
||||||
❌ 🐳 *[PENPOT] Error building penpot docker images.*
|
❌ 🐳 *[PENPOT] Error building penpot docker images.*
|
||||||
📄 Triggered from ref: `${{ steps.vars.outputs.gh_ref }}`
|
📄 Triggered from ref: `${{ steps.vars.outputs.gh_ref }}`
|
||||||
📦 Bundle: `${{ steps.bundles.outputs.bundle_version }}`
|
|
||||||
🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
||||||
@infra
|
@infra
|
||||||
|
|||||||
22
.github/workflows/build-main-staging.yml
vendored
22
.github/workflows/build-main-staging.yml
vendored
@ -1,22 +0,0 @@
|
|||||||
name: _MAIN-STAGING
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
schedule:
|
|
||||||
- cron: '26 5-20 * * 1-5'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-bundle:
|
|
||||||
uses: ./.github/workflows/build-bundle.yml
|
|
||||||
secrets: inherit
|
|
||||||
with:
|
|
||||||
gh_ref: "main-staging"
|
|
||||||
build_wasm: "yes"
|
|
||||||
build_storybook: "yes"
|
|
||||||
|
|
||||||
build-docker:
|
|
||||||
needs: build-bundle
|
|
||||||
uses: ./.github/workflows/build-docker.yml
|
|
||||||
secrets: inherit
|
|
||||||
with:
|
|
||||||
gh_ref: "main-staging"
|
|
||||||
1
.github/workflows/build-staging.yml
vendored
1
.github/workflows/build-staging.yml
vendored
@ -1,7 +1,6 @@
|
|||||||
name: _STAGING
|
name: _STAGING
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '36 5-20 * * 1-5'
|
- cron: '36 5-20 * * 1-5'
|
||||||
|
|
||||||
|
|||||||
19
.github/workflows/build-tag.yml
vendored
19
.github/workflows/build-tag.yml
vendored
@ -1,7 +1,6 @@
|
|||||||
name: _TAG
|
name: _TAG
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
- '*'
|
- '*'
|
||||||
@ -12,7 +11,7 @@ jobs:
|
|||||||
secrets: inherit
|
secrets: inherit
|
||||||
with:
|
with:
|
||||||
gh_ref: ${{ github.ref_name }}
|
gh_ref: ${{ github.ref_name }}
|
||||||
build_wasm: "yes"
|
build_wasm: "no"
|
||||||
build_storybook: "yes"
|
build_storybook: "yes"
|
||||||
|
|
||||||
build-docker:
|
build-docker:
|
||||||
@ -22,22 +21,6 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
gh_ref: ${{ github.ref_name }}
|
gh_ref: ${{ github.ref_name }}
|
||||||
|
|
||||||
notify:
|
|
||||||
name: Notifications
|
|
||||||
runs-on: ubuntu-24.04
|
|
||||||
needs: build-docker
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Notify Mattermost
|
|
||||||
uses: mattermost/action-mattermost-notify@master
|
|
||||||
with:
|
|
||||||
MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
|
|
||||||
MATTERMOST_CHANNEL: bot-alerts-cicd
|
|
||||||
TEXT: |
|
|
||||||
🐳 *[PENPOT] Docker image available: ${{ github.ref_name }}*
|
|
||||||
🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
|
||||||
@infra
|
|
||||||
|
|
||||||
publish-final-tag:
|
publish-final-tag:
|
||||||
if: ${{ !contains(github.ref_name, '-RC') && !contains(github.ref_name, '-alpha') && !contains(github.ref_name, '-beta') && contains(github.ref_name, '.') }}
|
if: ${{ !contains(github.ref_name, '-RC') && !contains(github.ref_name, '-alpha') && !contains(github.ref_name, '-beta') && contains(github.ref_name, '.') }}
|
||||||
needs: build-docker
|
needs: build-docker
|
||||||
|
|||||||
5
.github/workflows/commit-checker.yml
vendored
5
.github/workflows/commit-checker.yml
vendored
@ -6,14 +6,12 @@ on:
|
|||||||
- edited
|
- edited
|
||||||
- reopened
|
- reopened
|
||||||
- synchronize
|
- synchronize
|
||||||
- ready_for_review
|
|
||||||
pull_request_target:
|
pull_request_target:
|
||||||
types:
|
types:
|
||||||
- opened
|
- opened
|
||||||
- edited
|
- edited
|
||||||
- reopened
|
- reopened
|
||||||
- synchronize
|
- synchronize
|
||||||
- ready_for_review
|
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
@ -22,14 +20,13 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
check-commit-message:
|
check-commit-message:
|
||||||
if: ${{ !github.event.pull_request.draft }}
|
|
||||||
name: Check Commit Message
|
name: Check Commit Message
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check Commit Type
|
- name: Check Commit Type
|
||||||
uses: gsactions/commit-message-checker@v2
|
uses: gsactions/commit-message-checker@v2
|
||||||
with:
|
with:
|
||||||
pattern: '^(((:(lipstick|globe_with_meridians|wrench|books|arrow_up|arrow_down|zap|ambulance|construction|boom|fire|whale|bug|sparkles|paperclip|tada|recycle|rewind|construction_worker):)\s[A-Z].*[^.])|(Merge|Revert|Reapply).+[^.])$'
|
pattern: '^(Merge|Revert|:(lipstick|globe_with_meridians|wrench|books|arrow_up|arrow_down|zap|ambulance|construction|boom|fire|whale|bug|sparkles|paperclip|tada|recycle|rewind|construction_worker):)\s["A-Z].*[^.]$'
|
||||||
flags: 'gm'
|
flags: 'gm'
|
||||||
error: 'Commit should match CONTRIBUTING.md guideline'
|
error: 'Commit should match CONTRIBUTING.md guideline'
|
||||||
checkAllCommitMessages: 'true' # optional: this checks all commits associated with a pull request
|
checkAllCommitMessages: 'true' # optional: this checks all commits associated with a pull request
|
||||||
|
|||||||
142
.github/workflows/plugins-deploy-api-doc.yml
vendored
142
.github/workflows/plugins-deploy-api-doc.yml
vendored
@ -1,142 +0,0 @@
|
|||||||
name: Plugins/api-doc deployer
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- develop
|
|
||||||
- staging
|
|
||||||
- main
|
|
||||||
paths:
|
|
||||||
- 'plugins/libs/plugin-types/index.d.ts'
|
|
||||||
- 'plugins/libs/plugin-types/REAME.md'
|
|
||||||
- 'plugins/tools/typedoc.css'
|
|
||||||
- 'plugins/CHANGELOG.md'
|
|
||||||
- 'plugins/wrangler-penpot-plugins-api-doc.toml'
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
gh_ref:
|
|
||||||
description: 'Name of the branch'
|
|
||||||
type: choice
|
|
||||||
required: true
|
|
||||||
default: 'develop'
|
|
||||||
options:
|
|
||||||
- develop
|
|
||||||
- staging
|
|
||||||
- main
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
deploy:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Extract some useful variables
|
|
||||||
id: vars
|
|
||||||
run: |
|
|
||||||
echo "gh_ref=${{ inputs.gh_ref || github.ref_name }}" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
ref: ${{ steps.vars.outputs.gh_ref }}
|
|
||||||
|
|
||||||
# START: Setup Node and PNPM enabling cache
|
|
||||||
- name: Setup Node.js
|
|
||||||
uses: actions/setup-node@v6
|
|
||||||
with:
|
|
||||||
node-version-file: .nvmrc
|
|
||||||
|
|
||||||
- name: Enable PNPM
|
|
||||||
working-directory: ./plugins
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
corepack enable;
|
|
||||||
corepack install;
|
|
||||||
|
|
||||||
- name: Get pnpm store path
|
|
||||||
id: pnpm-store
|
|
||||||
working-directory: ./plugins
|
|
||||||
shell: bash
|
|
||||||
run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Cache pnpm store
|
|
||||||
uses: actions/cache@v5
|
|
||||||
with:
|
|
||||||
path: ${{ steps.pnpm-store.outputs.STORE_PATH }}
|
|
||||||
key: ${{ runner.os }}-pnpm-${{ hashFiles('plugins/pnpm-lock.yaml') }}
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-pnpm-
|
|
||||||
# END: Setup Node and PNPM enabling cache
|
|
||||||
|
|
||||||
- name: Install deps
|
|
||||||
working-directory: ./plugins
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
pnpm install --no-frozen-lockfile;
|
|
||||||
pnpm add -D -w wrangler@latest;
|
|
||||||
|
|
||||||
- name: Build docs
|
|
||||||
working-directory: plugins
|
|
||||||
shell: bash
|
|
||||||
run: pnpm run build:doc
|
|
||||||
|
|
||||||
- name: Select Worker name
|
|
||||||
run: |
|
|
||||||
REF="${{ steps.vars.outputs.gh_ref }}"
|
|
||||||
case "$REF" in
|
|
||||||
main)
|
|
||||||
echo "WORKER_NAME=penpot-plugins-api-doc-pro" >> $GITHUB_ENV
|
|
||||||
echo "WORKER_URI=doc.plugins.penpot.app" >> $GITHUB_ENV ;;
|
|
||||||
staging)
|
|
||||||
echo "WORKER_NAME=penpot-plugins-api-doc-pre" >> $GITHUB_ENV
|
|
||||||
echo "WORKER_URI=doc.plugins.penpot.dev" >> $GITHUB_ENV ;;
|
|
||||||
develop)
|
|
||||||
echo "WORKER_NAME=penpot-plugins-api-doc-hourly" >> $GITHUB_ENV
|
|
||||||
echo "WORKER_URI=doc.plugins.hourly.penpot.dev" >> $GITHUB_ENV ;;
|
|
||||||
*) echo "Unsupported branch ${REF}" && exit 1 ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
- name: Set the custom url
|
|
||||||
working-directory: plugins
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
sed -i "s/WORKER_URI/${{ env.WORKER_URI }}/g" wrangler-penpot-plugins-api-doc.toml
|
|
||||||
|
|
||||||
- name: Add noindex header and robots.txt files for non-production environments
|
|
||||||
if: ${{ steps.vars.outputs.gh_ref != 'main' }}
|
|
||||||
working-directory: plugins
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
ASSETS_DIR="dist/doc"
|
|
||||||
|
|
||||||
cat > "${ASSETS_DIR}/_headers" << 'EOF'
|
|
||||||
/*
|
|
||||||
X-Robots-Tag: noindex, nofollow
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cat > "${ASSETS_DIR}/robots.txt" << 'EOF'
|
|
||||||
User-agent: *
|
|
||||||
Disallow: /
|
|
||||||
EOF
|
|
||||||
|
|
||||||
- name: Deploy to Cloudflare Workers
|
|
||||||
uses: cloudflare/wrangler-action@v3
|
|
||||||
with:
|
|
||||||
workingDirectory: plugins
|
|
||||||
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
|
||||||
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
|
||||||
command: deploy --config wrangler-penpot-plugins-api-doc.toml --name ${{ env.WORKER_NAME }}
|
|
||||||
|
|
||||||
- name: Notify Mattermost
|
|
||||||
if: failure()
|
|
||||||
uses: mattermost/action-mattermost-notify@master
|
|
||||||
with:
|
|
||||||
MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
|
|
||||||
MATTERMOST_CHANNEL: bot-alerts-cicd
|
|
||||||
TEXT: |
|
|
||||||
❌ 🧩📚 *[PENPOT PLUGINS] Error deploying API documentation.*
|
|
||||||
📄 Triggered from ref: `${{ inputs.gh_ref }}`
|
|
||||||
🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
|
||||||
@infra
|
|
||||||
127
.github/workflows/plugins-deploy-package.yml
vendored
127
.github/workflows/plugins-deploy-package.yml
vendored
@ -1,127 +0,0 @@
|
|||||||
name: Plugins/package deployer
|
|
||||||
|
|
||||||
on:
|
|
||||||
# Deploy package from manual action
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
gh_ref:
|
|
||||||
description: 'Name of the branch'
|
|
||||||
type: choice
|
|
||||||
required: true
|
|
||||||
default: 'develop'
|
|
||||||
options:
|
|
||||||
- develop
|
|
||||||
- staging
|
|
||||||
- main
|
|
||||||
plugin_name:
|
|
||||||
description: 'Pluging name (like plugins/apps/<plugin_name>-plugin)'
|
|
||||||
type: string
|
|
||||||
required: true
|
|
||||||
workflow_call:
|
|
||||||
inputs:
|
|
||||||
gh_ref:
|
|
||||||
description: 'Name of the branch'
|
|
||||||
type: string
|
|
||||||
required: true
|
|
||||||
default: 'develop'
|
|
||||||
plugin_name:
|
|
||||||
description: 'Publig name (from plugins/apps/<plugin_name>-plugin)'
|
|
||||||
type: string
|
|
||||||
required: true
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
deploy:
|
|
||||||
runs-on: penpot-runner-01
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
ref: ${{ inputs.gh_ref }}
|
|
||||||
|
|
||||||
# START: Setup Node and PNPM enabling cache
|
|
||||||
- name: Setup Node.js
|
|
||||||
uses: actions/setup-node@v6
|
|
||||||
with:
|
|
||||||
node-version-file: .nvmrc
|
|
||||||
|
|
||||||
- name: Enable PNPM
|
|
||||||
working-directory: ./plugins
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
corepack enable;
|
|
||||||
corepack install;
|
|
||||||
|
|
||||||
- name: Get pnpm store path
|
|
||||||
id: pnpm-store
|
|
||||||
working-directory: ./plugins
|
|
||||||
shell: bash
|
|
||||||
run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Cache pnpm store
|
|
||||||
uses: actions/cache@v5
|
|
||||||
with:
|
|
||||||
path: ${{ steps.pnpm-store.outputs.STORE_PATH }}
|
|
||||||
key: ${{ runner.os }}-pnpm-${{ hashFiles('plugins/pnpm-lock.yaml') }}
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-pnpm-
|
|
||||||
# END: Setup Node and PNPM enabling cache
|
|
||||||
|
|
||||||
- name: Install deps
|
|
||||||
working-directory: ./plugins
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
pnpm install --no-frozen-lockfile;
|
|
||||||
pnpm add -D -w wrangler@latest;
|
|
||||||
|
|
||||||
- name: "Build package for ${{ inputs.plugin_name }}-plugin"
|
|
||||||
working-directory: plugins
|
|
||||||
shell: bash
|
|
||||||
run: pnpm --filter ${{ inputs.plugin_name }}-plugin build
|
|
||||||
|
|
||||||
- name: Select Worker name
|
|
||||||
run: |
|
|
||||||
REF="${{ inputs.gh_ref }}"
|
|
||||||
case "$REF" in
|
|
||||||
main)
|
|
||||||
echo "WORKER_NAME=${{ inputs.plugin_name }}-plugin-pro" >> $GITHUB_ENV
|
|
||||||
echo "WORKER_URI=${{ inputs.plugin_name }}.plugins.penpot.app" >> $GITHUB_ENV ;;
|
|
||||||
staging)
|
|
||||||
echo "WORKER_NAME=${{ inputs.plugin_name }}-plugin-pre" >> $GITHUB_ENV
|
|
||||||
echo "WORKER_URI=${{ inputs.plugin_name }}.plugins.penpot.dev" >> $GITHUB_ENV ;;
|
|
||||||
develop)
|
|
||||||
echo "WORKER_NAME=${{ inputs.plugin_name }}-plugin-hourly" >> $GITHUB_ENV
|
|
||||||
echo "WORKER_URI=${{ inputs.plugin_name }}.plugins.hourly.penpot.dev" >> $GITHUB_ENV ;;
|
|
||||||
*) echo "Unsupported branch ${REF}" && exit 1 ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
- name: Set the custom url
|
|
||||||
working-directory: plugins
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
sed -i "s/WORKER_URI/${{ env.WORKER_URI }}/g" apps/${{ inputs.plugin_name }}-plugin/wrangler.toml
|
|
||||||
|
|
||||||
- name: Deploy to Cloudflare Workers
|
|
||||||
uses: cloudflare/wrangler-action@v3
|
|
||||||
with:
|
|
||||||
workingDirectory: plugins
|
|
||||||
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
|
||||||
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
|
||||||
command: deploy --config apps/${{ inputs.plugin_name }}-plugin/wrangler.toml --name ${{ env.WORKER_NAME }}
|
|
||||||
|
|
||||||
- name: Notify Mattermost
|
|
||||||
if: failure()
|
|
||||||
uses: mattermost/action-mattermost-notify@master
|
|
||||||
with:
|
|
||||||
MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
|
|
||||||
MATTERMOST_CHANNEL: bot-alerts-cicd
|
|
||||||
TEXT: |
|
|
||||||
❌ 🧩📦 *[PENPOT PLUGINS] Error deploying ${{ env.WORKER_NAME }}.*
|
|
||||||
📄 Triggered from ref: `${{ inputs.gh_ref }}`
|
|
||||||
Plugin name: `${{ inputs.plugin_name }}-plugin`
|
|
||||||
Cloudflare worker name: `${{ env.WORKER_NAME }}`
|
|
||||||
🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
|
||||||
@infra
|
|
||||||
143
.github/workflows/plugins-deploy-packages.yml
vendored
143
.github/workflows/plugins-deploy-packages.yml
vendored
@ -1,143 +0,0 @@
|
|||||||
name: Plugins/packages deployer
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- develop
|
|
||||||
- staging
|
|
||||||
- main
|
|
||||||
paths:
|
|
||||||
- 'plugins/apps/*-plugin/**'
|
|
||||||
- 'libs/plugins-styles/**'
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
gh_ref:
|
|
||||||
description: 'Name of the branch'
|
|
||||||
type: choice
|
|
||||||
required: true
|
|
||||||
default: 'develop'
|
|
||||||
options:
|
|
||||||
- develop
|
|
||||||
- staging
|
|
||||||
- main
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
detect-changes:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
outputs:
|
|
||||||
colors_to_tokens: ${{ steps.filter.outputs.colors_to_tokens }}
|
|
||||||
create_palette: ${{ steps.filter.outputs.create_palette }}
|
|
||||||
lorem_ipsum: ${{ steps.filter.outputs.lorem_ipsum }}
|
|
||||||
rename_layers: ${{ steps.filter.outputs.rename_layers }}
|
|
||||||
contrast: ${{ steps.filter.outputs.contrast }}
|
|
||||||
icons: ${{ steps.filter.outputs.icons }}
|
|
||||||
poc_state: ${{ steps.filter.outputs.poc_state }}
|
|
||||||
table: ${{ steps.filter.outputs.table }}
|
|
||||||
# [For new plugins]
|
|
||||||
# Add more outputs here
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v6
|
|
||||||
- id: filter
|
|
||||||
uses: dorny/paths-filter@v4
|
|
||||||
with:
|
|
||||||
filters: |
|
|
||||||
colors_to_tokens:
|
|
||||||
- 'plugins/apps/colors-to-tokens-plugin/**'
|
|
||||||
- 'libs/plugins-styles/**'
|
|
||||||
contrast:
|
|
||||||
- 'plugins/apps/contrast-plugin/**'
|
|
||||||
- 'libs/plugins-styles/**'
|
|
||||||
create_palette:
|
|
||||||
- 'plugins/apps/create-palette-plugin/**'
|
|
||||||
- 'libs/plugins-styles/**'
|
|
||||||
icons:
|
|
||||||
- 'plugins/apps/icons-plugin/**'
|
|
||||||
- 'libs/plugins-styles/**'
|
|
||||||
lorem_ipsum:
|
|
||||||
- 'plugins/apps/lorem-ipsum-plugin/**'
|
|
||||||
- 'libs/plugins-styles/**'
|
|
||||||
rename_layers:
|
|
||||||
- 'plugins/apps/rename-layers-plugin/**'
|
|
||||||
- 'libs/plugins-styles/**'
|
|
||||||
table:
|
|
||||||
- 'plugins/apps/table-plugin/**'
|
|
||||||
- 'libs/plugins-styles/**'
|
|
||||||
# [For new plugins]
|
|
||||||
# Add more plugin filters here
|
|
||||||
# another_plugin:
|
|
||||||
# - 'plugins/apps/another-plugin/**'
|
|
||||||
# - 'libs/plugins-styles/**'
|
|
||||||
|
|
||||||
colors-to-tokens-plugin:
|
|
||||||
needs: detect-changes
|
|
||||||
if: github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.colors_to_tokens == 'true'
|
|
||||||
uses: ./.github/workflows/plugins-deploy-package.yml
|
|
||||||
secrets: inherit
|
|
||||||
with:
|
|
||||||
gh_ref: "${{ inputs.gh_ref || github.ref_name }}"
|
|
||||||
plugin_name: colors-to-tokens
|
|
||||||
|
|
||||||
contrast-plugin:
|
|
||||||
needs: detect-changes
|
|
||||||
if: github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.contrast == 'true'
|
|
||||||
uses: ./.github/workflows/plugins-deploy-package.yml
|
|
||||||
secrets: inherit
|
|
||||||
with:
|
|
||||||
gh_ref: "${{ inputs.gh_ref || github.ref_name }}"
|
|
||||||
plugin_name: contrast
|
|
||||||
|
|
||||||
create-palette-plugin:
|
|
||||||
needs: detect-changes
|
|
||||||
if: github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.create_palette == 'true'
|
|
||||||
uses: ./.github/workflows/plugins-deploy-package.yml
|
|
||||||
secrets: inherit
|
|
||||||
with:
|
|
||||||
gh_ref: "${{ inputs.gh_ref || github.ref_name }}"
|
|
||||||
plugin_name: create-palette
|
|
||||||
|
|
||||||
icons-plugin:
|
|
||||||
needs: detect-changes
|
|
||||||
if: github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.icons == 'true'
|
|
||||||
uses: ./.github/workflows/plugins-deploy-package.yml
|
|
||||||
secrets: inherit
|
|
||||||
with:
|
|
||||||
gh_ref: "${{ inputs.gh_ref || github.ref_name }}"
|
|
||||||
plugin_name: icons
|
|
||||||
|
|
||||||
lorem-ipsum-plugin:
|
|
||||||
needs: detect-changes
|
|
||||||
if: github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.lorem_ipsum == 'true'
|
|
||||||
uses: ./.github/workflows/plugins-deploy-package.yml
|
|
||||||
secrets: inherit
|
|
||||||
with:
|
|
||||||
gh_ref: "${{ inputs.gh_ref || github.ref_name }}"
|
|
||||||
plugin_name: lorem-ipsum
|
|
||||||
|
|
||||||
rename-layers-plugin:
|
|
||||||
needs: detect-changes
|
|
||||||
if: github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.rename_layers == 'true'
|
|
||||||
uses: ./.github/workflows/plugins-deploy-package.yml
|
|
||||||
secrets: inherit
|
|
||||||
with:
|
|
||||||
gh_ref: "${{ inputs.gh_ref || github.ref_name }}"
|
|
||||||
plugin_name: rename-layers
|
|
||||||
|
|
||||||
table-plugin:
|
|
||||||
needs: detect-changes
|
|
||||||
if: github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.table == 'true'
|
|
||||||
uses: ./.github/workflows/plugins-deploy-package.yml
|
|
||||||
secrets: inherit
|
|
||||||
with:
|
|
||||||
gh_ref: "${{ inputs.gh_ref || github.ref_name }}"
|
|
||||||
plugin_name: table
|
|
||||||
|
|
||||||
# [For new plugins]
|
|
||||||
# Add more jobs for other plugins below, following the same pattern
|
|
||||||
# another-plugin:
|
|
||||||
# needs: detect-changes
|
|
||||||
# if: github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.another_plugin == 'true'
|
|
||||||
# uses: ./.github/workflows/plugins-deploy-package.yml
|
|
||||||
# secrets: inherit
|
|
||||||
# with:
|
|
||||||
# gh_ref: "${{ inputs.gh_ref || github.ref_name }}"
|
|
||||||
# plugin_name: another
|
|
||||||
140
.github/workflows/plugins-deploy-styles-doc.yml
vendored
140
.github/workflows/plugins-deploy-styles-doc.yml
vendored
@ -1,140 +0,0 @@
|
|||||||
name: Plugins/styles-doc deployer
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- develop
|
|
||||||
- staging
|
|
||||||
- main
|
|
||||||
paths:
|
|
||||||
- 'plugins/apps/example-styles/**'
|
|
||||||
- 'plugins/libs/plugins-styles/**'
|
|
||||||
- 'plugins/wrangler-penpot-plugins-styles-doc.toml'
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
gh_ref:
|
|
||||||
description: 'Name of the branch'
|
|
||||||
type: choice
|
|
||||||
required: true
|
|
||||||
default: 'develop'
|
|
||||||
options:
|
|
||||||
- develop
|
|
||||||
- staging
|
|
||||||
- main
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
deploy:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Extract some useful variables
|
|
||||||
id: vars
|
|
||||||
run: |
|
|
||||||
echo "gh_ref=${{ inputs.gh_ref || github.ref_name }}" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
ref: ${{ steps.vars.outputs.gh_ref }}
|
|
||||||
|
|
||||||
# START: Setup Node and PNPM enabling cache
|
|
||||||
- name: Setup Node.js
|
|
||||||
uses: actions/setup-node@v6
|
|
||||||
with:
|
|
||||||
node-version-file: .nvmrc
|
|
||||||
|
|
||||||
- name: Enable PNPM
|
|
||||||
working-directory: ./plugins
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
corepack enable;
|
|
||||||
corepack install;
|
|
||||||
|
|
||||||
- name: Get pnpm store path
|
|
||||||
id: pnpm-store
|
|
||||||
working-directory: ./plugins
|
|
||||||
shell: bash
|
|
||||||
run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Cache pnpm store
|
|
||||||
uses: actions/cache@v5
|
|
||||||
with:
|
|
||||||
path: ${{ steps.pnpm-store.outputs.STORE_PATH }}
|
|
||||||
key: ${{ runner.os }}-pnpm-${{ hashFiles('plugins/pnpm-lock.yaml') }}
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-pnpm-
|
|
||||||
# END: Setup Node and PNPM enabling cache
|
|
||||||
|
|
||||||
- name: Install deps
|
|
||||||
working-directory: ./plugins
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
pnpm install --no-frozen-lockfile;
|
|
||||||
pnpm add -D -w wrangler@latest;
|
|
||||||
|
|
||||||
- name: Build styles
|
|
||||||
working-directory: plugins
|
|
||||||
shell: bash
|
|
||||||
run: pnpm run build:styles-example
|
|
||||||
|
|
||||||
- name: Select Worker name
|
|
||||||
run: |
|
|
||||||
REF="${{ steps.vars.outputs.gh_ref }}"
|
|
||||||
case "$REF" in
|
|
||||||
main)
|
|
||||||
echo "WORKER_NAME=penpot-plugins-styles-doc-pro" >> $GITHUB_ENV
|
|
||||||
echo "WORKER_URI=styles-doc.plugins.penpot.app" >> $GITHUB_ENV ;;
|
|
||||||
staging)
|
|
||||||
echo "WORKER_NAME=penpot-plugins-styles-doc-pre" >> $GITHUB_ENV
|
|
||||||
echo "WORKER_URI=styles-doc.plugins.penpot.dev" >> $GITHUB_ENV ;;
|
|
||||||
develop)
|
|
||||||
echo "WORKER_NAME=penpot-plugins-styles-doc-hourly" >> $GITHUB_ENV
|
|
||||||
echo "WORKER_URI=styles-doc.plugins.hourly.penpot.dev" >> $GITHUB_ENV ;;
|
|
||||||
*) echo "Unsupported branch ${REF}" && exit 1 ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
- name: Set the custom url
|
|
||||||
working-directory: plugins
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
sed -i "s/WORKER_URI/${{ env.WORKER_URI }}/g" wrangler-penpot-plugins-styles-doc.toml
|
|
||||||
|
|
||||||
- name: Add noindex header and robots.txt files for non-production environments
|
|
||||||
if: ${{ steps.vars.outputs.gh_ref != 'main' }}
|
|
||||||
working-directory: plugins
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
ASSETS_DIR="dist/apps/example-styles"
|
|
||||||
|
|
||||||
cat > "${ASSETS_DIR}/_headers" << 'EOF'
|
|
||||||
/*
|
|
||||||
X-Robots-Tag: noindex, nofollow
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cat > "${ASSETS_DIR}/robots.txt" << 'EOF'
|
|
||||||
User-agent: *
|
|
||||||
Disallow: /
|
|
||||||
EOF
|
|
||||||
|
|
||||||
- name: Deploy to Cloudflare Workers
|
|
||||||
uses: cloudflare/wrangler-action@v3
|
|
||||||
with:
|
|
||||||
workingDirectory: plugins
|
|
||||||
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
|
||||||
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
|
||||||
command: deploy --config wrangler-penpot-plugins-styles-doc.toml --name ${{ env.WORKER_NAME }}
|
|
||||||
|
|
||||||
- name: Notify Mattermost
|
|
||||||
if: failure()
|
|
||||||
uses: mattermost/action-mattermost-notify@master
|
|
||||||
with:
|
|
||||||
MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
|
|
||||||
MATTERMOST_CHANNEL: bot-alerts-cicd
|
|
||||||
TEXT: |
|
|
||||||
❌ 🧩💅 *[PENPOT PLUGINS] Error deploying Styles documentation.*
|
|
||||||
📄 Triggered from ref: `${{ inputs.gh_ref }}`
|
|
||||||
🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
|
||||||
@infra
|
|
||||||
11
.github/workflows/release.yml
vendored
11
.github/workflows/release.yml
vendored
@ -31,7 +31,7 @@ jobs:
|
|||||||
echo "gh_ref=${{ inputs.gh_ref || github.ref_name }}" >> $GITHUB_OUTPUT
|
echo "gh_ref=${{ inputs.gh_ref || github.ref_name }}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
ref: ${{ steps.vars.outputs.gh_ref }}
|
ref: ${{ steps.vars.outputs.gh_ref }}
|
||||||
@ -64,17 +64,16 @@ jobs:
|
|||||||
echo "$PUB_DOCKER_PASSWORD" | skopeo login --username "$PUB_DOCKER_USERNAME" --password-stdin docker.io
|
echo "$PUB_DOCKER_PASSWORD" | skopeo login --username "$PUB_DOCKER_USERNAME" --password-stdin docker.io
|
||||||
|
|
||||||
IMAGES=("frontend" "backend" "exporter" "storybook")
|
IMAGES=("frontend" "backend" "exporter" "storybook")
|
||||||
SHORT_TAG=${TAG%.*}
|
|
||||||
|
|
||||||
for image in "${IMAGES[@]}"; do
|
for image in "${IMAGES[@]}"; do
|
||||||
skopeo copy --all \
|
skopeo copy --all \
|
||||||
docker://$DOCKER_REGISTRY/$image:$TAG \
|
docker://$DOCKER_REGISTRY/$image:$TAG \
|
||||||
docker://docker.io/penpotapp/$image:$TAG
|
docker://docker.io/$PUB_DOCKER_USERNAME/$image:$TAG
|
||||||
|
|
||||||
for alias in main latest "$SHORT_TAG"; do
|
for alias in main latest; do
|
||||||
skopeo copy --all \
|
skopeo copy --all \
|
||||||
docker://$DOCKER_REGISTRY/$image:$TAG \
|
docker://$DOCKER_REGISTRY/$image:$TAG \
|
||||||
docker://docker.io/penpotapp/$image:$alias
|
docker://docker.io/$PUB_DOCKER_USERNAME/$image:$alias
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -94,7 +93,7 @@ jobs:
|
|||||||
|
|
||||||
# --- Create GitHub release ---
|
# --- Create GitHub release ---
|
||||||
- name: Create GitHub release
|
- name: Create GitHub release
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v1
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
|
|||||||
47
.github/workflows/tests-mcp.yml
vendored
47
.github/workflows/tests-mcp.yml
vendored
@ -1,47 +0,0 @@
|
|||||||
name: "MCP CI"
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- develop
|
|
||||||
- staging
|
|
||||||
- main
|
|
||||||
|
|
||||||
types:
|
|
||||||
- opened
|
|
||||||
- synchronize
|
|
||||||
- ready_for_review
|
|
||||||
|
|
||||||
paths:
|
|
||||||
- 'mcp/**'
|
|
||||||
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- develop
|
|
||||||
- staging
|
|
||||||
- main
|
|
||||||
|
|
||||||
paths:
|
|
||||||
- 'mcp/**'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test-mcp:
|
|
||||||
if: ${{ !github.event.pull_request.draft }}
|
|
||||||
name: "Test MCP"
|
|
||||||
runs-on: penpot-runner-02
|
|
||||||
container: penpotapp/devenv:latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Setup
|
|
||||||
working-directory: ./mcp
|
|
||||||
run: ./scripts/setup
|
|
||||||
|
|
||||||
- name: Check
|
|
||||||
working-directory: ./mcp
|
|
||||||
run: |
|
|
||||||
pnpm run fmt:check;
|
|
||||||
pnpm -r run build;
|
|
||||||
pnpm -r run types:check;
|
|
||||||
363
.github/workflows/tests.yml
vendored
363
.github/workflows/tests.yml
vendored
@ -1,363 +0,0 @@
|
|||||||
name: "CI"
|
|
||||||
|
|
||||||
defaults:
|
|
||||||
run:
|
|
||||||
shell: bash
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
types:
|
|
||||||
- opened
|
|
||||||
- synchronize
|
|
||||||
- ready_for_review
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- develop
|
|
||||||
- staging
|
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.event.pull_request.number || github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
lint:
|
|
||||||
if: ${{ !github.event.pull_request.draft }}
|
|
||||||
name: "Linter"
|
|
||||||
runs-on: penpot-runner-02
|
|
||||||
container: penpotapp/devenv:latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Lint Common
|
|
||||||
working-directory: ./common
|
|
||||||
run: |
|
|
||||||
corepack enable;
|
|
||||||
corepack install;
|
|
||||||
pnpm install;
|
|
||||||
pnpm run check-fmt:clj
|
|
||||||
pnpm run check-fmt:js
|
|
||||||
pnpm run lint:clj
|
|
||||||
|
|
||||||
- name: Lint Frontend
|
|
||||||
working-directory: ./frontend
|
|
||||||
run: |
|
|
||||||
corepack enable;
|
|
||||||
corepack install;
|
|
||||||
pnpm install;
|
|
||||||
pnpm run check-fmt:js
|
|
||||||
pnpm run check-fmt:clj
|
|
||||||
pnpm run check-fmt:scss
|
|
||||||
pnpm run lint:clj
|
|
||||||
pnpm run lint:js
|
|
||||||
pnpm run lint:scss
|
|
||||||
|
|
||||||
- name: Lint Backend
|
|
||||||
working-directory: ./backend
|
|
||||||
run: |
|
|
||||||
corepack enable;
|
|
||||||
corepack install;
|
|
||||||
pnpm install;
|
|
||||||
pnpm run check-fmt
|
|
||||||
pnpm run lint
|
|
||||||
|
|
||||||
- name: Lint Exporter
|
|
||||||
working-directory: ./exporter
|
|
||||||
run: |
|
|
||||||
corepack enable;
|
|
||||||
corepack install;
|
|
||||||
pnpm install;
|
|
||||||
pnpm run check-fmt
|
|
||||||
pnpm run lint
|
|
||||||
|
|
||||||
- name: Lint Library
|
|
||||||
working-directory: ./library
|
|
||||||
run: |
|
|
||||||
corepack enable;
|
|
||||||
corepack install;
|
|
||||||
pnpm install;
|
|
||||||
pnpm run check-fmt
|
|
||||||
pnpm run lint
|
|
||||||
|
|
||||||
test-common:
|
|
||||||
if: ${{ !github.event.pull_request.draft }}
|
|
||||||
name: "Common Tests"
|
|
||||||
runs-on: penpot-runner-02
|
|
||||||
container: penpotapp/devenv:latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Run tests
|
|
||||||
working-directory: ./common
|
|
||||||
run: |
|
|
||||||
./scripts/test
|
|
||||||
|
|
||||||
test-plugins:
|
|
||||||
if: ${{ !github.event.pull_request.draft }}
|
|
||||||
name: Plugins Runtime Linter & Tests
|
|
||||||
runs-on: penpot-runner-02
|
|
||||||
container: penpotapp/devenv:latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Setup Node
|
|
||||||
id: setup-node
|
|
||||||
uses: actions/setup-node@v6
|
|
||||||
with:
|
|
||||||
node-version-file: .nvmrc
|
|
||||||
|
|
||||||
- name: Install deps
|
|
||||||
working-directory: ./plugins
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
corepack enable;
|
|
||||||
corepack install;
|
|
||||||
pnpm install;
|
|
||||||
|
|
||||||
- name: Run Lint
|
|
||||||
working-directory: ./plugins
|
|
||||||
run: pnpm run lint
|
|
||||||
|
|
||||||
- name: Run Format Check
|
|
||||||
working-directory: ./plugins
|
|
||||||
run: pnpm run format:check
|
|
||||||
|
|
||||||
- name: Run Test
|
|
||||||
working-directory: ./plugins
|
|
||||||
run: pnpm run test
|
|
||||||
|
|
||||||
- name: Build runtime
|
|
||||||
working-directory: ./plugins
|
|
||||||
run: pnpm run build:runtime
|
|
||||||
|
|
||||||
- name: Build doc
|
|
||||||
working-directory: ./plugins
|
|
||||||
run: pnpm run build:doc
|
|
||||||
|
|
||||||
- name: Build plugins
|
|
||||||
working-directory: ./plugins
|
|
||||||
run: pnpm run build:plugins
|
|
||||||
|
|
||||||
- name: Build styles
|
|
||||||
working-directory: ./plugins
|
|
||||||
run: pnpm run build:styles-example
|
|
||||||
|
|
||||||
test-frontend:
|
|
||||||
if: ${{ !github.event.pull_request.draft }}
|
|
||||||
name: "Frontend Tests"
|
|
||||||
runs-on: penpot-runner-02
|
|
||||||
container: penpotapp/devenv:latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Unit Tests
|
|
||||||
working-directory: ./frontend
|
|
||||||
run: |
|
|
||||||
./scripts/test
|
|
||||||
|
|
||||||
- name: Component Tests
|
|
||||||
working-directory: ./frontend
|
|
||||||
env:
|
|
||||||
VITEST_BROWSER_TIMEOUT: 120000
|
|
||||||
run: |
|
|
||||||
./scripts/test-components
|
|
||||||
|
|
||||||
test-render-wasm:
|
|
||||||
if: ${{ !github.event.pull_request.draft }}
|
|
||||||
name: "Render WASM Tests"
|
|
||||||
runs-on: penpot-runner-02
|
|
||||||
container: penpotapp/devenv:latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Format
|
|
||||||
working-directory: ./render-wasm
|
|
||||||
run: |
|
|
||||||
cargo fmt --check
|
|
||||||
|
|
||||||
- name: Lint
|
|
||||||
working-directory: ./render-wasm
|
|
||||||
run: |
|
|
||||||
./lint
|
|
||||||
|
|
||||||
- name: Test
|
|
||||||
working-directory: ./render-wasm
|
|
||||||
run: |
|
|
||||||
./test
|
|
||||||
|
|
||||||
test-backend:
|
|
||||||
if: ${{ !github.event.pull_request.draft }}
|
|
||||||
name: "Backend Tests"
|
|
||||||
runs-on: penpot-runner-02
|
|
||||||
container: penpotapp/devenv:latest
|
|
||||||
|
|
||||||
services:
|
|
||||||
postgres:
|
|
||||||
image: postgres:17
|
|
||||||
# Provide the password for postgres
|
|
||||||
env:
|
|
||||||
POSTGRES_USER: penpot_test
|
|
||||||
POSTGRES_PASSWORD: penpot_test
|
|
||||||
POSTGRES_DB: penpot_test
|
|
||||||
|
|
||||||
# Set health checks to wait until postgres has started
|
|
||||||
options: >-
|
|
||||||
--health-cmd pg_isready
|
|
||||||
--health-interval 10s
|
|
||||||
--health-timeout 5s
|
|
||||||
--health-retries 5
|
|
||||||
|
|
||||||
redis:
|
|
||||||
image: valkey/valkey:9
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Run tests
|
|
||||||
working-directory: ./backend
|
|
||||||
env:
|
|
||||||
PENPOT_TEST_DATABASE_URI: "postgresql://postgres/penpot_test"
|
|
||||||
PENPOT_TEST_DATABASE_USERNAME: penpot_test
|
|
||||||
PENPOT_TEST_DATABASE_PASSWORD: penpot_test
|
|
||||||
PENPOT_TEST_REDIS_URI: "redis://redis/1"
|
|
||||||
|
|
||||||
run: |
|
|
||||||
clojure -M:dev:test --reporter kaocha.report/documentation
|
|
||||||
|
|
||||||
test-library:
|
|
||||||
if: ${{ !github.event.pull_request.draft }}
|
|
||||||
name: "Library Tests"
|
|
||||||
runs-on: penpot-runner-02
|
|
||||||
container: penpotapp/devenv:latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Run tests
|
|
||||||
working-directory: ./library
|
|
||||||
run: |
|
|
||||||
./scripts/test
|
|
||||||
|
|
||||||
build-integration:
|
|
||||||
if: ${{ !github.event.pull_request.draft }}
|
|
||||||
name: "Build Integration Bundle"
|
|
||||||
runs-on: penpot-runner-02
|
|
||||||
container: penpotapp/devenv:latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Build Bundle
|
|
||||||
working-directory: ./frontend
|
|
||||||
run: |
|
|
||||||
./scripts/build
|
|
||||||
|
|
||||||
- name: Store Bundle Cache
|
|
||||||
uses: actions/cache@v5
|
|
||||||
with:
|
|
||||||
key: "integration-bundle-${{ github.sha }}"
|
|
||||||
path: frontend/resources/public
|
|
||||||
|
|
||||||
test-integration-1:
|
|
||||||
if: ${{ !github.event.pull_request.draft }}
|
|
||||||
name: "Integration Tests 1/3"
|
|
||||||
runs-on: penpot-runner-02
|
|
||||||
container: penpotapp/devenv:latest
|
|
||||||
needs: build-integration
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout Repository
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Restore Cache
|
|
||||||
uses: actions/cache/restore@v5
|
|
||||||
with:
|
|
||||||
key: "integration-bundle-${{ github.sha }}"
|
|
||||||
path: frontend/resources/public
|
|
||||||
|
|
||||||
- name: Run Tests
|
|
||||||
working-directory: ./frontend
|
|
||||||
run: |
|
|
||||||
./scripts/test-e2e --shard="1/3";
|
|
||||||
|
|
||||||
- name: Upload test result
|
|
||||||
uses: actions/upload-artifact@v7
|
|
||||||
if: always()
|
|
||||||
with:
|
|
||||||
name: integration-tests-result-1
|
|
||||||
path: frontend/test-results/
|
|
||||||
overwrite: true
|
|
||||||
retention-days: 3
|
|
||||||
|
|
||||||
test-integration-2:
|
|
||||||
if: ${{ !github.event.pull_request.draft }}
|
|
||||||
name: "Integration Tests 2/3"
|
|
||||||
runs-on: penpot-runner-02
|
|
||||||
container: penpotapp/devenv:latest
|
|
||||||
needs: build-integration
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout Repository
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Restore Cache
|
|
||||||
uses: actions/cache/restore@v5
|
|
||||||
with:
|
|
||||||
key: "integration-bundle-${{ github.sha }}"
|
|
||||||
path: frontend/resources/public
|
|
||||||
|
|
||||||
- name: Run Tests
|
|
||||||
working-directory: ./frontend
|
|
||||||
run: |
|
|
||||||
./scripts/test-e2e --shard="2/3";
|
|
||||||
|
|
||||||
- name: Upload test result
|
|
||||||
uses: actions/upload-artifact@v7
|
|
||||||
if: always()
|
|
||||||
with:
|
|
||||||
name: integration-tests-result-2
|
|
||||||
path: frontend/test-results/
|
|
||||||
overwrite: true
|
|
||||||
retention-days: 3
|
|
||||||
|
|
||||||
test-integration-3:
|
|
||||||
if: ${{ !github.event.pull_request.draft }}
|
|
||||||
name: "Integration Tests 3/3"
|
|
||||||
runs-on: penpot-runner-02
|
|
||||||
container: penpotapp/devenv:latest
|
|
||||||
needs: build-integration
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout Repository
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Restore Cache
|
|
||||||
uses: actions/cache/restore@v5
|
|
||||||
with:
|
|
||||||
key: "integration-bundle-${{ github.sha }}"
|
|
||||||
path: frontend/resources/public
|
|
||||||
|
|
||||||
- name: Run Tests
|
|
||||||
working-directory: ./frontend
|
|
||||||
run: |
|
|
||||||
./scripts/test-e2e --shard="3/3";
|
|
||||||
|
|
||||||
- name: Upload test result
|
|
||||||
uses: actions/upload-artifact@v7
|
|
||||||
if: always()
|
|
||||||
with:
|
|
||||||
name: integration-tests-result-3
|
|
||||||
path: frontend/test-results/
|
|
||||||
overwrite: true
|
|
||||||
retention-days: 3
|
|
||||||
32
.gitignore
vendored
32
.gitignore
vendored
@ -1,4 +1,10 @@
|
|||||||
.pnp.*
|
.pnp.*
|
||||||
|
.yarn/*
|
||||||
|
!.yarn/patches
|
||||||
|
!.yarn/plugins
|
||||||
|
!.yarn/releases
|
||||||
|
!.yarn/sdks
|
||||||
|
!.yarn/versions
|
||||||
*-init.clj
|
*-init.clj
|
||||||
*.css.json
|
*.css.json
|
||||||
*.jar
|
*.jar
|
||||||
@ -13,6 +19,7 @@
|
|||||||
.nyc_output
|
.nyc_output
|
||||||
.rebel_readline_history
|
.rebel_readline_history
|
||||||
.repl
|
.repl
|
||||||
|
.shadow-cljs
|
||||||
/*.jpg
|
/*.jpg
|
||||||
/*.md
|
/*.md
|
||||||
/*.png
|
/*.png
|
||||||
@ -24,13 +31,8 @@
|
|||||||
/.clj-kondo/.cache
|
/.clj-kondo/.cache
|
||||||
/_dump
|
/_dump
|
||||||
/notes
|
/notes
|
||||||
/.opencode/package-lock.json
|
|
||||||
/plans
|
|
||||||
/prompts
|
|
||||||
/playground/
|
/playground/
|
||||||
/backend/*.md
|
/backend/*.md
|
||||||
!/backend/AGENTS.md
|
|
||||||
/backend/.shadow-cljs
|
|
||||||
/backend/*.sql
|
/backend/*.sql
|
||||||
/backend/*.txt
|
/backend/*.txt
|
||||||
/backend/assets/
|
/backend/assets/
|
||||||
@ -41,34 +43,27 @@
|
|||||||
/backend/resources/public/media
|
/backend/resources/public/media
|
||||||
/backend/target/
|
/backend/target/
|
||||||
/backend/experiments
|
/backend/experiments
|
||||||
/backend/scripts/_env.local
|
|
||||||
/bundle*
|
/bundle*
|
||||||
|
/cd.md
|
||||||
/clj-profiler/
|
/clj-profiler/
|
||||||
/common/coverage
|
/common/coverage
|
||||||
/common/target
|
/common/target
|
||||||
/common/.shadow-cljs
|
/deploy
|
||||||
/docker/images/bundle*
|
/docker/images/bundle*
|
||||||
/exporter/target
|
/exporter/target
|
||||||
/exporter/.shadow-cljs
|
|
||||||
/frontend/.storybook/preview-body.html
|
/frontend/.storybook/preview-body.html
|
||||||
/frontend/.storybook/preview-head.html
|
/frontend/.storybook/preview-head.html
|
||||||
/frontend/playwright-report/
|
|
||||||
/frontend/playwright/ui/visual-specs/
|
|
||||||
/frontend/text-editor/src/wasm/
|
|
||||||
/frontend/dist/
|
/frontend/dist/
|
||||||
/frontend/npm-debug.log
|
/frontend/npm-debug.log
|
||||||
/frontend/out/
|
/frontend/out/
|
||||||
/frontend/package-lock.json
|
/frontend/package-lock.json
|
||||||
/frontend/resources/fonts/experiments
|
/frontend/resources/fonts/experiments
|
||||||
/frontend/resources/public/*
|
/frontend/resources/public/*
|
||||||
/frontend/src/app/render_wasm/api/shared.js
|
|
||||||
/frontend/storybook-static/
|
/frontend/storybook-static/
|
||||||
/frontend/target/
|
/frontend/target/
|
||||||
/frontend/test-results/
|
|
||||||
/frontend/.shadow-cljs
|
|
||||||
/other/
|
/other/
|
||||||
/scripts/
|
/scripts/
|
||||||
/nexus/
|
/telemetry/
|
||||||
/tmp/
|
/tmp/
|
||||||
/vendor/**/target
|
/vendor/**/target
|
||||||
/vendor/svgclean/bundle*.js
|
/vendor/svgclean/bundle*.js
|
||||||
@ -76,13 +71,12 @@
|
|||||||
/library/target/
|
/library/target/
|
||||||
/library/*.zip
|
/library/*.zip
|
||||||
/external
|
/external
|
||||||
/penpot-nitrate
|
|
||||||
|
clj-profiler/
|
||||||
|
node_modules
|
||||||
/test-results/
|
/test-results/
|
||||||
/playwright-report/
|
/playwright-report/
|
||||||
/blob-report/
|
/blob-report/
|
||||||
/playwright/.cache/
|
/playwright/.cache/
|
||||||
/render-wasm/target/
|
/render-wasm/target/
|
||||||
/**/node_modules
|
|
||||||
/**/.yarn/*
|
/**/.yarn/*
|
||||||
/.pnpm-store
|
|
||||||
/.vscode
|
|
||||||
|
|||||||
105
.gitpod.yml
Normal file
105
.gitpod.yml
Normal file
@ -0,0 +1,105 @@
|
|||||||
|
image:
|
||||||
|
file: docker/gitpod/Dockerfile
|
||||||
|
|
||||||
|
ports:
|
||||||
|
# nginx
|
||||||
|
- port: 3449
|
||||||
|
onOpen: open-preview
|
||||||
|
|
||||||
|
# frontend nREPL
|
||||||
|
- port: 3447
|
||||||
|
onOpen: ignore
|
||||||
|
visibility: private
|
||||||
|
|
||||||
|
# frontend shadow server
|
||||||
|
- port: 3448
|
||||||
|
onOpen: ignore
|
||||||
|
visibility: private
|
||||||
|
|
||||||
|
# backend
|
||||||
|
- port: 6060
|
||||||
|
onOpen: ignore
|
||||||
|
|
||||||
|
# exporter shadow server
|
||||||
|
- port: 9630
|
||||||
|
onOpen: ignore
|
||||||
|
visibility: private
|
||||||
|
|
||||||
|
# exporter http server
|
||||||
|
- port: 6061
|
||||||
|
onOpen: ignore
|
||||||
|
|
||||||
|
# mailhog web interface
|
||||||
|
- port: 8025
|
||||||
|
onOpen: ignore
|
||||||
|
|
||||||
|
# mailhog postfix
|
||||||
|
- port: 1025
|
||||||
|
onOpen: ignore
|
||||||
|
|
||||||
|
# postgres
|
||||||
|
- port: 5432
|
||||||
|
onOpen: ignore
|
||||||
|
|
||||||
|
# redis
|
||||||
|
- port: 6379
|
||||||
|
onOpen: ignore
|
||||||
|
|
||||||
|
# openldap
|
||||||
|
- port: 389
|
||||||
|
onOpen: ignore
|
||||||
|
|
||||||
|
tasks:
|
||||||
|
# https://github.com/gitpod-io/gitpod/issues/666#issuecomment-534347856
|
||||||
|
- name: gulp
|
||||||
|
command: >
|
||||||
|
cd $GITPOD_REPO_ROOT/frontend/;
|
||||||
|
yarn && gp sync-done 'frontend-yarn';
|
||||||
|
npx gulp --theme=${PENPOT_THEME} watch
|
||||||
|
|
||||||
|
- name: frontend shadow watch
|
||||||
|
command: >
|
||||||
|
cd $GITPOD_REPO_ROOT/frontend/;
|
||||||
|
gp sync-await 'frontend-yarn';
|
||||||
|
npx shadow-cljs watch main
|
||||||
|
|
||||||
|
- init: gp await-port 5432 && psql -f $GITPOD_REPO_ROOT/docker/gitpod/files/postgresql_init.sql
|
||||||
|
name: backend
|
||||||
|
command: >
|
||||||
|
cd $GITPOD_REPO_ROOT/backend/;
|
||||||
|
./scripts/start-dev
|
||||||
|
|
||||||
|
- name: exporter shadow watch
|
||||||
|
command:
|
||||||
|
cd $GITPOD_REPO_ROOT/exporter/;
|
||||||
|
gp sync-await 'frontend-yarn';
|
||||||
|
yarn && npx shadow-cljs watch main
|
||||||
|
|
||||||
|
- name: exporter web server
|
||||||
|
command: >
|
||||||
|
cd $GITPOD_REPO_ROOT/exporter/;
|
||||||
|
./scripts/wait-and-start.sh
|
||||||
|
|
||||||
|
- name: signed terminal
|
||||||
|
before: >
|
||||||
|
[[ ! -z ${GNUGPG} ]] &&
|
||||||
|
cd ~ &&
|
||||||
|
rm -rf .gnupg &&
|
||||||
|
echo ${GNUGPG} | base64 -d | tar --no-same-owner -xzvf -
|
||||||
|
init: >
|
||||||
|
[[ ! -z ${GNUGPG_KEY} ]] &&
|
||||||
|
git config --global commit.gpgsign true &&
|
||||||
|
git config --global user.signingkey ${GNUGPG_KEY}
|
||||||
|
command: cd $GITPOD_REPO_ROOT
|
||||||
|
|
||||||
|
- name: redis
|
||||||
|
command: redis-server
|
||||||
|
|
||||||
|
- before: go get github.com/mailhog/MailHog
|
||||||
|
name: mailhog
|
||||||
|
command: MailHog
|
||||||
|
|
||||||
|
- name: Nginx
|
||||||
|
command: >
|
||||||
|
nginx &&
|
||||||
|
multitail /var/log/nginx/access.log -I /var/log/nginx/error.log
|
||||||
@ -1,29 +0,0 @@
|
|||||||
---
|
|
||||||
name: commiter
|
|
||||||
description: Git commit assistant following CONTRIBUTING.md commit rules
|
|
||||||
mode: subagent
|
|
||||||
---
|
|
||||||
|
|
||||||
Role: You are responsible for creating git commits for Penpot and must
|
|
||||||
follow the repository commit-format rules exactly. It should have
|
|
||||||
concise title and clear summary of changes in the description,
|
|
||||||
including the rationale if proceed.
|
|
||||||
|
|
||||||
Requirements:
|
|
||||||
|
|
||||||
* Read `CONTRIBUTING.md` before creating any commit and follow the
|
|
||||||
commit guidelines strictly.
|
|
||||||
* Use commit messages in the form `:emoji: <imperative subject>`.
|
|
||||||
* Keep the subject capitalized, concise, 70 characters or fewer, and
|
|
||||||
without a trailing period.
|
|
||||||
* Keep the description (commit body) with maximum line length of 80
|
|
||||||
characters. Use manual line breaks to wrap text before it exceeds
|
|
||||||
this limit.
|
|
||||||
* Separate the subject from the body with a blank line.
|
|
||||||
* Write a clear and concise body when needed.
|
|
||||||
* Use `git commit -s` so the commit includes the required
|
|
||||||
`Signed-off-by` line.
|
|
||||||
* Do not guess or hallucinate git author information (Name or
|
|
||||||
Email). Never include the `--author` flag in git commands unless
|
|
||||||
specifically instructed by the user for a unique case; assume the
|
|
||||||
local environment is already configured.
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
---
|
|
||||||
name: Penpot Engineer
|
|
||||||
description: Senior Full-Stack Software Engineer
|
|
||||||
mode: primary
|
|
||||||
---
|
|
||||||
|
|
||||||
Role: You are a high-autonomy Senior Full-Stack Software Engineer working on
|
|
||||||
Penpot, an open-source design tool. You have full permission to navigate the
|
|
||||||
codebase, modify files, and execute commands to fulfill your tasks. Your goal is
|
|
||||||
to solve complex technical tasks with high precision while maintaining a strong
|
|
||||||
focus on maintainability and performance.
|
|
||||||
|
|
||||||
Tech stack: Clojure (backend), ClojureScript (frontend/exporter), Rust/WASM
|
|
||||||
(render-wasm), TypeScript (plugins/mcp), SCSS.
|
|
||||||
|
|
||||||
Requirements:
|
|
||||||
|
|
||||||
* Read the root `AGENTS.md` to understand the repository and application
|
|
||||||
architecture. Then read the `AGENTS.md` **only** for each affected module.
|
|
||||||
Not all modules have one — verify before reading.
|
|
||||||
* Before writing code, analyze the task in depth and describe your plan. If the
|
|
||||||
task is complex, break it down into atomic steps.
|
|
||||||
* When searching code, prefer `ripgrep` (`rg`) over `grep` — it respects
|
|
||||||
`.gitignore` by default.
|
|
||||||
* Do **not** touch unrelated modules unless the task explicitly requires it.
|
|
||||||
* Only reference functions, namespaces, or APIs that actually exist in the
|
|
||||||
codebase. Verify their existence before citing them. If unsure, search first.
|
|
||||||
* Be concise and autonomous — avoid unnecessary explanations.
|
|
||||||
* After making changes, run the applicable lint and format checks for the
|
|
||||||
affected module before considering the work done (see module `AGENTS.md` for
|
|
||||||
exact commands).
|
|
||||||
* Make small and logical commits following the commit guideline described in
|
|
||||||
`CONTRIBUTING.md`. Commit only when explicitly asked.
|
|
||||||
- Do not guess or hallucinate git author information (Name or Email). Never include the
|
|
||||||
`--author` flag in git commands unless specifically instructed by the user for a unique
|
|
||||||
case; assume the local environment is already configured. Allow git commit to
|
|
||||||
automatically pull the identity from the local git config `user.name` and `user.email`.
|
|
||||||
@ -1,61 +0,0 @@
|
|||||||
---
|
|
||||||
name: Penpot Planner
|
|
||||||
description: Software architect for planning and analysis only
|
|
||||||
mode: primary
|
|
||||||
permission:
|
|
||||||
edit: ask
|
|
||||||
---
|
|
||||||
|
|
||||||
# Penpot Planner
|
|
||||||
|
|
||||||
## Role
|
|
||||||
|
|
||||||
You are a Senior Software Architect working on Penpot, an open-source design
|
|
||||||
tool. Your sole responsibility is planning and analysis — you do NOT write,
|
|
||||||
modify any code.
|
|
||||||
|
|
||||||
You help users understand the codebase, design solutions, and create detailed
|
|
||||||
implementation plans that other agents or developers can execute. Document
|
|
||||||
everything they need to know: which files to touch for each task, code, testing,
|
|
||||||
docs they might need to check, how to test it. Give them the whole plan as
|
|
||||||
bite-sized tasks. DRY. YAGNI. TDD. Frequent commits.
|
|
||||||
|
|
||||||
Assume they are a skilled developer, but know almost nothing about our toolset
|
|
||||||
or problem domain. Assume they don't know good test design very well.
|
|
||||||
|
|
||||||
## Requirements
|
|
||||||
|
|
||||||
* Analyze the codebase architecture and identify affected modules.
|
|
||||||
* Read `AGENTS.md` files (root and per-module) to understand structure and
|
|
||||||
conventions.
|
|
||||||
* Search code using `ripgrep` skill (`rg`) to trace dependencies, find patterns,
|
|
||||||
and understand existing implementations.
|
|
||||||
* Break down complex features or bugs into atomic, actionable steps.
|
|
||||||
* Propose solutions with clear rationale, trade-offs, and sequencing.
|
|
||||||
* Identify risks, edge cases, and testing considerations.
|
|
||||||
|
|
||||||
Save plans to: plans/YYYY-MM-DD-<plan-one-line-title>.md
|
|
||||||
|
|
||||||
## Constraints
|
|
||||||
|
|
||||||
* You are **read-only** — never create, edit, or delete files.
|
|
||||||
* You do **not** run builds, tests, linters, or any commands that modify state.
|
|
||||||
* You do **not** create git commits or interact with version control.
|
|
||||||
* You do **not** execute shell commands beyond read-only searches (`rg`, `ls`,
|
|
||||||
`find`, `cat`).
|
|
||||||
* Your output is a structured plan or analysis, ready for handoff to an
|
|
||||||
engineer agent or developer.
|
|
||||||
|
|
||||||
## Output format
|
|
||||||
|
|
||||||
When producing a plan, structure it as:
|
|
||||||
|
|
||||||
1. **Context** — What is the problem or feature request?
|
|
||||||
2. **Affected modules** — Which parts of the codebase are involved?
|
|
||||||
3. **Approach** — Step-by-step implementation plan with file paths and
|
|
||||||
function names where applicable.
|
|
||||||
4. **Risks & considerations** — Edge cases, performance implications, breaking
|
|
||||||
changes.
|
|
||||||
5. **Testing strategy** — How to verify the implementation works correctly.
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,59 +0,0 @@
|
|||||||
---
|
|
||||||
name: Prompt Assistant
|
|
||||||
description: Refines and improves prompts for maximum clarity and effectiveness
|
|
||||||
mode: all
|
|
||||||
---
|
|
||||||
|
|
||||||
# Prompt Assistant
|
|
||||||
|
|
||||||
## Role
|
|
||||||
|
|
||||||
You are an expert Prompt Engineer with strong knowledge of
|
|
||||||
penpot. Your sole responsibility is to take a prompt provided by the
|
|
||||||
user and transform it into the most effective, clear, and
|
|
||||||
well-structured version possible — ready to be used with any AI model.
|
|
||||||
|
|
||||||
## Requirements
|
|
||||||
|
|
||||||
* You do NOT execute tasks. You do NOT write code. You only design and
|
|
||||||
refine prompts
|
|
||||||
* Read the root `AGENTS.md` to understand the repository and application
|
|
||||||
architecture. Then read the `AGENTS.md` **only** for each affected module.
|
|
||||||
* Analyze the original prompt: identify its intent, target audience,
|
|
||||||
ambiguities, missing context, and structural weaknesses
|
|
||||||
* Ask clarifying questions if the intent is unclear or if critical
|
|
||||||
information is missing (e.g. target model, expected output format,
|
|
||||||
tone, constraints). Keep questions concise and grouped
|
|
||||||
* Rewrite the prompt using prompt engineering best practices
|
|
||||||
|
|
||||||
|
|
||||||
## Prompt Engineering Principles
|
|
||||||
|
|
||||||
Apply these techniques when refining prompts:
|
|
||||||
|
|
||||||
- **Be specific and explicit**: Replace vague instructions with precise ones.
|
|
||||||
- **Set the context**: Include background information the model needs to
|
|
||||||
perform well.
|
|
||||||
- **Specify the output format**: State the desired structure, length, tone,
|
|
||||||
or format (e.g. bullet list, JSON, step-by-step).
|
|
||||||
- **Add constraints**: Include what the model should avoid or not do.
|
|
||||||
- **Use examples** (few-shot): When applicable, suggest adding examples to
|
|
||||||
anchor the model's behaviour.
|
|
||||||
- **Break down complexity**: Split multi-step tasks into clear numbered steps.
|
|
||||||
- **Avoid ambiguity**: Remove pronouns and references that could be
|
|
||||||
misinterpreted.
|
|
||||||
- **Chain of thought**: For reasoning tasks, include "Think step by step."
|
|
||||||
|
|
||||||
## Constraints
|
|
||||||
|
|
||||||
- Do NOT execute the prompt yourself.
|
|
||||||
- Do NOT answer the question inside the prompt.
|
|
||||||
- Do NOT add unnecessary verbosity — prompts should be as short as they can
|
|
||||||
be while remaining complete.
|
|
||||||
- Always preserve the user's original intent.
|
|
||||||
|
|
||||||
## Output
|
|
||||||
|
|
||||||
Refined Prompt: The improved, ready-to-use prompt. Print it for
|
|
||||||
immediate use and save it to
|
|
||||||
prompts/YYYY-MM-DD-<prompt-one-line-title>.md for future use.
|
|
||||||
@ -1,210 +0,0 @@
|
|||||||
---
|
|
||||||
name: bat-cat
|
|
||||||
description: A cat clone with syntax highlighting, line numbers, and Git integration - a modern replacement for cat.
|
|
||||||
homepage: https://github.com/sharkdp/bat
|
|
||||||
metadata: {"clawdbot":{"emoji":"🦇","requires":{"bins":["bat"]},"install":[{"id":"brew","kind":"brew","formula":"bat","bins":["bat"],"label":"Install bat (brew)"},{"id":"apt","kind":"apt","package":"bat","bins":["bat"],"label":"Install bat (apt)"}]}}
|
|
||||||
---
|
|
||||||
|
|
||||||
# bat - Better cat
|
|
||||||
|
|
||||||
`cat` with syntax highlighting, line numbers, and Git integration.
|
|
||||||
|
|
||||||
## Quick Start
|
|
||||||
|
|
||||||
### Basic usage
|
|
||||||
```bash
|
|
||||||
# View file with syntax highlighting
|
|
||||||
bat README.md
|
|
||||||
|
|
||||||
# Multiple files
|
|
||||||
bat file1.js file2.py
|
|
||||||
|
|
||||||
# With line numbers (default)
|
|
||||||
bat script.sh
|
|
||||||
|
|
||||||
# Without line numbers
|
|
||||||
bat -p script.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
### Viewing modes
|
|
||||||
```bash
|
|
||||||
# Plain mode (like cat)
|
|
||||||
bat -p file.txt
|
|
||||||
|
|
||||||
# Show non-printable characters
|
|
||||||
bat -A file.txt
|
|
||||||
|
|
||||||
# Squeeze blank lines
|
|
||||||
bat -s file.txt
|
|
||||||
|
|
||||||
# Paging (auto for large files)
|
|
||||||
bat --paging=always file.txt
|
|
||||||
bat --paging=never file.txt
|
|
||||||
```
|
|
||||||
|
|
||||||
## Syntax Highlighting
|
|
||||||
|
|
||||||
### Language detection
|
|
||||||
```bash
|
|
||||||
# Auto-detect from extension
|
|
||||||
bat script.py
|
|
||||||
|
|
||||||
# Force specific language
|
|
||||||
bat -l javascript config.txt
|
|
||||||
|
|
||||||
# Show all languages
|
|
||||||
bat --list-languages
|
|
||||||
```
|
|
||||||
|
|
||||||
### Themes
|
|
||||||
```bash
|
|
||||||
# List available themes
|
|
||||||
bat --list-themes
|
|
||||||
|
|
||||||
# Use specific theme
|
|
||||||
bat --theme="Monokai Extended" file.py
|
|
||||||
|
|
||||||
# Set default theme in config
|
|
||||||
# ~/.config/bat/config: --theme="Dracula"
|
|
||||||
```
|
|
||||||
|
|
||||||
## Line Ranges
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Show specific lines
|
|
||||||
bat -r 10:20 file.txt
|
|
||||||
|
|
||||||
# From line to end
|
|
||||||
bat -r 100: file.txt
|
|
||||||
|
|
||||||
# Start to specific line
|
|
||||||
bat -r :50 file.txt
|
|
||||||
|
|
||||||
# Multiple ranges
|
|
||||||
bat -r 1:10 -r 50:60 file.txt
|
|
||||||
```
|
|
||||||
|
|
||||||
## Git Integration
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Show Git modifications (added/removed/modified lines)
|
|
||||||
bat --diff file.txt
|
|
||||||
|
|
||||||
# Show decorations (Git + file header)
|
|
||||||
bat --decorations=always file.txt
|
|
||||||
```
|
|
||||||
|
|
||||||
## Output Control
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Output raw (no styling)
|
|
||||||
bat --style=plain file.txt
|
|
||||||
|
|
||||||
# Customize style
|
|
||||||
bat --style=numbers,changes file.txt
|
|
||||||
|
|
||||||
# Available styles: auto, full, plain, changes, header, grid, numbers, snip
|
|
||||||
bat --style=header,grid,numbers file.txt
|
|
||||||
```
|
|
||||||
|
|
||||||
## Common Use Cases
|
|
||||||
|
|
||||||
**Quick file preview:**
|
|
||||||
```bash
|
|
||||||
bat file.json
|
|
||||||
```
|
|
||||||
|
|
||||||
**View logs with syntax highlighting:**
|
|
||||||
```bash
|
|
||||||
bat error.log
|
|
||||||
```
|
|
||||||
|
|
||||||
**Compare files visually:**
|
|
||||||
```bash
|
|
||||||
bat --diff file1.txt
|
|
||||||
bat file2.txt
|
|
||||||
```
|
|
||||||
|
|
||||||
**Preview before editing:**
|
|
||||||
```bash
|
|
||||||
bat config.yaml && vim config.yaml
|
|
||||||
```
|
|
||||||
|
|
||||||
**Cat replacement in pipes:**
|
|
||||||
```bash
|
|
||||||
bat -p file.txt | grep "pattern"
|
|
||||||
```
|
|
||||||
|
|
||||||
**View specific function:**
|
|
||||||
```bash
|
|
||||||
bat -r 45:67 script.py # If function is on lines 45-67
|
|
||||||
```
|
|
||||||
|
|
||||||
## Integration with other tools
|
|
||||||
|
|
||||||
**As pager for man pages:**
|
|
||||||
```bash
|
|
||||||
export MANPAGER="sh -c 'col -bx | bat -l man -p'"
|
|
||||||
man grep
|
|
||||||
```
|
|
||||||
|
|
||||||
**With ripgrep:**
|
|
||||||
```bash
|
|
||||||
rg "pattern" -l | xargs bat
|
|
||||||
```
|
|
||||||
|
|
||||||
**With fzf:**
|
|
||||||
```bash
|
|
||||||
fzf --preview 'bat --color=always --style=numbers {}'
|
|
||||||
```
|
|
||||||
|
|
||||||
**With diff:**
|
|
||||||
```bash
|
|
||||||
diff -u file1 file2 | bat -l diff
|
|
||||||
```
|
|
||||||
|
|
||||||
## Configuration
|
|
||||||
|
|
||||||
Create `~/.config/bat/config` for defaults:
|
|
||||||
|
|
||||||
```
|
|
||||||
# Set theme
|
|
||||||
--theme="Dracula"
|
|
||||||
|
|
||||||
# Show line numbers, Git modifications and file header, but no grid
|
|
||||||
--style="numbers,changes,header"
|
|
||||||
|
|
||||||
# Use italic text on terminal
|
|
||||||
--italic-text=always
|
|
||||||
|
|
||||||
# Add custom mapping
|
|
||||||
--map-syntax "*.conf:INI"
|
|
||||||
```
|
|
||||||
|
|
||||||
## Performance Tips
|
|
||||||
|
|
||||||
- Use `-p` for plain mode when piping
|
|
||||||
- Use `--paging=never` when output is used programmatically
|
|
||||||
- `bat` caches parsed files for faster subsequent access
|
|
||||||
|
|
||||||
## Tips
|
|
||||||
|
|
||||||
- **Alias:** `alias cat='bat -p'` for drop-in cat replacement
|
|
||||||
- **Pager:** Use as pager with `export PAGER="bat"`
|
|
||||||
- **On Debian/Ubuntu:** Command may be `batcat` instead of `bat`
|
|
||||||
- **Custom syntaxes:** Add to `~/.config/bat/syntaxes/`
|
|
||||||
- **Performance:** For huge files, use `bat --paging=never` or plain `cat`
|
|
||||||
|
|
||||||
## Common flags
|
|
||||||
|
|
||||||
- `-p` / `--plain`: Plain mode (no line numbers/decorations)
|
|
||||||
- `-n` / `--number`: Only show line numbers
|
|
||||||
- `-A` / `--show-all`: Show non-printable characters
|
|
||||||
- `-l` / `--language`: Set language for syntax highlighting
|
|
||||||
- `-r` / `--line-range`: Only show specific line range(s)
|
|
||||||
|
|
||||||
## Documentation
|
|
||||||
|
|
||||||
GitHub: https://github.com/sharkdp/bat
|
|
||||||
Man page: `man bat`
|
|
||||||
Customization: https://github.com/sharkdp/bat#customization
|
|
||||||
@ -1,194 +0,0 @@
|
|||||||
---
|
|
||||||
name: fd-find
|
|
||||||
description: A fast and user-friendly alternative to 'find' - simple syntax, smart defaults, respects gitignore.
|
|
||||||
homepage: https://github.com/sharkdp/fd
|
|
||||||
metadata: {"clawdbot":{"emoji":"📂","requires":{"bins":["fd"]},"install":[{"id":"brew","kind":"brew","formula":"fd","bins":["fd"],"label":"Install fd (brew)"},{"id":"apt","kind":"apt","package":"fd-find","bins":["fd"],"label":"Install fd (apt)"}]}}
|
|
||||||
---
|
|
||||||
|
|
||||||
# fd - Fast File Finder
|
|
||||||
|
|
||||||
User-friendly alternative to `find` with smart defaults.
|
|
||||||
|
|
||||||
## Quick Start
|
|
||||||
|
|
||||||
### Basic search
|
|
||||||
```bash
|
|
||||||
# Find files by name
|
|
||||||
fd pattern
|
|
||||||
|
|
||||||
# Find in specific directory
|
|
||||||
fd pattern /path/to/dir
|
|
||||||
|
|
||||||
# Case-insensitive
|
|
||||||
fd -i pattern
|
|
||||||
```
|
|
||||||
|
|
||||||
### Common patterns
|
|
||||||
```bash
|
|
||||||
# Find all Python files
|
|
||||||
fd -e py
|
|
||||||
|
|
||||||
# Find multiple extensions
|
|
||||||
fd -e py -e js -e ts
|
|
||||||
|
|
||||||
# Find directories only
|
|
||||||
fd -t d pattern
|
|
||||||
|
|
||||||
# Find files only
|
|
||||||
fd -t f pattern
|
|
||||||
|
|
||||||
# Find symlinks
|
|
||||||
fd -t l
|
|
||||||
```
|
|
||||||
|
|
||||||
## Advanced Usage
|
|
||||||
|
|
||||||
### Filtering
|
|
||||||
```bash
|
|
||||||
# Exclude patterns
|
|
||||||
fd pattern -E "node_modules" -E "*.min.js"
|
|
||||||
|
|
||||||
# Include hidden files
|
|
||||||
fd -H pattern
|
|
||||||
|
|
||||||
# Include ignored files (.gitignore)
|
|
||||||
fd -I pattern
|
|
||||||
|
|
||||||
# Search all (hidden + ignored)
|
|
||||||
fd -H -I pattern
|
|
||||||
|
|
||||||
# Maximum depth
|
|
||||||
fd pattern -d 3
|
|
||||||
```
|
|
||||||
|
|
||||||
### Execution
|
|
||||||
```bash
|
|
||||||
# Execute command on results
|
|
||||||
fd -e jpg -x convert {} {.}.png
|
|
||||||
|
|
||||||
# Parallel execution
|
|
||||||
fd -e md -x wc -l
|
|
||||||
|
|
||||||
# Use with xargs
|
|
||||||
fd -e log -0 | xargs -0 rm
|
|
||||||
```
|
|
||||||
|
|
||||||
### Regex patterns
|
|
||||||
```bash
|
|
||||||
# Full regex search
|
|
||||||
fd '^test.*\.js$'
|
|
||||||
|
|
||||||
# Match full path
|
|
||||||
fd --full-path 'src/.*/test'
|
|
||||||
|
|
||||||
# Glob pattern
|
|
||||||
fd -g "*.{js,ts}"
|
|
||||||
```
|
|
||||||
|
|
||||||
## Time-based filtering
|
|
||||||
```bash
|
|
||||||
# Modified within last day
|
|
||||||
fd --changed-within 1d
|
|
||||||
|
|
||||||
# Modified before specific date
|
|
||||||
fd --changed-before 2024-01-01
|
|
||||||
|
|
||||||
# Created recently
|
|
||||||
fd --changed-within 1h
|
|
||||||
```
|
|
||||||
|
|
||||||
## Size filtering
|
|
||||||
```bash
|
|
||||||
# Files larger than 10MB
|
|
||||||
fd --size +10m
|
|
||||||
|
|
||||||
# Files smaller than 1KB
|
|
||||||
fd --size -1k
|
|
||||||
|
|
||||||
# Specific size range
|
|
||||||
fd --size +100k --size -10m
|
|
||||||
```
|
|
||||||
|
|
||||||
## Output formatting
|
|
||||||
```bash
|
|
||||||
# Absolute paths
|
|
||||||
fd --absolute-path
|
|
||||||
|
|
||||||
# List format (like ls -l)
|
|
||||||
fd --list-details
|
|
||||||
|
|
||||||
# Null separator (for xargs)
|
|
||||||
fd -0 pattern
|
|
||||||
|
|
||||||
# Color always/never/auto
|
|
||||||
fd --color always pattern
|
|
||||||
```
|
|
||||||
|
|
||||||
## Common Use Cases
|
|
||||||
|
|
||||||
**Find and delete old files:**
|
|
||||||
```bash
|
|
||||||
fd --changed-before 30d -t f -x rm {}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Find large files:**
|
|
||||||
```bash
|
|
||||||
fd --size +100m --list-details
|
|
||||||
```
|
|
||||||
|
|
||||||
**Copy all PDFs to directory:**
|
|
||||||
```bash
|
|
||||||
fd -e pdf -x cp {} /target/dir/
|
|
||||||
```
|
|
||||||
|
|
||||||
**Count lines in all Python files:**
|
|
||||||
```bash
|
|
||||||
fd -e py -x wc -l | awk '{sum+=$1} END {print sum}'
|
|
||||||
```
|
|
||||||
|
|
||||||
**Find broken symlinks:**
|
|
||||||
```bash
|
|
||||||
fd -t l -x test -e {} \; -print
|
|
||||||
```
|
|
||||||
|
|
||||||
**Search in specific time window:**
|
|
||||||
```bash
|
|
||||||
fd --changed-within 2d --changed-before 1d
|
|
||||||
```
|
|
||||||
|
|
||||||
## Integration with other tools
|
|
||||||
|
|
||||||
**With ripgrep:**
|
|
||||||
```bash
|
|
||||||
fd -e js | xargs rg "pattern"
|
|
||||||
```
|
|
||||||
|
|
||||||
**With fzf (fuzzy finder):**
|
|
||||||
```bash
|
|
||||||
vim $(fd -t f | fzf)
|
|
||||||
```
|
|
||||||
|
|
||||||
**With bat (cat alternative):**
|
|
||||||
```bash
|
|
||||||
fd -e md | xargs bat
|
|
||||||
```
|
|
||||||
|
|
||||||
## Performance Tips
|
|
||||||
|
|
||||||
- `fd` is typically much faster than `find`
|
|
||||||
- Respects `.gitignore` by default (disable with `-I`)
|
|
||||||
- Uses parallel traversal automatically
|
|
||||||
- Smart case: lowercase = case-insensitive, any uppercase = case-sensitive
|
|
||||||
|
|
||||||
## Tips
|
|
||||||
|
|
||||||
- Use `-t` for type filtering (f=file, d=directory, l=symlink, x=executable)
|
|
||||||
- `-e` for extension is simpler than `-g "*.ext"`
|
|
||||||
- `{}` in `-x` commands represents the found path
|
|
||||||
- `{.}` strips the extension
|
|
||||||
- `{/}` gets basename, `{//}` gets directory
|
|
||||||
|
|
||||||
## Documentation
|
|
||||||
|
|
||||||
GitHub: https://github.com/sharkdp/fd
|
|
||||||
Man page: `man fd`
|
|
||||||
@ -1,112 +0,0 @@
|
|||||||
---
|
|
||||||
name: jq-json-processor
|
|
||||||
description: Process, filter, and transform JSON data using jq - the lightweight and flexible command-line JSON processor.
|
|
||||||
homepage: https://jqlang.github.io/jq/
|
|
||||||
metadata: {"clawdbot":{"emoji":"🔍","requires":{"bins":["jq"]},"install":[{"id":"brew","kind":"brew","formula":"jq","bins":["jq"],"label":"Install jq (brew)"},{"id":"apt","kind":"apt","package":"jq","bins":["jq"],"label":"Install jq (apt)"}]}}
|
|
||||||
---
|
|
||||||
|
|
||||||
# jq JSON Processor
|
|
||||||
|
|
||||||
Process, filter, and transform JSON data with jq.
|
|
||||||
|
|
||||||
## Quick Examples
|
|
||||||
|
|
||||||
### Basic filtering
|
|
||||||
```bash
|
|
||||||
# Extract a field
|
|
||||||
echo '{"name":"Alice","age":30}' | jq '.name'
|
|
||||||
# Output: "Alice"
|
|
||||||
|
|
||||||
# Multiple fields
|
|
||||||
echo '{"name":"Alice","age":30}' | jq '{name: .name, age: .age}'
|
|
||||||
|
|
||||||
# Array indexing
|
|
||||||
echo '[1,2,3,4,5]' | jq '.[2]'
|
|
||||||
# Output: 3
|
|
||||||
```
|
|
||||||
|
|
||||||
### Working with arrays
|
|
||||||
```bash
|
|
||||||
# Map over array
|
|
||||||
echo '[{"name":"Alice"},{"name":"Bob"}]' | jq '.[].name'
|
|
||||||
# Output: "Alice" "Bob"
|
|
||||||
|
|
||||||
# Filter array
|
|
||||||
echo '[1,2,3,4,5]' | jq 'map(select(. > 2))'
|
|
||||||
# Output: [3,4,5]
|
|
||||||
|
|
||||||
# Length
|
|
||||||
echo '[1,2,3]' | jq 'length'
|
|
||||||
# Output: 3
|
|
||||||
```
|
|
||||||
|
|
||||||
### Common operations
|
|
||||||
```bash
|
|
||||||
# Pretty print JSON
|
|
||||||
cat file.json | jq '.'
|
|
||||||
|
|
||||||
# Compact output
|
|
||||||
cat file.json | jq -c '.'
|
|
||||||
|
|
||||||
# Raw output (no quotes)
|
|
||||||
echo '{"name":"Alice"}' | jq -r '.name'
|
|
||||||
# Output: Alice
|
|
||||||
|
|
||||||
# Sort keys
|
|
||||||
echo '{"z":1,"a":2}' | jq -S '.'
|
|
||||||
```
|
|
||||||
|
|
||||||
### Advanced filtering
|
|
||||||
```bash
|
|
||||||
# Select with conditions
|
|
||||||
jq '[.[] | select(.age > 25)]' people.json
|
|
||||||
|
|
||||||
# Group by
|
|
||||||
jq 'group_by(.category)' items.json
|
|
||||||
|
|
||||||
# Reduce
|
|
||||||
echo '[1,2,3,4,5]' | jq 'reduce .[] as $item (0; . + $item)'
|
|
||||||
# Output: 15
|
|
||||||
```
|
|
||||||
|
|
||||||
### Working with files
|
|
||||||
```bash
|
|
||||||
# Read from file
|
|
||||||
jq '.users[0].name' users.json
|
|
||||||
|
|
||||||
# Multiple files
|
|
||||||
jq -s '.[0] * .[1]' file1.json file2.json
|
|
||||||
|
|
||||||
# Modify and save
|
|
||||||
jq '.version = "2.0"' package.json > package.json.tmp && mv package.json.tmp package.json
|
|
||||||
```
|
|
||||||
|
|
||||||
## Common Use Cases
|
|
||||||
|
|
||||||
**Extract specific fields from API response:**
|
|
||||||
```bash
|
|
||||||
curl -s https://api.github.com/users/octocat | jq '{name: .name, repos: .public_repos, followers: .followers}'
|
|
||||||
```
|
|
||||||
|
|
||||||
**Convert CSV-like data:**
|
|
||||||
```bash
|
|
||||||
jq -r '.[] | [.name, .email, .age] | @csv' users.json
|
|
||||||
```
|
|
||||||
|
|
||||||
**Debug API responses:**
|
|
||||||
```bash
|
|
||||||
curl -s https://api.example.com/data | jq '.'
|
|
||||||
```
|
|
||||||
|
|
||||||
## Tips
|
|
||||||
|
|
||||||
- Use `-r` for raw string output (removes quotes)
|
|
||||||
- Use `-c` for compact output (single line)
|
|
||||||
- Use `-S` to sort object keys
|
|
||||||
- Use `--arg name value` to pass variables
|
|
||||||
- Pipe multiple jq operations: `jq '.a' | jq '.b'`
|
|
||||||
|
|
||||||
## Documentation
|
|
||||||
|
|
||||||
Full manual: https://jqlang.github.io/jq/manual/
|
|
||||||
Interactive tutorial: https://jqplay.org/
|
|
||||||
@ -1,150 +0,0 @@
|
|||||||
---
|
|
||||||
name: ripgrep
|
|
||||||
description: Blazingly fast text search tool - recursively searches directories for regex patterns with respect to gitignore rules.
|
|
||||||
homepage: https://github.com/BurntSushi/ripgrep
|
|
||||||
metadata: {"clawdbot":{"emoji":"🔎","requires":{"bins":["rg"]},"install":[{"id":"brew","kind":"brew","formula":"ripgrep","bins":["rg"],"label":"Install ripgrep (brew)"},{"id":"apt","kind":"apt","package":"ripgrep","bins":["rg"],"label":"Install ripgrep (apt)"}]}}
|
|
||||||
---
|
|
||||||
|
|
||||||
# ripgrep (rg)
|
|
||||||
|
|
||||||
Fast, smart recursive search. Respects `.gitignore` by default.
|
|
||||||
|
|
||||||
## Quick Start
|
|
||||||
|
|
||||||
### Basic search
|
|
||||||
```bash
|
|
||||||
# Search for "TODO" in current directory
|
|
||||||
rg "TODO"
|
|
||||||
|
|
||||||
# Case-insensitive search
|
|
||||||
rg -i "fixme"
|
|
||||||
|
|
||||||
# Search specific file types
|
|
||||||
rg "error" -t py # Python files only
|
|
||||||
rg "function" -t js # JavaScript files
|
|
||||||
```
|
|
||||||
|
|
||||||
### Common patterns
|
|
||||||
```bash
|
|
||||||
# Whole word match
|
|
||||||
rg -w "test"
|
|
||||||
|
|
||||||
# Show only filenames
|
|
||||||
rg -l "pattern"
|
|
||||||
|
|
||||||
# Show with context (3 lines before/after)
|
|
||||||
rg -C 3 "function"
|
|
||||||
|
|
||||||
# Count matches
|
|
||||||
rg -c "import"
|
|
||||||
```
|
|
||||||
|
|
||||||
## Advanced Usage
|
|
||||||
|
|
||||||
### File type filtering
|
|
||||||
```bash
|
|
||||||
# Multiple file types
|
|
||||||
rg "error" -t py -t js
|
|
||||||
|
|
||||||
# Exclude file types
|
|
||||||
rg "TODO" -T md -T txt
|
|
||||||
|
|
||||||
# List available types
|
|
||||||
rg --type-list
|
|
||||||
```
|
|
||||||
|
|
||||||
### Search modifiers
|
|
||||||
```bash
|
|
||||||
# Regex search
|
|
||||||
rg "user_\d+"
|
|
||||||
|
|
||||||
# Fixed string (no regex)
|
|
||||||
rg -F "function()"
|
|
||||||
|
|
||||||
# Multiline search
|
|
||||||
rg -U "start.*end"
|
|
||||||
|
|
||||||
# Only show matches, not lines
|
|
||||||
rg -o "https?://[^\s]+"
|
|
||||||
```
|
|
||||||
|
|
||||||
### Path filtering
|
|
||||||
```bash
|
|
||||||
# Search specific directory
|
|
||||||
rg "pattern" src/
|
|
||||||
|
|
||||||
# Glob patterns
|
|
||||||
rg "error" -g "*.log"
|
|
||||||
rg "test" -g "!*.min.js"
|
|
||||||
|
|
||||||
# Include hidden files
|
|
||||||
rg "secret" --hidden
|
|
||||||
|
|
||||||
# Search all files (ignore .gitignore)
|
|
||||||
rg "pattern" --no-ignore
|
|
||||||
```
|
|
||||||
|
|
||||||
## Replacement Operations
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Preview replacements
|
|
||||||
rg "old_name" --replace "new_name"
|
|
||||||
|
|
||||||
# Actually replace (requires extra tool like sd)
|
|
||||||
rg "old_name" -l | xargs sed -i 's/old_name/new_name/g'
|
|
||||||
```
|
|
||||||
|
|
||||||
## Performance Tips
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Parallel search (auto by default)
|
|
||||||
rg "pattern" -j 8
|
|
||||||
|
|
||||||
# Skip large files
|
|
||||||
rg "pattern" --max-filesize 10M
|
|
||||||
|
|
||||||
# Memory map files
|
|
||||||
rg "pattern" --mmap
|
|
||||||
```
|
|
||||||
|
|
||||||
## Common Use Cases
|
|
||||||
|
|
||||||
**Find TODOs in code:**
|
|
||||||
```bash
|
|
||||||
rg "TODO|FIXME|HACK" --type-add 'code:*.{rs,go,py,js,ts}' -t code
|
|
||||||
```
|
|
||||||
|
|
||||||
**Search in specific branches:**
|
|
||||||
```bash
|
|
||||||
git show branch:file | rg "pattern"
|
|
||||||
```
|
|
||||||
|
|
||||||
**Find files containing multiple patterns:**
|
|
||||||
```bash
|
|
||||||
rg "pattern1" | rg "pattern2"
|
|
||||||
```
|
|
||||||
|
|
||||||
**Search with context and color:**
|
|
||||||
```bash
|
|
||||||
rg -C 2 --color always "error" | less -R
|
|
||||||
```
|
|
||||||
|
|
||||||
## Comparison to grep
|
|
||||||
|
|
||||||
- **Faster:** Typically 5-10x faster than grep
|
|
||||||
- **Smarter:** Respects `.gitignore`, skips binary files
|
|
||||||
- **Better defaults:** Recursive, colored output, line numbers
|
|
||||||
- **Easier:** Simpler syntax for common tasks
|
|
||||||
|
|
||||||
## Tips
|
|
||||||
|
|
||||||
- `rg` is often faster than `grep -r`
|
|
||||||
- Use `-t` for file type filtering instead of `--include`
|
|
||||||
- Combine with other tools: `rg pattern -l | xargs tool`
|
|
||||||
- Add custom types in `~/.ripgreprc`
|
|
||||||
- Use `--stats` to see search performance
|
|
||||||
|
|
||||||
## Documentation
|
|
||||||
|
|
||||||
GitHub: https://github.com/BurntSushi/ripgrep
|
|
||||||
User Guide: https://github.com/BurntSushi/ripgrep/blob/master/GUIDE.md
|
|
||||||
40
.travis.yml
Normal file
40
.travis.yml
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
dist: xenial
|
||||||
|
|
||||||
|
language: generic
|
||||||
|
sudo: required
|
||||||
|
|
||||||
|
cache:
|
||||||
|
directories:
|
||||||
|
- $HOME/.m2
|
||||||
|
|
||||||
|
services:
|
||||||
|
- docker
|
||||||
|
|
||||||
|
branches:
|
||||||
|
only:
|
||||||
|
- master
|
||||||
|
- develop
|
||||||
|
|
||||||
|
install:
|
||||||
|
- curl -O https://download.clojure.org/install/linux-install-1.10.1.447.sh
|
||||||
|
- chmod +x linux-install-1.10.1.447.sh
|
||||||
|
- sudo ./linux-install-1.10.1.447.sh
|
||||||
|
|
||||||
|
before_script:
|
||||||
|
- env | sort
|
||||||
|
|
||||||
|
script:
|
||||||
|
- ./manage.sh build-devenv
|
||||||
|
- ./manage.sh run-frontend-tests
|
||||||
|
- ./manage.sh run-backend-tests
|
||||||
|
- ./manage.sh build-images
|
||||||
|
- ./manage.sh run
|
||||||
|
|
||||||
|
after_script:
|
||||||
|
- docker images
|
||||||
|
|
||||||
|
notifications:
|
||||||
|
email: false
|
||||||
|
|
||||||
|
env:
|
||||||
|
- NODE_VERSION=10.16.0
|
||||||
9
.vscode/settings.json
vendored
Normal file
9
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"files.exclude": {
|
||||||
|
"**/.clj-kondo": true,
|
||||||
|
"**/.cpcache": true,
|
||||||
|
"**/.lsp": true,
|
||||||
|
"**/.shadow-cljs": true,
|
||||||
|
"**/node_modules": true
|
||||||
|
}
|
||||||
|
}
|
||||||
11
.yarnrc.yml
Normal file
11
.yarnrc.yml
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
enableGlobalCache: true
|
||||||
|
|
||||||
|
enableImmutableCache: false
|
||||||
|
|
||||||
|
enableImmutableInstalls: false
|
||||||
|
|
||||||
|
enableTelemetry: false
|
||||||
|
|
||||||
|
httpTimeout: 600000
|
||||||
|
|
||||||
|
nodeLinker: node-modules
|
||||||
93
AGENTS.md
93
AGENTS.md
@ -1,93 +0,0 @@
|
|||||||
# AI Agent Guide
|
|
||||||
|
|
||||||
This document provides the core context and operating guidelines for AI agents
|
|
||||||
working in this repository.
|
|
||||||
|
|
||||||
## Before You Start
|
|
||||||
|
|
||||||
Before responding to any user request, you must:
|
|
||||||
|
|
||||||
1. Read this file completely.
|
|
||||||
2. Identify which modules are affected by the task.
|
|
||||||
3. Load the `AGENTS.md` file **only** for each affected module (see the
|
|
||||||
architecture table below). Not all modules have an `AGENTS.md` — verify the
|
|
||||||
file exists before attempting to read it.
|
|
||||||
4. Do **not** load `AGENTS.md` files for unrelated modules.
|
|
||||||
|
|
||||||
## Role: Senior Software Engineer
|
|
||||||
|
|
||||||
You are a high-autonomy Senior Full-Stack Software Engineer. You have full
|
|
||||||
permission to navigate the codebase, modify files, and execute commands to
|
|
||||||
fulfill your tasks. Your goal is to solve complex technical tasks with high
|
|
||||||
precision while maintaining a strong focus on maintainability and performance.
|
|
||||||
|
|
||||||
### Operational Guidelines
|
|
||||||
|
|
||||||
1. Before writing code, describe your plan. If the task is complex, break it
|
|
||||||
down into atomic steps.
|
|
||||||
2. Be concise and autonomous.
|
|
||||||
3. Do **not** touch unrelated modules unless the task explicitly requires it.
|
|
||||||
4. Commit only when explicitly asked. Follow the commit format rules in
|
|
||||||
`CONTRIBUTING.md`.
|
|
||||||
5. When searching code, prefer `ripgrep` (`rg`) over `grep` — it respects
|
|
||||||
`.gitignore` by default.
|
|
||||||
|
|
||||||
## GitHub Operations
|
|
||||||
|
|
||||||
To obtain the list of repository members/collaborators:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
gh api repos/:owner/:repo/collaborators --paginate --jq '.[].login'
|
|
||||||
```
|
|
||||||
|
|
||||||
To obtain the list of open PRs authored by members:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
MEMBERS=$(gh api repos/:owner/:repo/collaborators --paginate --jq '.[].login' | tr '\n' '|' | sed 's/|$//')
|
|
||||||
gh pr list --state open --limit 200 --json author,title,number | jq -r --arg members "$MEMBERS" '
|
|
||||||
($members | split("|")) as $m |
|
|
||||||
.[] | select(.author.login as $a | $m | index($a)) |
|
|
||||||
"\(.number)\t\(.author.login)\t\(.title)"
|
|
||||||
'
|
|
||||||
```
|
|
||||||
|
|
||||||
To obtain the list of open PRs from external contributors (non-members):
|
|
||||||
|
|
||||||
```bash
|
|
||||||
MEMBERS=$(gh api repos/:owner/:repo/collaborators --paginate --jq '.[].login' | tr '\n' '|' | sed 's/|$//')
|
|
||||||
gh pr list --state open --limit 200 --json author,title,number | jq -r --arg members "$MEMBERS" '
|
|
||||||
($members | split("|")) as $m |
|
|
||||||
.[] | select(.author.login as $a | $m | index($a) | not) |
|
|
||||||
"\(.number)\t\(.author.login)\t\(.title)"
|
|
||||||
'
|
|
||||||
```
|
|
||||||
|
|
||||||
## Architecture Overview
|
|
||||||
|
|
||||||
Penpot is an open-source design tool composed of several modules:
|
|
||||||
|
|
||||||
| Directory | Language | Purpose | Has `AGENTS.md` |
|
|
||||||
|-----------|----------|---------|:----------------:|
|
|
||||||
| `frontend/` | ClojureScript + SCSS | Single-page React app (design editor) | Yes |
|
|
||||||
| `backend/` | Clojure (JVM) | HTTP/RPC server, PostgreSQL, Redis | Yes |
|
|
||||||
| `common/` | Cljc (shared Clojure/ClojureScript) | Data types, geometry, schemas, utilities | Yes |
|
|
||||||
| `render-wasm/` | Rust -> WebAssembly | High-performance canvas renderer (Skia) | Yes |
|
|
||||||
| `exporter/` | ClojureScript (Node.js) | Headless Playwright-based export (SVG/PDF) | No |
|
|
||||||
| `mcp/` | TypeScript | Model Context Protocol integration | No |
|
|
||||||
| `plugins/` | TypeScript | Plugin runtime and example plugins | No |
|
|
||||||
|
|
||||||
Some submodules use `pnpm` workspaces. The root `package.json` and
|
|
||||||
`pnpm-lock.yaml` manage shared dependencies. Helper scripts live in `scripts/`.
|
|
||||||
|
|
||||||
### Module Dependency Graph
|
|
||||||
|
|
||||||
```
|
|
||||||
frontend ──> common
|
|
||||||
backend ──> common
|
|
||||||
exporter ──> common
|
|
||||||
frontend ──> render-wasm (loads compiled WASM)
|
|
||||||
```
|
|
||||||
|
|
||||||
`common` is referenced as a local dependency (`{:local/root "../common"}`) by
|
|
||||||
both `frontend` and `backend`. Changes to `common` can therefore affect multiple
|
|
||||||
modules — test across consumers when modifying shared code.
|
|
||||||
427
CHANGES.md
427
CHANGES.md
@ -1,431 +1,5 @@
|
|||||||
# CHANGELOG
|
# CHANGELOG
|
||||||
|
|
||||||
## 2.17.0 (Unreleased)
|
|
||||||
|
|
||||||
### :boom: Breaking changes & Deprecations
|
|
||||||
|
|
||||||
### :rocket: Epics and highlights
|
|
||||||
|
|
||||||
### :sparkles: New features & Enhancements
|
|
||||||
|
|
||||||
- Add `Alt+click` on a layer's disclosure arrow to recursively expand the entire subtree rooted at that layer in the Layers sidebar; symmetric with the existing `Shift+click` collapse-all gesture, and removes the O(siblings × depth) click cost of unfolding a deep subtree one level at a time [Github #7736](https://github.com/penpot/penpot/issues/7736)
|
|
||||||
- Show alpha percentage next to library color values to distinguish colors that differ only in opacity (by @rockchris099) [Github #6328](https://github.com/penpot/penpot/issues/6328)
|
|
||||||
- Add "Clear artboard guides" option to right-click context menu for frames (by @eureka0928) [Github #6987](https://github.com/penpot/penpot/issues/6987)
|
|
||||||
- Add loader feedback while importing and exporting files [Github #9020](https://github.com/penpot/penpot/issues/9020)
|
|
||||||
- Allow duplicating color and typography styles (by @MkDev11) [Github #2912](https://github.com/penpot/penpot/issues/2912)
|
|
||||||
- Add woff2 support on user uploaded fonts (by @Nivl) [Github #8248](https://github.com/penpot/penpot/pull/8248)
|
|
||||||
- Import Tokens from linked library (by @dfelinto) [Github #8391](https://github.com/penpot/penpot/pull/8391)
|
|
||||||
- Option to download custom fonts (by @dfelinto) [Github #8320](https://github.com/penpot/penpot/issues/8320)
|
|
||||||
- Add copy as image to clipboard option to workspace context menu (by @dfelinto) [Github #8313](https://github.com/penpot/penpot/pull/8313)
|
|
||||||
- Add Tab/Shift+Tab navigation to rename layers sequentially (by @bittoby) [Github #8474](https://github.com/penpot/penpot/pull/8474)
|
|
||||||
- Copy and paste entire rows in existing table (by @bittoby) [Github #8498](https://github.com/penpot/penpot/pull/8498)
|
|
||||||
- Rename token group [Taiga #13137](https://tree.taiga.io/project/penpot/us/13137)
|
|
||||||
- Duplicate token group [Taiga #10653](https://tree.taiga.io/project/penpot/us/10653)
|
|
||||||
- Copy token name from contextual menu [Taiga #13568](https://tree.taiga.io/project/penpot/issue/13568)
|
|
||||||
- Add natural sorting on token names [Taiga #13713](https://tree.taiga.io/project/penpot/issue/13713)
|
|
||||||
- Add drag-to-change for numeric inputs in workspace sidebar [Github #2466](https://github.com/penpot/penpot/issues/2466)
|
|
||||||
- Add CSS linter [Taiga #13790](https://tree.taiga.io/project/penpot/us/13790)
|
|
||||||
- Save and restore selection state in undo/redo (by @eureka0928) [Github #6007](https://github.com/penpot/penpot/issues/6007)
|
|
||||||
- Fix warnings for unsupported token $type (by @Dexterity104) [Github #8790](https://github.com/penpot/penpot/issues/8790)
|
|
||||||
- Add per-group add button for typographies (by @eureka0928) [Github #5275](https://github.com/penpot/penpot/issues/5275)
|
|
||||||
- Add Find & Replace for text content and layer names (by @statxc) [Github #7108](https://github.com/penpot/penpot/issues/7108)
|
|
||||||
- Use page name for multi-export ZIP/PDF downloads (by @Dexterity104) [Github #8773](https://github.com/penpot/penpot/issues/8773)
|
|
||||||
- Make links in comments clickable (by @eureka0928) [Github #1602](https://github.com/penpot/penpot/issues/1602)
|
|
||||||
- Add visibility toggle for strokes (by @eureka0928) [Github #7438](https://github.com/penpot/penpot/issues/7438)
|
|
||||||
- Sort asset library subfolders alphabetically at every nesting level (by @eureka0928) [Github #2572](https://github.com/penpot/penpot/issues/2572)
|
|
||||||
- Add Paste to replace (Cmd+Shift+V) to replace the selected shape with clipboard contents (by @eureka0928) [Github #4240](https://github.com/penpot/penpot/issues/4240)
|
|
||||||
- Differentiate incoming and outgoing interaction link colors (by @claytonlin1110) [Github #7794](https://github.com/penpot/penpot/issues/7794)
|
|
||||||
- Add guide locking and fix locked elements not selectable in viewer (by @Dexterity104) [Github #8358](https://github.com/penpot/penpot/issues/8358)
|
|
||||||
- Apply styles to selection (by @AzazelN28) [Taiga #13647](https://tree.taiga.io/project/penpot/task/13647)
|
|
||||||
- Reorder prototyping overlay options to show Position before Relative to (by @rockchris099) [Github #2910](https://github.com/penpot/penpot/issues/2910)
|
|
||||||
- Add customizable colors for ruler guides (by @Dexterity104) [Github #5199](https://github.com/penpot/penpot/issues/5199)
|
|
||||||
- Persist asset search query and section filter when switching sidebar tabs (by @eureka0928) [Github #2913](https://github.com/penpot/penpot/issues/2913)
|
|
||||||
- Add delete and duplicate buttons to typography dialog (by @eureka0928) [Github #5270](https://github.com/penpot/penpot/issues/5270)
|
|
||||||
- Edit ruler guide position by double-clicking the guide pill (by @eureka0928) [Github #2311](https://github.com/penpot/penpot/issues/2311)
|
|
||||||
- Add a search bar to filter colors in the color palette toolbar (by @eureka0928) [Github #7653](https://github.com/penpot/penpot/issues/7653)
|
|
||||||
- Allow customising the OIDC login button label (by @wdeveloper16) [Github #7027](https://github.com/penpot/penpot/issues/7027)
|
|
||||||
- Add page separators in Workspace [Taiga #13611](https://tree.taiga.io/project/penpot/us/13611?milestone=262806)
|
|
||||||
- Preserve vector content when pasting from external tools such as Inkscape: recognise SVG sent as text/plain (with optional XML declaration and HTML comments), skip the raster preview when an SVG sibling is on the clipboard, and ignore empty SVG blobs that some tools advertise alongside the real payload, so pasted graphics arrive editable without spurious "SVG is invalid" warnings [Github #546](https://github.com/penpot/penpot/issues/546)
|
|
||||||
|
|
||||||
- Add Shift+Numpad0/1/2 as aliases to Shift+0/1/2 for zoom shortcuts [Github #2457](https://github.com/penpot/penpot/issues/2457)
|
|
||||||
- Adds a **Pixel grid color** picker in the viewport settings, next to the existing canvas color control [Github #7750](https://github.com/penpot/penpot/issues/7750)
|
|
||||||
### :bug: Bugs fixed
|
|
||||||
|
|
||||||
- Fix plugin API `fileVersion.restore()` promise hanging indefinitely on restore failure [Github #9092](https://github.com/penpot/penpot/issues/9092)
|
|
||||||
- Fix plugin API `library.connectLibrary()` returning a non-Promise (or throwing synchronously) when the plugin lacks `library:write` permission — the method now always returns a `Promise` and rejects with a structured error message, matching the contract used by every other Promise-returning plugin method (`restore`, `remove`, `pin`, `saveVersion`, `findVersions`, …)
|
|
||||||
- Fix LDAP provider params schema typo (`bind-passwor` → `bind-password`) introduced during the `clojure.spec` → `malli` migration; the schema slot now matches the runtime key actually read by `prepare-params` (`:password (:bind-password cfg)`) and `try-connectivity` (`(:bind-password cfg)`), so a wrong type for the password no longer slips through unvalidated
|
|
||||||
- Fix `login-with-ldap` silently dropping its error message on the `ldap-not-initialized` restriction (typo `:hide` → `:hint`); the message `"ldap auth provider is not initialized"` now actually surfaces in logs and error responses instead of being discarded into an unread key
|
|
||||||
- Fix `PENPOT_OIDC_USER_INFO_SOURCE` flag being silently ignored (`userinfo` / `token`) in the OIDC callback, causing "incomplete user info" failures during registration [Github #9108](https://github.com/penpot/penpot/issues/9108)
|
|
||||||
- Fix `get-view-only-bundle` crashing when a share-link viewer encounters a team member whose email lacks `@` (NullPointerException in `obfuscate-email`) or whose domain has no `.` (previously produced a dangling-dot `****@****.`); now the viewer-side obfuscation is nil-safe and omits the trailing dot when the domain has no TLD
|
|
||||||
- Remove `corepack` from the MCP local launcher so it runs on Node.js 25+, where corepack is no longer bundled [Github #8877](https://github.com/penpot/penpot/issues/8877)
|
|
||||||
- Fix Copy as SVG: emit a single valid SVG document when multiple shapes are selected, and publish `image/svg+xml` to the clipboard so the paste target works in Inkscape and other SVG-native tools [Github #838](https://github.com/penpot/penpot/issues/838)
|
|
||||||
- Reset profile submenu state when the account menu closes (by @eureka0928) [Github #8947](https://github.com/penpot/penpot/issues/8947)
|
|
||||||
- Add export panel to inspect styles tab [Taiga #13582](https://tree.taiga.io/project/penpot/issue/13582)
|
|
||||||
- Fix styles between grid layout inputs [Taiga #13526](https://tree.taiga.io/project/penpot/issue/13526)
|
|
||||||
- Fix id prop on switch component [Taiga #13534](https://tree.taiga.io/project/penpot/issue/13534)
|
|
||||||
- Update copy on penpot update message [Taiga #12924](https://tree.taiga.io/project/penpot/issue/12924)
|
|
||||||
- Fix scroll on library modal [Taiga #13639](https://tree.taiga.io/project/penpot/issue/13639)
|
|
||||||
- Fix dates to avoid show them in english when browser is in auto [Taiga #13786](https://tree.taiga.io/project/penpot/issue/13786)
|
|
||||||
- Fix focus radio button [Taiga #13841](https://tree.taiga.io/project/penpot/issue/13841)
|
|
||||||
- Token tree should be expanded by default [Taiga #13631](https://tree.taiga.io/project/penpot/issue/13631)
|
|
||||||
- Fix opacity incorrectly disabled for visible shapes [Taiga #13906](https://tree.taiga.io/project/penpot/issue/13906)
|
|
||||||
- Update onboarding image [Taiga #13864](https://tree.taiga.io/project/penpot/issue/13864)
|
|
||||||
- Fix plugin modal drag interactions over iframe and close-button behavior (by @marekhrabe) [Github #8871](https://github.com/penpot/penpot/pull/8871)
|
|
||||||
- Fix hot update on color-row on texts [Taiga #13923](https://tree.taiga.io/project/penpot/issue/13923)
|
|
||||||
- Fix selected color tokens [Taiga #13930](https://tree.taiga.io/project/penpot/issue/13930)
|
|
||||||
- Fix dashboard Recent/Deleted titles overlapped by scrolling content (by @rockchris099) [Github #8577](https://github.com/penpot/penpot/issues/8577)
|
|
||||||
- Display resolved values of inactive tokens [Taiga #13628](https://tree.taiga.io/project/penpot/issue/13628)
|
|
||||||
- Fix hyphens stripped from export filenames (by @jamesrayammons) [Github #8901](https://github.com/penpot/penpot/issues/8901)
|
|
||||||
- Fix app crash when selecting shapes with one hidden [Taiga #13959](https://tree.taiga.io/project/penpot/issue/13959)
|
|
||||||
- Fix opacity mixed value [Taiga #13960](https://tree.taiga.io/project/penpot/issue/13960)
|
|
||||||
- Fix gap input throwing an error [Github #8984](https://github.com/penpot/penpot/pull/8984)
|
|
||||||
- Fix non-functional clear icon in change email modal inputs (by @Dexterity104) [Github #8977](https://github.com/penpot/penpot/issues/8977)
|
|
||||||
- Disable save button after saving account profile settings (by @Dexterity104) [Github #8979](https://github.com/penpot/penpot/issues/8979)
|
|
||||||
- Fix copy to be more specific [Taiga #13990](https://tree.taiga.io/project/penpot/issue/13990)
|
|
||||||
- Allow deleting the profile avatar after uploading [Github #9067](https://github.com/penpot/penpot/issues/9067)
|
|
||||||
- Fix incorrect rendering when exporting text as SVG, PNG and JPG (by @edwin-rivera-dev) [Github #8516](https://github.com/penpot/penpot/issues/8516)
|
|
||||||
- Fix Settings and Notifications "Update Settings" button enabled state when form has no changes (by @moorsecopers99) [Github #9090](https://github.com/penpot/penpot/issues/9090)
|
|
||||||
- Fix "Help & Learning" submenu vertical alignment in account menu (by @juan-flores077) [Github #9137](https://github.com/penpot/penpot/issues/9137)
|
|
||||||
- Fix plugin `addInteraction` silently rejecting `open-overlay` actions with `manualPositionLocation` [Github #8409](https://github.com/penpot/penpot/issues/8409)
|
|
||||||
- Fix typography style creation with tokenized line-height (by @juan-flores077) [Github #8479](https://github.com/penpot/penpot/issues/8479)
|
|
||||||
- Fix colorpicker layout so the eyedropper button is visible again [Taiga #14057](https://tree.taiga.io/project/penpot/issue/14057)
|
|
||||||
|
|
||||||
|
|
||||||
## 2.16.0 (Unreleased)
|
|
||||||
|
|
||||||
### :boom: Breaking changes & Deprecations
|
|
||||||
|
|
||||||
### :rocket: Epics and highlights
|
|
||||||
|
|
||||||
### :sparkles: New features & Enhancements
|
|
||||||
|
|
||||||
- Enhance readability of applied tokens in plugins API [Taiga #13714](https://tree.taiga.io/project/penpot/issue/13714)
|
|
||||||
|
|
||||||
### :bug: Bugs fixed
|
|
||||||
|
|
||||||
- Fix Alt/Option to draw shapes from center point (by @offreal) [Github #8361](https://github.com/penpot/penpot/pull/8361)
|
|
||||||
- Add token name on broken token pill on sidebar [Taiga #13527](https://tree.taiga.io/project/penpot/issue/13527)
|
|
||||||
- Fix tooltip activated when tab change [Taiga #13627](https://tree.taiga.io/project/penpot/issue/13627)
|
|
||||||
- Fix title on shared button [Taiga #13730](https://tree.taiga.io/project/penpot/issue/13730)
|
|
||||||
- Fix hover on layers [Taiga #13799](https://tree.taiga.io/project/penpot/issue/13799)
|
|
||||||
- Fix highlight after name edition [Taiga #13783](https://tree.taiga.io/project/penpot/issue/13783)
|
|
||||||
- Fix id prop on switch component [Taiga #13534](https://tree.taiga.io/project/penpot/issue/13534)
|
|
||||||
- Fix dashboard navigation tabs overlap with projects content when scrolling [Taiga #13962](https://tree.taiga.io/project/penpot/issue/13962)
|
|
||||||
- Fix text editor v1 focus [Taiga #13961](https://tree.taiga.io/project/penpot/issue/13961)
|
|
||||||
- Fix color dropdown option update [Taiga #14035](https://tree.taiga.io/project/penpot/issue/14035)
|
|
||||||
- Fix themes modal height [Taiga #14046](https://tree.taiga.io/project/penpot/issue/14046)
|
|
||||||
|
|
||||||
|
|
||||||
## 2.15.0 (Unreleased)
|
|
||||||
|
|
||||||
### :sparkles: New features & Enhancements
|
|
||||||
|
|
||||||
- Access Tokens look & feel refinement [Taiga #13114](https://tree.taiga.io/project/penpot/us/13114)
|
|
||||||
- Add MCP server integration [Taiga #13112](https://tree.taiga.io/project/penpot/us/13112)
|
|
||||||
- Add chunked upload API for large media and binary files (removes previous upload size limits) [Github #8909](https://github.com/penpot/penpot/pull/8909)
|
|
||||||
|
|
||||||
### :bug: Bugs fixed
|
|
||||||
|
|
||||||
- Fix incorrect handling of version restore operation [Github #9041](https://github.com/penpot/penpot/pull/9041)
|
|
||||||
|
|
||||||
|
|
||||||
## 2.14.4
|
|
||||||
|
|
||||||
### :bug: Bugs fixed
|
|
||||||
|
|
||||||
- Fix email validation [Taiga #14006](https://tree.taiga.io/project/penpot/issue/14006)
|
|
||||||
- Fix email blacklisting [Github #9122](https://github.com/penpot/penpot/pull/9122)
|
|
||||||
- Fix removeChild errors from unmount race conditions [Github #8927](https://github.com/penpot/penpot/pull/8927)
|
|
||||||
|
|
||||||
|
|
||||||
## 2.14.3
|
|
||||||
|
|
||||||
### :sparkles: New features & Enhancements
|
|
||||||
|
|
||||||
- Add webp export format to plugin types [Github #8870](https://github.com/penpot/penpot/pull/8870)
|
|
||||||
- Use shared singleton containers for React portals to reduce DOM growth [Github #8957](https://github.com/penpot/penpot/pull/8957)
|
|
||||||
|
|
||||||
### :bug: Bugs fixed
|
|
||||||
|
|
||||||
- Fix component "broken" after switch variant [Taiga #12984](https://tree.taiga.io/project/penpot/issue/12984)
|
|
||||||
- Fix variants corner cases with selrect and points [Github #8882](https://github.com/penpot/penpot/pull/8882)
|
|
||||||
- Fix dashboard navigation tabs overlap with projects content when scrolling [Taiga #13962](https://tree.taiga.io/project/penpot/issue/13962)
|
|
||||||
- Fix text editor v1 focus [Taiga #13961](https://tree.taiga.io/project/penpot/issue/13961)
|
|
||||||
- Fix highlight on frames after rename [Github #8938](https://github.com/penpot/penpot/pull/8938)
|
|
||||||
- Fix TypeError in sd-token-uuid when resolving tokens interactively [Github #8929](https://github.com/penpot/penpot/pull/8929)
|
|
||||||
- Fix path drawing preview passing shape instead of content to next-node
|
|
||||||
- Fix swapped arguments in CLJS PathData `-nth` with default
|
|
||||||
- Normalize PathData coordinates to safe integer bounds on read
|
|
||||||
- Fix RangeError from re-entrant error handling causing stack overflow [Github #8962](https://github.com/penpot/penpot/pull/8962)
|
|
||||||
- Fix builder bool styles and media validation [Github #8963](https://github.com/penpot/penpot/pull/8963)
|
|
||||||
- Fix "Move to" menu allowing same project as target when multiple files are selected
|
|
||||||
- Fix crash when index query param is duplicated in URL
|
|
||||||
- Fix wrong extremity point in path `calculate-extremities` for line-to segments
|
|
||||||
- Fix reversed args in DTCG shadow composite token conversion
|
|
||||||
- Fix `inside-layout?` passing shape id instead of shape to `frame-shape?`
|
|
||||||
- Fix wrong `mapcat` call in `collect-main-shapes`
|
|
||||||
- Fix stale accumulator in `get-children-in-instance` recursion
|
|
||||||
- Fix typo `:podition` in swap-shapes grid cell
|
|
||||||
- Fix multiple selection on shapes with token applied to stroke color
|
|
||||||
|
|
||||||
|
|
||||||
## 2.14.2
|
|
||||||
|
|
||||||
### :sparkles: New features & Enhancements
|
|
||||||
|
|
||||||
- Add protection for stale JS asset cache to force reload on version mismatch [Github #8638](https://github.com/penpot/penpot/pull/8638)
|
|
||||||
- Normalize newsletter opt-in checkbox across different register flows [Github #8839](https://github.com/penpot/penpot/pull/8839)
|
|
||||||
|
|
||||||
### :bug: Bugs fixed
|
|
||||||
|
|
||||||
- Fix PathData corruption root causes across WASM and CLJS (unsafe transmute and byteOffset handling)
|
|
||||||
- Handle corrupted PathData segments gracefully instead of crashing
|
|
||||||
- Fix swapped move-to/line-to type codes in PathData binary readers
|
|
||||||
- Fix non-integer row/column values in grid cell position inputs [Github #8869](https://github.com/penpot/penpot/pull/8869)
|
|
||||||
- Fix nil path content crash by exposing safe public API [Github #8806](https://github.com/penpot/penpot/pull/8806)
|
|
||||||
- Fix infinite recursion in get-frame-ids for thumbnail extraction [Github #8807](https://github.com/penpot/penpot/pull/8807)
|
|
||||||
- Fix stale-asset detector missing protocol-dispatch errors
|
|
||||||
- Ignore Zone.js toString TypeError in uncaught error handler [Github #8804](https://github.com/penpot/penpot/pull/8804)
|
|
||||||
- Prevent thumbnail frame recursion overflow [Github #8763](https://github.com/penpot/penpot/pull/8763)
|
|
||||||
- Fix vector index out of bounds in viewer zoom-to-fit/fill [Github #8834](https://github.com/penpot/penpot/pull/8834)
|
|
||||||
- Guard delete undo against missing sibling order [Github #8858](https://github.com/penpot/penpot/pull/8858)
|
|
||||||
- Fix ICounted error on numeric-input token dropdown keyboard nav [Github #8803](https://github.com/penpot/penpot/pull/8803)
|
|
||||||
|
|
||||||
## 2.14.1
|
|
||||||
|
|
||||||
### :sparkles: New features & Enhancements
|
|
||||||
|
|
||||||
- Add automatic retry with backoff for idempotent RPC requests on network failures [Github #8792](https://github.com/penpot/penpot/pull/8792)
|
|
||||||
- Add scroll and zoom throttling to one state update per animation frame [Github #8812](https://github.com/penpot/penpot/pull/8812)
|
|
||||||
- Improve error handling and exception formatting [Github #8757](https://github.com/penpot/penpot/pull/8757)
|
|
||||||
|
|
||||||
### :bug: Bugs fixed
|
|
||||||
|
|
||||||
- Fix crash in apply-text-modifier with nil selrect or modifier [Github #8762](https://github.com/penpot/penpot/pull/8762)
|
|
||||||
- Fix incorrect attrs references on generate-sync-shape [Github #8776](https://github.com/penpot/penpot/pull/8776)
|
|
||||||
- Fix regression on subpath support [Github #8793](https://github.com/penpot/penpot/pull/8793)
|
|
||||||
- Improve error reporting on request parsing failures [Github #8805](https://github.com/penpot/penpot/pull/8805)
|
|
||||||
- Fix fetch abort errors escaping the unhandled exception handler [Github #8801](https://github.com/penpot/penpot/pull/8801)
|
|
||||||
- Fix nil deref on missing bounds in layout modifier propagation [Github #8735](https://github.com/penpot/penpot/pull/8735)
|
|
||||||
- Fix TypeError when token error map lacks :error/fn key [Github #8767](https://github.com/penpot/penpot/pull/8767)
|
|
||||||
- Fix dissoc error when detaching stroke color from library [Github #8738](https://github.com/penpot/penpot/pull/8738)
|
|
||||||
- Fix crash when pasting image into text editor
|
|
||||||
- Fix null text crash on paste in text editor
|
|
||||||
- Ensure path content is always PathData when saving
|
|
||||||
- Fix error when get-parent-with-data encounters non-Element nodes
|
|
||||||
|
|
||||||
## 2.14.0
|
|
||||||
|
|
||||||
### :boom: Breaking changes & Deprecations
|
|
||||||
|
|
||||||
- Deprecate `PENPOT_HTTP_SERVER_MAX_MULTIPART_BODY_SIZE` in favour of `PENPOT_HTTP_SERVER_MAX_BODY_SIZE`.
|
|
||||||
|
|
||||||
### :sparkles: New features & Enhancements
|
|
||||||
|
|
||||||
- Access to design tokens in Penpot Plugins [Taiga #8990](https://tree.taiga.io/project/penpot/us/8990)
|
|
||||||
- Remap references when renaming tokens [Taiga #10202](https://tree.taiga.io/project/penpot/us/10202)
|
|
||||||
- Tokens panel nested path view [Taiga #9966](https://tree.taiga.io/project/penpot/us/9966)
|
|
||||||
- Improve usability of lock and hide buttons in the layer panel. [Taiga #12916](https://tree.taiga.io/project/penpot/issue/12916)
|
|
||||||
- Optimize sidebar performance for deeply nested shapes [Taiga #13017](https://tree.taiga.io/project/penpot/task/13017)
|
|
||||||
- Remove tokens path node and bulk remove tokens [Taiga #13007](https://tree.taiga.io/project/penpot/us/13007)
|
|
||||||
- Replace themes management modal radio buttons for switches [Taiga #9215](https://tree.taiga.io/project/penpot/us/9215)
|
|
||||||
- [MCP server] Integrations section [Taiga #13112](https://tree.taiga.io/project/penpot/us/13112)
|
|
||||||
- [Access Tokens] Look & feel refinement [Taiga #13114](https://tree.taiga.io/project/penpot/us/13114)
|
|
||||||
|
|
||||||
### :bug: Bugs fixed
|
|
||||||
|
|
||||||
- Remove whitespaces from asset export filename [Github #8133](https://github.com/penpot/penpot/pull/8133)
|
|
||||||
- Fix prototype connections lost when switching between variants [Taiga #12812](https://tree.taiga.io/project/penpot/issue/12812)
|
|
||||||
- Fix wrong image in the onboarding invitation block [Taiga #13040](https://tree.taiga.io/project/penpot/issue/13040)
|
|
||||||
- Fix wrong register image [Taiga #12955](https://tree.taiga.io/project/penpot/task/12955)
|
|
||||||
- Fix error message on components doesn't close automatically [Taiga #12012](https://tree.taiga.io/project/penpot/issue/12012)
|
|
||||||
- Fix incorrect handling of input values on layout gap and padding inputs [Github #8113](https://github.com/penpot/penpot/issues/8113)
|
|
||||||
- Fix incorrect default option on tokens import dialog [Github #8051](https://github.com/penpot/penpot/pull/8051)
|
|
||||||
- Fix unhandled exception tokens creation dialog [Github #8110](https://github.com/penpot/penpot/issues/8110)
|
|
||||||
- Fix displaying a hidden user avatar when there is only one more [Taiga #13058](https://tree.taiga.io/project/penpot/issue/13058)
|
|
||||||
- Fix unhandled exception on open-new-window helper [Github #7787](https://github.com/penpot/penpot/issues/7787)
|
|
||||||
- Fix exception on uploading large fonts [Github #8135](https://github.com/penpot/penpot/pull/8135)
|
|
||||||
- Fix boolean operators in menu for boards [Taiga #13174](https://tree.taiga.io/project/penpot/issue/13174)
|
|
||||||
- Fix viewer can update library [Taiga #13186](https://tree.taiga.io/project/penpot/issue/13186)
|
|
||||||
- Fix remove fill affects different element than selected [Taiga #13128](https://tree.taiga.io/project/penpot/issue/13128)
|
|
||||||
- Fix unable to finish the create account form using keyboard [Taiga #11333](https://tree.taiga.io/project/penpot/issue/11333)
|
|
||||||
- Fix 45 rotated board titles rendered incorrectly [Taiga #13306](https://tree.taiga.io/project/penpot/issue/13306)
|
|
||||||
- Fix cannot apply second token after creation while shape is selected [Taiga #13513](https://tree.taiga.io/project/penpot/issue/13513)
|
|
||||||
- Fix error activating a set with invalid shadow token applied [Taiga #13528](https://tree.taiga.io/project/penpot/issue/13528)
|
|
||||||
- Fix component "broken" after variant switch [Taiga #12984](https://tree.taiga.io/project/penpot/issue/12984)
|
|
||||||
- Fix incorrect query for file versions [Github #8463](https://github.com/penpot/penpot/pull/8463)
|
|
||||||
- Fix warning when clicking on number token pills [Taiga #13661](https://tree.taiga.io/project/penpot/issue/13661)
|
|
||||||
- Fix 'not ISeqable' error when entering float values in layout item and opacity inputs [Github #8569](https://github.com/penpot/penpot/pull/8569)
|
|
||||||
- Fix crash in select component when options vector is empty [Github #8578](https://github.com/penpot/penpot/pull/8578)
|
|
||||||
- Fix scroll on colorpicker [Taiga #13623](https://tree.taiga.io/project/penpot/issue/13623)
|
|
||||||
- Fix crash when pasting non-map transit clipboard data [Github #8580](https://github.com/penpot/penpot/pull/8580)
|
|
||||||
- Fix `penpot.openPage()` plugin API not navigating in the same tab; change default to same-tab navigation and allow passing a UUID string instead of a Page object [Github #8520](https://github.com/penpot/penpot/issues/8520)
|
|
||||||
|
|
||||||
## 2.13.3
|
|
||||||
|
|
||||||
### :bug: Bugs fixed
|
|
||||||
|
|
||||||
- Revert yetti (http server) update, because that caused a regression on multipart uploads
|
|
||||||
|
|
||||||
## 2.13.2
|
|
||||||
|
|
||||||
### :bug: Bugs fixed
|
|
||||||
|
|
||||||
- Fix modifying shapes by apply negative tokens to border radius [Taiga #13317](https://tree.taiga.io/project/penpot/issue/13317)
|
|
||||||
- Fix arbitrary file read security issue on create-font-variant rpc method (https://github.com/penpot/penpot/security/advisories/GHSA-xp3f-g8rq-9px2)
|
|
||||||
|
|
||||||
## 2.13.1
|
|
||||||
|
|
||||||
### :bug: Bugs fixed
|
|
||||||
|
|
||||||
- Fix PDF Exporter outputs empty page when board has A4 format [Taiga #13181](https://tree.taiga.io/project/penpot/issue/13181)
|
|
||||||
|
|
||||||
## 2.13.0
|
|
||||||
|
|
||||||
### :heart: Community contributions (Thank you!)
|
|
||||||
|
|
||||||
- Add 'page' special shapeId to MCP export_shape tool for full-page snapshots [Github #8689](https://github.com/penpot/penpot/issues/8689)
|
|
||||||
|
|
||||||
- Fix mask issues with component swap (by @dfelinto) [Github #7675](https://github.com/penpot/penpot/issues/7675)
|
|
||||||
|
|
||||||
### :sparkles: New features & Enhancements
|
|
||||||
|
|
||||||
- Add new Box Shadow Tokens [Taiga #10201](https://tree.taiga.io/project/penpot/us/10201)
|
|
||||||
- Make i18n translation files load on-demand [Taiga #11474](https://tree.taiga.io/project/penpot/us/11474)
|
|
||||||
- Add deleted files to dashboard [Taiga #8149](https://tree.taiga.io/project/penpot/us/8149)
|
|
||||||
|
|
||||||
### :bug: Bugs fixed
|
|
||||||
|
|
||||||
- Fix problem when drag+duplicate a full grid [Taiga #12565](https://tree.taiga.io/project/penpot/issue/12565)
|
|
||||||
- Fix problem when pasting elements in reverse flex layout [Taiga #12460](https://tree.taiga.io/project/penpot/issue/12460)
|
|
||||||
- Fix wrong board size presets in Android [Taiga #12339](https://tree.taiga.io/project/penpot/issue/12339)
|
|
||||||
- Fix problem with grid layout components and auto sizing [Github #7797](https://github.com/penpot/penpot/issues/7797)
|
|
||||||
- Fix some alignments on inspect tab [Taiga #12915](https://tree.taiga.io/project/penpot/issue/12915)
|
|
||||||
- Fix problem with text editor maintaining previous styles [Taiga #12835](https://tree.taiga.io/project/penpot/issue/12835)
|
|
||||||
- Fix color assets from shared libraries not appearing as assets in Selected colors panel [Taiga #12957](https://tree.taiga.io/project/penpot/issue/12957)
|
|
||||||
- Fix CSS generated box-shadow property [Taiga #12997](https://tree.taiga.io/project/penpot/issue/12997)
|
|
||||||
- Fix inner shadow selector on shadow token [Taiga #12951](https://tree.taiga.io/project/penpot/issue/12951)
|
|
||||||
- Fix missing text color token from selected shapes in selected colors list [Taiga #12956](https://tree.taiga.io/project/penpot/issue/12956)
|
|
||||||
- Fix dropdown option width in Guides columns dropdown [Taiga #12959](https://tree.taiga.io/project/penpot/issue/12959)
|
|
||||||
- Fix typos on download modal [Taiga #12865](https://tree.taiga.io/project/penpot/issue/12865)
|
|
||||||
- Fix problem with text editor maintaining previous styles [Taiga #12835](https://tree.taiga.io/project/penpot/issue/12835)
|
|
||||||
- Fix unhandled exception tokens creation dialog [Github #8110](https://github.com/penpot/penpot/issues/8110)
|
|
||||||
- Fix allow negative spread values on shadow token creation [Taiga #13167](https://tree.taiga.io/project/penpot/issue/13167)
|
|
||||||
- Fix spanish translations on import export token modal [Taiga #13171](https://tree.taiga.io/project/penpot/issue/13171)
|
|
||||||
- Remove whitespaces from asset export filename [Github #8133](https://github.com/penpot/penpot/pull/8133)
|
|
||||||
- Fix exception on uploading large fonts [Github #8135](https://github.com/penpot/penpot/pull/8135)
|
|
||||||
- Fix unhandled exception on open-new-window helper [Github #7787](https://github.com/penpot/penpot/issues/7787)
|
|
||||||
- Fix incorrect handling of input values on layout gap and padding inputs [Github #8113](https://github.com/penpot/penpot/issues/8113)
|
|
||||||
- Fix several race conditions on path editor [Github #8187](https://github.com/penpot/penpot/pull/8187)
|
|
||||||
- Fix app freeze when introducing an error on a very long token name [Taiga #13214](https://tree.taiga.io/project/penpot/issue/13214)
|
|
||||||
- Fix import a file with shadow tokens [Taiga #13229](https://tree.taiga.io/project/penpot/issue/13229)
|
|
||||||
- Fix allow spaces on token description [Taiga #13184](https://tree.taiga.io/project/penpot/issue/13184)
|
|
||||||
- Fix error when creating a token with an invalid name [Taiga #13219](https://tree.taiga.io/project/penpot/issue/13219)
|
|
||||||
|
|
||||||
## 2.12.1
|
|
||||||
|
|
||||||
### :bug: Bugs fixed
|
|
||||||
|
|
||||||
- Fix setting a portion of text as bold or underline messes things up [Github #7980](https://github.com/penpot/penpot/issues/7980)
|
|
||||||
- Fix problem with style in fonts input [Taiga #12935](https://tree.taiga.io/project/penpot/issue/12935)
|
|
||||||
- Fix problem with path editor and right click [Github #7917](https://github.com/penpot/penpot/issues/7917)
|
|
||||||
|
|
||||||
## 2.12.0
|
|
||||||
|
|
||||||
### :boom: Breaking changes & Deprecations
|
|
||||||
|
|
||||||
#### Backend RPC API changes
|
|
||||||
|
|
||||||
The backend RPC API URLS are changed from `/api/rpc/command/<name>` to
|
|
||||||
`/api/main/methods/<name>`. The previous PATH is preserved for backward
|
|
||||||
compatibility; however, if you are a user of this API, it is strongly
|
|
||||||
recommended that you adapt your code to use the new PATH.
|
|
||||||
|
|
||||||
#### Updated SSO Callback URL
|
|
||||||
|
|
||||||
The OAuth / Single Sign-On (SSO) callback endpoint has changed to
|
|
||||||
align with the new OpenID Connect (OIDC) implementation.
|
|
||||||
|
|
||||||
Old callback URL:
|
|
||||||
|
|
||||||
```
|
|
||||||
https://<your_domain>/api/auth/oauth/<oauth_provider>/callback
|
|
||||||
```
|
|
||||||
|
|
||||||
New callback URL:
|
|
||||||
|
|
||||||
```
|
|
||||||
https://<your_domain>/api/auth/oidc/callback
|
|
||||||
```
|
|
||||||
|
|
||||||
**Action required:**
|
|
||||||
|
|
||||||
If you have SSO/Social-Auth configured on your on-premise instance,
|
|
||||||
the following actions are required before update:
|
|
||||||
|
|
||||||
Update your OAuth or SSO provider configuration (e.g., Okta, Google,
|
|
||||||
Azure AD, etc.) to use the new callback URL. Failure to update may
|
|
||||||
result in authentication failures after upgrading.
|
|
||||||
|
|
||||||
**Reason for change:**
|
|
||||||
|
|
||||||
This update standardizes all authentication flows under the single URL
|
|
||||||
and makis it more modular, enabling the ability to configure SSO auth
|
|
||||||
provider dinamically.
|
|
||||||
|
|
||||||
#### Changes on default docker compose
|
|
||||||
|
|
||||||
We have updated the `docker/images/docker-compose.yaml` with a small
|
|
||||||
change related to the `PENPOT_SECRET_KEY`. Since this version, this
|
|
||||||
environment variable is also required on exporter. So if you are using
|
|
||||||
penpot on-premise you will need to apply the same changes on your own
|
|
||||||
`docker-compose.yaml` file.
|
|
||||||
|
|
||||||
We have removed the Minio server from the `docker/images/docker-compose.yml`
|
|
||||||
example. It's still usable as before, we just removed the example.
|
|
||||||
|
|
||||||
### :rocket: Epics and highlights
|
|
||||||
|
|
||||||
### :heart: Community contributions (Thank you!)
|
|
||||||
|
|
||||||
- Ensure consistent snap behavior across all zoom levels [Github #7774](https://github.com/penpot/penpot/pull/7774) by [@Tokytome](https://github.com/Tokytome)
|
|
||||||
- Fix crash in token grid view due to tooltip validation (by @dfelinto) [Github #7887](https://github.com/penpot/penpot/pull/7887)
|
|
||||||
- Enable Hindi translations on the application
|
|
||||||
|
|
||||||
### :sparkles: New features & Enhancements
|
|
||||||
|
|
||||||
- Add the ability to select boards to export as PDF [Taiga #12320](https://tree.taiga.io/project/penpot/issue/12320)
|
|
||||||
- Add toggle for switching boolean property values [Taiga #12341](https://tree.taiga.io/project/penpot/us/12341)
|
|
||||||
- Make the file export process more reliable [Taiga #12555](https://tree.taiga.io/project/penpot/us/12555)
|
|
||||||
- Add auth flow changes [Taiga #12333](https://tree.taiga.io/project/penpot/us/12333)
|
|
||||||
- Add new shape validation mechanism for shapes [Github #7696](https://github.com/penpot/penpot/pull/7696)
|
|
||||||
- Apply color tokens from sidebar [Taiga #11353](https://tree.taiga.io/project/penpot/us/11353)
|
|
||||||
- Display tokens in the inspect tab [Taiga #9313](https://tree.taiga.io/project/penpot/us/9313)
|
|
||||||
- Refactor clipboard behavior to assess some minor inconsistencies and make pasting binary data faster. [Taiga #12571](https://tree.taiga.io/project/penpot/task/12571)
|
|
||||||
|
|
||||||
### :bug: Bugs fixed
|
|
||||||
|
|
||||||
- Fix text line-height values are wrong [Taiga #12252](https://tree.taiga.io/project/penpot/issue/12252)
|
|
||||||
- Fix an error translation [Taiga #12402](https://tree.taiga.io/project/penpot/issue/12402)
|
|
||||||
- Fix pan cursor not disabling viewport guides [Github #6985](https://github.com/penpot/penpot/issues/6985)
|
|
||||||
- Fix viewport resize on locked shapes [Taiga #11974](https://tree.taiga.io/project/penpot/issue/11974)
|
|
||||||
- Fix nested variant in a component doesn't keep inherited overrides [Taiga #12299](https://tree.taiga.io/project/penpot/issue/12299)
|
|
||||||
- Fix on copy instance inside a components chain touched are missing [Taiga #12371](https://tree.taiga.io/project/penpot/issue/12371)
|
|
||||||
- Fix problem with multiple selection and shadows [Github #7437](https://github.com/penpot/penpot/issues/7437)
|
|
||||||
- Fix search shortcut [Taiga #10265](https://tree.taiga.io/project/penpot/issue/10265)
|
|
||||||
- Fix shortcut conflict in text editor (increase/decrease font size vs word selection)
|
|
||||||
- Fix problem with plugins generating code for pages different than current one [Taiga #12312](https://tree.taiga.io/project/penpot/issue/12312)
|
|
||||||
- Fix input confirmation behavior is not uniform [Taiga #12294](https://tree.taiga.io/project/penpot/issue/12294)
|
|
||||||
- Fix copy/pasting application/transit+json [Taiga #12721](https://tree.taiga.io/project/penpot/issue/12721)
|
|
||||||
- Fix problem with plugins content attribute [Plugins #209](https://github.com/penpot/penpot-plugins/issues/209)
|
|
||||||
- Fix U and E icon displayed in project list [Taiga #12806](https://tree.taiga.io/project/penpot/issue/12806)
|
|
||||||
- Fix unpublish library modal not scrolling a long file list [Taiga #12285](https://tree.taiga.io/project/penpot/issue/12285)
|
|
||||||
- Fix incorrect interaction betwen hower and scroll on assets sidebar [Taiga #12389](https://tree.taiga.io/project/penpot/issue/12389)
|
|
||||||
- Fix switch variants with paths [Taiga #12841](https://tree.taiga.io/project/penpot/issue/12841)
|
|
||||||
- Fix referencing typography tokens on font-family tokens [Taiga #12492](https://tree.taiga.io/project/penpot/issue/12492)
|
|
||||||
- Fix horizontal scroll on layer panel [Taiga #12843](https://tree.taiga.io/project/penpot/issue/12843)
|
|
||||||
- Fix unicode handling on email template abbreviation filter [Github #7966](https://github.com/penpot/penpot/pull/7966)
|
|
||||||
|
|
||||||
## 2.11.1
|
## 2.11.1
|
||||||
|
|
||||||
- Fix WEBP shape export on docker images [Taiga #3838](https://tree.taiga.io/project/penpot/issue/3838)
|
- Fix WEBP shape export on docker images [Taiga #3838](https://tree.taiga.io/project/penpot/issue/3838)
|
||||||
@ -436,6 +10,7 @@ example. It's still usable as before, we just removed the example.
|
|||||||
|
|
||||||
- Deprecated configuration variables with the prefix `PENPOT_ASSETS_*`, and will be
|
- Deprecated configuration variables with the prefix `PENPOT_ASSETS_*`, and will be
|
||||||
removed in future versions:
|
removed in future versions:
|
||||||
|
|
||||||
- The `PENPOT_ASSETS_STORAGE_BACKEND` becomes `PENPOT_OBJECTS_STORAGE_BACKEND` and its
|
- The `PENPOT_ASSETS_STORAGE_BACKEND` becomes `PENPOT_OBJECTS_STORAGE_BACKEND` and its
|
||||||
values passes from (`assets-fs` or `assets-s3`) to (`fs` or `s3`)
|
values passes from (`assets-fs` or `assets-s3`) to (`fs` or `s3`)
|
||||||
- The `PENPOT_STORAGE_ASSETS_FS_DIRECTORY` becomes `PENPOT_OBJECTS_STORAGE_FS_DIRECTORY`
|
- The `PENPOT_STORAGE_ASSETS_FS_DIRECTORY` becomes `PENPOT_OBJECTS_STORAGE_FS_DIRECTORY`
|
||||||
|
|||||||
394
CONTRIBUTING.md
394
CONTRIBUTING.md
@ -1,289 +1,213 @@
|
|||||||
# Contributing Guide
|
# Contributing Guide #
|
||||||
|
|
||||||
Thank you for your interest in contributing to Penpot. This guide covers
|
Thank you for your interest in contributing to Penpot. This is a
|
||||||
how to propose changes, submit fixes, and follow project conventions.
|
generic guide that details how to contribute to the project in a way that
|
||||||
|
is efficient for everyone. If you are looking for specific documentation on
|
||||||
|
different parts of the platform, please refer to the `docs/` directory,
|
||||||
|
or the rendered version at the [Help Center](https://help.penpot.app/).
|
||||||
|
|
||||||
For architecture details, module-specific guidelines, and AI-agent
|
## Reporting Bugs ##
|
||||||
instructions, see [AGENTS.md](AGENTS.md). For final user technical
|
|
||||||
documentation, see the `docs/` directory or the rendered [Help
|
|
||||||
Center](https://help.penpot.app/).
|
|
||||||
|
|
||||||
## Table of Contents
|
We are using [GitHub Issues](https://github.com/penpot/penpot/issues)
|
||||||
|
for our public bugs. We keep a close eye on them and try to make it
|
||||||
|
clear when we have an internal fix in progress. Before filing a new
|
||||||
|
task, try to make sure your problem doesn't already exist.
|
||||||
|
|
||||||
- [Prerequisites](#prerequisites)
|
If you found a bug, please report it, as far as possible, with:
|
||||||
- [Reporting Bugs](#reporting-bugs)
|
|
||||||
- [Pull Requests](#pull-requests)
|
|
||||||
- [Workflow](#workflow)
|
|
||||||
- [Title format](#title-format)
|
|
||||||
- [Description](#description)
|
|
||||||
- [Branch naming](#branch-naming)
|
|
||||||
- [Review process](#review-process)
|
|
||||||
- [What we won't accept](#what-we-wont-accept)
|
|
||||||
- [Good first issues](#good-first-issues)
|
|
||||||
- [Commit Guidelines](#commit-guidelines)
|
|
||||||
- [Commit types](#commit-types)
|
|
||||||
- [Rules](#rules)
|
|
||||||
- [Examples](#examples)
|
|
||||||
- [Formatting and Linting](#formatting-and-linting)
|
|
||||||
- [Changelog](#changelog)
|
|
||||||
- [Code of Conduct](#code-of-conduct)
|
|
||||||
- [Developer's Certificate of Origin (DCO)](#developers-certificate-of-origin-dco)
|
|
||||||
|
|
||||||
## Prerequisites
|
- a detailed explanation of steps to reproduce the error
|
||||||
|
- the browser and browser version used
|
||||||
|
- a dev tools console exception stack trace (if available)
|
||||||
|
|
||||||
- **Language**: Penpot is written primarily in Clojure (backend), ClojureScript
|
If you found a bug which you think is better to discuss in private (for
|
||||||
(frontend/exporter), and Rust (render-wasm). Familiarity with the Clojure
|
example, security bugs), consider first sending an email to
|
||||||
ecosystem is expected for most contributions.
|
`support@penpot.app`.
|
||||||
- **Issue tracker**: We use [GitHub Issues](https://github.com/penpot/penpot/issues)
|
|
||||||
for public bugs and [Taiga](https://tree.taiga.io/project/penpot/) for
|
|
||||||
internal project management. Changelog entries reference both.
|
|
||||||
|
|
||||||
## Reporting Bugs
|
**We don't have a formal bug bounty program for security reports; this
|
||||||
|
is an open source application, and your contribution will be recognized
|
||||||
|
in the changelog.**
|
||||||
|
|
||||||
Report bugs via [GitHub Issues](https://github.com/penpot/penpot/issues).
|
|
||||||
Before filing, search existing issues to avoid duplicates.
|
|
||||||
|
|
||||||
Include the following when possible:
|
## Pull Requests ##
|
||||||
|
|
||||||
1. Steps to reproduce the error.
|
If you want to propose a change or bug fix via a pull request (PR),
|
||||||
2. Browser and browser version used.
|
you should first carefully read the section **Developer's Certificate of
|
||||||
3. DevTools console exception stack trace (if available).
|
Origin**. You must also format your code and commits according to the
|
||||||
|
instructions below.
|
||||||
|
|
||||||
For security bugs or issues better discussed in private, email
|
If you intend to fix a bug, it's fine to submit a pull request right
|
||||||
`support@penpot.app` or report them on [Github Security
|
away, but we still recommend filing an issue detailing what you're
|
||||||
Advisories](https://github.com/penpot/penpot/security/advisories)
|
fixing. This is helpful in case we don't accept that specific fix but
|
||||||
|
want to keep track of the issue.
|
||||||
|
|
||||||
> **Note:** We do not have a formal bug bounty program. Security
|
If you want to implement or start working on a new feature, please
|
||||||
> contributions are recognized in the changelog.
|
open a **question*- / **discussion*- issue for it. No PR
|
||||||
|
will be accepted without a prior discussion about the changes,
|
||||||
|
whether it is a new feature, an already planned one, or a quick win.
|
||||||
|
|
||||||
## Pull Requests
|
If it is your first PR, you can learn how to proceed from
|
||||||
|
[this free video
|
||||||
|
series](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github)
|
||||||
|
|
||||||
### Workflow
|
We use the `easy fix` tag to indicate issues that are appropriate for beginners.
|
||||||
|
|
||||||
1. **Read the DCO** — see [Developer's Certificate of Origin](#developers-certificate-of-origin-dco)
|
## Commit Guidelines ##
|
||||||
below. All code patches must include a `Signed-off-by` line.
|
|
||||||
2. **Discuss before building** — open a [GitHub
|
|
||||||
Issue](https://github.com/penpot/penpot/issues) or start a [GitHub
|
|
||||||
Discussion](https://github.com/penpot/penpot/discussions) before starting
|
|
||||||
work on a new feature or significant change. For planned features on the
|
|
||||||
roadmap, reference the corresponding Taiga story. No PR will be accepted
|
|
||||||
without prior discussion, whether it is a new feature, a planned one, or a
|
|
||||||
quick win.
|
|
||||||
3. **Bug fixes** — you may submit a PR directly, but we still recommend
|
|
||||||
filing an issue first so we can track it independently of your fix.
|
|
||||||
4. **Format and lint** — run the checks described in
|
|
||||||
[Formatting and Linting](#formatting-and-linting) before submitting.
|
|
||||||
|
|
||||||
### Title format
|
We have very precise rules on how our git commit messages must be formatted.
|
||||||
|
|
||||||
Pull request titles **must** follow the same convention as commit subjects:
|
The commit message format is:
|
||||||
|
|
||||||
```
|
```
|
||||||
:emoji: <subject>
|
<type> <subject>
|
||||||
```
|
|
||||||
|
|
||||||
- Use the **imperative mood** (e.g. "Fix", not "Fixed").
|
|
||||||
- Capitalize the first letter of the subject.
|
|
||||||
- Do not end the subject with a period.
|
|
||||||
- Keep the subject to **70 characters** or fewer.
|
|
||||||
- Use one of the [commit type emojis](#commit-types) listed below.
|
|
||||||
|
|
||||||
When a PR contains multiple unrelated commits, choose the emoji that
|
|
||||||
best represents the dominant change.
|
|
||||||
|
|
||||||
**Examples:**
|
|
||||||
|
|
||||||
```
|
|
||||||
:bug: Fix unexpected error on launching modal
|
|
||||||
:sparkles: Enable new modal for profile
|
|
||||||
:zap: Improve performance of dashboard navigation
|
|
||||||
```
|
|
||||||
|
|
||||||
> **Note:** When a PR is squash-merged, the PR title becomes the
|
|
||||||
> commit message on the main branch. Getting the title right matters.
|
|
||||||
|
|
||||||
### Description
|
|
||||||
|
|
||||||
Every pull request should include a description that helps reviewers
|
|
||||||
understand the change quickly:
|
|
||||||
|
|
||||||
1. **What and why** — describe the change and its motivation.
|
|
||||||
2. **Link related issues** — use `Closes #1234` or reference a Taiga
|
|
||||||
story (e.g. `Taiga #5678`).
|
|
||||||
3. **Screenshots or recordings** — required for any UI-visible change.
|
|
||||||
4. **Testing notes** — how did you verify the change? Any edge cases?
|
|
||||||
5. **Breaking changes** — call out anything that affects existing users
|
|
||||||
or requires migration steps.
|
|
||||||
|
|
||||||
### Branch naming
|
|
||||||
|
|
||||||
Use a descriptive branch name that reflects the type and scope of the
|
|
||||||
change:
|
|
||||||
|
|
||||||
```
|
|
||||||
<type>/<short-description>
|
|
||||||
```
|
|
||||||
|
|
||||||
Types: `fix`, `feat`, `refactor`, `docs`, `chore`, `perf`.
|
|
||||||
|
|
||||||
Optionally include the issue number:
|
|
||||||
|
|
||||||
```
|
|
||||||
fix/9122-email-blacklisting
|
|
||||||
feat/export-webp
|
|
||||||
refactor/layout-sizing
|
|
||||||
```
|
|
||||||
|
|
||||||
### Review process
|
|
||||||
|
|
||||||
- Maintainers review PRs when time permits. Please be patient.
|
|
||||||
- Address review feedback by **pushing new commits** — do not
|
|
||||||
force-push during review, as it breaks comment threads.
|
|
||||||
- PRs require at least **one approval** before merge.
|
|
||||||
- We use **squash-merge** by default. The PR title becomes the final
|
|
||||||
commit message, so follow the [title format](#title-format) above.
|
|
||||||
|
|
||||||
### What we won't accept
|
|
||||||
|
|
||||||
To save time on both sides, please avoid submitting PRs that:
|
|
||||||
|
|
||||||
- Introduce new dependencies without prior discussion.
|
|
||||||
- Change the build system or CI configuration without maintainer
|
|
||||||
approval.
|
|
||||||
- Mix unrelated changes in a single PR — keep PRs focused on one
|
|
||||||
concern.
|
|
||||||
- Skip the [discussion step](#workflow) for non-bug-fix changes.
|
|
||||||
|
|
||||||
### Good first issues
|
|
||||||
|
|
||||||
We use the `easy fix` label to mark issues appropriate for newcomers.
|
|
||||||
|
|
||||||
## Commit Guidelines
|
|
||||||
|
|
||||||
Commit messages must follow this format:
|
|
||||||
|
|
||||||
```
|
|
||||||
:emoji: <subject>
|
|
||||||
|
|
||||||
[body]
|
[body]
|
||||||
|
|
||||||
[footer]
|
[footer]
|
||||||
```
|
```
|
||||||
|
|
||||||
### Commit types
|
Where type is:
|
||||||
|
|
||||||
| Emoji | Description |
|
- :bug: `:bug:` a commit that fixes a bug
|
||||||
|-------|-------------|
|
- :sparkles: `:sparkles:` a commit that adds an improvement
|
||||||
| :bug: | Bug fix |
|
- :tada: `:tada:` a commit with a new feature
|
||||||
| :sparkles: | Improvement or enhancement |
|
- :recycle: `:recycle:` a commit that introduces a refactor
|
||||||
| :tada: | New feature |
|
- :lipstick: `:lipstick:` a commit with cosmetic changes
|
||||||
| :recycle: | Refactor |
|
- :ambulance: `:ambulance:` a commit that fixes a critical bug
|
||||||
| :lipstick: | Cosmetic changes |
|
- :books: `:books:` a commit that improves or adds documentation
|
||||||
| :ambulance: | Critical bug fix |
|
- :construction: `:construction:` a WIP commit
|
||||||
| :books: | Documentation |
|
- :boom: `:boom:` a commit with breaking changes
|
||||||
| :construction: | Work in progress |
|
- :wrench: `:wrench:` a commit for config updates
|
||||||
| :boom: | Breaking change |
|
- :zap: `:zap:` a commit with performance improvements
|
||||||
| :wrench: | Configuration update |
|
- :whale: `:whale:` a commit for Docker-related stuff
|
||||||
| :zap: | Performance improvement |
|
- :paperclip: `:paperclip:` a commit with other non-relevant changes
|
||||||
| :whale: | Docker-related change |
|
- :arrow_up: `:arrow_up:` a commit with dependency updates
|
||||||
| :paperclip: | Other non-relevant changes |
|
- :arrow_down: `:arrow_down:` a commit with dependency downgrades
|
||||||
| :arrow_up: | Dependency update |
|
- :fire: `:fire:` a commit that removes files or code
|
||||||
| :arrow_down: | Dependency downgrade |
|
- :globe_with_meridians: `:globe_with_meridians:` a commit that adds or updates
|
||||||
| :fire: | Removal of code or files |
|
translations
|
||||||
| :globe_with_meridians: | Add or update translations |
|
|
||||||
| :rocket: | Epic or highlight |
|
|
||||||
|
|
||||||
### Rules
|
More info:
|
||||||
|
|
||||||
- Use the **imperative mood** in the subject (e.g. "Fix", not "Fixed")
|
- https://gist.github.com/parmentf/035de27d6ed1dce0b36a
|
||||||
- Capitalize the first letter of the subject
|
- https://gist.github.com/rxaviers/7360908
|
||||||
- Add clear and concise description on the body
|
|
||||||
- Do not end the subject with a period
|
|
||||||
- Keep the subject to **70 characters** or fewer
|
|
||||||
- Separate the subject from the body with a **blank line**
|
|
||||||
|
|
||||||
### Examples
|
Each commit should have:
|
||||||
|
|
||||||
```
|
- A concise subject using the imperative mood.
|
||||||
:bug: Fix unexpected error on launching modal
|
- The subject should capitalize the first letter, omit the period
|
||||||
:sparkles: Enable new modal for profile
|
at the end, and be no longer than 65 characters.
|
||||||
:zap: Improve performance of dashboard navigation
|
- A blank line between the subject line and the body.
|
||||||
:ambulance: Fix critical bug on user registration process
|
- An entry in the CHANGES.md file if applicable, referencing the
|
||||||
:tada: Add new approach for user registration
|
GitHub or Taiga issue/user story using these same rules.
|
||||||
```
|
|
||||||
|
|
||||||
## Formatting and Linting
|
Examples of good commit messages:
|
||||||
|
|
||||||
We use [cljfmt](https://github.com/weavejester/cljfmt) for formatting and
|
- `:bug: Fix unexpected error on launching modal`
|
||||||
[clj-kondo](https://github.com/clj-kondo/clj-kondo) for linting.
|
- `:bug: Set proper error message on generic error`
|
||||||
|
- `:sparkles: Enable new modal for profile`
|
||||||
|
- `:zap: Improve performance of dashboard navigation`
|
||||||
|
- `:wrench: Update default backend configuration`
|
||||||
|
- `:books: Add more documentation for authentication process`
|
||||||
|
- `:ambulance: Fix critical bug on user registration process`
|
||||||
|
- `:tada: Add new approach for user registration`
|
||||||
|
|
||||||
|
## Formatting and Linting ##
|
||||||
|
|
||||||
|
You will want to make sure your code is formatted and linted before submitting
|
||||||
|
a PR. We use [cljfmt](https://github.com/weavejester/cljfmt) and
|
||||||
|
[clj-kondo](https://github.com/clj-kondo/clj-kondo) for this. After installing
|
||||||
|
them on your system, you can run them with:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Check formatting (does not modify files)
|
# Check formatting
|
||||||
./scripts/check-fmt
|
yarn fmt:clj:check
|
||||||
|
|
||||||
# Fix formatting (modifies files in place)
|
# Check and fix formatting
|
||||||
./scripts/fmt
|
yarn fmt:clj
|
||||||
|
|
||||||
# Lint
|
# Run the linter
|
||||||
./scripts/lint
|
yarn lint:clj
|
||||||
```
|
```
|
||||||
|
|
||||||
Ideally, run these as git pre-commit hooks.
|
There are more choices in `package.json`.
|
||||||
[Husky](https://typicode.github.io/husky/#/) is a convenient option for
|
|
||||||
setting this up.
|
|
||||||
|
|
||||||
## Changelog
|
Ideally, you should run these commands as git pre-commit hooks. A convenient way
|
||||||
|
of defining them is to use [Husky](https://typicode.github.io/husky/#/).
|
||||||
|
|
||||||
When your change is user-facing or otherwise notable, add an entry to
|
## Code of Conduct ##
|
||||||
[CHANGES.md](CHANGES.md) following the same commit-type conventions. Reference
|
|
||||||
the relevant GitHub issue or Taiga user story.
|
|
||||||
|
|
||||||
## Code of Conduct
|
As contributors and maintainers of this project, we pledge to respect
|
||||||
|
all people who contribute through reporting issues, posting feature
|
||||||
|
requests, updating documentation, submitting pull requests or patches,
|
||||||
|
and other activities.
|
||||||
|
|
||||||
This project follows the [Contributor Covenant](https://www.contributor-covenant.org/).
|
We are committed to making participation in this project a
|
||||||
The full Code of Conduct is available at
|
harassment-free experience for everyone, regardless of level of
|
||||||
[help.penpot.app/contributing-guide/coc](https://help.penpot.app/contributing-guide/coc/)
|
experience, gender, gender identity and expression, sexual
|
||||||
and in the repository's [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md).
|
orientation, disability, personal appearance, body size, race,
|
||||||
|
ethnicity, age, or religion.
|
||||||
|
|
||||||
To report unacceptable behavior, open an issue or contact a project maintainer
|
Examples of unacceptable behavior by participants include the use of
|
||||||
directly.
|
sexual language or imagery, derogatory comments or personal attacks,
|
||||||
|
trolling, public or private harassment, insults, or other
|
||||||
|
unprofessional conduct.
|
||||||
|
|
||||||
|
Project maintainers have the right and responsibility to remove, edit,
|
||||||
|
or reject comments, commits, code, wiki edits, issues, and other
|
||||||
|
contributions that are not aligned with this Code of Conduct. Project
|
||||||
|
maintainers who do not follow the Code of Conduct may be removed from
|
||||||
|
the project team.
|
||||||
|
|
||||||
|
This Code of Conduct applies both within project spaces and in public
|
||||||
|
spaces when an individual is representing the project or its
|
||||||
|
community.
|
||||||
|
|
||||||
|
Instances of abusive, harassing, or otherwise unacceptable behavior
|
||||||
|
may be reported by opening an issue or contacting one or more of the
|
||||||
|
project maintainers.
|
||||||
|
|
||||||
|
This Code of Conduct is adapted from the Contributor Covenant, version
|
||||||
|
1.1.0, available from [http://contributor-covenant.org/version/1/1/0/](http://contributor-covenant.org/version/1/1/0/)
|
||||||
|
|
||||||
## Developer's Certificate of Origin (DCO)
|
## Developer's Certificate of Origin (DCO)
|
||||||
|
|
||||||
By submitting code you agree to and can certify the following:
|
By submitting code you agree to and can certify the following:
|
||||||
|
|
||||||
> **Developer's Certificate of Origin 1.1**
|
Developer's Certificate of Origin 1.1
|
||||||
>
|
|
||||||
> By making a contribution to this project, I certify that:
|
|
||||||
>
|
|
||||||
> (a) The contribution was created in whole or in part by me and I have the
|
|
||||||
> right to submit it under the open source license indicated in the file; or
|
|
||||||
>
|
|
||||||
> (b) The contribution is based upon previous work that, to the best of my
|
|
||||||
> knowledge, is covered under an appropriate open source license and I have
|
|
||||||
> the right under that license to submit that work with modifications,
|
|
||||||
> whether created in whole or in part by me, under the same open source
|
|
||||||
> license (unless I am permitted to submit under a different license), as
|
|
||||||
> indicated in the file; or
|
|
||||||
>
|
|
||||||
> (c) The contribution was provided directly to me by some other person who
|
|
||||||
> certified (a), (b) or (c) and I have not modified it.
|
|
||||||
>
|
|
||||||
> (d) I understand and agree that this project and the contribution are public
|
|
||||||
> and that a record of the contribution (including all personal information
|
|
||||||
> I submit with it, including my sign-off) is maintained indefinitely and
|
|
||||||
> may be redistributed consistent with this project or the open source
|
|
||||||
> license(s) involved.
|
|
||||||
|
|
||||||
### Signed-off-by
|
By making a contribution to this project, I certify that:
|
||||||
|
|
||||||
All code patches (**documentation is excluded**) must contain a sign-off line
|
(a) The contribution was created in whole or in part by me and I
|
||||||
at the end of the commit body. Add it automatically with `git commit -s`.
|
have the right to submit it under the open source license
|
||||||
|
indicated in the file; or
|
||||||
|
|
||||||
|
(b) The contribution is based upon previous work that, to the best
|
||||||
|
of my knowledge, is covered under an appropriate open source
|
||||||
|
license and I have the right under that license to submit that
|
||||||
|
work with modifications, whether created in whole or in part
|
||||||
|
by me, under the same open source license (unless I am
|
||||||
|
permitted to submit under a different license), as indicated
|
||||||
|
in the file; or
|
||||||
|
|
||||||
|
(c) The contribution was provided directly to me by some other
|
||||||
|
person who certified (a), (b) or (c) and I have not modified
|
||||||
|
it.
|
||||||
|
|
||||||
|
(d) I understand and agree that this project and the contribution
|
||||||
|
are public and that a record of the contribution (including all
|
||||||
|
personal information I submit with it, including my sign-off) is
|
||||||
|
maintained indefinitely and may be redistributed consistent with
|
||||||
|
this project or the open source license(s) involved.
|
||||||
|
|
||||||
|
Then, all your code patches (**documentation is excluded**) should
|
||||||
|
contain a sign-off at the end of the patch/commit description body. It
|
||||||
|
can be automatically added by adding the `-s` parameter to `git commit`.
|
||||||
|
|
||||||
|
This is an example of what the line should look like:
|
||||||
|
|
||||||
```
|
```
|
||||||
Signed-off-by: Your Real Name <your.email@example.com>
|
Signed-off-by: Andrey Antukh <niwi@niwi.nz>
|
||||||
```
|
```
|
||||||
|
|
||||||
- Use your **real name** — pseudonyms and anonymous contributions are not
|
Please, use your real name (sorry, no pseudonyms or anonymous
|
||||||
allowed.
|
contributions are allowed).
|
||||||
- The `Signed-off-by` line is **mandatory** and must match the commit author.
|
|
||||||
|
|||||||
138
README.md
138
README.md
@ -1,56 +1,53 @@
|
|||||||
<img width="100%" src="https://github.com/user-attachments/assets/da17b160-f289-436f-b140-972083a08602" />
|
|
||||||
|
|
||||||
[uri_license]: https://www.mozilla.org/en-US/MPL/2.0
|
[uri_license]: https://www.mozilla.org/en-US/MPL/2.0
|
||||||
[uri_license_image]: https://img.shields.io/badge/MPL-2.0-blue.svg
|
[uri_license_image]: https://img.shields.io/badge/MPL-2.0-blue.svg
|
||||||
|
|
||||||
|
<picture>
|
||||||
|
<source media="(prefers-color-scheme: dark)" srcset="https://penpot.app/images/readme/github-dark-mode.png">
|
||||||
|
<source media="(prefers-color-scheme: light)" srcset="https://penpot.app/images/readme/github-light-mode.png">
|
||||||
|
<img alt="penpot header image" src="https://penpot.app/images/readme/github-light-mode.png">
|
||||||
|
</picture>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://www.digitalpublicgoods.net/r/penpot" rel="nofollow">
|
<a href="https://www.mozilla.org/en-US/MPL/2.0" rel="nofollow"><img alt="License: MPL-2.0" src="https://img.shields.io/badge/MPL-2.0-blue.svg" style="max-width:100%;"></a>
|
||||||
<img alt="Verified DPG" src="https://img.shields.io/badge/Verified-DPG-blue.svg">
|
<a href="https://community.penpot.app" rel="nofollow"><img alt="Penpot Community" src="https://img.shields.io/discourse/posts?server=https%3A%2F%2Fcommunity.penpot.app" style="max-width:100%;"></a>
|
||||||
</a>
|
<a href="https://tree.taiga.io/project/penpot/" title="Managed with Taiga.io" rel="nofollow"><img alt="Managed with Taiga.io" src="https://img.shields.io/badge/managed%20with-TAIGA.io-709f14.svg" style="max-width:100%;"></a>
|
||||||
<a href="https://community.penpot.app" rel="nofollow">
|
<a href="https://gitpod.io/#https://github.com/penpot/penpot" rel="nofollow"><img alt="Gitpod ready-to-code" src="https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod" style="max-width:100%;"></a>
|
||||||
<img alt="Penpot Community" src="https://img.shields.io/discourse/posts?server=https%3A%2F%2Fcommunity.penpot.app">
|
|
||||||
</a>
|
|
||||||
<a href="https://tree.taiga.io/project/penpot/" rel="nofollow">
|
|
||||||
<img alt="Managed with Taiga.io" src="https://img.shields.io/badge/managed%20with-TAIGA.io-709f14.svg">
|
|
||||||
</a>
|
|
||||||
<a href="https://gitpod.io/#https://github.com/penpot/penpot" rel="nofollow">
|
|
||||||
<img alt="Gitpod ready-to-code" src="https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod">
|
|
||||||
</a>
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://penpot.app/"><b>Website</b></a> •
|
<a href="https://penpot.app/"><b>Website</b></a> •
|
||||||
<a href="https://help.penpot.app/user-guide/"><b>User Guide</b></a> •
|
<a href="https://help.penpot.app/user-guide/"><b>User Guide</b></a> •
|
||||||
<a href="https://penpot.app/learning-center"><b>Learning Center</b></a> •
|
<a href="https://penpot.app/learning-center"><b>Learning Center</b></a> •
|
||||||
<a href="https://community.penpot.app/"><b>Community</b></a>
|
<a href="https://community.penpot.app/"><b>Community</b></a>
|
||||||
</p>
|
</p>
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://www.youtube.com/@Penpot"><b>Youtube</b></a> •
|
<a href="https://www.youtube.com/@Penpot"><b>Youtube</b></a> •
|
||||||
<a href="https://peertube.kaleidos.net/a/penpot_app/video-channels"><b>Peertube</b></a> •
|
<a href="https://peertube.kaleidos.net/a/penpot_app/video-channels"><b>Peertube</b></a> •
|
||||||
<a href="https://www.linkedin.com/company/penpot/"><b>Linkedin</b></a> •
|
<a href="https://www.linkedin.com/company/penpot/"><b>Linkedin</b></a> •
|
||||||
<a href="https://instagram.com/penpot.app"><b>Instagram</b></a> •
|
<a href="https://instagram.com/penpot.app"><b>Instagram</b></a> •
|
||||||
<a href="https://fosstodon.org/@penpot/"><b>Mastodon</b></a> •
|
<a href="https://fosstodon.org/@penpot/"><b>Mastodon</b></a> •
|
||||||
<a href="https://bsky.app/profile/penpot.app"><b>Bluesky</b></a> •
|
<a href="https://bsky.app/profile/penpot.app"><b>Bluesky</b></a> •
|
||||||
<a href="https://twitter.com/penpotapp"><b>X</b></a>
|
<a href="https://twitter.com/penpotapp"><b>X</b></a>
|
||||||
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
[Penpot video](https://github.com/user-attachments/assets/7c67fd7c-04d3-4c9b-88ec-b6f5e23f8332)
|
<br />
|
||||||
|
|
||||||
Penpot is the open-source design platform for teams that build digital products at scale.
|
[Penpot video](https://github.com/user-attachments/assets/7c67fd7c-04d3-4c9b-88ec-b6f5e23f8332
|
||||||
|
)
|
||||||
|
|
||||||
Penpot’s key strength lies in giving you **full ownership of your design infrastructure**. Built on open source and designed for [self-hosting](https://help.penpot.app/technical-guide/getting-started/), it puts teams in complete control of their design environment supporting strict compliance and governance requirements. Whether used in the **browser or deployed on your own servers**, Penpot **works with open standards** like SVG, CSS, HTML, and JSON.
|
<br />
|
||||||
|
|
||||||
Real-time collaboration strengthens this foundation, helping teams scale and bring design closer to the product through top-tier capabilities. Additionally, developers feel at home using Penpot, because design is expressed as code, enabling a direct translation and shipping products faster.
|
Penpot is the first **open-source** design tool for design and code collaboration. Designers can create stunning designs, interactive prototypes, design systems at scale, while developers enjoy ready-to-use code and make their workflow easy and fast. And all of this with no handoff drama.
|
||||||
|
|
||||||
Best-in-class native [Design Tokens](https://penpot.dev/collaboration/design-tokens) provide a single source of truth between design and development. They ensure consistency, improve collaboration, and make it easier to manage complex design systems.
|
Available on browser or self-hosted, Penpot works with open standards like SVG, CSS, HTML and JSON, and it’s free!
|
||||||
|
|
||||||
The [MCP server](https://penpot.app/penpot-mcp-server) takes it further by enabling multi-directional workflows between design and code. A [powerful open API](https://help.penpot.app/mcp/#quick-start) and plugin system makes the workspace programmable, enabling automation, AI-driven workflows, and integrations with the tools and systems you already use.
|
The latest updates take Penpot even further. It’s the first design tool to integrate native [design tokens](https://penpot.dev/collaboration/design-tokens)—a single source of truth to improve efficiency and collaboration between product design and development.
|
||||||
|
With the [huge 2.0 release](https://penpot.app/dev-diaries), Penpot took the platform to a whole new level. This update introduces the ground-breaking [CSS Grid Layout feature](https://penpot.app/penpot-2.0), a complete UI redesign, a new Components system, and much more.
|
||||||
|
For organizations that need extra service for its teams, [get in touch](https://cal.com/team/penpot/talk-to-us)
|
||||||
|
|
||||||
With [CSS Grid and Flex Layout](https://help.penpot.app/user-guide/designing/flexible-layouts/), teams can design responsive interfaces that behave like real code from the start.
|
🎇 Design, code, and Open Source meet at [Penpot Fest](https://penpot.app/penpotfest)! Be part of the 2025 edition in Madrid, Spain, on October 9-10.
|
||||||
|
|
||||||
Combined, these features turn Penpot into a **full-stack design platform** for building scalable design systems and fully integrated product development processes.
|
|
||||||
|
|
||||||
If your organization is scaling and needs extra support, we’re here to help. [Talk to us](https://penpot.app/talk-to-us)
|
|
||||||
|
|
||||||
## Table of contents ##
|
## Table of contents ##
|
||||||
|
|
||||||
@ -63,78 +60,101 @@ If your organization is scaling and needs extra support, we’re here to help. [
|
|||||||
|
|
||||||
## Why Penpot ##
|
## Why Penpot ##
|
||||||
|
|
||||||
Penpot connects design, code, and AI workflows through a code-based approach, making designs readable by developers and AI via the MCP server. This approach helps teams ship what’s actually designed and manage design systems at scale with powerful design tokens. As a self-hosted, open-source and real-time collaboration platform, Penpot offers full flexibility, security, and ownership without vendor lock-in. Learn more about [why Penpot](https://penpot.app/why-penpot) is the platform for your team.
|
Penpot expresses designs as code. Designers can do their best work and see it will be beautifully implemented by developers in a two-way collaboration.
|
||||||
|
|
||||||
### Plugin system ###
|
### Plugin system ###
|
||||||
|
|
||||||
[Penpot plugins](https://penpot.app/penpothub/plugins) let you expand the platform's capabilities, give you the flexibility to integrate it with other apps, and design custom solutions.
|
[Penpot plugins](https://penpot.app/penpothub/plugins) let you expand the platform's capabilities, give you the flexibility to integrate it with other apps, and design custom solutions.
|
||||||
|
|
||||||
### Designed for developers ###
|
### Designed for developers ###
|
||||||
|
|
||||||
Penpot was built to serve both designers and developers and create a fluid design-code process. You have the choice to enjoy real-time collaboration or play "solo".
|
Penpot was built to serve both designers and developers and create a fluid design-code process. You have the choice to enjoy real-time collaboration or play "solo".
|
||||||
|
|
||||||
### Inspect mode ###
|
### Inspect mode ###
|
||||||
|
|
||||||
Work with ready-to-use code and make your workflow easy and fast. The inspect tab gives instant access to SVG, CSS and HTML code.
|
Work with ready-to-use code and make your workflow easy and fast. The inspect tab gives instant access to SVG, CSS and HTML code.
|
||||||
|
|
||||||
|
### Self host your own instance ###
|
||||||
|
Provide your team or organization with a completely owned collaborative design tool. Use Penpot's cloud service or deploy your own Penpot server.
|
||||||
|
|
||||||
### Integrations ###
|
### Integrations ###
|
||||||
|
Penpot offers integration into the development toolchain, thanks to its support for webhooks and an API accessible through access tokens.
|
||||||
|
|
||||||
Penpot offers [integration](https://penpot.app/integrations-api) into the development toolchain, thanks to its support for webhooks and an API accessible through access tokens.
|
### Building Design Systems: design tokens, components and variants ###
|
||||||
|
Penpot brings design systems to code-minded teams: a single source of truth with native Design Tokens, Components, and Variants for scalable, reusable, and consistent UI across projects and platforms.
|
||||||
|
|
||||||
### Building Design Systems: design tokens, components and variants ###
|
|
||||||
|
|
||||||
Penpot brings [design systems](https://penpot.app/design/design-systems) to code-minded teams: a single source of truth with native Design Tokens, Components, and Variants for scalable, reusable, and consistent UI across projects and platforms.
|
<br />
|
||||||
|
|
||||||
<img width="100%" alt="Penpot Design Systems" src="https://github.com/user-attachments/assets/cce75ad6-f783-473f-8803-da9eb8255fef">
|
<p align="center">
|
||||||
|
<img src="https://github.com/user-attachments/assets/cce75ad6-f783-473f-8803-da9eb8255fef">
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<br />
|
||||||
|
|
||||||
## Getting started ##
|
## Getting started ##
|
||||||
|
|
||||||
Penpot is the only design & prototype platform that is deployment agnostic. You can use it in our [SAAS](https://design.penpot.app) or deploy it anywhere.
|
Penpot is the only design & prototype platform that is deployment agnostic. You can use it in our [SAAS](https://design.penpot.app) or deploy it anywhere.
|
||||||
|
|
||||||
Learn how to install it with Docker, Kubernetes, Elestio or other options on [our website](https://penpot.app/self-host).
|
Learn how to install it with Docker, Kubernetes, Elestio or other options on [our website](https://penpot.app/self-host).
|
||||||
|
<br />
|
||||||
|
|
||||||
|
<p align="center">
|
||||||
|
<img src="https://site-assets.plasmic.app/2168cf524dd543caeff32384eb9ea0a1.svg" alt="Open Source" style="width: 65%;">
|
||||||
|
</p>
|
||||||
|
<br />
|
||||||
|
|
||||||
## Community ##
|
## Community ##
|
||||||
|
|
||||||
We love the Open Source software community. Contributing is our passion and if it’s yours too, participate and [improve](https://community.penpot.app/c/help-us-improve-penpot/7) Penpot. All your designs, code and ideas are welcome!
|
We love the Open Source software community. Contributing is our passion and if it’s yours too, participate and [improve](https://community.penpot.app/c/help-us-improve-penpot/7) Penpot. All your designs, code and ideas are welcome!
|
||||||
|
|
||||||
Want to go a step further? Become a [Penpot Ambassador](https://penpot.app/ambassador-program) and help grow the Penpot community in your region while contributing to a global, open design ecosystem.
|
|
||||||
|
|
||||||
If you need help or have any questions; if you’d like to share your experience using Penpot or get inspired; if you’d rather meet our community of developers and designers, [join our Community](https://community.penpot.app/)!
|
If you need help or have any questions; if you’d like to share your experience using Penpot or get inspired; if you’d rather meet our community of developers and designers, [join our Community](https://community.penpot.app/)!
|
||||||
|
|
||||||
Categories include:
|
You will find the following categories:
|
||||||
|
|
||||||
- [Ask the Community](https://community.penpot.app/c/ask-for-help-using-penpot/6)
|
- [Ask the Community](https://community.penpot.app/c/ask-for-help-using-penpot/6)
|
||||||
- [Troubleshooting](https://community.penpot.app/c/technical/8)
|
- [Troubleshooting](https://community.penpot.app/c/technical/8)
|
||||||
- [Help us Improve Penpot](https://community.penpot.app/c/help-us-improve-penpot/7)
|
- [Help us Improve Penpot](https://community.penpot.app/c/help-us-improve-penpot/7)
|
||||||
|
- [#MadeWithPenpot](https://community.penpot.app/c/madewithpenpot/9)
|
||||||
- [Events and Announcements](https://community.penpot.app/c/announcements/5)
|
- [Events and Announcements](https://community.penpot.app/c/announcements/5)
|
||||||
|
- [Inside Penpot](https://community.penpot.app/c/inside-penpot/21)
|
||||||
- [Penpot in your language](https://community.penpot.app/c/penpot-in-your-language/12)
|
- [Penpot in your language](https://community.penpot.app/c/penpot-in-your-language/12)
|
||||||
- [Education](https://community.penpot.app/c/education/28)
|
- [Design and Code Essentials](https://community.penpot.app/c/design-and-code-essentials/22)
|
||||||
|
|
||||||
<img width="100%" alt="Pentpot Community" src="https://github.com/user-attachments/assets/4b2a4360-12b5-4994-bd45-641449f86c4e" />
|
|
||||||
|
<br />
|
||||||
|
|
||||||
|
<p align="center">
|
||||||
|
<img src="https://github.com/penpot/penpot/assets/5446186/6ac62220-a16c-46c9-ab21-d24ae357ed03" alt="Community" style="width: 65%;">
|
||||||
|
</p>
|
||||||
|
<br />
|
||||||
|
|
||||||
### Code of Conduct ###
|
### Code of Conduct ###
|
||||||
|
|
||||||
Anyone who contributes to Penpot, whether through code, in the community, or at an event, must adhere to the
|
Anyone who contributes to Penpot, whether through code, in the community, or at an event, must adhere to the
|
||||||
[code of conduct](https://help.penpot.app/contributing-guide/coc/) and foster a positive and safe environment.
|
[code of conduct](https://help.penpot.app/contributing-guide/coc/) and foster a positive and safe environment.
|
||||||
|
|
||||||
### Contributing ###
|
|
||||||
|
## Contributing ##
|
||||||
|
|
||||||
Any contribution will make a difference to improve Penpot. How can you get involved?
|
Any contribution will make a difference to improve Penpot. How can you get involved?
|
||||||
|
|
||||||
Choose your way:
|
Choose your way:
|
||||||
|
|
||||||
- Create and [share Libraries & Templates](https://penpot.app/libraries-templates.html) that will be helpful for the community.
|
- Create and [share Libraries & Templates](https://penpot.app/libraries-templates.html) that will be helpful for the community
|
||||||
- Invite your [team to join](https://design.penpot.app/#/auth/register).
|
- Invite your [team to join](https://design.penpot.app/#/auth/register)
|
||||||
- Give this repo a star and follow us on Social Media: [Mastodon](https://fosstodon.org/@penpot/), [Youtube](https://www.youtube.com/c/Penpot), [Instagram](https://instagram.com/penpot.app), [Linkedin](https://www.linkedin.com/company/penpotdesign), [Peertube](https://peertube.kaleidos.net/a/penpot_app), [X](https://twitter.com/penpotapp) and [BlueSky](https://bsky.app/profile/penpot.app).
|
- Give this repo a star and follow us on Social Media: [Mastodon](https://fosstodon.org/@penpot/), [Youtube](https://www.youtube.com/c/Penpot), [Instagram](https://instagram.com/penpot.app), [Linkedin](https://www.linkedin.com/company/penpotdesign), [Peertube](https://peertube.kaleidos.net/a/penpot_app), [X](https://twitter.com/penpotapp) and [BlueSky](https://bsky.app/profile/penpot.app)
|
||||||
- Participate in the [Community](https://community.penpot.app/) space by asking and answering questions; reacting to others’ articles; opening your own conversations and following along on decisions affecting the project.
|
- Participate in the [Community](https://community.penpot.app/) space by asking and answering questions; reacting to others’ articles; opening your own conversations and following along on decisions affecting the project.
|
||||||
- Report bugs with our easy [guide for bugs hunting](https://help.penpot.app/contributing-guide/reporting-bugs/) or [GitHub issues](https://github.com/penpot/penpot/issues).
|
- Report bugs with our easy [guide for bugs hunting](https://help.penpot.app/contributing-guide/reporting-bugs/) or [GitHub issues](https://github.com/penpot/penpot/issues)
|
||||||
- Become a [translator](https://help.penpot.app/contributing-guide/translations).
|
- Become a [translator](https://help.penpot.app/contributing-guide/translations)
|
||||||
- Give feedback: [Email us](mailto:support@penpot.app).
|
- Give feedback: [Email us](mailto:support@penpot.app)
|
||||||
- **Contribute to Penpot's code:** [Watch this video](https://www.youtube.com/watch?v=TpN0osiY-8k) by Alejandro Alonso, CIO and developer at Penpot, where he gives us a hands-on demo of how to use Penpot’s repository and make changes in both front and back end.
|
- **Contribute to Penpot's code:** [Watch this video](https://www.youtube.com/watch?v=TpN0osiY-8k) by Alejandro Alonso, CIO and developer at Penpot, where he gives us a hands-on demo of how to use Penpot’s repository and make changes in both front and back end
|
||||||
|
|
||||||
To find (almost) everything you need to know on how to contribute to Penpot, refer to the [contributing guide](https://help.penpot.app/contributing-guide/).
|
To find (almost) everything you need to know on how to contribute to Penpot, refer to the [contributing guide](https://help.penpot.app/contributing-guide/).
|
||||||
|
|
||||||
<img width="100%" alt="Penpot hub" src="https://github.com/user-attachments/assets/0abc02f0-625c-45ab-ad81-4927bec7a055" />
|
<br />
|
||||||
|
|
||||||
|
<p align="center">
|
||||||
|
<img src="https://github.com/penpot/penpot/assets/5446186/fea18923-dc06-49be-86ad-c3496a7956e6" alt="Libraries and templates" style="width: 65%;">
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<br />
|
||||||
|
|
||||||
## Resources ##
|
## Resources ##
|
||||||
|
|
||||||
@ -150,8 +170,6 @@ You can ask and answer questions, have open-ended conversations, and follow alon
|
|||||||
|
|
||||||
📚 [Dev Diaries](https://penpot.app/dev-diaries.html)
|
📚 [Dev Diaries](https://penpot.app/dev-diaries.html)
|
||||||
|
|
||||||
🧑🏫 [UI Design Course](https://penpot.app/courses/)
|
|
||||||
|
|
||||||
|
|
||||||
## License ##
|
## License ##
|
||||||
|
|
||||||
|
|||||||
28
SECURITY.md
28
SECURITY.md
@ -2,30 +2,4 @@
|
|||||||
|
|
||||||
## Reporting a Vulnerability
|
## Reporting a Vulnerability
|
||||||
|
|
||||||
We take the security of this project seriously. If you have discovered
|
Please report security issues to `support@penpot.app`
|
||||||
a security vulnerability, please do **not** open a public issue.
|
|
||||||
|
|
||||||
Please report vulnerabilities via email to: **[support@penpot.app]**
|
|
||||||
|
|
||||||
|
|
||||||
### What to include:
|
|
||||||
|
|
||||||
* A brief description of the vulnerability.
|
|
||||||
* Steps to reproduce the issue.
|
|
||||||
* Potential impact if exploited.
|
|
||||||
|
|
||||||
We appreciate your patience and your commitment to **responsible disclosure**.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Security Contributors
|
|
||||||
|
|
||||||
We are incredibly grateful to the following individuals and
|
|
||||||
organizations for their help in keeping this project safe.
|
|
||||||
|
|
||||||
* **Ali Maharramli** – for identifying critical path traversal vulnerability
|
|
||||||
|
|
||||||
|
|
||||||
> **Note:** This list is a work in progress. If you have contributed
|
|
||||||
> to the security of this project and would like to be recognized (or
|
|
||||||
> prefer to remain anonymous), please let us know.
|
|
||||||
7
backend/.gitignore
vendored
Normal file
7
backend/.gitignore
vendored
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
.pnp.*
|
||||||
|
.yarn/*
|
||||||
|
!.yarn/patches
|
||||||
|
!.yarn/plugins
|
||||||
|
!.yarn/releases
|
||||||
|
!.yarn/sdks
|
||||||
|
!.yarn/versions
|
||||||
@ -1,259 +0,0 @@
|
|||||||
# Penpot Backend – Agent Instructions
|
|
||||||
|
|
||||||
Clojure backend (RPC) service running on the JVM.
|
|
||||||
|
|
||||||
Uses Integrant for dependency injection, PostgreSQL for storage, and
|
|
||||||
Redis for messaging/caching.
|
|
||||||
|
|
||||||
## General Guidelines
|
|
||||||
|
|
||||||
To ensure consistency across the Penpot JVM stack, all contributions must adhere
|
|
||||||
to these criteria:
|
|
||||||
|
|
||||||
### 1. Testing & Validation
|
|
||||||
|
|
||||||
* **Coverage:** If code is added or modified in `src/`, corresponding
|
|
||||||
tests in `test/backend_tests/` must be added or updated.
|
|
||||||
|
|
||||||
* **Execution:**
|
|
||||||
* **Isolated:** Run `clojure -M:dev:test --focus backend-tests.my-ns-test` for the specific test namespace.
|
|
||||||
* **Regression:** Run `clojure -M:dev:test` to ensure the suite passes without regressions in related functional areas.
|
|
||||||
|
|
||||||
### 2. Code Quality & Formatting
|
|
||||||
|
|
||||||
* **Linting:** All code must pass `clj-kondo` checks (run `pnpm run lint:clj`)
|
|
||||||
* **Formatting:** All the code must pass the formatting check (run `pnpm run
|
|
||||||
check-fmt`). Use `pnpm run fmt` to fix formatting issues. Avoid "dirty"
|
|
||||||
diffs caused by unrelated whitespace changes.
|
|
||||||
* **Type Hinting:** Use explicit JVM type hints (e.g., `^String`, `^long`) in
|
|
||||||
performance-critical paths to avoid reflection overhead.
|
|
||||||
|
|
||||||
## Code Conventions
|
|
||||||
|
|
||||||
### Namespace Overview
|
|
||||||
|
|
||||||
The source is located under `src` directory and this is a general overview of
|
|
||||||
namespaces structure:
|
|
||||||
|
|
||||||
- `app.rpc.commands.*` – RPC command implementations (`auth`, `files`, `teams`, etc.)
|
|
||||||
- `app.http.*` – HTTP routes and middleware
|
|
||||||
- `app.db.*` – Database layer
|
|
||||||
- `app.tasks.*` – Background job tasks
|
|
||||||
- `app.main` – Integrant system setup and entrypoint
|
|
||||||
- `app.loggers` – Internal loggers (auditlog, mattermost, etc.) (not to be confused with `app.common.logging`)
|
|
||||||
|
|
||||||
### RPC
|
|
||||||
|
|
||||||
The RPC methods are implemented using a multimethod-like structure via the
|
|
||||||
`app.util.services` namespace. The main RPC methods are collected under
|
|
||||||
`app.rpc.commands` namespace and exposed under `/api/rpc/command/<cmd-name>`.
|
|
||||||
|
|
||||||
The RPC method accepts POST and GET requests indistinctly and uses the `Accept`
|
|
||||||
header to negotiate the response encoding (which can be Transit — the default —
|
|
||||||
or plain JSON). It also accepts Transit (default) or JSON as input, which should
|
|
||||||
be indicated using the `Content-Type` header.
|
|
||||||
|
|
||||||
The main convention is: use `get-` prefix on RPC name when we want READ
|
|
||||||
operation.
|
|
||||||
|
|
||||||
Example of RPC method definition:
|
|
||||||
|
|
||||||
```clojure
|
|
||||||
(sv/defmethod ::my-command
|
|
||||||
{::rpc/auth true ;; requires auth
|
|
||||||
::doc/added "1.18"
|
|
||||||
::sm/params [:map ...] ;; malli input schema
|
|
||||||
::sm/result [:map ...]} ;; malli output schema
|
|
||||||
[{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id] :as params}]
|
|
||||||
;; return a plain map or throw
|
|
||||||
{:id (uuid/next)})
|
|
||||||
```
|
|
||||||
|
|
||||||
Look under `src/app/rpc/commands/*.clj` to see more examples.
|
|
||||||
|
|
||||||
### Tests
|
|
||||||
|
|
||||||
Test namespaces match `.*-test$` under `test/`. Config is in `tests.edn`.
|
|
||||||
|
|
||||||
|
|
||||||
### Integrant System
|
|
||||||
|
|
||||||
The `src/app/main.clj` declares the system map. Each key is a component; values
|
|
||||||
are config maps with `::ig/ref` for dependencies. Components implement
|
|
||||||
`ig/init-key` / `ig/halt-key!`.
|
|
||||||
|
|
||||||
|
|
||||||
### Connecting to the Database
|
|
||||||
|
|
||||||
Two PostgreSQL databases are used in this environment:
|
|
||||||
|
|
||||||
| Database | Purpose | Connection string |
|
|
||||||
|---------------|--------------------|----------------------------------------------------|
|
|
||||||
| `penpot` | Development / app | `postgresql://penpot:penpot@postgres/penpot` |
|
|
||||||
| `penpot_test` | Test suite | `postgresql://penpot:penpot@postgres/penpot_test` |
|
|
||||||
|
|
||||||
**Interactive psql session:**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# development DB
|
|
||||||
psql "postgresql://penpot:penpot@postgres/penpot"
|
|
||||||
|
|
||||||
# test DB
|
|
||||||
psql "postgresql://penpot:penpot@postgres/penpot_test"
|
|
||||||
```
|
|
||||||
|
|
||||||
**One-shot query (non-interactive):**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
psql "postgresql://penpot:penpot@postgres/penpot" -c "SELECT id, name FROM team LIMIT 5;"
|
|
||||||
```
|
|
||||||
|
|
||||||
**Useful psql meta-commands:**
|
|
||||||
|
|
||||||
```
|
|
||||||
\dt -- list all tables
|
|
||||||
\d <table> -- describe a table (columns, types, constraints)
|
|
||||||
\di -- list indexes
|
|
||||||
\q -- quit
|
|
||||||
```
|
|
||||||
|
|
||||||
> **Migrations table:** Applied migrations are tracked in the `migrations` table
|
|
||||||
> with columns `module`, `step`, and `created_at`. When renaming a migration
|
|
||||||
> logical name, update this table in both databases to match the new name;
|
|
||||||
> otherwise the runner will attempt to re-apply the migration on next startup.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Example: fix a renamed migration entry in the test DB
|
|
||||||
psql "postgresql://penpot:penpot@postgres/penpot_test" \
|
|
||||||
-c "UPDATE migrations SET step = 'new-name' WHERE step = 'old-name';"
|
|
||||||
```
|
|
||||||
|
|
||||||
### Database Access (Clojure)
|
|
||||||
|
|
||||||
`app.db` wraps next.jdbc. Queries use a SQL builder that auto-converts kebab-case ↔ snake_case.
|
|
||||||
|
|
||||||
```clojure
|
|
||||||
;; Query helpers
|
|
||||||
(db/get cfg-or-pool :table {:id id}) ; fetch one row (throws if missing)
|
|
||||||
(db/get* cfg-or-pool :table {:id id}) ; fetch one row (returns nil)
|
|
||||||
(db/query cfg-or-pool :table {:team-id team-id}) ; fetch multiple rows
|
|
||||||
(db/insert! cfg-or-pool :table {:name "x" :team-id id}) ; insert
|
|
||||||
(db/update! cfg-or-pool :table {:name "y"} {:id id}) ; update
|
|
||||||
(db/delete! cfg-or-pool :table {:id id}) ; delete
|
|
||||||
|
|
||||||
;; Run multiple statements/queries on single connection
|
|
||||||
(db/run! cfg (fn [{:keys [::db/conn]}]
|
|
||||||
(db/insert! conn :table row1)
|
|
||||||
(db/insert! conn :table row2))
|
|
||||||
|
|
||||||
|
|
||||||
;; Transactions
|
|
||||||
(db/tx-run! cfg (fn [{:keys [::db/conn]}]
|
|
||||||
(db/insert! conn :table row)))
|
|
||||||
```
|
|
||||||
|
|
||||||
Almost all methods in the `app.db` namespace accept `pool`, `conn`, or
|
|
||||||
`cfg` as params.
|
|
||||||
|
|
||||||
Migrations live in `src/app/migrations/` as numbered SQL files. They run automatically on startup.
|
|
||||||
|
|
||||||
|
|
||||||
### Error Handling
|
|
||||||
|
|
||||||
The exception helpers are defined on Common module, and are available under
|
|
||||||
`app.common.exceptions` namespace.
|
|
||||||
|
|
||||||
Example of raising an exception:
|
|
||||||
|
|
||||||
```clojure
|
|
||||||
(ex/raise :type :not-found
|
|
||||||
:code :object-not-found
|
|
||||||
:hint "File does not exist"
|
|
||||||
:file-id id)
|
|
||||||
```
|
|
||||||
|
|
||||||
Common types: `:not-found`, `:validation`, `:authorization`, `:conflict`, `:internal`.
|
|
||||||
|
|
||||||
|
|
||||||
### Performance Macros (`app.common.data.macros`)
|
|
||||||
|
|
||||||
Always prefer these macros over their `clojure.core` equivalents — they provide
|
|
||||||
optimized implementations:
|
|
||||||
|
|
||||||
```clojure
|
|
||||||
(dm/select-keys m [:a :b]) ;; faster than core/select-keys
|
|
||||||
(dm/get-in obj [:a :b :c]) ;; faster than core/get-in
|
|
||||||
(dm/str "a" "b" "c") ;; string concatenation
|
|
||||||
```
|
|
||||||
|
|
||||||
### Configuration
|
|
||||||
|
|
||||||
`src/app/config.clj` reads `PENPOT_*` environment variables, validated with
|
|
||||||
Malli. Access anywhere via `(cf/get :smtp-host)`. Feature flags: `(cf/flags
|
|
||||||
:enable-smtp)`.
|
|
||||||
|
|
||||||
|
|
||||||
### Background Tasks
|
|
||||||
|
|
||||||
Background tasks live in `src/app/tasks/`. Each task is an Integrant component
|
|
||||||
that exposes a `::handler` key and follows this three-method pattern:
|
|
||||||
|
|
||||||
```clojure
|
|
||||||
(defmethod ig/assert-key ::handler ;; validate config at startup
|
|
||||||
[_ params]
|
|
||||||
(assert (db/pool? (::db/pool params)) "expected a valid database pool"))
|
|
||||||
|
|
||||||
(defmethod ig/expand-key ::handler ;; inject defaults before init
|
|
||||||
[k v]
|
|
||||||
{k (assoc v ::my-option default-value)})
|
|
||||||
|
|
||||||
(defmethod ig/init-key ::handler ;; return the task fn
|
|
||||||
[_ cfg]
|
|
||||||
(fn [_task] ;; receives the task row from the worker
|
|
||||||
(db/tx-run! cfg (fn [{:keys [::db/conn]}]
|
|
||||||
;; … do work …
|
|
||||||
))))
|
|
||||||
```
|
|
||||||
|
|
||||||
**Wiring a new task** requires two changes in `src/app/main.clj`:
|
|
||||||
|
|
||||||
1. **Handler config** – add an entry in `system-config` with the dependencies:
|
|
||||||
|
|
||||||
```clojure
|
|
||||||
:app.tasks.my-task/handler
|
|
||||||
{::db/pool (ig/ref ::db/pool)}
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **Registry + cron** – register the handler name and schedule it:
|
|
||||||
|
|
||||||
```clojure
|
|
||||||
;; in ::wrk/registry ::wrk/tasks map:
|
|
||||||
:my-task (ig/ref :app.tasks.my-task/handler)
|
|
||||||
|
|
||||||
;; in worker-config ::wrk/cron ::wrk/entries vector:
|
|
||||||
{:cron #penpot/cron "0 0 0 * * ?" ;; daily at midnight
|
|
||||||
:task :my-task}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Useful cron patterns** (Quartz format — six fields: s m h dom mon dow):
|
|
||||||
|
|
||||||
| Expression | Meaning |
|
|
||||||
|------------------------------|--------------------|
|
|
||||||
| `"0 0 0 * * ?"` | Daily at midnight |
|
|
||||||
| `"0 0 */6 * * ?"` | Every 6 hours |
|
|
||||||
| `"0 */5 * * * ?"` | Every 5 minutes |
|
|
||||||
|
|
||||||
**Time helpers** (`app.common.time`):
|
|
||||||
|
|
||||||
```clojure
|
|
||||||
(ct/now) ;; current instant
|
|
||||||
(ct/duration {:hours 1}) ;; java.time.Duration
|
|
||||||
(ct/minus (ct/now) some-duration) ;; subtract duration from instant
|
|
||||||
```
|
|
||||||
|
|
||||||
`db/interval` converts a `Duration` (or millis / string) to a PostgreSQL
|
|
||||||
interval object suitable for use in SQL queries:
|
|
||||||
|
|
||||||
```clojure
|
|
||||||
(db/interval (ct/duration {:hours 1})) ;; → PGInterval "3600.0 seconds"
|
|
||||||
```
|
|
||||||
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
:deps
|
:deps
|
||||||
{penpot/common {:local/root "../common"}
|
{penpot/common {:local/root "../common"}
|
||||||
org.clojure/clojure {:mvn/version "1.12.4"}
|
org.clojure/clojure {:mvn/version "1.12.2"}
|
||||||
org.clojure/tools.namespace {:mvn/version "1.5.0"}
|
org.clojure/tools.namespace {:mvn/version "1.5.0"}
|
||||||
|
|
||||||
com.github.luben/zstd-jni {:mvn/version "1.5.7-4"}
|
com.github.luben/zstd-jni {:mvn/version "1.5.7-4"}
|
||||||
@ -28,8 +28,8 @@
|
|||||||
com.google.guava/guava {:mvn/version "33.4.8-jre"}
|
com.google.guava/guava {:mvn/version "33.4.8-jre"}
|
||||||
|
|
||||||
funcool/yetti
|
funcool/yetti
|
||||||
{:git/tag "v11.9"
|
{:git/tag "v11.8"
|
||||||
:git/sha "5fad7a9"
|
:git/sha "1d1b33f"
|
||||||
:git/url "https://github.com/funcool/yetti.git"
|
:git/url "https://github.com/funcool/yetti.git"
|
||||||
:exclusions [org.slf4j/slf4j-api]}
|
:exclusions [org.slf4j/slf4j-api]}
|
||||||
|
|
||||||
@ -39,7 +39,7 @@
|
|||||||
metosin/reitit-core {:mvn/version "0.9.1"}
|
metosin/reitit-core {:mvn/version "0.9.1"}
|
||||||
nrepl/nrepl {:mvn/version "1.4.0"}
|
nrepl/nrepl {:mvn/version "1.4.0"}
|
||||||
|
|
||||||
org.postgresql/postgresql {:mvn/version "42.7.9"}
|
org.postgresql/postgresql {:mvn/version "42.7.7"}
|
||||||
org.xerial/sqlite-jdbc {:mvn/version "3.50.3.0"}
|
org.xerial/sqlite-jdbc {:mvn/version "3.50.3.0"}
|
||||||
|
|
||||||
com.zaxxer/HikariCP {:mvn/version "7.0.2"}
|
com.zaxxer/HikariCP {:mvn/version "7.0.2"}
|
||||||
@ -49,7 +49,7 @@
|
|||||||
buddy/buddy-hashers {:mvn/version "2.0.167"}
|
buddy/buddy-hashers {:mvn/version "2.0.167"}
|
||||||
buddy/buddy-sign {:mvn/version "3.6.1-359"}
|
buddy/buddy-sign {:mvn/version "3.6.1-359"}
|
||||||
|
|
||||||
com.github.ben-manes.caffeine/caffeine {:mvn/version "3.2.3"}
|
com.github.ben-manes.caffeine/caffeine {:mvn/version "3.2.2"}
|
||||||
|
|
||||||
org.jsoup/jsoup {:mvn/version "1.21.2"}
|
org.jsoup/jsoup {:mvn/version "1.21.2"}
|
||||||
org.im4java/im4java
|
org.im4java/im4java
|
||||||
@ -66,7 +66,7 @@
|
|||||||
|
|
||||||
;; Pretty Print specs
|
;; Pretty Print specs
|
||||||
pretty-spec/pretty-spec {:mvn/version "0.1.4"}
|
pretty-spec/pretty-spec {:mvn/version "0.1.4"}
|
||||||
software.amazon.awssdk/s3 {:mvn/version "2.41.21"}}
|
software.amazon.awssdk/s3 {:mvn/version "2.33.10"}}
|
||||||
|
|
||||||
:paths ["src" "resources" "target/classes"]
|
:paths ["src" "resources" "target/classes"]
|
||||||
:aliases
|
:aliases
|
||||||
@ -97,8 +97,8 @@
|
|||||||
|
|
||||||
:jmx-remote
|
:jmx-remote
|
||||||
{:jvm-opts ["-Dcom.sun.management.jmxremote"
|
{:jvm-opts ["-Dcom.sun.management.jmxremote"
|
||||||
"-Dcom.sun.management.jmxremote.port=9000"
|
"-Dcom.sun.management.jmxremote.port=9090"
|
||||||
"-Dcom.sun.management.jmxremote.rmi.port=9000"
|
"-Dcom.sun.management.jmxremote.rmi.port=9090"
|
||||||
"-Dcom.sun.management.jmxremote.local.only=false"
|
"-Dcom.sun.management.jmxremote.local.only=false"
|
||||||
"-Dcom.sun.management.jmxremote.authenticate=false"
|
"-Dcom.sun.management.jmxremote.authenticate=false"
|
||||||
"-Dcom.sun.management.jmxremote.ssl=false"
|
"-Dcom.sun.management.jmxremote.ssl=false"
|
||||||
|
|||||||
@ -27,7 +27,6 @@
|
|||||||
[app.common.transit :as t]
|
[app.common.transit :as t]
|
||||||
[app.common.types.file :as ctf]
|
[app.common.types.file :as ctf]
|
||||||
[app.common.uuid :as uuid]
|
[app.common.uuid :as uuid]
|
||||||
[app.common.uri :as u]
|
|
||||||
[app.config :as cf]
|
[app.config :as cf]
|
||||||
[app.db :as db]
|
[app.db :as db]
|
||||||
[app.main :as main]
|
[app.main :as main]
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
"license": "MPL-2.0",
|
"license": "MPL-2.0",
|
||||||
"author": "Kaleidos INC",
|
"author": "Kaleidos INC",
|
||||||
"private": true,
|
"private": true,
|
||||||
"packageManager": "pnpm@10.31.0+sha512.e3927388bfaa8078ceb79b748ffc1e8274e84d75163e67bc22e06c0d3aed43dd153151cbf11d7f8301ff4acb98c68bdc5cadf6989532801ffafe3b3e4a63c268",
|
"packageManager": "yarn@4.9.2+sha512.1fc009bc09d13cfd0e19efa44cbfc2b9cf6ca61482725eb35bbc5e257e093ebf4130db6dfe15d604ff4b79efd8e1e8e99b25fa7d0a6197c9f9826358d4d65c3c",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/penpot/penpot"
|
"url": "https://github.com/penpot/penpot"
|
||||||
@ -19,9 +19,8 @@
|
|||||||
"ws": "^8.17.0"
|
"ws": "^8.17.0"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"lint": "clj-kondo --parallel --lint ../common/src src/",
|
"fmt:clj:check": "cljfmt check --parallel=false src/ test/",
|
||||||
"check-fmt": "cljfmt check --parallel=true src/ test/",
|
"fmt:clj": "cljfmt fix --parallel=true src/ test/",
|
||||||
"fmt": "cljfmt fix --parallel=true src/ test/",
|
"lint:clj": "clj-kondo --parallel --lint src/"
|
||||||
"test": "clojure -M:dev:test"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
306
backend/pnpm-lock.yaml
generated
306
backend/pnpm-lock.yaml
generated
@ -1,306 +0,0 @@
|
|||||||
lockfileVersion: '9.0'
|
|
||||||
|
|
||||||
settings:
|
|
||||||
autoInstallPeers: true
|
|
||||||
excludeLinksFromLockfile: false
|
|
||||||
|
|
||||||
importers:
|
|
||||||
|
|
||||||
.:
|
|
||||||
dependencies:
|
|
||||||
luxon:
|
|
||||||
specifier: ^3.4.4
|
|
||||||
version: 3.7.2
|
|
||||||
sax:
|
|
||||||
specifier: ^1.4.1
|
|
||||||
version: 1.4.3
|
|
||||||
devDependencies:
|
|
||||||
nodemon:
|
|
||||||
specifier: ^3.1.2
|
|
||||||
version: 3.1.11
|
|
||||||
source-map-support:
|
|
||||||
specifier: ^0.5.21
|
|
||||||
version: 0.5.21
|
|
||||||
ws:
|
|
||||||
specifier: ^8.17.0
|
|
||||||
version: 8.18.3
|
|
||||||
|
|
||||||
packages:
|
|
||||||
|
|
||||||
anymatch@3.1.3:
|
|
||||||
resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
|
|
||||||
engines: {node: '>= 8'}
|
|
||||||
|
|
||||||
balanced-match@1.0.2:
|
|
||||||
resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
|
|
||||||
|
|
||||||
binary-extensions@2.3.0:
|
|
||||||
resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
|
|
||||||
engines: {node: '>=8'}
|
|
||||||
|
|
||||||
brace-expansion@1.1.12:
|
|
||||||
resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==}
|
|
||||||
|
|
||||||
braces@3.0.3:
|
|
||||||
resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
|
|
||||||
engines: {node: '>=8'}
|
|
||||||
|
|
||||||
buffer-from@1.1.2:
|
|
||||||
resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
|
|
||||||
|
|
||||||
chokidar@3.6.0:
|
|
||||||
resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
|
|
||||||
engines: {node: '>= 8.10.0'}
|
|
||||||
|
|
||||||
concat-map@0.0.1:
|
|
||||||
resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
|
|
||||||
|
|
||||||
debug@4.4.3:
|
|
||||||
resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
|
|
||||||
engines: {node: '>=6.0'}
|
|
||||||
peerDependencies:
|
|
||||||
supports-color: '*'
|
|
||||||
peerDependenciesMeta:
|
|
||||||
supports-color:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
fill-range@7.1.1:
|
|
||||||
resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
|
|
||||||
engines: {node: '>=8'}
|
|
||||||
|
|
||||||
fsevents@2.3.3:
|
|
||||||
resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
|
|
||||||
engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
|
|
||||||
os: [darwin]
|
|
||||||
|
|
||||||
glob-parent@5.1.2:
|
|
||||||
resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
|
|
||||||
engines: {node: '>= 6'}
|
|
||||||
|
|
||||||
has-flag@3.0.0:
|
|
||||||
resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
|
|
||||||
engines: {node: '>=4'}
|
|
||||||
|
|
||||||
ignore-by-default@1.0.1:
|
|
||||||
resolution: {integrity: sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==}
|
|
||||||
|
|
||||||
is-binary-path@2.1.0:
|
|
||||||
resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
|
|
||||||
engines: {node: '>=8'}
|
|
||||||
|
|
||||||
is-extglob@2.1.1:
|
|
||||||
resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
|
|
||||||
engines: {node: '>=0.10.0'}
|
|
||||||
|
|
||||||
is-glob@4.0.3:
|
|
||||||
resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
|
|
||||||
engines: {node: '>=0.10.0'}
|
|
||||||
|
|
||||||
is-number@7.0.0:
|
|
||||||
resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
|
|
||||||
engines: {node: '>=0.12.0'}
|
|
||||||
|
|
||||||
luxon@3.7.2:
|
|
||||||
resolution: {integrity: sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew==}
|
|
||||||
engines: {node: '>=12'}
|
|
||||||
|
|
||||||
minimatch@3.1.2:
|
|
||||||
resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
|
|
||||||
|
|
||||||
ms@2.1.3:
|
|
||||||
resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
|
|
||||||
|
|
||||||
nodemon@3.1.11:
|
|
||||||
resolution: {integrity: sha512-is96t8F/1//UHAjNPHpbsNY46ELPpftGUoSVNXwUfMk/qdjSylYrWSu1XavVTBOn526kFiOR733ATgNBCQyH0g==}
|
|
||||||
engines: {node: '>=10'}
|
|
||||||
hasBin: true
|
|
||||||
|
|
||||||
normalize-path@3.0.0:
|
|
||||||
resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
|
|
||||||
engines: {node: '>=0.10.0'}
|
|
||||||
|
|
||||||
picomatch@2.3.1:
|
|
||||||
resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
|
|
||||||
engines: {node: '>=8.6'}
|
|
||||||
|
|
||||||
pstree.remy@1.1.8:
|
|
||||||
resolution: {integrity: sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==}
|
|
||||||
|
|
||||||
readdirp@3.6.0:
|
|
||||||
resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
|
|
||||||
engines: {node: '>=8.10.0'}
|
|
||||||
|
|
||||||
sax@1.4.3:
|
|
||||||
resolution: {integrity: sha512-yqYn1JhPczigF94DMS+shiDMjDowYO6y9+wB/4WgO0Y19jWYk0lQ4tuG5KI7kj4FTp1wxPj5IFfcrz/s1c3jjQ==}
|
|
||||||
|
|
||||||
semver@7.7.3:
|
|
||||||
resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
|
|
||||||
engines: {node: '>=10'}
|
|
||||||
hasBin: true
|
|
||||||
|
|
||||||
simple-update-notifier@2.0.0:
|
|
||||||
resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==}
|
|
||||||
engines: {node: '>=10'}
|
|
||||||
|
|
||||||
source-map-support@0.5.21:
|
|
||||||
resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
|
|
||||||
|
|
||||||
source-map@0.6.1:
|
|
||||||
resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
|
|
||||||
engines: {node: '>=0.10.0'}
|
|
||||||
|
|
||||||
supports-color@5.5.0:
|
|
||||||
resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
|
|
||||||
engines: {node: '>=4'}
|
|
||||||
|
|
||||||
to-regex-range@5.0.1:
|
|
||||||
resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
|
|
||||||
engines: {node: '>=8.0'}
|
|
||||||
|
|
||||||
touch@3.1.1:
|
|
||||||
resolution: {integrity: sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==}
|
|
||||||
hasBin: true
|
|
||||||
|
|
||||||
undefsafe@2.0.5:
|
|
||||||
resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==}
|
|
||||||
|
|
||||||
ws@8.18.3:
|
|
||||||
resolution: {integrity: sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==}
|
|
||||||
engines: {node: '>=10.0.0'}
|
|
||||||
peerDependencies:
|
|
||||||
bufferutil: ^4.0.1
|
|
||||||
utf-8-validate: '>=5.0.2'
|
|
||||||
peerDependenciesMeta:
|
|
||||||
bufferutil:
|
|
||||||
optional: true
|
|
||||||
utf-8-validate:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
snapshots:
|
|
||||||
|
|
||||||
anymatch@3.1.3:
|
|
||||||
dependencies:
|
|
||||||
normalize-path: 3.0.0
|
|
||||||
picomatch: 2.3.1
|
|
||||||
|
|
||||||
balanced-match@1.0.2: {}
|
|
||||||
|
|
||||||
binary-extensions@2.3.0: {}
|
|
||||||
|
|
||||||
brace-expansion@1.1.12:
|
|
||||||
dependencies:
|
|
||||||
balanced-match: 1.0.2
|
|
||||||
concat-map: 0.0.1
|
|
||||||
|
|
||||||
braces@3.0.3:
|
|
||||||
dependencies:
|
|
||||||
fill-range: 7.1.1
|
|
||||||
|
|
||||||
buffer-from@1.1.2: {}
|
|
||||||
|
|
||||||
chokidar@3.6.0:
|
|
||||||
dependencies:
|
|
||||||
anymatch: 3.1.3
|
|
||||||
braces: 3.0.3
|
|
||||||
glob-parent: 5.1.2
|
|
||||||
is-binary-path: 2.1.0
|
|
||||||
is-glob: 4.0.3
|
|
||||||
normalize-path: 3.0.0
|
|
||||||
readdirp: 3.6.0
|
|
||||||
optionalDependencies:
|
|
||||||
fsevents: 2.3.3
|
|
||||||
|
|
||||||
concat-map@0.0.1: {}
|
|
||||||
|
|
||||||
debug@4.4.3(supports-color@5.5.0):
|
|
||||||
dependencies:
|
|
||||||
ms: 2.1.3
|
|
||||||
optionalDependencies:
|
|
||||||
supports-color: 5.5.0
|
|
||||||
|
|
||||||
fill-range@7.1.1:
|
|
||||||
dependencies:
|
|
||||||
to-regex-range: 5.0.1
|
|
||||||
|
|
||||||
fsevents@2.3.3:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
glob-parent@5.1.2:
|
|
||||||
dependencies:
|
|
||||||
is-glob: 4.0.3
|
|
||||||
|
|
||||||
has-flag@3.0.0: {}
|
|
||||||
|
|
||||||
ignore-by-default@1.0.1: {}
|
|
||||||
|
|
||||||
is-binary-path@2.1.0:
|
|
||||||
dependencies:
|
|
||||||
binary-extensions: 2.3.0
|
|
||||||
|
|
||||||
is-extglob@2.1.1: {}
|
|
||||||
|
|
||||||
is-glob@4.0.3:
|
|
||||||
dependencies:
|
|
||||||
is-extglob: 2.1.1
|
|
||||||
|
|
||||||
is-number@7.0.0: {}
|
|
||||||
|
|
||||||
luxon@3.7.2: {}
|
|
||||||
|
|
||||||
minimatch@3.1.2:
|
|
||||||
dependencies:
|
|
||||||
brace-expansion: 1.1.12
|
|
||||||
|
|
||||||
ms@2.1.3: {}
|
|
||||||
|
|
||||||
nodemon@3.1.11:
|
|
||||||
dependencies:
|
|
||||||
chokidar: 3.6.0
|
|
||||||
debug: 4.4.3(supports-color@5.5.0)
|
|
||||||
ignore-by-default: 1.0.1
|
|
||||||
minimatch: 3.1.2
|
|
||||||
pstree.remy: 1.1.8
|
|
||||||
semver: 7.7.3
|
|
||||||
simple-update-notifier: 2.0.0
|
|
||||||
supports-color: 5.5.0
|
|
||||||
touch: 3.1.1
|
|
||||||
undefsafe: 2.0.5
|
|
||||||
|
|
||||||
normalize-path@3.0.0: {}
|
|
||||||
|
|
||||||
picomatch@2.3.1: {}
|
|
||||||
|
|
||||||
pstree.remy@1.1.8: {}
|
|
||||||
|
|
||||||
readdirp@3.6.0:
|
|
||||||
dependencies:
|
|
||||||
picomatch: 2.3.1
|
|
||||||
|
|
||||||
sax@1.4.3: {}
|
|
||||||
|
|
||||||
semver@7.7.3: {}
|
|
||||||
|
|
||||||
simple-update-notifier@2.0.0:
|
|
||||||
dependencies:
|
|
||||||
semver: 7.7.3
|
|
||||||
|
|
||||||
source-map-support@0.5.21:
|
|
||||||
dependencies:
|
|
||||||
buffer-from: 1.1.2
|
|
||||||
source-map: 0.6.1
|
|
||||||
|
|
||||||
source-map@0.6.1: {}
|
|
||||||
|
|
||||||
supports-color@5.5.0:
|
|
||||||
dependencies:
|
|
||||||
has-flag: 3.0.0
|
|
||||||
|
|
||||||
to-regex-range@5.0.1:
|
|
||||||
dependencies:
|
|
||||||
is-number: 7.0.0
|
|
||||||
|
|
||||||
touch@3.1.1: {}
|
|
||||||
|
|
||||||
undefsafe@2.0.5: {}
|
|
||||||
|
|
||||||
ws@8.18.3: {}
|
|
||||||
@ -8,41 +8,38 @@
|
|||||||
<body>
|
<body>
|
||||||
<p>
|
<p>
|
||||||
<strong>Feedback from:</strong><br />
|
<strong>Feedback from:</strong><br />
|
||||||
<span>
|
{% if profile %}
|
||||||
<span>Name: </span>
|
<span>
|
||||||
<span><code>{{profile.fullname|abbreviate:25}}</code></span>
|
<span>Name: </span>
|
||||||
</span>
|
<span><code>{{profile.fullname|abbreviate:25}}</code></span>
|
||||||
<br />
|
</span>
|
||||||
<span>
|
<br />
|
||||||
<span>Email: </span>
|
|
||||||
<span>{{profile.email}}</span>
|
<span>
|
||||||
</span>
|
<span>Email: </span>
|
||||||
<br />
|
<span>{{profile.email}}</span>
|
||||||
<span>
|
</span>
|
||||||
<span>ID: </span>
|
<br />
|
||||||
<span><code>{{profile.id}}</code></span>
|
|
||||||
</span>
|
<span>
|
||||||
|
<span>ID: </span>
|
||||||
|
<span><code>{{profile.id}}</code></span>
|
||||||
|
</span>
|
||||||
|
{% else %}
|
||||||
|
<span>
|
||||||
|
<span>Email: </span>
|
||||||
|
<span>{{profile.email}}</span>
|
||||||
|
</span>
|
||||||
|
{% endif %}
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
<strong>Subject:</strong><br />
|
<strong>Subject:</strong><br />
|
||||||
<span>{{feedback-subject|abbreviate:300}}</span>
|
<span>{{subject|abbreviate:300}}</span>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
|
||||||
<strong>Type:</strong><br />
|
|
||||||
<span>{{feedback-type|abbreviate:300}}</span>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
{% if feedback-error-href %}
|
|
||||||
<p>
|
|
||||||
<strong>Error HREF:</strong><br />
|
|
||||||
<span>{{feedback-error-href|abbreviate:500}}</span>
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<strong>Message:</strong><br />
|
<strong>Message:</strong><br />
|
||||||
{{feedback-content|linebreaks-br}}
|
{{content|linebreaks-br|safe}}
|
||||||
</p>
|
</p>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
[PENPOT FEEDBACK]: {{feedback-subject}}
|
[PENPOT FEEDBACK]: {{subject}}
|
||||||
|
|||||||
@ -1,11 +1,9 @@
|
|||||||
From: {{profile.fullname}} <{{profile.email}}> / {{profile.id}}
|
{% if profile %}
|
||||||
Subject: {{feedback-subject}}
|
Feedback profile: {{profile.fullname}} <{{profile.email}}> / {{profile.id}}
|
||||||
Type: {{feedback-type}}
|
{% else %}
|
||||||
|
Feedback from: {{email}}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% if feedback-error-href %}
|
Subject: {{subject}}
|
||||||
HREF: {{feedback-error-href}}
|
|
||||||
{% endif -%}
|
|
||||||
|
|
||||||
Message:
|
{{content}}
|
||||||
|
|
||||||
{{feedback-content}}
|
|
||||||
|
|||||||
@ -1,264 +0,0 @@
|
|||||||
<!doctype html>
|
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
|
|
||||||
xmlns:o="urn:schemas-microsoft-com:office:office">
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<title>
|
|
||||||
</title>
|
|
||||||
<!--[if !mso]><!-- -->
|
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
|
||||||
<!--<![endif]-->
|
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
<style type="text/css">
|
|
||||||
#outlook a {
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
-webkit-text-size-adjust: 100%;
|
|
||||||
-ms-text-size-adjust: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
table,
|
|
||||||
td {
|
|
||||||
border-collapse: collapse;
|
|
||||||
mso-table-lspace: 0pt;
|
|
||||||
mso-table-rspace: 0pt;
|
|
||||||
}
|
|
||||||
|
|
||||||
img {
|
|
||||||
border: 0;
|
|
||||||
height: auto;
|
|
||||||
line-height: 100%;
|
|
||||||
outline: none;
|
|
||||||
text-decoration: none;
|
|
||||||
-ms-interpolation-mode: bicubic;
|
|
||||||
}
|
|
||||||
|
|
||||||
p {
|
|
||||||
display: block;
|
|
||||||
margin: 13px 0;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<!--[if mso]>
|
|
||||||
<xml>
|
|
||||||
<o:OfficeDocumentSettings>
|
|
||||||
<o:AllowPNG/>
|
|
||||||
<o:PixelsPerInch>96</o:PixelsPerInch>
|
|
||||||
</o:OfficeDocumentSettings>
|
|
||||||
</xml>
|
|
||||||
<![endif]-->
|
|
||||||
<!--[if lte mso 11]>
|
|
||||||
<style type="text/css">
|
|
||||||
.mj-outlook-group-fix { width:100% !important; }
|
|
||||||
</style>
|
|
||||||
<![endif]-->
|
|
||||||
<!--[if !mso]><!-->
|
|
||||||
<link href="https://fonts.googleapis.com/css?family=Source%20Sans%20Pro" rel="stylesheet" type="text/css">
|
|
||||||
<style type="text/css">
|
|
||||||
@import url(https://fonts.googleapis.com/css?family=Source%20Sans%20Pro);
|
|
||||||
</style>
|
|
||||||
<!--<![endif]-->
|
|
||||||
<style type="text/css">
|
|
||||||
@media only screen and (min-width:480px) {
|
|
||||||
.mj-column-per-100 {
|
|
||||||
width: 100% !important;
|
|
||||||
max-width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mj-column-px-425 {
|
|
||||||
width: 425px !important;
|
|
||||||
max-width: 425px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<style type="text/css">
|
|
||||||
@media only screen and (max-width:480px) {
|
|
||||||
table.mj-full-width-mobile {
|
|
||||||
width: 100% !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
td.mj-full-width-mobile {
|
|
||||||
width: auto !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body style="background-color:#E5E5E5;">
|
|
||||||
<div style="background-color:#E5E5E5;">
|
|
||||||
<!--[if mso | IE]>
|
|
||||||
<table
|
|
||||||
align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
|
|
||||||
>
|
|
||||||
<tr>
|
|
||||||
<td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
|
|
||||||
<![endif]-->
|
|
||||||
<div style="margin:0px auto;max-width:600px;">
|
|
||||||
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
|
||||||
<tbody>
|
|
||||||
<tr>
|
|
||||||
<td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
|
|
||||||
<!--[if mso | IE]>
|
|
||||||
<table role="presentation" border="0" cellpadding="0" cellspacing="0">
|
|
||||||
|
|
||||||
<tr>
|
|
||||||
|
|
||||||
<td
|
|
||||||
class="" style="vertical-align:top;width:600px;"
|
|
||||||
>
|
|
||||||
<![endif]-->
|
|
||||||
<div class="mj-column-per-100 mj-outlook-group-fix"
|
|
||||||
style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
|
|
||||||
<table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
|
|
||||||
width="100%">
|
|
||||||
<tr>
|
|
||||||
<td align="left" style="font-size:0px;padding:16px;word-break:break-word;">
|
|
||||||
<table border="0" cellpadding="0" cellspacing="0" role="presentation"
|
|
||||||
style="border-collapse:collapse;border-spacing:0px;">
|
|
||||||
<tbody>
|
|
||||||
<tr>
|
|
||||||
<td style="width:97px;">
|
|
||||||
<img height="32" src="{{ public-uri }}/images/email/uxbox-title.png"
|
|
||||||
style="border:0;display:block;outline:none;text-decoration:none;height:32px;width:100%;font-size:13px;"
|
|
||||||
width="97" />
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<!--[if mso | IE]>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
</table>
|
|
||||||
<![endif]-->
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<!--[if mso | IE]>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
<table
|
|
||||||
align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
|
|
||||||
>
|
|
||||||
<tr>
|
|
||||||
<td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
|
|
||||||
<![endif]-->
|
|
||||||
<div style="background:#FFFFFF;background-color:#FFFFFF;margin:0px auto;max-width:600px;">
|
|
||||||
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
|
|
||||||
style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
|
|
||||||
<tbody>
|
|
||||||
<tr>
|
|
||||||
<td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
|
|
||||||
<!--[if mso | IE]>
|
|
||||||
<table role="presentation" border="0" cellpadding="0" cellspacing="0">
|
|
||||||
|
|
||||||
<tr>
|
|
||||||
|
|
||||||
<td
|
|
||||||
class="" style="vertical-align:top;width:600px;"
|
|
||||||
>
|
|
||||||
<![endif]-->
|
|
||||||
<div class="mj-column-per-100 mj-outlook-group-fix"
|
|
||||||
style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
|
|
||||||
<table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
|
|
||||||
width="100%">
|
|
||||||
<tr>
|
|
||||||
<td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
|
|
||||||
<div
|
|
||||||
style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
|
|
||||||
Hi{% if user-name %} {{ user-name|abbreviate:25 }}{% endif %},
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
|
|
||||||
<div
|
|
||||||
style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
|
|
||||||
<b>{{invited-by|abbreviate:25}}</b> sent you an invitation to join the organization:
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
|
|
||||||
<div
|
|
||||||
style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
|
|
||||||
<table role="presentation" cellpadding="0" cellspacing="0" border="0" width="20" height="20" style="display:inline-block;vertical-align:middle;">
|
|
||||||
<tr>
|
|
||||||
<td width="20" height="20" align="center" valign="middle"
|
|
||||||
background="{{organization-logo}}"
|
|
||||||
style="width:20px;height:20px;text-align:center;font-weight:bold;font-size:9px;line-height:20px;color:#ffffff;background-size:cover;background-position:center;background-repeat:no-repeat;border-radius: 50%;color:black">
|
|
||||||
{% if organization-initials %}{{organization-initials}}{% endif %}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
<span style="display:inline-block; vertical-align: middle;padding-left:5px;height:20px;line-height: 20px;">
|
|
||||||
“{{ organization-name|abbreviate:25 }}”
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td align="center" vertical-align="middle"
|
|
||||||
style="font-size:0px;padding:10px 25px;word-break:break-word;">
|
|
||||||
<table border="0" cellpadding="0" cellspacing="0" role="presentation"
|
|
||||||
style="border-collapse:separate;line-height:100%;">
|
|
||||||
<tr>
|
|
||||||
<td align="center" bgcolor="#6911d4" role="presentation"
|
|
||||||
style="border:none;border-radius:8px;cursor:auto;mso-padding-alt:10px 25px;background:#6911d4;"
|
|
||||||
valign="middle">
|
|
||||||
<a href="{{ public-uri }}/#/auth/verify-token?token={{token}}"
|
|
||||||
style="display:inline-block;background:#6911d4;color:#FFFFFF;font-family:Source Sans Pro, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:8px;"
|
|
||||||
target="_blank"> ACCEPT INVITE </a>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
|
|
||||||
<div
|
|
||||||
style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
|
|
||||||
Enjoy!</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
|
|
||||||
<div
|
|
||||||
style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
|
|
||||||
The Penpot team.</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<!--[if mso | IE]>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
</table>
|
|
||||||
<![endif]-->
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% include "app/email/includes/footer.html" %}
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
@ -1 +0,0 @@
|
|||||||
{{invited-by|abbreviate:25}} has invited you to join the organization “{{ organization-name|abbreviate:25 }}”
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
Hello!
|
|
||||||
|
|
||||||
{{invited-by|abbreviate:25}} has invited you to join the organization “{{ organization-name|abbreviate:25 }}”.
|
|
||||||
|
|
||||||
Accept invitation using this link:
|
|
||||||
|
|
||||||
{{ public-uri }}/#/auth/verify-token?token={{token}}
|
|
||||||
|
|
||||||
Enjoy!
|
|
||||||
The Penpot team.
|
|
||||||
@ -186,8 +186,7 @@
|
|||||||
<td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
|
<td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
|
||||||
<div
|
<div
|
||||||
style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
|
style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
|
||||||
{{invited-by|abbreviate:25}} has invited you to join the team “{{ team|abbreviate:25 }}”{% if organization %}
|
{{invited-by|abbreviate:25}} has invited you to join the team “{{ team|abbreviate:25 }}”.</div>
|
||||||
part of the organization “{{ organization|abbreviate:25 }}”{% endif %}.</div>
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
@ -241,4 +240,4 @@
|
|||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Hello!
|
Hello!
|
||||||
|
|
||||||
{{invited-by|abbreviate:25}} has invited you to join the team "{{ team|abbreviate:25 }}"{% if organization %}, part of the organization "{{ organization|abbreviate:25 }}"{% endif %}.
|
{{invited-by|abbreviate:25}} has invited you to join the team “{{ team|abbreviate:25 }}”.
|
||||||
|
|
||||||
Accept invitation using this link:
|
Accept invitation using this link:
|
||||||
|
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
:file-uri "https://github.com/penpot/penpot-files/raw/refs/heads/main/Tokens%20starter%20kit.penpot"}
|
:file-uri "https://github.com/penpot/penpot-files/raw/refs/heads/main/Tokens%20starter%20kit.penpot"}
|
||||||
{:id "penpot-design-system"
|
{:id "penpot-design-system"
|
||||||
:name "Penpot Design System | Pencil"
|
:name "Penpot Design System | Pencil"
|
||||||
:file-uri "https://github.com/penpot/penpot-files/raw/refs/heads/main/Pencil-Penpot-Design-System.penpot"}
|
:file-uri "https://github.com/penpot/penpot-files/raw/refs/heads/main/penpot-app.penpot"}
|
||||||
{:id "wireframing-kit"
|
{:id "wireframing-kit"
|
||||||
:name "Wireframe library"
|
:name "Wireframe library"
|
||||||
:file-uri "https://github.com/penpot/penpot-files/raw/refs/heads/main/Wireframing%20kit%20v1.1.penpot"}
|
:file-uri "https://github.com/penpot/penpot-files/raw/refs/heads/main/Wireframing%20kit%20v1.1.penpot"}
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<meta name="robots" content="noindex,nofollow">
|
<meta name="robots" content="noindex,nofollow">
|
||||||
<meta http-equiv="x-ua-compatible" content="ie=edge" />
|
<meta http-equiv="x-ua-compatible" content="ie=edge" />
|
||||||
<title>{{label|upper}} API Documentation</title>
|
<title>Builtin API Documentation - Penpot</title>
|
||||||
|
|
||||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||||
@ -19,7 +19,7 @@
|
|||||||
<body>
|
<body>
|
||||||
<main>
|
<main>
|
||||||
<header>
|
<header>
|
||||||
<h1>{{label|upper}}: API Documentation (v{{version}})</h1>
|
<h1>Penpot API Documentation (v{{version}})</h1>
|
||||||
<small class="menu">
|
<small class="menu">
|
||||||
[
|
[
|
||||||
<nav>
|
<nav>
|
||||||
@ -31,10 +31,9 @@
|
|||||||
</header>
|
</header>
|
||||||
<section class="doc-content">
|
<section class="doc-content">
|
||||||
<h2>INTRODUCTION</h2>
|
<h2>INTRODUCTION</h2>
|
||||||
<p>This documentation is intended to be a general overview of
|
<p>This documentation is intended to be a general overview of the penpot RPC API.
|
||||||
the {{label}} API. If you prefer, you can
|
If you prefer, you can use <a href="/api/openapi.json">OpenAPI</a>
|
||||||
use <a href="{{openapi}}">Swagger/OpenAPI</a> as
|
and/or <a href="/api/openapi">SwaggerUI</a> as alternative.</p>
|
||||||
alternative.</p>
|
|
||||||
|
|
||||||
<h2>GENERAL NOTES</h2>
|
<h2>GENERAL NOTES</h2>
|
||||||
|
|
||||||
@ -44,7 +43,7 @@
|
|||||||
that starts with <b>get-</b> in the name, can use GET HTTP
|
that starts with <b>get-</b> in the name, can use GET HTTP
|
||||||
method which in many cases benefits from the HTTP cache.</p>
|
method which in many cases benefits from the HTTP cache.</p>
|
||||||
|
|
||||||
{% block auth-section %}
|
|
||||||
<h3>Authentication</h3>
|
<h3>Authentication</h3>
|
||||||
<p>The penpot backend right now offers two way for authenticate the request:
|
<p>The penpot backend right now offers two way for authenticate the request:
|
||||||
<b>cookies</b> (the same mechanism that we use ourselves on accessing the API from the
|
<b>cookies</b> (the same mechanism that we use ourselves on accessing the API from the
|
||||||
@ -57,10 +56,9 @@
|
|||||||
<p>The access token can be obtained on the appropriate section on profile settings
|
<p>The access token can be obtained on the appropriate section on profile settings
|
||||||
and it should be provided using <b>`Authorization`</b> header with <b>`Token
|
and it should be provided using <b>`Authorization`</b> header with <b>`Token
|
||||||
<token-string>`</b> value.</p>
|
<token-string>`</b> value.</p>
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
<h3>Content Negotiation</h3>
|
<h3>Content Negotiation</h3>
|
||||||
<p>This API operates indistinctly with: <b>`application/json`</b>
|
<p>The penpot API by default operates indistinctly with: <b>`application/json`</b>
|
||||||
and <b>`application/transit+json`</b> content types. You should specify the
|
and <b>`application/transit+json`</b> content types. You should specify the
|
||||||
desired content-type on the <b>`Accept`</b> header, the transit encoding is used
|
desired content-type on the <b>`Accept`</b> header, the transit encoding is used
|
||||||
by default.</p>
|
by default.</p>
|
||||||
@ -77,16 +75,13 @@
|
|||||||
standard <a href="https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API">Fetch
|
standard <a href="https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API">Fetch
|
||||||
API</a></p>
|
API</a></p>
|
||||||
|
|
||||||
{% block limits-section %}
|
|
||||||
<h3>Limits</h3>
|
<h3>Limits</h3>
|
||||||
<p>The rate limit work per user basis (this means that different api keys share
|
<p>The rate limit work per user basis (this means that different api keys share
|
||||||
the same rate limit). For now the limits are not documented because we are
|
the same rate limit). For now the limits are not documented because we are
|
||||||
studying and analyzing the data. As a general rule, it should not be abused, if an
|
studying and analyzing the data. As a general rule, it should not be abused, if an
|
||||||
abusive use is detected, we will proceed to block the user's access to the
|
abusive use is detected, we will proceed to block the user's access to the
|
||||||
API.</p>
|
API.</p>
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block webhooks-section %}
|
|
||||||
<h3>Webhooks</h3>
|
<h3>Webhooks</h3>
|
||||||
<p>All methods that emit webhook events are marked with flag <b>WEBHOOK</b>, the
|
<p>All methods that emit webhook events are marked with flag <b>WEBHOOK</b>, the
|
||||||
data structure defined on each method represents the <i>payload</i> of the
|
data structure defined on each method represents the <i>payload</i> of the
|
||||||
@ -102,11 +97,9 @@
|
|||||||
"profileId": "db601c95-045f-808b-8002-361312e63531"
|
"profileId": "db601c95-045f-808b-8002-361312e63531"
|
||||||
}
|
}
|
||||||
</pre>
|
</pre>
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
</section>
|
</section>
|
||||||
<section class="rpc-doc-content">
|
<section class="rpc-doc-content">
|
||||||
<h2>METHODS REFERENCE:</h2>
|
<h2>RPC METHODS REFERENCE:</h2>
|
||||||
<ul class="rpc-items">
|
<ul class="rpc-items">
|
||||||
{% for item in methods %}
|
{% for item in methods %}
|
||||||
{% include "app/templates/api-doc-entry.tmpl" with item=item %}
|
{% include "app/templates/api-doc-entry.tmpl" with item=item %}
|
||||||
|
|||||||
@ -5,6 +5,7 @@
|
|||||||
<meta name="robots" content="noindex,nofollow">
|
<meta name="robots" content="noindex,nofollow">
|
||||||
<meta http-equiv="x-ua-compatible" content="ie=edge" />
|
<meta http-equiv="x-ua-compatible" content="ie=edge" />
|
||||||
<title>{% block title %}{% endblock %}</title>
|
<title>{% block title %}{% endblock %}</title>
|
||||||
|
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=JetBrains+Mono">
|
||||||
<style>
|
<style>
|
||||||
{% include "app/templates/styles.css" %}
|
{% include "app/templates/styles.css" %}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@ -12,22 +12,43 @@ Debug Main Page
|
|||||||
</nav>
|
</nav>
|
||||||
<main class="dashboard">
|
<main class="dashboard">
|
||||||
<section class="widget">
|
<section class="widget">
|
||||||
|
<fieldset>
|
||||||
|
<legend>Error reports</legend>
|
||||||
|
<desc><a href="/dbg/error">CLICK HERE TO SEE THE ERROR REPORTS</a> </desc>
|
||||||
|
</fieldset>
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend>CURRENT PROFILE</legend>
|
<legend>Profile Management</legend>
|
||||||
<desc>
|
<form method="post" action="/dbg/actions/resend-email-verification">
|
||||||
<p>
|
<div class="row">
|
||||||
Name: <b>{{profile.fullname}}</b> <br />
|
<input type="email" name="email" placeholder="example@example.com" value="" />
|
||||||
Email: <b>{{profile.email}}</b>
|
</div>
|
||||||
</p>
|
|
||||||
</desc>
|
<div class="row">
|
||||||
|
<label for="force-verify">Are you sure?</label>
|
||||||
|
<input id="force-verify" type="checkbox" name="force" />
|
||||||
|
<br />
|
||||||
|
<small>
|
||||||
|
This is a just a security double check for prevent non intentional submits.
|
||||||
|
</small>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<input type="submit" name="resend" value="Resend Verification" />
|
||||||
|
<input type="submit" name="verify" value="Verify" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<input type="submit" class="danger" name="block" value="Block" />
|
||||||
|
<input type="submit" class="danger" name="unblock" value="Unblock" />
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend>VIRTUAL CLOCK</legend>
|
<legend>VIRTUAL CLOCK</legend>
|
||||||
|
|
||||||
<desc>
|
<desc>
|
||||||
<p><b>IMPORTANT:</b> The virtual clock is profile based and only affects the currently logged-in profile.</p>
|
|
||||||
<p>
|
<p>
|
||||||
CURRENT CLOCK: <b>{{current-clock}}</b>
|
CURRENT CLOCK: <b>{{current-clock}}</b>
|
||||||
<br />
|
<br />
|
||||||
@ -60,93 +81,8 @@ Debug Main Page
|
|||||||
</form>
|
</form>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
<fieldset>
|
|
||||||
<legend>ERROR REPORTS</legend>
|
|
||||||
<desc><a href="/dbg/error">CLICK HERE TO SEE THE ERROR REPORTS</a> </desc>
|
|
||||||
</fieldset>
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|
||||||
<section class="widget">
|
|
||||||
<fieldset>
|
|
||||||
<legend>Profile Management</legend>
|
|
||||||
<form method="post" action="/dbg/actions/resend-email-verification">
|
|
||||||
<div class="row">
|
|
||||||
<input type="email" name="email" placeholder="example@example.com" value="" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<label for="force-verify">Are you sure?</label>
|
|
||||||
<input id="force-verify" type="checkbox" name="force" />
|
|
||||||
<br />
|
|
||||||
<small>
|
|
||||||
This is a just a security double check for prevent non intentional submits.
|
|
||||||
</small>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<input type="submit" name="resend" value="Resend Verification" />
|
|
||||||
<input type="submit" name="verify" value="Verify" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<input type="submit" class="danger" name="block" value="Block" />
|
|
||||||
<input type="submit" class="danger" name="unblock" value="Unblock" />
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</fieldset>
|
|
||||||
|
|
||||||
|
|
||||||
<fieldset>
|
|
||||||
<legend>Feature Flags for Team</legend>
|
|
||||||
<desc>Add a feature flag to a team</desc>
|
|
||||||
<form method="post" action="/dbg/actions/handle-team-features">
|
|
||||||
<div class="row">
|
|
||||||
<input type="text" style="width:300px" name="team-id" placeholder="team-id" />
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<select type="text" style="width:100px" name="feature">
|
|
||||||
{% for feature in supported-features %}
|
|
||||||
<option value="{{feature}}">{{feature}}</option>
|
|
||||||
{% endfor %}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<select style="width:100px" name="action">
|
|
||||||
<option value="">Action...</option>
|
|
||||||
<option value="show">Show</option>
|
|
||||||
<option value="enable">Enable</option>
|
|
||||||
<option value="disable">Disable</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<label for="check-feature">Skip feature check</label>
|
|
||||||
<input id="check-feature" type="checkbox" name="skip-check" />
|
|
||||||
<br />
|
|
||||||
<small>
|
|
||||||
Do not check if the feature is supported
|
|
||||||
</small>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<label for="force-version">Are you sure?</label>
|
|
||||||
<input id="force-version" type="checkbox" name="force" />
|
|
||||||
<br />
|
|
||||||
<small>
|
|
||||||
This is a just a security double check for prevent non intentional submits.
|
|
||||||
</small>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<input type="submit" value="Submit" />
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</fieldset>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
|
|
||||||
<section class="widget">
|
<section class="widget">
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
@ -237,5 +173,55 @@ Debug Main Page
|
|||||||
</form>
|
</form>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<section class="widget">
|
||||||
|
<fieldset>
|
||||||
|
<legend>Feature Flags for Team</legend>
|
||||||
|
<desc>Add a feature flag to a team</desc>
|
||||||
|
<form method="post" action="/dbg/actions/handle-team-features">
|
||||||
|
<div class="row">
|
||||||
|
<input type="text" style="width:300px" name="team-id" placeholder="team-id" />
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<select type="text" style="width:100px" name="feature">
|
||||||
|
{% for feature in supported-features %}
|
||||||
|
<option value="{{feature}}">{{feature}}</option>
|
||||||
|
{% endfor %}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<select style="width:100px" name="action">
|
||||||
|
<option value="">Action...</option>
|
||||||
|
<option value="show">Show</option>
|
||||||
|
<option value="enable">Enable</option>
|
||||||
|
<option value="disable">Disable</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<label for="check-feature">Skip feature check</label>
|
||||||
|
<input id="check-feature" type="checkbox" name="skip-check" />
|
||||||
|
<br />
|
||||||
|
<small>
|
||||||
|
Do not check if the feature is supported
|
||||||
|
</small>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<label for="force-version">Are you sure?</label>
|
||||||
|
<input id="force-version" type="checkbox" name="force" />
|
||||||
|
<br />
|
||||||
|
<small>
|
||||||
|
This is a just a security double check for prevent non intentional submits.
|
||||||
|
</small>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<input type="submit" value="Submit" />
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</fieldset>
|
||||||
|
</section>
|
||||||
</main>
|
</main>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@ -5,26 +5,23 @@ penpot - error list
|
|||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<nav>
|
<nav>
|
||||||
<div class="title">
|
<div class="title">
|
||||||
<a href="/dbg"> [BACK]</a>
|
<h1>Error reports (last 200)
|
||||||
<h1>Error reports (last 300)</h1>
|
<a href="/dbg">[GO BACK]</a>
|
||||||
|
</h1>
|
||||||
<a class="{% if version = 3 %}strong{% endif %}" href="?version=3">[BACKEND ERRORS]</a>
|
</div>
|
||||||
<a class="{% if version = 4 %}strong{% endif %}" href="?version=4">[FRONTEND ERRORS]</a>
|
</nav>
|
||||||
<a class="{% if version = 5 %}strong{% endif %}" href="?version=5">[RLIMIT REPORTS]</a>
|
<main class="horizontal-list">
|
||||||
</div>
|
<ul>
|
||||||
</nav>
|
{% for item in items %}
|
||||||
<main class="horizontal-list">
|
<li>
|
||||||
<ul>
|
<a class="date" href="/dbg/error/{{item.id}}">{{item.created-at}}</a>
|
||||||
{% for item in items %}
|
<a class="hint" href="/dbg/error/{{item.id}}">
|
||||||
<li>
|
<span class="title">{{item.hint|abbreviate:150}}</span>
|
||||||
<a class="date" href="/dbg/error/{{item.id}}">{{item.created-at}}</a>
|
</a>
|
||||||
<a class="hint" href="/dbg/error/{{item.id}}">
|
</li>
|
||||||
<span class="title">{{item.hint|abbreviate:150}}</span>
|
{% endfor %}
|
||||||
</a>
|
</ul>
|
||||||
</li>
|
</main>
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
</main>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@ -6,7 +6,7 @@ Report: {{hint|abbreviate:150}} - {{id}} - Penpot Error Report (v3)
|
|||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<nav>
|
<nav>
|
||||||
<div>[<a href="/dbg/error?version={{version}}">⮜</a>]</div>
|
<div>[<a href="/dbg/error">⮜</a>]</div>
|
||||||
<div>[<a href="#head">head</a>]</div>
|
<div>[<a href="#head">head</a>]</div>
|
||||||
<div>[<a href="#props">props</a>]</div>
|
<div>[<a href="#props">props</a>]</div>
|
||||||
<div>[<a href="#context">context</a>]</div>
|
<div>[<a href="#context">context</a>]</div>
|
||||||
|
|||||||
@ -1,46 +0,0 @@
|
|||||||
{% extends "app/templates/base.tmpl" %}
|
|
||||||
|
|
||||||
{% block title %}
|
|
||||||
Report: {{hint|abbreviate:150}} - {{id}} - Penpot Error Report (v4)
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<nav>
|
|
||||||
<div>[<a href="/dbg/error?version={{version}}">⮜</a>]</div>
|
|
||||||
<div>[<a href="#head">head</a>]</div>
|
|
||||||
<div>[<a href="#context">context</a>]</div>
|
|
||||||
{% if report %}
|
|
||||||
<div>[<a href="#report">report</a>]</div>
|
|
||||||
{% endif %}
|
|
||||||
</nav>
|
|
||||||
<main>
|
|
||||||
<div class="table">
|
|
||||||
<div class="table-row multiline">
|
|
||||||
<div id="head" class="table-key">HEAD</div>
|
|
||||||
<div class="table-val">
|
|
||||||
<h1><span class="not-important">Hint:</span> <br/> {{hint}}</h1>
|
|
||||||
<h2><span class="not-important">Reported at:</span> <br/> {{created-at}}</h2>
|
|
||||||
<h2><span class="not-important">Origin:</span> <br/> {{origin}}</h2>
|
|
||||||
<h2><span class="not-important">HREF:</span> <br/> {{href}}</h2>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="table-row multiline">
|
|
||||||
<div id="context" class="table-key">CONTEXT: </div>
|
|
||||||
|
|
||||||
<div class="table-val">
|
|
||||||
<pre>{{context}}</pre>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% if report %}
|
|
||||||
<div class="table-row multiline">
|
|
||||||
<div id="report" class="table-key">REPORT:</div>
|
|
||||||
<div class="table-val">
|
|
||||||
<pre>{{report}}</pre>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
{% endblock %}
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
{% extends "app/templates/base.tmpl" %}
|
|
||||||
|
|
||||||
{% block title %}
|
|
||||||
Report: {{hint|abbreviate:150}} - {{id}} - Penpot Rate Limit Report
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<nav>
|
|
||||||
<div>[<a href="/dbg/error?version={{version}}">⮜</a>]</div>
|
|
||||||
<div>[<a href="#head">head</a>]</div>
|
|
||||||
<div>[<a href="#context">context</a>]</div>
|
|
||||||
<div>[<a href="#result">result</a>]</div>
|
|
||||||
</nav>
|
|
||||||
<main>
|
|
||||||
<div class="table">
|
|
||||||
<div class="table-row multiline">
|
|
||||||
<div id="head" class="table-key">HEAD:</div>
|
|
||||||
<div class="table-val">
|
|
||||||
<h1><span class="not-important">Hint:</span> <br/> {{hint}}</h1>
|
|
||||||
<h2><span class="not-important">Reported at:</span> <br/> {{created-at}}</h2>
|
|
||||||
<h2><span class="not-important">Report ID:</span> <br/> {{id}}</h2>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="table-row multiline">
|
|
||||||
<div id="context" class="table-key">CONTEXT: </div>
|
|
||||||
<div class="table-val">
|
|
||||||
<pre>{{context}}</pre>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="table-row multiline">
|
|
||||||
<div id="result" class="table-key">RESULT: </div>
|
|
||||||
<div class="table-val">
|
|
||||||
<pre>{{result}}</pre>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
{% endblock %}
|
|
||||||
@ -1 +0,0 @@
|
|||||||
{% extends "app/templates/api-doc.tmpl" %}
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
{% extends "app/templates/api-doc.tmpl" %}
|
|
||||||
|
|
||||||
{% block auth-section %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block limits-section %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block webhooks-section %}
|
|
||||||
{% endblock %}
|
|
||||||
@ -7,7 +7,7 @@
|
|||||||
name="description"
|
name="description"
|
||||||
content="SwaggerUI"
|
content="SwaggerUI"
|
||||||
/>
|
/>
|
||||||
<title>{{label|upper}} API</title>
|
<title>PENPOT Swagger UI</title>
|
||||||
<style>{{swagger-css|safe}}</style>
|
<style>{{swagger-css|safe}}</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
@ -16,7 +16,7 @@
|
|||||||
<script>
|
<script>
|
||||||
window.onload = () => {
|
window.onload = () => {
|
||||||
window.ui = SwaggerUIBundle({
|
window.ui = SwaggerUIBundle({
|
||||||
url: '{{uri}}',
|
url: '{{public-uri}}/api/openapi.json',
|
||||||
dom_id: '#swagger-ui',
|
dom_id: '#swagger-ui',
|
||||||
presets: [
|
presets: [
|
||||||
SwaggerUIBundle.presets.apis,
|
SwaggerUIBundle.presets.apis,
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
* {
|
* {
|
||||||
font-family: monospace;
|
font-family: "JetBrains Mono", monospace;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -36,10 +36,6 @@ small {
|
|||||||
color: #888;
|
color: #888;
|
||||||
}
|
}
|
||||||
|
|
||||||
.strong {
|
|
||||||
font-weight: 900;
|
|
||||||
}
|
|
||||||
|
|
||||||
.not-important {
|
.not-important {
|
||||||
color: #888;
|
color: #888;
|
||||||
font-weight: 200;
|
font-weight: 200;
|
||||||
@ -61,26 +57,14 @@ nav {
|
|||||||
|
|
||||||
nav > .title {
|
nav > .title {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
nav > .title > a {
|
|
||||||
color: black;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
nav > .title > a.strong {
|
|
||||||
text-decoration: underline;
|
|
||||||
}
|
|
||||||
|
|
||||||
nav > .title > h1 {
|
nav > .title > h1 {
|
||||||
|
padding: 0px;
|
||||||
margin: 0px;
|
margin: 0px;
|
||||||
font-size: 11px;
|
font-size: 11px;
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
nav > .title > * {
|
|
||||||
padding: 0px 6px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
nav > div {
|
nav > div {
|
||||||
|
|||||||
@ -25,7 +25,8 @@
|
|||||||
<Logger name="app.storage.tmp" level="info" />
|
<Logger name="app.storage.tmp" level="info" />
|
||||||
<Logger name="app.worker" level="trace" />
|
<Logger name="app.worker" level="trace" />
|
||||||
<Logger name="app.msgbus" level="info" />
|
<Logger name="app.msgbus" level="info" />
|
||||||
<Logger name="app.http" level="info" />
|
<Logger name="app.http.websocket" level="info" />
|
||||||
|
<Logger name="app.http.sse" level="info" />
|
||||||
<Logger name="app.util.websocket" level="info" />
|
<Logger name="app.util.websocket" level="info" />
|
||||||
<Logger name="app.redis" level="info" />
|
<Logger name="app.redis" level="info" />
|
||||||
<Logger name="app.rpc.rlimit" level="info" />
|
<Logger name="app.rpc.rlimit" level="info" />
|
||||||
|
|||||||
@ -25,7 +25,8 @@
|
|||||||
<Logger name="app.storage.tmp" level="info" />
|
<Logger name="app.storage.tmp" level="info" />
|
||||||
<Logger name="app.worker" level="trace" />
|
<Logger name="app.worker" level="trace" />
|
||||||
<Logger name="app.msgbus" level="info" />
|
<Logger name="app.msgbus" level="info" />
|
||||||
<Logger name="app.http" level="info" />
|
<Logger name="app.http.websocket" level="info" />
|
||||||
|
<Logger name="app.http.sse" level="info" />
|
||||||
<Logger name="app.util.websocket" level="info" />
|
<Logger name="app.util.websocket" level="info" />
|
||||||
<Logger name="app.redis" level="info" />
|
<Logger name="app.redis" level="info" />
|
||||||
<Logger name="app.rpc.rlimit" level="info" />
|
<Logger name="app.rpc.rlimit" level="info" />
|
||||||
|
|||||||
@ -3,9 +3,9 @@
|
|||||||
{:default
|
{:default
|
||||||
[[:default :window "200000/h"]]
|
[[:default :window "200000/h"]]
|
||||||
|
|
||||||
;; #{:main/get-teams}
|
;; #{:command/get-teams}
|
||||||
;; [[:burst :bucket "5/5/5s"]]
|
;; [[:burst :bucket "5/5/5s"]]
|
||||||
|
|
||||||
;; #{:main/get-profile}
|
;; #{:command/get-profile}
|
||||||
;; [[:burst :bucket "60/60/1m"]]
|
;; [[:burst :bucket "60/60/1m"]]
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,25 +1,18 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
export PENPOT_NITRATE_SHARED_KEY=super-secret-nitrate-api-key
|
|
||||||
export PENPOT_EXPORTER_SHARED_KEY=super-secret-exporter-api-key
|
export PENPOT_MANAGEMENT_API_SHARED_KEY=super-secret-management-api-key
|
||||||
export PENPOT_NEXUS_SHARED_KEY=super-secret-nexus-api-key
|
|
||||||
export PENPOT_SECRET_KEY=super-secret-devenv-key
|
export PENPOT_SECRET_KEY=super-secret-devenv-key
|
||||||
|
|
||||||
# DEPRECATED: only used for subscriptions
|
|
||||||
export PENPOT_MANAGEMENT_API_KEY=super-secret-management-api-key
|
|
||||||
|
|
||||||
export PENPOT_HOST=devenv
|
export PENPOT_HOST=devenv
|
||||||
export PENPOT_PUBLIC_URI=https://localhost:3449
|
|
||||||
|
|
||||||
export PENPOT_FLAGS="\
|
export PENPOT_FLAGS="\
|
||||||
$PENPOT_FLAGS \
|
$PENPOT_FLAGS \
|
||||||
enable-login-with-password \
|
enable-login-with-ldap \
|
||||||
disable-login-with-ldap \
|
enable-login-with-password
|
||||||
disable-login-with-oidc \
|
enable-login-with-oidc \
|
||||||
disable-login-with-google \
|
enable-login-with-google \
|
||||||
disable-login-with-github \
|
enable-login-with-github \
|
||||||
disable-login-with-gitlab \
|
enable-login-with-gitlab \
|
||||||
disable-telemetry \
|
|
||||||
enable-backend-worker \
|
enable-backend-worker \
|
||||||
enable-backend-asserts \
|
enable-backend-asserts \
|
||||||
disable-feature-fdata-pointer-map \
|
disable-feature-fdata-pointer-map \
|
||||||
@ -27,7 +20,6 @@ export PENPOT_FLAGS="\
|
|||||||
enable-audit-log \
|
enable-audit-log \
|
||||||
enable-transit-readable-response \
|
enable-transit-readable-response \
|
||||||
enable-demo-users \
|
enable-demo-users \
|
||||||
enable-user-feedback \
|
|
||||||
disable-secure-session-cookies \
|
disable-secure-session-cookies \
|
||||||
enable-smtp \
|
enable-smtp \
|
||||||
enable-prepl-server \
|
enable-prepl-server \
|
||||||
@ -45,10 +37,6 @@ export PENPOT_FLAGS="\
|
|||||||
enable-redis-cache \
|
enable-redis-cache \
|
||||||
enable-subscriptions";
|
enable-subscriptions";
|
||||||
|
|
||||||
# Uncomment for nexus integration testing
|
|
||||||
# export PENPOT_FLAGS="$PENPOT_FLAGS enable-audit-log-archive";
|
|
||||||
# export PENPOT_AUDIT_LOG_ARCHIVE_URI="http://localhost:6070/api/audit";
|
|
||||||
|
|
||||||
# Default deletion delay for devenv
|
# Default deletion delay for devenv
|
||||||
export PENPOT_DELETION_DELAY="24h"
|
export PENPOT_DELETION_DELAY="24h"
|
||||||
|
|
||||||
@ -58,16 +46,12 @@ export PENPOT_MEDIA_MAX_FILE_SIZE=104857600
|
|||||||
# Setup default multipart upload size to 300MiB
|
# Setup default multipart upload size to 300MiB
|
||||||
export PENPOT_HTTP_SERVER_MAX_MULTIPART_BODY_SIZE=314572800
|
export PENPOT_HTTP_SERVER_MAX_MULTIPART_BODY_SIZE=314572800
|
||||||
|
|
||||||
export PENPOT_USER_FEEDBACK_DESTINATION="support@example.com"
|
|
||||||
|
|
||||||
export AWS_ACCESS_KEY_ID=penpot-devenv
|
export AWS_ACCESS_KEY_ID=penpot-devenv
|
||||||
export AWS_SECRET_ACCESS_KEY=penpot-devenv
|
export AWS_SECRET_ACCESS_KEY=penpot-devenv
|
||||||
export PENPOT_OBJECTS_STORAGE_BACKEND=s3
|
export PENPOT_OBJECTS_STORAGE_BACKEND=s3
|
||||||
export PENPOT_OBJECTS_STORAGE_S3_ENDPOINT=http://minio:9000
|
export PENPOT_OBJECTS_STORAGE_S3_ENDPOINT=http://minio:9000
|
||||||
export PENPOT_OBJECTS_STORAGE_S3_BUCKET=penpot
|
export PENPOT_OBJECTS_STORAGE_S3_BUCKET=penpot
|
||||||
|
|
||||||
export PENPOT_NITRATE_BACKEND_URI=http://localhost:3000/control-center
|
|
||||||
|
|
||||||
export JAVA_OPTS="\
|
export JAVA_OPTS="\
|
||||||
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager \
|
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager \
|
||||||
-Djdk.attach.allowAttachSelf \
|
-Djdk.attach.allowAttachSelf \
|
||||||
|
|||||||
@ -3,10 +3,6 @@
|
|||||||
SCRIPT_DIR=$(dirname $0);
|
SCRIPT_DIR=$(dirname $0);
|
||||||
source $SCRIPT_DIR/_env;
|
source $SCRIPT_DIR/_env;
|
||||||
|
|
||||||
if [ -f $SCRIPT_DIR/_env.local ]; then
|
|
||||||
source $SCRIPT_DIR/_env.local;
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Initialize MINIO config
|
# Initialize MINIO config
|
||||||
setup_minio;
|
setup_minio;
|
||||||
|
|
||||||
|
|||||||
@ -3,11 +3,6 @@
|
|||||||
SCRIPT_DIR=$(dirname $0);
|
SCRIPT_DIR=$(dirname $0);
|
||||||
|
|
||||||
source $SCRIPT_DIR/_env;
|
source $SCRIPT_DIR/_env;
|
||||||
|
|
||||||
if [ -f $SCRIPT_DIR/_env.local ]; then
|
|
||||||
source $SCRIPT_DIR/_env.local;
|
|
||||||
fi
|
|
||||||
|
|
||||||
export OPTIONS="-A:dev"
|
export OPTIONS="-A:dev"
|
||||||
|
|
||||||
entrypoint=${1:-app.main};
|
entrypoint=${1:-app.main};
|
||||||
|
|||||||
@ -3,10 +3,6 @@
|
|||||||
SCRIPT_DIR=$(dirname $0);
|
SCRIPT_DIR=$(dirname $0);
|
||||||
source $SCRIPT_DIR/_env;
|
source $SCRIPT_DIR/_env;
|
||||||
|
|
||||||
if [ -f $SCRIPT_DIR/_env.local ]; then
|
|
||||||
source $SCRIPT_DIR/_env.local;
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Initialize MINIO config
|
# Initialize MINIO config
|
||||||
setup_minio;
|
setup_minio;
|
||||||
|
|
||||||
|
|||||||
@ -111,7 +111,7 @@
|
|||||||
[:host {:optional true} :string]
|
[:host {:optional true} :string]
|
||||||
[:port {:optional true} ::sm/int]
|
[:port {:optional true} ::sm/int]
|
||||||
[:bind-dn {:optional true} :string]
|
[:bind-dn {:optional true} :string]
|
||||||
[:bind-password {:optional true} :string]
|
[:bind-passwor {:optional true} :string]
|
||||||
[:query {:optional true} :string]
|
[:query {:optional true} :string]
|
||||||
[:base-dn {:optional true} :string]
|
[:base-dn {:optional true} :string]
|
||||||
[:attrs-email {:optional true} :string]
|
[:attrs-email {:optional true} :string]
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -331,81 +331,6 @@
|
|||||||
(set/difference cfeat/backend-only-features))
|
(set/difference cfeat/backend-only-features))
|
||||||
#{}))))
|
#{}))))
|
||||||
|
|
||||||
(defn check-file-exists
|
|
||||||
[cfg id & {:keys [include-deleted?]
|
|
||||||
:or {include-deleted? false}
|
|
||||||
:as options}]
|
|
||||||
(db/get-with-sql cfg [sql:get-minimal-file id]
|
|
||||||
{:db/remove-deleted (not include-deleted?)}))
|
|
||||||
|
|
||||||
(def ^:private sql:file-permissions
|
|
||||||
"select fpr.is_owner,
|
|
||||||
fpr.is_admin,
|
|
||||||
fpr.can_edit
|
|
||||||
from file_profile_rel as fpr
|
|
||||||
inner join file as f on (f.id = fpr.file_id)
|
|
||||||
where fpr.file_id = ?
|
|
||||||
and fpr.profile_id = ?
|
|
||||||
union all
|
|
||||||
select tpr.is_owner,
|
|
||||||
tpr.is_admin,
|
|
||||||
tpr.can_edit
|
|
||||||
from team_profile_rel as tpr
|
|
||||||
inner join project as p on (p.team_id = tpr.team_id)
|
|
||||||
inner join file as f on (p.id = f.project_id)
|
|
||||||
where f.id = ?
|
|
||||||
and tpr.profile_id = ?
|
|
||||||
union all
|
|
||||||
select ppr.is_owner,
|
|
||||||
ppr.is_admin,
|
|
||||||
ppr.can_edit
|
|
||||||
from project_profile_rel as ppr
|
|
||||||
inner join file as f on (f.project_id = ppr.project_id)
|
|
||||||
where f.id = ?
|
|
||||||
and ppr.profile_id = ?")
|
|
||||||
|
|
||||||
(defn- get-file-permissions*
|
|
||||||
[conn profile-id file-id]
|
|
||||||
(when (and profile-id file-id)
|
|
||||||
(db/exec! conn [sql:file-permissions
|
|
||||||
file-id profile-id
|
|
||||||
file-id profile-id
|
|
||||||
file-id profile-id])))
|
|
||||||
|
|
||||||
(defn get-file-permissions
|
|
||||||
([conn profile-id file-id]
|
|
||||||
(let [rows (get-file-permissions* conn profile-id file-id)
|
|
||||||
is-owner (boolean (some :is-owner rows))
|
|
||||||
is-admin (boolean (some :is-admin rows))
|
|
||||||
can-edit (boolean (some :can-edit rows))]
|
|
||||||
(when (seq rows)
|
|
||||||
{:type :membership
|
|
||||||
:is-owner is-owner
|
|
||||||
:is-admin (or is-owner is-admin)
|
|
||||||
:can-edit (or is-owner is-admin can-edit)
|
|
||||||
:can-read true
|
|
||||||
:is-logged (some? profile-id)})))
|
|
||||||
|
|
||||||
([conn profile-id file-id share-id]
|
|
||||||
(let [perms (get-file-permissions conn profile-id file-id)
|
|
||||||
ldata (some-> (db/get* conn :share-link {:id share-id :file-id file-id})
|
|
||||||
(dissoc :flags)
|
|
||||||
(update :pages db/decode-pgarray #{}))]
|
|
||||||
|
|
||||||
;; NOTE: in a future when share-link becomes more powerful and
|
|
||||||
;; will allow us specify which parts of the app is available, we
|
|
||||||
;; will probably need to tweak this function in order to expose
|
|
||||||
;; this flags to the frontend.
|
|
||||||
(cond
|
|
||||||
(some? perms) perms
|
|
||||||
(some? ldata) {:type :share-link
|
|
||||||
:can-read true
|
|
||||||
:pages (:pages ldata)
|
|
||||||
:is-logged (some? profile-id)
|
|
||||||
:who-comment (:who-comment ldata)
|
|
||||||
:who-inspect (:who-inspect ldata)}))))
|
|
||||||
|
|
||||||
|
|
||||||
(defn get-project
|
(defn get-project
|
||||||
[cfg project-id]
|
[cfg project-id]
|
||||||
(db/get cfg :project {:id project-id}))
|
(db/get cfg :project {:id project-id}))
|
||||||
|
|||||||
@ -40,8 +40,8 @@
|
|||||||
[promesa.util :as pu]
|
[promesa.util :as pu]
|
||||||
[yetti.adapter :as yt])
|
[yetti.adapter :as yt])
|
||||||
(:import
|
(:import
|
||||||
com.github.luben.zstd.ZstdInputStream
|
|
||||||
com.github.luben.zstd.ZstdIOException
|
com.github.luben.zstd.ZstdIOException
|
||||||
|
com.github.luben.zstd.ZstdInputStream
|
||||||
com.github.luben.zstd.ZstdOutputStream
|
com.github.luben.zstd.ZstdOutputStream
|
||||||
java.io.DataInputStream
|
java.io.DataInputStream
|
||||||
java.io.DataOutputStream
|
java.io.DataOutputStream
|
||||||
|
|||||||
@ -255,8 +255,6 @@
|
|||||||
|
|
||||||
(write-entry! output path params)
|
(write-entry! output path params)
|
||||||
|
|
||||||
(events/tap :progress {:section :storage-object :id id})
|
|
||||||
|
|
||||||
(with-open [input (sto/get-object-data storage sobject)]
|
(with-open [input (sto/get-object-data storage sobject)]
|
||||||
(.putNextEntry ^ZipOutputStream output (ZipEntry. (str "objects/" id ext)))
|
(.putNextEntry ^ZipOutputStream output (ZipEntry. (str "objects/" id ext)))
|
||||||
(io/copy input output :size (:size sobject))
|
(io/copy input output :size (:size sobject))
|
||||||
@ -281,8 +279,6 @@
|
|||||||
|
|
||||||
thumbnails (bfc/get-file-object-thumbnails cfg file-id)]
|
thumbnails (bfc/get-file-object-thumbnails cfg file-id)]
|
||||||
|
|
||||||
(events/tap :progress {:section :file :id file-id})
|
|
||||||
|
|
||||||
(vswap! bfc/*state* update :files assoc file-id
|
(vswap! bfc/*state* update :files assoc file-id
|
||||||
{:id file-id
|
{:id file-id
|
||||||
:name (:name file)
|
:name (:name file)
|
||||||
@ -821,10 +817,9 @@
|
|||||||
entries (keep (match-storage-entry-fn) entries)]
|
entries (keep (match-storage-entry-fn) entries)]
|
||||||
|
|
||||||
(doseq [{:keys [id entry]} entries]
|
(doseq [{:keys [id entry]} entries]
|
||||||
(let [object (-> (read-entry input entry)
|
(let [object (->> (read-entry input entry)
|
||||||
(decode-storage-object)
|
(decode-storage-object)
|
||||||
(update :bucket d/nilv sto/default-bucket)
|
(validate-storage-object))
|
||||||
(validate-storage-object))
|
|
||||||
|
|
||||||
ext (cmedia/mtype->extension (:content-type object))
|
ext (cmedia/mtype->extension (:content-type object))
|
||||||
path (str "objects/" id ext)
|
path (str "objects/" id ext)
|
||||||
@ -873,8 +868,11 @@
|
|||||||
(import-storage-objects cfg)
|
(import-storage-objects cfg)
|
||||||
|
|
||||||
(let [files (get manifest :files)
|
(let [files (get manifest :files)
|
||||||
result (reduce (fn [result file]
|
result (reduce (fn [result {:keys [id] :as file}]
|
||||||
(let [name' (get file :name)
|
(let [name' (get file :name)
|
||||||
|
name' (if (map? name)
|
||||||
|
(get name id)
|
||||||
|
name')
|
||||||
file (assoc file :name name')]
|
file (assoc file :name name')]
|
||||||
(conj result (import-file cfg file))))
|
(conj result (import-file cfg file))))
|
||||||
[]
|
[]
|
||||||
|
|||||||
@ -5,6 +5,7 @@
|
|||||||
;; Copyright (c) KALEIDOS INC
|
;; Copyright (c) KALEIDOS INC
|
||||||
|
|
||||||
(ns app.config
|
(ns app.config
|
||||||
|
"A configuration management."
|
||||||
(:refer-clojure :exclude [get])
|
(:refer-clojure :exclude [get])
|
||||||
(:require
|
(:require
|
||||||
[app.common.data :as d]
|
[app.common.data :as d]
|
||||||
@ -46,7 +47,6 @@
|
|||||||
:auto-file-snapshot-timeout "3h"
|
:auto-file-snapshot-timeout "3h"
|
||||||
|
|
||||||
:public-uri "http://localhost:3449"
|
:public-uri "http://localhost:3449"
|
||||||
|
|
||||||
:host "localhost"
|
:host "localhost"
|
||||||
:tenant "default"
|
:tenant "default"
|
||||||
|
|
||||||
@ -57,8 +57,6 @@
|
|||||||
:objects-storage-backend "fs"
|
:objects-storage-backend "fs"
|
||||||
:objects-storage-fs-directory "assets"
|
:objects-storage-fs-directory "assets"
|
||||||
|
|
||||||
:auth-token-cookie-name "auth-token"
|
|
||||||
|
|
||||||
:assets-path "/internal/assets/"
|
:assets-path "/internal/assets/"
|
||||||
:smtp-default-reply-to "Penpot <no-reply@example.com>"
|
:smtp-default-reply-to "Penpot <no-reply@example.com>"
|
||||||
:smtp-default-from "Penpot <no-reply@example.com>"
|
:smtp-default-from "Penpot <no-reply@example.com>"
|
||||||
@ -82,10 +80,7 @@
|
|||||||
:initial-project-skey "initial-project"
|
:initial-project-skey "initial-project"
|
||||||
|
|
||||||
;; time to avoid email sending after profile modification
|
;; time to avoid email sending after profile modification
|
||||||
:email-verify-threshold "15m"
|
:email-verify-threshold "15m"})
|
||||||
|
|
||||||
:quotes-upload-sessions-per-profile 5
|
|
||||||
:quotes-upload-chunks-per-session 20})
|
|
||||||
|
|
||||||
(def schema:config
|
(def schema:config
|
||||||
(do #_sm/optional-keys
|
(do #_sm/optional-keys
|
||||||
@ -95,19 +90,17 @@
|
|||||||
[:secret-key {:optional true} :string]
|
[:secret-key {:optional true} :string]
|
||||||
|
|
||||||
[:tenant {:optional false} :string]
|
[:tenant {:optional false} :string]
|
||||||
[:public-uri {:optional false} ::sm/uri]
|
[:public-uri {:optional false} :string]
|
||||||
[:host {:optional false} :string]
|
[:host {:optional false} :string]
|
||||||
|
|
||||||
[:http-server-port {:optional true} ::sm/int]
|
[:http-server-port {:optional true} ::sm/int]
|
||||||
[:http-server-host {:optional true} :string]
|
[:http-server-host {:optional true} :string]
|
||||||
[:http-server-max-body-size {:optional true} ::sm/int]
|
[:http-server-max-body-size {:optional true} ::sm/int]
|
||||||
|
[:http-server-max-multipart-body-size {:optional true} ::sm/int]
|
||||||
[:http-server-io-threads {:optional true} ::sm/int]
|
[:http-server-io-threads {:optional true} ::sm/int]
|
||||||
[:http-server-max-worker-threads {:optional true} ::sm/int]
|
[:http-server-max-worker-threads {:optional true} ::sm/int]
|
||||||
|
|
||||||
[:exporter-shared-key {:optional true} :string]
|
[:management-api-shared-key {:optional true} :string]
|
||||||
[:nitrate-shared-key {:optional true} :string]
|
|
||||||
[:nexus-shared-key {:optional true} :string]
|
|
||||||
[:management-api-key {:optional true} :string]
|
|
||||||
|
|
||||||
[:telemetry-uri {:optional true} :string]
|
[:telemetry-uri {:optional true} :string]
|
||||||
[:telemetry-with-taiga {:optional true} ::sm/boolean] ;; DELETE
|
[:telemetry-with-taiga {:optional true} ::sm/boolean] ;; DELETE
|
||||||
@ -157,8 +150,6 @@
|
|||||||
[:quotes-snapshots-per-team {:optional true} ::sm/int]
|
[:quotes-snapshots-per-team {:optional true} ::sm/int]
|
||||||
[:quotes-team-access-requests-per-team {:optional true} ::sm/int]
|
[:quotes-team-access-requests-per-team {:optional true} ::sm/int]
|
||||||
[:quotes-team-access-requests-per-requester {:optional true} ::sm/int]
|
[:quotes-team-access-requests-per-requester {:optional true} ::sm/int]
|
||||||
[:quotes-upload-sessions-per-profile {:optional true} ::sm/int]
|
|
||||||
[:quotes-upload-chunks-per-session {:optional true} ::sm/int]
|
|
||||||
|
|
||||||
[:auth-token-cookie-name {:optional true} :string]
|
[:auth-token-cookie-name {:optional true} :string]
|
||||||
[:auth-token-cookie-max-age {:optional true} ::ct/duration]
|
[:auth-token-cookie-max-age {:optional true} ::ct/duration]
|
||||||
@ -174,7 +165,7 @@
|
|||||||
[:google-client-id {:optional true} :string]
|
[:google-client-id {:optional true} :string]
|
||||||
[:google-client-secret {:optional true} :string]
|
[:google-client-secret {:optional true} :string]
|
||||||
[:oidc-client-id {:optional true} :string]
|
[:oidc-client-id {:optional true} :string]
|
||||||
[:oidc-user-info-source {:optional true} [:enum "auto" "userinfo" "token"]]
|
[:oidc-user-info-source {:optional true} :keyword]
|
||||||
[:oidc-client-secret {:optional true} :string]
|
[:oidc-client-secret {:optional true} :string]
|
||||||
[:oidc-base-uri {:optional true} :string]
|
[:oidc-base-uri {:optional true} :string]
|
||||||
[:oidc-token-uri {:optional true} :string]
|
[:oidc-token-uri {:optional true} :string]
|
||||||
@ -232,8 +223,6 @@
|
|||||||
[:netty-io-threads {:optional true} ::sm/int]
|
[:netty-io-threads {:optional true} ::sm/int]
|
||||||
[:executor-threads {:optional true} ::sm/int]
|
[:executor-threads {:optional true} ::sm/int]
|
||||||
|
|
||||||
[:nitrate-backend-uri {:optional true} ::sm/uri]
|
|
||||||
|
|
||||||
;; DEPRECATED
|
;; DEPRECATED
|
||||||
[:assets-storage-backend {:optional true} :keyword]
|
[:assets-storage-backend {:optional true} :keyword]
|
||||||
[:storage-assets-fs-directory {:optional true} :string]
|
[:storage-assets-fs-directory {:optional true} :string]
|
||||||
@ -332,7 +321,7 @@
|
|||||||
|
|
||||||
(defn logging-context
|
(defn logging-context
|
||||||
[]
|
[]
|
||||||
{:backend/version (:full version)})
|
{:version/backend (:full version)})
|
||||||
|
|
||||||
;; Set value for all new threads bindings.
|
;; Set value for all new threads bindings.
|
||||||
(alter-var-root #'*assert* (constantly (contains? flags :backend-asserts)))
|
(alter-var-root #'*assert* (constantly (contains? flags :backend-asserts)))
|
||||||
|
|||||||
@ -36,11 +36,11 @@
|
|||||||
java.sql.Connection
|
java.sql.Connection
|
||||||
java.sql.PreparedStatement
|
java.sql.PreparedStatement
|
||||||
java.sql.Savepoint
|
java.sql.Savepoint
|
||||||
|
org.postgresql.PGConnection
|
||||||
org.postgresql.geometric.PGpoint
|
org.postgresql.geometric.PGpoint
|
||||||
org.postgresql.jdbc.PgArray
|
org.postgresql.jdbc.PgArray
|
||||||
org.postgresql.largeobject.LargeObject
|
org.postgresql.largeobject.LargeObject
|
||||||
org.postgresql.largeobject.LargeObjectManager
|
org.postgresql.largeobject.LargeObjectManager
|
||||||
org.postgresql.PGConnection
|
|
||||||
org.postgresql.util.PGInterval
|
org.postgresql.util.PGInterval
|
||||||
org.postgresql.util.PGobject))
|
org.postgresql.util.PGobject))
|
||||||
|
|
||||||
@ -704,12 +704,6 @@
|
|||||||
(and (sql-exception? cause)
|
(and (sql-exception? cause)
|
||||||
(= "40001" (.getSQLState ^java.sql.SQLException cause))))
|
(= "40001" (.getSQLState ^java.sql.SQLException cause))))
|
||||||
|
|
||||||
(defn duplicate-key-error?
|
|
||||||
[cause]
|
|
||||||
(and (sql-exception? cause)
|
|
||||||
(= "23505" (.getSQLState ^java.sql.SQLException cause))))
|
|
||||||
|
|
||||||
|
|
||||||
(extend-protocol jdbc.prepare/SettableParameter
|
(extend-protocol jdbc.prepare/SettableParameter
|
||||||
clojure.lang.Keyword
|
clojure.lang.Keyword
|
||||||
(set-parameter [^clojure.lang.Keyword v ^PreparedStatement s ^long i]
|
(set-parameter [^clojure.lang.Keyword v ^PreparedStatement s ^long i]
|
||||||
|
|||||||
@ -7,7 +7,6 @@
|
|||||||
(ns app.email
|
(ns app.email
|
||||||
"Main api for send emails."
|
"Main api for send emails."
|
||||||
(:require
|
(:require
|
||||||
[app.common.data :as d]
|
|
||||||
[app.common.data.macros :as dm]
|
[app.common.data.macros :as dm]
|
||||||
[app.common.exceptions :as ex]
|
[app.common.exceptions :as ex]
|
||||||
[app.common.logging :as l]
|
[app.common.logging :as l]
|
||||||
@ -22,13 +21,13 @@
|
|||||||
[cuerdas.core :as str]
|
[cuerdas.core :as str]
|
||||||
[integrant.core :as ig])
|
[integrant.core :as ig])
|
||||||
(:import
|
(:import
|
||||||
|
jakarta.mail.Message$RecipientType
|
||||||
|
jakarta.mail.Session
|
||||||
|
jakarta.mail.Transport
|
||||||
jakarta.mail.internet.InternetAddress
|
jakarta.mail.internet.InternetAddress
|
||||||
jakarta.mail.internet.MimeBodyPart
|
jakarta.mail.internet.MimeBodyPart
|
||||||
jakarta.mail.internet.MimeMessage
|
jakarta.mail.internet.MimeMessage
|
||||||
jakarta.mail.internet.MimeMultipart
|
jakarta.mail.internet.MimeMultipart
|
||||||
jakarta.mail.Message$RecipientType
|
|
||||||
jakarta.mail.Session
|
|
||||||
jakarta.mail.Transport
|
|
||||||
java.util.Properties))
|
java.util.Properties))
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
@ -94,42 +93,36 @@
|
|||||||
headers)))
|
headers)))
|
||||||
|
|
||||||
(defn- assign-body
|
(defn- assign-body
|
||||||
[^MimeMessage mmsg {:keys [body charset attachments] :or {charset "utf-8"}}]
|
[^MimeMessage mmsg {:keys [body charset] :or {charset "utf-8"}}]
|
||||||
(let [mixed-mpart (MimeMultipart. "mixed")]
|
(let [mpart (MimeMultipart. "mixed")]
|
||||||
(cond
|
(cond
|
||||||
(string? body)
|
(string? body)
|
||||||
(let [text-part (MimeBodyPart.)]
|
(let [bpart (MimeBodyPart.)]
|
||||||
(.setText text-part ^String body ^String charset)
|
(.setContent bpart ^String body (str "text/plain; charset=" charset))
|
||||||
(.addBodyPart mixed-mpart text-part))
|
(.addBodyPart mpart bpart))
|
||||||
|
|
||||||
|
(vector? body)
|
||||||
|
(let [mmp (MimeMultipart. "alternative")
|
||||||
|
mbp (MimeBodyPart.)]
|
||||||
|
(.addBodyPart mpart mbp)
|
||||||
|
(.setContent mbp mmp)
|
||||||
|
(doseq [item body]
|
||||||
|
(let [mbp (MimeBodyPart.)]
|
||||||
|
(.setContent mbp
|
||||||
|
^String (:content item)
|
||||||
|
^String (str (:type item "text/plain") "; charset=" charset))
|
||||||
|
(.addBodyPart mmp mbp))))
|
||||||
|
|
||||||
(map? body)
|
(map? body)
|
||||||
(let [content-part (MimeBodyPart.)
|
(let [bpart (MimeBodyPart.)]
|
||||||
alternative-mpart (MimeMultipart. "alternative")]
|
(.setContent bpart
|
||||||
|
^String (:content body)
|
||||||
(when-let [content (get body "text/plain")]
|
^String (str (:type body "text/plain") "; charset=" charset))
|
||||||
(let [text-part (MimeBodyPart.)]
|
(.addBodyPart mpart bpart))
|
||||||
(.setText text-part ^String content ^String charset)
|
|
||||||
(.addBodyPart alternative-mpart text-part)))
|
|
||||||
|
|
||||||
(when-let [content (get body "text/html")]
|
|
||||||
(let [html-part (MimeBodyPart.)]
|
|
||||||
(.setContent html-part ^String content
|
|
||||||
(str "text/html; charset=" charset))
|
|
||||||
(.addBodyPart alternative-mpart html-part)))
|
|
||||||
|
|
||||||
(.setContent content-part alternative-mpart)
|
|
||||||
(.addBodyPart mixed-mpart content-part))
|
|
||||||
|
|
||||||
:else
|
:else
|
||||||
(throw (IllegalArgumentException. "invalid email body provided")))
|
(throw (ex-info "Unsupported type" {:body body})))
|
||||||
|
(.setContent mmsg mpart)
|
||||||
(doseq [[name content] attachments]
|
|
||||||
(let [attachment-part (MimeBodyPart.)]
|
|
||||||
(.setFileName attachment-part ^String name)
|
|
||||||
(.setContent attachment-part ^String content (str "text/plain; charset=" charset))
|
|
||||||
(.addBodyPart mixed-mpart attachment-part)))
|
|
||||||
|
|
||||||
(.setContent mmsg mixed-mpart)
|
|
||||||
mmsg))
|
mmsg))
|
||||||
|
|
||||||
(defn- opts->props
|
(defn- opts->props
|
||||||
@ -217,26 +210,24 @@
|
|||||||
(ex/raise :type :internal
|
(ex/raise :type :internal
|
||||||
:code :missing-email-templates))
|
:code :missing-email-templates))
|
||||||
{:subject subj
|
{:subject subj
|
||||||
:body (d/without-nils
|
:body (into
|
||||||
{"text/plain" text
|
[{:type "text/plain"
|
||||||
"text/html" html})}))
|
:content text}]
|
||||||
|
(when html
|
||||||
|
[{:type "text/html"
|
||||||
|
:content html}]))}))
|
||||||
|
|
||||||
(def ^:private schema:params
|
(def ^:private schema:context
|
||||||
[:map {:title "Email Params"}
|
[:map
|
||||||
[:to [:or ::sm/email [::sm/vec ::sm/email]]]
|
[:to [:or ::sm/email [::sm/vec ::sm/email]]]
|
||||||
[:reply-to {:optional true} ::sm/email]
|
[:reply-to {:optional true} ::sm/email]
|
||||||
[:from {:optional true} ::sm/email]
|
[:from {:optional true} ::sm/email]
|
||||||
[:lang {:optional true} ::sm/text]
|
[:lang {:optional true} ::sm/text]
|
||||||
[:subject {:optional true} ::sm/text]
|
|
||||||
[:priority {:optional true} [:enum :high :low]]
|
[:priority {:optional true} [:enum :high :low]]
|
||||||
[:extra-data {:optional true} ::sm/text]
|
[:extra-data {:optional true} ::sm/text]])
|
||||||
[:body {:optional true}
|
|
||||||
[:or :string [:map-of :string :string]]]
|
|
||||||
[:attachments {:optional true}
|
|
||||||
[:map-of :string :string]]])
|
|
||||||
|
|
||||||
(def ^:private check-params
|
(def ^:private check-context
|
||||||
(sm/check-fn schema:params))
|
(sm/check-fn schema:context))
|
||||||
|
|
||||||
(defn template-factory
|
(defn template-factory
|
||||||
[& {:keys [id schema]}]
|
[& {:keys [id schema]}]
|
||||||
@ -244,9 +235,9 @@
|
|||||||
(let [check-fn (if schema
|
(let [check-fn (if schema
|
||||||
(sm/check-fn schema)
|
(sm/check-fn schema)
|
||||||
(constantly nil))]
|
(constantly nil))]
|
||||||
(fn [params]
|
(fn [context]
|
||||||
(let [params (-> params check-params check-fn)
|
(let [context (-> context check-context check-fn)
|
||||||
email (build-email-template id params)]
|
email (build-email-template id context)]
|
||||||
(when-not email
|
(when-not email
|
||||||
(ex/raise :type :internal
|
(ex/raise :type :internal
|
||||||
:code :email-template-does-not-exists
|
:code :email-template-does-not-exists
|
||||||
@ -254,40 +245,35 @@
|
|||||||
:template-id id))
|
:template-id id))
|
||||||
|
|
||||||
(cond-> (assoc email :id (name id))
|
(cond-> (assoc email :id (name id))
|
||||||
(:extra-data params)
|
(:extra-data context)
|
||||||
(assoc :extra-data (:extra-data params))
|
(assoc :extra-data (:extra-data context))
|
||||||
|
|
||||||
(seq (:attachments params))
|
(:from context)
|
||||||
(assoc :attachments (:attachments params))
|
(assoc :from (:from context))
|
||||||
|
|
||||||
(:from params)
|
(:reply-to context)
|
||||||
(assoc :from (:from params))
|
(assoc :reply-to (:reply-to context))
|
||||||
|
|
||||||
(:reply-to params)
|
(:to context)
|
||||||
(assoc :reply-to (:reply-to params))
|
(assoc :to (:to context)))))))
|
||||||
|
|
||||||
(:to params)
|
|
||||||
(assoc :to (:to params)))))))
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;; PUBLIC HIGH-LEVEL API
|
;; PUBLIC HIGH-LEVEL API
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
(defn render
|
(defn render
|
||||||
[email-factory params]
|
[email-factory context]
|
||||||
(email-factory params))
|
(email-factory context))
|
||||||
|
|
||||||
(defn send!
|
(defn send!
|
||||||
"Schedule an already defined email to be sent using asynchronously
|
"Schedule an already defined email to be sent using asynchronously
|
||||||
using worker task."
|
using worker task."
|
||||||
[{:keys [::conn ::factory] :as params}]
|
[{:keys [::conn ::factory] :as context}]
|
||||||
(assert (db/connectable? conn) "expected a valid database connection or pool")
|
(assert (db/connectable? conn) "expected a valid database connection or pool")
|
||||||
|
|
||||||
(let [email (if factory
|
(let [email (if factory
|
||||||
(factory params)
|
(factory context)
|
||||||
(-> params
|
(dissoc context ::conn))]
|
||||||
(dissoc params)
|
|
||||||
(check-params)))]
|
|
||||||
(wrk/submit! {::wrk/task :sendmail
|
(wrk/submit! {::wrk/task :sendmail
|
||||||
::wrk/delay 0
|
::wrk/delay 0
|
||||||
::wrk/max-retries 4
|
::wrk/max-retries 4
|
||||||
@ -357,10 +343,8 @@
|
|||||||
|
|
||||||
(def ^:private schema:feedback
|
(def ^:private schema:feedback
|
||||||
[:map
|
[:map
|
||||||
[:feedback-subject ::sm/text]
|
[:subject ::sm/text]
|
||||||
[:feedback-type ::sm/text]
|
[:content ::sm/text]])
|
||||||
[:feedback-content ::sm/text]
|
|
||||||
[:profile :map]])
|
|
||||||
|
|
||||||
(def user-feedback
|
(def user-feedback
|
||||||
"A profile feedback email."
|
"A profile feedback email."
|
||||||
@ -412,21 +396,6 @@
|
|||||||
:id ::invite-to-team
|
:id ::invite-to-team
|
||||||
:schema schema:invite-to-team))
|
:schema schema:invite-to-team))
|
||||||
|
|
||||||
(def ^:private schema:invite-to-org
|
|
||||||
[:map
|
|
||||||
[:invited-by ::sm/text]
|
|
||||||
[:organization-name ::sm/text]
|
|
||||||
[:organization-initials [:maybe :string]]
|
|
||||||
[:organization-logo ::sm/uri]
|
|
||||||
[:user-name [:maybe ::sm/text]]
|
|
||||||
[:token ::sm/text]])
|
|
||||||
|
|
||||||
(def invite-to-org
|
|
||||||
"Org member invitation email."
|
|
||||||
(template-factory
|
|
||||||
:id ::invite-to-org
|
|
||||||
:schema schema:invite-to-org))
|
|
||||||
|
|
||||||
(def ^:private schema:join-team
|
(def ^:private schema:join-team
|
||||||
[:map
|
[:map
|
||||||
[:invited-by ::sm/text]
|
[:invited-by ::sm/text]
|
||||||
|
|||||||
@ -36,18 +36,10 @@
|
|||||||
:cause cause)))))
|
:cause cause)))))
|
||||||
|
|
||||||
(defn contains?
|
(defn contains?
|
||||||
"Check if email is in the blacklist. Also matches subdomains: if
|
"Check if email is in the blacklist."
|
||||||
'somedomain.com' is blacklisted, 'xxx@foo.somedomain.com' will also
|
|
||||||
be rejected."
|
|
||||||
[{:keys [::email/blacklist]} email]
|
[{:keys [::email/blacklist]} email]
|
||||||
(let [[_ domain] (str/split email "@" 2)
|
(let [[_ domain] (str/split email "@" 2)]
|
||||||
parts (str/split (str/lower domain) #"\.")]
|
(c/contains? blacklist (str/lower domain))))
|
||||||
(loop [parts parts]
|
|
||||||
(if (empty? parts)
|
|
||||||
false
|
|
||||||
(if (c/contains? blacklist (str/join "." parts))
|
|
||||||
true
|
|
||||||
(recur (rest parts)))))))
|
|
||||||
|
|
||||||
(defn enabled?
|
(defn enabled?
|
||||||
"Check if the blacklist is enabled"
|
"Check if the blacklist is enabled"
|
||||||
|
|||||||
@ -112,9 +112,8 @@
|
|||||||
THEN (c.deleted_at IS NULL OR c.deleted_at >= ?::timestamptz)
|
THEN (c.deleted_at IS NULL OR c.deleted_at >= ?::timestamptz)
|
||||||
END"))
|
END"))
|
||||||
|
|
||||||
(defn get-snapshot-data
|
(defn- get-snapshot
|
||||||
"Get a fully decoded snapshot for read-only preview or restoration.
|
"Get snapshot with decoded data"
|
||||||
Returns the snapshot map with decoded :data field."
|
|
||||||
[cfg file-id snapshot-id]
|
[cfg file-id snapshot-id]
|
||||||
(let [now (ct/now)]
|
(let [now (ct/now)]
|
||||||
(->> (db/get-with-sql cfg [sql:get-snapshot file-id snapshot-id now]
|
(->> (db/get-with-sql cfg [sql:get-snapshot file-id snapshot-id now]
|
||||||
@ -139,7 +138,6 @@
|
|||||||
c.deleted_at
|
c.deleted_at
|
||||||
FROM snapshots1 AS c
|
FROM snapshots1 AS c
|
||||||
WHERE c.file_id = ?
|
WHERE c.file_id = ?
|
||||||
ORDER BY c.created_at DESC
|
|
||||||
), snapshots3 AS (
|
), snapshots3 AS (
|
||||||
(SELECT * FROM snapshots2
|
(SELECT * FROM snapshots2
|
||||||
WHERE created_by = 'system'
|
WHERE created_by = 'system'
|
||||||
@ -152,7 +150,8 @@
|
|||||||
AND deleted_at IS NULL
|
AND deleted_at IS NULL
|
||||||
LIMIT 500)
|
LIMIT 500)
|
||||||
)
|
)
|
||||||
SELECT * FROM snapshots3;"))
|
SELECT * FROM snapshots3
|
||||||
|
ORDER BY created_at DESC"))
|
||||||
|
|
||||||
(defn get-visible-snapshots
|
(defn get-visible-snapshots
|
||||||
"Return a list of snapshots fecheable from the API, it has a limited
|
"Return a list of snapshots fecheable from the API, it has a limited
|
||||||
@ -327,7 +326,7 @@
|
|||||||
(sto/resolve cfg {::db/reuse-conn true})
|
(sto/resolve cfg {::db/reuse-conn true})
|
||||||
|
|
||||||
snapshot
|
snapshot
|
||||||
(get-snapshot-data cfg file-id snapshot-id)]
|
(get-snapshot cfg file-id snapshot-id)]
|
||||||
|
|
||||||
(when-not snapshot
|
(when-not snapshot
|
||||||
(ex/raise :type :not-found
|
(ex/raise :type :not-found
|
||||||
|
|||||||
@ -25,6 +25,7 @@
|
|||||||
[app.main :as-alias main]
|
[app.main :as-alias main]
|
||||||
[app.metrics :as mtx]
|
[app.metrics :as mtx]
|
||||||
[app.rpc :as-alias rpc]
|
[app.rpc :as-alias rpc]
|
||||||
|
[app.rpc.doc :as-alias rpc.doc]
|
||||||
[app.setup :as-alias setup]
|
[app.setup :as-alias setup]
|
||||||
[integrant.core :as ig]
|
[integrant.core :as ig]
|
||||||
[reitit.core :as r]
|
[reitit.core :as r]
|
||||||
@ -42,8 +43,8 @@
|
|||||||
(def default-params
|
(def default-params
|
||||||
{::port 6060
|
{::port 6060
|
||||||
::host "0.0.0.0"
|
::host "0.0.0.0"
|
||||||
::max-body-size 367001600 ; default 350 MiB
|
::max-body-size 31457280 ; default 30 MiB
|
||||||
})
|
::max-multipart-body-size 367001600}) ; default 350 MiB
|
||||||
|
|
||||||
(defmethod ig/expand-key ::server
|
(defmethod ig/expand-key ::server
|
||||||
[k v]
|
[k v]
|
||||||
@ -56,6 +57,7 @@
|
|||||||
[::io-threads {:optional true} ::sm/int]
|
[::io-threads {:optional true} ::sm/int]
|
||||||
[::max-worker-threads {:optional true} ::sm/int]
|
[::max-worker-threads {:optional true} ::sm/int]
|
||||||
[::max-body-size {:optional true} ::sm/int]
|
[::max-body-size {:optional true} ::sm/int]
|
||||||
|
[::max-multipart-body-size {:optional true} ::sm/int]
|
||||||
[::router {:optional true} [:fn r/router?]]
|
[::router {:optional true} [:fn r/router?]]
|
||||||
[::handler {:optional true} ::sm/fn]])
|
[::handler {:optional true} ::sm/fn]])
|
||||||
|
|
||||||
@ -78,7 +80,7 @@
|
|||||||
{:http/port port
|
{:http/port port
|
||||||
:http/host host
|
:http/host host
|
||||||
:http/max-body-size (::max-body-size cfg)
|
:http/max-body-size (::max-body-size cfg)
|
||||||
:http/max-multipart-body-size (::max-body-size cfg)
|
:http/max-multipart-body-size (::max-multipart-body-size cfg)
|
||||||
:xnio/direct-buffers false
|
:xnio/direct-buffers false
|
||||||
:xnio/io-threads (::io-threads cfg)
|
:xnio/io-threads (::io-threads cfg)
|
||||||
:xnio/max-worker-threads (::max-worker-threads cfg)
|
:xnio/max-worker-threads (::max-worker-threads cfg)
|
||||||
@ -147,6 +149,7 @@
|
|||||||
[:map
|
[:map
|
||||||
[::ws/routes schema:routes]
|
[::ws/routes schema:routes]
|
||||||
[::rpc/routes schema:routes]
|
[::rpc/routes schema:routes]
|
||||||
|
[::rpc.doc/routes schema:routes]
|
||||||
[::oidc/routes schema:routes]
|
[::oidc/routes schema:routes]
|
||||||
[::assets/routes schema:routes]
|
[::assets/routes schema:routes]
|
||||||
[::debug/routes schema:routes]
|
[::debug/routes schema:routes]
|
||||||
@ -168,9 +171,8 @@
|
|||||||
[sec/sec-fetch-metadata]
|
[sec/sec-fetch-metadata]
|
||||||
[mw/params]
|
[mw/params]
|
||||||
[mw/format-response]
|
[mw/format-response]
|
||||||
[mw/auth {:bearer (partial session/decode-token cfg)
|
[session/soft-auth cfg]
|
||||||
:cookie (partial session/decode-token cfg)
|
[actoken/soft-auth cfg]
|
||||||
:token (partial actoken/decode-token cfg)}]
|
|
||||||
[mw/parse-request]
|
[mw/parse-request]
|
||||||
[mw/errors errors/handle]
|
[mw/errors errors/handle]
|
||||||
[mw/restrict-methods]]}
|
[mw/restrict-methods]]}
|
||||||
@ -186,5 +188,9 @@
|
|||||||
(::mgmt/routes cfg)]
|
(::mgmt/routes cfg)]
|
||||||
|
|
||||||
(::ws/routes cfg)
|
(::ws/routes cfg)
|
||||||
(::oidc/routes cfg)
|
|
||||||
(::rpc/routes cfg)]]))
|
["/api" {:middleware [[mw/cors]
|
||||||
|
[sec/client-header-check]]}
|
||||||
|
(::oidc/routes cfg)
|
||||||
|
(::rpc.doc/routes cfg)
|
||||||
|
(::rpc/routes cfg)]]]))
|
||||||
|
|||||||
@ -9,19 +9,23 @@
|
|||||||
[app.common.logging :as l]
|
[app.common.logging :as l]
|
||||||
[app.config :as cf]
|
[app.config :as cf]
|
||||||
[app.db :as db]
|
[app.db :as db]
|
||||||
[app.http :as-alias http]
|
|
||||||
[app.main :as-alias main]
|
[app.main :as-alias main]
|
||||||
[app.setup :as-alias setup]
|
[app.setup :as-alias setup]
|
||||||
[app.tokens :as tokens]))
|
[app.tokens :as tokens]
|
||||||
|
[yetti.request :as yreq]))
|
||||||
|
|
||||||
(defn decode-token
|
(def header-re #"(?i)^Token\s+(.*)")
|
||||||
|
|
||||||
|
(defn get-token
|
||||||
|
[request]
|
||||||
|
(some->> (yreq/get-header request "authorization")
|
||||||
|
(re-matches header-re)
|
||||||
|
(second)))
|
||||||
|
|
||||||
|
(defn- decode-token
|
||||||
[cfg token]
|
[cfg token]
|
||||||
(try
|
(when token
|
||||||
(tokens/verify cfg {:token token :iss "access-token"})
|
(tokens/verify cfg {:token token :iss "access-token"})))
|
||||||
(catch Throwable cause
|
|
||||||
(l/trc :hint "exception on decoding token"
|
|
||||||
:token token
|
|
||||||
:cause cause))))
|
|
||||||
|
|
||||||
(def sql:get-token-data
|
(def sql:get-token-data
|
||||||
"SELECT perms, profile_id, expires_at
|
"SELECT perms, profile_id, expires_at
|
||||||
@ -31,28 +35,47 @@
|
|||||||
OR (expires_at > now()));")
|
OR (expires_at > now()));")
|
||||||
|
|
||||||
(defn- get-token-data
|
(defn- get-token-data
|
||||||
[pool claims]
|
[pool token-id]
|
||||||
(when-not (db/read-only? pool)
|
(when-not (db/read-only? pool)
|
||||||
(when-let [token-id (get claims :tid)]
|
(some-> (db/exec-one! pool [sql:get-token-data token-id])
|
||||||
(some-> (db/exec-one! pool [sql:get-token-data token-id])
|
(update :perms db/decode-pgarray #{}))))
|
||||||
(update :perms db/decode-pgarray #{})))))
|
|
||||||
|
(defn- wrap-soft-auth
|
||||||
|
"Soft Authentication, will be executed synchronously on the undertow
|
||||||
|
worker thread."
|
||||||
|
[handler cfg]
|
||||||
|
(letfn [(handle-request [request]
|
||||||
|
(try
|
||||||
|
(let [token (get-token request)
|
||||||
|
claims (decode-token cfg token)]
|
||||||
|
(cond-> request
|
||||||
|
(map? claims)
|
||||||
|
(assoc ::id (:tid claims))))
|
||||||
|
(catch Throwable cause
|
||||||
|
(l/trace :hint "exception on decoding malformed token" :cause cause)
|
||||||
|
request)))]
|
||||||
|
|
||||||
|
(fn [request]
|
||||||
|
(handler (handle-request request)))))
|
||||||
|
|
||||||
(defn- wrap-authz
|
(defn- wrap-authz
|
||||||
|
"Authorization middleware, will be executed synchronously on vthread."
|
||||||
[handler {:keys [::db/pool]}]
|
[handler {:keys [::db/pool]}]
|
||||||
(fn [request]
|
(fn [request]
|
||||||
(let [{:keys [type claims]} (get request ::http/auth-data)]
|
(let [{:keys [perms profile-id expires-at]} (some->> (::id request) (get-token-data pool))]
|
||||||
(if (= :token type)
|
(handler (cond-> request
|
||||||
(let [{:keys [perms profile-id expires-at]} (some->> claims (get-token-data pool))]
|
(some? perms)
|
||||||
;; FIXME: revisit this, this data looks unused
|
(assoc ::perms perms)
|
||||||
(handler (cond-> request
|
(some? profile-id)
|
||||||
(some? perms)
|
(assoc ::profile-id profile-id)
|
||||||
(assoc ::perms perms)
|
(some? expires-at)
|
||||||
(some? profile-id)
|
(assoc ::expires-at expires-at))))))
|
||||||
(assoc ::profile-id profile-id)
|
|
||||||
(some? expires-at)
|
|
||||||
(assoc ::expires-at expires-at))))
|
|
||||||
|
|
||||||
(handler request)))))
|
(def soft-auth
|
||||||
|
{:name ::soft-auth
|
||||||
|
:compile (fn [& _]
|
||||||
|
(when (contains? cf/flags :access-tokens)
|
||||||
|
wrap-soft-auth))})
|
||||||
|
|
||||||
(def authz
|
(def authz
|
||||||
{:name ::authz
|
{:name ::authz
|
||||||
|
|||||||
@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
(defn- get-file-media-object
|
(defn- get-file-media-object
|
||||||
[pool id]
|
[pool id]
|
||||||
(db/get pool :file-media-object {:id id} {::db/remove-deleted false}))
|
(db/get pool :file-media-object {:id id}))
|
||||||
|
|
||||||
(defn- serve-object-from-s3
|
(defn- serve-object-from-s3
|
||||||
[{:keys [::sto/storage] :as cfg} obj]
|
[{:keys [::sto/storage] :as cfg} obj]
|
||||||
|
|||||||
@ -9,7 +9,8 @@
|
|||||||
(:require
|
(:require
|
||||||
[app.common.schema :as sm]
|
[app.common.schema :as sm]
|
||||||
[integrant.core :as ig]
|
[integrant.core :as ig]
|
||||||
[java-http-clj.core :as http])
|
[java-http-clj.core :as http]
|
||||||
|
[promesa.core :as p])
|
||||||
(:import
|
(:import
|
||||||
java.net.http.HttpClient))
|
java.net.http.HttpClient))
|
||||||
|
|
||||||
@ -28,9 +29,14 @@
|
|||||||
|
|
||||||
(defn send!
|
(defn send!
|
||||||
([client req] (send! client req {}))
|
([client req] (send! client req {}))
|
||||||
([client req {:keys [response-type] :or {response-type :string}}]
|
([client req {:keys [response-type sync?] :or {response-type :string sync? false}}]
|
||||||
(assert (client? client) "expected valid http client")
|
(assert (client? client) "expected valid http client")
|
||||||
(http/send req {:client client :as response-type})))
|
(if sync?
|
||||||
|
(http/send req {:client client :as response-type})
|
||||||
|
(try
|
||||||
|
(http/send-async req {:client client :as response-type})
|
||||||
|
(catch Throwable cause
|
||||||
|
(p/rejected cause))))))
|
||||||
|
|
||||||
(defn- resolve-client
|
(defn- resolve-client
|
||||||
[params]
|
[params]
|
||||||
@ -50,8 +56,8 @@
|
|||||||
([cfg-or-client request]
|
([cfg-or-client request]
|
||||||
(let [client (resolve-client cfg-or-client)
|
(let [client (resolve-client cfg-or-client)
|
||||||
request (update request :uri str)]
|
request (update request :uri str)]
|
||||||
(send! client request {})))
|
(send! client request {:sync? true})))
|
||||||
([cfg-or-client request options]
|
([cfg-or-client request options]
|
||||||
(let [client (resolve-client cfg-or-client)
|
(let [client (resolve-client cfg-or-client)
|
||||||
request (update request :uri str)]
|
request (update request :uri str)]
|
||||||
(send! client request options))))
|
(send! client request (merge {:sync? true} options)))))
|
||||||
|
|||||||
@ -31,6 +31,7 @@
|
|||||||
[app.srepl.main :as srepl]
|
[app.srepl.main :as srepl]
|
||||||
[app.storage :as-alias sto]
|
[app.storage :as-alias sto]
|
||||||
[app.storage.tmp :as tmp]
|
[app.storage.tmp :as tmp]
|
||||||
|
[app.util.blob :as blob]
|
||||||
[app.util.template :as tmpl]
|
[app.util.template :as tmpl]
|
||||||
[cuerdas.core :as str]
|
[cuerdas.core :as str]
|
||||||
[datoteka.io :as io]
|
[datoteka.io :as io]
|
||||||
@ -48,16 +49,13 @@
|
|||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
(defn index-handler
|
(defn index-handler
|
||||||
[cfg request]
|
[_cfg _request]
|
||||||
(let [profile-id (::session/profile-id request)
|
(let [{:keys [clock offset]} @clock/current]
|
||||||
offset (clock/get-offset profile-id)
|
|
||||||
profile (profile/get-profile cfg profile-id)]
|
|
||||||
{::yres/status 200
|
{::yres/status 200
|
||||||
::yres/headers {"content-type" "text/html"}
|
::yres/headers {"content-type" "text/html"}
|
||||||
::yres/body (-> (io/resource "app/templates/debug.tmpl")
|
::yres/body (-> (io/resource "app/templates/debug.tmpl")
|
||||||
(tmpl/render {:version (:full cf/version)
|
(tmpl/render {:version (:full cf/version)
|
||||||
:profile profile
|
:current-clock (str clock)
|
||||||
:current-clock ct/*clock*
|
|
||||||
:current-offset (if offset
|
:current-offset (if offset
|
||||||
(ct/format-duration offset)
|
(ct/format-duration offset)
|
||||||
"NO OFFSET")
|
"NO OFFSET")
|
||||||
@ -70,7 +68,8 @@
|
|||||||
|
|
||||||
(defn- get-resolved-file
|
(defn- get-resolved-file
|
||||||
[cfg file-id]
|
[cfg file-id]
|
||||||
(bfc/get-file cfg file-id :migrate? false :decode? false))
|
(some-> (bfc/get-file cfg file-id :migrate? false)
|
||||||
|
(update :data blob/encode)))
|
||||||
|
|
||||||
(defn prepare-download
|
(defn prepare-download
|
||||||
[file filename]
|
[file filename]
|
||||||
@ -230,30 +229,13 @@
|
|||||||
(-> (io/resource "app/templates/error-report.v3.tmpl")
|
(-> (io/resource "app/templates/error-report.v3.tmpl")
|
||||||
(tmpl/render (-> content
|
(tmpl/render (-> content
|
||||||
(assoc :id id)
|
(assoc :id id)
|
||||||
(assoc :version 3)
|
|
||||||
(assoc :created-at (ct/format-inst created-at :rfc1123))))))
|
|
||||||
|
|
||||||
(render-template-v4 [{:keys [content id created-at]}]
|
|
||||||
(-> (io/resource "app/templates/error-report.v4.tmpl")
|
|
||||||
(tmpl/render (-> content
|
|
||||||
(assoc :id id)
|
|
||||||
(assoc :version 4)
|
|
||||||
(assoc :created-at (ct/format-inst created-at :rfc1123))))))
|
|
||||||
|
|
||||||
(render-template-v5 [{:keys [content id created-at]}]
|
|
||||||
(-> (io/resource "app/templates/error-report.v5.tmpl")
|
|
||||||
(tmpl/render (-> content
|
|
||||||
(assoc :id id)
|
|
||||||
(assoc :version 5)
|
|
||||||
(assoc :created-at (ct/format-inst created-at :rfc1123))))))]
|
(assoc :created-at (ct/format-inst created-at :rfc1123))))))]
|
||||||
|
|
||||||
(if-let [report (get-report request)]
|
(if-let [report (get-report request)]
|
||||||
(let [result (case (:version report)
|
(let [result (case (:version report)
|
||||||
1 (render-template-v1 report)
|
1 (render-template-v1 report)
|
||||||
2 (render-template-v2 report)
|
2 (render-template-v2 report)
|
||||||
3 (render-template-v3 report)
|
3 (render-template-v3 report))]
|
||||||
4 (render-template-v4 report)
|
|
||||||
5 (render-template-v5 report))]
|
|
||||||
{::yres/status 200
|
{::yres/status 200
|
||||||
::yres/body result
|
::yres/body result
|
||||||
::yres/headers {"content-type" "text/html; charset=utf-8"
|
::yres/headers {"content-type" "text/html; charset=utf-8"
|
||||||
@ -261,22 +243,20 @@
|
|||||||
{::yres/status 404
|
{::yres/status 404
|
||||||
::yres/body "not found"})))
|
::yres/body "not found"})))
|
||||||
|
|
||||||
(def ^:private sql:error-reports
|
(def sql:error-reports
|
||||||
"SELECT id, created_at,
|
"SELECT id, created_at,
|
||||||
content->>'~:hint' AS hint
|
content->>'~:hint' AS hint
|
||||||
FROM server_error_report
|
FROM server_error_report
|
||||||
WHERE version = ?
|
|
||||||
ORDER BY created_at DESC
|
ORDER BY created_at DESC
|
||||||
LIMIT 300")
|
LIMIT 200")
|
||||||
|
|
||||||
(defn- error-list-handler
|
(defn error-list-handler
|
||||||
[{:keys [::db/pool]} {:keys [params]}]
|
[{:keys [::db/pool]} _request]
|
||||||
(let [version (or (some-> (get params :version) parse-long) 3)
|
(let [items (->> (db/exec! pool [sql:error-reports])
|
||||||
items (->> (db/exec! pool [sql:error-reports version])
|
(map #(update % :created-at ct/format-inst :rfc1123)))]
|
||||||
(map #(update % :created-at ct/format-inst :rfc1123)))]
|
|
||||||
{::yres/status 200
|
{::yres/status 200
|
||||||
::yres/body (-> (io/resource "app/templates/error-list.tmpl")
|
::yres/body (-> (io/resource "app/templates/error-list.tmpl")
|
||||||
(tmpl/render {:items items :version version}))
|
(tmpl/render {:items items}))
|
||||||
::yres/headers {"content-type" "text/html; charset=utf-8"
|
::yres/headers {"content-type" "text/html; charset=utf-8"
|
||||||
"x-robots-tag" "noindex"}}))
|
"x-robots-tag" "noindex"}}))
|
||||||
|
|
||||||
@ -467,16 +447,15 @@
|
|||||||
|
|
||||||
(defn- set-virtual-clock
|
(defn- set-virtual-clock
|
||||||
[_ {:keys [params] :as request}]
|
[_ {:keys [params] :as request}]
|
||||||
(let [offset (some-> params :offset str/trim not-empty ct/duration)
|
(let [offset (some-> params :offset str/trim not-empty ct/duration)
|
||||||
profile-id (::session/profile-id request)
|
reset? (contains? params :reset)]
|
||||||
reset? (contains? params :reset)]
|
|
||||||
(if (= "production" (cf/get :tenant))
|
(if (= "production" (cf/get :tenant))
|
||||||
{::yres/status 501
|
{::yres/status 501
|
||||||
::yres/body "OPERATION NOT ALLOWED"}
|
::yres/body "OPERATION NOT ALLOWED"}
|
||||||
(do
|
(do
|
||||||
(if (or reset? (zero? (inst-ms offset)))
|
(if (or reset? (zero? (inst-ms offset)))
|
||||||
(clock/assign-offset profile-id nil)
|
(clock/set-offset! nil)
|
||||||
(clock/assign-offset profile-id offset))
|
(clock/set-offset! offset))
|
||||||
{::yres/status 302
|
{::yres/status 302
|
||||||
::yres/headers {"location" "/dbg"}}))))
|
::yres/headers {"location" "/dbg"}}))))
|
||||||
|
|
||||||
@ -516,7 +495,7 @@
|
|||||||
|
|
||||||
(defn authorized?
|
(defn authorized?
|
||||||
[pool {:keys [::session/profile-id]}]
|
[pool {:keys [::session/profile-id]}]
|
||||||
(or (and (= "devenv" (cf/get :host)) profile-id)
|
(or (= "devenv" (cf/get :host))
|
||||||
(let [profile (ex/ignoring (profile/get-profile pool profile-id))
|
(let [profile (ex/ignoring (profile/get-profile pool profile-id))
|
||||||
admins (or (cf/get :admins) #{})]
|
admins (or (cf/get :admins) #{})]
|
||||||
(contains? admins (:email profile)))))
|
(contains? admins (:email profile)))))
|
||||||
|
|||||||
@ -13,7 +13,6 @@
|
|||||||
[app.config :as cf]
|
[app.config :as cf]
|
||||||
[app.http :as-alias http]
|
[app.http :as-alias http]
|
||||||
[app.http.access-token :as-alias actoken]
|
[app.http.access-token :as-alias actoken]
|
||||||
[app.http.auth :as-alias auth]
|
|
||||||
[app.http.session :as-alias session]
|
[app.http.session :as-alias session]
|
||||||
[app.util.inet :as inet]
|
[app.util.inet :as inet]
|
||||||
[clojure.spec.alpha :as s]
|
[clojure.spec.alpha :as s]
|
||||||
@ -23,16 +22,17 @@
|
|||||||
(defn request->context
|
(defn request->context
|
||||||
"Extracts error report relevant context data from request."
|
"Extracts error report relevant context data from request."
|
||||||
[request]
|
[request]
|
||||||
(let [{:keys [claims] :as auth} (get request ::http/auth-data)]
|
(let [claims (-> {}
|
||||||
|
(into (::session/token-claims request))
|
||||||
|
(into (::actoken/token-claims request)))]
|
||||||
(-> (cf/logging-context)
|
(-> (cf/logging-context)
|
||||||
(assoc :request/path (:path request))
|
(assoc :request/path (:path request))
|
||||||
(assoc :request/method (:method request))
|
(assoc :request/method (:method request))
|
||||||
(assoc :request/params (:params request))
|
(assoc :request/params (:params request))
|
||||||
(assoc :request/user-agent (yreq/get-header request "user-agent"))
|
(assoc :request/user-agent (yreq/get-header request "user-agent"))
|
||||||
(assoc :request/ip-addr (inet/parse-request request))
|
(assoc :request/ip-addr (inet/parse-request request))
|
||||||
(assoc :request/profile-id (get claims :uid))
|
(assoc :request/profile-id (:uid claims))
|
||||||
(assoc :request/auth-data auth)
|
(assoc :version/frontend (or (yreq/get-header request "x-frontend-version") "unknown")))))
|
||||||
(assoc :frontend/version (or (yreq/get-header request "x-frontend-version") "unknown")))))
|
|
||||||
|
|
||||||
(defmulti handle-error
|
(defmulti handle-error
|
||||||
(fn [cause _ _]
|
(fn [cause _ _]
|
||||||
@ -60,6 +60,7 @@
|
|||||||
::yres/body data}
|
::yres/body data}
|
||||||
|
|
||||||
(binding [l/*context* (request->context request)]
|
(binding [l/*context* (request->context request)]
|
||||||
|
(l/wrn :hint "restriction error" :cause err)
|
||||||
{::yres/status 400
|
{::yres/status 400
|
||||||
::yres/body data}))))
|
::yres/body data}))))
|
||||||
|
|
||||||
@ -220,14 +221,12 @@
|
|||||||
(assoc :hint (ex-message error)))}))))
|
(assoc :hint (ex-message error)))}))))
|
||||||
|
|
||||||
(defmethod handle-exception java.io.IOException
|
(defmethod handle-exception java.io.IOException
|
||||||
[cause request _]
|
[cause _ _]
|
||||||
(binding [l/*context* (request->context request)]
|
(l/wrn :hint "io exception" :cause cause)
|
||||||
(l/wrn :hint "io exception" :cause cause)
|
{::yres/status 500
|
||||||
{::yres/status 500
|
::yres/body {:type :server-error
|
||||||
::yres/body {:type :server-error
|
:code :io-exception
|
||||||
:code :io-exception
|
:hint (ex-message cause)}})
|
||||||
:hint (ex-message cause)
|
|
||||||
:path (:path request)}}))
|
|
||||||
|
|
||||||
(defmethod handle-exception java.util.concurrent.CompletionException
|
(defmethod handle-exception java.util.concurrent.CompletionException
|
||||||
[cause request _]
|
[cause request _]
|
||||||
|
|||||||
@ -13,13 +13,13 @@
|
|||||||
[app.common.time :as ct]
|
[app.common.time :as ct]
|
||||||
[app.config :as cf]
|
[app.config :as cf]
|
||||||
[app.db :as db]
|
[app.db :as db]
|
||||||
|
[app.http.access-token :refer [get-token]]
|
||||||
[app.main :as-alias main]
|
[app.main :as-alias main]
|
||||||
[app.rpc.commands.profile :as cmd.profile]
|
[app.rpc.commands.profile :as cmd.profile]
|
||||||
[app.setup :as-alias setup]
|
[app.setup :as-alias setup]
|
||||||
[app.tokens :as tokens]
|
[app.tokens :as tokens]
|
||||||
[app.worker :as-alias wrk]
|
[app.worker :as-alias wrk]
|
||||||
[integrant.core :as ig]
|
[integrant.core :as ig]
|
||||||
[yetti.request :as yreq]
|
|
||||||
[yetti.response :as-alias yres]))
|
[yetti.response :as-alias yres]))
|
||||||
|
|
||||||
;; ---- ROUTES
|
;; ---- ROUTES
|
||||||
@ -32,6 +32,20 @@
|
|||||||
[_ params]
|
[_ params]
|
||||||
(assert (db/pool? (::db/pool params)) "expect valid database pool"))
|
(assert (db/pool? (::db/pool params)) "expect valid database pool"))
|
||||||
|
|
||||||
|
(def ^:private auth
|
||||||
|
{:name ::auth
|
||||||
|
:compile
|
||||||
|
(fn [_ _]
|
||||||
|
(fn [handler shared-key]
|
||||||
|
(if shared-key
|
||||||
|
(fn [request]
|
||||||
|
(let [token (get-token request)]
|
||||||
|
(if (= token shared-key)
|
||||||
|
(handler request)
|
||||||
|
{::yres/status 403})))
|
||||||
|
(fn [_ _]
|
||||||
|
{::yres/status 403}))))})
|
||||||
|
|
||||||
(def ^:private default-system
|
(def ^:private default-system
|
||||||
{:name ::default-system
|
{:name ::default-system
|
||||||
:compile
|
:compile
|
||||||
@ -49,25 +63,9 @@
|
|||||||
(fn [cfg request]
|
(fn [cfg request]
|
||||||
(db/tx-run! cfg handler request)))))})
|
(db/tx-run! cfg handler request)))))})
|
||||||
|
|
||||||
(def ^:private shared-key-auth
|
|
||||||
{:name ::shared-key-auth
|
|
||||||
:compile
|
|
||||||
(fn [_ _]
|
|
||||||
(fn [handler key]
|
|
||||||
(if key
|
|
||||||
(fn [request]
|
|
||||||
(if-let [key' (yreq/get-header request "x-shared-key")]
|
|
||||||
(if (= key key')
|
|
||||||
(handler request)
|
|
||||||
{::yres/status 403})
|
|
||||||
{::yres/status 403}))
|
|
||||||
(fn [_ _]
|
|
||||||
{::yres/status 403}))))})
|
|
||||||
|
|
||||||
(defmethod ig/init-key ::routes
|
(defmethod ig/init-key ::routes
|
||||||
[_ cfg]
|
[_ cfg]
|
||||||
|
["" {:middleware [[auth (cf/get :management-api-shared-key)]
|
||||||
["" {:middleware [[shared-key-auth (cf/get :management-api-key)]
|
|
||||||
[default-system cfg]
|
[default-system cfg]
|
||||||
[transaction]]}
|
[transaction]]}
|
||||||
["/authenticate"
|
["/authenticate"
|
||||||
|
|||||||
@ -12,9 +12,7 @@
|
|||||||
[app.common.schema :as-alias sm]
|
[app.common.schema :as-alias sm]
|
||||||
[app.common.transit :as t]
|
[app.common.transit :as t]
|
||||||
[app.config :as cf]
|
[app.config :as cf]
|
||||||
[app.http :as-alias http]
|
|
||||||
[app.http.errors :as errors]
|
[app.http.errors :as errors]
|
||||||
[app.tokens :as tokens]
|
|
||||||
[app.util.pointer-map :as pmap]
|
[app.util.pointer-map :as pmap]
|
||||||
[cuerdas.core :as str]
|
[cuerdas.core :as str]
|
||||||
[yetti.adapter :as yt]
|
[yetti.adapter :as yt]
|
||||||
@ -213,14 +211,14 @@
|
|||||||
(assoc "access-control-allow-origin" origin)
|
(assoc "access-control-allow-origin" origin)
|
||||||
(assoc "access-control-allow-methods" "GET,POST,DELETE,OPTIONS,PUT,HEAD,PATCH")
|
(assoc "access-control-allow-methods" "GET,POST,DELETE,OPTIONS,PUT,HEAD,PATCH")
|
||||||
(assoc "access-control-allow-credentials" "true")
|
(assoc "access-control-allow-credentials" "true")
|
||||||
(assoc "access-control-expose-headers" "content-type, set-cookie")
|
(assoc "access-control-expose-headers" "x-requested-with, content-type, cookie")
|
||||||
(assoc "access-control-allow-headers" "x-frontend-version, x-client, x-requested-width, content-type, accept, cookie")))
|
(assoc "access-control-allow-headers" "x-frontend-version, content-type, accept, x-requested-width")))
|
||||||
|
|
||||||
(defn wrap-cors
|
(defn wrap-cors
|
||||||
[handler]
|
[handler]
|
||||||
(fn [request]
|
(fn [request]
|
||||||
(let [response (if (= (yreq/method request) :options)
|
(let [response (if (= (yreq/method request) :options)
|
||||||
{::yres/status 204}
|
{::yres/status 200}
|
||||||
(handler request))
|
(handler request))
|
||||||
origin (yreq/get-header request "origin")]
|
origin (yreq/get-header request "origin")]
|
||||||
(update response ::yres/headers with-cors-headers origin))))
|
(update response ::yres/headers with-cors-headers origin))))
|
||||||
@ -242,81 +240,3 @@
|
|||||||
(if (contains? allowed method)
|
(if (contains? allowed method)
|
||||||
(handler request)
|
(handler request)
|
||||||
{::yres/status 405}))))))})
|
{::yres/status 405}))))))})
|
||||||
|
|
||||||
(defn- wrap-auth
|
|
||||||
[handler decoders]
|
|
||||||
(let [token-re
|
|
||||||
#"(?i)^(Token|Bearer)\s+(.*)"
|
|
||||||
|
|
||||||
get-token-from-authorization
|
|
||||||
(fn [request]
|
|
||||||
(when-let [[_ token-type token] (some->> (yreq/get-header request "authorization")
|
|
||||||
(re-matches token-re))]
|
|
||||||
(if (= "token" (str/lower token-type))
|
|
||||||
{:type :token
|
|
||||||
:token token}
|
|
||||||
{:type :bearer
|
|
||||||
:token token})))
|
|
||||||
|
|
||||||
get-token-from-cookie
|
|
||||||
(fn [request]
|
|
||||||
(let [cname (cf/get :auth-token-cookie-name)
|
|
||||||
token (some-> (yreq/get-cookie request cname) :value)]
|
|
||||||
(when-not (str/empty? token)
|
|
||||||
{:type :cookie
|
|
||||||
:token token})))
|
|
||||||
|
|
||||||
get-token
|
|
||||||
(some-fn get-token-from-cookie get-token-from-authorization)
|
|
||||||
|
|
||||||
process-request
|
|
||||||
(fn [request]
|
|
||||||
(if-let [{:keys [type token] :as auth} (get-token request)]
|
|
||||||
(let [decode-fn (get decoders type)]
|
|
||||||
(if (or (= type :cookie) (= type :bearer))
|
|
||||||
(let [metadata (tokens/decode-header token)]
|
|
||||||
;; NOTE: we only proceed to decode claims on new
|
|
||||||
;; cookie tokens. The old cookies dont need to be
|
|
||||||
;; decoded because they use the token string as ID
|
|
||||||
(if (and (= (:kid metadata) 1)
|
|
||||||
(= (:ver metadata) 1)
|
|
||||||
(some? decode-fn))
|
|
||||||
(assoc request ::http/auth-data (assoc auth
|
|
||||||
:claims (decode-fn token)
|
|
||||||
:metadata metadata))
|
|
||||||
(assoc request ::http/auth-data (assoc auth :metadata {:ver 0}))))
|
|
||||||
|
|
||||||
(if decode-fn
|
|
||||||
(assoc request ::http/auth-data (assoc auth :claims (decode-fn token)))
|
|
||||||
(assoc request ::http/auth-data auth))))
|
|
||||||
|
|
||||||
request))]
|
|
||||||
|
|
||||||
(fn [request]
|
|
||||||
(-> request process-request handler))))
|
|
||||||
|
|
||||||
(def auth
|
|
||||||
{:name ::auth
|
|
||||||
:compile (constantly wrap-auth)})
|
|
||||||
|
|
||||||
(defn- wrap-shared-key-auth
|
|
||||||
[handler keys]
|
|
||||||
(if (seq keys)
|
|
||||||
(fn [request]
|
|
||||||
(if-let [[key-id key] (some-> (yreq/get-header request "x-shared-key")
|
|
||||||
(str/split #"\s+" 2))]
|
|
||||||
(let [key-id (-> key-id str/lower keyword)]
|
|
||||||
(if (and (string? key)
|
|
||||||
(contains? keys key-id)
|
|
||||||
(= key (get keys key-id)))
|
|
||||||
(-> request
|
|
||||||
(assoc ::http/auth-key-id key-id)
|
|
||||||
(handler))
|
|
||||||
{::yres/status 403}))
|
|
||||||
{::yres/status 403}))
|
|
||||||
(fn [_ _]
|
|
||||||
{::yres/status 403})))
|
|
||||||
|
|
||||||
(def shared-key-auth
|
|
||||||
{:name ::shared-key-auth
|
|
||||||
:compile (constantly wrap-shared-key-auth)})
|
|
||||||
|
|||||||
@ -11,25 +11,28 @@
|
|||||||
[app.common.logging :as l]
|
[app.common.logging :as l]
|
||||||
[app.common.schema :as sm]
|
[app.common.schema :as sm]
|
||||||
[app.common.time :as ct]
|
[app.common.time :as ct]
|
||||||
[app.common.uuid :as uuid]
|
|
||||||
[app.config :as cf]
|
[app.config :as cf]
|
||||||
[app.db :as db]
|
[app.db :as db]
|
||||||
[app.db.sql :as sql]
|
[app.db.sql :as sql]
|
||||||
[app.http :as-alias http]
|
|
||||||
[app.http.auth :as-alias http.auth]
|
|
||||||
[app.http.session.tasks :as-alias tasks]
|
[app.http.session.tasks :as-alias tasks]
|
||||||
[app.main :as-alias main]
|
[app.main :as-alias main]
|
||||||
[app.setup :as-alias setup]
|
[app.setup :as-alias setup]
|
||||||
[app.setup.clock :as clock]
|
|
||||||
[app.tokens :as tokens]
|
[app.tokens :as tokens]
|
||||||
|
[cuerdas.core :as str]
|
||||||
[integrant.core :as ig]
|
[integrant.core :as ig]
|
||||||
[yetti.request :as yreq]
|
[yetti.request :as yreq]))
|
||||||
[yetti.response :as yres]))
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;; DEFAULTS
|
;; DEFAULTS
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
|
;; A default cookie name for storing the session.
|
||||||
|
(def default-auth-token-cookie-name "auth-token")
|
||||||
|
|
||||||
|
;; A cookie that we can use to check from other sites of the same
|
||||||
|
;; domain if a user is authenticated.
|
||||||
|
(def default-auth-data-cookie-name "auth-data")
|
||||||
|
|
||||||
;; Default value for cookie max-age
|
;; Default value for cookie max-age
|
||||||
(def default-cookie-max-age (ct/duration {:days 7}))
|
(def default-cookie-max-age (ct/duration {:days 7}))
|
||||||
|
|
||||||
@ -41,10 +44,10 @@
|
|||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
(defprotocol ISessionManager
|
(defprotocol ISessionManager
|
||||||
(read-session [_ id])
|
(read [_ key])
|
||||||
(create-session [_ params])
|
(write! [_ key data])
|
||||||
(update-session [_ session])
|
(update! [_ data])
|
||||||
(delete-session [_ id]))
|
(delete! [_ key]))
|
||||||
|
|
||||||
(defn manager?
|
(defn manager?
|
||||||
[o]
|
[o]
|
||||||
@ -59,82 +62,71 @@
|
|||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
(def ^:private schema:params
|
(def ^:private schema:params
|
||||||
[:map {:title "SessionParams" :closed true}
|
[:map {:title "session-params"}
|
||||||
|
[:user-agent ::sm/text]
|
||||||
[:profile-id ::sm/uuid]
|
[:profile-id ::sm/uuid]
|
||||||
[:user-agent {:optional true} ::sm/text]
|
[:created-at ::ct/inst]])
|
||||||
[:sso-provider-id {:optional true} ::sm/uuid]
|
|
||||||
[:sso-session-id {:optional true} :string]])
|
|
||||||
|
|
||||||
(def ^:private valid-params?
|
(def ^:private valid-params?
|
||||||
(sm/validator schema:params))
|
(sm/validator schema:params))
|
||||||
|
|
||||||
|
(defn- prepare-session-params
|
||||||
|
[params key]
|
||||||
|
(assert (string? key) "expected key to be a string")
|
||||||
|
(assert (not (str/blank? key)) "expected key to be not empty")
|
||||||
|
(assert (valid-params? params) "expected valid params")
|
||||||
|
|
||||||
|
{:user-agent (:user-agent params)
|
||||||
|
:profile-id (:profile-id params)
|
||||||
|
:created-at (:created-at params)
|
||||||
|
:updated-at (:created-at params)
|
||||||
|
:id key})
|
||||||
|
|
||||||
(defn- database-manager
|
(defn- database-manager
|
||||||
[pool]
|
[pool]
|
||||||
(reify ISessionManager
|
(reify ISessionManager
|
||||||
(read-session [_ id]
|
(read [_ token]
|
||||||
(if (string? id)
|
(db/exec-one! pool (sql/select :http-session {:id token})))
|
||||||
;; Backward compatibility
|
|
||||||
(let [session (db/exec-one! pool (sql/select :http-session {:id id}))]
|
|
||||||
(-> session
|
|
||||||
(assoc :modified-at (:updated-at session))
|
|
||||||
(dissoc :updated-at)))
|
|
||||||
(db/exec-one! pool (sql/select :http-session-v2 {:id id}))))
|
|
||||||
|
|
||||||
(create-session [_ params]
|
(write! [_ key params]
|
||||||
(assert (valid-params? params) "expect valid session params")
|
(let [params (-> params
|
||||||
|
(assoc :created-at (ct/now))
|
||||||
|
(prepare-session-params key))]
|
||||||
|
(db/insert! pool :http-session params)
|
||||||
|
params))
|
||||||
|
|
||||||
(let [now (ct/now)
|
(update! [_ params]
|
||||||
params (-> params
|
(let [updated-at (ct/now)]
|
||||||
(assoc :id (uuid/next))
|
(db/update! pool :http-session
|
||||||
(assoc :created-at now)
|
{:updated-at updated-at}
|
||||||
(assoc :modified-at now))]
|
{:id (:id params)})
|
||||||
(db/insert! pool :http-session-v2 params
|
(assoc params :updated-at updated-at)))
|
||||||
{::db/return-keys true})))
|
|
||||||
|
|
||||||
(update-session [_ session]
|
(delete! [_ token]
|
||||||
(let [modified-at (ct/now)]
|
(db/delete! pool :http-session {:id token})
|
||||||
(if (string? (:id session))
|
|
||||||
(db/insert! pool :http-session-v2
|
|
||||||
(-> session
|
|
||||||
(assoc :id (uuid/next))
|
|
||||||
(assoc :created-at modified-at)
|
|
||||||
(assoc :modified-at modified-at)))
|
|
||||||
(db/update! pool :http-session-v2
|
|
||||||
{:modified-at modified-at}
|
|
||||||
{:id (:id session)}
|
|
||||||
{::db/return-keys true}))))
|
|
||||||
|
|
||||||
(delete-session [_ id]
|
|
||||||
(if (string? id)
|
|
||||||
(db/delete! pool :http-session {:id id} {::db/return-keys false})
|
|
||||||
(db/delete! pool :http-session-v2 {:id id} {::db/return-keys false}))
|
|
||||||
nil)))
|
nil)))
|
||||||
|
|
||||||
(defn inmemory-manager
|
(defn inmemory-manager
|
||||||
[]
|
[]
|
||||||
(let [cache (atom {})]
|
(let [cache (atom {})]
|
||||||
(reify ISessionManager
|
(reify ISessionManager
|
||||||
(read-session [_ id]
|
(read [_ token]
|
||||||
(get @cache id))
|
(get @cache token))
|
||||||
|
|
||||||
(create-session [_ params]
|
(write! [_ key params]
|
||||||
(assert (valid-params? params) "expect valid session params")
|
(let [params (-> params
|
||||||
|
(assoc :created-at (ct/now))
|
||||||
|
(prepare-session-params key))]
|
||||||
|
(swap! cache assoc key params)
|
||||||
|
params))
|
||||||
|
|
||||||
(let [now (ct/now)
|
(update! [_ params]
|
||||||
session (-> params
|
(let [updated-at (ct/now)]
|
||||||
(assoc :id (uuid/next))
|
(swap! cache update (:id params) assoc :updated-at updated-at)
|
||||||
(assoc :created-at now)
|
(assoc params :updated-at updated-at)))
|
||||||
(assoc :modified-at now))]
|
|
||||||
(swap! cache assoc (:id session) session)
|
|
||||||
session))
|
|
||||||
|
|
||||||
(update-session [_ session]
|
(delete! [_ token]
|
||||||
(let [modified-at (ct/now)]
|
(swap! cache dissoc token)
|
||||||
(swap! cache update (:id session) assoc :modified-at modified-at)
|
|
||||||
(assoc session :modified-at modified-at)))
|
|
||||||
|
|
||||||
(delete-session [_ id]
|
|
||||||
(swap! cache dissoc id)
|
|
||||||
nil))))
|
nil))))
|
||||||
|
|
||||||
(defmethod ig/assert-key ::manager
|
(defmethod ig/assert-key ::manager
|
||||||
@ -154,120 +146,103 @@
|
|||||||
;; MANAGER IMPL
|
;; MANAGER IMPL
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
(declare ^:private assign-session-cookie)
|
(declare ^:private assign-auth-token-cookie)
|
||||||
(declare ^:private clear-session-cookie)
|
(declare ^:private clear-auth-token-cookie)
|
||||||
|
(declare ^:private gen-token)
|
||||||
(defn- assign-token
|
|
||||||
[cfg session]
|
|
||||||
(let [claims {:iss "authentication"
|
|
||||||
:aud "penpot"
|
|
||||||
:sid (:id session)
|
|
||||||
:iat (:modified-at session)
|
|
||||||
:uid (:profile-id session)
|
|
||||||
:sso-provider-id (:sso-provider-id session)
|
|
||||||
:sso-session-id (:sso-session-id session)}
|
|
||||||
header {:kid 1 :ver 1}
|
|
||||||
token (tokens/generate cfg claims header)]
|
|
||||||
(assoc session :token token)))
|
|
||||||
|
|
||||||
(defn create-fn
|
(defn create-fn
|
||||||
[{:keys [::manager] :as cfg} {profile-id :id :as profile}
|
[{:keys [::manager] :as cfg} profile-id]
|
||||||
& {:keys [sso-provider-id sso-session-id]}]
|
|
||||||
|
|
||||||
(assert (manager? manager) "expected valid session manager")
|
(assert (manager? manager) "expected valid session manager")
|
||||||
(assert (uuid? profile-id) "expected valid uuid for profile-id")
|
(assert (uuid? profile-id) "expected valid uuid for profile-id")
|
||||||
|
|
||||||
(fn [request response]
|
(fn [request response]
|
||||||
(let [uagent (yreq/get-header request "user-agent")
|
(let [uagent (yreq/get-header request "user-agent")
|
||||||
session (->> {:user-agent uagent
|
params {:profile-id profile-id
|
||||||
:profile-id profile-id
|
:user-agent uagent}
|
||||||
:sso-provider-id sso-provider-id
|
token (gen-token cfg params)
|
||||||
:sso-session-id sso-session-id}
|
session (write! manager token params)]
|
||||||
(d/without-nils)
|
(l/trc :hint "create" :profile-id (str profile-id))
|
||||||
(create-session manager)
|
(-> response
|
||||||
(assign-token cfg))]
|
(assign-auth-token-cookie session)))))
|
||||||
|
|
||||||
(l/trc :hint "create" :id (str (:id session)) :profile-id (str profile-id))
|
|
||||||
(assign-session-cookie response session))))
|
|
||||||
|
|
||||||
(defn delete-fn
|
(defn delete-fn
|
||||||
[{:keys [::manager]}]
|
[{:keys [::manager]}]
|
||||||
(assert (manager? manager) "expected valid session manager")
|
(assert (manager? manager) "expected valid session manager")
|
||||||
(fn [request response]
|
(fn [request response]
|
||||||
(some->> (get request ::id) (delete-session manager))
|
(let [cname (cf/get :auth-token-cookie-name default-auth-token-cookie-name)
|
||||||
(clear-session-cookie response)))
|
cookie (yreq/get-cookie request cname)]
|
||||||
|
(l/trc :hint "delete" :profile-id (:profile-id request))
|
||||||
|
(some->> (:value cookie) (delete! manager))
|
||||||
|
(-> response
|
||||||
|
(assoc :status 204)
|
||||||
|
(assoc :body nil)
|
||||||
|
(clear-auth-token-cookie)))))
|
||||||
|
|
||||||
(defn decode-token
|
(defn- gen-token
|
||||||
|
[cfg {:keys [profile-id created-at]}]
|
||||||
|
(tokens/generate cfg {:iss "authentication"
|
||||||
|
:iat created-at
|
||||||
|
:uid profile-id}))
|
||||||
|
(defn- decode-token
|
||||||
[cfg token]
|
[cfg token]
|
||||||
(try
|
(when token
|
||||||
(tokens/verify cfg {:token token :iss "authentication"})
|
(tokens/verify cfg {:token token :iss "authentication"})))
|
||||||
(catch Throwable cause
|
|
||||||
(l/trc :hint "exception on decoding token"
|
|
||||||
:token token
|
|
||||||
:cause cause))))
|
|
||||||
|
|
||||||
(defn get-session
|
(defn- get-token
|
||||||
[request]
|
[request]
|
||||||
(get request ::session))
|
(let [cname (cf/get :auth-token-cookie-name default-auth-token-cookie-name)
|
||||||
|
cookie (some-> (yreq/get-cookie request cname) :value)]
|
||||||
|
(when-not (str/empty? cookie)
|
||||||
|
cookie)))
|
||||||
|
|
||||||
(defn invalidate-others
|
(defn- get-session
|
||||||
[cfg session]
|
[manager token]
|
||||||
(let [sql "delete from http_session_v2 where profile_id = ? and id != ?"]
|
(some->> token (read manager)))
|
||||||
(-> (db/exec-one! cfg [sql (:profile-id session) (:id session)])
|
|
||||||
(db/get-update-count))))
|
|
||||||
|
|
||||||
(defn- renew-session?
|
(defn- renew-session?
|
||||||
[{:keys [id modified-at] :as session}]
|
[{:keys [updated-at] :as session}]
|
||||||
(or (string? id)
|
(and (ct/inst? updated-at)
|
||||||
(and (ct/inst? modified-at)
|
(let [elapsed (ct/diff updated-at (ct/now))]
|
||||||
(let [elapsed (ct/diff modified-at (ct/now))]
|
(neg? (compare default-renewal-max-age elapsed)))))
|
||||||
(neg? (compare default-renewal-max-age elapsed))))))
|
|
||||||
|
|
||||||
(defn- wrap-authz
|
(defn- wrap-soft-auth
|
||||||
[handler {:keys [::manager] :as cfg}]
|
[handler {:keys [::manager] :as cfg}]
|
||||||
(assert (manager? manager) "expected valid session manager")
|
(assert (manager? manager) "expected valid session manager")
|
||||||
|
(letfn [(handle-request [request]
|
||||||
|
(try
|
||||||
|
(let [token (get-token request)
|
||||||
|
claims (decode-token cfg token)]
|
||||||
|
(cond-> request
|
||||||
|
(map? claims)
|
||||||
|
(-> (assoc ::token-claims claims)
|
||||||
|
(assoc ::token token))))
|
||||||
|
(catch Throwable cause
|
||||||
|
(l/trc :hint "exception on decoding malformed token" :cause cause)
|
||||||
|
request)))]
|
||||||
|
|
||||||
|
(fn [request]
|
||||||
|
(handler (handle-request request)))))
|
||||||
|
|
||||||
|
(defn- wrap-authz
|
||||||
|
[handler {:keys [::manager]}]
|
||||||
|
(assert (manager? manager) "expected valid session manager")
|
||||||
(fn [request]
|
(fn [request]
|
||||||
(let [{:keys [type token claims metadata]} (get request ::http/auth-data)]
|
(let [session (get-session manager (::token request))
|
||||||
(cond
|
request (cond-> request
|
||||||
(= type :cookie)
|
(some? session)
|
||||||
(let [session
|
(assoc ::profile-id (:profile-id session)
|
||||||
(case (:ver metadata)
|
::id (:id session)))
|
||||||
;; BACKWARD COMPATIBILITY WITH OLD TOKENS
|
response (handler request)]
|
||||||
0 (read-session manager token)
|
|
||||||
1 (some->> (:sid claims) (read-session manager))
|
|
||||||
nil)
|
|
||||||
|
|
||||||
request
|
(if (renew-session? session)
|
||||||
(cond-> request
|
(let [session (update! manager session)]
|
||||||
(some? session)
|
(-> response
|
||||||
(-> (assoc ::profile-id (:profile-id session))
|
(assign-auth-token-cookie session)))
|
||||||
(assoc ::session session)))
|
response))))
|
||||||
|
|
||||||
response
|
(def soft-auth
|
||||||
(binding [ct/*clock* (clock/get-clock (:profile-id session))]
|
{:name ::soft-auth
|
||||||
(handler request))]
|
:compile (constantly wrap-soft-auth)})
|
||||||
|
|
||||||
(if (and session (renew-session? session))
|
|
||||||
(let [session (->> session
|
|
||||||
(update-session manager)
|
|
||||||
(assign-token cfg))]
|
|
||||||
(assign-session-cookie response session))
|
|
||||||
response))
|
|
||||||
|
|
||||||
(= type :bearer)
|
|
||||||
(let [session (case (:ver metadata)
|
|
||||||
;; BACKWARD COMPATIBILITY WITH OLD TOKENS
|
|
||||||
0 (read-session manager token)
|
|
||||||
1 (some->> (:sid claims) (read-session manager))
|
|
||||||
nil)
|
|
||||||
request (cond-> request
|
|
||||||
(some? session)
|
|
||||||
(-> (assoc ::profile-id (:profile-id session))
|
|
||||||
(assoc ::session session)))]
|
|
||||||
(handler request))
|
|
||||||
|
|
||||||
:else
|
|
||||||
(handler request)))))
|
|
||||||
|
|
||||||
(def authz
|
(def authz
|
||||||
{:name ::authz
|
{:name ::authz
|
||||||
@ -275,16 +250,16 @@
|
|||||||
|
|
||||||
;; --- IMPL
|
;; --- IMPL
|
||||||
|
|
||||||
(defn- assign-session-cookie
|
(defn- assign-auth-token-cookie
|
||||||
[response {token :token modified-at :modified-at}]
|
[response {token :id updated-at :updated-at}]
|
||||||
(let [max-age (cf/get :auth-token-cookie-max-age default-cookie-max-age)
|
(let [max-age (cf/get :auth-token-cookie-max-age default-cookie-max-age)
|
||||||
created-at modified-at
|
created-at updated-at
|
||||||
renewal (ct/plus created-at default-renewal-max-age)
|
renewal (ct/plus created-at default-renewal-max-age)
|
||||||
expires (ct/plus created-at max-age)
|
expires (ct/plus created-at max-age)
|
||||||
secure? (contains? cf/flags :secure-session-cookies)
|
secure? (contains? cf/flags :secure-session-cookies)
|
||||||
strict? (contains? cf/flags :strict-session-cookies)
|
strict? (contains? cf/flags :strict-session-cookies)
|
||||||
cors? (contains? cf/flags :cors)
|
cors? (contains? cf/flags :cors)
|
||||||
name (cf/get :auth-token-cookie-name)
|
name (cf/get :auth-token-cookie-name default-auth-token-cookie-name)
|
||||||
comment (str "Renewal at: " (ct/format-inst renewal :rfc1123))
|
comment (str "Renewal at: " (ct/format-inst renewal :rfc1123))
|
||||||
cookie {:path "/"
|
cookie {:path "/"
|
||||||
:http-only true
|
:http-only true
|
||||||
@ -293,12 +268,12 @@
|
|||||||
:comment comment
|
:comment comment
|
||||||
:same-site (if cors? :none (if strict? :strict :lax))
|
:same-site (if cors? :none (if strict? :strict :lax))
|
||||||
:secure secure?}]
|
:secure secure?}]
|
||||||
(update response ::yres/cookies assoc name cookie)))
|
(update response :cookies assoc name cookie)))
|
||||||
|
|
||||||
(defn- clear-session-cookie
|
(defn- clear-auth-token-cookie
|
||||||
[response]
|
[response]
|
||||||
(let [cname (cf/get :auth-token-cookie-name)]
|
(let [cname (cf/get :auth-token-cookie-name default-auth-token-cookie-name)]
|
||||||
(update response ::yres/cookies assoc cname {:path "/" :value "" :max-age 0})))
|
(update response :cookies assoc cname {:path "/" :value "" :max-age 0})))
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;; TASK: SESSION GC
|
;; TASK: SESSION GC
|
||||||
|
|||||||
@ -6,6 +6,7 @@
|
|||||||
|
|
||||||
(ns app.http.sse
|
(ns app.http.sse
|
||||||
"SSE (server sent events) helpers"
|
"SSE (server sent events) helpers"
|
||||||
|
(:refer-clojure :exclude [tap])
|
||||||
(:require
|
(:require
|
||||||
[app.common.data :as d]
|
[app.common.data :as d]
|
||||||
[app.common.logging :as l]
|
[app.common.logging :as l]
|
||||||
@ -53,7 +54,6 @@
|
|||||||
::yres/status 200
|
::yres/status 200
|
||||||
::yres/body (yres/stream-body
|
::yres/body (yres/stream-body
|
||||||
(fn [_ output]
|
(fn [_ output]
|
||||||
|
|
||||||
(let [channel (sp/chan :buf buf :xf (keep encode))
|
(let [channel (sp/chan :buf buf :xf (keep encode))
|
||||||
listener (events/spawn-listener
|
listener (events/spawn-listener
|
||||||
channel
|
channel
|
||||||
|
|||||||
@ -9,7 +9,6 @@
|
|||||||
(:require
|
(:require
|
||||||
[app.common.data :as d]
|
[app.common.data :as d]
|
||||||
[app.common.data.macros :as dm]
|
[app.common.data.macros :as dm]
|
||||||
[app.common.json :as json]
|
|
||||||
[app.common.logging :as l]
|
[app.common.logging :as l]
|
||||||
[app.common.schema :as sm]
|
[app.common.schema :as sm]
|
||||||
[app.common.time :as ct]
|
[app.common.time :as ct]
|
||||||
@ -26,8 +25,7 @@
|
|||||||
[app.util.inet :as inet]
|
[app.util.inet :as inet]
|
||||||
[app.util.services :as-alias sv]
|
[app.util.services :as-alias sv]
|
||||||
[app.worker :as wrk]
|
[app.worker :as wrk]
|
||||||
[cuerdas.core :as str]
|
[cuerdas.core :as str]))
|
||||||
[yetti.request :as yreq]))
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;; HELPERS
|
;; HELPERS
|
||||||
@ -80,32 +78,17 @@
|
|||||||
(remove #(contains? reserved-props (key %))))
|
(remove #(contains? reserved-props (key %))))
|
||||||
props))
|
props))
|
||||||
|
|
||||||
(defn get-external-session-id
|
(defn event-from-rpc-params
|
||||||
[request]
|
"Create a base event skeleton with pre-filled some important
|
||||||
(when-let [session-id (yreq/get-header request "x-external-session-id")]
|
data that can be extracted from RPC params object"
|
||||||
(when-not (or (> (count session-id) 256)
|
[params]
|
||||||
(= session-id "null")
|
(let [context {:external-session-id (::rpc/external-session-id params)
|
||||||
(str/blank? session-id))
|
:external-event-origin (::rpc/external-event-origin params)
|
||||||
session-id)))
|
:triggered-by (::rpc/handler-name params)}]
|
||||||
|
{::type "action"
|
||||||
(defn- get-client-event-origin
|
::profile-id (::rpc/profile-id params)
|
||||||
[request]
|
::ip-addr (::rpc/ip-addr params)
|
||||||
(when-let [origin (yreq/get-header request "x-event-origin")]
|
::context (d/without-nils context)}))
|
||||||
(when-not (or (= origin "null")
|
|
||||||
(str/blank? origin))
|
|
||||||
(str/prune origin 200))))
|
|
||||||
|
|
||||||
(defn get-client-user-agent
|
|
||||||
[request]
|
|
||||||
(when-let [user-agent (yreq/get-header request "user-agent")]
|
|
||||||
(str/prune user-agent 500)))
|
|
||||||
|
|
||||||
(defn- get-client-version
|
|
||||||
[request]
|
|
||||||
(when-let [origin (yreq/get-header request "x-frontend-version")]
|
|
||||||
(when-not (or (= origin "null")
|
|
||||||
(str/blank? origin))
|
|
||||||
(str/prune origin 100))))
|
|
||||||
|
|
||||||
;; --- SPECS
|
;; --- SPECS
|
||||||
|
|
||||||
@ -113,14 +96,12 @@
|
|||||||
;; COLLECTOR API
|
;; COLLECTOR API
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
(declare ^:private prepare-context-from-request)
|
|
||||||
|
|
||||||
;; Defines a service that collects the audit/activity log using
|
;; Defines a service that collects the audit/activity log using
|
||||||
;; internal database. Later this audit log can be transferred to
|
;; internal database. Later this audit log can be transferred to
|
||||||
;; an external storage and data cleared.
|
;; an external storage and data cleared.
|
||||||
|
|
||||||
(def ^:private schema:event
|
(def ^:private schema:event
|
||||||
[:map {:title "AuditEvent"}
|
[:map {:title "event"}
|
||||||
[::type ::sm/text]
|
[::type ::sm/text]
|
||||||
[::name ::sm/text]
|
[::name ::sm/text]
|
||||||
[::profile-id ::sm/uuid]
|
[::profile-id ::sm/uuid]
|
||||||
@ -128,8 +109,6 @@
|
|||||||
[::props {:optional true} [:map-of :keyword :any]]
|
[::props {:optional true} [:map-of :keyword :any]]
|
||||||
[::context {:optional true} [:map-of :keyword :any]]
|
[::context {:optional true} [:map-of :keyword :any]]
|
||||||
[::tracked-at {:optional true} ::ct/inst]
|
[::tracked-at {:optional true} ::ct/inst]
|
||||||
[::created-at {:optional true} ::ct/inst]
|
|
||||||
[::source {:optional true} ::sm/text]
|
|
||||||
[::webhooks/event? {:optional true} ::sm/boolean]
|
[::webhooks/event? {:optional true} ::sm/boolean]
|
||||||
[::webhooks/batch-timeout {:optional true} ::ct/duration]
|
[::webhooks/batch-timeout {:optional true} ::ct/duration]
|
||||||
[::webhooks/batch-key {:optional true}
|
[::webhooks/batch-key {:optional true}
|
||||||
@ -138,9 +117,6 @@
|
|||||||
(def ^:private check-event
|
(def ^:private check-event
|
||||||
(sm/check-fn schema:event))
|
(sm/check-fn schema:event))
|
||||||
|
|
||||||
(def valid-event?
|
|
||||||
(sm/validator schema:event))
|
|
||||||
|
|
||||||
(defn prepare-event
|
(defn prepare-event
|
||||||
[cfg mdata params result]
|
[cfg mdata params result]
|
||||||
(let [resultm (meta result)
|
(let [resultm (meta result)
|
||||||
@ -150,23 +126,29 @@
|
|||||||
(::rpc/profile-id params)
|
(::rpc/profile-id params)
|
||||||
uuid/zero)
|
uuid/zero)
|
||||||
|
|
||||||
|
session-id (get params ::rpc/external-session-id)
|
||||||
|
event-origin (get params ::rpc/external-event-origin)
|
||||||
props (-> (or (::replace-props resultm)
|
props (-> (or (::replace-props resultm)
|
||||||
(merge params (::props resultm)))
|
(-> params
|
||||||
|
(merge (::props resultm))
|
||||||
|
(dissoc :profile-id)
|
||||||
|
(dissoc :type)))
|
||||||
|
|
||||||
(clean-props))
|
(clean-props))
|
||||||
|
|
||||||
context (merge (::context resultm)
|
token-id (::actoken/id request)
|
||||||
(prepare-context-from-request request))
|
context (-> (::context resultm)
|
||||||
ip-addr (inet/parse-request request)
|
(assoc :external-session-id session-id)
|
||||||
module (get cfg ::rpc/module)]
|
(assoc :external-event-origin event-origin)
|
||||||
|
(assoc :access-token-id (some-> token-id str))
|
||||||
|
(d/without-nils))
|
||||||
|
|
||||||
|
ip-addr (inet/parse-request request)]
|
||||||
|
|
||||||
{::type (or (::type resultm)
|
{::type (or (::type resultm)
|
||||||
(::rpc/type cfg))
|
(::rpc/type cfg))
|
||||||
::name (or (::name resultm)
|
::name (or (::name resultm)
|
||||||
(let [sname (::sv/name mdata)]
|
(::sv/name mdata))
|
||||||
(if (not= module "main")
|
|
||||||
(str module "-" sname)
|
|
||||||
sname)))
|
|
||||||
|
|
||||||
::profile-id profile-id
|
::profile-id profile-id
|
||||||
::ip-addr ip-addr
|
::ip-addr ip-addr
|
||||||
::props props
|
::props props
|
||||||
@ -190,38 +172,6 @@
|
|||||||
(::webhooks/event? resultm)
|
(::webhooks/event? resultm)
|
||||||
false)}))
|
false)}))
|
||||||
|
|
||||||
(defn- prepare-context-from-request
|
|
||||||
"Prepare backend event context from request"
|
|
||||||
[request]
|
|
||||||
(let [client-event-origin (get-client-event-origin request)
|
|
||||||
client-version (get-client-version request)
|
|
||||||
client-user-agent (get-client-user-agent request)
|
|
||||||
session-id (get-external-session-id request)
|
|
||||||
key-id (::http/auth-key-id request)
|
|
||||||
token-id (::actoken/id request)
|
|
||||||
token-type (::actoken/type request)]
|
|
||||||
(d/without-nils
|
|
||||||
{:external-session-id session-id
|
|
||||||
:initiator (or key-id "app")
|
|
||||||
:access-token-id (some-> token-id str)
|
|
||||||
:access-token-type (some-> token-type str)
|
|
||||||
:client-event-origin client-event-origin
|
|
||||||
:client-user-agent client-user-agent
|
|
||||||
:client-version client-version
|
|
||||||
:version (:full cf/version)})))
|
|
||||||
|
|
||||||
(defn event-from-rpc-params
|
|
||||||
"Create a base event skeleton with pre-filled some important
|
|
||||||
data that can be extracted from RPC params object"
|
|
||||||
[params]
|
|
||||||
(let [context (some-> params meta ::http/request prepare-context-from-request)
|
|
||||||
event {::type "action"
|
|
||||||
::profile-id (or (::rpc/profile-id params) uuid/zero)
|
|
||||||
::ip-addr (::rpc/ip-addr params)}]
|
|
||||||
(cond-> event
|
|
||||||
(some? context)
|
|
||||||
(assoc ::context context))))
|
|
||||||
|
|
||||||
(defn- event->params
|
(defn- event->params
|
||||||
[event]
|
[event]
|
||||||
(let [params {:id (uuid/next)
|
(let [params {:id (uuid/next)
|
||||||
@ -238,7 +188,7 @@
|
|||||||
(some? tnow)
|
(some? tnow)
|
||||||
(assoc :tracked-at tnow))))
|
(assoc :tracked-at tnow))))
|
||||||
|
|
||||||
(defn- append-audit-entry
|
(defn- append-audit-entry!
|
||||||
[cfg params]
|
[cfg params]
|
||||||
(let [params (-> params
|
(let [params (-> params
|
||||||
(update :props db/tjson)
|
(update :props db/tjson)
|
||||||
@ -248,26 +198,17 @@
|
|||||||
|
|
||||||
(defn- handle-event!
|
(defn- handle-event!
|
||||||
[cfg event]
|
[cfg event]
|
||||||
(let [tnow (ct/now)
|
(let [params (event->params event)
|
||||||
params (-> (event->params event)
|
tnow (ct/now)]
|
||||||
(assoc :created-at tnow)
|
|
||||||
(update :tracked-at #(or % tnow)))]
|
|
||||||
|
|
||||||
(when (contains? cf/flags :audit-log-logger)
|
|
||||||
(l/log! ::l/logger "app.audit"
|
|
||||||
::l/level :info
|
|
||||||
:profile-id (str (::profile-id event))
|
|
||||||
:ip-addr (str (::ip-addr event))
|
|
||||||
:type (::type event)
|
|
||||||
:name (::name event)
|
|
||||||
:props (json/encode (::props event) :key-fn json/write-camel-key)
|
|
||||||
:context (json/encode (::context event) :key-fn json/write-camel-key)))
|
|
||||||
|
|
||||||
(when (contains? cf/flags :audit-log)
|
(when (contains? cf/flags :audit-log)
|
||||||
;; NOTE: this operation may cause primary key conflicts on inserts
|
;; NOTE: this operation may cause primary key conflicts on inserts
|
||||||
;; because of the timestamp precission (two concurrent requests), in
|
;; because of the timestamp precission (two concurrent requests), in
|
||||||
;; this case we just retry the operation.
|
;; this case we just retry the operation.
|
||||||
(append-audit-entry cfg params))
|
(let [params (-> params
|
||||||
|
(assoc :created-at tnow)
|
||||||
|
(update :tracked-at #(or % tnow)))]
|
||||||
|
(append-audit-entry! cfg params)))
|
||||||
|
|
||||||
(when (and (or (contains? cf/flags :telemetry)
|
(when (and (or (contains? cf/flags :telemetry)
|
||||||
(cf/get :telemetry-enabled))
|
(cf/get :telemetry-enabled))
|
||||||
@ -278,9 +219,11 @@
|
|||||||
;;
|
;;
|
||||||
;; NOTE: this is only executed when general audit log is disabled
|
;; NOTE: this is only executed when general audit log is disabled
|
||||||
(let [params (-> params
|
(let [params (-> params
|
||||||
|
(assoc :created-at tnow)
|
||||||
|
(update :tracked-at #(or % tnow))
|
||||||
(assoc :props {})
|
(assoc :props {})
|
||||||
(assoc :context {}))]
|
(assoc :context {}))]
|
||||||
(append-audit-entry cfg params)))
|
(append-audit-entry! cfg params)))
|
||||||
|
|
||||||
(when (and (contains? cf/flags :webhooks)
|
(when (and (contains? cf/flags :webhooks)
|
||||||
(::webhooks/event? event))
|
(::webhooks/event? event))
|
||||||
@ -334,4 +277,4 @@
|
|||||||
params (-> (event->params event)
|
params (-> (event->params event)
|
||||||
(assoc :created-at tnow)
|
(assoc :created-at tnow)
|
||||||
(update :tracked-at #(or % tnow)))]
|
(update :tracked-at #(or % tnow)))]
|
||||||
(append-audit-entry cfg params)))))))
|
(append-audit-entry! cfg params)))))))
|
||||||
|
|||||||
@ -10,11 +10,14 @@
|
|||||||
[app.common.logging :as l]
|
[app.common.logging :as l]
|
||||||
[app.common.schema :as sm]
|
[app.common.schema :as sm]
|
||||||
[app.common.transit :as t]
|
[app.common.transit :as t]
|
||||||
|
[app.common.uuid :as uuid]
|
||||||
[app.config :as cf]
|
[app.config :as cf]
|
||||||
[app.db :as db]
|
[app.db :as db]
|
||||||
[app.http.client :as http]
|
[app.http.client :as http]
|
||||||
[app.setup :as-alias setup]
|
[app.setup :as-alias setup]
|
||||||
|
[app.tokens :as tokens]
|
||||||
[integrant.core :as ig]
|
[integrant.core :as ig]
|
||||||
|
[lambdaisland.uri :as u]
|
||||||
[promesa.exec :as px]))
|
[promesa.exec :as px]))
|
||||||
|
|
||||||
;; This is a task responsible to send the accumulated events to
|
;; This is a task responsible to send the accumulated events to
|
||||||
@ -49,18 +52,19 @@
|
|||||||
|
|
||||||
(defn- send!
|
(defn- send!
|
||||||
[{:keys [::uri] :as cfg} events]
|
[{:keys [::uri] :as cfg} events]
|
||||||
(let [skey (-> cfg ::setup/shared-keys :nexus)
|
(let [token (tokens/generate cfg
|
||||||
|
{:iss "authentication"
|
||||||
|
:uid uuid/zero})
|
||||||
body (t/encode {:events events})
|
body (t/encode {:events events})
|
||||||
headers {"content-type" "application/transit+json"
|
headers {"content-type" "application/transit+json"
|
||||||
"origin" (str (cf/get :public-uri))
|
"origin" (cf/get :public-uri)
|
||||||
"x-shared-key" (str "nexus " skey)}
|
"cookie" (u/map->query-string {:auth-token token})}
|
||||||
params {:uri uri
|
params {:uri uri
|
||||||
:timeout 12000
|
:timeout 12000
|
||||||
:method :post
|
:method :post
|
||||||
:headers headers
|
:headers headers
|
||||||
:body body}
|
:body body}
|
||||||
resp (http/req! cfg params)]
|
resp (http/req! cfg params)]
|
||||||
|
|
||||||
(if (= (:status resp) 204)
|
(if (= (:status resp) 204)
|
||||||
true
|
true
|
||||||
(do
|
(do
|
||||||
@ -81,7 +85,7 @@
|
|||||||
(def ^:private sql:get-audit-log-chunk
|
(def ^:private sql:get-audit-log-chunk
|
||||||
"SELECT *
|
"SELECT *
|
||||||
FROM audit_log
|
FROM audit_log
|
||||||
WHERE archived_at IS NULL
|
WHERE archived_at is null
|
||||||
ORDER BY created_at ASC
|
ORDER BY created_at ASC
|
||||||
LIMIT 128
|
LIMIT 128
|
||||||
FOR UPDATE
|
FOR UPDATE
|
||||||
@ -105,7 +109,7 @@
|
|||||||
(def ^:private schema:handler-params
|
(def ^:private schema:handler-params
|
||||||
[:map
|
[:map
|
||||||
::db/pool
|
::db/pool
|
||||||
::setup/shared-keys
|
::setup/props
|
||||||
::http/client])
|
::http/client])
|
||||||
|
|
||||||
(defmethod ig/assert-key ::handler
|
(defmethod ig/assert-key ::handler
|
||||||
|
|||||||
@ -14,8 +14,6 @@
|
|||||||
[app.common.schema :as sm]
|
[app.common.schema :as sm]
|
||||||
[app.config :as cf]
|
[app.config :as cf]
|
||||||
[app.db :as db]
|
[app.db :as db]
|
||||||
[app.loggers.audit :as audit]
|
|
||||||
[app.rpc.rlimit :as-alias rlimit]
|
|
||||||
[clojure.spec.alpha :as s]
|
[clojure.spec.alpha :as s]
|
||||||
[integrant.core :as ig]
|
[integrant.core :as ig]
|
||||||
[promesa.exec :as px]
|
[promesa.exec :as px]
|
||||||
@ -30,145 +28,69 @@
|
|||||||
(defonce enabled (atom true))
|
(defonce enabled (atom true))
|
||||||
|
|
||||||
(defn- persist-on-database!
|
(defn- persist-on-database!
|
||||||
[pool id version report]
|
[pool id report]
|
||||||
(when-not (db/read-only? pool)
|
(when-not (db/read-only? pool)
|
||||||
(db/insert! pool :server-error-report
|
(db/insert! pool :server-error-report
|
||||||
{:id id
|
{:id id
|
||||||
:version version
|
:version 3
|
||||||
:content (db/tjson report)})))
|
:content (db/tjson report)})))
|
||||||
|
|
||||||
(defn- concurrent-exception?
|
(defn record->report
|
||||||
[cause]
|
|
||||||
(or (instance? java.util.concurrent.CompletionException cause)
|
|
||||||
(instance? java.util.concurrent.ExecutionException cause)))
|
|
||||||
|
|
||||||
(defn- log-record->report
|
|
||||||
[{:keys [::l/context ::l/message ::l/props ::l/logger ::l/level ::l/cause] :as record}]
|
[{:keys [::l/context ::l/message ::l/props ::l/logger ::l/level ::l/cause] :as record}]
|
||||||
(assert (l/valid-record? record) "expectd valid log record")
|
(assert (l/valid-record? record) "expectd valid log record")
|
||||||
(let [data (if (concurrent-exception? cause)
|
(if (or (instance? java.util.concurrent.CompletionException cause)
|
||||||
(ex-data (ex-cause cause))
|
(instance? java.util.concurrent.ExecutionException cause))
|
||||||
(ex-data cause))
|
(-> record
|
||||||
|
(assoc ::trace (ex/format-throwable cause :data? true :explain? false :header? false :summary? false))
|
||||||
|
(assoc ::l/cause (ex-cause cause))
|
||||||
|
(record->report))
|
||||||
|
|
||||||
ctx (-> context
|
(let [data (ex-data cause)
|
||||||
(assoc :backend/tenant (cf/get :tenant))
|
ctx (-> context
|
||||||
(assoc :backend/host (cf/get :host))
|
(assoc :tenant (cf/get :tenant))
|
||||||
(assoc :backend/public-uri (str (cf/get :public-uri)))
|
(assoc :host (cf/get :host))
|
||||||
(assoc :backend/version (:full cf/version))
|
(assoc :public-uri (cf/get :public-uri))
|
||||||
(assoc :logger/name logger)
|
(assoc :logger/name logger)
|
||||||
(assoc :logger/level level)
|
(assoc :logger/level level)
|
||||||
(dissoc :request/params :value :params :data))]
|
(dissoc :request/params :value :params :data))]
|
||||||
|
|
||||||
(merge
|
(merge
|
||||||
{:context (-> (into (sorted-map) ctx)
|
{:context (-> (into (sorted-map) ctx)
|
||||||
(pp/pprint-str :length 50))
|
(pp/pprint-str :length 50))
|
||||||
:props (pp/pprint-str props :length 50)
|
:props (pp/pprint-str props :length 50)
|
||||||
:hint (or (when-let [message (ex-message cause)]
|
:hint (or (when-let [message (ex-message cause)]
|
||||||
(if-let [props-hint (:hint props)]
|
(if-let [props-hint (:hint props)]
|
||||||
(str props-hint ": " message)
|
(str props-hint ": " message)
|
||||||
message))
|
message))
|
||||||
@message)
|
@message)
|
||||||
:trace (or (::trace record)
|
:trace (or (::trace record)
|
||||||
(some-> cause (ex/format-throwable :data? true :explain? false :header? false :summary? false)))}
|
(some-> cause (ex/format-throwable :data? true :explain? false :header? false :summary? false)))}
|
||||||
|
|
||||||
(when-let [params (or (:request/params context) (:params context))]
|
(when-let [params (or (:request/params context) (:params context))]
|
||||||
{:params (pp/pprint-str params :length 20 :level 20)})
|
{:params (pp/pprint-str params :length 20 :level 20)})
|
||||||
|
|
||||||
(when-let [value (:value context)]
|
(when-let [value (:value context)]
|
||||||
{:value (pp/pprint-str value :length 30 :level 13)})
|
{:value (pp/pprint-str value :length 30 :level 13)})
|
||||||
|
|
||||||
(when-let [data (some-> data (dissoc ::s/problems ::s/value ::s/spec ::sm/explain :hint))]
|
(when-let [data (some-> data (dissoc ::s/problems ::s/value ::s/spec ::sm/explain :hint))]
|
||||||
{:data (pp/pprint-str data :length 30 :level 13)})
|
{:data (pp/pprint-str data :length 30 :level 13)})
|
||||||
|
|
||||||
(when-let [explain (ex/explain data :length 30 :level 13)]
|
(when-let [explain (ex/explain data :length 30 :level 13)]
|
||||||
{:explain explain}))))
|
{:explain explain})))))
|
||||||
|
|
||||||
(defn- handle-log-record
|
(defn error-record?
|
||||||
"Convert the log record into a report object and persist it on the database"
|
[{:keys [::l/level]}]
|
||||||
|
(= :error level))
|
||||||
|
|
||||||
|
(defn- handle-event
|
||||||
[{:keys [::db/pool]} {:keys [::l/id] :as record}]
|
[{:keys [::db/pool]} {:keys [::l/id] :as record}]
|
||||||
(try
|
(try
|
||||||
(let [uri (cf/get :public-uri)
|
(let [uri (cf/get :public-uri)
|
||||||
report (-> record log-record->report d/without-nils)]
|
report (-> record record->report d/without-nils)]
|
||||||
(l/dbg :hint "registering error on database"
|
(l/debug :hint "registering error on database" :id id
|
||||||
:id (str id)
|
:uri (str uri "/dbg/error/" id))
|
||||||
:src "logging"
|
|
||||||
:uri (str uri "/dbg/error/" id))
|
|
||||||
(persist-on-database! pool id 3 report))
|
|
||||||
(catch Throwable cause
|
|
||||||
(l/warn :hint "unexpected exception on database error logger" :cause cause))))
|
|
||||||
|
|
||||||
(defn- audit-event->report
|
(persist-on-database! pool id report))
|
||||||
[{:keys [::audit/context ::audit/props ::audit/ip-addr] :as record}]
|
|
||||||
(let [context
|
|
||||||
(reduce-kv (fn [context k v]
|
|
||||||
(let [k' (keyword "frontend" (name k))]
|
|
||||||
(-> context
|
|
||||||
(dissoc k)
|
|
||||||
(assoc k' v))))
|
|
||||||
context
|
|
||||||
context)
|
|
||||||
|
|
||||||
context
|
|
||||||
(-> context
|
|
||||||
(assoc :backend/tenant (cf/get :tenant))
|
|
||||||
(assoc :backend/host (cf/get :host))
|
|
||||||
(assoc :backend/public-uri (str (cf/get :public-uri)))
|
|
||||||
(assoc :backend/version (:full cf/version))
|
|
||||||
(assoc :frontend/ip-addr ip-addr))]
|
|
||||||
|
|
||||||
{:context (-> (into (sorted-map) context)
|
|
||||||
(pp/pprint-str :length 50))
|
|
||||||
:origin (::audit/name record)
|
|
||||||
:href (get props :href)
|
|
||||||
:hint (get props :hint)
|
|
||||||
:report (get props :report)}))
|
|
||||||
|
|
||||||
(defn- handle-audit-event
|
|
||||||
"Convert the log record into a report object and persist it on the database"
|
|
||||||
[{:keys [::db/pool]} {:keys [::audit/id] :as event}]
|
|
||||||
(try
|
|
||||||
(let [uri (cf/get :public-uri)
|
|
||||||
report (-> event audit-event->report d/without-nils)]
|
|
||||||
(l/dbg :hint "registering error on database"
|
|
||||||
:id (str id)
|
|
||||||
:src "audit-log"
|
|
||||||
:uri (str uri "/dbg/error/" id))
|
|
||||||
(persist-on-database! pool id 4 report))
|
|
||||||
(catch Throwable cause
|
|
||||||
(l/warn :hint "unexpected exception on database error logger" :cause cause))))
|
|
||||||
|
|
||||||
(defn- rlimit-event->report
|
|
||||||
[event]
|
|
||||||
(let [context
|
|
||||||
(-> {}
|
|
||||||
(assoc :rlimit/uid (::rlimit/uid event))
|
|
||||||
(assoc :rlimit/method (::rlimit/method event))
|
|
||||||
(assoc :backend/tenant (cf/get :tenant))
|
|
||||||
(assoc :backend/host (cf/get :host))
|
|
||||||
(assoc :backend/public-uri (str (cf/get :public-uri)))
|
|
||||||
(assoc :backend/version (:full cf/version)))
|
|
||||||
|
|
||||||
result
|
|
||||||
(->> (::rlimit/results event)
|
|
||||||
(mapv (fn [result]
|
|
||||||
(-> (into (sorted-map) result)
|
|
||||||
(dissoc ::rlimit/method)))))]
|
|
||||||
|
|
||||||
{:hint (str "Rate Limit Rejection: " (::rlimit/method event) " for " (::rlimit/uid event))
|
|
||||||
:context (-> (into (sorted-map) context)
|
|
||||||
(pp/pprint-str :length 50))
|
|
||||||
:result (pp/pprint-str result :length 50)}))
|
|
||||||
|
|
||||||
(defn- handle-rlimit-event
|
|
||||||
"Convert the log record into a report object and persist it on the database"
|
|
||||||
[{:keys [::db/pool]} {:keys [::rlimit/id] :as event}]
|
|
||||||
(try
|
|
||||||
(let [uri (cf/get :public-uri)
|
|
||||||
report (-> event rlimit-event->report d/without-nils)]
|
|
||||||
(l/dbg :hint "registering rate limit rejection"
|
|
||||||
:id (str id)
|
|
||||||
:src "rlimit"
|
|
||||||
:uri (str uri "/dbg/error/" id))
|
|
||||||
(persist-on-database! pool id 5 report))
|
|
||||||
(catch Throwable cause
|
(catch Throwable cause
|
||||||
(l/warn :hint "unexpected exception on database error logger" :cause cause))))
|
(l/warn :hint "unexpected exception on database error logger" :cause cause))))
|
||||||
|
|
||||||
@ -178,52 +100,26 @@
|
|||||||
|
|
||||||
(defmethod ig/init-key ::reporter
|
(defmethod ig/init-key ::reporter
|
||||||
[_ cfg]
|
[_ cfg]
|
||||||
(let [input (sp/chan :buf (sp/sliding-buffer 256))
|
(let [input (sp/chan :buf (sp/sliding-buffer 64)
|
||||||
thread (px/thread
|
:xf (filter error-record?))]
|
||||||
{:name "penpot/reporter/database"}
|
(add-watch l/log-record ::reporter #(sp/put! input %4))
|
||||||
(l/info :hint "initializing database error persistence")
|
|
||||||
(try
|
|
||||||
(loop []
|
|
||||||
(when-let [item (sp/take! input)]
|
|
||||||
(cond
|
|
||||||
(::l/id item)
|
|
||||||
(handle-log-record cfg item)
|
|
||||||
|
|
||||||
(::audit/id item)
|
(px/thread {:name "penpot/database-reporter"}
|
||||||
(handle-audit-event cfg item)
|
(l/info :hint "initializing database error persistence")
|
||||||
|
(try
|
||||||
(::rlimit/id item)
|
(loop []
|
||||||
(handle-rlimit-event cfg item)
|
(when-let [record (sp/take! input)]
|
||||||
|
(handle-event cfg record)
|
||||||
:else
|
(recur)))
|
||||||
(l/warn :hint "received unexpected item" :item item))
|
(catch InterruptedException _
|
||||||
|
(l/debug :hint "reporter interrupted"))
|
||||||
(recur)))
|
(catch Throwable cause
|
||||||
|
(l/error :hint "unexpected error" :cause cause))
|
||||||
(catch InterruptedException _
|
(finally
|
||||||
(l/debug :hint "reporter interrupted"))
|
(sp/close! input)
|
||||||
(catch Throwable cause
|
(remove-watch l/log-record ::reporter)
|
||||||
(l/error :hint "unexpected error" :cause cause))
|
(l/info :hint "reporter terminated"))))))
|
||||||
(finally
|
|
||||||
(l/info :hint "reporter terminated"))))]
|
|
||||||
|
|
||||||
(add-watch l/log-record ::reporter
|
|
||||||
(fn [_ _ _ record]
|
|
||||||
(when (= :error (::l/level record))
|
|
||||||
(sp/put! input record))))
|
|
||||||
|
|
||||||
{::input input
|
|
||||||
::thread thread}))
|
|
||||||
|
|
||||||
(defmethod ig/halt-key! ::reporter
|
(defmethod ig/halt-key! ::reporter
|
||||||
[_ {:keys [::input ::thread]}]
|
[_ thread]
|
||||||
(remove-watch l/log-record ::reporter)
|
(some-> thread px/interrupt!))
|
||||||
(sp/close! input)
|
|
||||||
(px/interrupt! thread))
|
|
||||||
|
|
||||||
(defn emit
|
|
||||||
"Emit an event/report into the database reporter"
|
|
||||||
[cfg event]
|
|
||||||
(when-let [{:keys [::input]} (get cfg ::reporter)]
|
|
||||||
(sp/put! input event)))
|
|
||||||
|
|
||||||
|
|||||||
@ -9,12 +9,9 @@
|
|||||||
(:require
|
(:require
|
||||||
[app.common.exceptions :as ex]
|
[app.common.exceptions :as ex]
|
||||||
[app.common.logging :as l]
|
[app.common.logging :as l]
|
||||||
[app.common.pprint :as pp]
|
|
||||||
[app.common.uri :as u]
|
|
||||||
[app.config :as cf]
|
[app.config :as cf]
|
||||||
[app.http.client :as http]
|
[app.http.client :as http]
|
||||||
[app.loggers.audit :as audit]
|
[app.loggers.database :as ldb]
|
||||||
[app.rpc.rlimit :as-alias rlimit]
|
|
||||||
[app.util.json :as json]
|
[app.util.json :as json]
|
||||||
[integrant.core :as ig]
|
[integrant.core :as ig]
|
||||||
[promesa.exec :as px]
|
[promesa.exec :as px]
|
||||||
@ -23,34 +20,24 @@
|
|||||||
(defonce enabled (atom true))
|
(defonce enabled (atom true))
|
||||||
|
|
||||||
(defn- send-mattermost-notification!
|
(defn- send-mattermost-notification!
|
||||||
[cfg {:keys [id] :as report}]
|
[cfg {:keys [id public-uri] :as report}]
|
||||||
(let [type (get report :type)
|
|
||||||
text (str "#" type " | " (get report :hint) "\n"
|
|
||||||
(when id
|
|
||||||
(str (u/join (cf/get :public-uri) "/dbg/error/" id) " "))
|
|
||||||
|
|
||||||
|
|
||||||
|
(let [text (str "Exception: " public-uri "/dbg/error/" id " "
|
||||||
(when-let [pid (:profile-id report)]
|
(when-let [pid (:profile-id report)]
|
||||||
(if (uuid? pid)
|
(str "(pid: #uuid-" pid ")"))
|
||||||
(str "(pid: #uuid-" pid ")")
|
|
||||||
(str "(pid: #ip-" pid ")")))
|
|
||||||
"\n"
|
"\n"
|
||||||
"- host: #" (:host report) "\n"
|
"- host: #" (:host report) "\n"
|
||||||
"- tenant: #" (:tenant report) "\n"
|
"- tenant: #" (:tenant report) "\n"
|
||||||
"- origin: #" (:origin report) "\n"
|
"- logger: #" (:logger report) "\n"
|
||||||
(when-let [href (get report :href)]
|
"- request-path: `" (:request-path report) "`\n"
|
||||||
(str "- href: `" href "`\n"))
|
"- frontend-version: `" (:frontend-version report) "`\n"
|
||||||
(when-let [version (get report :frontend-version)]
|
"- backend-version: `" (:backend-version report) "`\n"
|
||||||
(str "- frontend-version: `" version "`\n"))
|
|
||||||
(when-let [version (get report :backend-version)]
|
|
||||||
(str "- backend-version: `" version "`\n"))
|
|
||||||
"\n"
|
"\n"
|
||||||
(when-let [info (:info report)]
|
"```\n"
|
||||||
(str "```\n" info "```"))
|
"Trace:\n"
|
||||||
(when-let [trace (:trace report)]
|
(:trace report)
|
||||||
(str "```\n"
|
"```")
|
||||||
"Trace:\n"
|
|
||||||
trace
|
|
||||||
"```")))
|
|
||||||
|
|
||||||
resp (http/req! cfg
|
resp (http/req! cfg
|
||||||
{:uri (cf/get :error-report-webhook)
|
{:uri (cf/get :error-report-webhook)
|
||||||
@ -63,70 +50,28 @@
|
|||||||
(l/warn :hint "error on sending data"
|
(l/warn :hint "error on sending data"
|
||||||
:response (pr-str resp)))))
|
:response (pr-str resp)))))
|
||||||
|
|
||||||
(defn- log-record->report
|
(defn record->report
|
||||||
[{:keys [::l/context ::l/id ::l/cause ::l/message] :as record}]
|
[{:keys [::l/context ::l/id ::l/cause] :as record}]
|
||||||
(assert (l/valid-record? record) "expectd valid log record")
|
(assert (l/valid-record? record) "expectd valid log record")
|
||||||
|
|
||||||
(let [public-uri (cf/get :public-uri)]
|
|
||||||
{:id id
|
|
||||||
:type "exception"
|
|
||||||
:origin "logging"
|
|
||||||
:hint (or (some-> cause ex-message) @message)
|
|
||||||
:tenant (cf/get :tenant)
|
|
||||||
:host (cf/get :host)
|
|
||||||
:backend-version (:full cf/version)
|
|
||||||
:frontend-version (:frontend/version context)
|
|
||||||
:profile-id (:request/profile-id context)
|
|
||||||
:href (-> public-uri
|
|
||||||
(assoc :path (:request/path context))
|
|
||||||
(str))
|
|
||||||
:trace (ex/format-throwable cause :detail? false :header? false)}))
|
|
||||||
|
|
||||||
(defn- audit-event->report
|
|
||||||
[{:keys [::audit/context ::audit/props ::audit/id] :as event}]
|
|
||||||
{:id id
|
{:id id
|
||||||
:type "exception"
|
|
||||||
:origin "audit-log"
|
|
||||||
:hint (get props :hint)
|
|
||||||
:tenant (cf/get :tenant)
|
:tenant (cf/get :tenant)
|
||||||
:host (cf/get :host)
|
:host (cf/get :host)
|
||||||
:backend-version (:full cf/version)
|
:public-uri (cf/get :public-uri)
|
||||||
:frontend-version (:version context)
|
:backend-version (or (:version/backend context) (:full cf/version))
|
||||||
:profile-id (:audit/profile-id event)
|
:frontend-version (:version/frontend context)
|
||||||
:href (get props :href)})
|
:profile-id (:request/profile-id context)
|
||||||
|
:request-path (:request/path context)
|
||||||
|
:logger (::l/logger record)
|
||||||
|
:trace (ex/format-throwable cause :detail? false :header? false)})
|
||||||
|
|
||||||
(defn- rlimit-event->report
|
(defn handle-event
|
||||||
[event]
|
[cfg record]
|
||||||
{:id (::rlimit/id event)
|
(when @enabled
|
||||||
:type "notification"
|
(try
|
||||||
:origin "rlimit"
|
(let [report (record->report record)]
|
||||||
:hint (str "rlimit reject of "
|
(send-mattermost-notification! cfg report))
|
||||||
(::rlimit/method event)
|
(catch Throwable cause
|
||||||
" for "
|
(l/warn :hint "unhandled error" :cause cause)))))
|
||||||
(::rlimit/uid event))
|
|
||||||
:tenant (cf/get :tenant)
|
|
||||||
:host (cf/get :host)
|
|
||||||
:backend-version (:full cf/version)
|
|
||||||
:profile-id (::rlimit/profile-id event)
|
|
||||||
:info (with-out-str
|
|
||||||
(println "Rejected by:")
|
|
||||||
(println "------------")
|
|
||||||
(println "Method: " (::rlimit/method event))
|
|
||||||
(println "Limit Name: " (::rlimit/name event))
|
|
||||||
(println "Limit Strategy:" (::rlimit/strategy event))
|
|
||||||
(println)
|
|
||||||
(println "Results & Config:")
|
|
||||||
(println "-----------------")
|
|
||||||
(doseq [result (::rlimit/results event)]
|
|
||||||
(pp/pprint (into (sorted-map) result))))})
|
|
||||||
|
|
||||||
(defn- handle-event
|
|
||||||
[cfg event event->report]
|
|
||||||
(try
|
|
||||||
(let [report (event->report event)]
|
|
||||||
(send-mattermost-notification! cfg report))
|
|
||||||
(catch Throwable cause
|
|
||||||
(l/warn :hint "unhandled error" :cause cause))))
|
|
||||||
|
|
||||||
(defmethod ig/assert-key ::reporter
|
(defmethod ig/assert-key ::reporter
|
||||||
[_ params]
|
[_ params]
|
||||||
@ -135,52 +80,27 @@
|
|||||||
(defmethod ig/init-key ::reporter
|
(defmethod ig/init-key ::reporter
|
||||||
[_ cfg]
|
[_ cfg]
|
||||||
(when-let [uri (cf/get :error-report-webhook)]
|
(when-let [uri (cf/get :error-report-webhook)]
|
||||||
(let [input (sp/chan :buf (sp/sliding-buffer 256))
|
(px/thread
|
||||||
thread (px/thread
|
{:name "penpot/mattermost-reporter"
|
||||||
{:name "penpot/reporter/mattermost"}
|
:virtual true}
|
||||||
(l/info :hint "initializing error reporter" :uri uri)
|
(l/info :hint "initializing error reporter" :uri uri)
|
||||||
|
(let [input (sp/chan :buf (sp/sliding-buffer 128)
|
||||||
(try
|
:xf (filter ldb/error-record?))]
|
||||||
(loop []
|
(add-watch l/log-record ::reporter #(sp/put! input %4))
|
||||||
(when-let [item (sp/take! input)]
|
(try
|
||||||
(when @enabled
|
(loop []
|
||||||
(cond
|
(when-let [msg (sp/take! input)]
|
||||||
(::l/id item)
|
(handle-event cfg msg)
|
||||||
(handle-event cfg item log-record->report)
|
(recur)))
|
||||||
|
(catch InterruptedException _
|
||||||
(::audit/id item)
|
(l/debug :hint "reporter interrupted"))
|
||||||
(handle-event cfg item audit-event->report)
|
(catch Throwable cause
|
||||||
|
(l/error :hint "unexpected error" :cause cause))
|
||||||
(::rlimit/id item)
|
(finally
|
||||||
(handle-event cfg item rlimit-event->report)
|
(sp/close! input)
|
||||||
|
(remove-watch l/log-record ::reporter)
|
||||||
:else
|
(l/info :hint "reporter terminated")))))))
|
||||||
(l/warn :hint "received unexpected item" :item item)))
|
|
||||||
|
|
||||||
(recur)))
|
|
||||||
(catch InterruptedException _
|
|
||||||
(l/debug :hint "reporter interrupted"))
|
|
||||||
(catch Throwable cause
|
|
||||||
(l/error :hint "unexpected error" :cause cause))
|
|
||||||
(finally
|
|
||||||
(l/info :hint "reporter terminated"))))]
|
|
||||||
|
|
||||||
(add-watch l/log-record ::reporter
|
|
||||||
(fn [_ _ _ record]
|
|
||||||
(when (= :error (::l/level record))
|
|
||||||
(sp/put! input record))))
|
|
||||||
|
|
||||||
{::input input
|
|
||||||
::thread thread})))
|
|
||||||
|
|
||||||
(defmethod ig/halt-key! ::reporter
|
(defmethod ig/halt-key! ::reporter
|
||||||
[_ {:keys [::input ::thread]}]
|
[_ thread]
|
||||||
(remove-watch l/log-record ::reporter)
|
|
||||||
(some-> input sp/close!)
|
|
||||||
(some-> thread px/interrupt!))
|
(some-> thread px/interrupt!))
|
||||||
|
|
||||||
(defn emit
|
|
||||||
"Emit an event/report into the mattermost reporter"
|
|
||||||
[cfg event]
|
|
||||||
(when-let [{:keys [::input]} (get cfg ::reporter)]
|
|
||||||
(sp/put! input event)))
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
[app.http.client :as-alias http.client]
|
[app.http.client :as-alias http.client]
|
||||||
[app.http.debug :as-alias http.debug]
|
[app.http.debug :as-alias http.debug]
|
||||||
[app.http.management :as mgmt]
|
[app.http.management :as mgmt]
|
||||||
[app.http.session :as session]
|
[app.http.session :as-alias session]
|
||||||
[app.http.session.tasks :as-alias session.tasks]
|
[app.http.session.tasks :as-alias session.tasks]
|
||||||
[app.http.websocket :as http.ws]
|
[app.http.websocket :as http.ws]
|
||||||
[app.loggers.webhooks :as-alias webhooks]
|
[app.loggers.webhooks :as-alias webhooks]
|
||||||
@ -31,6 +31,7 @@
|
|||||||
[app.redis :as-alias rds]
|
[app.redis :as-alias rds]
|
||||||
[app.rpc :as-alias rpc]
|
[app.rpc :as-alias rpc]
|
||||||
[app.rpc.climit :as-alias climit]
|
[app.rpc.climit :as-alias climit]
|
||||||
|
[app.rpc.doc :as-alias rpc.doc]
|
||||||
[app.setup :as-alias setup]
|
[app.setup :as-alias setup]
|
||||||
[app.srepl :as-alias srepl]
|
[app.srepl :as-alias srepl]
|
||||||
[app.storage :as-alias sto]
|
[app.storage :as-alias sto]
|
||||||
@ -226,10 +227,11 @@
|
|||||||
::http/server
|
::http/server
|
||||||
{::http/port (cf/get :http-server-port)
|
{::http/port (cf/get :http-server-port)
|
||||||
::http/host (cf/get :http-server-host)
|
::http/host (cf/get :http-server-host)
|
||||||
|
::http/router (ig/ref ::http/router)
|
||||||
::http/io-threads (cf/get :http-server-io-threads)
|
::http/io-threads (cf/get :http-server-io-threads)
|
||||||
::http/max-worker-threads (cf/get :http-server-max-worker-threads)
|
::http/max-worker-threads (cf/get :http-server-max-worker-threads)
|
||||||
::http/max-body-size (cf/get :http-server-max-body-size)
|
::http/max-body-size (cf/get :http-server-max-body-size)
|
||||||
::http/router (ig/ref ::http/router)
|
::http/max-multipart-body-size (cf/get :http-server-max-multipart-body-size)
|
||||||
::mtx/metrics (ig/ref ::mtx/metrics)}
|
::mtx/metrics (ig/ref ::mtx/metrics)}
|
||||||
|
|
||||||
::ldap/provider
|
::ldap/provider
|
||||||
@ -258,17 +260,14 @@
|
|||||||
::oidc.providers/generic
|
::oidc.providers/generic
|
||||||
{::http.client/client (ig/ref ::http.client/client)}
|
{::http.client/client (ig/ref ::http.client/client)}
|
||||||
|
|
||||||
::oidc/providers
|
|
||||||
[(ig/ref ::oidc.providers/google)
|
|
||||||
(ig/ref ::oidc.providers/github)
|
|
||||||
(ig/ref ::oidc.providers/gitlab)
|
|
||||||
(ig/ref ::oidc.providers/generic)]
|
|
||||||
|
|
||||||
::oidc/routes
|
::oidc/routes
|
||||||
{::http.client/client (ig/ref ::http.client/client)
|
{::http.client/client (ig/ref ::http.client/client)
|
||||||
::db/pool (ig/ref ::db/pool)
|
::db/pool (ig/ref ::db/pool)
|
||||||
::setup/props (ig/ref ::setup/props)
|
::setup/props (ig/ref ::setup/props)
|
||||||
::oidc/providers (ig/ref ::oidc/providers)
|
::oidc/providers {:google (ig/ref ::oidc.providers/google)
|
||||||
|
:github (ig/ref ::oidc.providers/github)
|
||||||
|
:gitlab (ig/ref ::oidc.providers/gitlab)
|
||||||
|
:oidc (ig/ref ::oidc.providers/generic)}
|
||||||
::session/manager (ig/ref ::session/manager)
|
::session/manager (ig/ref ::session/manager)
|
||||||
::email/blacklist (ig/ref ::email/blacklist)
|
::email/blacklist (ig/ref ::email/blacklist)
|
||||||
::email/whitelist (ig/ref ::email/whitelist)}
|
::email/whitelist (ig/ref ::email/whitelist)}
|
||||||
@ -281,6 +280,7 @@
|
|||||||
{::session/manager (ig/ref ::session/manager)
|
{::session/manager (ig/ref ::session/manager)
|
||||||
::db/pool (ig/ref ::db/pool)
|
::db/pool (ig/ref ::db/pool)
|
||||||
::rpc/routes (ig/ref ::rpc/routes)
|
::rpc/routes (ig/ref ::rpc/routes)
|
||||||
|
::rpc.doc/routes (ig/ref ::rpc.doc/routes)
|
||||||
::setup/props (ig/ref ::setup/props)
|
::setup/props (ig/ref ::setup/props)
|
||||||
::mtx/routes (ig/ref ::mtx/routes)
|
::mtx/routes (ig/ref ::mtx/routes)
|
||||||
::oidc/routes (ig/ref ::oidc/routes)
|
::oidc/routes (ig/ref ::oidc/routes)
|
||||||
@ -300,7 +300,6 @@
|
|||||||
{::db/pool (ig/ref ::db/pool)
|
{::db/pool (ig/ref ::db/pool)
|
||||||
::mtx/metrics (ig/ref ::mtx/metrics)
|
::mtx/metrics (ig/ref ::mtx/metrics)
|
||||||
::mbus/msgbus (ig/ref ::mbus/msgbus)
|
::mbus/msgbus (ig/ref ::mbus/msgbus)
|
||||||
::setup/props (ig/ref ::setup/props)
|
|
||||||
::session/manager (ig/ref ::session/manager)}
|
::session/manager (ig/ref ::session/manager)}
|
||||||
|
|
||||||
:app.http.assets/routes
|
:app.http.assets/routes
|
||||||
@ -316,19 +315,12 @@
|
|||||||
::climit/enabled (contains? cf/flags :rpc-climit)}
|
::climit/enabled (contains? cf/flags :rpc-climit)}
|
||||||
|
|
||||||
:app.rpc/rlimit
|
:app.rpc/rlimit
|
||||||
{::wrk/executor (ig/ref ::wrk/netty-executor)
|
{::wrk/executor (ig/ref ::wrk/netty-executor)}
|
||||||
|
|
||||||
:app.loggers.mattermost/reporter
|
|
||||||
(ig/ref :app.loggers.mattermost/reporter)
|
|
||||||
|
|
||||||
:app.loggers.database/reporter
|
|
||||||
(ig/ref :app.loggers.database/reporter)}
|
|
||||||
|
|
||||||
:app.rpc/methods
|
:app.rpc/methods
|
||||||
{::http.client/client (ig/ref ::http.client/client)
|
{::http.client/client (ig/ref ::http.client/client)
|
||||||
::db/pool (ig/ref ::db/pool)
|
::db/pool (ig/ref ::db/pool)
|
||||||
::rds/pool (ig/ref ::rds/pool)
|
::rds/pool (ig/ref ::rds/pool)
|
||||||
:app.nitrate/client (ig/ref :app.nitrate/client)
|
|
||||||
::wrk/executor (ig/ref ::wrk/netty-executor)
|
::wrk/executor (ig/ref ::wrk/netty-executor)
|
||||||
::session/manager (ig/ref ::session/manager)
|
::session/manager (ig/ref ::session/manager)
|
||||||
::ldap/provider (ig/ref ::ldap/provider)
|
::ldap/provider (ig/ref ::ldap/provider)
|
||||||
@ -343,40 +335,16 @@
|
|||||||
::setup/props (ig/ref ::setup/props)
|
::setup/props (ig/ref ::setup/props)
|
||||||
|
|
||||||
::email/blacklist (ig/ref ::email/blacklist)
|
::email/blacklist (ig/ref ::email/blacklist)
|
||||||
::email/whitelist (ig/ref ::email/whitelist)
|
::email/whitelist (ig/ref ::email/whitelist)}
|
||||||
|
|
||||||
:app.loggers.database/reporter
|
:app.rpc.doc/routes
|
||||||
(ig/ref :app.loggers.database/reporter)
|
{:app.rpc/methods (ig/ref :app.rpc/methods)}
|
||||||
|
|
||||||
:app.loggers.mattermost/reporter
|
|
||||||
(ig/ref :app.loggers.mattermost/reporter)}
|
|
||||||
|
|
||||||
:app.nitrate/client
|
|
||||||
{::http.client/client (ig/ref ::http.client/client)
|
|
||||||
::setup/shared-keys (ig/ref ::setup/shared-keys)}
|
|
||||||
|
|
||||||
:app.rpc/management-methods
|
|
||||||
{::http.client/client (ig/ref ::http.client/client)
|
|
||||||
::db/pool (ig/ref ::db/pool)
|
|
||||||
::rds/pool (ig/ref ::rds/pool)
|
|
||||||
::wrk/executor (ig/ref ::wrk/netty-executor)
|
|
||||||
::session/manager (ig/ref ::session/manager)
|
|
||||||
::sto/storage (ig/ref ::sto/storage)
|
|
||||||
::mtx/metrics (ig/ref ::mtx/metrics)
|
|
||||||
::mbus/msgbus (ig/ref ::mbus/msgbus)
|
|
||||||
:app.nitrate/client (ig/ref :app.nitrate/client)
|
|
||||||
::rds/client (ig/ref ::rds/client)
|
|
||||||
::setup/props (ig/ref ::setup/props)}
|
|
||||||
|
|
||||||
::rpc/routes
|
::rpc/routes
|
||||||
{::rpc/methods (ig/ref :app.rpc/methods)
|
{::rpc/methods (ig/ref :app.rpc/methods)
|
||||||
::rpc/management-methods (ig/ref :app.rpc/management-methods)
|
::db/pool (ig/ref ::db/pool)
|
||||||
|
::session/manager (ig/ref ::session/manager)
|
||||||
;; FIXME: revisit if db/pool is necessary here
|
::setup/props (ig/ref ::setup/props)}
|
||||||
::db/pool (ig/ref ::db/pool)
|
|
||||||
::session/manager (ig/ref ::session/manager)
|
|
||||||
::setup/props (ig/ref ::setup/props)
|
|
||||||
::setup/shared-keys (ig/ref ::setup/shared-keys)}
|
|
||||||
|
|
||||||
::wrk/registry
|
::wrk/registry
|
||||||
{::mtx/metrics (ig/ref ::mtx/metrics)
|
{::mtx/metrics (ig/ref ::mtx/metrics)
|
||||||
@ -388,7 +356,6 @@
|
|||||||
:offload-file-data (ig/ref :app.tasks.offload-file-data/handler)
|
:offload-file-data (ig/ref :app.tasks.offload-file-data/handler)
|
||||||
:tasks-gc (ig/ref :app.tasks.tasks-gc/handler)
|
:tasks-gc (ig/ref :app.tasks.tasks-gc/handler)
|
||||||
:telemetry (ig/ref :app.tasks.telemetry/handler)
|
:telemetry (ig/ref :app.tasks.telemetry/handler)
|
||||||
:upload-session-gc (ig/ref :app.tasks.upload-session-gc/handler)
|
|
||||||
:storage-gc-deleted (ig/ref ::sto.gc-deleted/handler)
|
:storage-gc-deleted (ig/ref ::sto.gc-deleted/handler)
|
||||||
:storage-gc-touched (ig/ref ::sto.gc-touched/handler)
|
:storage-gc-touched (ig/ref ::sto.gc-touched/handler)
|
||||||
:session-gc (ig/ref ::session.tasks/gc)
|
:session-gc (ig/ref ::session.tasks/gc)
|
||||||
@ -424,9 +391,6 @@
|
|||||||
:app.tasks.tasks-gc/handler
|
:app.tasks.tasks-gc/handler
|
||||||
{::db/pool (ig/ref ::db/pool)}
|
{::db/pool (ig/ref ::db/pool)}
|
||||||
|
|
||||||
:app.tasks.upload-session-gc/handler
|
|
||||||
{::db/pool (ig/ref ::db/pool)}
|
|
||||||
|
|
||||||
:app.tasks.objects-gc/handler
|
:app.tasks.objects-gc/handler
|
||||||
{::db/pool (ig/ref ::db/pool)
|
{::db/pool (ig/ref ::db/pool)
|
||||||
::sto/storage (ig/ref ::sto/storage)}
|
::sto/storage (ig/ref ::sto/storage)}
|
||||||
@ -468,19 +432,13 @@
|
|||||||
;; module requires the migrations to run before initialize.
|
;; module requires the migrations to run before initialize.
|
||||||
::migrations (ig/ref :app.migrations/migrations)}
|
::migrations (ig/ref :app.migrations/migrations)}
|
||||||
|
|
||||||
::setup/shared-keys
|
|
||||||
{::setup/props (ig/ref ::setup/props)
|
|
||||||
:nexus (cf/get :nexus-shared-key)
|
|
||||||
:nitrate (cf/get :nitrate-shared-key)
|
|
||||||
:exporter (cf/get :exporter-shared-key)}
|
|
||||||
|
|
||||||
::setup/clock
|
::setup/clock
|
||||||
{}
|
{}
|
||||||
|
|
||||||
:app.loggers.audit.archive-task/handler
|
:app.loggers.audit.archive-task/handler
|
||||||
{::setup/shared-keys (ig/ref ::setup/shared-keys)
|
{::setup/props (ig/ref ::setup/props)
|
||||||
::http.client/client (ig/ref ::http.client/client)
|
::db/pool (ig/ref ::db/pool)
|
||||||
::db/pool (ig/ref ::db/pool)}
|
::http.client/client (ig/ref ::http.client/client)}
|
||||||
|
|
||||||
:app.loggers.audit.gc-task/handler
|
:app.loggers.audit.gc-task/handler
|
||||||
{::db/pool (ig/ref ::db/pool)}
|
{::db/pool (ig/ref ::db/pool)}
|
||||||
@ -548,9 +506,6 @@
|
|||||||
{:cron #penpot/cron "0 0 0 * * ?" ;; daily
|
{:cron #penpot/cron "0 0 0 * * ?" ;; daily
|
||||||
:task :tasks-gc}
|
:task :tasks-gc}
|
||||||
|
|
||||||
{:cron #penpot/cron "0 0 0 * * ?" ;; daily
|
|
||||||
:task :upload-session-gc}
|
|
||||||
|
|
||||||
{:cron #penpot/cron "0 0 2 * * ?" ;; daily
|
{:cron #penpot/cron "0 0 2 * * ?" ;; daily
|
||||||
:task :file-gc-scheduler}
|
:task :file-gc-scheduler}
|
||||||
|
|
||||||
|
|||||||
@ -17,7 +17,6 @@
|
|||||||
[app.common.time :as ct]
|
[app.common.time :as ct]
|
||||||
[app.config :as cf]
|
[app.config :as cf]
|
||||||
[app.db :as-alias db]
|
[app.db :as-alias db]
|
||||||
[app.http.client :as http]
|
|
||||||
[app.storage :as-alias sto]
|
[app.storage :as-alias sto]
|
||||||
[app.storage.tmp :as tmp]
|
[app.storage.tmp :as tmp]
|
||||||
[buddy.core.bytes :as bb]
|
[buddy.core.bytes :as bb]
|
||||||
@ -31,14 +30,12 @@
|
|||||||
(:import
|
(:import
|
||||||
clojure.lang.XMLHandler
|
clojure.lang.XMLHandler
|
||||||
java.io.InputStream
|
java.io.InputStream
|
||||||
javax.xml.parsers.SAXParserFactory
|
|
||||||
javax.xml.XMLConstants
|
javax.xml.XMLConstants
|
||||||
|
javax.xml.parsers.SAXParserFactory
|
||||||
org.apache.commons.io.IOUtils
|
org.apache.commons.io.IOUtils
|
||||||
org.im4java.core.ConvertCmd
|
org.im4java.core.ConvertCmd
|
||||||
org.im4java.core.IMOperation))
|
org.im4java.core.IMOperation
|
||||||
|
org.im4java.core.Info))
|
||||||
(def default-max-file-size
|
|
||||||
(* 1024 1024 10)) ; 10 MiB
|
|
||||||
|
|
||||||
(def schema:upload
|
(def schema:upload
|
||||||
[:map {:title "Upload"}
|
[:map {:title "Upload"}
|
||||||
@ -54,7 +51,7 @@
|
|||||||
[:path ::fs/path]
|
[:path ::fs/path]
|
||||||
[:mtype {:optional true} ::sm/text]])
|
[:mtype {:optional true} ::sm/text]])
|
||||||
|
|
||||||
(def check-input
|
(def ^:private check-input
|
||||||
(sm/check-fn schema:input))
|
(sm/check-fn schema:input))
|
||||||
|
|
||||||
(defn validate-media-type!
|
(defn validate-media-type!
|
||||||
@ -223,18 +220,17 @@
|
|||||||
;; If we are processing an animated gif we use the first frame with -scene 0
|
;; If we are processing an animated gif we use the first frame with -scene 0
|
||||||
(let [dim-result (sh/sh "identify" "-format" "%w %h\n" path)
|
(let [dim-result (sh/sh "identify" "-format" "%w %h\n" path)
|
||||||
orient-result (sh/sh "identify" "-format" "%[EXIF:Orientation]\n" path)]
|
orient-result (sh/sh "identify" "-format" "%[EXIF:Orientation]\n" path)]
|
||||||
(when (= 0 (:exit dim-result))
|
(if (and (= 0 (:exit dim-result))
|
||||||
|
(= 0 (:exit orient-result)))
|
||||||
(let [[w h] (-> (:out dim-result)
|
(let [[w h] (-> (:out dim-result)
|
||||||
str/trim
|
str/trim
|
||||||
(clojure.string/split #"\s+")
|
(clojure.string/split #"\s+")
|
||||||
(->> (mapv #(Integer/parseInt %))))
|
(->> (mapv #(Integer/parseInt %))))
|
||||||
orientation-exit (:exit orient-result)
|
orientation (-> orient-result :out str/trim)]
|
||||||
orientation (-> orient-result :out str/trim)]
|
(case orientation
|
||||||
(if (= 0 orientation-exit)
|
("6" "8") {:width h :height w} ; Rotated 90 or 270 degrees
|
||||||
(case orientation
|
{:width w :height h})) ; Normal or unknown orientation
|
||||||
("6" "8") {:width h :height w} ; Rotated 90 or 270 degrees
|
nil)))
|
||||||
{:width w :height h}) ; Normal or unknown orientation
|
|
||||||
{:width w :height h}))))) ; If orientation can't be read, use dimensions as-is
|
|
||||||
|
|
||||||
(defmethod process :info
|
(defmethod process :info
|
||||||
[{:keys [input] :as params}]
|
[{:keys [input] :as params}]
|
||||||
@ -245,39 +241,27 @@
|
|||||||
(ex/raise :type :validation
|
(ex/raise :type :validation
|
||||||
:code :invalid-svg-file
|
:code :invalid-svg-file
|
||||||
:hint "uploaded svg does not provides dimensions"))
|
:hint "uploaded svg does not provides dimensions"))
|
||||||
(merge input info {:ts (ct/now) :size (fs/size path)}))
|
(merge input info {:ts (ct/now)}))
|
||||||
|
|
||||||
(let [path-str (str path)
|
(let [instance (Info. (str path))
|
||||||
identify-res (sh/sh "identify" "-format" "image/%[magick]\n" path-str)
|
mtype' (.getProperty instance "Mime type")]
|
||||||
;; identify prints one line per frame (animated GIFs, etc.); we take the first one
|
|
||||||
mtype' (if (zero? (:exit identify-res))
|
|
||||||
(-> identify-res
|
|
||||||
:out
|
|
||||||
str/trim
|
|
||||||
(str/split #"\s+" 2)
|
|
||||||
first
|
|
||||||
str/lower)
|
|
||||||
(ex/raise :type :validation
|
|
||||||
:code :invalid-image
|
|
||||||
:hint "invalid image"))
|
|
||||||
{:keys [width height]}
|
|
||||||
(or (get-dimensions-with-orientation path-str)
|
|
||||||
(do
|
|
||||||
(l/warn "Failed to read image dimensions with orientation" {:path path})
|
|
||||||
(ex/raise :type :validation
|
|
||||||
:code :invalid-image
|
|
||||||
:hint "invalid image")))]
|
|
||||||
(when (and (string? mtype)
|
(when (and (string? mtype)
|
||||||
(not= (str/lower mtype) mtype'))
|
(not= mtype mtype'))
|
||||||
(ex/raise :type :validation
|
(ex/raise :type :validation
|
||||||
:code :media-type-mismatch
|
:code :media-type-mismatch
|
||||||
:hint (str "Seems like you are uploading a file whose content does not match the extension."
|
:hint (str "Seems like you are uploading a file whose content does not match the extension."
|
||||||
"Expected: " mtype ". Got: " mtype')))
|
"Expected: " mtype ". Got: " mtype')))
|
||||||
(assoc input
|
(let [{:keys [width height]}
|
||||||
:width width
|
(or (get-dimensions-with-orientation (str path))
|
||||||
:height height
|
(do
|
||||||
:size (fs/size path)
|
(l/warn "Failed to read image dimensions with orientation; falling back to im4java"
|
||||||
:ts (ct/now))))))
|
{:path path})
|
||||||
|
{:width (.getPageWidth instance)
|
||||||
|
:height (.getPageHeight instance)}))]
|
||||||
|
(assoc input
|
||||||
|
:width width
|
||||||
|
:height height
|
||||||
|
:ts (ct/now)))))))
|
||||||
|
|
||||||
(defmethod process-error org.im4java.core.InfoException
|
(defmethod process-error org.im4java.core.InfoException
|
||||||
[error]
|
[error]
|
||||||
@ -286,82 +270,6 @@
|
|||||||
:hint "invalid image"
|
:hint "invalid image"
|
||||||
:cause error))
|
:cause error))
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
;; IMAGE HELPERS
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
|
|
||||||
(defn download-image
|
|
||||||
"Download an image from the provided URI and return the media input object"
|
|
||||||
[{:keys [::http/client]} uri]
|
|
||||||
(letfn [(parse-and-validate [{:keys [status headers] :as response}]
|
|
||||||
(let [size (some-> (get headers "content-length") d/parse-integer)
|
|
||||||
mtype (get headers "content-type")
|
|
||||||
format (cm/mtype->format mtype)
|
|
||||||
max-size (cf/get :media-max-file-size default-max-file-size)]
|
|
||||||
|
|
||||||
(when-not (<= 200 status 299)
|
|
||||||
(ex/raise :type :validation
|
|
||||||
:code :unable-to-download-image
|
|
||||||
:hint (str/ffmt "unable to download image from '%': unexpected status code %" uri status)))
|
|
||||||
|
|
||||||
(when-not size
|
|
||||||
(ex/raise :type :validation
|
|
||||||
:code :unknown-size
|
|
||||||
:hint "seems like the url points to resource with unknown size"))
|
|
||||||
|
|
||||||
(when (> size max-size)
|
|
||||||
(ex/raise :type :validation
|
|
||||||
:code :file-too-large
|
|
||||||
:hint (str/ffmt "the file size % is greater than the maximum %"
|
|
||||||
size
|
|
||||||
default-max-file-size)))
|
|
||||||
|
|
||||||
(when (nil? format)
|
|
||||||
(ex/raise :type :validation
|
|
||||||
:code :media-type-not-allowed
|
|
||||||
:hint "seems like the url points to an invalid media object"))
|
|
||||||
|
|
||||||
{:size size :mtype mtype :format format}))]
|
|
||||||
|
|
||||||
(let [{:keys [body] :as response}
|
|
||||||
(try
|
|
||||||
(http/req! client
|
|
||||||
{:method :get :uri uri}
|
|
||||||
{:response-type :input-stream})
|
|
||||||
(catch java.net.ConnectException cause
|
|
||||||
(ex/raise :type :validation
|
|
||||||
:code :unable-to-download-image
|
|
||||||
:hint (str/ffmt "unable to download image from '%': connection refused or host unreachable" uri)
|
|
||||||
:cause cause))
|
|
||||||
(catch java.net.http.HttpConnectTimeoutException cause
|
|
||||||
(ex/raise :type :validation
|
|
||||||
:code :unable-to-download-image
|
|
||||||
:hint (str/ffmt "unable to download image from '%': connection timeout" uri)
|
|
||||||
:cause cause))
|
|
||||||
(catch java.net.http.HttpTimeoutException cause
|
|
||||||
(ex/raise :type :validation
|
|
||||||
:code :unable-to-download-image
|
|
||||||
:hint (str/ffmt "unable to download image from '%': request timeout" uri)
|
|
||||||
:cause cause))
|
|
||||||
(catch java.io.IOException cause
|
|
||||||
(ex/raise :type :validation
|
|
||||||
:code :unable-to-download-image
|
|
||||||
:hint (str/ffmt "unable to download image from '%': I/O error" uri)
|
|
||||||
:cause cause)))
|
|
||||||
|
|
||||||
{:keys [size mtype]} (parse-and-validate response)
|
|
||||||
path (tmp/tempfile :prefix "penpot.media.download.")
|
|
||||||
written (io/write* path body :size size)]
|
|
||||||
|
|
||||||
(when (not= written size)
|
|
||||||
(ex/raise :type :internal
|
|
||||||
:code :mismatch-write-size
|
|
||||||
:hint "unexpected state: unable to write to file"))
|
|
||||||
|
|
||||||
{;; :size size
|
|
||||||
:path path
|
|
||||||
:mtype mtype})))
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;; FONTS
|
;; FONTS
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
@ -409,22 +317,6 @@
|
|||||||
(when (zero? (:exit res))
|
(when (zero? (:exit res))
|
||||||
(:out res))))
|
(:out res))))
|
||||||
|
|
||||||
(woff2->sfnt [data]
|
|
||||||
;; woff2_decompress outputs to same directory with .ttf extension
|
|
||||||
(let [finput (tmp/tempfile :prefix "penpot.font." :suffix ".woff2")
|
|
||||||
foutput (fs/path (str/replace (str finput) #"\.woff2$" ".ttf"))]
|
|
||||||
(try
|
|
||||||
(io/write* finput data)
|
|
||||||
(let [res (sh/sh "woff2_decompress" (str finput))]
|
|
||||||
(if (zero? (:exit res))
|
|
||||||
foutput
|
|
||||||
(do
|
|
||||||
(when (fs/exists? foutput)
|
|
||||||
(fs/delete foutput))
|
|
||||||
nil)))
|
|
||||||
(finally
|
|
||||||
(fs/delete finput)))))
|
|
||||||
|
|
||||||
;; Documented here:
|
;; Documented here:
|
||||||
;; https://docs.microsoft.com/en-us/typography/opentype/spec/otff#table-directory
|
;; https://docs.microsoft.com/en-us/typography/opentype/spec/otff#table-directory
|
||||||
(get-sfnt-type [data]
|
(get-sfnt-type [data]
|
||||||
@ -474,27 +366,4 @@
|
|||||||
|
|
||||||
(= stype :ttf)
|
(= stype :ttf)
|
||||||
(-> (assoc "font/otf" (ttf->otf sfnt))
|
(-> (assoc "font/otf" (ttf->otf sfnt))
|
||||||
(assoc "font/ttf" sfnt)))))
|
(assoc "font/ttf" sfnt)))))))))
|
||||||
|
|
||||||
(contains? current "font/woff2")
|
|
||||||
(let [data (get input "font/woff2")
|
|
||||||
foutput (woff2->sfnt data)]
|
|
||||||
(when-not foutput
|
|
||||||
(ex/raise :type :validation
|
|
||||||
:code :invalid-woff2-file
|
|
||||||
:hint "invalid woff2 file"))
|
|
||||||
(try
|
|
||||||
(let [sfnt (io/read* foutput)
|
|
||||||
type (get-sfnt-type sfnt)]
|
|
||||||
(cond-> input
|
|
||||||
(= type :otf)
|
|
||||||
(-> (assoc "font/otf" sfnt)
|
|
||||||
(assoc "font/ttf" (otf->ttf sfnt))
|
|
||||||
(update "font/woff" gen-if-nil #(ttf-or-otf->woff sfnt)))
|
|
||||||
|
|
||||||
(= type :ttf)
|
|
||||||
(-> (assoc "font/ttf" sfnt)
|
|
||||||
(assoc "font/otf" (ttf->otf sfnt))
|
|
||||||
(update "font/woff" gen-if-nil #(ttf-or-otf->woff sfnt)))))
|
|
||||||
(finally
|
|
||||||
(fs/delete foutput))))))))
|
|
||||||
|
|||||||
@ -15,16 +15,16 @@
|
|||||||
io.prometheus.client.CollectorRegistry
|
io.prometheus.client.CollectorRegistry
|
||||||
io.prometheus.client.Counter
|
io.prometheus.client.Counter
|
||||||
io.prometheus.client.Counter$Child
|
io.prometheus.client.Counter$Child
|
||||||
io.prometheus.client.exporter.common.TextFormat
|
|
||||||
io.prometheus.client.Gauge
|
io.prometheus.client.Gauge
|
||||||
io.prometheus.client.Gauge$Child
|
io.prometheus.client.Gauge$Child
|
||||||
io.prometheus.client.Histogram
|
io.prometheus.client.Histogram
|
||||||
io.prometheus.client.Histogram$Child
|
io.prometheus.client.Histogram$Child
|
||||||
io.prometheus.client.hotspot.DefaultExports
|
|
||||||
io.prometheus.client.SimpleCollector
|
io.prometheus.client.SimpleCollector
|
||||||
io.prometheus.client.Summary
|
io.prometheus.client.Summary
|
||||||
io.prometheus.client.Summary$Builder
|
io.prometheus.client.Summary$Builder
|
||||||
io.prometheus.client.Summary$Child
|
io.prometheus.client.Summary$Child
|
||||||
|
io.prometheus.client.exporter.common.TextFormat
|
||||||
|
io.prometheus.client.hotspot.DefaultExports
|
||||||
java.io.StringWriter))
|
java.io.StringWriter))
|
||||||
|
|
||||||
(set! *warn-on-reflection* true)
|
(set! *warn-on-reflection* true)
|
||||||
|
|||||||
@ -10,7 +10,6 @@
|
|||||||
[app.common.logging :as l]
|
[app.common.logging :as l]
|
||||||
[app.db :as db]
|
[app.db :as db]
|
||||||
[app.migrations.clj.migration-0023 :as mg0023]
|
[app.migrations.clj.migration-0023 :as mg0023]
|
||||||
[app.migrations.clj.migration-0145 :as mg0145]
|
|
||||||
[app.util.migrations :as mg]
|
[app.util.migrations :as mg]
|
||||||
[integrant.core :as ig]))
|
[integrant.core :as ig]))
|
||||||
|
|
||||||
@ -451,31 +450,7 @@
|
|||||||
:fn (mg/resource "app/migrations/sql/0141-add-idx-to-file-library-rel.sql")}
|
:fn (mg/resource "app/migrations/sql/0141-add-idx-to-file-library-rel.sql")}
|
||||||
|
|
||||||
{:name "0141-add-file-data-table.sql"
|
{:name "0141-add-file-data-table.sql"
|
||||||
:fn (mg/resource "app/migrations/sql/0141-add-file-data-table.sql")}
|
:fn (mg/resource "app/migrations/sql/0141-add-file-data-table.sql")}])
|
||||||
|
|
||||||
{:name "0142-add-sso-provider-table"
|
|
||||||
:fn (mg/resource "app/migrations/sql/0142-add-sso-provider-table.sql")}
|
|
||||||
|
|
||||||
{:name "0143-http-session-v2-table"
|
|
||||||
:fn (mg/resource "app/migrations/sql/0143-add-http-session-v2-table.sql")}
|
|
||||||
|
|
||||||
{:name "0144-mod-server-error-report-table"
|
|
||||||
:fn (mg/resource "app/migrations/sql/0144-mod-server-error-report-table.sql")}
|
|
||||||
|
|
||||||
{:name "0145-fix-plugins-uri-on-profile"
|
|
||||||
:fn mg0145/migrate}
|
|
||||||
|
|
||||||
{:name "0145-mod-audit-log-table"
|
|
||||||
:fn (mg/resource "app/migrations/sql/0145-mod-audit-log-table.sql")}
|
|
||||||
|
|
||||||
{:name "0146-mod-access-token-table"
|
|
||||||
:fn (mg/resource "app/migrations/sql/0146-mod-access-token-table.sql")}
|
|
||||||
|
|
||||||
{:name "0147-mod-team-invitation-table"
|
|
||||||
:fn (mg/resource "app/migrations/sql/0147-mod-team-invitation-table.sql")}
|
|
||||||
|
|
||||||
{:name "0147-add-upload-session-table"
|
|
||||||
:fn (mg/resource "app/migrations/sql/0147-add-upload-session-table.sql")}])
|
|
||||||
|
|
||||||
(defn apply-migrations!
|
(defn apply-migrations!
|
||||||
[pool name migrations]
|
[pool name migrations]
|
||||||
|
|||||||
@ -58,3 +58,4 @@
|
|||||||
(when (nil? (:data file))
|
(when (nil? (:data file))
|
||||||
(migrate-file conn file)))
|
(migrate-file conn file)))
|
||||||
(db/exec-one! conn ["drop table page cascade;"])))
|
(db/exec-one! conn ["drop table page cascade;"])))
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user