Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge of testing in preparation for release 1.5.0 #2

Merged
merged 25 commits into from
Dec 17, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Warn on Nord firewall and ALLOW_LIST
  • Loading branch information
tmknight committed Dec 11, 2022
commit ae4deee2b22b93d98513b3f4f7eb4bd3e17abfa4
10 changes: 9 additions & 1 deletion nordvpn_start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,15 @@ fi
## Not sure about wanting to include this
## Seems prudent as these are non-VPN connections
## WIP
[[ "${FIREWALL:-false}" == "false" ]] && 40-allowlist
if [[ -n ${ALLOW_LIST} ]]
then
if [[ "${FIREWALL:-false}" == "false" ]]
then
40-allowlist
else
echo -e $(date "+%F %T%z") "\tWARNING\tNordVPN firewall use overrides ALLOW_LIST; ALLOW_LIST will not be honored"
fi
fi

## Expose private key with Wireguard
if [ $(which wg) ]
Expand Down
9 changes: 5 additions & 4 deletions scripts/nord_config
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash

shopt -s nocasematch
## Client information
nordvpn version | grep -Eiv "new feature"

Expand All @@ -9,17 +10,17 @@ nordvpn version | grep -Eiv "new feature"
[[ -n ${OBFUSCATE} ]] && nordvpn set obfuscate ${OBFUSCATE} | grep -Eiv -f /opt/inv-grep
[[ -n ${PROTOCOL} ]] && nordvpn set protocol ${PROTOCOL} | grep -Eiv -f /opt/inv-grep
nordvpn set technology ${TECHNOLOGY:-NordLynx} | grep -Eiv -f /opt/inv-grep
nordvpn set firewall ${FIREWALL:-false} | grep -Eiv -f /opt/inv-grep
## NordVPN firewall disabled by default
[[ -z ${FIREWALL} ]] && FIREWALL=false
nordvpn set firewall ${FIREWALL} | grep -Eiv -f /opt/inv-grep
## Firewall must be enabled to enable killswitch
## Be warned that NordVPn firewall = true breaks ALLOW_LIST
shopt -s nocasematch
if [[ "${FIREWALL:-false}" == "true" ]]
if [[ "${FIREWALL}" == "true" ]]
then
if [[ -n ${KILLSWITCH} ]]
then
nordvpn set killswitch ${KILLSWITCH} | grep -Eiv -f /opt/inv-grep
fi
[[ -n ${ALLOW_LIST} ]] && echo -e $(date "+%F %T%z") "\tWARNING\tNordVPN firewall use overrides ALLOW_LIST; ALLOW_LIST will not be honored"
fi

[[ -n ${PORTS} ]] && for port in ${PORTS//[;,]/ }
Expand Down