Skip to content

Fixes #15 and #16 #17

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
FragsterAt wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes #15 and #16 #17

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8c7682
fetch_regex in error, fixes #16
FragsterAt Mar 4, 2022
68f5c62
fix url, if it miss second slash after protocol, fixes #15
FragsterAt Mar 4, 2022
8255ba6
echo request url in wrong url eror message #16
FragsterAt Mar 4, 2022
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
32 changes: 16 additions & 16 deletions server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var config = require("./config");
var url = require("url");
var request = require("request");
var cluster = require('cluster');
var throttle = require("tokenthrottle")({rate: config.max_requests_per_second});
var throttle = require("tokenthrottle")({ rate: config.max_requests_per_second });

http.globalAgent.maxSockets = Infinity;
https.globalAgent.maxSockets = Infinity;
Expand All @@ -19,7 +19,7 @@ publicAddressFinder(function (err, data) {
}
});

function addCORSHeaders(req, res) {
function addCORSHeaders (req, res) {
if (req.method.toUpperCase() === "OPTIONS") {
if (req.headers["access-control-request-headers"]) {
res.setHeader("Access-Control-Allow-Headers", req.headers["access-control-request-headers"]);
Expand All @@ -38,25 +38,25 @@ function addCORSHeaders(req, res) {
}
}

function writeResponse(res, httpCode, body) {
function writeResponse (res, httpCode, body) {
res.statusCode = httpCode;
res.end(body);
}

function sendInvalidURLResponse(res) {
return writeResponse(res, 404, "url must be in the form of /fetch/{some_url_here}");
function sendInvalidURLResponse (res, fetch_regex, url) {
return writeResponse(res, 404, "url must be in the form of " + fetch_regex + "{some_url_here}, has " + url);
}

function sendTooBigResponse(res) {
function sendTooBigResponse (res) {
return writeResponse(res, 413, "the content in the request or response cannot exceed " + config.max_request_length + " characters.");
}

function getClientAddress(req) {
function getClientAddress (req) {
return (req.headers['x-forwarded-for'] || '').split(',')[0]
|| req.connection.remoteAddress;
}

function processRequest(req, res) {
function processRequest (req, res) {
addCORSHeaders(req, res);

// Return options pre-flight requests right away
Expand All @@ -70,10 +70,11 @@ function processRequest(req, res) {
var remoteURL;

try {
remoteURL = url.parse(decodeURI(result[1]));
var unnormalizedUrl = result[1].replace(/^(http(s?):\/)(?!\/)/, '$1/')
remoteURL = url.parse(decodeURI(unnormalizedUrl));
}
catch (e) {
return sendInvalidURLResponse(res);
return sendInvalidURLResponse(res, config.fetch_regex, req.url);
}

// We don't support relative links
Expand Down Expand Up @@ -105,7 +106,7 @@ function processRequest(req, res) {
if (req.headers["host"]) {
req.headers["host"] = remoteURL.host;
}

// Remove origin and referer headers. TODO: This is a bit naughty, we should remove at some point.
delete req.headers["origin"];
delete req.headers["referer"];
Expand Down Expand Up @@ -141,7 +142,7 @@ function processRequest(req, res) {
proxyRequest.end();
return sendTooBigResponse(res);
}
}).on('error', function(err){
}).on('error', function (err) {
writeResponse(res, 500, "Stream Error");
});

Expand All @@ -153,12 +154,12 @@ function processRequest(req, res) {
proxyRequest.end();
return sendTooBigResponse(res);
}
}).on('error', function(err){
}).on('error', function (err) {
writeResponse(res, 500, "Stream Error");
});
}
else {
return sendInvalidURLResponse(res);
return sendInvalidURLResponse(res, config.fetch_regex, req.url);
}
}

Expand All @@ -167,8 +168,7 @@ if (cluster.isMaster) {
cluster.fork();
}
}
else
{
else {
http.createServer(function (req, res) {

// Process AWS health checks
Expand Down