Browse Source
Merge pull request #13430 from dibdot/trm-2.0
travelmate: update to release 2.0lilik-openwrt-22.03
Dirk Brenken
4 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 1263 additions and 474 deletions
Split View
Diff Options
-
+7 -3net/travelmate/Makefile
-
+128 -103net/travelmate/files/README.md
-
+37 -0net/travelmate/files/chs-hotel.login
-
+53 -0net/travelmate/files/db-bahn.login
-
+37 -0net/travelmate/files/h-hotels.login
-
+2 -10net/travelmate/files/travelmate.conf
-
+120 -17net/travelmate/files/travelmate.init
-
+72 -0net/travelmate/files/travelmate.mail
-
+625 -323net/travelmate/files/travelmate.sh
-
+141 -0net/travelmate/files/travelmate.vpn
-
+31 -0net/travelmate/files/travelmate_ntp.hotplug
-
+10 -18net/travelmate/files/wifionice.login
+ 7
- 3
net/travelmate/Makefile
View File
+ 128
- 103
net/travelmate/files/README.md
View File
+ 37
- 0
net/travelmate/files/chs-hotel.login
View File
| @ -0,0 +1,37 @@ | |||
| #!/bin/sh | |||
| # captive portal auto-login script for german chs hotels | |||
| # Copyright (c) 2020 Dirk Brenken (dev@brenken.org) | |||
| # This is free software, licensed under the GNU General Public License v3. | |||
| domain="hotspot.internet-for-guests.com" | |||
| cmd="$(command -v curl)" | |||
| # curl check | |||
| # | |||
| if [ ! -x "${cmd}" ] | |||
| then | |||
| exit 1 | |||
| fi | |||
| # initial get request to receive & extract valid security tokens | |||
| # | |||
| "${cmd}" "https://${domain}/logon/cgi/index.cgi" -c "/tmp/${domain}.cookie" -s -o /dev/null | |||
| if [ -r "/tmp/${domain}.cookie" ] | |||
| then | |||
| lg_id="$(awk '/LGNSID/{print $7}' "/tmp/${domain}.cookie")" | |||
| ta_id="$(awk '/ta_id/{print $7}' "/tmp/${domain}.cookie")" | |||
| cl_id="$(awk '/cl_id/{print $7}' "/tmp/${domain}.cookie")" | |||
| rm -f "/tmp/${domain}.cookie" | |||
| else | |||
| exit 2 | |||
| fi | |||
| # final post request/login with valid session cookie/security token | |||
| # | |||
| if [ -n "${lg_id}" ] && [ -n "${ta_id}" ] && [ -n "${cl_id}" ] | |||
| then | |||
| "${cmd}" "https://${domain}/logon/cgi/index.cgi" -H "Referer: https://${domain}/logon/cgi/index.cgi" -H "Cookie: LGNSID=${lg_id}; lang=en_US; use_mobile_interface=0; ta_id=${ta_id}; cl_id=${cl_id}" -H 'Connection: keep-alive' --data 'accept_termsofuse=&freeperperiod=1&device_infos=1125:2048:1152:2048' -s -o /dev/null | |||
| else | |||
| exit 3 | |||
| fi | |||
+ 53
- 0
net/travelmate/files/db-bahn.login
View File
| @ -0,0 +1,53 @@ | |||
| #!/bin/sh | |||
| # captive portal auto-login script for german DB hotspots via portal login API | |||
| # Copyright (c) 2020 Dirk Brenken (dev@brenken.org) | |||
| # This is free software, licensed under the GNU General Public License v3. | |||
| trm_fetch="$(command -v curl)" | |||
| trm_domain="wifi.bahn.de" | |||
| trm_useragent="$(uci_get travelmate global trm_useragent "Mozilla/5.0 (Linux x86_64; rv:80.0) Gecko/20100101 Firefox/80.0")" | |||
| trm_maxwait="$(uci_get travelmate global trm_maxwait "30")" | |||
| # initial get request to receive all header information | |||
| # | |||
| "${trm_fetch}" -A "${trm_useragent}" "https://${trm_domain}" -si > "/tmp/${trm_domain}.cookie" | |||
| # extract the session cookie and the hotspot location | |||
| # | |||
| if [ -s "/tmp/${trm_domain}.cookie" ] | |||
| then | |||
| php_token="$(awk 'BEGIN{FS="[ ;]"}/^Set-Cookie:/{print $2}' "/tmp/${trm_domain}.cookie")" | |||
| location="$(awk '/^Location:/{print $2}' "/tmp/${trm_domain}.cookie")" | |||
| rm -f "/tmp/${trm_domain}.cookie" | |||
| else | |||
| exit 2 | |||
| fi | |||
| # post request to subscribe to the portal API | |||
| # | |||
| if [ -n "${php_token}" ] && [ -n "${location}" ] | |||
| then | |||
| "${trm_fetch}" -A "${trm_useragent}" "https://${trm_domain}/portal_api.php" -H "Connection: keep-alive" -H "Referer: ${location}" -H "Cookie: ${php_token}" --data "action=subscribe&type=one&connect_policy_accept=false&user_login=&user_password=&user_password_confirm=&email_address=&prefix=&phone=&policy_accept=false&gender=&interests=" -si > "/tmp/${trm_domain}.cookie" | |||
| else | |||
| exit 3 | |||
| fi | |||
| # extract additional login and password information from the portal API | |||
| # | |||
| if [ -s "/tmp/${trm_domain}.cookie" ] | |||
| then | |||
| login="$(awk 'BEGIN{FS="[\"]"}/^\{\"info/{print $12}' "/tmp/${trm_domain}.cookie")" | |||
| password="$(awk 'BEGIN{FS="[\"]"}/^\{\"info/{print $16}' "/tmp/${trm_domain}.cookie")" | |||
| rm -f "/tmp/${trm_domain}.cookie" | |||
| else | |||
| exit 4 | |||
| fi | |||
| # final post request to authenticate to the portal API | |||
| # | |||
| if [ -n "${login}" ] && [ -n "${password}" ] | |||
| then | |||
| "${trm_fetch}" -A "${trm_useragent}" "https://${trm_domain}/portal_api.php" -H "Connection: keep-alive" -H "Referer: ${location}" -H "Cookie: ${php_token}" --data "action=authenticate&login=${login}&password=${password}&policy_accept=false&from_ajax=true&wispr_mode=false" | |||
| else | |||
| exit 5 | |||
| fi | |||
+ 37
- 0
net/travelmate/files/h-hotels.login
View File
| @ -0,0 +1,37 @@ | |||
| #!/bin/sh | |||
| # captive portal auto-login script for Telekom hotspots in german h+hotels | |||
| # Copyright (c) 2020 Dirk Brenken (dev@brenken.org) | |||
| # This is free software, licensed under the GNU General Public License v3. | |||
| domain="hotspot.t-mobile.net" | |||
| cmd="$(command -v curl)" | |||
| # curl check | |||
| # | |||
| if [ ! -x "${cmd}" ] | |||
| then | |||
| exit 1 | |||
| fi | |||
| # initial get request to receive & extract valid security tokens | |||
| # | |||
| "${cmd}" "https://${domain}/wlan/rest/freeLogin" -c "/tmp/${domain}.cookie" -s -o /dev/null | |||
| if [ -r "/tmp/${domain}.cookie" ] | |||
| then | |||
| ses_id="$(awk '/JSESSIONID/{print $7}' "/tmp/${domain}.cookie")" | |||
| sec_id="$(awk '/DT_H/{print $7}' "/tmp/${domain}.cookie")" | |||
| dev_id="$(sha256sum /etc/config/wireless | awk '{printf "%s",substr($1,1,13)}')" | |||
| rm -f "/tmp/${domain}.cookie" | |||
| else | |||
| exit 2 | |||
| fi | |||
| # final post request/login with valid session cookie/security token | |||
| # | |||
| if [ -n "${ses_id}" ] && [ -n "${sec_id}" ] && [ -n "${dev_id}" ] | |||
| then | |||
| "${cmd}" "https://${domain}/wlan/rest/freeLogin" -H "Referer: https://${domain}/TD/hotspot/H_Hotels/en_GB/index.html" -H "Cookie: JSESSIONID=${ses_id}; DT_DEV_ID=${dev_id}; DT_H=${sec_id}" -H 'Connection: keep-alive' --data "rememberMe=true" -s -o /dev/null | |||
| else | |||
| exit 3 | |||
| fi | |||
+ 2
- 10
net/travelmate/files/travelmate.conf
View File
+ 120
- 17
net/travelmate/files/travelmate.init
View File
+ 72
- 0
net/travelmate/files/travelmate.mail
View File
| @ -0,0 +1,72 @@ | |||
| #!/bin/sh | |||
| # send mail script for travelmate notifications | |||
| # Copyright (c) 2020 Dirk Brenken (dev@brenken.org) | |||
| # This is free software, licensed under the GNU General Public License v3. | |||
| # set (s)hellcheck exceptions | |||
| # shellcheck disable=1091,2016,2039,2059,2086,2143,2181,2188 | |||
| # Please note: you have to setup the package 'msmtp' before using this script | |||
| LC_ALL=C | |||
| PATH="/usr/sbin:/usr/bin:/sbin:/bin" | |||
| . "/lib/functions.sh" | |||
| trm_debug="$(uci_get travelmate global trm_debug "0")" | |||
| trm_mailsender="$(uci_get travelmate global trm_mailsender "no-reply@travelmate")" | |||
| trm_mailreceiver="$(uci_get travelmate global trm_mailreceiver)" | |||
| trm_mailprofile="$(uci_get travelmate global trm_mailprofile "trm_notify")" | |||
| trm_mail="$(command -v msmtp)" | |||
| trm_rtfile="$(uci_get travelmate global trm_rtfile "/tmp/trm_runtime.json")" | |||
| trm_logger="$(command -v logger)" | |||
| trm_rc=1 | |||
| f_log() | |||
| { | |||
| local class="${1}" log_msg="${2}" | |||
| if [ -x "${trm_logger}" ] | |||
| then | |||
| "${trm_logger}" -p "${class}" -t "trm-mail [${$}]" "${log_msg}" | |||
| else | |||
| printf "%s %s %s\\n" "${class}" "trm-mail [${$}]" "${log_msg}" | |||
| fi | |||
| } | |||
| if [ -z "${trm_mailreceiver}" ] | |||
| then | |||
| f_log "err" "please set the mail receiver with the 'trm_mailreceiver' option" | |||
| exit ${trm_rc} | |||
| fi | |||
| if [ "${trm_debug}" -eq 1 ] | |||
| then | |||
| debug="--debug" | |||
| fi | |||
| # info preparation | |||
| # | |||
| sys_info="$(strings /etc/banner 2>/dev/null; ubus call system board | sed -e 's/\"release\": {//' | sed -e 's/^[ \t]*//' | sed -e 's/[{}\",]//g' | sed -e 's/[ ]/ \t/' | sed '/^$/d' 2>/dev/null)" | |||
| trm_info="$(/etc/init.d/travelmate status 2>/dev/null)" | |||
| sta_info="$(jsonfilter -i "${trm_rtfile}" -l1 -e '@.data.station_id')" | |||
| trm_mailtopic="$(uci_get travelmate global trm_mailtopic "travelmate connection to '${sta_info}'")" | |||
| trm_mailhead="From: ${trm_mailsender}\\nTo: ${trm_mailreceiver}\\nSubject: ${trm_mailtopic}\\nReply-to: ${trm_mailsender}\\nMime-Version: 1.0\\nContent-Type: text/html; charset=UTF-8\\nContent-Disposition: inline\\n\\n" | |||
| # mail body | |||
| # | |||
| trm_mailtext="<html><body><pre style='display:block;font-family:monospace;font-size:1rem;padding:20;background-color:#f3eee5;white-space:pre'>" | |||
| trm_mailtext="${trm_mailtext}\\n<strong>++\\n++ System Information ++\\n++</strong>\\n${sys_info}" | |||
| trm_mailtext="${trm_mailtext}\\n\\n<strong>++\\n++ Travelmate Information ++\\n++</strong>\\n${trm_info}" | |||
| trm_mailtext="${trm_mailtext}</pre></body></html>" | |||
| # send mail | |||
| # | |||
| if [ -x "${trm_mail}" ] | |||
| then | |||
| printf "%b" "${trm_mailhead}${trm_mailtext}" 2>/dev/null | "${trm_mail}" ${debug} -a "${trm_mailprofile}" "${trm_mailreceiver}" >/dev/null 2>&1 | |||
| trm_rc=${?} | |||
| f_log "info" "mail sent to '${trm_mailreceiver}' with rc '${trm_rc}'" | |||
| else | |||
| f_log "err" "msmtp mail daemon not found" | |||
| fi | |||
| exit ${trm_rc} | |||
+ 625
- 323
net/travelmate/files/travelmate.sh
File diff suppressed because it is too large
View File
+ 141
- 0
net/travelmate/files/travelmate.vpn
View File
| @ -0,0 +1,141 @@ | |||
| #!/bin/sh | |||
| # vpn switch for travelmate | |||
| # Copyright (c) 2020 Dirk Brenken (dev@brenken.org) | |||
| # This is free software, licensed under the GNU General Public License v3. | |||
| # set (s)hellcheck exceptions | |||
| # shellcheck disable=1091,2016,2039,2059,2086,2143,2181,2188 | |||
| # Please note: you have to setup the package 'wireguard' or 'openvpn' before using this script | |||
| LC_ALL=C | |||
| PATH="/usr/sbin:/usr/bin:/sbin:/bin" | |||
| . "/lib/functions.sh" | |||
| trm_action="${1}" | |||
| trm_vpnservice="$(uci_get travelmate global trm_vpnservice)" | |||
| trm_vpniface="$(uci_get travelmate global trm_vpniface)" | |||
| trm_landevice="$(uci_get travelmate global trm_landevice)" | |||
| trm_maxwait="$(uci_get travelmate global trm_maxwait "30")" | |||
| trm_captiveurl="$(uci_get travelmate global trm_captiveurl "http://captive.apple.com")" | |||
| trm_useragent="$(uci_get travelmate global trm_useragent "Mozilla/5.0 (Linux x86_64; rv:80.0) Gecko/20100101 Firefox/80.0")" | |||
| trm_iptrule_accept="FORWARD -i ${trm_landevice} -p tcp --match multiport --dports 80,443 -j ACCEPT" | |||
| trm_iptrule_drop="FORWARD -i ${trm_landevice} -j DROP" | |||
| trm_iptables="$(command -v iptables)" | |||
| trm_logger="$(command -v logger)" | |||
| trm_fetch="$(command -v curl)" | |||
| f_log() | |||
| { | |||
| local class="${1}" log_msg="${2}" | |||
| if [ -x "${trm_logger}" ] | |||
| then | |||
| "${trm_logger}" -p "${class}" -t "trm-vpn [${$}]" "${log_msg}" | |||
| else | |||
| printf "%s %s %s\\n" "${class}" "trm-vpn [${$}]" "${log_msg}" | |||
| fi | |||
| } | |||
| f_net() | |||
| { | |||
| local IFS json_raw json_rc result="net nok" | |||
| json_raw="$(${trm_fetch} --user-agent "${trm_useragent}" --referer "http://www.example.com" --write-out "%{json}" --silent --show-error --connect-timeout $((trm_maxwait/10)) "${trm_captiveurl}" 2>/dev/null)" | |||
| json_raw="${json_raw#*\{}" | |||
| if [ -n "${json_raw}" ] | |||
| then | |||
| json_rc="$(printf "%s" "{${json_raw}" | jsonfilter -l1 -e '@.response_code' 2>/dev/null)" | |||
| if [ "${json_rc}" = "200" ] || [ "${json_rc}" = "204" ] | |||
| then | |||
| result="net ok" | |||
| fi | |||
| fi | |||
| printf "%s" "${result}" | |||
| } | |||
| if [ -n "${trm_vpnservice}" ] && [ -n "${trm_vpniface}" ] && [ -n "${trm_landevice}" ] && [ -f "/tmp/trm_runtime.json" ] | |||
| then | |||
| status="$(jsonfilter -i "/tmp/trm_runtime.json" -l1 -e '@.data.travelmate_status' 2>/dev/null)" | |||
| vpn_status="$(ubus -S call network.interface."${trm_vpniface}" status 2>/dev/null | jsonfilter -l1 -e '@.up')" | |||
| if [ "${trm_action}" = "disable" ] && [ "${vpn_status}" = "true" ] | |||
| then | |||
| if [ -n "$("${trm_iptables}" "-w $((trm_maxwait/6))" -C ${trm_iptrule_drop} 2>&1)" ] | |||
| then | |||
| "${trm_iptables}" "-w $((trm_maxwait/6))" -I ${trm_iptrule_drop} 2>&1 | |||
| f_log "info" "lan forward blocked for device '${trm_landevice}'" | |||
| fi | |||
| if [ "${status%% (net cp *}" = "connected" ] | |||
| then | |||
| if [ -n "$("${trm_iptables}" "-w $((trm_maxwait/6))" -C ${trm_iptrule_accept} 2>&1)" ] | |||
| then | |||
| "${trm_iptables}" "-w $((trm_maxwait/6))" -I ${trm_iptrule_accept} 2>&1 | |||
| f_log "info" "lan forward on ports 80/443 freed for device '${trm_landevice}'" | |||
| fi | |||
| fi | |||
| fi | |||
| case "${trm_vpnservice}" in | |||
| "wireguard") | |||
| if [ "${trm_action}" = "enable" ] && [ "${vpn_status}" != "true" ] | |||
| then | |||
| ubus call network.interface."${trm_vpniface}" up | |||
| elif [ "${trm_action}" = "disable" ] && [ "${vpn_status}" = "true" ] | |||
| then | |||
| ubus call network.interface."${trm_vpniface}" down | |||
| f_log "info" "${trm_vpnservice} client connection disabled" | |||
| fi | |||
| ;; | |||
| "openvpn") | |||
| if [ "${trm_action}" = "enable" ] && [ "${vpn_status}" != "true" ] | |||
| then | |||
| ubus call network.interface."${trm_vpniface}" up | |||
| /etc/init.d/openvpn restart >/dev/null 2>&1 | |||
| elif [ "${trm_action}" = "disable" ] && [ "${vpn_status}" = "true" ] | |||
| then | |||
| ubus call network.interface."${trm_vpniface}" down | |||
| /etc/init.d/openvpn stop >/dev/null 2>&1 | |||
| f_log "info" "${trm_vpnservice} client connection disabled" | |||
| fi | |||
| ;; | |||
| esac | |||
| if [ "${trm_action}" = "enable" ] && [ "${vpn_status}" != "true" ] | |||
| then | |||
| cnt=0 | |||
| while true | |||
| do | |||
| vpn_status="$(ubus -S call network.interface."${trm_vpniface}" status 2>/dev/null | jsonfilter -l1 -e '@.up')" | |||
| if [ "${vpn_status}" = "true" ] | |||
| then | |||
| net_status="$(f_net)" | |||
| if [ "${net_status}" = "net ok" ] | |||
| then | |||
| f_log "info" "${trm_vpnservice} client connection enabled" | |||
| if [ -z "$("${trm_iptables}" "-w $((trm_maxwait/6))" -C ${trm_iptrule_drop} 2>&1)" ] | |||
| then | |||
| "${trm_iptables}" "-w $((trm_maxwait/6))" -D ${trm_iptrule_drop} 2>&1 | |||
| if [ -z "$("${trm_iptables}" "-w $((trm_maxwait/6))" -C ${trm_iptrule_accept} 2>&1)" ] | |||
| then | |||
| "${trm_iptables}" "-w $((trm_maxwait/6))" -D ${trm_iptrule_accept} 2>&1 | |||
| fi | |||
| f_log "info" "lan forward freed for device '${trm_landevice}'" | |||
| fi | |||
| if [ -f "/etc/init.d/sysntpd" ] | |||
| then | |||
| /etc/init.d/sysntpd restart >/dev/null 2>&1 | |||
| fi | |||
| break | |||
| fi | |||
| fi | |||
| if [ "${cnt}" -ge "$((trm_maxwait/6))" ] | |||
| then | |||
| f_log "info" "${trm_vpnservice} restart failed, lan forward for device '${trm_landevice}' still blocked" | |||
| ubus call network.interface."${trm_vpniface}" down | |||
| break | |||
| fi | |||
| sleep 1 | |||
| cnt="$((cnt+1))" | |||
| done | |||
| fi | |||
| fi | |||
+ 31
- 0
net/travelmate/files/travelmate_ntp.hotplug
View File
| @ -0,0 +1,31 @@ | |||
| #!/bin/sh | |||
| # ntp hotplug script for travelmate | |||
| # Copyright (c) 2020 Dirk Brenken (dev@brenken.org) | |||
| # This is free software, licensed under the GNU General Public License v3. | |||
| # set (s)hellcheck exceptions | |||
| # shellcheck disable=1091,2016,2039,2059,2086,2143,2181,2188 | |||
| trm_init="/etc/init.d/travelmate" | |||
| trm_ntpfile="/var/state/travelmate.ntp" | |||
| trm_logger="$(command -v logger)" | |||
| f_log() | |||
| { | |||
| local class="${1}" log_msg="${2}" | |||
| if [ -x "${trm_logger}" ] | |||
| then | |||
| "${trm_logger}" -p "${class}" -t "trm-ntp [${$}]" "${log_msg}" | |||
| else | |||
| printf "%s %s %s\\n" "${class}" "trm-ntp [${$}]" "${log_msg}" | |||
| fi | |||
| } | |||
| if [ "${ACTION}" = "stratum" ] && [ ! -f "${trm_ntpfile}" ] && \ | |||
| [ "$("${trm_init}" enabled; printf "%u" ${?})" -eq "0" ] | |||
| then | |||
| > "${trm_ntpfile}" | |||
| f_log "info" "get ntp time sync" | |||
| "${trm_init}" restart | |||
| fi | |||