github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-26 02:09:47 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
1,204 Commits 30 Branches 138 Tags 33 MiB
2b51be7fd7
Commit Graph

1204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Weingartner
2b51be7fd7 Better error message. (#768) 
* Fix PrivateKeyBytes to error out and fail tests on error.

* Better error message.
 2016-04-17 15:15:14 -06:00
Tobias Weingartner
376e1090a3 Fix PrivateKeyBytes to error out and fail tests on error. 2016-04-17 14:17:42 -06:00
elcore
a682100c5e Merge pull request #765 from mholt/elcore-error-ecdsa 
Error if we are unable to marshal the ECDSA private key
 2016-04-17 18:40:02 +02:00
elcore
aba3d37c88 Error if we are unable to marshal the ECDSA private key 2016-04-17 18:19:41 +02:00
W. Mark Kubacki
0890e330e2 Merge pull request #759 from mholt/paths-cleanup 
Tell usage of 'path' from 'filepath' and fix *path checking
 2016-04-17 14:16:57 +02:00
W-Mark Kubacki
c05c5163e2 browse: Don't leak Cookies to sessions in HTTP from HTTPS 2016-04-17 01:16:17 +02:00
W-Mark Kubacki
3513b6f2f7 fileserver: When out of filedescriptors, spread retry attempts 2016-04-17 01:16:17 +02:00
W-Mark Kubacki
4a6121f989 Tell usage of 'path' from 'filepath' and fix *path checking 2016-04-17 01:16:16 +02:00
Matthew Holt
b75016e646 Fix lint warning 2016-04-15 15:13:44 -06:00
W. Mark Kubacki
ddf4b1fd3b Merge pull request #757 from mholt/extend-tls-client-auth 
Extend tls client auth
 2016-04-15 22:57:45 +02:00
W-Mark Kubacki
69c2d78f69 Support configuring less restrictive TLS client auth requirements 
Caddyfile parameter "clients" of "tls" henceforth accepts a special
first modifier. It is one of, and effects:

 * request         = tls.RequestClientCert
 * require         = tls.RequireAnyClientCert
 * verify_if_given = tls.VerifyClientCertIfGiven
 * (none)          = tls.RequireAndVerifyClientCert

The use-case for this is as follows: A middleware would serve items to the
public, but if a certificate were given the middleware would permit file
manipulation.

And, in a different plugin such as a forum or blog, not verifying a client
cert would be nice for registration: said blog would subsequently only
compare the SPKI of a client certificate.
 2016-04-15 22:21:55 +02:00
W-Mark Kubacki
f31875dfde Move sanitization of URL.Path to Server 
No need to have this in every plugin. And, even in flat filesystems
filenames with dots and slashes are best avoided.
 2016-04-15 21:02:36 +02:00
W-Mark Kubacki
4e98cc3005 browse: Return HTTP errors on unhandled HTTP methods 
For example, a HTTP POST should not be answered with StatusOK,
and a response to HTTP OPTIONS should not carry any contents.
 2016-04-15 18:22:51 +02:00
Matt Holt
d3a77ce3c3 Use binExt 2016-04-13 15:21:18 -06:00
W. Mark Kubacki
b149a86bc2 server: Rotate TLS ticket "keys" (#742) 2016-04-12 10:09:45 -06:00
Matt Holt
ac80f6edc3 Merge pull request #744 from tboerger/feature/breadcrumb 
browse: Dropped LinkedPath and updated browse template
 2016-04-12 10:01:01 -06:00
Thomas Boerger
ef95173827
Dropped LinkedPath and updated browse template 
As discussed with @mholt I have dropped the old LinkedPath function and
replaced it within the browse template with the new BreadcrumbMap
function. Visually it looks exactly the same as before, now the template
functionality is just more powerful.

Signed-off-by: Thomas Boerger <tboerger@suse.de>
 2016-04-12 17:18:21 +02:00
Matt Holt
36a3e204b6 Merge pull request #740 from tboerger/feature/browse-breadcrumb 
Added breadcrumb map function to browse
 2016-04-11 14:08:18 -06:00
Thomas Boerger
e0b63d92f4
Added breadcrumb map function to browse 
In order to being able to really build a custom template for the browse
directive I have added another function to build even custom breadcrumb
paths. The other function `LinkedPath` is not that easy styleable as
this map function. That way we are able to build the breadcrumb path
matching different CSS frameworks like Bootstrap.

Signed-off-by: Thomas Boerger <thomas@webhippie.de>
 2016-04-11 21:47:44 +02:00
Thomas Boerger
004a7f84ef Make test case less dependent on exact error string (#741) 2016-04-11 13:08:30 -06:00
Matt Holt
ed8a48e7f1 Merge pull request #739 from tboerger/feature/browse-go-up 
Added "go up" link to browse template
 2016-04-11 12:28:13 -06:00
Thomas Boerger
c86c26a056 Added "go up" link to browse template 
In order to have directly a link within the browse listing I have added
a link to the top of the table to get one level up in the tree. Added
that after a chat with @mholt.

Signed-off-by: Thomas Boerger <thomas@webhippie.de>
 2016-04-11 20:10:41 +02:00
Matt Holt
0a7ca64f53 gzipResponseWriter should also be a Flusher 
To be consistent with 3faad41b43 and c64cf218b0
 2016-04-11 00:24:26 -06:00
Matt Holt
c4e2cf96e7 Merge pull request #737 from tw4452852/closeNotifier 
http.CloseNotifier implementation for http.ResponseWriter wrapper
 2016-04-11 00:18:06 -06:00
Tw
c64cf218b0 http.CloseNotifier implementation for http.ResponseWriter wrapper 
Signed-off-by: Tw <tw19881113@gmail.com>
 2016-04-11 14:10:33 +08:00
Matt Holt
6a7b777f14 panic if not a Flusher 
Caddy recovers panics that occur in the middleware stack so this is not a risk to process termination. This way is also preferable to hiding the error. See 3faad41b43 (commitcomment-17035158)
 2016-04-09 22:11:36 -06:00
Matthew Holt
67b137175e
Replaced automate.sh with Go program 2016-04-09 10:02:16 -06:00
Matthew Holt
dfa3b8645d
Who uses 32-bit Mac anyway. :P 2016-04-09 00:40:37 -06:00
Matthew Holt
2dca50dee8
Rewrite automate.sh as Go program; add init folder to release archives 
Easier parallelism and more control over platforms we build for, but
more importantly, we can do parallel builds using the build script which
properly embeds version information into the binaries. We also produce
the archive files ourselves and in parallel rather than using external
tar and zip commands.
 2016-04-09 00:21:55 -06:00
Matthew Holt
3faad41b43
middleware: ResponseRecorder now is an http.Flusher (fixes #677) 
Flush every 250ms. This should keep latency somewhat low but there is
still buffering; maybe in the future we can make this configurable.
 2016-04-09 00:17:15 -06:00
Matthew Holt
c21ff8343c
Apparently vet ships with Go now 2016-04-06 17:29:53 -06:00
Matt Holt
2072eec11f Merge pull request #731 from wjkohnen/host-caseinsensitive 
Handle host names case insensitively.
 2016-04-06 15:56:34 -06:00
Wolfgang Johannes Kohnen
497ebb9ccb Handle host names case insensitively. 
RFC 3986 3.2.2: The host subcomponent is case-insensitive.
 2016-04-06 21:36:46 +00:00
Benny Ng
e4e773c9ea Merge pull request #730 from tpng/restart-refactor 
Extract restartInProc to its own file
 2016-04-06 11:51:44 +08:00
Benny Ng
32e63e6b94 Extract restartInProc to its own file 2016-04-06 11:40:39 +08:00
Matthew Holt
86ccafbe58
Update changes 
Also testing commit signing again, different email this time.
 2016-04-05 19:04:08 -06:00
Matthew Holt
3ef78d3db3
Allow git repo as argument to build script 
This will help build server perform builds with copy of repo in a folder
outside the original git repo folder. Also testing signed commits on
GitHub.
 2016-04-05 18:57:50 -06:00
elcore
9ec1c17846 Merge pull request #727 from mholt/rename-keytype-ec-to-p 
Rename EC256,EC384 to P256,P384
 2016-04-05 19:59:37 +02:00
Eldin Hadzic
7ababfc909 Rename EC256,EC384 to P256,P384 2016-04-05 13:37:39 +00:00
Benny Ng
31062dd6c2 Merge pull request #725 from tpng/reload-validate-caddyfile 
revert to old Caddyfile on failed in-process restart
 2016-04-05 20:07:48 +08:00
Benny Ng
b952fd8f8f revert to old Caddyfile on failed in-process restart 2016-04-05 19:57:52 +08:00
Benny Ng
28e0bfbbbe update README to include Docker 
update README to include Docker container zzrot/alpine-caddy
 2016-04-05 17:24:33 +08:00
Sean Kilgarriff
30ce73e8fb updated README to include ZZROT's docker container that runs caddy on Alpine Linux inside of a Docker Container. 2016-04-05 03:11:55 -04:00
elcore
987a5f98c4 Merge pull request #723 from mholt/fix-#721 
Fix for #721
 2016-04-05 04:54:49 +02:00
Eldin Hadzic
859a93d296 Fix for #721 2016-04-04 23:59:40 +00:00
Matt Holt
a14fce0b1e Merge pull request #707 from jupiter/caching-headers 
Add Etag header
 2016-04-03 15:01:33 -06:00
Matt Holt
25b567b301 Merge pull request #715 from mholt/elcore-faster-tests 
https: Faster tests
 2016-04-03 14:33:03 -06:00
Matt Holt
3d066789d3 Merge pull request #713 from 5an1ty/patch-1 
proxy: Allow mixed case Upgrade headers (WebSocket fix)
 2016-04-03 14:30:32 -06:00
Pieter Raubenheimer
93d982a5a4 Improve readability and fully comply with RFC7232 2016-04-03 20:14:10 +01:00
Pieter Raubenheimer
572b9e4d67 Merge branch 'master' into caching-headers 2016-04-03 19:59:25 +01:00