From 94d205bd598026ba923b790920220ab547a9431a Mon Sep 17 00:00:00 2001 From: pucherot Date: Thu, 22 Apr 2021 22:03:48 +0200 Subject: [PATCH] Pi.Alert 3.01 #106 --- back/pialert.py | 12 +++++++++--- install/pialert_install.sh | 3 ++- tar/pialert_3.00.tar | Bin 58634240 -> 58634240 bytes tar/pialert_latest.tar | Bin 58634240 -> 58634240 bytes 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/back/pialert.py b/back/pialert.py index 3399b59c..1ba3cc61 100644 --- a/back/pialert.py +++ b/back/pialert.py @@ -586,11 +586,17 @@ def save_scanned_devices (p_arpscan_devices, p_cycle_interval): VALUES (?, 'Internet', ?, Null, 'queryDNS') """, (cycle, internet_IP) ) # #76 Add Local MAC of default local interface - #local_mac_cmd = ["bash -lc ifconfig `ip route list default | awk {'print $5'}` | grep ether | awk '{print $2}'"] - local_mac_cmd = ["/sbin/ifconfig `ip route list default | sort -nk11 | head -1 | awk {'print $5'}` | grep ether | awk '{print $2}'"] + # BUGFIX #106 - Device that pialert is running + # local_mac_cmd = ["bash -lc ifconfig `ip route list default | awk {'print $5'}` | grep ether | awk '{print $2}'"] + # local_mac_cmd = ["/sbin/ifconfig `ip route list default | sort -nk11 | head -1 | awk {'print $5'}` | grep ether | awk '{print $2}'"] + local_mac_cmd = ["/sbin/ifconfig `ip -o route get 1 | sed 's/^.*dev \([^ ]*\).*$/\1/;q'` | grep ether | awk '{print $2}'"] local_mac = subprocess.Popen (local_mac_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0].strip() + + # local_dev_cmd = ["ip -o route get 1 | sed 's/^.*dev \([^ ]*\).*$/\1/;q'"] + # local_dev = subprocess.Popen (local_dev_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0].strip() - local_ip_cmd = ["ip route list default | awk {'print $7'}"] + # local_ip_cmd = ["ip route list default | awk {'print $7'}"] + local_ip_cmd = ["ip -o route get 1 | sed 's/^.*src \([^ ]*\).*$/\1/;q'"] local_ip = subprocess.Popen (local_ip_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0].strip() sql.execute ("INSERT INTO CurrentScan (cur_ScanCycle, cur_MAC, cur_IP, cur_Vendor, cur_ScanMethod) "+ diff --git a/install/pialert_install.sh b/install/pialert_install.sh index 04165b1b..9518f2f8 100644 --- a/install/pialert_install.sh +++ b/install/pialert_install.sh @@ -23,7 +23,8 @@ LOG="pialert_install_`date +"%Y-%m-%d_%H-%M"`.log" - MAIN_IP=`ip -o route get 1 | sed -n 's/.*src \([0-9.]\+\).*/\1/p'` + # MAIN_IP=`ip -o route get 1 | sed -n 's/.*src \([0-9.]\+\).*/\1/p'` + MAIN_IP=`ip -o route get 1 | sed -n 's/^.*src \([^ ]*\).*$/\1/;q'` PIHOLE_INSTALL=false PIHOLE_ACTIVE=false diff --git a/tar/pialert_3.00.tar b/tar/pialert_3.00.tar index 1ee094e15265a822d268df9a4c4dd7d52e52bdd7..8fbab3a95dfe02e77e1791eb695984662fc8bab1 100644 GIT binary patch delta 4643 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 diff --git a/tar/pialert_latest.tar b/tar/pialert_latest.tar index 1ee094e15265a822d268df9a4c4dd7d52e52bdd7..8fbab3a95dfe02e77e1791eb695984662fc8bab1 100644 GIT binary patch delta 4643 zcmaLbbx@T38i#RV4Ge5l#8_DsMFf_z3l+o$TS^2}6j3P?yIWVq#_sOM?(XjH?l|A; zoOjNgbLO41GuLOHo!#f2=bz{I$35`wcZY#$-H?oh&F(&)8O&bpUhbaW9v<#q8QjfY zW>23CM)y>6XzeJAmDQgOna|g+Vl*gYm9 zHab4h7?WU(Pl}6+iR+ln_}9l|v|MPKl;vOFOcwt@izP6yNa|V_d%L1e32tGo&Qa0H z#*i|>Va8DBkg~4MCEY^IZdH0XS&V^Z%k{v%_WvAZGRAg`jED`_pTi@&Mj5LagB?>> zx!4zS`@cgRL;v?~jdU<*isfry2P=~$G$GssdGzYNnd27OJIcrCO^t zs;vrEAu3dbsc_X!MX2^FQbnm~)j@Ssom7nKth%UJ)m6o*ZmPTLq2g77N>oWIS@l%C zRBzQs^;P{;it4WhsDWyb8mxw>p=y{Ku12VlYLptS#;CDsoEontsEKNlnyf5pikhmX zsZ=#x%}_JdEHzurQFB$Any2Qg1!|#Mq!z0sYN=YLma7$NrCOy{t2Jt^TBp{l4Qiv> zq&BN9YOC6&wyPa#r`n}YL;Y00)Nl1?jNbhT3ar5Z86gv7hAdzMSs@!_ha6xF zIUyJ1hCGlL@WET6`&$ig33?@szNoW4mF@A)B<0q4RxR{_<=vvg8--x4WJ=3g2vDU znnEB1K{IF$EubZ|g4WOm+CngdKq!PkIJAQZXb+JP1<}v}IzlIifzHqcVxcRH=nn&6APj=RFa(CeFc=OaU?hx!(J%(a!Z;WY6JR1t zg2`ZkDKHhLK`Km#888!O!EBfVb0H1p!F*T%3t=06KsYpuobq!cGv+sVHfO%J&+E2VIS;=18@)y!C^Q8N8uP8hZArTPQht7183nJ zoQDf=5iY@HxB^$<8eE4Pa1(C9ZMXw>;U3(F2k;Oc!DDy=PvIFnhZpb?Ucqa418?CS zyoV3)5kA3Z_yS+y8+?Z!@DqN)Z}?-SID!dELMbQ>PEZEQf-{r@7bp*|;0Eqs z1`qHAFYpE*r~nnA5>$pNP!*~{b*KR~p%(Z;ZKwlv!4LeQ9t1#rXaEhN5j2J-&=dk8 z2%152XaOyu6|{yn&=!Ir1VSMU!l4~RKzoRUD2Rp*&=ER840MJr5DQ%)4!S{i=mGJN z0Ev(U$!v@$0 zn_x3+fvvC&w!;qC3ARSe#0MY9e)O0Sb;SdAR}ag%#a0aAS+~p?2rR&At&U5+>i(I zLO#e3c2EEcLLsn+!r%Z!pePiB;$Val;0Put38kPkI6)aG3(imuT%bI-f*ZJl89cxf zyucfLpaN8cN>CZ9Kvk#))u9H|gj(PWwV@8w1wZhIdJq8hp#e06M$j0VKvM{WAZP~7 zp#`*rR?r&SKwAig5D0}Z2#0nM0qr3Yq97VNKu72VG0+*hKrD2HIOqo5p$Ei60wh8b zBtuW=1-+pU^fjdG_%rnMwfFMz`1hv9+w7@LjgOay_kV6`=8jDj;pn`~n1sEtICY}QautiWoEYiThz!n<|Q53sSP_eN)P_YBMySo#+ zTkk*L?!)}X8e>22^{^5i{B%lC>4{d3Mw7{y&15#3jUFa1FSAcJqseUY^v>pNOf^OM zN2gd={M(Y_Qjmp9id{%-ihZbS%BGN*l=-1?DYg+dDZj%4x6TNUoRw^8muQzY-Y&~R zSt^6FQrT4wl~Y+O8#w;6;s7k2~|=# zt5T}8a#3ZJt17G9R5?{%RZtaGB~@9ut18NZM{-Z`DWjRsB?dH9!qiv1*VStcIweYM6>s z!&ST*p+>3%HA;-~sD)~gN>hu~617wWDh3j;Z77ggU8CsnhC=I;+m9^Xh`Ss4l6?>WaFm zuBq$lhPtV4soUy~x~uM~`|5#us2-`u>WO-)o~h^Rg?g#7)GPH`y-{z~JM~_DP#@JN z^;vyUU)4ADUHwo$)i3p1{ZW6_zsdUhNeV2%09KG4azIY71{=r)wvZd_AP?k)e2^as zfISq1LQoirKv8f2M{t5-P#j7?NpOZzP#RpI47fsBaD#GC9x6aZs05Y49jbs4OyB{Y zU3B4c&dP5)R3;m!!41j?U z3xi-V41u9A4B}uo#KQ;}2?;O?MnfWufw3?S#=``d2$NtkOo6E|4U%9w%z$J_ftfH1 zWfw?db=EDM52#X*M7Q+%)3d>+QtbmoU3Rc4!SPSc5J#2uDunE#(Gi-sakOA9Z zJM4g+unTs>9@q=}U_WHS0XPVU;4mD4qi_t4!wEPEr{FZ4fwOQ9&cg+`2$$e8T!E`_ z4X(otxCyu5Hr#=`a1ZXo19%9J;4wUbr|=A(!wYx`S?~&8!y9-D@8CUrfRFGAKEoII z3g6&6{D7bE3x2~N_zV9mwEiqLSb!xMzzVWM4#)}CU<0|p7IK3fUoN`niO0aqvsZcq-&Lj|Y^m7p@XLlrQB2|U0P%-{vy z-~&~m8dQfGP!noFZKwmjP#65bAL>DUXaE5a2n`_!8bM=d0!^VA1VadfLKuWY1T=>h z&=OifB(#P$&=%T36tss9&=ER8G<1e8&=tBtcjy5M+DKHhLK@v=d8ITMqFcW6MY)FMU zFc;>*d{_VrVG*RkVpsx8VHqrk6|fRk!D?6oYhfL%hYhe1HbFXUhApraGGH5QhaIpJ zcEN7g1AAc~?1xM^00-d^9EKxs6pq1hH~}Z&6r6@La2C$NdAI-<;SyYiD{vLA!F9L+ zH{llChC6T@#%AU_lUdngEnpfD7H zqTm3I-~`2>IFx{r;0&dpG`K(+aD}qq2IZhURDg<52`Ym-Q~@KHzymzN3|`<3K2Q~^ zL3OABHK7*NhC1L2b-@q(p&rzS1`q&&&=7*45j2J-&=i_MFoZxTgh4n&KyzpTEuj@e zLThLPZJ`}RL3`)`9ibCMLucp$U7;IvhaS)qdO-~IhCa|2`aypf00SWw2Ekw$0z+XK z#2GTR{tSct96Y@|xm$Rez0DrpCX?