mirror of
https://github.com/xcat2/xcat-dep.git
synced 2024-11-24 10:29:53 +00:00
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
diff --git a/scripts/Dpkg/Source/Patch.pm b/scripts/Dpkg/Source/Patch.pm
|
|
--- a/scripts/Dpkg/Source/Patch.pm
|
|
+++ b/scripts/Dpkg/Source/Patch.pm
|
|
@@ -322,8 +322,9 @@ sub analyze {
|
|
error(_g("expected ^--- in line %d of diff `%s'"), $., $diff);
|
|
}
|
|
$_ = strip_ts($_);
|
|
- if ($_ eq '/dev/null' or s{^(\./)?[^/]+/}{$destdir/}) {
|
|
+ if ($_ eq '/dev/null' or s{^[^/]+/}{$destdir/}) {
|
|
$fn = $_;
|
|
+ error(_g("%s contains an insecure path: %s"), $diff, $_) if m{/\.\./};
|
|
}
|
|
if (/\.dpkg-orig$/) {
|
|
error(_g("diff `%s' patches file with name ending .dpkg-orig"), $diff);
|
|
@@ -336,8 +337,9 @@ sub analyze {
|
|
error(_g("line after --- isn't as expected in diff `%s' (line %d)"), $diff, $.);
|
|
}
|
|
$_ = strip_ts($_);
|
|
- if ($_ eq '/dev/null' or s{^(\./)?[^/]+/}{$destdir/}) {
|
|
+ if ($_ eq '/dev/null' or s{^[^/]+/}{$destdir/}) {
|
|
$fn2 = $_;
|
|
+ error(_g("%s contains an insecure path: %s"), $diff, $_) if m{/\.\./};
|
|
} else {
|
|
unless (defined $fn) {
|
|
error(_g("none of the filenames in ---/+++ are relative in diff `%s' (line %d)"),
|
|
@@ -363,6 +365,17 @@ sub analyze {
|
|
if ($dirname =~ s{/[^/]+$}{} && not -d $dirname) {
|
|
$dirtocreate{$dirname} = 1;
|
|
}
|
|
+
|
|
+ # Sanity check, refuse to patch through a symlink
|
|
+ $dirname = $fn;
|
|
+ while (1) {
|
|
+ if (-l $dirname) {
|
|
+ error(_g("diff %s modifies file %s through a symlink: %s"),
|
|
+ $diff, $fn, $dirname);
|
|
+ }
|
|
+ last unless $dirname =~ s{/[^/]+$}{};
|
|
+ }
|
|
+
|
|
if (-e $fn and not -f _) {
|
|
error(_g("diff `%s' patches something which is not a plain file"), $diff);
|
|
}
|