Skip to content

add forward path prefix to prefix services in a sub path. #3115

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

Open
wants to merge 2 commits into
base: develop
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
42 changes: 42 additions & 0 deletions backend/migrations/20230811144605_forward_path.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
const migrate_name = 'identifier_for_migrate';
const logger = require('../logger').migrate;

/**
* Migrate
*
* @see http://knexjs.org/#Schema
*
* @param {Object} knex
* @param {Promise} Promise
* @returns {Promise}
*/
exports.up = function (knex) {

logger.info('[' + migrate_name + '] Migrating Up...');


return knex.schema.alterTable('proxy_host', function(table){
table.string('forward_path_prefix').notNull().defaultTo('' );
})
.then(function() {
logger.info('[' + migrate_name + '] Migrating Up Complete');
});
};

/**
* Undo Migrate
*
* @param {Object} knex
* @param {Promise} Promise
* @returns {Promise}
*/
exports.down = function (knex) {
logger.info('[' + migrate_name + '] Migrating Down...');

return knex.schema.alterTable('proxy_host', function(table){
table.dropColumn('forward_path_prefix');
})
.then(() => {
logger.info('[' + migrate_name + '] Migrating Down Complete');
});
};
15 changes: 15 additions & 0 deletions backend/schema/endpoints/proxy-hosts.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@
"minimum": 1,
"maximum": 65535
},
"forward_path_prefix":{
"type":"string",
"pattern": "^(\/[^/]+)*$",
"maxLength":255
},
"certificate_id": {
"$ref": "../definitions.json#/definitions/certificate_id"
},
Expand Down Expand Up @@ -102,6 +107,10 @@
"forward_path": {
"type": "string"
},
"forward_path_prefix":{
"type":"string",
"pattern": "^(\/[^/]+)*$"
},
"advanced_config": {
"type": "string"
}
Expand Down Expand Up @@ -221,6 +230,9 @@
"forward_port": {
"$ref": "#/definitions/forward_port"
},
"forward_path_prefix":{
"$ref": "#/definitions/forward_path_prefix"
},
"certificate_id": {
"$ref": "#/definitions/certificate_id"
},
Expand Down Expand Up @@ -294,6 +306,9 @@
"forward_port": {
"$ref": "#/definitions/forward_port"
},
"forward_path_prefix":{
"$ref": "#/definitions/forward_path_prefix"
},
"certificate_id": {
"$ref": "#/definitions/certificate_id"
},
Expand Down
2 changes: 1 addition & 1 deletion backend/templates/_location.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Real-IP $remote_addr;
proxy_pass {{ forward_scheme }}://{{ forward_host }}:{{ forward_port }}{{ forward_path }};
proxy_pass {{ forward_scheme }}://{{ forward_host }}:{{ forward_port }}{{ forward_path_prefix }}{{ forward_path }};

