| /alcasar.sh |
|---|
| 2072,6 → 2072,7 |
| $SED "s?^PermitRootLogin.*?PermitRootLogin without-password?g" /etc/ssh/sshd_config |
| # ALCASAR conf file |
| echo "HTTPS_LOGIN=on" >> $CONF_FILE |
| echo "HTTPS_CHILLI=off" >> $CONF_FILE |
| echo "SSH=on" >> $CONF_FILE |
| echo "SSH_ADMIN_FROM=0.0.0.0/0.0.0.0" >> $CONF_FILE |
| echo "LDAP=off" >> $CONF_FILE |
| /scripts/alcasar-conf.sh |
|---|
| 172,6 → 172,11 |
| then |
| echo "HTTPS_LOGIN=on" >> $CONF_FILE |
| fi |
| # V3.2.0 |
| # add "HTTPS_CHILLI=off" in conf file |
| if [ $(grep -c "^HTTPS_CHILLI=" $CONF_FILE) == "0" ]; then |
| echo "HTTPS_CHILLI=off" >> $CONF_FILE |
| fi |
| ;; |
| --apply|-apply) |
| PTN="\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/([012]?[0-9]|3[0-2])\b" |
| /scripts/alcasar-https.sh |
|---|
| 30,6 → 30,7 |
| ;; |
| --off | -off) # disable HTTPS |
| $SED "s?^HTTPS_LOGIN=.*?HTTPS_LOGIN=off?" $CONF_FILE |
| $SED "s?^HTTPS_CHILLI=.*?HTTPS_CHILLI=off?" $CONF_FILE |
| $SED "s?uamserver.*?uamserver\thttp://$HOSTNAME.$DOMAIN/intercept.php?" $CHILLI_CONF_FILE |
| /usr/bin/systemctl restart chilli |
| ;; |
| /web/index.php |
|---|
| 49,7 → 49,7 |
| $network_pb = false; // "alcasar-watchdog.sh" changes this value if a network issue is detected |
| $diagnostic = "can't contact the default router"; // "alcasar-watchdog.sh" changes this value if a network issue is detected |
| $certCa_link = (($useHTTPS) ? 'https' : 'http')."://$hostname/certs/certificat_alcasar_ca.crt"; |
| $logout_link = (($useHTTPS) ? 'https' : 'http').'://'.$hostname.':'.(($useHTTPS) ? 3991 : 3990).'/logoff'; |
| $logout_link = ((($conf['HTTPS_CHILLI'] === 'on') && $useHTTPS) ? 'https://'.$hostname.':3991' : 'http://'.$hostname.':3990').'/logoff'; |
| $direct_access = false; |
| $remote_ip = preg_match('#^([0-9]{1,3}\.){3}[0-9]{1,3}$#', $_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : ''; |
| $connection_history = ''; |
| /web/intercept.php |
|---|
| 67,10 → 67,10 |
| $service_SMS_status = false; |
| // Our own path |
| $loginpath = htmlspecialchars($_SERVER['PHP_SELF']); |
| $loginpath = htmlspecialchars($_SERVER['PHP_SELF']); |
| $useHTTPS = ((isset($_SERVER['HTTPS'])) && (!empty($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'] !== 'off')); |
| $alcasarpath = (($conf['HTTPS_LOGIN'] === 'on') ? 'https' : 'http' ).'://'.$conf['HOSTNAME'].'.'.$conf['DOMAIN']; |
| $statuspath = $alcasarpath.'/status.php'; |
| $alcasarpath = (($useHTTPS) ? 'https' : 'http' ).'://'.$conf['HOSTNAME'].'.'.$conf['DOMAIN']; |
| $statuspath = (($conf['HTTPS_CHILLI'] === 'on') ? 'https' : 'http' ).'://'.$conf['HOSTNAME'].'.'.$conf['DOMAIN'].'/status.php'; |
| // Choice of language |
| $Language = 'en'; |
| 398,7 → 398,7 |
| // TODO: clean unused query params |
| $uamip = $conf['HOSTNAME'].'.'.$conf['DOMAIN']; |
| if ($useHTTPS) { |
| if (($conf['HTTPS_CHILLI'] === 'on') && $useHTTPS) { |
| $uamproto = 'https'; |
| $uamport = 3991; |
| } else { |