Skip to content

Commit

Permalink
style: format code with Black and PHP CS Fixer
Browse files Browse the repository at this point in the history 
This commit fixes the style issues introduced in 1e2289e according to the output
from Black and PHP CS Fixer.

Details: None
  • Loading branch information
@deepsource-autofix
deepsource-autofix[bot] committed Sep 28, 2023
1 parent 1e2289e commit dde7cee
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 56 deletions.
67 changes: 37 additions & 30 deletions services/mmc/plugins/pkgs/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,12 @@ def refresh_dependencies(self, uuid, dependencies_list):
def list_all_extensions(self):
return PkgsDatabase().list_all_extensions()

def rule_test_extensions(self, nameexectutable, rule, bangtring= 0,
stringstring = 0, stringfile = 0):
return PkgsDatabase().rule_test_extensions( nameexectutable,
rule,
bangtring= 0,
stringstring = 0,
stringfile = 0)
def rule_test_extensions(
self, nameexectutable, rule, bangtring=0, stringstring=0, stringfile=0
):
return PkgsDatabase().rule_test_extensions(
nameexectutable, rule, bangtring=0, stringstring=0, stringfile=0
)

def delete_extension(self, id):
return PkgsDatabase().delete_extension(id)
Expand Down Expand Up @@ -766,7 +765,7 @@ def pkgs_getTemporaryFiles():
return ret


def getTemporaryFileSuggestedCommand1(tempdir,db, size_max=524288000):
def getTemporaryFileSuggestedCommand1(tempdir, db, size_max=524288000):
tmp_input_dir = os.path.join("/", "var", "lib", "pulse2", "package-server-tmpdir")
retresult = {
"version": "0.1",
Expand Down Expand Up @@ -799,46 +798,54 @@ def getTemporaryFileSuggestedCommand1(tempdir,db, size_max=524288000):
rule["file"] = rule["file"].replace("\\", "")

# FILE
stringfile=0
stringfile = 0
if rule["file"]:
cmd="file %s" % fileadd
result = simplecommand("file %s" % fileadd )
if result['result'] :
stringfile=1
cmd = "file %s" % fileadd
result = simplecommand("file %s" % fileadd)
if result["result"]:
stringfile = 1

# STRING
stringstring=0
stringstring = 0
if rule["strings"]:
recherche=rule["strings"].replace('"', '\"')
cmd="strings %s | grep \"%s\""%( fileadd, rule["strings"])
recherche = rule["strings"].replace('"', '"')
cmd = 'strings %s | grep "%s"' % (fileadd, rule["strings"])
result = simplecommand(cmd)
if result['result'] :
stringstring=1
if result["result"]:
stringstring = 1

# BANG
bangtring = 0
if rule["bang"]:
strbang=cmd="strings %s | tail -c 60 | grep %s" %( fileadd, rule["bang"])
strbang = cmd = "strings %s | tail -c 60 | grep %s" % (
fileadd,
rule["bang"],
)
result = simplecommand(cmd)
if result['result'] :
bangtring=1
resultrule = PkgsDatabase().rule_test_extensions(db,
filename,
rule,
bangtring= bangtring,
stringstring = stringstring,
stringfile = stringfile)
if result["result"]:
bangtring = 1
resultrule = PkgsDatabase().rule_test_extensions(
db,
filename,
rule,
bangtring=bangtring,
stringstring=stringstring,
stringfile=stringfile,
)
if resultrule:
retelt=resultrule[0]
logging.getLogger().debug("command propose %s" % retelt['proposition'])
suggestedCommand.append(retelt['proposition'])
retelt = resultrule[0]
logging.getLogger().debug(
"command propose %s" % retelt["proposition"]
)
suggestedCommand.append(retelt["proposition"])
break
if suggestedCommand:
retresult["commandcmd"] = "\n".join(suggestedCommand)
else:
retresult["commandcmd"] = "No command found with rules."
return retresult


def pushPackage(random_dir, files, local_files):
tmp_input_dir = os.path.join("/", "var", "lib", "pulse2", "package-server-tmpdir")
logging.getLogger().info("pushing package from a local mmc-agent")
Expand Down
55 changes: 29 additions & 26 deletions services/pulse2/database/pkgs/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -762,13 +762,13 @@ def list_all_extensions(self, session):
extensions.append(extension.to_array())
return extensions


@DatabaseHelper._sessionm
def rule_test_extensions(self, session, nameexectutable, rule, bangtring= 0,
stringstring = 0, stringfile = 0):
extensions_dictlist=[]
def rule_test_extensions(
self, session, nameexectutable, rule, bangtring=0, stringstring=0, stringfile=0
):
extensions_dictlist = []
try:
sql="""SELECT
sql = """SELECT
id,
REPLACE('%s', '"%%s"', "%s"),
(IF(name IS NULL OR name = '', 0, 1) and (SUBSTRING_INDEX("%s", '/', - 1) REGEXP name)) as rulename,
Expand All @@ -784,31 +784,34 @@ def rule_test_extensions(self, session, nameexectutable, rule, bangtring= 0,
( extension = '' or SUBSTRING_INDEX("%s", '.', - 1) REGEXP extension ) and
( strings = '' or %s) and
( file = '' or %s) and
( bang = '' or %s) ;""" %( rule['proposition'],
nameexectutable,
nameexectutable,
nameexectutable,
bangtring,
stringstring,
stringfile,
rule['id'],
nameexectutable,
nameexectutable,
stringstring,
stringfile,
bangtring)
( bang = '' or %s) ;""" % (
rule["proposition"],
nameexectutable,
nameexectutable,
nameexectutable,
bangtring,
stringstring,
stringfile,
rule["id"],
nameexectutable,
nameexectutable,
stringstring,
stringfile,
bangtring,
)
result = session.execute(sql)
session.commit()
session.flush()
for extension in result:
extensions_dict = {
'id': extension[0],
'proposition': extension[1],
'rulename': extension[2],
'ruleext': extension[3],
'rulestring': extension[4],
'rulefile': extension[5],
'rulesbang': extension[6]}
extensions_dict = {
"id": extension[0],
"proposition": extension[1],
"rulename": extension[2],
"ruleext": extension[3],
"rulestring": extension[4],
"rulefile": extension[5],
"rulesbang": extension[6],
}
extensions_dictlist.append(extensions_dict)
logger.info(extensions_dictlist)
except Exception as e:
Expand Down

0 comments on commit dde7cee

Please sign in to comment.