reorganized the folders

included node as part of the server

PyFuzz2-Node/debugging/msec/license.txt → node/debugging/msec/license.txt

@@ -1,14 +1,14 @@
-Microsoft Public License (Ms-PL)
-This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.
-
-Definitions
-The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law. A "contribution" is the original software, or any additions or changes to the software. A "contributor" is any person that distributes its contribution under this license. "Licensed patents" are a contributor's patent claims that read directly on its contribution.
-Grant of Rights
-(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
-(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
-Conditions and Limitations
-(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks. 
-(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically. 
-(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software. 
-(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license. 
+Microsoft Public License (Ms-PL)
+This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.
+
+Definitions
+The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law. A "contribution" is the original software, or any additions or changes to the software. A "contributor" is any person that distributes its contribution under this license. "Licensed patents" are a contributor's patent claims that read directly on its contribution.
+Grant of Rights
+(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
+(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
+Conditions and Limitations
+(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks. 
+(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically. 
+(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software. 
+(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license. 
 (E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees, or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.

PyFuzz2-Node/fuzzing/bytemutation.py → node/fuzzing/bytemutation.py

@@ -1,6 +1,7 @@
 __author__ = 'susperius'
 
 import random
+
 import helper
 import fuzzer
 

PyFuzz2-Node/fuzzing/javascript.py → node/fuzzing/javascript.py

@@ -1,18 +1,16 @@
 __author__ = 'susperius'
 
+import random
+
 from jsfuzzer.JsDocument import *
 from jsfuzzer.JsElement import *
-from jsfuzzer.JsAttrNodeMap import *
 from jsfuzzer.JsGlobal import JsGlobal
 from jsfuzzer.domObjects import *
 from jsfuzzer.htmlObjects import *
-from jsfuzzer.values import *
 from jsfuzzer.browserObjects import *
 from html import HtmlFuzzer
 from jsfuzzer.values import FuzzValues
 import fuzzer
-import random
-import os
 
 TEMPLATE_FILE = "fuzzing/jsfuzzer/template.dat"
 

PyFuzz2-Server/pyfuzz2_server.py → pyfuzz2_server.py

@@ -1,10 +1,13 @@
 __author__ = 'susperius'
 
 import logging
+from urlparse import parse_qs
+
 import gevent
 import gevent.monkey
-import node.config
 from gevent.queue import Queue
+
+import node.model.config
 from communication.beaconserver import BeaconServer
 from communication.reportserver import ReportServer
 from communication.webserver import WebServer
@@ -13,8 +16,6 @@
 from worker.reportworker import ReportWorker
 from worker.nodeclientworker import NodeClientWorker
 from web.main import WebSite
-from urlparse import parse_qs
-import model.message_types as message_types
 
 gevent.monkey.patch_all()
 

PyFuzz2-Server/web/main.py → web/main.py

@@ -1,6 +1,6 @@
 __author__ = 'susperius'
 import html
-from node.config import ConfigParser
+from node.model.config import ConfigParser
 
 class WebSite:
     def __init__(self):

worker/__init__.py

@@ -0,0 +1 @@
+__author__ = 'susperius'

PyFuzz2-Server/worker/beaconworker.py → worker/beaconworker.py

@@ -1,9 +1,10 @@
 __author__ = 'susperius'
 
-import gevent
 import logging
 import pickle
-from gevent.queue import Queue
+
+import gevent
+
 from model.node import PyFuzz2Node
 
 

PyFuzz2-Server/worker/nodeclientworker.py → worker/nodeclientworker.py

@@ -1,8 +1,10 @@
 __author__ = 'susperius'
 
-import gevent
 import logging
 import pickle
+
+import gevent
+
 from communication.nodeclient import NodeClient
 from worker import Worker