ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-08-15 21:36:51 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
1,221 Commits 12 Branches 78 Tags
c528e41c5d0367873fd9916a975c28f44dc8e806
Commit Graph

232 Commits

Author SHA1 Message Date
Nick Craig
c528e41c5d Merge branch 'oc-main' into hsts_to_serverdef 2023-05-03 11:25:06 -04:00
Nick Craig
f757219270 Merge branch 'oc-main' into cloudwatchLogs 2023-05-03 11:23:19 -04:00
Nick Craig
3a72c68410 Merge remote-tracking branch 'origin/OCMaster' into oc-main 
repoint all docker configs to OC image environment
 2023-05-03 09:45:18 -04:00
Nick Craig
b3e228285d ocmaster-rebuild 2023-05-03 09:00:28 -04:00
Jamie Curnow
5d03ede100 Add test for creating a host 2023-03-30 12:44:28 +10:00
Jamie Curnow
124cb18e17 Fix renewing certs because of permission errors 2023-03-22 13:40:36 +10:00
Jamie Curnow
77eb618758 Fix pip installs running as non-root user 2023-03-22 09:41:59 +10:00
Jamie Curnow
4fdc80be01 Fix logical error with keys and mysql config 2023-03-21 17:59:27 +10:00
Jamie Curnow
c3469de61b Linting fixes 2023-03-21 17:11:16 +10:00
Jamie Curnow
2a07445005 Refactor configuration 
- No longer use config npm package
- Prefer config from env vars, though still has support for config file
- No longer writes a config file for database config
- Writes keys to a new file in /data folder
- Removes a lot of cruft and improves config understanding
 2023-03-21 16:53:39 +10:00
Jamie Curnow
dad3e1da7c Adds support to run processes as a user/group, defined 
with PUID and PGID environment variables

- Detects if image is run with a user in docker command and fails if so
- Adds s6 prepare scripts for adding a 'npmuser'
- Split up and refactor the s6 prepare scripts
- Runs nginx and backend node as 'npmuser'
- Changes ownership of files required at startup
 2023-03-20 16:56:52 +10:00
Jamie Curnow
fccbde1371 fix linting 2023-03-17 14:23:12 +10:00
Jamie Curnow
fec36834f7 - Updated objection, knex, liquidjs, signale and sqlite3 packages 
- Changes for objection migration
- Moved common access template code to an include
- Fixed access rules configuration generation
 2023-03-17 14:18:51 +10:00
Jamie Curnow
00aeef75b6 Refactor nginx config functions, some don't need to report errors, save error'd config files as .err for debugging later 2023-03-17 11:34:27 +10:00
Jamie Curnow
b30fcb50c8 Args weren't being passed to htpasswd command, fixes #2692 2023-03-17 08:49:18 +10:00
jc21
09d1d3744c Merge pull request #2530 from jmerdich/jmerdich/fix-acl-edit-ssl 2023-03-08 21:08:52 +10:00
jc21
84e0b30f8d Merge pull request #2411 from plantysnake/fix-certbot-plugins 
Bugfix: Fix certbot plugin installation issues
 2023-03-08 20:40:15 +10:00
jc21
30076a0e66 Merge pull request #2635 from skarlcf/security/CVE-2023-23596 
Mitigate CVE-2023-23596
 2023-03-08 08:25:38 +10:00
jc21
42bd39163a Merge pull request #2638 from jlesage/case-insensitive-email-login 
Make sure to lowercase email address entered by the user during login.
 2023-03-08 08:25:09 +10:00
