removed moduleman_plugin decorator (fixes xmendez#259)

framework/fuzzer/base.py

@@ -2,6 +2,8 @@
 
 # decorator for iterator plugins
 def wfuzz_iterator(gen_func):
+    method_args = ["count", "next", "__iter__"]
+
     class _reiterator:
 	name = gen_func.name
 	description = gen_func.description
@@ -23,7 +25,12 @@ def __getattr__(self, method):
 	    else:
 		return self.restart
 
+    for method in method_args:
+	if (not (method in dir(gen_func))):
+	    raise Exception("Required method %s not implemented" % method)
+
     _reiterator.__PLUGIN_MODULEMAN_MARK = "Plugin mark"
+
     return _reiterator
 
 class BaseFuzzRequest:

plugins/payloads.py

@@ -4,14 +4,12 @@
 import cPickle as pickle
 import gzip
 
-from externals.moduleman.plugin import moduleman_plugin
 from framework.core.myexception import FuzzException
 from framework.fuzzer.base import wfuzz_iterator
 from framework.plugins.api.payloadtools import BingIter
 from framework.plugins.api.payloadtools import range_results, filter_results
 
 @wfuzz_iterator
-@moduleman_plugin("count", "next", "__iter__")
 class file:
     name = "file"
     description = "Returns each word from a file."
@@ -46,7 +44,6 @@ def next(self):
 
 
 @wfuzz_iterator
-@moduleman_plugin("count", "next", "__iter__")
 class range:
     name = "range"
     description = "Returns each number of the given range. ie. 0-10"
@@ -84,7 +81,6 @@ def __iter__(self):
 	return self
 
 @wfuzz_iterator
-@moduleman_plugin("count", "next", "__iter__")
 class hexrange:
     name = "hexrange"
     description = "Returns each hex number of the given hex range. ie. 00-ff"
@@ -122,7 +118,6 @@ def next(self):
 	return payl
 
 @wfuzz_iterator
-@moduleman_plugin("count", "next", "__iter__")
 class hexrand:
     name = "hexrand"
     description = "Returns random hex numbers."
@@ -157,7 +152,6 @@ def next (self):
 
 
 @wfuzz_iterator
-@moduleman_plugin("count", "next", "__iter__")
 class buffer_overflow:
     name = "buffer_overflow"
     description = "Returns a string using the following pattern A * given number."
@@ -183,7 +177,6 @@ def next (self):
 	    raise StopIteration
 
 @wfuzz_iterator
-@moduleman_plugin("count", "next", "__iter__")
 class list:
     name = "list"
     description = "Returns each element of the given word list separated by -. ie word1-word2"
@@ -221,7 +214,6 @@ def next (self):
 	    return elem
 
 @wfuzz_iterator
-@moduleman_plugin("count", "next", "__iter__")
 class stdin:
     name = "stdin"
     description = "Returns each item read from stdin."
@@ -247,7 +239,6 @@ def next (self):
 	return line
 
 @wfuzz_iterator
-@moduleman_plugin("count", "next", "__iter__")
 class names:
     name = "names"
     description = "Returns possible usernames by mixing the given words, separated by -, using known typical constructions. ie. jon-smith"
@@ -324,7 +315,6 @@ def next(self):
 	    raise StopIteration
 
 @wfuzz_iterator
-@moduleman_plugin("count", "next", "__iter__")
 class permutation:
     name = "permutation"
     description = "Returns permutations of the given charset and length. ie. abc-2"
@@ -378,7 +368,6 @@ def xcombinations(self, items, n):
 		sys.exit()
 
 @wfuzz_iterator
-@moduleman_plugin("count", "next", "__iter__")
 class bing:
     '''
     Some examples of bing hacking:
@@ -411,7 +400,6 @@ def next(self):
 	return self._it.next()
 
 @wfuzz_iterator
-@moduleman_plugin("count", "next",  "__iter__")
 class wfuzz:
     name = "wfuzz"
     description = "Returns fuzz results' URL from a previous stored wfuzz session."