github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-11 12:47:57 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
1,772 Commits 31 Branches 138 Tags 34 MiB
18c93756b4
Commit Graph

1772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Holt
abdf13ea30 Improve TLS storage provider errors 
We renamed caddytls.ErrStorageNotFound to caddytls.ErrNotExist to more
closely mirror the os package. We changed it to an interface wrapper
so that the custom error message can be preserved. Returning only "data
not found" was useless in debugging because we couldn't know the
concrete value of the error (like what it was trying to load).

Users can do a type assertion to determine if the error value is a "not
found" error instead of doing an equality check.
 2016-09-08 18:50:04 -06:00
Matthew Holt
a251831feb Fix bug renewing certs affecting Caddyfiles using wildcard addresses 
A Caddyfile using *.example.com as its site address would be subject to
this bug at renewal time, as it would use the literal "*.example.com"
value instead of the name being passed in to obtain a certificate.
This change fixes the LoadSite call so that it looks in the proper
directory for the certificate resources.
 2016-09-08 18:50:04 -06:00
Matt Holt
1ea96def31 Merge pull request #1091 from mikepulaski/master 
Caddyfiles read from STDIN now have server types associated with them.
 2016-09-05 13:14:35 -06:00
Mike Pulaski
635714fe38 Caddyfiles read from STDIN now have server types associated with them. Fixes #1090. 2016-09-05 18:34:32 +02:00
Matthew Holt
5f135a27d5
Eliminate ineffectual assignments 
Most of these were fixed by handling errors that were previously
unhandled (oops).
 2016-09-05 10:30:46 -06:00
Matthew Holt
45a3d0b526
Fix misspellings 2016-09-05 10:20:34 -06:00
Sebastian
a122304196 Support for lego's timeout option (#1041) 
* Support for lego's timeout option

* Changed IntVar to DurationVar for catimeout

* Modified catimeout according to mholt's comments
 2016-08-30 13:38:44 -06:00
Matthew Holt
14a6e4b4ed
More minor text fixes 2016-08-30 13:37:35 -06:00
Matt Holt
72e4ba8b5b Merge pull request #1079 from ijt/master 
Use naoina/toml for MIT license. Make proxy_test work in any directory.
 2016-08-30 08:10:57 -06:00
Issac Trotts
1991083322 Fix tests to not make long unix domain socketpaths 
Some tests were running into this issue:
https://github.com/golang/go/issues/6895

Putting the sockets into temp dirs fixes the problem.
 2016-08-29 18:09:46 -07:00
Issac Trotts
7ba804353c Use naoina/toml instead of BurntSushi/toml 2016-08-29 17:55:44 -07:00
Abiola Ibrahim
ac933f1685 Merge pull request #1042 from mholt/status-middleware 
Add 'status' middleware instead of 'status' directive for 'rewrite' middleware
 2016-08-29 16:41:27 +01:00
Volodymyr Galkin
20ee457cae Add 'status' middleware instead of 'status' directive for 'rewrite' middleware 2016-08-29 17:17:23 +03:00
Matthew Holt
34a99598f7
Ignore conflicting settings if TLS disabled (fixes #1075) 2016-08-26 16:18:08 -06:00
Matthew Holt
191ec27c26
Clarify godoc for HTTP handler signature 2016-08-25 17:13:49 -06:00
Matthew Holt
b1ae8a71f1
More tests for TLS configuration 2016-08-25 17:13:27 -06:00
Matt Holt
d4f4fcdb4c Merge pull request #1070 from FiloSottile/master 
Actually set tls.Config.PreferServerCipherSuites
 2016-08-25 16:33:12 -06:00
Filippo Valsorda
ef58536711 Actually set tls.Config.PreferServerCipherSuites 
It was set by default on the caddy-internal config object, and even
checked for conflicts, but it was never actually reflected on the
tls.Config.

This will have user-visible changes: a client that prefers, say, AES-CBC
but also supports AES-GCM would have used AES-CBC befor this, and will
use AES-GCM after.

This is desirable and important behavior, because if for example the
server wanted to support 3DES, but *only if it was strictly necessary*,
it would have had no way of doing so with PreferServerCipherSuites
false, as the client preference would have won.
 2016-08-25 18:28:51 +01:00
Matthew Holt
17709a7d3f
Defer loading directives until needed (fix for previous commit) 
This change is still experimental.
 2016-08-25 00:15:18 -06:00
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