OISF/suricata
1
0
Fork 0
mirror of https://github.com/OISF/suricata.git synced 2026-10-12 02:07:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

suricatasc: Get rid of issues detected by Pylint

Browse Source 
Pylint is a tool to make sure we do not regress the support for Python
3. The following conventions, warnings, errors, refactors have been
fixed.

C0326: Exactly one space required around assignment
C0326: No space allowed around keyword argument assignment
C0325: Unnecessary parens after 'if' keyword
W0301: Unnecessary semicolon
W0702: No exception type(s) specified
W0231: __init__ method from base class 'Exception' is not called
W0107: Unnecessary pass statement
C0121: Comparison to None should be 'expr is not None'
E0602: Undefined variable 'raw_input'
W0201: Attribute 'socket' defined outside __init__
W0611: Unused import
This commit is contained in:
Shivani Bhardwaj
2019-02-15 10:56:58 +01:00
committed by Victor Julien
parent 87019ff22b
commit 57285b54d5
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/suricata/sc/suricatasc.py
+20 -20
View File
@@ -16,12 +16,10 @@
try:
import simplejson as json
except:
except ImportError:
import json
import re
import readline
from socket import socket, AF_UNIX, error
from time import sleep
import select
import sys
@@ -30,33 +28,35 @@ SURICATASC_VERSION = "1.0"
VERSION = "0.2"
INC_SIZE = 1024
class SuricataException(Exception):
"""
Generic class for suricatasc exception
"""
def __init__(self, value):
super(SuricataException, self).__init__(value)
self.value = value
def __str__(self):
return str(self.value)
class SuricataNetException(SuricataException):
"""
Exception raised when network error occur.
"""
pass
class SuricataCommandException(SuricataException):
"""
Exception raised when command is not correct.
"""
pass
class SuricataReturnException(SuricataException):
"""
Exception raised when return message is not correct.
"""
pass
class SuricataCompleter:
@@ -80,9 +80,10 @@ class SuricataCompleter:
class SuricataSC:
def __init__(self, sck_path, verbose=False):
self.cmd_list=['shutdown','quit','pcap-file','pcap-file-continuous','pcap-file-number','pcap-file-list','pcap-last-processed','pcap-interrupt','iface-list','iface-stat','register-tenant','unregister-tenant','register-tenant-handler','unregister-tenant-handler', 'add-hostbit', 'remove-hostbit', 'list-hostbit', 'memcap-set', 'memcap-show']
self.cmd_list = ['shutdown', 'quit', 'pcap-file', 'pcap-file-continuous', 'pcap-file-number', 'pcap-file-list', 'pcap-last-processed', 'pcap-interrupt', 'iface-list', 'iface-stat', 'register-tenant', 'unregister-tenant', 'register-tenant-handler', 'unregister-tenant-handler', 'add-hostbit', 'remove-hostbit', 'list-hostbit', 'memcap-set', 'memcap-show']
self.sck_path = sck_path
self.verbose = verbose
self.socket = socket(AF_UNIX)
def json_recv(self):
cmdret = None
@@ -97,13 +98,13 @@ class SuricataSC:
break
return cmdret
def send_command(self, command, arguments = None):
def send_command(self, command, arguments=None):
if command not in self.cmd_list and command != 'command-list':
raise SuricataCommandException("No such command: %s", command)
cmdmsg = {}
cmdmsg['command'] = command
if (arguments != None):
if arguments:
cmdmsg['arguments'] = arguments
if self.verbose:
print("SND: " + json.dumps(cmdmsg))
@@ -119,7 +120,7 @@ class SuricataSC:
else:
cmdret = None
if cmdret == None:
if not cmdret:
raise SuricataReturnException("Unable to get message from server")
if self.verbose:
@@ -129,7 +130,6 @@ class SuricataSC:
def connect(self):
try:
self.socket = socket(AF_UNIX)
self.socket.connect(self.sck_path)
except error as err:
raise SuricataNetException(err)
@@ -149,7 +149,7 @@ class SuricataSC:
else:
cmdret = None
if cmdret == None:
if not cmdret:
raise SuricataReturnException("Unable to get message from server")
if self.verbose:
@@ -193,11 +193,11 @@ class SuricataSC:
arguments = {}
arguments["filename"] = filename
arguments["output-dir"] = output
if tenant != None:
if tenant:
arguments["tenant"] = int(tenant)
if continuous != None:
if continuous:
arguments["continuous"] = continuous
if delete_when_done != None:
if delete_when_done:
arguments["delete-when-done"] = delete_when_done
elif "pcap-file-continuous " in command:
try:
@@ -218,9 +218,9 @@ class SuricataSC:
arguments["filename"] = filename
arguments["output-dir"] = output
arguments["continuous"] = True
if tenant != None:
if tenant:
arguments["tenant"] = int(tenant)
if delete_when_done != None:
if delete_when_done:
arguments["delete-when-done"] = delete_when_done
elif "iface-stat" in command:
try:
@@ -257,7 +257,7 @@ class SuricataSC:
arguments = {}
arguments["id"] = int(tenantid)
arguments["htype"] = htype
if hargs != None:
if hargs:
arguments["hargs"] = int(hargs)
elif "register-tenant-handler" in command:
try:
@@ -274,7 +274,7 @@ class SuricataSC:
arguments = {}
arguments["id"] = int(tenantid)
arguments["htype"] = htype
if hargs != None:
if hargs:
arguments["hargs"] = int(hargs)
elif "unregister-tenant" in command:
try:
@@ -380,7 +380,7 @@ class SuricataSC:
else:
command = input(">>> ").strip()
if command == "quit":
break;
break
try:
(cmd, arguments) = self.parse_command(command)
except SuricataCommandException as err: