Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-12 18:18:24 -05:00
Code Issues Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
Andrey Antukh 2025-01-16 10:45:22 +01:00
commit cb650ebf1c
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
backend/scripts/repl
View file

@ -1,5 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
export PENPOT_SECRET_KEY=super-secret-devenv-key
export PENPOT_HOST=devenv export PENPOT_HOST=devenv
export PENPOT_FLAGS="\ export PENPOT_FLAGS="\
$PENPOT_FLAGS \ $PENPOT_FLAGS \

1
backend/scripts/start-dev
View file

@ -1,5 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
export PENPOT_SECRET_KEY=super-secret-devenv-key
export PENPOT_HOST=devenv export PENPOT_HOST=devenv
export PENPOT_FLAGS="\ export PENPOT_FLAGS="\
$PENPOT_FLAGS \ $PENPOT_FLAGS \

6
backend/src/app/auth.clj
View file

@ -8,7 +8,7 @@
(:require (:require
[buddy.hashers :as hashers])) [buddy.hashers :as hashers]))
(def default-params (def ^:private default-options
{:alg :argon2id {:alg :argon2id
:memory 32768 ;; 32 MiB :memory 32768 ;; 32 MiB
:iterations 3 :iterations 3
@ -16,12 +16,12 @@
(defn derive-password (defn derive-password
[password] [password]
(hashers/derive password default-params)) (hashers/derive password default-options))
(defn verify-password (defn verify-password
[attempt password] [attempt password]
(try (try
(hashers/verify attempt password) (hashers/verify attempt password default-options)
(catch Throwable _ (catch Throwable _
{:update false {:update false
:valid false}))) :valid false})))

3
backend/src/app/setup.clj
View file

@ -74,8 +74,7 @@
(defmethod ig/assert-key ::props (defmethod ig/assert-key ::props
[_ params] [_ params]
(assert (db/pool? (::db/pool params)) "expected valid database pool") (assert (db/pool? (::db/pool params)) "expected valid database pool"))
(assert (string? (::key params)) "expected valid key string"))
(defmethod ig/init-key ::props (defmethod ig/init-key ::props
[_ {:keys [::db/pool ::key] :as cfg}] [_ {:keys [::db/pool ::key] :as cfg}]

1
docker/devenv/docker-compose.yaml
View file

@ -43,7 +43,6 @@ services:
environment: environment:
- EXTERNAL_UID=${CURRENT_USER_ID} - EXTERNAL_UID=${CURRENT_USER_ID}
- PENPOT_SECRET_KEY=super-secret-devenv-key
# SMTP setup # SMTP setup
- PENPOT_SMTP_ENABLED=true - PENPOT_SMTP_ENABLED=true
- PENPOT_SMTP_DEFAULT_FROM=no-reply@example.com - PENPOT_SMTP_DEFAULT_FROM=no-reply@example.com