{% include "_access.conf" %}
{% include "_assets.conf" %}
Expand Down
1 change: 1 addition & 0 deletions backend/templates/proxy_host.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ server {
set $forward_scheme {{ forward_scheme }};
set $server "{{ forward_host }}";
set $port {{ forward_port }};
set $path_prefix "{{ forward_path_prefix }}";

{% include "_listen.conf" %}
{% include "_certificates.conf" %}
Expand Down
1 change: 1 addition & 0 deletions docker/rootfs/etc/nginx/conf.d/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ server {
set $forward_scheme "http";
set $server "127.0.0.1";
set $port "80";
set $path_prefix "";

server_name localhost-nginx-proxy-manager;
access_log /data/logs/fallback_access.log standard;
Expand Down
2 changes: 1 addition & 1 deletion docker/rootfs/etc/nginx/conf.d/include/proxy.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ proxy_set_header X-Forwarded-Scheme $scheme;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Real-IP $remote_addr;
proxy_pass $forward_scheme://$server:$port$request_uri;
proxy_pass $forward_scheme://$server:$port$path_prefix$request_uri;

6 changes: 6 additions & 0 deletions frontend/js/app/nginx/proxy/form.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@
<input name="forward_port" type="number" class="form-control text-monospace" placeholder="80" value="<%- forward_port %>" required>
</div>
</div>
<div class="col-sm-12 col-md-12">
<div class="form-group">
<label class="form-label"><%- i18n('proxy-hosts','forward-path-prefix') %></label>
<input name="forward_path_prefix" type="text" class="form-control text-monospace" placeholder="/" value="<%- forward_path_prefix %>">
</div>
</div>
<div class="col-sm-6 col-md-6">
<div class="form-group">
<label class="custom-switch">
Expand Down
5 changes: 4 additions & 1 deletion frontend/js/app/nginx/proxy/form.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ module.exports = Mn.View.extend({
dns_provider_credentials: 'textarea[name="meta[dns_provider_credentials]"]',
propagation_seconds: 'input[name="meta[propagation_seconds]"]',
forward_scheme: 'select[name="forward_scheme"]',
letsencrypt: '.letsencrypt'
letsencrypt: '.letsencrypt',
forward_path_prefix: 'input[name="forward_path_prefix"]'
},

regions: {
Expand Down Expand Up @@ -149,6 +150,7 @@ module.exports = Mn.View.extend({
let data = this.ui.form.serializeJSON();

// Add locations
console.log(this.locationsCollection.models)
data.locations = [];
this.locationsCollection.models.forEach((___location) => {
data.locations.push(___location.toJSON());
Expand Down Expand Up @@ -361,6 +363,7 @@ module.exports = Mn.View.extend({
// Check wether there are any ___location defined
if (options.model && Array.isArray(options.model.attributes.locations)) {
options.model.attributes.locations.forEach((___location) => {
console.log(___location)
let m = new ProxyLocationModel.Model(___location);
this.locationsCollection.add(m);
});
Expand Down
2 changes: 1 addition & 1 deletion frontend/js/app/nginx/proxy/list/item.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</div>
</td>
<td>
<div class="text-monospace"><%- forward_scheme %>://<%- forward_host %>:<%- forward_port %></div>
<div class="text-monospace"><%- forward_scheme %>://<%- forward_host %>:<%- forward_port %><%- forward_path_prefix %></div>
</td>
<td>
<div><%- certificate && certificate_id ? i18n('ssl', certificate.provider) : i18n('ssl', 'none') %></div>
Expand Down
6 changes: 6 additions & 0 deletions frontend/js/app/nginx/proxy/___location-item.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
<input name="forward_port" type="number" class="form-control text-monospace model" placeholder="80" value="<%- forward_port %>" required>
</div>
</div>
<div class="col-sm-12 col-md-12">
<div class="form-group">
<label class="form-label"><%- i18n('proxy-hosts','forward-path-prefix') %></label>
<input name="forward_path_prefix" type="text" class="form-control text-monospace model" placeholder="" value="<%- forward_path_prefix %>">
</div>
</div>
</div>
<div class="row config">
<div class="col-md-12">
Expand Down
1 change: 1 addition & 0 deletions frontend/js/i18n/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
"forward-scheme": "Scheme",
"forward-host": "Forward Hostname / IP",
"forward-port": "Forward Port",
"forward-path-prefix": "Forward Path Prefix",
"delete": "Delete Proxy Host",
"delete-confirm": "Are you sure you want to delete the Proxy host for: <strong>{domains}</strong>?",
"help-title": "What is a Proxy Host?",
Expand Down
3 changes: 2 additions & 1 deletion frontend/js/models/proxy-host-___location.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ const model = Backbone.Model.extend({
advanced_config: '',
forward_scheme: 'http',
forward_host: '',
forward_port: '80'
forward_port: '80',
forward_path_prefix:''
}
},

Expand Down
1 change: 1 addition & 0 deletions frontend/js/models/proxy-host.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const model = Backbone.Model.extend({
forward_scheme: 'http',
forward_host: '',
forward_port: null,
forward_path_prefix: '',
access_list_id: 0,
certificate_id: 0,
ssl_forced: false,
Expand Down