diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2013-10-28 14:57:14 -0200 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2013-10-28 14:57:14 -0200 |
| commit | 54fd9122644d8cc2b302cc7e870155059e595da7 (patch) | |
| tree | a50638c6b6d5479c82edd03002b865ac88407944 | |
| parent | 76b1780341877eb2a4e5a2f8ca52c404fcdb3e54 (diff) | |
| download | luarocks-54fd9122644d8cc2b302cc7e870155059e595da7.tar.gz luarocks-54fd9122644d8cc2b302cc7e870155059e595da7.tar.bz2 luarocks-54fd9122644d8cc2b302cc7e870155059e595da7.zip | |
Add escaping of ]] preventing code injection as contributed by @siffiejoe. See #154, #167.
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
| @@ -25,6 +25,8 @@ purge.lua path.lua write_rockspec.lua | |||
| 25 | 25 | ||
| 26 | CONFIG_FILE = $(SYSCONFDIR)/config-$(LUA_VERSION).lua | 26 | CONFIG_FILE = $(SYSCONFDIR)/config-$(LUA_VERSION).lua |
| 27 | 27 | ||
| 28 | SAFEPWD=`echo "$$PWD" | sed -e 's/\([][]\)\1/]]..'\''\1\1'\''..[[/g' -` | ||
| 29 | |||
| 28 | all: | 30 | all: |
| 29 | @echo "- Type 'make build' and 'make install':" | 31 | @echo "- Type 'make build' and 'make install':" |
| 30 | @echo " to install to $(PREFIX) as usual." | 32 | @echo " to install to $(PREFIX) as usual." |
| @@ -174,6 +176,6 @@ write_sysconfig: built | |||
| 174 | install: install_bins install_luas install_site_config write_sysconfig | 176 | install: install_bins install_luas install_site_config write_sysconfig |
| 175 | 177 | ||
| 176 | bootstrap: src/luarocks/site_config.lua install_site_config write_sysconfig | 178 | bootstrap: src/luarocks/site_config.lua install_site_config write_sysconfig |
| 177 | '$(LUA_BINDIR)/lua$(LUA_SUFFIX)' -e "package.path=[[$$PWD/src/?.lua;]]..package.path" src/bin/luarocks make rockspec --tree="$(PREFIX)" | 179 | '$(LUA_BINDIR)/lua$(LUA_SUFFIX)' -e "package.path=[[$(SAFEPWD)/src/?.lua;]]..package.path" src/bin/luarocks make rockspec --tree="$(PREFIX)" |
| 178 | 180 | ||
| 179 | install_rock: install_bins install_luas | 181 | install_rock: install_bins install_luas |
