Commit graph

702 commits

Author SHA1 Message Date
Ribas160
ed9b3d1aa0
fix: The content format is not reset on create a new or clone document 2025-12-14 09:08:48 +02:00
Ribas160
54d002d26f
fix: Attachment disappears after a "paste" in the message area 2025-12-09 15:43:59 +02:00
El RIDO
52c0846dad
Merge pull request #1734 from PrivateBin/php85
Enable PHP 8.5 testing and handle deprecations
2025-12-03 19:10:03 +01:00
El RIDO
4f28c357ae
Merge pull request #1715 from PrivateBin/i18n/soften-html-encoding
fix: do not encode source JSON translation string resulting in wrong display of special characters like '
2025-12-03 19:07:17 +01:00
El RIDO
eaf8f9f92e
address PHP 8.5 deprecation 2025-12-02 07:07:04 +01:00
El RIDO
aa931c7a5c
enable Swedish translations 2025-12-02 06:40:07 +01:00
El RIDO
65a90360b6
apply Scrutinizer fix 2025-11-20 09:23:47 +01:00
El RIDO
348d36d6ee
prefer DirectoryIterator for readability, also test jbo translation, log deletion errors 2025-11-20 09:13:15 +01:00
El RIDO
3146d41609
apply StyleCI recommendation 2025-11-20 08:28:50 +01:00
El RIDO
b4db5f8e57
apply null coalescing operator, strict equality, avoid aliases, prefer empty 2025-11-20 08:19:14 +01:00
El RIDO
fc4a92e6a4
apply Scrutinizer fix 2025-11-19 19:40:05 +01:00
El RIDO
9c5ba6ffc3
apply StyleCI recommendation 2025-11-19 19:26:00 +01:00
El RIDO
69e5fc1b05
apply null coalescing operator 2025-11-19 19:24:17 +01:00
El RIDO
c8643f187e
apply null coalescing operator
Co-authored-by: Mikhail Romanov <42250412+Ribas160@users.noreply.github.com>
2025-11-19 18:45:35 +01:00
El RIDO
0e2055d54a
remove unnecessary variable 2025-11-19 11:15:28 +01:00
El RIDO
3caf3214f1
apply StyleCI recommendation 2025-11-19 10:02:15 +01:00
El RIDO
528f2f7221
fix PHP 7.4 compatibility 2025-11-19 09:59:54 +01:00
El RIDO
baa79e12e8
apply StyleCI recommendation 2025-11-19 09:57:08 +01:00
El RIDO
3a23117ebf
Refactored translation of exception messages 2025-11-19 09:36:40 +01:00
El RIDO
3e6f1733f9
refactored exceptions in controller
- added missing exception doc blocks
- introduced exception type that translates message during construction
- catch explicit exception types where possible
2025-11-19 09:36:39 +01:00
El RIDO
e26bcfa733
apply StyleCI recommendation 2025-11-14 10:21:57 +01:00
El RIDO
d78c33438d
refactor JSON response processing
- avoid translating JSON error messages twice
- separation of concerns, JSON response preparation should not mix handling errors and results, provide two functions instead of one
- callers of JSON error method are responsible for translation of errors
2025-11-14 10:04:41 +01:00
rugk
2c4dd2594c fix: do not encode source JSON translation string resulting in wrong display of special characters like '
Fixes #1712

Disclosure: Coded with help of Copiot. (description wrtten by me)

So this does indeed loosen the encoding a bit. However, IMHO, it was neither better before though. You could always bypass the encoding for `args{0]` when  you just include `<a` (or the other tag) somewhere or so.

**One important notice:** This was (due to the exceptions before and afterwards) valid before and also now: Translators **could** (and can) if they have malicious intent, inject/do "XSS attacks".
Thus, translations PRs (also from Crowdin) should be reviewed for wild HTML code inside translations. I suppose this is easy to fix, but anyway a valid risk.

But IMHO, we should teat the JSON files being part of our source code as a "trusted source". In the end, such an attak is basicaly just ends up being injecting malicious code. I hope such contributors would be detected.

References I explicitly checked again to not introduce an XSS here: https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html and the PHP doc for he HTML encoding.

I feel the safter way obviously would be encoding the _whole_ string _after_ translation (just like you should apply DOMPurify after everything), but as explained it was not done before and would break compatibility. Also, I looked through the sources and I see no risk described by doing it only for the "dangerous" "untrusted" inputs.
Only here is a notice that `%s` shall not be used in some contexts, for example to define a tag: https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html#dangerous-contexts (obviously in such a case, attacks may be possible even with encoding; but again; this is nothing new)

