| /CHANGELOG.md |
|---|
| 4,8 → 4,9 |
| * NEWS |
| * Mageia9 (kernel 6.6.22) |
| * CHANGES |
| * E2guardian : new architecture |
| * ACC |
| * use nmap's MAC prefix file instead of our |
| * Use nmap's MAC prefix file instead of our |
| * BUGS |
| * SECURITY |
| * WEB |
| /alcasar.sh |
|---|
| 1321,12 → 1321,14 |
| $SED "s/^#groupname =.*/groupname = 'blacklisted_users'/g" $DIR_DG/e2guardianf1.conf |
| $SED "s/^#htmltemplate =.*/htmltemplate = 'alcasar-e2g.html'/g" $DIR_DG/e2guardianf1.conf |
| $SED "s/^.Define LISTDIR.*/.Define LISTDIR <$DIR_DG/lists/group1/g" $DIR_DG/e2guardianf1.conf |
| DIR_GROUP1="$DIR_DG/lists/group1" |
| DIR_COMMON="$DIR_DG/lists/common" |
| cp -r $DIR_DG/lists/example.group $DIR_GROUP1 |
| chown -R e2guardian:root $DIR_GROUP1 |
| # RAZ bannedphraselist |
| [ -e $DIR_GROUP1/bannedphraselist.default ] || mv $DIR_GROUP1/bannedphraselist $DIR_GROUP1/bannedphraselist.default |
| $SED "s?^[^#]?#&?g" $DIR_GROUP1/bannedphraselist # (comment what is not) |
| # Disable URL control with regex |
| [ -e $DIR_GROUP1/banned.regexpurllist.default ] || mv $DIR_GROUP1/regexpurllist $DIR_GROUP1/regexpurllist.default |
| $SED "s?^[^#]?#&?g" $DIR_GROUP1/bannedregexpurllist # (comment what is not) |
| # Dont filtering files by extension or mime-type (empty list) |
| > $DIR_GROUP1/bannedextensionlist |
| 1343,16 → 1345,17 |
| # block all sites specified only by an IP |
| *ip |
| EOF |
| # Creation of ALCASAR empty banned URLs list (filled later with Toulouse BL --> see BL function) |
| # Creation of file for banned URLs (filled later with Toulouse BL --> see BL function) |
| [ -e $DIR_GROUP1/bannedurllist.default ] || mv $DIR_GROUP1/bannedurllist $DIR_GROUP1/bannedurllist.default |
| cat <<EOF > $DIR_GROUP1/bannedurllist |
| # E2guardian URL filter config for ALCASAR |
| EOF |
| # Creation of files for rehabilited domains and urls |
| # Creation of files for rehabilited domains |
| [ -e $DIR_GROUP1/exceptionsitelist.default ] || mv $DIR_GROUP1/exceptionsitelist $DIR_GROUP1/exceptionsitelist.default |
| [ -e $DIR_GROUP1/exceptionurllist.default ] || mv $DIR_GROUP1/exceptionurllist $DIR_GROUP1/exceptionurllist.default |
| touch $DIR_GROUP1/exceptionsitelist |
| touch $DIR_GROUP1/exceptionurllist |
| # Creation of files for rehabilited IP |
| [ -e $DIR_DG/lists/common/exceptioniplist.default ] || mv $DIR_DG/lists/common/exceptioniplist $DIR_DG/lists/common/exceptioniplist.default |
| touch $DIR_DG/lists/common/exceptioniplist |
| # Add Bing to the safesearch url regext list (parental control) |
| [ -e $DIR_GROUP1/urlregexplist.default ] || cp $DIR_GROUP1/urlregexplist $DIR_GROUP1/urlregexplist.default |
| cat <<EOF >> $DIR_GROUP1/urlregexplist |
| /scripts/alcasar-bl.sh |
|---|
| 58,7 → 58,8 |
| chown root:apache $DIR_CONF/update_cat.conf |
| chmod 660 $DIR_CONF/update_cat.conf |
| fi |
| $SED "/\.Include/d" $DIR_DG_GROUP1/bannedsitelist $DIR_DG_GROUP1/bannedurllist # cleaning for DG |
| $SED "/\.Include/d" $DIR_DG_GROUP1/bannedurllist # cleaning E2G url blacklisted |
| # $SED "/\.Include/d" $DIR_DG_GROUP1/bannedsitelist # cleaning E2G domain blacklisted (now managed by unbound) |
| $SED "s?^[^#]?#&?g" $BL_CATEGORIES $WL_CATEGORIES # cleaning BL & WL categories file (comment all lines) |
| # process the file $BL_CATEGORIES with the choice of categories |
| /scripts/alcasar-conf.sh |
|---|
| 75,18 → 75,14 |
| cp /var/Save/base/"$(ls -1t /var/Save/base|head -1)" $DIR_UPDATE |
| # backup organism logo |
| cp -f $DIR_WEB/images/organisme.png $DIR_UPDATE |
| # backup BL/WL custom files |
| # backup E2D BL/WL custom files |
| mkdir $DIR_UPDATE/custom_bl |
| for i in exceptioniplist urlregexplist exceptionsitelist bannedsitelist exceptionurllist bannedurllist |
| for i in urlregexplist exceptionsitelist bannedurllist |
| do |
| if [ -d /etc/dansguardian ]; then |
| cp /etc/dansguardian/lists/$i $DIR_UPDATE/custom_bl/ # before V3.3 |
| cp -rf /etc/dansguardian/lists/blacklists/ossi-* $DIR_UPDATE/custom_bl/ 2>/dev/null |
| else |
| cp $DIR_E2G/$i $DIR_UPDATE/custom_bl/ # since V3.3 |
| cp -rf $DIR_BLACKLIST/ossi-* $DIR_UPDATE/custom_bl/ 2>/dev/null |
| fi |
| cp $DIR_E2G/group1/$i $DIR_UPDATE/custom_bl/ |
| done |
| cp $DIR_E2G/common/exceptioniplist $DIR_UPDATE/custom_bl/ |
| cp -rf $DIR_BLACKLIST/ossi-* $DIR_UPDATE/custom_bl/ 2>/dev/null |
| # backup conf files (main conf file, filtering, digest, etc.) |
| mkdir $DIR_UPDATE/etc/ |
| cp -rf $DIR_ETC/* $DIR_UPDATE/etc/ |
| 181,12 → 177,10 |
| [ -e $DIR_UPDATE/gammurc ] && cp -f $DIR_UPDATE/gammurc /etc/ # Gammu conf file |
| [ -e $DIR_UPDATE/gammu_smsd_conf ] && cp -f $DIR_UPDATE/gammu_smsd_conf /etc/ # Gammu_smsd conf file |
| # Retrieve BL/WL custom files |
| cp -f $DIR_UPDATE/custom_bl/exceptioniplist $DIR_E2G/ |
| cp -f $DIR_UPDATE/custom_bl/exceptionsitelist $DIR_E2G/ |
| cp -f $DIR_UPDATE/custom_bl/exceptioniplist $DIR_E2G/common/ |
| cp -f $DIR_UPDATE/custom_bl/exceptionsitelist $DIR_E2G/group1/ |
| cp -f $DIR_UPDATE/custom_bl/urlregexplist $DIR_E2G/ |
| cp -f $DIR_UPDATE/custom_bl/bannedsitelist $DIR_E2G/ |
| cp -f $DIR_UPDATE/custom_bl/exceptionurllist $DIR_E2G/ |
| cp -f $DIR_UPDATE/custom_bl/bannedurllist $DIR_E2G/ |
| cp -f $DIR_UPDATE/custom_bl/bannedurllist $DIR_E2G/group1/ |
| cp -rf $DIR_UPDATE/custom_bl/ossi-* $DIR_BLACKLIST/ 2>/dev/null |
| chown -R e2guardian:apache $DIR_E2G |
| chmod -R g+rw $DIR_E2G |
| /scripts/alcasar-iptables.sh |
|---|
| 53,7 → 53,7 |
| SSH_LAN_ADMIN_FROM=${SSH_LAN_ADMIN_FROM:="0.0.0.0"} |
| SSH_LAN_ADMIN_FROM=$([ "$SSH_LAN_ADMIN_FROM" == "0.0.0.0" ] && echo "$PRIVATE_NETWORK_MASK" || echo "$SSH_LAN_ADMIN_FROM" ) |
| IPTABLES="/sbin/iptables" |
| REHABILITED_IP="/etc/e2guardian/lists/group1/exceptioniplist" |
| REHABILITED_IP="/etc/e2guardian/lists/common/exceptioniplist" |
| ALLOWED_SITES="/usr/local/etc/alcasar-site-direct" # WEB Sites allowed for all (no av and no filtering for av_bl users) |
| MULTIWAN=`grep ^MULTIWAN $CONF_FILE|cut -d"=" -f2` |
| PROXY=`grep ^PROXY= $CONF_FILE|cut -d"=" -f2` |
| /scripts/alcasar-uninstall.sh |
|---|
| 105,7 → 105,7 |
| e2guardian () |
| { |
| echo -en "(16) : " |
| echo -en "(15) : " |
| [ -d /var/e2guardian ] && rm -rf /var/e2guardian |
| [ -d /var/dansguardian ] && rm -rf /var/dansguardian |
| if [ -e /etc/systemd/system/e2guardian.service ]; then |
| 124,9 → 124,8 |
| [ -e /etc/e2guardian/lists/greysitelist.default ] && mv /etc/e2guardian/lists/greysitelist.default /etc/e2guardian/lists/greysitelist && echo -n "11, " |
| [ -e /etc/e2guardian/lists/bannedurllist.default ] && mv /etc/e2guardian/lists/bannedurllist.default /etc/e2guardian/lists/bannedurllist && echo -n "12, " |
| [ -e /etc/e2guardian/lists/exceptionsitelist.default ] && mv /etc/e2guardian/lists/exceptionsitelist.default /etc/e2guardian/lists/exceptionsitelist && echo -n "13, " |
| [ -e /etc/e2guardian/lists/exceptionurllist.default ] && mv /etc/e2guardian/lists/exceptionurllist.default /etc/e2guardian/lists/exceptionurllist && echo -n "14, " |
| [ -e /etc/e2guardian/lists/urlregexplist.default ] && mv /etc/e2guardian/lists/urlregexplist.default /etc/e2guardian/lists/urlregexplist && echo -n "15, " |
| [ -e /etc/e2guardian/lists/bannedregexpurllist.default ] && mv -f /etc/e2guardian/lists/bannedregexpurllist.default /etc/e2guardian/lists/bannedregexpurllist && echo -n "16" |
| [ -e /etc/e2guardian/lists/urlregexplist.default ] && mv /etc/e2guardian/lists/urlregexplist.default /etc/e2guardian/lists/urlregexplist && echo -n "14, " |
| [ -e /etc/e2guardian/lists/bannedregexpurllist.default ] && mv -f /etc/e2guardian/lists/bannedregexpurllist.default /etc/e2guardian/lists/bannedregexpurllist && echo -n "15" |
| } |
| antivirus () |
| /scripts/alcasar-url_filter_bl.sh |
|---|
| 12,7 → 12,7 |
| # Enable / disable : filter of urls containing ip address instead of domain name |
| CONF_FILE="/usr/local/etc/alcasar.conf" |
| DIR_DG="/etc/e2guardian/lists" |
| DIR_DG_GROUP1="/etc/e2guardian/lists/group1" |
| UNBOUND_BL_DOMAIN_FILTER_CONF="/etc/unbound/conf.d/blacklist/domainfilter.conf" |
| SED="/bin/sed -i" |
| safesearch="Off" |
| 69,7 → 69,7 |
| if [ "$safesearch" == "On" ] |
| then |
| $SED "s?^#\"?\"?g" $DIR_DG/urlregexplist # on décommente les lignes de regles |
| $SED "s?^#\"?\"?g" $DIR_DG_GROUP1/urlregexplist # on décommente les lignes de regles |
| # add 'SafeSearch' redirection for google searching |
| google_safe_server=`host -ta forcesafesearch.google.com | grep "address" | cut -d" " -f4` # retrieve google forcesafesearch ip |
| 103,7 → 103,7 |
| $SED 's/^BL_SAFESEARCH=.*/BL_SAFESEARCH=on/g' $CONF_FILE |
| elif [ "$safesearch" == "Off" ] |
| then |
| $SED "s?^[^#]?#&?g" $DIR_DG/urlregexplist |
| $SED "s?^[^#]?#&?g" $DIR_DG_GROUP1/urlregexplist |
| [ -e $UNBOUND_BL_DOMAIN_FILTER_CONF ] && rm -f $UNBOUND_BL_DOMAIN_FILTER_CONF |
| $SED 's/^BL_SAFESEARCH=.*/BL_SAFESEARCH=off/g' $CONF_FILE |
| 111,14 → 111,14 |
| if [ "$pureip" == "On" ] |
| then |
| $SED "s/^\#\*ip$/*ip/g" $DIR_DG/bannedsitelist |
| $SED "s/^\#\*ips$/*ips/g" $DIR_DG/bannedsitelist |
| $SED "s/^\#\*ip$/*ip/g" $DIR_DG_GROUP1/bannedsitelist |
| $SED "s/^\#\*ips$/*ips/g" $DIR_DG_GROUP1/bannedsitelist |
| $SED 's/^BL_PUREIP=.*/BL_PUREIP=on/g' $CONF_FILE |
| elif [ "$pureip" == "Off" ] |
| then |
| $SED "s/^\*ip$/#*ip/g" $DIR_DG/bannedsitelist |
| $SED "s/^\*ips$/#*ips/g" $DIR_DG/bannedsitelist |
| $SED "s/^\*ip$/#*ip/g" $DIR_DG_GROUP1/bannedsitelist |
| $SED "s/^\*ips$/#*ips/g" $DIR_DG_GROUP1/bannedsitelist |
| $SED 's/^BL_PUREIP=.*/BL_PUREIP=off/g' $CONF_FILE |
| fi |