Merge pull request 'update akkoma' (#31) from update-akkoma into main
Some checks failed
Hydra akkoma Hydra build #16274 of nix-packages:x86_64-linux-master:akkoma
ci/woodpecker/cron/update-lockfile Pipeline was successful
ci/woodpecker/cron/update Pipeline failed
Hydra rpi4Kernel Hydra build #13999 of nix-packages:aarch64-linux-master:rpi4Kernel
Hydra emoji-volpeon-drgn Hydra build #14005 of nix-packages:aarch64-linux-master:emoji-volpeon-drgn

Reviewed-on: #31
This commit is contained in:
Charlotte 🦝 Delenk 2023-04-15 12:37:29 +00:00
commit 0bf192b97c
Signed by: gitea-bot
GPG key ID: C9974EDF9932B558
2 changed files with 10 additions and 10 deletions

View file

@ -1,13 +1,13 @@
diff --git a/lib/pleroma/web/plugs/http_security_plug.ex b/lib/pleroma/web/plugs/http_security_plug.ex diff --git a/lib/pleroma/web/plugs/http_security_plug.ex b/lib/pleroma/web/plugs/http_security_plug.ex
index b1f1ada94..8bae50900 100644 index d7cff7343..d09159c4f 100644
--- a/lib/pleroma/web/plugs/http_security_plug.ex --- a/lib/pleroma/web/plugs/http_security_plug.ex
+++ b/lib/pleroma/web/plugs/http_security_plug.ex +++ b/lib/pleroma/web/plugs/http_security_plug.ex
@@ -114,7 +114,7 @@ defp csp_string(conn) do @@ -116,7 +116,7 @@ defp csp_string(conn) do
style_src = "style-src 'self' '#{nonce_tag}'" style_src = "style-src 'self' '#{nonce_tag}'"
font_src = "font-src 'self'" font_src = "font-src 'self'"
- script_src = "script-src 'self' '#{nonce_tag}' " - script_src = "script-src 'self' '#{nonce_tag}' "
+ script_src = "script-src 'self' 'unsafe-eval' '#{nonce_tag}' " + script_src = "script-src 'self' 'unsafe-eval' '#{nonce_tag}' "
report = if report_uri, do: ["report-uri ", report_uri, ";report-to csp-endpoint"] script_src =
insecure = if scheme == "https", do: "upgrade-insecure-requests" if @mix_env == :dev do

View file

@ -1,9 +1,9 @@
{ {
"url": "https://akkoma.dev/AkkomaGang/akkoma.git", "url": "https://akkoma.dev/AkkomaGang/akkoma.git",
"rev": "62e22eeff23b8841e3cdc7e4a4ee6ef29b612aca", "rev": "d6bed599c8ca3f77a3936ff68cbaf036a5ae59b6",
"date": "2023-04-11T09:28:01+00:00", "date": "2023-04-14T18:09:59+01:00",
"path": "/nix/store/9gi0bkr23rfd7wzsfbvlk340hdb0hk3j-akkoma", "path": "/nix/store/hxm4g88mida0f9f4k2n07kxysvlw5bnm-akkoma",
"sha256": "0hrf8w9lg00nlsw2xlvka0hgwgxl4vggax0fcld7qzmc6i28fcdk", "sha256": "09i9d20yb4p051y0xd73yviyc30lmpg61bj863bnf7bgas5k7y7g",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,