From c8b7d62a60efa5b1a470768fa66770e614680d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Rosiak?= Date: Thu, 6 Oct 2016 19:15:20 +0300 Subject: [PATCH] newdevice: Add support for more Pulse Secure devices #4680 --- html/images/os/pulse.png | Bin 0 -> 1845 bytes includes/definitions.inc.php | 2 +- includes/discovery/os/pulse.inc.php | 2 +- tests/snmpsim/pulse-mag2600.snmprec | 2 ++ tests/snmpsim/pulse-sa2500.snmprec | 2 ++ tests/snmpsim/pulse-sa6500.snmprec | 2 ++ tests/snmpsim/pulse-vaspe.snmprec | 2 ++ 7 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 html/images/os/pulse.png create mode 100644 tests/snmpsim/pulse-mag2600.snmprec create mode 100644 tests/snmpsim/pulse-sa2500.snmprec create mode 100644 tests/snmpsim/pulse-sa6500.snmprec create mode 100644 tests/snmpsim/pulse-vaspe.snmprec diff --git a/html/images/os/pulse.png b/html/images/os/pulse.png new file mode 100644 index 0000000000000000000000000000000000000000..6f0c3e6a4d7e150c688374fd35d3de2fbffa8bce GIT binary patch literal 1845 zcmb_dYfw|y7EXPWQjJ)UR~4*?#YB|a7HCn4iQyrXf(em;Vs4`X5)dJPl%fLgADIh)U!Y2DpI)NOG_SQXny4!AJpxCNtL`ccwGFKkj_9_qV>i)~xko zf3tUXfIs0Qq%{(OKz!uwg$p!rr*UmqW!QJPyLBND>)v|fJdY>Ib$4|!TWE;K^V^%| zi%-^t2~H}cEsbFiL!)#-&0n#kdcCDyE_v+eVCR!(JeOz-~N61 z=3^Pz=vhx5?fgiy+zXj96_%1H5KJU4q=we3N1TOKI*&dNTHjz2!n7*S9wAy~#9_1% z|8L=PJ>=VjTRZiO_m|SMUj!_MKA6Yu{Cunr_P-GHaj!A5v5?abAYGx|y37VGd)_^&xl& zC9Wa;8zXW7i18nCbIwbTo?=NbBBxfOj!^o|XH7cYE`BEYY6EBN+(W0EEeSy{^5q-9 zpzWHnpcW}PjctBzK-}@gdb+ViC2^tOK)m;4XxJ0^-*fIgX{m;5d<}g@$D@Xjsk$(a`Gj~u+A%;T7SH`!d zGS#Nk_30D|N5y9^H!#&1$&a24EO?#+LWnqM@PrNb&a32pXNRN6<|jF6mM#iT2OQ}^ zehj|GS#oU;6DtaBF?OVLi50Z88-t&2y@T2;HhDJdoqd}9+sh!EdR09+p_3AO(m&0U zYdahE6N_-^ArXjpQyN|5J`wq6>46M#uN^;lpb9I+%<+q&iy8?s-26I}*nW?-8LxeY zdrZS>C#f3?y{)Xcwm-G609LSMl%tHPL;5h)mV>4b`ZB>8)*F&~L#w2-1?%|Ti$8v8 zW{;hDWDiTEoR_De7^ z>5vbOi=Jd@WWU34slXcZs3?I077&?70eq>R8#uJL`^nd;gWJU_It`38pLBJ+S2kIt z0Qa+N*(LO9lC+VT;8il&XD8LN_TuAUAJbf^lgMcl6L!CFDA$$4q+NnUYq)5Q1@(o6 z!JY==87vf=OSk`zdL^WEOj=NHUmjiCVKkR~hbM%3pEg+eedv(%kMR;JI(Mn)jDnGy zrEo7Gr>GWtu8D(%4a1mi9bv!Ifgf8B)-OKSs|WF4C+4nRV=LoGo5j7bs&mUkgVPEx z8ghNml@G?@AXidvKFCXhTsI6io01esH`bom{JtB|cvX=TfwcJq$Z0nXZ+wr}j{kU>8$4 za|F$&#X^Bqg{6-Dk6eXZV(XF;mId zGsID=)g8{kuvrs@8eO@snz8_P3vtt|SV6q$j7(1QP_s&4vkObbS77-=V!UsEYUb7W zs5z3!DCWXfHLPI_#!x@q+uPV4#Kc2iYK?xaU0BGxcUQ360+zojZH-F^U+N!xR@WdL zpIN`@IFK~w4q+0)8+%OCt6Yr2YC}s%h7CsLlS_B zN?lx+Sg0}2+0!;b@uPpfA#_;F4{^+jd&z*+k8toH5Gbj^TDrHX;* zX^SHh0*25c`WkSk?XbOtodF2y2SymfzZcZ~$jf9S5X`kk{Ldo%^X0YS_X)uPEj>!Z PcZl%D`{Qb{;pu+?#}1Wq literal 0 HcmV?d00001 diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index 6a8cfa655a..6d4fd1de3d 100644 --- a/includes/definitions.inc.php +++ b/includes/definitions.inc.php @@ -906,7 +906,7 @@ $config['os'][$os]['over'][0]['text'] = 'Device Traffic'; $os = 'pulse'; $config['os'][$os]['text'] = 'Pulse Secure'; $config['os'][$os]['type'] = 'firewall'; -$config['os'][$os]['icon'] = 'junos'; +$config['os'][$os]['icon'] = 'pulse'; $config['os'][$os]['over'][0]['graph'] = 'device_bits'; $config['os'][$os]['over'][0]['text'] = 'Device Traffic'; $config['os'][$os]['over'][1]['graph'] = 'device_processor'; diff --git a/includes/discovery/os/pulse.inc.php b/includes/discovery/os/pulse.inc.php index 4a5291a7f0..b5f629f0de 100644 --- a/includes/discovery/os/pulse.inc.php +++ b/includes/discovery/os/pulse.inc.php @@ -10,6 +10,6 @@ * the source code distribution for details. */ -if (str_contains($sysDescr, 'Pulse Connect Secure')) { +if (str_contains($sysDescr, array('Pulse Connect Secure', 'Pulse Secure'))) { $os = 'pulse'; } diff --git a/tests/snmpsim/pulse-mag2600.snmprec b/tests/snmpsim/pulse-mag2600.snmprec new file mode 100644 index 0000000000..d43f89c60a --- /dev/null +++ b/tests/snmpsim/pulse-mag2600.snmprec @@ -0,0 +1,2 @@ +1.3.6.1.2.1.1.1.0|4|Pulse Secure,LLC,MAG-2600,8.0R14 (build 41869) +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.12532.254.1.1 \ No newline at end of file diff --git a/tests/snmpsim/pulse-sa2500.snmprec b/tests/snmpsim/pulse-sa2500.snmprec new file mode 100644 index 0000000000..41be873a89 --- /dev/null +++ b/tests/snmpsim/pulse-sa2500.snmprec @@ -0,0 +1,2 @@ +1.3.6.1.2.1.1.1.0|4|Pulse Secure,LLC,SA-2500,8.0R13 (build 38659) +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.12532.252.3.1 \ No newline at end of file diff --git a/tests/snmpsim/pulse-sa6500.snmprec b/tests/snmpsim/pulse-sa6500.snmprec new file mode 100644 index 0000000000..2e54e5c6ff --- /dev/null +++ b/tests/snmpsim/pulse-sa6500.snmprec @@ -0,0 +1,2 @@ +1.3.6.1.2.1.1.1.0|4|Pulse Secure,LLC,SA-6500,8.0R13 (build 38659) +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.12532.252.7.1 \ No newline at end of file diff --git a/tests/snmpsim/pulse-vaspe.snmprec b/tests/snmpsim/pulse-vaspe.snmprec new file mode 100644 index 0000000000..4e54e61ce8 --- /dev/null +++ b/tests/snmpsim/pulse-vaspe.snmprec @@ -0,0 +1,2 @@ +1.3.6.1.2.1.1.1.0|4|Pulse Secure, LLC,Pulse Connect Secure,VMware-VA-SPE,8.2R5 (build 49363) +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.12532.255.1.1 \ No newline at end of file