Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (7d7e3fb92d148c7cc496513ca45a9113d684e59c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (7d7e3fb92d148c7cc496513ca45a9113d684e59c)
  • Date: Thu, 4 Dec 2008 11:44:02 -0600

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 2 ++
var/lib/sorcery/modules/build_api/api2 | 2 +-
var/lib/sorcery/modules/libgrimoire | 8 ++++++++
3 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 7d7e3fb92d148c7cc496513ca45a9113d684e59c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

* libgrimoire: fixed a slight security issue in real_rm_source_dir
#14100
* api2: bail out of run_pre_build if rm_source_dir fails

diff --git a/ChangeLog b/ChangeLog
index d4f7be7..c10f34d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
* alter, libtablet: added the missing version cache support #14934
* url_hg_http, dl_hg, libsummon, scribe: added hg support #14771,
slightly modified patch by Remko van der Vossen
+ * libgrimoire: fixed a slight security issue in real_rm_source_dir
#14100
+ * api2: bail out of run_pre_build if rm_source_dir fails

2008-12-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* gaze: improved what/short when dealing with multiple spells #14839
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index 2272ffe..35d653d 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -126,7 +126,7 @@ function run_pre_build() {
"${SPELL_COLOR}${SPELL}" \
"${DEFAULT_COLOR}"

- rm_source_dir
+ rm_source_dir || return 1
mkdir -p $BUILD_DIRECTORY
cd "$BUILD_DIRECTORY"

diff --git a/var/lib/sorcery/modules/libgrimoire
b/var/lib/sorcery/modules/libgrimoire
index 8705b57..5cf82b2 100755
--- a/var/lib/sorcery/modules/libgrimoire
+++ b/var/lib/sorcery/modules/libgrimoire
@@ -67,6 +67,14 @@ function real_rm_source_dir() {

debug "libgrimoire" "Running rm_source_dir() on $dead_dir"

+ if [[ $dead_dir == $SOURCE_DIRECTORY ]] &&
+ [[ ${SOURCE_DIRECTORY#$BUILD_DIRECTORY} == $SOURCE_DIRECTORY ]]; then
+ error_message "The source directory ($SOURCE_DIRECTORY) is not under the
build"
+ error_message "directory ($BUILD_DIRECTORY)! Refusing deletion for
safety reasons!"
+ error_message "Please report this bug to http://bugs.sourcemage.org";
+ return 1
+ fi
+
if [[ -n $dead_dir ]] && [[ -d $dead_dir ]]; then

pushd $BUILD_DIRECTORY 2>&1 > /dev/null



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (7d7e3fb92d148c7cc496513ca45a9113d684e59c), Jaka Kranjc, 12/04/2008

Archive powered by MHonArc 2.6.24.

Top of Page