github/openNDS
1
1
Fork 0
mirror of https://github.com/openNDS/openNDS.git synced 2026-01-10 04:17:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix - issue #596, Problem with fasremotefqdn that has multiple IPs ( CDN )

Browse Source 
Signed-off-by: Rob White <rob@blue-wave.net>
This commit is contained in:
Rob White
2024-05-27 21:27:32 +01:00
parent be7d5008f7
commit 1cfbf50575
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forward_authentication_service/libs/libopennds.sh
View File

@@ -2001,6 +2001,19 @@ resolve_fqdn() {
continue
fi
done
if [ -z "$fqdnaddress" ]; then
option="gatewayinterface"
get_option_from_config
if [ -z "$gatewayinterface" ]; then
gatewayinterface="br-lan"
fi
ifname="$gatewayinterface"
check_gw_ip
fqdnaddress="$gw_ip"
fi
}
#### end of functions ####

11
src/fw_iptables.c
View File

@@ -198,6 +198,8 @@ iptables_fw_init(void)
t_MAC *pt;
int rc = 0;
char *dnscmd;
char *fqdnip;
char *fqdncmd;
debug(LOG_NOTICE, "Initializing firewall rules");
@@ -298,7 +300,14 @@ iptables_fw_init(void)
// Allow access to remote FAS - CHAIN_OUTGOING and CHAIN_TO_INTERNET packets for remote FAS, ACCEPT
if (config->fas_port != 0) {
if (strcmp(config->fas_remotefqdn, "disabled") != 0) {
rc |= nftables_do_command("add rule ip nds_nat %s ip daddr %s tcp dport %d counter accept", CHAIN_OUTGOING, fas_remotefqdn, fas_port);
fqdncmd = safe_calloc(SMALL_BUF);
safe_snprintf(fqdncmd, SMALL_BUF, "/usr/lib/opennds/libopennds.sh resolve_fqdn \"%s\"", fas_remotefqdn);
fqdnip = safe_calloc(SMALL_BUF);
rc = execute_ret_url_encoded(fqdnip, SMALL_BUF, fqdncmd);
rc |= nftables_do_command("add rule ip nds_nat %s ip daddr %s tcp dport %d counter accept", CHAIN_OUTGOING, fqdnip, fas_port);
free(fqdncmd);
free(fqdnip);
} else {
if (strcmp(config->fas_remoteip, "disabled") != 0) {