Skip to content
This repository was archived by the owner on Feb 12, 2025. It is now read-only.

Commit d6b98f5

Browse files
Medan-rfzMedan-rfz
authored
Merge branch 'NginxProxyManager:develop' into develop
2 parents a56342c + b3de76c commit d6b98f5

File tree

17 files changed

+47
-50
lines changed

17 files changed

+47
-50
lines changed

‎backend/internal/token.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ const authModel = require('../models/auth');
55
const helpers = require('../lib/helpers');
66
const TokenModel = require('../models/token');
77

8+
const ERROR_MESSAGE_INVALID_AUTH = 'Invalid email or password';
9+
810
module.exports = {
911

1012
/**
@@ -69,15 +71,15 @@ module.exports = {
6971
};
7072
});
7173
} else {
72-
throw new error.AuthError('Invalid password');
74+
throw new error.AuthError(ERROR_MESSAGE_INVALID_AUTH);
7375
}
7476
});
7577
} else {
76-
throw new error.AuthError('No password auth for user');
78+
throw new error.AuthError(ERROR_MESSAGE_INVALID_AUTH);
7779
}
7880
});
7981
} else {
80-
throw new error.AuthError('No relevant user found');
82+
throw new error.AuthError(ERROR_MESSAGE_INVALID_AUTH);
8183
}
8284
});
8385
},

‎backend/schema/components/stream-object.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
"incoming_port": {
2020
"type": "integer",
2121
"minimum": 1,
22-
"maximum": 65535
22+
"maximum": 65535,
23+
"if": {"properties": {"tcp_forwarding": {"const": true}}},
24+
"then": {"not": {"oneOf": [{"const": 80}, {"const": 443}]}}
2325
},
2426
"forwarding_host": {
2527
"anyOf": [

‎backend/yarn.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -830,9 +830,9 @@ crc32-stream@^4.0.2:
830830
readable-stream "^3.4.0"
831831

832832
cross-spawn@^7.0.2:
833-
version "7.0.3"
834-
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
835-
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
833+
version "7.0.6"
834+
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
835+
integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
836836
dependencies:
837837
path-key "^3.1.0"
838838
shebang-command "^2.0.0"

‎docker/rootfs/etc/nginx/conf.d/include/assets.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
location ~* ^.*\.(css|js|jpe?g|gif|png|webp|woff|eot|ttf|svg|ico|css\.map|js\.map)$ {
1+
location ~* ^.*\.(css|js|jpe?g|gif|png|webp|woff|woff2|eot|ttf|svg|ico|css\.map|js\.map)$ {
22
if_modified_since off;
33

44
# use the public cache

‎docs/src/advanced-config/index.md

-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ networks:
5050
Let's look at a Portainer example:
5151
5252
```yml
53-
version: '3.8'
5453
services:
5554

5655
portainer:
@@ -92,8 +91,6 @@ This image supports the use of Docker secrets to import from files and keep sens
9291
You can set any environment variable from a file by appending `__FILE` (double-underscore FILE) to the environmental variable name.
9392

9493
```yml
95-
version: '3.8'
96-
9794
secrets:
9895
# Secrets are single-line text files where the sole content is the secret
9996
# Paths in this example assume that secrets are kept in local folder called ".secrets"

‎docs/src/setup/index.md

-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ outline: deep
99
Create a `docker-compose.yml` file:
1010

1111
```yml
12-
version: '3.8'
1312
services:
1413
app:
1514
image: 'jc21/nginx-proxy-manager:latest'
@@ -55,7 +54,6 @@ are going to use.
5554
Here is an example of what your `docker-compose.yml` will look like when using a MariaDB container:
5655

5756
```yml
58-
version: '3.8'
5957
services:
6058
app:
6159
image: 'jc21/nginx-proxy-manager:latest'

‎frontend/js/app/dashboard/main.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ module.exports = Mn.View.extend({
5050
onRender: function () {
5151
let view = this;
5252

53-
if (typeof view.stats.hosts === 'undefined') {
54-
Api.Reports.getHostStats()
53+
Api.Reports.getHostStats()
5554
.then(response => {
5655
if (!view.isDestroyed()) {
5756
view.stats.hosts = response;
@@ -61,7 +60,6 @@ module.exports = Mn.View.extend({
6160
.catch(err => {
6261
console.log(err);
6362
});
64-
}
6563
},
6664

6765
/**

‎frontend/js/app/nginx/access/list/item.ejs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<td class="text-center">
2-
<div class="avatar d-block" style="background-image: url(<%- owner.avatar || '/images/default-avatar.jpg' %>)" title="Owned by <%- owner.name %>">
3-
<span class="avatar-status <%- owner.is_disabled ? 'bg-red' : 'bg-green' %>"></span>
2+
<div class="avatar d-block" style="background-image: url(<%- (owner && owner.avatar) || '/images/default-avatar.jpg' %>)" title="Owned by <%- (owner && owner.name) || 'a deleted user' %>">
3+
<span class="avatar-status <%- owner && !owner.is_disabled ? 'bg-green' : 'bg-red' %>"></span>
44
</div>
55
</td>
66
<td>

‎frontend/js/app/nginx/certificates/list/item.ejs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<td class="text-center">
2-
<div class="avatar d-block" style="background-image: url(<%- owner.avatar || '/images/default-avatar.jpg' %>)" title="Owned by <%- owner.name %>">
3-
<span class="avatar-status <%- owner.is_disabled ? 'bg-red' : 'bg-green' %>"></span>
2+
<div class="avatar d-block" style="background-image: url(<%- (owner && owner.avatar) || '/images/default-avatar.jpg' %>)" title="Owned by <%- (owner && owner.name) || 'a deleted user' %>">
3+
<span class="avatar-status <%- owner && !owner.is_disabled ? 'bg-green' : 'bg-red' %>"></span>
44
</div>
55
</td>
66
<td>

‎frontend/js/app/nginx/dead/list/item.ejs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<td class="text-center">
2-
<div class="avatar d-block" style="background-image: url(<%- owner.avatar || '/images/default-avatar.jpg' %>)" title="Owned by <%- owner.name %>">
3-
<span class="avatar-status <%- owner.is_disabled ? 'bg-red' : 'bg-green' %>"></span>
2+
<div class="avatar d-block" style="background-image: url(<%- (owner && owner.avatar) || '/images/default-avatar.jpg' %>)" title="Owned by <%- (owner && owner.name) || 'a deleted user' %>">
3+
<span class="avatar-status <%- owner && !owner.is_disabled ? 'bg-green' : 'bg-red' %>"></span>
44
</div>
55
</td>
66
<td>

‎frontend/js/app/nginx/proxy/list/item.ejs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<td class="text-center">
2-
<div class="avatar d-block" style="background-image: url(<%- owner.avatar || '/images/default-avatar.jpg' %>)" title="Owned by <%- owner.name %>">
3-
<span class="avatar-status <%- owner.is_disabled ? 'bg-red' : 'bg-green' %>"></span>
2+
<div class="avatar d-block" style="background-image: url(<%- (owner && owner.avatar) || '/images/default-avatar.jpg' %>)" title="Owned by <%- (owner && owner.name) || 'a deleted user' %>">
3+
<span class="avatar-status <%- owner && !owner.is_disabled ? 'bg-green' : 'bg-red' %>"></span>
44
</div>
55
</td>
66
<td>

‎frontend/js/app/nginx/redirection/list/item.ejs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<td class="text-center">
2-
<div class="avatar d-block" style="background-image: url(<%- owner.avatar || '/images/default-avatar.jpg' %>)" title="Owned by <%- owner.name %>">
3-
<span class="avatar-status <%- owner.is_disabled ? 'bg-red' : 'bg-green' %>"></span>
2+
<div class="avatar d-block" style="background-image: url(<%- (owner && owner.avatar) || '/images/default-avatar.jpg' %>)" title="Owned by <%- (owner && owner.name) || 'a deleted user' %>">
3+
<span class="avatar-status <%- owner && !owner.is_disabled ? 'bg-green' : 'bg-red' %>"></span>
44
</div>
55
</td>
66
<td>

‎frontend/js/app/nginx/stream/list/item.ejs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<td class="text-center">
2-
<div class="avatar d-block" style="background-image: url(<%- owner.avatar || '/images/default-avatar.jpg' %>)" title="Owned by <%- owner.name %>">
3-
<span class="avatar-status <%- owner.is_disabled ? 'bg-red' : 'bg-green' %>"></span>
2+
<div class="avatar d-block" style="background-image: url(<%- (owner && owner.avatar) || '/images/default-avatar.jpg' %>)" title="Owned by <%- (owner && owner.name) || 'a deleted user' %>">
3+
<span class="avatar-status <%- owner && !owner.is_disabled ? 'bg-green' : 'bg-red' %>"></span>
44
</div>
55
</td>
66
<td>

‎frontend/js/app/user/form.ejs

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="modal-content">
2-
<div class="modal-header">
3-
<h5 class="modal-title"><%- i18n('users', 'form-title', {id: id}) %></h5>
4-
<button type="button" class="close cancel" aria-label="Close" data-dismiss="modal">&nbsp;</button>
5-
</div>
6-
<div class="modal-body">
7-
<form>
2+
<form>
3+
<div class="modal-header">
4+
<h5 class="modal-title"><%- i18n('users', 'form-title', {id: id}) %></h5>
5+
<button type="button" class="close cancel" aria-label="Close" data-dismiss="modal">&nbsp;</button>
6+
</div>
7+
<div class="modal-body">
88
<div class="row">
99
<div class="col-sm-6 col-md-6">
1010
<div class="form-group">
@@ -49,10 +49,10 @@
4949
</div>
5050
<% } %>
5151
</div>
52-
</form>
53-
</div>
54-
<div class="modal-footer">
55-
<button type="button" class="btn btn-secondary cancel" data-dismiss="modal"><%- i18n('str', 'cancel') %></button>
56-
<button type="button" class="btn btn-teal save"><%- i18n('str', 'save') %></button>
57-
</div>
52+
</div>
53+
<div class="modal-footer">
54+
<button type="button" class="btn btn-secondary cancel" data-dismiss="modal"><%- i18n('str', 'cancel') %></button>
55+
<button type="submit" class="btn btn-teal save"><%- i18n('str', 'save') %></button>
56+
</div>
57+
</form>
5858
</div>

‎frontend/js/app/user/form.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ module.exports = Mn.View.extend({
1919

2020
events: {
2121

22-
'click @ui.save': function (e) {
22+
'submit @ui.form': function (e) {
2323
e.preventDefault();
2424
this.ui.error.hide();
2525
let view = this;

‎frontend/yarn.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -2648,9 +2648,9 @@ electron-to-chromium@^1.3.47:
26482648
integrity sha512-67V62Z4CFOiAtox+o+tosGfVk0QX4DJgH609tjT8QymbJZVAI/jWnAthnr8c5hnRNziIRwkc9EMQYejiVz3/9Q==
26492649

26502650
elliptic@^6.5.3, elliptic@^6.5.4:
2651-
version "6.5.7"
2652-
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.7.tgz#8ec4da2cb2939926a1b9a73619d768207e647c8b"
2653-
integrity sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==
2651+
version "6.6.0"
2652+
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.6.0.tgz#5919ec723286c1edf28685aa89261d4761afa210"
2653+
integrity sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==
26542654
dependencies:
26552655
bn.js "^4.11.9"
26562656
brorand "^1.1.0"

‎test/yarn.lock

+6-6
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@
132132
integrity sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==
133133

134134
"@eslint/plugin-kit@^0.2.0":
135-
version "0.2.0"
136-
resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.2.0.tgz#8712dccae365d24e9eeecb7b346f85e750ba343d"
137-
integrity sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==
135+
version "0.2.3"
136+
resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz#812980a6a41ecf3a8341719f92a6d1e784a2e0e8"
137+
integrity sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==
138138
dependencies:
139139
levn "^0.4.1"
140140

@@ -628,9 +628,9 @@ core-util-is@1.0.2:
628628
integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
629629

630630
cross-spawn@^7.0.0, cross-spawn@^7.0.2:
631-
version "7.0.3"
632-
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
633-
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
631+
version "7.0.6"
632+
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
633+
integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
634634
dependencies:
635635
path-key "^3.1.0"
636636
shebang-command "^2.0.0"

0 commit comments

Comments
 (0)