Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support raw url path & fix download file name #10

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ cd Re2Pcap/
```
OR
```
docker run --rm --cap-add NET_ADMIN -p 5000:5000 --name re2pcap amitraut/re2pcap
docker run -d --cap-add NET_ADMIN -p 5000:5000 --name re2pcap jkxss/re2pcap
```

Open `localhost:5000` in your web browser to access Re2Pcap or use [Re2Pcap-cmd](Re2Pcap-cmd) script to interact with Re2Pcap container to get PCAP in current working directory
Expand Down
16 changes: 14 additions & 2 deletions Re2Pcap/Re2Pcap
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@ class simpleHTTPRequestHandler(BaseHTTPRequestHandler):

# Client send request method
def send_request(req, port, postParam):
logger.info('req info: %s',req)
# Setting default headers to None
default_headers = ['Connection', 'User-Agent', 'Accept', 'Accept-Encoding']
header_dict = dict(req.headers.items())
Expand All @@ -394,11 +395,22 @@ def send_request(req, port, postParam):

# Setting path to start with `/` if it doesn't start with it
url_path = "/" + req.path if req.path[0] != "/" else req.path
logger.info('url path: %s',url_path)
try:
if req.command == 'GET':
responseText = ses.get('http://' + get_ip() + ':' + str(port) + url_path, headers=header_dict)
url = 'http://' + get_ip() + ':' + str(port) + url_path
req = requests.Request('GET',url,headers=header_dict)
prepared = ses.prepare_request(req)
prepared.url = url
responseText = ses.send(prepared)
#responseText = ses.get('http://' + get_ip() + ':' + str(port) + url_path, headers=header_dict)
elif req.command == 'POST':
responseText = ses.post('http://' + get_ip() + ':' + str(port) + url_path, headers=header_dict, data=postParam)
url = 'http://' + get_ip() + ':' + str(port) + url_path
req = requests.Request('POST', url, headers=header_dict, data=postParam)
prepared = ses.prepare_request(req)
prepared.url = url
responseText = ses.send(prepared)
#responseText = ses.post('http://' + get_ip() + ':' + str(port) + url_path, headers=header_dict, data=postParam)
else:
logger.warning(' Incompatible Method. This may fail')
http_methods = ["HEAD", "PUT", "DELETE", "CONNECT", "OPTIONS", "TRACE", "PATCH"]
Expand Down
2 changes: 1 addition & 1 deletion Re2Pcap/Re2Pcap.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def createPcap():
time.sleep(5)
childProc.communicate()
if not childProc.returncode:
return send_file('io/Re2Pcap-result.pcap', as_attachment=True, attachment_filename=resultFileName)
return send_file('io/Re2Pcap-result.pcap', as_attachment=True, download_name=resultFileName)
else:
return jsonify(error='Something went Wrong :( Please Check the Input/ Error log and Try Again ....')
else:
Expand Down
7 changes: 7 additions & 0 deletions Re2Pcap/static/css/bootstrap.min.css

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions Re2Pcap/static/js/bootstrap.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions Re2Pcap/static/js/jquery.min.js

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions Re2Pcap/static/js/popper.min.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Re2Pcap/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<html>
<head>
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="static/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">

<!-- custom css -->
<link href="static/css/mystyle.css" rel="stylesheet">
Expand Down Expand Up @@ -65,10 +65,10 @@
</form>
</div>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="static/js/jquery.min.js"></script>
<!-- <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script> -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
<script src="static/js/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
<script src="static/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
<script src="{{ url_for('static', filename='js/myscript.js') }}"></script>

<!-- <script src="static/js/myscript.js"></script> -->
Expand Down