Kamil Skrzypinski
2ff66ee238 Add style required by linter 2023-03-07 17:15:03 +01:00
dependabot[bot]
7b48488c29 Bump express from 4.17.1 to 4.17.3 in /backend 
Bumps [express](https://github.com/expressjs/express) from 4.17.1 to 4.17.3.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.1...4.17.3)

---
updated-dependencies:
- dependency-name: express
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-07 10:49:22 +00:00
jc21
edba369ae8 Merge pull request #2497 from NginxProxyManager/dependabot/npm_and_yarn/backend/jsonwebtoken-9.0.0 
Bump jsonwebtoken from 8.5.1 to 9.0.0 in /backend
 2023-03-07 20:48:45 +10:00
jc21
b77d916bdd Merge pull request #2498 from NginxProxyManager/dependabot/npm_and_yarn/backend/liquidjs-10.0.0 
Bump liquidjs from 9.15.0 to 10.0.0 in /backend
 2023-03-07 20:48:36 +10:00
dependabot[bot]
e227f4177b Bump minimist from 1.2.5 to 1.2.8 in /backend 
Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.5 to 1.2.8.
- [Release notes](https://github.com/minimistjs/minimist/releases)
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.8)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-07 06:51:09 +00:00
dependabot[bot]
88fa7cdfff Bump liquidjs from 9.15.0 to 10.0.0 in /backend 
Bumps [liquidjs](https://github.com/harttle/liquidjs) from 9.15.0 to 10.0.0.
- [Release notes](https://github.com/harttle/liquidjs/releases)
- [Changelog](https://github.com/harttle/liquidjs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/harttle/liquidjs/compare/v9.15.0...v10.0.0)

---
updated-dependencies:
- dependency-name: liquidjs
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-07 06:51:08 +00:00
dependabot[bot]
cf6cc7dcc5 Bump jsonwebtoken from 8.5.1 to 9.0.0 in /backend 
Bumps [jsonwebtoken](https://github.com/auth0/node-jsonwebtoken) from 8.5.1 to 9.0.0.
- [Release notes](https://github.com/auth0/node-jsonwebtoken/releases)
- [Changelog](https://github.com/auth0/node-jsonwebtoken/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/node-jsonwebtoken/compare/v8.5.1...v9.0.0)

---
updated-dependencies:
- dependency-name: jsonwebtoken
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-07 06:50:55 +00:00
jc21
448c8a2dd5 Merge pull request #2523 from NginxProxyManager/dependabot/npm_and_yarn/backend/json5-2.2.3 
Bump json5 from 2.1.3 to 2.2.3 in /backend
 2023-03-07 16:50:37 +10:00
jc21
634cfe13f1 Merge pull request #2534 from NginxProxyManager/dependabot/npm_and_yarn/backend/knex-2.4.0 
Bump knex from 0.20.15 to 2.4.0 in /backend
 2023-03-07 16:50:30 +10:00
Jocelyn Le Sage
b0fd976b97 Make sure to lowercase email address entered by the user during login. 2023-02-26 22:24:58 -05:00
Kamil Skrzypinski
7fe7e94fbd Mitigate CVE-2023-23596 by changing child_process.exec to child_process.execFile 2023-02-26 20:10:25 +01:00
dependabot[bot]
23326895b2 Bump http-cache-semantics from 4.1.0 to 4.1.1 in /backend 
Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/kornelski/http-cache-semantics/releases)
- [Commits](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: http-cache-semantics
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-03 12:12:01 +00:00
dependabot[bot]
7ca3a9e7a6 Bump knex from 0.20.15 to 2.4.0 in /backend 
Bumps [knex](https://github.com/knex/knex) from 0.20.15 to 2.4.0.
- [Release notes](https://github.com/knex/knex/releases)
- [Changelog](https://github.com/knex/knex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/knex/knex/compare/0.20.15...2.4.0)

---
updated-dependencies:
- dependency-name: knex
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-11 02:35:51 +00:00
Jake Merdich
c80d099193 ACL changes should not blow away cert config 
When editing an access list, all affected sites get their config updated without certificates, functionally breaking https on those sites until they get a manual config change that rewrites the config properly. Properly fetch the certificate from the DB before `bulkGenerateConfigs` so it gets updated right.

I am not certain whether there are similar bugs in other places that use `bulkGenerateConfigs`.

Should fix #2254
 2023-01-10 01:59:04 -05:00
dependabot[bot]
b69e493c54 Bump json5 from 2.1.3 to 2.2.3 in /backend 
Bumps [json5](https://github.com/json5/json5) from 2.1.3 to 2.2.3.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v2.1.3...v2.2.3)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-06 02:33:27 +00:00
plantysnake
8dee139810 Fix linter issues 2022-11-21 01:46:42 +03:00
plantysnake
6349cb6094 Fix cerbot plugin installation issues 2022-11-18 15:06:19 +03:00
Jamie Curnow
fd30cfe98b Fix linting 2022-11-15 07:54:48 +10:00
Jamie Curnow
6f281fef42 Workaround for cloudflare plugin install (#2381) 2022-11-15 07:48:57 +10:00
jc21
b673ebe2ca Merge pull request #2126 from NginxProxyManager/dependabot/npm_and_yarn/backend/async-3.2.4 
Bump async from 3.2.1 to 3.2.4 in /backend
 2022-08-23 20:44:21 +10:00
dependabot[bot]
e5966b54a8 Bump moment from 2.27.0 to 2.29.4 in /backend 
Bumps [moment](https://github.com/moment/moment) from 2.27.0 to 2.29.4.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.27.0...2.29.4)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-07 16:43:24 +00:00
dependabot[bot]
1e5916db28 Bump async from 3.2.1 to 3.2.4 in /backend 
Bumps [async](https://github.com/caolan/async) from 3.2.1 to 3.2.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v3.2.1...v3.2.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-22 17:38:17 +00:00
Nick Craig
bc90dd58d6 move to a unified log, stopping all access logs for individual sites. 2022-03-15 08:12:35 -04:00
Nick Craig
e8262946d7 commiting OC AWS tools 2022-03-10 16:18:22 -05:00
Nick Craig
6368c39ef7 merging changes 2022-03-10 16:14:07 -05:00
Nick Craig
2f8097cdd4 removing HSTS include from location as it is superfluous. 
HSTS is defined at the server level and re-adding the host at the location prevents inheritance from the advanced config include.

Per the NGINX documentation,
"These directives are inherited from the previous configuration level if and only if there are no add_header directives defined on the current level."
 2022-03-09 11:29:27 -05:00
Nick Craig
c571599d45 adding wrapper for proxy header passing. 
add a selection to the proxy editing page and passes that down into the templates.
Removed set_proxy_header from locations and moved to server directive. these will inherit down into locations if they are not defined there.
 2022-03-09 10:19:51 -05:00
Nick Craig
7f2d59a4f1 Merge branch 'NginxProxyManager:develop' into develop 2022-03-09 09:11:39 -05:00
Ivan Kristianto
366fcf0bed Fix nginx/certificates search query 2022-02-12 12:46:06 +07:00
Nick Craig
9c3e024287 removing HSTS include from location as it is superfluous. HSTS is defined at the server level and re-adding the host at the location prevents inheritance from the advanced config include. 
Per the NGINX documentation,
"These directives are inherited from the previous configuration level if and only if there are no add_header directives defined on the current level."
 2022-02-08 07:48:13 -05:00
jc21
d7e0ae0fa0 Merge pull request #1701 from jc21/escape-credential-backslashes 
Correctly escape backslashes in dns plugin credentials
 2022-01-02 15:29:31 +10:00