Skip to content

Commit ec29d4c

Browse files
renovate[bot]Zoey2936
authored andcommitted
dep updates/remove useless files/fix reachability test?
Update zoeyvid/nginx-quic Docker tag to v110 Update zoeyvid/nginx-quic Docker tag to v109 Update zoeyvid/nginx-quic Docker tag to v107 Update dependency liquidjs to v10.7.1 Update dependency eslint to v8.38.0 remove empty folder Delete Hosts.spec.js Fix for SSL certificate error NginxProxyManager#2011 by @S-T-3-V-3 - Keepalive, User Agent + Accept headers - Catch added for failed JSON parsing - More accurate errors displayed to user Signed-off-by: Zoey <[email protected]>
1 parent 0d9da2b commit ec29d4c

File tree

8 files changed

+16
-61
lines changed

8 files changed

+16
-61
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN apk add --no-cache ca-certificates nodejs-current yarn && \
3030
yarn cache clean --all
3131

3232

33-
FROM zoeyvid/nginx-quic:106
33+
FROM zoeyvid/nginx-quic:110
3434
RUN apk add --no-cache ca-certificates tzdata \
3535
nodejs-current \
3636
openssl apache2-utils \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ so that the barrier for entry here is low.
7070

7171
## Soon
7272
- disabling IPv4/IPv6 ([1](https://github.com/NginxProxyManager/nginx-proxy-manager/blob/develop/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/40-dynamic.sh) / [2](https://github.com/NginxProxyManager/nginx-proxy-manager/blob/develop/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh) / nginx templates (nginx.js lines 200-300))
73+
- custom IP-Bindings in nginx/backend to allow multiple instances in host network mode
7374
- support changing the PUID/PGID (maybe)
7475
- more
7576

backend/config/.gitkeep

Lines changed: 0 additions & 1 deletion
This file was deleted.

backend/internal/certificate.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,7 +1152,10 @@ const internalCertificate = {
11521152
method: 'POST',
11531153
headers: {
11541154
'Content-Type': 'application/x-www-form-urlencoded',
1155-
'Content-Length': Buffer.byteLength(formBody)
1155+
'Content-Length': Buffer.byteLength(formBody),
1156+
'Connection': 'keep-alive',
1157+
'User-Agent': 'Nginx Proxy Manager',
1158+
'Accept': '*/*'
11561159
}
11571160
};
11581161

@@ -1163,12 +1166,16 @@ const internalCertificate = {
11631166

11641167
res.on('data', (chunk) => responseBody = responseBody + chunk);
11651168
res.on('end', function () {
1166-
const parsedBody = JSON.parse(responseBody + '');
1167-
if (res.statusCode !== 200) {
1169+
try {
1170+
const parsedBody = JSON.parse(responseBody + '');
1171+
resolve(parsedBody);
1172+
}
1173+
catch (error) {
1174+
logger.warn('Error');
1175+
logger.warn(`Status Code: ${res.statusCode}`);
11681176
logger.warn(`Failed to test HTTP challenge for ___domain ${___domain}`, res);
11691177
resolve(undefined);
11701178
}
1171-
resolve(parsedBody);
11721179
});
11731180
});
11741181

backend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"gravatar": "1.8.2",
1717
"jsonwebtoken": "9.0.0",
1818
"knex": "2.4.2",
19-
"liquidjs": "10.7.0",
19+
"liquidjs": "10.7.1",
2020
"lodash": "4.17.21",
2121
"moment": "2.29.4",
2222
"mysql": "2.18.1",
@@ -30,7 +30,7 @@
3030
"author": "Jamie Curnow <[email protected]>",
3131
"license": "MIT",
3232
"devDependencies": {
33-
"eslint": "8.37.0",
33+
"eslint": "8.38.0",
3434
"eslint-plugin-align-assignments": "1.1.2"
3535
}
3636
}

frontend/js/app/nginx/certificates/form.ejs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818
<input type="text" name="domain_names" class="form-control" id="input-domains" value="<%- domain_names.join(',') %>" required>
1919
<div class="text-blue"><i class="fe fe-alert-triangle"></i> <%- i18n('ssl', 'hosts-warning') %></div>
2020
</div>
21-
<!--
2221
<div class="mb-3 test-domains-container">
2322
<button type="button" class="btn btn-secondary test-domains col-sm-12"><%- i18n('certificates', 'test-reachability') %></button>
2423
<div class="text-secondary small">
2524
<i class="fe fe-info"></i>
2625
<%- i18n('certificates', 'reachability-info') %>
2726
</div>
2827
</div>
29-
-->
3028
</div>
3129
<div class="col-sm-12 col-md-12">
3230
<div class="form-group">

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,13 @@
4242
<% if (provider === 'letsencrypt') { %>
4343
<a href="#" class="renew dropdown-item"><i class="dropdown-icon fe fe-refresh-cw"></i> <%- i18n('certificates', 'force-renew') %></a>
4444
<a href="#" class="download dropdown-item"><i class="dropdown-icon fe fe-download"></i> <%- i18n('certificates', 'download') %></a>
45-
<!--
4645
<% if (meta.dns_challenge === false) { %>
4746
<a href="#" class="test dropdown-item"><i class="dropdown-icon fe fe-globe"></i> <%- i18n('certificates', 'test-reachability') %></a>
4847
<% } %>
49-
-->
5048
<div class="dropdown-divider"></div>
5149
<% } %>
5250
<a href="#" class="delete dropdown-item"><i class="dropdown-icon fe fe-trash-2"></i> <%- i18n('str', 'delete') %></a>
5351
</div>
5452
</div>
5553
</td>
56-
<% } %>
54+
<% } %>

test/cypress/integration/api/Hosts.spec.js

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)