Skip to content

Commit

Permalink
Add user-defined wrappers
Browse files Browse the repository at this point in the history
The template.py.sample has needed an update to rename the function.
This file was not being included in previous releases but it is
copied correctly since 0.6.1.
  • Loading branch information
febrezo committed May 28, 2018
1 parent 7185a96 commit 5bc4164
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion MANIFEST.in
@@ -1,3 +1,3 @@
recursive-include config *cfg
recursive-include doc *md
include config *py.sample
recursive-include config *py.sample
4 changes: 1 addition & 3 deletions config/template.py.sample
Expand Up @@ -21,10 +21,8 @@


import os
import timeout_decorator

#@timeout_decorator.timeout(30, timeout_exception=StopIteration)
def runAnalysisFromFiles(**kwargs):
def runAnalysis(**kwargs):
"""
Method that runs an analysis

Expand Down
9 changes: 8 additions & 1 deletion doc/CHANGES.md
Expand Up @@ -3,7 +3,14 @@ Project Neto's Changelog

Full details of the changes committed with each version.

0.6.0, 2018/05/21 -- Add t
0.6.1, 2018/05/28 -- Add user-defined plugins

- Add user-defined wrappers including a template.py for doing
it.
- Fix an error that occurred when Virustotal API was not
provided.

0.6.0, 2018/05/21 -- Add Neto console interactive shell

- Add `neto console` as an interactive way of dealing
with Neto.
Expand Down
2 changes: 1 addition & 1 deletion neto/__init__.py
Expand Up @@ -19,4 +19,4 @@
#
################################################################################

__version__ = "0.6.0"
__version__ = "0.6.1"
2 changes: 1 addition & 1 deletion neto/lib/extensions.py
Expand Up @@ -543,7 +543,7 @@ def analyse(self, extensionFile=None, unzippedFiles=None):
"""
results = {}

analysisList = utils.getRunnableAnalysisFromModule("neto.plugins.analysis")
analysisList = utils.getRunnableAnalysisFromModule("neto.plugins.analysis") + utils.getUserAnalysisMethods()
for methodObj in analysisList:
results.update(methodObj(unzippedFiles=unzippedFiles, extensionFile=extensionFile))

Expand Down
2 changes: 1 addition & 1 deletion neto/lib/utils.py
Expand Up @@ -134,7 +134,7 @@ def getUserAnalysisMethods():
userMethods = []

# Creating the application paths
paths = utils.getConfigPath()
paths = getConfigPath()

newPath = os.path.abspath(paths["appPathPlugins"])

Expand Down

0 comments on commit 5bc4164

Please sign in to comment.