Skip to content

fix: proxy body forwarding and auth for /hooks routes #213

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
serefyarar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: proxy body forwarding and auth for /hooks routes #213

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
17 changes: 16 additions & 1 deletion src/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,6 +1316,17 @@ const proxy = httpProxy.createProxyServer({
xfwd: true,
});

// express.json() consumes the request stream before http-proxy can pipe
// it. Re-serialize req.body so the gateway receives the full payload.
proxy.on("proxyReq", (proxyReq, req) => {
if (req.body && typeof req.body === "object" && Object.keys(req.body).length > 0) {
const bodyData = JSON.stringify(req.body);
proxyReq.setHeader("Content-Type", "application/json");
proxyReq.setHeader("Content-Length", Buffer.byteLength(bodyData));
proxyReq.write(bodyData);
}
});

proxy.on("error", (err, _req, res) => {
console.error("[proxy]", err);
try {
Expand Down Expand Up @@ -1387,7 +1398,11 @@ app.use(requireDashboardAuth, async (req, res) => {
}
}

attachGatewayAuthHeader(req);
// Hooks have their own auth token (hooks.token); do not inject the
// gateway token or the hooks handler will read the wrong credential.
if (!req.path.startsWith("/hooks")) {
attachGatewayAuthHeader(req);
}
return proxy.web(req, res, { target: GATEWAY_TARGET });
});

Expand Down