Matt Holt
bf47951f3a
Merge pull request #196 from evermax/master
...
markdown, browse: Integrated Context struct for templating
2015-07-25 15:15:51 -06:00
Maxime
604c8abb59
Remove debug line, add file name as default title
2015-07-25 22:39:13 +02:00
Maxime
ef4a4b0ab8
Removed attribute not needed.
2015-07-24 22:17:14 +02:00
Maxime
24bdb433c9
Changed .Var to .Doc in Markdown templates
...
Put the title into the .Doc variables as well.
Changed the test template file to use new names.
2015-07-24 22:14:05 +02:00
Matthew Holt
a578c43810
browse: Add txt files to list of default files
2015-07-24 10:27:19 -06:00
Matthew Holt
74b758034e
redir: Allows replacements; defaults to exact match redirects
...
This is a breaking change for those who expect catch-all redirects to preserve path; use {uri} variable explicitly now
2015-07-24 10:27:19 -06:00
Matthew Holt
04571ff393
NewReplacer takes third argument for empty value string
2015-07-24 10:27:19 -06:00
pyed
1589129ea1
Save sorting preferences as cookies
...
To be used across directories
2015-07-23 13:25:03 +03:00
Maxime
97dcc79a7f
Remove undesired committed debug logs
2015-07-23 11:53:15 +02:00
Maxime
bc2feece4b
Moved test files to testdata folder.
...
Changed the tests accordingly.
2015-07-23 09:35:46 +02:00
Maxime
2df30d186e
Added a test on markdown for the default template
2015-07-21 17:45:32 +02:00
Maxime
6451e10d3e
Add context to markdown template
...
Created a struct containing middleware.Context, Title, Markdown and the
variables from the user to use to render the template.
The title now can be accessed via {{.Title}}.
The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 07:58:34 +02:00
Matthew Holt
00997db5ae
markdown: Fix large markdown files that got truncated
2015-07-18 12:57:16 -06:00
Maxime
2d5320c454
Added test for the browse directive
...
Created sample files for the test
2015-07-18 11:37:05 +02:00
Maxime
2fa6e278d2
Merge branch 'master' of https://github.com/mholt/caddy
2015-07-18 09:58:27 +02:00
Maxime
f536bc94b2
Added the Context to the browse directive
...
Moved the Context type to middleware and exported it.
Users can use .Include and others in browse directive templating
Created test for the templates directive.
2015-07-17 20:07:24 +02:00
Matthew Holt
afc540f6b7
Updated changes
2015-07-15 09:36:34 -06:00
Matt Holt
fcf2622c26
Merge pull request #187 from evermax/master
...
redir: Preserve query string on catch-all redirect (fixes #180 )
2015-07-13 09:42:19 -06:00
Maxime
d9ebc5398a
Changes regarding review
...
Use path.Join and then check if the request had a slash at the end to
place it again.
2015-07-12 21:22:15 +02:00
Maxime
eea68c34ad
Changes regarding comment.
...
Used http status code instead of a hardcoded value.
Used url.Parse instead of url.ParseRequestURI, so that you can parse
both absolute and relative URL.
2015-07-12 16:43:35 +02:00
Maxime
8a2d0890a2
Changes regarding issue 180
...
The get parameters are now forwarded when redirected.
Added some tests to validate this behavior.
2015-07-12 16:01:32 +02:00
Peter Hellberg
33fa29fda0
extensions: Initial tests
2015-07-10 12:05:06 -06:00
Matthew Holt
c82d7c2dd2
templates: Better error handling for missing files
2015-07-06 23:37:27 -06:00
Abiola Ibrahim
d4f0ac2303
Merge remote-tracking branch 'upstream/master'
2015-07-06 06:43:02 +01:00
Abiola Ibrahim
4588812d24
Gzip: Fix wildcard extension bug.
2015-07-06 06:36:48 +01:00
Matthew Holt
9467dbdd40
Fix errors tests
2015-07-05 23:23:35 -06:00
Matthew Holt
71c4fdbc85
errors: Prepend timestamp to log entry
2015-07-05 23:20:37 -06:00
Matthew Holt
b5579ca910
gzip: Remove mimes
2015-07-03 18:13:30 -06:00
Matthew Holt
32ef35b952
gzip: Fix tests
2015-07-01 19:05:31 -06:00
Matthew Holt
abf22909f1
gzip: Make it gzip again
2015-07-01 18:56:30 -06:00
Matt Holt
263fa064cd
Merge pull request #169 from abiosoft/master
...
git: Remove from core (available as add-on)
2015-07-01 11:44:49 -06:00
Matthew Holt
915172e9ef
templates: Close files after done including them
2015-07-01 11:36:37 -06:00
Matthew Holt
4d066b7e30
ext: Only append extension if request is not for directory ( fixes #173 )
2015-07-01 11:35:52 -06:00
Abiola Ibrahim
a7f0705bcf
Merge remote-tracking branch 'upstream/master'
2015-07-01 14:01:45 +01:00
Matthew Holt
7a42e60bcb
templates: Support for nested include files
...
i.e. included files are also parsed as templates
2015-06-30 18:21:18 -06:00
Abiola Ibrahim
aecdecbdf8
Merge remote-tracking branch 'upstream/master'
2015-06-30 17:31:40 +01:00
Abiola Ibrahim
4240817a3a
Fix for Issue 141: index not found, 502 Bad Gateway.
2015-06-30 11:54:50 +01:00
Abiola Ibrahim
3f1f6720ee
Decouple git middleware from caddy core. Now available as an add-on at https://github.com/abiosoft/caddy-git .
2015-06-28 00:31:52 +01:00
Matt Holt
47096e112a
Merge pull request #156 from pyed/sort
...
browse: Ability to sort
2015-06-22 12:40:58 -06:00
pyed
68add78230
Implement sorting functionality for "Browse"
2015-06-21 18:04:47 +03:00
Matt Holt
6b27d4ce11
Merge pull request #131 from slav123/master
...
fastcgi: fix #127
2015-06-17 17:26:52 -06:00
Slawomir Jasinski
f11e136068
Update fcgiclient.go
2015-06-18 09:12:35 +10:00
Matthew Holt
c811d416a7
log: Customizable default error function
2015-06-15 10:17:09 -06:00
Simon Jefford
6c1f2af53a
log: ensure the correct status is always logged
...
in the case of error (>=400) then no response may have been sent
2015-06-14 21:00:27 +01:00
Matt Holt
d7051e986f
Merge pull request #134 from tw4452852/hijack
...
middleware: let middleware.responseRecorder be a http.Hijacker
2015-06-12 08:26:49 -06:00
Tw
e79a88856a
let middleware.responseRecorder be a http.Hijacker
...
Signed-off-by: Tw <tw19881113@gmail.com>
2015-06-12 11:42:28 +08:00
Slawomir Jasinski
db2368cd0b
Removed parentheses #127
2015-06-12 11:33:55 +10:00
slav123
29404e34d9
code cleanup
2015-06-11 13:17:56 +10:00
Slawomir Jasinski
14b64fef43
fix #127
...
fixes issue with Status header coming from php-fpm 5.5 different then regular "HTTP/1.1 200 OK".
If server returns Status code - "200" will be handled properly instead "throwing runtime error: index out of range"
2015-06-11 09:59:30 +10:00
Abiola Ibrahim
e0f10c2b03
Gzip: Accept MIME types.
2015-06-10 22:02:08 +01:00
Matt Holt
01aca02edc
Merge pull request #129 from tw4452852/rename_internal
...
internal: rename middleware's package name from `internal` to `inner`
2015-06-10 08:04:27 -06:00
Tw
90921a9deb
rename middleware's name from internal
to inner
...
The internal package has the special meaning in go
(see https://golang.org/s/go14internal ).
So rename it to `inner`.
Signed-off-by: Tw <tw19881113@gmail.com>
2015-06-10 15:48:41 +08:00
AJ ONeal
d6a7dfc1a5
add ability to do meta redirects
...
Proper Location redirects are disadvantageous in some situations.
For example, you may want a developer to know that a resource is available
via https, but you don't want an insecure call to the API to succeed.
2015-06-10 05:48:40 +00:00
Matt Holt
3a795de828
Merge pull request #117 from zmb3/errorfmt
...
Update error strings (start with lowercase letters)
2015-06-09 08:24:08 -06:00
Tw
b717e6f2d8
Add unit test for errors middleware
...
Signed-off-by: Tw <tw19881113@gmail.com>
2015-06-09 15:24:53 +08:00
Zac Bergquist
3aff1677cc
Fix failing test that's looking for a specific error message.
2015-06-08 20:29:48 -04:00
Zac Bergquist
9e97d79c81
Ensure that proper names are capitalized in error strings.
2015-06-08 17:35:16 -04:00
Zac Bergquist
41e1f1ffa5
Update error strings (start with lowercase letters)
2015-06-07 20:49:17 -04:00
Abiola Ibrahim
c42e60a3d2
Git: fix for data races.
2015-06-07 20:39:24 +01:00
Abiola Ibrahim
13db60d382
rename gzip test function to TestGzipHandler
2015-06-07 01:27:36 +01:00
Abiola Ibrahim
c9233d7446
Gzip: Added compression level, extension and path filters.
2015-06-07 01:21:54 +01:00
Abiola Ibrahim
820b2af43a
FastCGI: allow "unix:" prefix for unix sockets.
2015-06-04 23:03:58 +01:00
Matt Holt
1cb0053720
Merge pull request #102 from brk0v/proxy-without
...
proxy: Add "without" option
2015-06-04 08:24:48 -06:00
Viacheslav Biriukov
822a615c6c
rollback tests
2015-06-04 14:02:52 +00:00
Viacheslav Biriukov
593557659c
fix tests and change naming
2015-06-04 13:57:39 +00:00
xenolf
b4780a41d3
Added webhook functionality to the git middleware.
...
The webhook providers reside behind a small interface which determines if
a provider should run. If a provider should run it delegates
responsibility of the request to the provider.
ghdeploy initial commit
Added webhook functionality to the git middleware.
The webhook providers reside behind a small interface which determines if a provider should run. If a provider should run it delegates responsibility of the request to the provider.
Add tests
Remove old implementation
Fix inconsistency with git interval pulling.
Remove '\n' from logging statements and put the initial pull into a startup function
2015-06-04 03:24:16 +02:00
Viacheslav Biriukov
4790dacbf7
add without to proxy middleware
2015-06-03 18:06:24 +00:00
Matthew Holt
9ce0e8e17c
proxy: Added tests for reverse websocket proxy
2015-06-01 22:39:53 -06:00
Matthew Holt
32825e8a79
basicauth: Patch timing vulnerability
2015-06-01 20:33:07 -06:00
Austin
68cd4bdeab
check server response instead of client
2015-06-01 19:29:32 -07:00
Austin
ccd3e55b32
changes as noted in PR
2015-06-01 10:23:57 -07:00
Austin
56ec7b9887
websocket directive, upgrade comparison
2015-05-30 11:34:54 -07:00
Austin
2d6ff40649
add supported for ws in reverse proxy
2015-05-29 19:21:50 -07:00
Austin
dd946f8ab5
moved init to policy.go
2015-05-28 18:16:23 -07:00
Austin
593aec9ab1
changes per comment
2015-05-28 16:53:54 -07:00
Austin
6b173b5170
added custom policy support
2015-05-28 15:56:11 -07:00
Abiola Ibrahim
2013838bfd
Git: mock time functions in tests.
2015-05-28 10:20:26 +01:00
Abiola Ibrahim
879558b9ee
Git: code refactor. replace Sleep with Ticker
2015-05-26 20:20:57 +01:00
Abiola Ibrahim
6c6e0e3f73
Git: More tests. Code refactor.
2015-05-26 04:44:47 +01:00
Matthew Holt
6f05794bb8
git: Fixed unusual but potent race condition
2015-05-25 15:39:04 -06:00
Zac Bergquist
e4b50aa814
Fix more lint warnings
2015-05-24 22:52:34 -04:00
Zac Bergquist
fd8490c689
Fix lint warnings for middleware/websockets
2015-05-24 21:04:03 -04:00
Zac Bergquist
d0a51048d7
Fix lint warnings in middleware/rewrite
2015-05-24 21:00:54 -04:00
Zac Bergquist
506f131428
Fix lint warnings for middleware/proxy
2015-05-24 20:58:17 -04:00
Abiola Ibrahim
4e94b85ec2
FastCGI: support for unix sockets.
2015-05-23 03:39:23 +01:00
Abiola Ibrahim
f44cd5d740
Git: Minor fixes. Refactor. Added tests.
2015-05-22 20:50:04 +01:00
Abiola Ibrahim
c382c885e4
use middleware.Path for base path comparison
2015-05-16 16:57:57 +01:00
Abiola Ibrahim
7ae9e3a262
Rewrite: Added new variables file, dir, fragment.
2015-05-16 16:30:15 +01:00
Abiola Ibrahim
74d162f377
Rewrite: Support for Regular Expressions.
2015-05-16 13:03:48 +01:00
Abiola Ibrahim
ad7b453f03
Rewrite: modified syntax.
2015-05-15 18:47:26 +01:00
Abiola Ibrahim
b2afc30d12
Rewrite: added regexp. awaiting documentation and tests.
2015-05-15 02:43:29 +01:00
Abiola Ibrahim
8394d72f48
Fix for Issue 72: Markdown: 500 for YAML metadata
2015-05-13 00:44:35 +01:00
Abiola Ibrahim
a1312465b5
browse: return forbidden (403) only when it is a permission error.
2015-05-10 17:58:44 +01:00
Matt Holt
e2273ea676
Merge pull request #69 from peterhellberg/headers_test
...
headers: Initial test for Headers and change of Rule.Url to Rule.Path
2015-05-10 07:49:11 -06:00
Matt Holt
c6eaf0db36
Merge pull request #62 from jordic/testing_basicauth
...
basicauth: Should write an unauthorized code to response. (Actually only returns it)
2015-05-10 07:47:16 -06:00
Michael Schoebel
e0173ec4c7
internal middleware: added tests
2015-05-10 14:41:48 +02:00
jordi collell
99fa4581aa
basicauth: patch for overlapping rules
2015-05-10 08:20:58 +02:00
Matthew Holt
4272536518
markdown: sitegen keyword and run generation at startup
...
Also fixed bug for markdown files that don't contain front matter
2015-05-09 21:12:52 -06:00
Peter Hellberg
d9dc9326f2
headers: Initial test for Headers
2015-05-09 21:47:02 +02:00
Peter Hellberg
b5fff09b54
headers: Changed Rule.Url to Rule.Path
...
Updated ServeHTTP comment to indicate that it is
setting headers and not adding them to existing values.
2015-05-09 21:45:28 +02:00