-
- Not connected
- Users connected: 0
- To test, open two windows with Web Socket support, type a message above and press return.
- The server side code is available here: node-web-socket & server (note that it runs on nodejs)
-
-
-
\ No newline at end of file
diff --git a/squatm3-api/requirements.txt b/squatm3-api/requirements.txt
index 1445303..52f6988 100644
--- a/squatm3-api/requirements.txt
+++ b/squatm3-api/requirements.txt
@@ -1,8 +1,16 @@
-tld==0.9.1
+Flask==1.0.2
+Flask_And_Redis>=0.7
+Flask_RESTful>=0.3.6
+Flask_Session>=0.3.1
+Flask_SocketIO>=3.0.2
+attr==0.3.1
attrs==18.2.0
+eventlet==0.24.1
+homoglyphs==1.3.1
redis==2.10.6
-requests>=2.20.0
+requests>=2.20.1
simplejson==3.16.0
+<<<<<<< HEAD
Flask_RESTful==0.3.6
Flask==1.0.2
Flask_Session==0.3.1
@@ -13,3 +21,7 @@ attr==0.3.1
Flask_And_Redis==0.7
eventlet
Flask-Redis==0.3.0
+=======
+tld==0.9.1
+validators==0.12.2
+>>>>>>> upstream/master
diff --git a/squatm3-api/server.py b/squatm3-api/server.py
index cb14cd0..de7d562 100644
--- a/squatm3-api/server.py
+++ b/squatm3-api/server.py
@@ -15,8 +15,6 @@ import validators
import eventlet
eventlet.monkey_patch(socket=True)
-
-
# initiate the app, Api and redis settings reading from config file
template_dir = os.path.abspath('../squatm3-ui')
app = Flask(__name__, template_folder=template_dir)
@@ -31,17 +29,15 @@ app.static_url_path="../squatm3-ui/static"
# set the absolute path to the static folder
app.static_folder=app.static_url_path
-#print(app.static_url_path)
-#print(app.static_folder)
-#app.config.from_pyfile('config.cfg')
+# Setup Session
app.config['SESSION_TYPE'] = 'redis'
app.config['SECRET_KEY'] = 'mysecretrediskey'
app.config['SESSION_REDIS'] = redis.Redis(host='localhost', port=6379, password='waddup')
-
sess = Session()
sess.init_app(app)
+# Setup SocketIO
socketio = SocketIO(app)
socketio.init_app(app, async_mode=async_mode, message_queue='redis://:waddup@localhost:6379/')
@@ -64,8 +60,6 @@ def start_reporting(sess_key=None, sid=None):
We do this by comparing the job_id and the session key. When we start an attack we create a UUID used as session
key and as job_id
'''
- #sess_key = "123"
- print(sess_key + "##" + sid)
print("Entering start_reporting")
c = comm.Communication()
with app.app_context():
@@ -75,29 +69,21 @@ def start_reporting(sess_key=None, sid=None):
if job and sess_key:
w_id,job_id,msg = job.decode().split("#")
if job_id == sess_key:
- print("###########")
- print(msg)
- print("###########")
socketio.emit('results', msg, room=sid)
else:
- print("NOT FOR THIS SESSION")
- print(msg)
#message not for this client, return it back in the queue
c.redis.rpush(c.channel_reporting, job)
@socketio.on('client_connected')
def handle_client_connect_event():
- print("connected client socketio")
worker_reporter = threading.Thread(target=start_reporting, kwargs=dict(sess_key=check_session(), sid=request.sid))
worker_reporter.setDaemon(True)
worker_reporter.start()
- #threadreport = socketio.start_background_task(target=start_reporting(check_session()))
@app.route('/')
def index():
create_session()
- print('Session has been created')
return render_template('index.html', async_mode=socketio.async_mode)
@app.errorhandler(404)
@@ -146,14 +132,10 @@ class get_list_domains_generated(Resource):
commands = ["Hf","Hc","-add","F","R"]
-
-
for attack in attacks:
- print(attack)
if attack in commands:
options = options + "-" + attack + " "
-
if godaddy == 1:
options = options + "--godaddy "
@@ -164,11 +146,8 @@ class get_list_domains_generated(Resource):
except Exception as e:
print(e)
-
return "Something went wrong while parsing the query string"
-
-
"""
Retrieves all the domains generated by the ALL attacks
We use the redis producer to push a Job object to the queue.
@@ -196,8 +175,6 @@ class get_list_domains_generated(Resource):
api.add_resource(get_list_domains_generated, '/api/