MailScanner/v5
1
1
Fork 0
mirror of https://github.com/MailScanner/v5.git synced 2024-09-20 07:16:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use base64 1x1spacer instead (#582)

Browse source
This commit is contained in:
Shawn Iverson 2022-01-08 13:24:35 -05:00 committed by GitHub
parent a7b6ad46c3
commit 55716e8146
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
1x1spacer.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 51 B

1
Build.debian
View file

@ -108,7 +108,6 @@ mkdir -p $WORK/usr/share/MailScanner/doc
cp $DEVBASEDIR/changelog $WORK/usr/share/MailScanner/doc/
cp $DEVBASEDIR/LICENSE $WORK/usr/share/MailScanner/doc/
cp $DEVBASEDIR/README.md $WORK/usr/share/MailScanner/doc/
cp $DEVBASEDIR/1x1spacer.gif $WORK/usr/share/MailScanner/doc/
fakeroot dpkg -b $WORK $PKGTMP/MailScanner-$VERSION.noarch.deb
#chmod +x $PKGTMP/MailScanner-${FULLMSVER}/install.sh
cd $PKGTMP

1
Build.nix
View file

@ -49,7 +49,6 @@ cp -fr $DEVBASEDIR/common/* $WORK/
cp -fr $DEVBASEDIR/nix/* $WORK/
cp -fr $DEVBASEDIR/LICENSE $WORK/
cp -fr $DEVBASEDIR/README.md $WORK/
cp -fr $DEVBASEDIR/1x1spacer.gif $WORK/
# Insert the version number we are building
perl -pi -e 's/VersionNumberHere/'$MSVERSION'/;' $WORK/etc/MailScanner/MailScanner.conf

2
changelog
View file

@ -2,7 +2,7 @@
==================================
- Remove default hosted 1x1spacer.gif
- Include sample 1x1spacer.gif in doc directory
- Include base64 encoded 1x1 spacer
- Add missing file wrappers to packages
11/28/2021 Changes in v5.4.3-1

2
common/etc/MailScanner/MailScanner.conf
View file

@ -1202,7 +1202,7 @@ Known Web Bug Servers = msgtag.com
# If this is not specified, the the old value of "MailScannerWebBug" is used,
# which of course is not an image and may well upset layout of the email.
# This can also be the filename of a ruleset.
Web Bug Replacement =
Web Bug Replacement = data:image/gif;base64,R0lGODlhAQABAJEAAP///wAAAAAAAAAAACH5BAkAAAAALAAAAAABAAEAAAgEAAEEBAA7
# Do you want to allow <Object Codebase=...> or <Object Data=...> tags
# in email messages?

7
common/usr/sbin/ms-upgrade-conf
View file

@ -290,10 +290,9 @@ while(<$newfh>) {
delete $oldsettings{'webbugreplacement'};
print STDERR "Important Note\n--------------\n";
print STDERR "Web Bug Replacement (1x1 pixel spacer) has been removed\n";
print STDERR "from pointing to our Amazon S3 in this version. Please host\n";
print STDERR "your own copy of the 1x1spacer.gif for disarming web bugs. A\n";
print STDERR "copy is included in this package for your convenience here:\n";
print STDERR "/usr/share/MailScanner/doc/1x1spacer.gif or package base.\n";
print STDERR "from pointing to our Amazon S3 in this version. A\n";
print STDERR "base64 encoded spacer has been substituted and does not\n";
print STDERR "require pointing to a URL\n";
print STDERR "\n";
sleep(5);
}

7
debian/DEBIAN/postinst vendored
View file

@ -160,6 +160,13 @@ if [ -f /etc/MailScanner/MailScanner.conf.original -a -f /etc/MailScanner/MailSc
cp -f /etc/MailScanner/MailScanner.conf ${SAVEDIR}/etc/MailScanner/MailScanner.new > /dev/null 2>&1
fi
# update web bug link
OLD="^Web Bug Replacement.*";
NEW="Web Bug Replacement = data:image\/gif;base64,R0lGODlhAQABAJEAAP\/\/\/wAAAAAAAAAAACH5BAkAAAAALAAAAAABAAEAAAgEAAEEBAA7";
if [ -f '/etc/MailScanner/MailScanner.conf' ]; then
sed -i "s/${OLD}/${NEW}/g" /etc/MailScanner/MailScanner.conf
fi
# fix reports directory
OLDTHING='\/etc\/MailScanner\/reports';
NEWTHING='\/usr\/share\/MailScanner\/reports';

12
rhel/mailscanner.spec
View file

@ -271,7 +271,6 @@ done << EOF
changelog
README.md
LICENSE
1x1spacer.gif
EOF
### usr/lib/MailScanner
@ -519,6 +518,13 @@ if [ -f /etc/MailScanner/MailScanner.conf.original -a -f /etc/MailScanner/MailSc
cp -f /etc/MailScanner/MailScanner.conf ${SAVEDIR}/etc/MailScanner/MailScanner.new > /dev/null 2>&1
fi
# update web bug link
OLD="^Web Bug Replacement.*";
NEW="Web Bug Replacement = data:image\/gif;base64,R0lGODlhAQABAJEAAP\/\/\/wAAAAAAAAAAACH5BAkAAAAALAAAAAABAAEAAAgEAAEEBAA7";
if [ -f '/etc/MailScanner/MailScanner.conf' ]; then
sed -i "s/${OLD}/${NEW}/g" /etc/MailScanner/MailScanner.conf
fi
# fix reports directory
OLDTHING='\/etc\/MailScanner\/reports';
NEWTHING='\/usr\/share\/MailScanner\/reports';
@ -791,7 +797,6 @@ exit 0
%attr(644,root,root) /usr/share/MailScanner/doc/changelog
%attr(644,root,root) /usr/share/MailScanner/doc/LICENSE
%attr(644,root,root) /usr/share/MailScanner/doc/README.md
%attr(644,root,root) /usr/share/MailScanner/doc/1x1spacer.gif
%config(noreplace) /usr/share/MailScanner/reports/en/deleted.content.message.txt
%config(noreplace) /usr/share/MailScanner/reports/en/stored.content.message.txt
@ -1275,6 +1280,9 @@ exit 0
%config(noreplace) /usr/share/MailScanner/reports/ca/stored.virus.message.txt
%changelog
* Sat Jan 08 2022 Shawn Iverson <shawniverson@efa-project.org>
- Revert addition of 1x1spacer.gif in favor of base64 embedding
* Tue Jan 04 2022 Shawn Iverson <shawniverson@efa-project.org>
- Remove 1x1spacer.gif default hosted url

12
suse/mailscanner.spec
View file

@ -272,7 +272,6 @@ done << EOF
changelog
README.md
LICENSE
1x1spacer.gif
EOF
### usr/lib/MailScanner
@ -488,6 +487,13 @@ if [ -f /etc/MailScanner/MailScanner.conf.original -a -f /etc/MailScanner/MailSc
cp -f /etc/MailScanner/MailScanner.conf ${SAVEDIR}/etc/MailScanner/MailScanner.new > /dev/null 2>&1
fi
# update web bug link
OLD="^Web Bug Replacement.*";
NEW="Web Bug Replacement = data:image\/gif;base64,R0lGODlhAQABAJEAAP\/\/\/wAAAAAAAAAAACH5BAkAAAAALAAAAAABAAEAAAgEAAEEBAA7";
if [ -f '/etc/MailScanner/MailScanner.conf' ]; then
sed -i "s/${OLD}/${NEW}/g" /etc/MailScanner/MailScanner.conf
fi
# fix reports directory
OLDTHING='\/etc\/MailScanner\/reports';
NEWTHING='\/usr\/share\/MailScanner\/reports';
@ -716,7 +722,6 @@ exit 0
%attr(644,root,root) /usr/share/MailScanner/doc/changelog
%attr(644,root,root) /usr/share/MailScanner/doc/LICENSE
%attr(644,root,root) /usr/share/MailScanner/doc/README.md
%attr(644,root,root) /usr/share/MailScanner/doc/1x1spacer.gif
%config(noreplace) /usr/share/MailScanner/reports/en/deleted.content.message.txt
%config(noreplace) /usr/share/MailScanner/reports/en/stored.content.message.txt
@ -1200,6 +1205,9 @@ exit 0
%config(noreplace) /usr/share/MailScanner/reports/ca/stored.virus.message.txt
%changelog
* Sat Jan 08 2022 Shawn Iverson <shawniverson@efa-project.org>
- Revert addition of 1x1spacer.gif in favor of base64 embedding
* Tue Jan 04 2022 Shawn Iverson <shawniverson@efa-project.org>
- Remove 1x1spacer.gif default hosted url