Skip to content

Tentative reverse proxy fix #501

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Tentative reverse proxy fix #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions gdbgui/server/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from flask import Flask, abort, request, session
from flask_compress import Compress # type: ignore
from flask_socketio import SocketIO, emit # type: ignore
from werkzeug.middleware.proxy_fix import ProxyFix

from .constants import DEFAULT_GDB_EXECUTABLE, STATIC_DIR, TEMPLATE_DIR
from .http_routes import blueprint
Expand All @@ -15,6 +16,7 @@
logger = logging.getLogger(__file__)
# Create flask application and add some configuration keys to be used in various callbacks
app = Flask(__name__, template_folder=str(TEMPLATE_DIR), static_folder=str(STATIC_DIR))
app.wsgi_app = ProxyFix(app.wsgi_app, x_for=1,x_prefix=1)
Compress(
app
) # add gzip compression to Flask. see https://github.com/libwilliam/flask-compress
Expand Down
4 changes: 3 additions & 1 deletion gdbgui/src/js/GdbApi.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ if (debug) {
// @ts-expect-error ts-migrate(2339) FIXME: Property 'initial_data' does not exist on type 'Wi... Remove this comment to see the full error message
const initial_data = window.initial_data;
let socket: SocketIOClient.Socket;
const base = window.location.pathname.replace(/\/$/, '');
const GdbApi = {
getSocket: function() {
return socket;
Expand All @@ -49,7 +50,8 @@ const GdbApi = {
csrf_token: initial_data.csrf_token,
gdbpid: initial_data.gdbpid,
gdb_command: initial_data.gdb_command
}
},
path: base + '/socket.io',
});

socket.on("connect", function() {
Expand Down
13 changes: 13 additions & 0 deletions gdbgui/src/js/ajaxOverride.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const originalAjax = $.ajax;
const base = window.location.pathname.replace(/\/$/, '');
console.log("AjaxOverride");

$.ajax = function (options: any) {
// You can customize the options here
const modifiedOptions = {
...options,
url: base + options.url
};

return originalAjax.call(this, modifiedOptions);
};
2 changes: 2 additions & 0 deletions gdbgui/src/js/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import './ajaxOverride'

let constants = {
ENTER_BUTTON_NUM: 13,
TAB_BUTTON_NUM: 9,
Expand Down
5 changes: 4 additions & 1 deletion gdbgui/templates/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
<link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}" />
</head>


<base href="{{ url_for('static', filename='') }}">

<body class="w-screen h-screen bg-gray-300">
<div id="dashboard">Loading dashboard...</div>
</body>
Expand All @@ -15,5 +18,5 @@
window.csrf_token = {{csrf_token | tojson}}
window.default_command = {{default_command | tojson}}
</script>
<script type="text/javascript" src="static/js/dashboard.js?_={{version}}"></script>
<script type="text/javascript" src="js/dashboard.js?_={{version}}"></script>
</html>
25 changes: 13 additions & 12 deletions gdbgui/templates/gdbgui.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,25 @@ <h3>Loading application, please wait.</h3>
</div>
</body>

<link href="static/vendor/css/bootstrap.min.css" rel="stylesheet" />
<link href="static/vendor/css/gdbgui_awesomeplete.css" rel="stylesheet" />
<base href="{{ url_for('static', filename='') }}">
<link href="vendor/css/bootstrap.min.css" rel="stylesheet" />
<link href="vendor/css/gdbgui_awesomeplete.css" rel="stylesheet" />
<script>
initial_data = {{initial_data | tojson}}
debug = {{debug | tojson}}
</script>
<script type="text/javascript" src="static/vendor/js/jquery.min.js"></script>
<script type="text/javascript" src="static/vendor/js/jquery.flot-0.8.3.min.js"></script>
<script type="text/javascript" src="static/vendor/js/bootstrap.min.js"></script>
<script type="text/javascript" src="static/vendor/js/lodash.min.js"></script>
<script type="text/javascript" src="static/vendor/js/moment.min.js"></script>
<script type="text/javascript" src="static/vendor/js/vis-4.20.1.min.js"></script>
<script type="text/javascript" src="static/vendor/js/awesomeplete.min.js"></script>
<script type="text/javascript" src="static/vendor/js/splitjs.min-1.2.0.js"></script>
<script type="text/javascript" src="vendor/js/jquery.min.js"></script>
<script type="text/javascript" src="vendor/js/jquery.flot-0.8.3.min.js"></script>
<script type="text/javascript" src="vendor/js/bootstrap.min.js"></script>
<script type="text/javascript" src="vendor/js/lodash.min.js"></script>
<script type="text/javascript" src="vendor/js/moment.min.js"></script>
<script type="text/javascript" src="vendor/js/vis-4.20.1.min.js"></script>
<script type="text/javascript" src="vendor/js/awesomeplete.min.js"></script>
<script type="text/javascript" src="vendor/js/splitjs.min-1.2.0.js"></script>

<script type="text/javascript" src="static/js/main.js?_={{version}}"></script>
<script type="text/javascript" src="js/main.js?_={{version}}"></script>

{% for theme in themes %}
<link href="static/vendor/css/pygments/{{theme}}.css" rel="stylesheet" />
<link href="vendor/css/pygments/{{theme}}.css" rel="stylesheet" />
{% endfor %}
</html>