Merge pull request #225 from TripleSD/dev

Dev
TripleSD · Mar 27, 2020 · ebe8001 · ebe8001
2 parents 26f8d1a + 1ef69c9
commit ebe8001
Show file tree

Hide file tree

Showing 28 changed files with 376 additions and 91 deletions.
diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
@@ -53,6 +53,9 @@ jobs:
     - name: Run SNMP server (Mikrotik hardware)
       run: python /home/runner/work/moring/moring/utils/snmp-server/snmp-server.py -p 9005 -c /home/runner/work/moring/moring/utils/snmp-server/configs/HardwareMikrotik.py &
 
+    - name: Run SNMP server (Empty vendor)
+      run: python /home/runner/work/moring/moring/utils/snmp-server/snmp-server.py -p 9006 -c /home/runner/work/moring/moring/utils/snmp-server/configs/EmptyVendor.py &
+
     - name: Check SNMP server 1
       run: snmpwalk -v2c -c public 127.0.0.1:9001
 
@@ -68,6 +71,9 @@ jobs:
     - name: Check SNMP server 5
       run: snmpwalk -v2c -c public 127.0.0.1:9005
 
+    - name: Check SNMP server 6
+      run: snmpwalk -v2c -c public 127.0.0.1:9006
+
     - name: Copy .env
       run: php -r "file_exists('.env') || copy('.env.testing.example', '.env');"
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+[v.0.1.4 (Build.023)](https://github.com/TripleSD/moring/releases/tag/0.1.4)
+ - **(New)** - Добавлены новые автотесты для SNMP классов
+ - **(New)** - Добавлена проверка на повторное добавление SNMP устройства
+ - **(Upd)** - Дополнены текущие автотесты для SNMP классов 
+ - **(Upd)** - Выполнен рефакторинг SNMP классов
+ - **(Upd)** - Выполнен рефакторинг Device классов
+ - **(Fix)** - Исправлена передача порта SNMP устройства из формы в обработчик
+
 [v.0.1.3 (Build.020)](https://github.com/TripleSD/moring/releases/tag/0.1.3)
  - **(Add)** - Добавлен пакет [delimitry/snmp-server](https://github.com/delimitry/snmp-server) для эмуляции snmp устройств
  - **(Upd)** - Осуществлен рефакторинг SNMP классов для ускоения запроса и получения SNMP информации

diff --git a/app/Console/Commands/SnmpDevicesChecker.php b/app/Console/Commands/SnmpDevicesChecker.php
@@ -55,12 +55,12 @@ public function handle(int $device_id = null)
 
         foreach ($devices as $device) {
             try {
-                $deviceConnection['hostname']      = $device->hostname;
-                $deviceConnection['title']         = $device->title;
-                $deviceConnection['snmpCommunity'] = $device->snmp_community;
-                $deviceConnection['snmpPort']      = $device->snmp_port;
-                $deviceConnection['snmpVersion']   = $device->snmp_version;
-                $deviceData                        = $this->devicesRepository->getDeviceData($deviceConnection);
+                $deviceConnection['hostname']    = $device->hostname;
+                $deviceConnection['title']       = $device->title;
+                $deviceConnection['community']   = $device->snmp_community;
+                $deviceConnection['port']        = $device->snmp_port;
+                $deviceConnection['snmpVersion'] = $device->snmp_version;
+                $deviceData                      = $this->devicesRepository->getDeviceData($deviceConnection);
                 $this->devicesRepository->update($deviceData, $device->id);
             } catch (\Exception $exception) {
                 if ($this->settingsController->getTelegramStatus() === 1) {

diff --git a/app/Http/Controllers/Admin/Network/NetworkDevicesController.php b/app/Http/Controllers/Admin/Network/NetworkDevicesController.php
@@ -4,6 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Sites\UpdateAndStoreDeviceRequest;
+use App\Models\Devices;
 use App\Repositories\Devices\DevicesLogsRepository;
 use App\Repositories\Devices\DevicesRepository;
 use App\Repositories\Devices\DevicesVendorsRepository;
@@ -107,6 +108,16 @@ public function update(UpdateAndStoreDeviceRequest $request)
     public function store(UpdateAndStoreDeviceRequest $request): RedirectResponse
     {
         try {
+            $device = Devices::where('hostname', $request->hostname)
+                ->where('snmp_version', $request->snmp_version)
+                ->where('snmp_port', $request->snmp_port)
+                ->where('snmp_community', $request->snmp_community)
+                ->get();
+
+            if ($device->isNotEmpty()) {
+                throw new Exception('Данное устройство уже есть в списке');
+            }
+
             $deviceConnection = $this->deviceRepository->setDataConnection($request);
             $deviceData       = $this->deviceRepository->getDeviceData($deviceConnection);
             $this->deviceRepository->store($deviceData);

diff --git a/app/Repositories/Devices/DevicesRepository.php b/app/Repositories/Devices/DevicesRepository.php
@@ -123,11 +123,11 @@ public function setDataConnection($request): array
         $deviceData = [];
 
         // Getting vars from template
-        $deviceData['hostname']      = $request->input('hostname');               // Hostname device
-        $deviceData['title']         = $request->input('title');                  // Short description
-        $deviceData['snmpCommunity'] = $request->input('snmp_community');         // Device community
-        $deviceData['snmpPort']      = $request->input('snmp_port');              // Device snmp port
-        $deviceData['snmpVersion']   = $request->input('snmp_version');           // Device snmp version 1/2/3
+        $deviceData['hostname']    = $request->input('hostname');               // Hostname device
+        $deviceData['title']       = $request->input('title');                  // Short description
+        $deviceData['community']   = $request->input('snmp_community');         // Device community
+        $deviceData['port']        = $request->input('snmp_port');              // Device snmp port
+        $deviceData['snmpVersion'] = $request->input('snmp_version');           // Device snmp version 1/2/3
 
         return (array) $deviceData;
     }
@@ -140,29 +140,29 @@ public function setDataConnection($request): array
     public function getDeviceData(array $varsConnection): array
     {
         try {
-            $connection = new SnmpRepository();
-            $snmpFlow   = $connection->startSession($varsConnection)->walk('SNMPv2-MIB::sysDescr.0');
+            $snmpObject          = new SnmpRepository();
+            $snmpFlow            = $snmpObject->startSession($varsConnection);
+            $vendorNameRawString = $snmpObject->getVendorNameRawString($snmpFlow);
         } catch (Exception $e) {
             throw new Exception('Устройство не отвечает');
         }
 
         $vendor     = new Vendor();
-        $vendorName = $vendor->parseName($snmpFlow);
+        $vendorName = $vendor->parseName($vendorNameRawString);
 
         if ($vendorName == null) {
             throw new Exception('Не удалось определить производителя.');
         }
 
         /** @var VendorInterface $device */
-        $snmpFlow = $connection->startSession($varsConnection);
-        $device   = $vendor->getVendorClass($vendorName);
+        $device = $vendor->getVendorClass($vendorName);
 
         //Set vars
-        $deviceData['hostname']      = $varsConnection['hostname'];
-        $deviceData['title']         = $varsConnection['title'];
-        $deviceData['snmpCommunity'] = $varsConnection['snmpCommunity'];
-        $deviceData['snmpPort']      = $varsConnection['snmpPort'];
-        $deviceData['snmpVersion']   = $varsConnection['snmpVersion'];
+        $deviceData['hostname']    = $varsConnection['hostname'];
+        $deviceData['title']       = $varsConnection['title'];
+        $deviceData['community']   = $varsConnection['community'];
+        $deviceData['port']        = $varsConnection['port'];
+        $deviceData['snmpVersion'] = $varsConnection['snmpVersion'];
 
         // Get & set vars from device
         $deviceData['location']        = $device->getLocation($snmpFlow);
@@ -210,8 +210,8 @@ public function store(array $deviceData, $deviceId = null): void
         $device->serial_number   = $deviceData['serialNumber'];
         $device->packets_version = $deviceData['packetsVersion'];
         $device->platform_type   = $deviceData['platformType'];
-        $device->snmp_port       = $deviceData['snmpPort'];
-        $device->snmp_community  = $deviceData['snmpCommunity'];
+        $device->snmp_port       = $deviceData['port'];
+        $device->snmp_community  = $deviceData['community'];
         $device->snmp_version    = $deviceData['snmpVersion'];
         $device->save();
     }

diff --git a/app/Repositories/Snmp/SnmpRepository.php b/app/Repositories/Snmp/SnmpRepository.php
@@ -9,11 +9,15 @@ class SnmpRepository extends Repository
 {
     public function startSession($varsConnection)
     {
-        return new SNMP(SNMP::VERSION_2c, $varsConnection['hostname'], $varsConnection['snmpCommunity']);
+        return new SNMP(
+            SNMP::VERSION_2c,
+            $varsConnection['hostname'] . ':' . $varsConnection['port'], $varsConnection['community']
+        );
     }
 
-    public function name($nameArray)
+    public function getVendorNameRawString($snmpFlow)
     {
-        return $nameArray['1.3.6.1.2.1.1.1.0'];
+        /** @var SNMP $snmpFlow */
+        return $snmpFlow->get('1.3.6.1.2.1.1.1.0');
     }
 }
diff --git a/app/Repositories/Snmp/Vendor.php b/app/Repositories/Snmp/Vendor.php
@@ -4,23 +4,23 @@
 
 class Vendor
 {
-    public function parseName(array $snmpFlow): string
+    public function parseName(string $rawString): string
     {
-        if (isset($snmpFlow['SNMPv2-MIB::sysDescr.0'])) {
-            if (preg_match('/RouterOS/', $snmpFlow['SNMPv2-MIB::sysDescr.0'])) {
-                return 'Mikrotik';
+        if (isset($rawString)) {
+            if (preg_match('/RouterOS/', $rawString)) {
+                return (string) 'Mikrotik';
             }
 
-            if (preg_match('/Cisco/', $snmpFlow['SNMPv2-MIB::sysDescr.0'])) {
-                return 'Cisco';
+            if (preg_match('/Cisco/', $rawString)) {
+                return (string) 'Cisco';
             }
 
-            if (preg_match('/[D][EG][S]/', $snmpFlow['SNMPv2-MIB::sysDescr.0'])) {
-                return 'DLink';
+            if (preg_match('/[D][EG][S]/', $rawString)) {
+                return (string) 'DLink';
             }
 
-            if (preg_match('/MES/', $snmpFlow['SNMPv2-MIB::sysDescr.0'])) {
-                return 'Eltex';
+            if (preg_match('/MES/', $rawString)) {
+                return (string) 'Eltex';
             }
         }
 

diff --git a/app/Repositories/Snmp/Vendors/Cisco.php b/app/Repositories/Snmp/Vendors/Cisco.php
@@ -53,6 +53,8 @@ public function getFirmwareVersion($snmpFlow): string
     public function getPacketsVersion($snmpFlow): string
     {
         /* @var SNMP $snmpFlow */
+        $snmpFlow->close();
+
         return (string) null;
     }
 
@@ -115,6 +117,8 @@ public function getSerialNumber($snmpFlow): string
     public function getLicenseLevel($snmpFlow): string
     {
         /* @var SNMP $snmpFlow */
+        $snmpFlow->close();
+
         return (string) null;
     }
 

diff --git a/app/Repositories/Snmp/Vendors/DLink.php b/app/Repositories/Snmp/Vendors/DLink.php
@@ -27,6 +27,8 @@ public function getModel($snmpFlow): string
     public function getFirmware($snmpFlow): string
     {
         /* @var SNMP $snmpFlow */
+        $snmpFlow->close();
+
         return (string) 'D-Link Linux';
     }
 
@@ -50,6 +52,8 @@ public function getFirmwareVersion($snmpFlow): string
     public function getPacketsVersion($snmpFlow): string
     {
         /* @var SNMP $snmpFlow */
+        $snmpFlow->close();
+
         return (string) null;
     }
 
@@ -111,6 +115,8 @@ public function getSerialNumber($snmpFlow): string
     public function getLicenseLevel($snmpFlow): string
     {
         /* @var SNMP $snmpFlow */
+        $snmpFlow->close();
+
         return (string) null;
     }
 

diff --git a/app/Repositories/Snmp/Vendors/Eltex.php b/app/Repositories/Snmp/Vendors/Eltex.php
@@ -27,6 +27,8 @@ public function getModel($snmpFlow): string
     public function getFirmware($snmpFlow): string
     {
         /* @var SNMP $snmpFlow */
+        $snmpFlow->close();
+
         return (string) 'Eltex Linux';
     }
 
@@ -50,6 +52,8 @@ public function getFirmwareVersion($snmpFlow): string
     public function getPacketsVersion($snmpFlow): string
     {
         /* @var SNMP $snmpFlow */
+        $snmpFlow->close();
+
         return (string) null;
     }
 
@@ -111,6 +115,8 @@ public function getSerialNumber($snmpFlow): string
     public function getLicenseLevel($snmpFlow): string
     {
         /* @var SNMP $snmpFlow */
+        $snmpFlow->close();
+
         return (string) null;
     }
 

diff --git a/commands/testing_local.sh b/commands/testing_local.sh
@@ -26,13 +26,16 @@ PID4=$!
 python utils/snmp-server/snmp-server.py -p 9005 -c utils/snmp-server/configs/HardwareMikrotik.py &
 PID5=$!
 
+python utils/snmp-server/snmp-server.py -p 9006 -c utils/snmp-server/configs/EmptyVendor.py &
+PID6=$!
+
 echo 'Starting PHPunit'
 #./vendor/bin/phpunit --coverage-html report_coverage
 ./vendor/bin/phpunit
 #./vendor/bin/phpunit --filter testGetSerialNumber tests/Unit/SNMP/CloudMikrotikEmptyOIDTest.php
 
 echo 'Killing SNMP servers'
-kill $PID1 $PID2 $PID3 $PID4 $PID5
+kill $PID1 $PID2 $PID3 $PID4 $PID5 $PID6
 
 echo 'Removing .env file'
 rm -f .env

diff --git a/config/moring.php b/config/moring.php
@@ -1,8 +1,8 @@
 <?php
 
 return [
-    'build' => '020',
-    'version' => '0.1.3',
+    'build' => '023',
+    'version' => '0.1.4',
     'createYear' => '2019',
     'bridgeUrl' => 'http://api.moring.ru/v1',
     'bridgeCurrentMoringVersionUrl' => '/moring/version',

diff --git a/tests/Unit/SNMP/CiscoTest.php b/tests/Unit/SNMP/CiscoTest.php
@@ -91,8 +91,9 @@ public function testGetPlatformType(): void
 
     private function setVarsConnection()
     {
-        $array['hostname']      = '127.0.0.1:9002';
-        $array['snmpCommunity'] = 'public';
+        $array['hostname']  = '127.0.0.1:9002';
+        $array['community'] = 'public';
+        $array['port']      = 161;
 
         return $array;
     }

diff --git a/tests/Unit/SNMP/CloudMikrotikExceptionTest.php b/tests/Unit/SNMP/CloudMikrotikExceptionTest.php
@@ -24,8 +24,9 @@ public function testGetFirmwareVersion(): void
 
     private function setVarsConnection()
     {
-        $array['hostname']      = '0.0.0.0';
-        $array['snmpCommunity'] = 'public';
+        $array['hostname']  = '0.0.0.0';
+        $array['community'] = 'public';
+        $array['port']      = 161;
 
         return $array;
     }

diff --git a/tests/Unit/SNMP/CloudMikrotikTest.php b/tests/Unit/SNMP/CloudMikrotikTest.php
@@ -91,8 +91,9 @@ public function testGetPlatformType(): void
 
     private function setVarsConnection()
     {
-        $array['hostname']      = '127.0.0.1:9001';
-        $array['snmpCommunity'] = 'public';
+        $array['hostname']  = '127.0.0.1:9001';
+        $array['community'] = 'public';
+        $array['port']      = 161;
 
         return $array;
     }