github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-30 04:33:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,703 Commits 32 Branches 138 Tags 33 MiB
dc6c986b3f
Commit Graph

1703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Holt
5a691fbaf5
httpserver: Added function to register directive at runtime (dev only) 
This function should not be used outside of development. It destroys the
absolute ordering and guarantees of correctness. Multiple uses of it
may work fine, but maybe not if they overlap, causing non-deterministic
builds which is bad. However, this can be convenient when developing
a plugin by calling it from an init() function, since you don't have
to modify the Caddy source code just to try your plugin.
 2016-08-24 23:12:41 -06:00
Matt Holt
fd3008459e Merge pull request #1068 from tw4452852/multiple_log_test 
log: add multiple log entry test
 2016-08-24 22:40:32 -06:00
Tw
e7af23e1e6 log: add multiple log entry test 
Signed-off-by: Tw <tw19881113@gmail.com>
 2016-08-25 11:21:08 +08:00
Matt Holt
536daf36be Merge pull request #1060 from tw4452852/multiple_log 
log: support multiple log entries under one path scope
 2016-08-23 22:55:17 -06:00
Tw
5e0f4083c4 log: support multiple log entries under one path scope 
fix issue #1044

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-08-24 12:48:51 +08:00
Matthew Holt
c3e0733406
Only move storage if actually starting a server (closes #1067) 2016-08-23 22:32:52 -06:00
Matt Holt
70cbfdc585 Merge pull request #1064 from stp-ip/quic-protocol-headers 
Keep quic protocol headers only between one hop
 2016-08-23 16:46:43 -06:00
Michael Grosser
3dc98c8ce3 Keep quic protocol headers only between one hop 
Removing quic protocol headers from being persisted during proxy requests.
Not removing them could lead to the client attempting to connect to the wrong port.
This makes the quic headers consistent with other protocol headers.
 2016-08-23 22:05:56 +00:00
Matthew Holt
151d0baa94
Minor text fixes ;) 2016-08-23 15:47:23 -06:00
Matt Holt
9d947713ff Merge pull request #1059 from PalmStoneGames/master 
Add plugin capabilities for tls storage.
 2016-08-23 15:31:20 -06:00
Luna Duclos
1dfe1e5ada Add plugin capabilities for tls storage. 
To use a plugged in storage, specify "storage storage_name" in the tls block of the Caddyfile, by default, file storage will be used
 2016-08-23 23:00:20 +02:00
Matthew Holt
628920e20e
Improve logic related to error handling on SiteExists call 
No need to check if SiteExists if the config is not managed or the name
does not even qualify.
 2016-08-23 14:51:07 -06:00
Matt Holt
15d25f1ca4 Merge pull request #1062 from nemothekid/fix/ws-connection-close 
Proxy: Set MaxIdleConnsPerHost to -1 to prevent Idle Conns
 2016-08-23 10:39:16 -06:00
Nimi Wariboko Jr
2ef8905966 Proxy: Instead of setting DisableKeepAlives, set MaxIdleConnsPerHost to -1 to prevent net/http from pooling the connections. DisableKeepAlives causes net/http to send a Connection: Closed header which is bad. Fixes #1056 2016-08-22 18:00:37 -07:00
Matt Holt
fdad616df7 Merge pull request #1049 from tw4452852/log_body 
capture request body normally
 2016-08-22 18:49:17 -06:00
Tw
590862a962 replacer: capture request body normally 
fix issue #1015

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-08-23 08:20:49 +08:00
Tw
40c09d6789 replacer: code refactor 
Signed-off-by: Tw <tw19881113@gmail.com>
 2016-08-23 08:20:49 +08:00
Tw
bba1059ef9 log: add log request body test 
Signed-off-by: Tw <tw19881113@gmail.com>
 2016-08-23 08:20:49 +08:00
Matt Holt
1d3212a598 Merge pull request #1046 from PalmStoneGames/master 
Add error parameter to storage.SiteExists()
 2016-08-20 16:52:18 -06:00
Matthew Holt
c75ee0000e
Fix edge case in stapling; do not allow certs without any names 2016-08-19 13:42:48 -06:00
Matt Holt
8cdc65edd2 Merge pull request #1048 from miekg/missingbits 
Implement missing bits for an external servertype
 2016-08-19 11:48:07 -06:00
Miek Gieben
a609fa5f56 Implement missing bits for an external servertype 
Make ServerListeners public and add two helper methods to get access
to the address they listen on. This is useful for tests (among other
things)

Also make DefaultConfigFile a var so it can be overridden by server
types.
 2016-08-19 00:19:45 +00:00
