Skip to content

feat: add internalUrl option to avoid hairpin-NAT on self-fetches #32

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

Draft
juliusknorr wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: add internalUrl option to avoid hairpin-NAT on self-fetches #32

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
3 changes: 2 additions & 1 deletion Common/config/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,8 @@
"documentFormatsFile": "../../document-formats/onlyoffice-docs-formats.json",
"downloadFileAllowExt": ["pdf", "xlsx"],
"tokenRequiredParams": true,
"forceSaveUsingButtonWithoutChanges": false
"forceSaveUsingButtonWithoutChanges": false,
"internalUrl": ""
},
"requestDefaults": {
"headers": {
Expand Down
9 changes: 9 additions & 0 deletions Common/sources/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ const cfgSecret = config.get('aesEncrypt.secret');
const cfgAESConfig = config.util.cloneDeep(config.get('aesEncrypt.config'));
const cfgRequesFilteringAgent = config.get('services.CoAuthoring.request-filtering-agent');
const cfgStorageExternalHost = config.get('storage.externalHost');
const cfgInternalUrl = config.get('services.CoAuthoring.server.internalUrl');
const cfgExternalRequestDirectIfIn = config.get('externalRequest.directIfIn');
const cfgExternalRequestAction = config.get('externalRequest.action');
const cfgWinCa = config.util.cloneDeep(config.get('win-ca'));
Expand Down Expand Up @@ -346,8 +347,16 @@ async function downloadUrlPromise(ctx, uri, optTimeout, optLimit, opt_Authorizat
const tenTenantRequestDefaults = ctx.getCfg('services.CoAuthoring.requestDefaults', cfgRequestDefaults);
const tenTokenOutboxHeader = ctx.getCfg('services.CoAuthoring.token.outbox.header', cfgTokenOutboxHeader);
const tenTokenOutboxPrefix = ctx.getCfg('services.CoAuthoring.token.outbox.prefix', cfgTokenOutboxPrefix);
const tenInternalUrl = ctx.getCfg('services.CoAuthoring.server.internalUrl', cfgInternalUrl);
const tenStorageExternalHost = ctx.getCfg('storage.externalHost', cfgStorageExternalHost);
const sizeLimit = optLimit || Number.MAX_VALUE;
uri = URI.serialize(URI.parse(uri));
if (tenInternalUrl && tenStorageExternalHost) {
const externalOrigin = tenStorageExternalHost.replace(/\/$/, '');
if (uri.startsWith(externalOrigin + '/') || uri === externalOrigin) {
uri = tenInternalUrl.replace(/\/$/, '') + uri.slice(externalOrigin.length);
}
}
const options = config.util.cloneDeep(tenTenantRequestDefaults);

//baseRequest creates new agent(win-ca injects in globalAgent)
Expand Down
Loading