Commit Graph

10 Commits

Author SHA1 Message Date
Samuel Georges 3dc105173a Only allow local files via view engine
The Laravel view engine wants to supply the Twig engine with an absolute path, even though this is outside the inclusion rules. This implements a temporary exception to wave it through. It seems like a suitable alternative instead of implementing a reverse lookup to ensure the path is a valid view file, since we can trust the source engine has passed the value through its resolver already

Fixes previous fix
2020-10-13 19:14:49 +11:00
Samuel Georges 11c93f0a3b Fixes View::make recursion
This logic is called via {% include %} (fixed) and as a custom .htm driver for View::make (broken). The previous change was too aggressive and broke the latter. This still fixes arbitrary file inclusion whilst retaining the original design. Both logic paths are now fixed and have been tested
2020-10-11 19:05:38 +11:00
Samuel Georges f9e14b02f5 Only allow view files in system twig
This no longer allows arbitrary inclusions, only views from the native Laravel view engine. Note this also affects the cms twig loader
2020-09-30 11:11:03 +10:00
Ben Thomson a59d3b83eb Code quality clean up (#4449)
Credit to @bennothommo
2019-07-18 08:50:37 -06:00
Luke Towers c86bec7f08 Replace deprecated Twig class references, refs: #4209. 2019-03-27 13:15:17 -06:00
Arthur Kushman c78b3ef786 Code formatting changes (#3363)
Code formatting improvements submitted by @arthurkushman.
2018-03-22 10:55:13 -06:00
Samuel Georges 2b5709adb9 Bump Twig to v2, refit code 2017-05-13 09:34:20 +10:00
Sam Georges c83797231d Subsequent expressions are on a new line (see developer guide > PSR exceptions) 2014-11-01 12:00:45 +11:00
Stefan Talen f85087eac6 Updating modules/system 2014-10-18 11:58:50 +02:00
Sam Georges 71a5dd67ab Welcome to the world, October :-) 2014-05-14 23:24:20 +10:00