diff options
| author | nachoparker <nacho@ownyourbits.com> | 2021-05-11 17:13:19 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2021-05-13 06:49:42 +0300 |
| commit | 1a8ac71543ec827e18bee632dd32e40a6fc21070 (patch) | |
| tree | 1ca6e5ca41fdde8db264a7ce5f98c1cfb0ecece6 | |
| parent | bd0c23d9f98affa2d12d264f4d8b6f43de0fb453 (diff) | |
ncp-web: fix port checkingv1.36.2
Signed-off-by: nachoparker <nacho@ownyourbits.com>
| -rw-r--r-- | bin/ncp-diag | 14 | ||||
| -rw-r--r-- | changelog.md | 6 |
2 files changed, 13 insertions, 7 deletions
diff --git a/bin/ncp-diag b/bin/ncp-diag index ef0d879c..b7d65e26 100644 --- a/bin/ncp-diag +++ b/bin/ncp-diag @@ -64,15 +64,19 @@ echo "internet check|$( ping -W 2 -w 1 -q github.com &>/dev/null && echo ok || e function is_port_open() { - local PORT=$1 + local port=$1 + local public_ip + public_ip="$(curl icanhazip.com 2>/dev/null)" || { echo "closed"; return 1; } + local tmp_file=$(mktemp) - local v=$(wget -T2 -t1 -q --keep-session-cookies --save-cookies $tmp_file https://portchecker.co -O - | grep -oP "_csrf\" value=\"\K.*\"") - if [[ "$v" != "" ]]; then - wget -T2 -t1 -q --load-cookies $tmp_file https://portchecker.co --post-data "port=$PORT&_csrf=${v::-1}" -O - \ + local token=$(wget -T2 -t1 -qO- --keep-session-cookies --save-cookies $tmp_file https://portchecker.co | grep -oP "_csrf\" value=\"\K.*\"") + rm $tmp_file + + if [[ "${token}" != "" ]]; then + wget -T2 -t1 -qO- --load-cookies $tmp_file https://portchecker.co --post-data "target_ip=${public_ip}&port=${port}&_csrf=${token::-1}" \ | grep -q '<span class="green">open</span>' && { echo "open"; return 1; } fi echo "closed" - rm $tmp_file } echo "port check 80|$( is_port_open 80 )" diff --git a/changelog.md b/changelog.md index 7763b2d2..ea0d65b3 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,9 @@ -[v1.36.1](https://github.com/nextcloud/nextcloudpi/commit/8e7579d) (2021-05-09) lamp: allow only TLSv12 and TLSv13 +[v1.36.2](https://github.com/nextcloud/nextcloudpi/commit/fccc04c) (2021-05-11) ncp-web: fix port checking -[v1.36.0](https://github.com/nextcloud/nextcloudpi/commit/24b6018) (2020-09-16) Namecheap dynamic DNS client +[v1.36.1](https://github.com/nextcloud/nextcloudpi/commit/c7f2939) (2021-05-09) lamp: allow only TLSv12 and TLSv13 + +[v1.36.0 ](https://github.com/nextcloud/nextcloudpi/commit/24b6018) (2020-09-16) Namecheap dynamic DNS client [v1.35.2 ](https://github.com/nextcloud/nextcloudpi/commit/bfab195) (2021-04-29) ncp-web: fix display of big files for 32 bit |