github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-02 05:33:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,113 Commits 32 Branches 138 Tags 33 MiB
3ee6d30659
Commit Graph

2113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Holt
6bb84ba19c Merge pull request #1664 from tw4452852/1663-log 
log: allow additional prefix/suffix with predefined format
 2017-05-11 18:10:49 -06:00
Tw
710f38043e log: allow additional prefix/suffix with predefined format 
Signed-off-by: Tw <tw19881113@gmail.com>
 2017-05-11 16:15:41 +08:00
Tw
958abcfa4c proxy: synchronize websocket test (#1654) 
fix issue #1652

Signed-off-by: Tw <tw19881113@gmail.com>
 2017-05-08 21:16:18 -06:00
Thibault Meyer
ea24744bbf Add datadog plugin directive (#1655) 
Signed-off-by: Thibault Meyer <meyer.thibault@gmail.com>
 2017-05-08 11:48:22 -06:00
Matt Holt
f06b825f44 Merge pull request #1656 from tw4452852/1587-limits 
Introduce `limits` middleware
 2017-05-08 11:39:10 -06:00
George Lesica
642aa63a9c markdown: Support Include arguments for Markdown. (#1653) 
Previously, the `Include` override used with the markdown plugin did not
provide the optional `args` parameter. This made it impossible to pass
arguments to a template used with that plugin.
 2017-05-08 10:32:14 -06:00
Tw
ae645ef2e9 Introduce limits middleware 
1. Replace original `maxrequestbody` directive.
2. Add request header limit.

fix issue #1587

Signed-off-by: Tw <tw19881113@gmail.com>
 2017-05-08 17:18:04 +08:00
Matthew Holt
90efff68e5
dist: Delete old build automation program 
We now use the release program to assist in deploying Caddy (it is much
more integrated and automated): https://github.com/caddyserver/releaser

This older automation code can still be found in this gist:
https://gist.github.com/mholt/cb7285f4950cb93f23be0aa6050fb043
 2017-05-05 18:12:41 -06:00
Tw
e38921f4a5 httpserver: rename context Push action for more general use (#1641) 
Signed-off-by: Tw <tw19881113@gmail.com>
 2017-05-05 17:36:20 -06:00
Tw
8e7a36de45 ResponseWriterWrapper and HTTPInterfaces (#1644) 
Signed-off-by: Tw <tw19881113@gmail.com>
 2017-05-05 09:42:06 -06:00
Sebastian Mancke
86d107f641 added 'login' directive for github.com/tarent/loginsrv/caddy (#1648) 2017-05-04 05:17:53 -06:00
Matthew Holt
dfebffb1ee
Update readme and changes for version 0.10.2 2017-05-02 12:02:28 -06:00
Matthew Holt
59a5afab29
fastcgi: Prepend missing leading slash when matching paths (see #1645) 
httpserver: More path matching tests
 2017-05-02 11:20:50 -06:00
Matthew Holt
d8fb2ddc2d
Fix contributing link in readme 2017-05-02 11:02:25 -06:00
Matthew Holt
5e467883b8
httpserver: Base path of "/" matches all paths, even empty ones 
Fixes #1645
 2017-05-02 09:43:43 -06:00
Matthew Holt
9fbac10a4b Revert "rewrite: Raise error if rewrite path does not begin with / #1610 (#1629)" 
This reverts commit e0ed709397.
 2017-05-02 09:30:18 -06:00
Matthew Holt
6d9783a267
Update changelog and readme for 0.10.1. 2017-05-01 23:50:58 -06:00
Matt Holt
d5371aff22 httpserver/all: Clean up and standardize request URL handling (#1633) 
* httpserver/all: Clean up and standardize request URL handling

The HTTP server now always creates a context value on the request which
is a copy of the request's URL struct. It should not be modified by
middlewares, but it is safe to get the value out of the request and make
changes to it locally-scoped. Thus, the value in the context always
stores the original request URL information as it was received. Any
rewrites that happen will be to the request's URL field directly.

The HTTP server no longer cleans /sanitizes the request URL. It made too
many strong assumptions and ended up making a lot of middleware more
complicated, including upstream proxying (and fastcgi). To alleviate
this complexity, we no longer change the request URL. Middlewares are
responsible to access the disk safely by using http.Dir or, if not
actually opening files, they can use httpserver.SafePath().

I'm hoping this will address issues with #1624, #1584, #1582, and others.

* staticfiles: Fix test on Windows

@abiosoft: I still can't figure out exactly what this is for. 😅

* Use (potentially) changed URL for browse redirects, as before

* Use filepath.ToSlash, clean up a couple proxy test cases

* Oops, fix variable name
 2017-05-01 23:11:10 -06:00
Matt Holt
5685a16449 Merge pull request #1642 from tw4452852/internal 
internal: inherit original ResponseWriter's interfaces
 2017-05-01 23:06:45 -06:00
Tw
f58653bc13 internal: inherit original ResponseWriter's interfaces 
Signed-off-by: Tw <tw19881113@gmail.com>
 2017-05-02 10:53:16 +08:00
Toby Allen
e0ed709397 rewrite: Raise error if rewrite path does not begin with / #1610 (#1629) 
* Raise syntax error if no '/' prefix to rewrite. Added Tests

* fix case where to keyword is used.

* Fixed spelling issue

* Changes to use Errf rather than new Err function

* Remove new RewritePathErr Function
 2017-05-01 13:45:40 -06:00
Matt Holt
b3dd604904 Merge pull request #1637 from devangels/bugfix1628 
Bugfix for issue #1628 where `Caddyfile` is not being hidden correctly
 2017-05-01 08:47:44 -06:00
Simon Lightfoot
8f09ed8f0d Bugfix for issue #1628 where Caddyfile is not being hidden correctly on windows. 
Added test case to check if Caddyfile is added to HiddenFiles correctly.
 2017-05-01 14:21:49 +01:00
Matt Holt
49d79d7ebc Merge pull request #1598 from tw4452852/1589 
proxy: recognize client's cancellation
 2017-04-30 08:19:03 -06:00
Matt Holt
4c034f6ad1 Merge pull request #1613 from tw4452852/addlink 
Context: add Push action
 2017-04-30 08:09:53 -06:00
Matt Holt
503c6b392c Merge pull request #1635 from aaronellington/lint-fixes 
lint fixes
 2017-04-29 23:49:59 -06:00
Tw
0146bb4e49 proxy: recognize client's cancellation 
fix issue #1589

Signed-off-by: Tw <tw19881113@gmail.com>
 2017-04-30 10:14:19 +08:00
Aaron Ellington
7ee4ea244f lint fixes 2017-04-29 20:53:58 -04:00
Matthew Holt
705cb98865 Remove TODO because Let's Encrypt has fixed issuance/OCSP ordering 2017-04-29 16:49:07 -06:00
Matthew Holt
ff45801cda Minor improvements to PR template 2017-04-29 16:49:07 -06:00
Tw
761a32a080 context: add Push action 
Signed-off-by: Tw <tw19881113@gmail.com>
 2017-04-27 09:51:33 +08:00
AJ ONeal
aa7ecb02af update macOS launchd example (#1600) 
* update to match same paths as systemd

* update to match new launchd plist

* generated from scratch with LaunchControl, flawless

Had some issues with the previous go and found LaunchControl which made it easy to generate a perfectly correct launchd conf

* Update README.md
 2017-04-26 13:44:32 -06:00
Matthew Holt
5d7db89a90 httpserver: Proper HTTP->HTTPS for wildcard sites (fixes #1625) 2017-04-26 12:32:15 -06:00
Francis Lavoie
1bae36ef29 Fix 1592: Allow insecure CA URL on internal networks (#1607) 
* Strip brackets in IsInternal if no port, allow loopback for CA URLs

* Fix a mistake

* Improve the trim

* Fix comment
 2017-04-26 12:00:49 -06:00
emersion
52fd4f89bf dist/init: Better way to get systemd version (#1612) 2017-04-26 10:45:57 -06:00
Tw
cad89a07e0 gzip: pool gzip.Writer to reduce allocation (#1618) 
* gzip: add benchmark

Signed-off-by: Tw <tw19881113@gmail.com>

* gzip: pool gzip.Writer to reduce allocation

Signed-off-by: Tw <tw19881113@gmail.com>
 2017-04-26 00:23:50 -06:00
Matthew Holt
b18527285d
Optimizations should be benchmarked or profiled. 2017-04-25 11:05:20 -06:00
Matthew Holt
1deb99c75c
Update contributing guide, make PR template, move github assets 2017-04-25 11:01:22 -06:00
Matthew Holt
0775f9123c
Change forum links to new domain 2017-04-23 12:51:08 -06:00
Matthew Holt
5fbd63e35d
Update README to match new site, branding, and latest version 2017-04-22 17:32:42 -06:00
Matthew Holt
f09fff3d8b
Remove ineffectual assignment created by reverting 344017d (#1584) 2017-04-21 22:26:38 -06:00
Matthew Holt
0a798aafac
mitm, templates, context: Pool buffers to reduce allocations 
Also disable some tests on context.Hostname because they're not portable
 2017-04-21 19:54:25 -06:00
Matthew Holt
f8614b877d
Revert 344017dc21 (#1584) 2017-04-21 13:02:15 -06:00
Matt Holt
182e1b4fb2 Merge pull request #1605 from tw4452852/1604 
proxy: take original URL path into account when remove prefix ("without")
 2017-04-21 12:07:14 -06:00
Tw
c684de9a88 proxy: take original URL path into account when remove prefix 
fix issue #1604

Signed-off-by: Tw <tw19881113@gmail.com>
 2017-04-21 19:35:32 +08:00
Matthew Holt
27785f7993
Update readme and changelog for v0.10 2017-04-20 11:36:40 -06:00
Matt Holt
ad4191a07e Merge pull request #1596 from mholt/closinglogs 
httpserver: Don't close stdout or stderr when closing logs (fix #1471)
 2017-04-20 05:39:42 -06:00
Jonas Östanbäck
91da965a39 Disable warning for insecure CA if located on private network. (#1599) 
* Disable warning for insecure CA if located on private network.
 * Add IsPrivateNetwork function
 * Add tests

Signed-off-by: Jonas Östanbäck <jonas.ostanback@gmail.com>

* Add more testcases

Signed-off-by: Jonas Östanbäck <jonas.ostanback@gmail.com>

* Rename IsPrivateNetwork -> IsInternal

Signed-off-by: Jonas Östanbäck <jonas.ostanback@gmail.com>
 2017-04-20 05:38:54 -06:00
Matt Holt
b37da03989 Merge pull request #1595 from jannickfahlbusch/feature/hostnameInTemplateActions 
templates: Add Hostname template action
 2017-04-19 16:20:16 -06:00
Jannick Fahlbusch
92af3ee4d8
Add hostname template action 
This adds the ability to display the remote hostname
of the visitors IP with template actions.
 2017-04-19 09:18:12 +02:00