Skip to content

Commit

Permalink
Merge pull request #17 from redcanari/fixing-author-bug
Browse files Browse the repository at this point in the history 
Fixing author bug
  • Loading branch information
@allfro
allfro committed May 30, 2017
2 parents c12a830 + a5923f6 commit 9fd4b43
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 15 deletions.
4 changes: 1 addition & 3 deletions src/canari/maltego/transform.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def camel_to_title(s):

class Transform(object):

# Specifies the author of the transform. If not specified __author__ will be used.
# Specifies the author of the transform. If not specified __author__ will be used for the create-profile command.
author = ''

# A detailed description of the transform. The description can be read from the Maltego Transforms dialog box. If
Expand Down Expand Up @@ -81,8 +81,6 @@ class Transform(object):
command = None

def __init__(self):
if not self.author and __author__:
self.author = __author__
if not self.name:
self.name = '.'.join([self.__module__.split('.', 1)[0], self.__class__.__name__])
if not self.display_name:
Expand Down
7 changes: 6 additions & 1 deletion src/canari/pkgutils/maltego.py
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from importlib import import_module

import os
import re
import sys
Expand Down Expand Up @@ -276,12 +278,15 @@ def remove_transform_from_set(self, transform_id, transform_set):
if not os.listdir(transform_set_dir):
os.rmdir(transform_set_dir)

def _get_module_author(self, module_name):
return getattr(import_module(module_name), '__author__', '')

def add_transform(self, working_dir, transform_repository, transform_class, server=None):
transform_repository_dir = self.get_transform_repository_dir(transform_repository)

transform = transform_class()
name = '.'.join([transform_class.__module__, transform_class.__name__])
author = transform.author
author = transform.author or self._get_module_author(transform.__module__)
transform_id = transform.name
input_set = transform.transform_set
input_entity = transform.input_type
Expand Down
22 changes: 11 additions & 11 deletions src/canari/unittests/maltego/test_transform.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class MyTransform(Transform):
transform = MyTransform()
self.assertEqual(transform.name, self.get_transform_name(MyTransform))
self.assertEqual(transform.display_name, 'My Transform')
self.assertEqual(transform.author, __author__)
self.assertEqual(transform.author, '')
self.assertEqual(transform.description, 'This is a test.')
self.assertEqual(transform.help_url, '')
self.assertFalse(transform.debug)
Expand All @@ -45,7 +45,7 @@ class MyTransform(Transform):
transform = MyTransform()
self.assertEqual(transform.name, self.get_transform_name(MyTransform))
self.assertEqual(transform.display_name, 'My Transform')
self.assertEqual(transform.author, __author__)
self.assertEqual(transform.author, '')
self.assertEqual(transform.description, 'This is a test.')
self.assertEqual(transform.help_url, '')
self.assertFalse(transform.debug)
Expand All @@ -63,7 +63,7 @@ class MyTransform(Transform):
transform = MyTransform()
self.assertEqual(transform.name, self.get_transform_name(MyTransform))
self.assertEqual(transform.display_name, 'My Transform')
self.assertEqual(transform.author, __author__)
self.assertEqual(transform.author, '')
self.assertEqual(transform.description, 'This is a test.')
self.assertEqual(transform.help_url, '')
self.assertTrue(transform.debug)
Expand All @@ -82,7 +82,7 @@ class MyTransform(Transform):
transform = MyTransform()
self.assertEqual(transform.name, self.get_transform_name(MyTransform))
self.assertEqual(transform.display_name, 'My Transform')
self.assertEqual(transform.author, __author__)
self.assertEqual(transform.author, '')
self.assertEqual(transform.description, 'This is a test.')
self.assertEqual(transform.help_url, '')
self.assertTrue(transform.debug)
Expand All @@ -102,7 +102,7 @@ class MyTransform(Transform):
transform = MyTransform()
self.assertEqual(transform.name, self.get_transform_name(MyTransform))
self.assertEqual(transform.display_name, 'My Transform')
self.assertEqual(transform.author, __author__)
self.assertEqual(transform.author, '')
self.assertEqual(transform.description, 'This is a test.')
self.assertEqual(transform.help_url, '')
self.assertTrue(transform.debug)
Expand All @@ -117,7 +117,7 @@ class MyTransform(Transform):
transform = MyTransform()
self.assertEqual(transform.name, self.get_transform_name(MyTransform))
self.assertEqual(transform.display_name, 'My Transform')
self.assertEqual(transform.author, __author__)
self.assertEqual(transform.author, '')
self.assertEqual(transform.description, '')
self.assertEqual(transform.help_url, '')
self.assertFalse(transform.debug)
Expand All @@ -132,7 +132,7 @@ class MyTransform(Transform):
transform = MyTransform()
self.assertEqual(transform.name, 'foobar.Transform')
self.assertEqual(transform.display_name, 'My Transform')
self.assertEqual(transform.author, __author__)
self.assertEqual(transform.author, '')
self.assertEqual(transform.description, '')
self.assertEqual(transform.help_url, '')
self.assertFalse(transform.debug)
Expand All @@ -147,7 +147,7 @@ class MyTransform(Transform):
transform = MyTransform()
self.assertEqual(transform.name, self.get_transform_name(MyTransform))
self.assertEqual(transform.display_name, 'Foo')
self.assertEqual(transform.author, __author__)
self.assertEqual(transform.author, '')
self.assertEqual(transform.description, '')
self.assertEqual(transform.help_url, '')
self.assertFalse(transform.debug)
Expand All @@ -162,7 +162,7 @@ class MyTransform(Transform):
transform = MyTransform()
self.assertEqual(transform.name, self.get_transform_name(MyTransform))
self.assertEqual(transform.display_name, 'My Transform')
self.assertEqual(transform.author, __author__)
self.assertEqual(transform.author, '')
self.assertEqual(transform.description, 'foo')
self.assertEqual(transform.help_url, '')
self.assertFalse(transform.debug)
Expand All @@ -177,7 +177,7 @@ class MyTransform(Transform):
transform = MyTransform()
self.assertEqual(transform.name, self.get_transform_name(MyTransform))
self.assertEqual(transform.display_name, 'My Transform')
self.assertEqual(transform.author, __author__)
self.assertEqual(transform.author, '')
self.assertEqual(transform.description, '')
self.assertEqual(transform.help_url, 'foo')
self.assertFalse(transform.debug)
Expand Down Expand Up @@ -207,7 +207,7 @@ class MyTransform(Transform):
transform = MyTransform()
self.assertEqual(transform.name, self.get_transform_name(MyTransform))
self.assertEqual(transform.display_name, 'My Transform')
self.assertEqual(transform.author, __author__)
self.assertEqual(transform.author, '')
self.assertEqual(transform.description, '')
self.assertEqual(transform.help_url, '')
self.assertFalse(transform.debug)
Expand Down

0 comments on commit 9fd4b43

Please sign in to comment.