Commit Graph

825 Commits

Author SHA1 Message Date
Guy Lewin
f336ef0062 style: export magic num 30*seconds to const 2020-03-03 17:47:06 -05:00
Guy Lewin
a537bbd585 feat: Add success function to vhost 2020-03-03 17:42:42 -05:00
Guy Lewin
6fc7135cbd style: split tcpmux into functions 2020-03-03 17:23:48 -05:00
Guy Lewin
045d5102d8 style: remove some naked returns 2020-03-03 17:02:15 -05:00
Guy Lewin
2cc839b311 docs: update readme to document tcpmux with httpconnect 2020-03-03 16:57:19 -05:00
Guy Lewin
ef0b21c3d5 feat: extend tcpmux with multiple multiplexers 2020-03-03 16:54:45 -05:00
Guy Lewin
e5edfb10f7 Merge branch 'dev' into feature/tcp-multiplexing
# Conflicts:
#	models/consts/consts.go
2020-03-02 09:22:32 -05:00
glzjin
0b9124d4fd
Fix bandwidth compare (#1679)
It may cause all proxy restart when api reload.
2020-03-02 11:20:08 +08:00
Guy Lewin
6c6607ae68
feat: add multiple authentication methods, token and oidc.
token is the current token comparison, and oidc generates oidc token using client-credentials flow. in addition - add ping verification using the same method
2020-03-01 10:57:01 +08:00
Guy Lewin
d0c499ee61 Update date on documentation 2020-02-17 11:26:17 +02:00
Guy Lewin
db06ae77dc Update documentation 2020-02-17 11:25:36 +02:00
Guy Lewin
a36bad8bcf Update tests to support rewrite 2020-02-17 11:22:36 +02:00
Guy Lewin
5c3b438863 Update readme to match code changes 2020-02-17 11:20:21 +02:00
Guy Lewin
1062ccaaee Include proxy file 2020-02-17 11:18:56 +02:00
Guy Lewin
8e3b6fcc53 Export tcp multiplexing into new proxy type 2020-02-17 11:18:40 +02:00
Guy Lewin
5f79740354 add test for tcp multiplexing 2020-02-17 10:22:31 +02:00
Guy Lewin
b7020e3f3c Multiplex TCP only if custom domain or subdomain is configured 2020-02-16 21:49:22 +02:00
Guy Lewin
3e6f825a9d Update readme to talk about tcp multiplexing 2020-02-16 18:06:14 +02:00
Guy Lewin
504f565d3f tcp multiplexing over http connect tunnel 2020-02-16 17:49:51 +02:00
fatedier
83d80857fd
Merge pull request #1644 from GuyLewin/feature/detailed-errors-to-client
DetailedErrorsToClient - only send detailed error info if this is on
2020-02-12 10:39:03 +08:00
Guy Lewin
98fa3855bd CR: export error string generation to a function 2020-02-11 16:57:38 +02:00
Guy Lewin
9440bc5d72 Merge branch 'dev' into feature/detailed-errors-to-client
# Conflicts:
#	models/config/server_common.go
2020-02-11 11:25:04 +02:00
fatedier
95753ebf1c
Merge pull request #1643 from GuyLewin/feature/tls-only
Feature/tls only
2020-02-11 13:57:03 +08:00
Guy Lewin
f8c6795119 DetailedErrorsToClient - only send detailed error info if this is on 2020-02-10 19:29:57 +02:00
Guy Lewin
7033f3e72b Test TlsOnly 2020-02-10 19:14:07 +02:00
Guy Lewin
e3101b7aa8 Update README.md 2020-02-10 19:01:23 +02:00
Guy Lewin
c747f160aa TlsOnly - only accept TLS connections if enabled 2020-02-10 18:56:41 +02:00
fatedier
c8748a2948 update .travis.yml 2020-02-04 22:24:07 +08:00
fatedier
69fa7ed16e bump version to v0.31.2 2020-02-04 21:43:37 +08:00
fatedier
5336155365
Merge pull request #1636 from fatedier/new
send closeProxy msg to server then client start proxy error
2020-02-04 21:39:26 +08:00
fatedier
4feb74cb89 doc typo 2020-02-04 21:34:46 +08:00
fatedier
4a4cf552af send closeProxy msg to server then client start proxy error, fix #1606 2020-02-04 19:41:39 +08:00
Joe Cloud
0f59b8f329 English grammar fix. (#1619) 2020-01-15 12:11:12 +08:00
fatedier
4832a2a1e9 bump version 2020-01-06 15:44:18 +08:00
fatedier
52ecd84d8a fix panic if set meta in proxy config, fix #1595 2020-01-06 15:43:25 +08:00
fatedier
42014eea23 improve xtcp, fix #1585 2020-01-03 11:39:44 +08:00
fatedier
c2da396230
Merge pull request #1587 from fatedier/doc
add server manage plugin doc
2020-01-03 11:37:52 +08:00
fatedier
e91c9473be add server manage plugin doc 2020-01-03 11:35:12 +08:00
fatedier
13e48c6ca0
Merge pull request #1575 from fatedier/new
support server plugin feature
2019-12-31 14:12:30 +08:00
fatedier
31e2cb76bb bump version 2019-12-23 20:00:59 +08:00
fatedier
91e46a2c53 support server plugin feature 2019-12-23 20:00:04 +08:00
fatedier
a57679f837 support meta info for client and proxy 2019-12-08 21:01:58 +08:00
fatedier
df18375308
Merge pull request #1537 from fatedier/new
bump version to v0.30.0
2019-11-26 10:42:31 +08:00
fatedier
c63737ab3e update doc for bandwith limit 2019-11-26 10:23:37 +08:00
fatedier
1cdceee347 bump version to v0.30.0 2019-11-26 09:15:24 +08:00
fatedier
694c434b9e
Merge pull request #1529 from kingjcy/20191118
plugin http2https
2019-11-22 15:25:01 +08:00
kingjcy
62af5c8844 handle close 2019-11-22 15:18:20 +08:00
kingjcy
56c53909aa plugin http2https
plugin http2https
2019-11-22 11:12:48 +08:00
fatedier
21a126e4e4
Merge pull request #1510 from CallanTaylor/close-file
Close file
2019-11-12 14:02:49 +08:00
CallanTaylor
8affab1a2b Close file 2019-11-12 11:38:55 +13:00