Luna Duclos
78341a3a9a Add error parameter to storage.SiteExists() 2016-08-18 18:38:33 +02:00
Matthew Holt
fdc62d015f
log: Create log file directory before creating log file 2016-08-18 07:35:55 -06:00
Matthew Holt
e8e55955f4
Report error when loading the lexer 2016-08-17 17:17:26 -06:00
Matthew Holt
8b8afd72d7
Support env vars in import; make sure it's a file 2016-08-17 17:03:21 -06:00
Matthew Holt
c5524b0bab
Report errors when loading Caddyfile 2016-08-17 17:02:01 -06:00
Matthew Holt
c5aa5843d9
Version 0.9.1 2016-08-17 14:09:04 -06:00
Matthew Holt
745ae6ff2f
Travis CI improvements 2016-08-15 23:05:46 -06:00
Matthew Holt
432a2d23a7
Use Go 1.7 for CI 2016-08-15 22:57:18 -06:00
Matt Holt
83345062d7 Merge pull request #1037 from devangels/template_env_1 
Fix for invalid environment variable names used on windows that start…
 2016-08-15 15:41:26 -06:00
Simon Lightfoot
f372f5fce7 Fix for invalid environment variable names used on windows that start with an equals symbol. Even though this contradicts the Microsoft docs. 2016-08-15 20:42:00 +01:00
Matthew Holt
454b1e3939
Honor bind directive for ACME challenges 
Fixes https://forum.caddyserver.com/t/basic-caddy-installation-failing-on-automatic-https/472?u=matt
 2016-08-15 12:08:51 -06:00
Simon Lightfoot
45ac11088e Added support for environment variables to 'templates' module. (#1035) 
* * Added support for environment variables to 'templates' module.

* Fixed flaw in test caused by environment variable ordering during testing on CI.

* Updated some local variables to camel-case.

* Reverted changes to replacer as environment variables are processed elsewhere.

* Removed PrintEnv functionality in favour of documenting using template range.
 2016-08-15 11:15:58 -06:00
Matt Holt
eb3bbc409f Merge pull request #1036 from mholt/fix-errors-setup-test 
Fix error which lead to skipping tests in 'errors.TestErrorsParse'
 2016-08-15 10:09:46 -06:00
Volodymyr Galkin
b830667a25 Fix error which lead to skipping tests in 'errors.TestErrorsParse' 2016-08-15 16:44:34 +03:00
Matt Holt
ba5aeab19d Merge pull request #1032 from mholt/errors-config-check-duplicate-status-codes 
Check for duplicate status code entries in 'errors' directive
 2016-08-12 09:28:51 -06:00
Volodymyr Galkin
441a8f5eff Check for duplicate status code entries in 'errors' directive 2016-08-12 16:47:00 +03:00
Matt Holt
4f6500c95b Merge pull request #1028 from evvvvr/wildcard-error-page-752 
Add support for default (wildcard) error page
 2016-08-11 23:33:44 -06:00
Carter
7dd385f6b4 Merge pull request #1023 from mholt/log-request-body 
Now logging the request body
 2016-08-11 22:32:32 -04:00
Matt Holt
ac0dd303be Merge branch 'master' into log-request-body 2016-08-11 17:36:09 -06:00
Carter
676202a31e Fixed styling and byte count 2016-08-11 19:08:49 -04:00
Matthew Holt
c8a99d2f81
Don't use X-Forwarded-For for {remote} placeholder (closes #1025) 2016-08-11 16:54:17 -06:00
Carter
8e8e2f596d Merge branch 'master' into log-request-body 2016-08-11 18:08:19 -04:00
Volodymyr Galkin
f7003bee3f Add support for default (wildcard) error page 2016-08-11 15:51:15 +03:00
Carter
532ab661c7 Fully read and close the request body 2016-08-11 07:03:14 -04:00
Matthew Holt
68be4a9161
Don't prompt for email when user is not there to provide one 
Also don't bother showing stdout output in same situation
 2016-08-10 23:46:04 -06:00
Matthew Holt
46bc0d5c4e
Whoops, finishing up the last commit properly 
Need to add the name to namesObtaining each time we use the ACME client.
 2016-08-10 23:44:43 -06:00
Matthew Holt
8e75ae2495
Only consume HTTP challenge for names we are solving for (closes #549) 
If another ACME client is trying to solve a challenge for a name not
being served by Caddy on the same machine where Caddy is running, the
HTTP challenge will be consumed by Caddy rather than allowing the owner
to use the Caddyfile to proxy the challenge.

With this change, we only consume requests for HTTP challenges for
hostnames that we recognize. Before doing the challenge, we add the
name to a set, and when seeing if we should proxy the challenge, we
first check the path of course to see if it is an HTTP challenge;
if it is, we then check that set to see if the hostname is in the
set. Only if it is, do we consume it.

Otherwise, the request is treated like any other, allowing the owner
to configure a proxy for such requests to another ACME client.
 2016-08-10 22:13:06 -06:00
Carter
d56ac28bec Using a LimitReader and fixed test and log format. 2016-08-10 22:43:26 -04:00