The basic "problem" of it all is: We want HTML to be translated/be usable in our translation. If we'd get rid of that, we would get for sure rid of all such XSS attack possibilities. But that woud be a bigger refactoring, so IMHO, this here is fine for a fix for the issue at hand.

Ah another point: I think the `is_int` check is harmless, but it's also kinda useless. Maybe it is some kind of obscure performance optimisation. (Yeah ints have nothing to encode as they have nothing that could be used for XSS, but they could also just be passed through that function.)
2025-11-13 10:52:08 +00:00
El RIDO
19ca6d3dab
incrementing version 2025-11-12 08:00:50 +01:00
El RIDO
bddfb173da
Merge branch 'master' into advisory-fix-1 2025-11-12 07:47:43 +01:00
El RIDO
5b85d63942
Merge branch 'master' into advisory-fix-1 2025-11-12 07:18:43 +01:00
El RIDO
e427458cd0 Merge branch 'master' into advisory-fix-1 2025-11-11 22:00:09 +01:00
Ribas160
08b3244314
privatebin.js SRI and CHANGELOG.md updated 2025-11-11 20:13:10 +02:00
El RIDO
2e11b13464
remove dead code 2025-11-11 17:56:49 +01:00
El RIDO
c35fc4f790
use more straight forward in_array check
kudos @Ribas160 for the suggestion
2025-11-11 17:53:50 +01:00
El RIDO
f456fb576e
ensure template cookie cannot be a path 2025-11-11 17:52:48 +01:00
Ribas160
9c71fbcc70
Use pure JavaScript to create a div element 2025-11-11 17:45:27 +02:00
El RIDO
a371f5cab5
remove dead code 2025-11-11 12:49:37 +01:00
El RIDO
94a854faca
do add the configured template to the available ones, if missing 2025-11-11 10:59:55 +01:00
El RIDO
ea73300e15
don't always set the cookie, having to unset it later
but still unset it, if it currently should not be in use (templateselection = false)
2025-11-11 09:45:51 +01:00
El RIDO
be6a3702fc
simplify logic and improve readability
function was only used in one place and only indirectly tested, so it could be inlined, which also makes the test for null and the extra variable allocation unnecessary
2025-11-11 09:43:41 +01:00
El RIDO
f2164353c3
use realpath and validate tpl directory contents
to ensure only php files inside the tpl dir can get used as templates
2025-11-11 09:34:54 +01:00
El RIDO
dae5f7fd61
partially revert #1559
Instead of automatically adding custom templates, we log an error if
that template is missing in the available templates. Still mitigates
arbitrary file inclusion, as the string is now checked against a fixed
allow list.
2025-11-10 17:31:35 +01:00
Ribas160
14b68af528
Insert drag and drop file names as a text, not html 2025-11-10 17:59:18 +02:00
El RIDO
a479d75405
belt and braces: reset the template cookie, if function is not enabled 2025-11-10 12:25:19 +01:00
El RIDO
17ff44037a
prevent use of paths in template names, only file names inside tpl directory are allowed 2025-11-10 12:23:50 +01:00
El RIDO
13949349af
improve readability of logic 2025-11-10 12:22:29 +01:00
Ribas160
a7b253a43a
fix: error fetching attachments from blob 2025-11-05 17:33:08 +02:00
El RIDO
a91d0afebd
ensure there is still a space between commenter icon and name 2025-10-28 16:35:58 +01:00
El RIDO
2f70456e9a
incrementing version 2025-10-28 16:08:13 +01:00
El RIDO
43cf8b53ac
Merge branch 'master' into purify-3.3.0 2025-10-28 11:27:17 +01:00
El RIDO
c4f8482b30
Refactored jQuery DOM element creation
using plain JavaScript, to ensure text nodes are sanitized
2025-10-25 12:56:55 +02:00
El RIDO
fd2c2ae0c5
update DOMpurify library from 3.2.7 to 3.3.0 2025-10-25 10:52:40 +02:00
El RIDO
0bfa300c59
apply StyleCI recommendation 2025-10-12 18:40:48 +02:00
El RIDO
d76796adf3
deduplicate logic 2025-10-12 18:39:36 +02:00