beenull/EHCP-Force-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes for Debian and Minor Enhancements

Browse source
This commit is contained in:
earnolmartin 2020-11-24 17:02:31 -07:00
parent 0eae628054
commit 1d9fdcbec0
2 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
ehcp/ehcpforceupdate.sh
View file

@ -2638,20 +2638,12 @@ function installPythonPamMysql(){
# Copy our libpam-python scripts to /etc/security
cp -vf /var/www/new/ehcp/etc/pam/pam_dbauth_smtp.conf /etc/security/pam_dbauth_smtp.conf
if [[ "$distro" == "ubuntu" && "$yrelease" -ge "16" ]]; then
cp -vf /var/www/new/ehcp/etc/pam/pam_dbauth_smtp_ubuntu_20_plus.py /etc/security/pam_dbauth_smtp.py
else
cp -vf /var/www/new/ehcp/etc/pam/pam_dbauth_smtp.py /etc/security/pam_dbauth_smtp.py
fi
cp -vf /var/www/new/ehcp/etc/pam/pam_dbauth_smtp_ubuntu_20_plus.py /etc/security/pam_dbauth_smtp.py
cp -vf /var/www/new/ehcp/etc/pam/pam_dbauth_vsftpd.conf /etc/security/pam_dbauth_vsftpd.conf
if [[ "$distro" == "ubuntu" && "$yrelease" -ge "16" ]]; then
cp -vf /var/www/new/ehcp/etc/pam/pam_dbauth_vsftpd_ubuntu_20_plus.py /etc/security/pam_dbauth_vsftpd.py
else
cp -vf /var/www/new/ehcp/etc/pam/pam_dbauth_vsftpd.py /etc/security/pam_dbauth_vsftpd.py
fi
cp -vf /var/www/new/ehcp/etc/pam/pam_dbauth_vsftpd_ubuntu_20_plus.py /etc/security/pam_dbauth_vsftpd.py
if [[ "$distro" == "ubuntu" && "$yrelease" -eq "16" ]] && [[ -e "/usr/lib/python2.7/lib-dynload/_hashlib.x86_64-linux-gnu.so" ]]; then
if ([[ "$distro" == "ubuntu" && "$yrelease" -eq "16" ]] || [[ "$distro" == "debian" && "$yrelease" -eq "9" ]]) && [[ -e "/usr/lib/python2.7/lib-dynload/_hashlib.x86_64-linux-gnu.so" ]]; then
rm -f /usr/lib/python2.7/lib-dynload/_hashlib.x86_64-linux-gnu.so
easy_install hashlib
fi
@ -3290,6 +3282,21 @@ function preventUserCronFromWebUser(){
fi
}
function removeMinerExploit(){
killall -9 kdevtmpfsi
killall -9 kinsing
rm -rf /var/tmp/kinsing
rm -rf /var/tmp/.ICEd-unix
rm -rf /var/tmp/.ICE-unix
rm -rf /tmp/kdevtmpfsi
rm -rf /tmp/.ICEd-unix
rm -rf /tmp/.ICE-unix
rm -rf /tmp/kinsing
rm -rf /tmp/libsystem.so
rm -rf /var/spool/cron/crontabs/ftp
rm -rf /var/spool/cron/crontabs/vsftpd
}
###############################
###START OF SCRIPT MAIN CODE###
###############################
@ -3528,6 +3535,9 @@ postfixEnableSubmissionPortByDefault
# Create symlinks
createSymlinks
# Remove possible miner exploit that affected EHCP Fore
removeMinerExploit
echo -e "Restarting web services, synchronizing domains, and finalizing installation!\n"
# Start the services and sync domains
finalize

14
ehcp/install_lib.php
View file

@ -1198,13 +1198,9 @@ function installPythonPamMysql(){
// Copy our libpam-python scripts to /etc/security
passthru2("cp -vf $ehcpinstalldir/etc/pam/pam_dbauth_smtp.conf /etc/security/pam_dbauth_smtp.conf");
if(getIsUbuntu() && getUbuntuReleaseYear() >= "16"){
passthru2("cp -vf $ehcpinstalldir/etc/pam/pam_dbauth_smtp_ubuntu_20_plus.py /etc/security/pam_dbauth_smtp.py");
}else{
passthru2("cp -vf $ehcpinstalldir/etc/pam/pam_dbauth_smtp.py /etc/security/pam_dbauth_smtp.py");
}
passthru2("cp -vf $ehcpinstalldir/etc/pam/pam_dbauth_smtp_ubuntu_20_plus.py /etc/security/pam_dbauth_smtp.py");
if(getIsUbuntu() && getUbuntuReleaseYear() == "16"){
if((getIsUbuntu() && getUbuntuReleaseYear() == "16") || (getIsDebian() && getUbuntuReleaseYear() == "9")){
if(file_exists("/usr/lib/python2.7/lib-dynload/_hashlib.x86_64-linux-gnu.so")){
unlink("/usr/lib/python2.7/lib-dynload/_hashlib.x86_64-linux-gnu.so");
passthru2("easy_install hashlib");
@ -1212,11 +1208,7 @@ function installPythonPamMysql(){
}
passthru2("cp -vf $ehcpinstalldir/etc/pam/pam_dbauth_vsftpd.conf /etc/security/pam_dbauth_vsftpd.conf");
if(getIsUbuntu() && getUbuntuReleaseYear() >= "16"){
passthru2("cp -vf $ehcpinstalldir/etc/pam/pam_dbauth_vsftpd_ubuntu_20_plus.py /etc/security/pam_dbauth_vsftpd.py");
}else{
passthru2("cp -vf $ehcpinstalldir/etc/pam/pam_dbauth_vsftpd.py /etc/security/pam_dbauth_vsftpd.py");
}
passthru2("cp -vf $ehcpinstalldir/etc/pam/pam_dbauth_vsftpd_ubuntu_20_plus.py /etc/security/pam_dbauth_vsftpd.py");
// Replace EHCP mysql password with the correct one
replacelineinfile("password=","password=" . $ehcpmysqlpass,"/etc/security/pam_dbauth_smtp.conf", true);