cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
937 Commits 3 Branches 105 Tags 84 MiB
7b5d6913f9
Commit Graph

140 Commits

Author SHA1 Message Date
曹海迪
7b5d6913f9 Merge branch '0341' 
# Conflicts:
#	client/admin_api.go
#	client/control.go
#	client/proxy/proxy.go
#	client/service.go
#	cmd/frpc/sub/root.go
#	pkg/util/log/log_extend.go
#	pkg/util/net/kcp.go
#	pkg/util/net/udp.go
#	server/group/tcp.go
#	server/ports/ports.go
#	server/service.go
 2020-11-06 08:57:59 +08:00
曹海迪
5c57b914a4 Merge branch '0321' 
# Conflicts:
#	client/control.go
 2020-11-06 08:29:19 +08:00
曹海迪
91f120371c Merge branch 'origin_0.32.0' 
# Conflicts:
#	vendor/github.com/fatedier/golib/net/mux/mux.go
 2020-10-11 23:10:34 +08:00
lonwern
0f8040b875
fix create tls work connection (#2013) 2020-09-29 15:44:52 +08:00
fatedier
3fbdea0f6b
rename models to pkg (#2005) 2020-09-23 13:49:14 +08:00
yuyulei
4fff3c7472
Add tls configuration to both client and server (#1974) 2020-09-18 19:58:58 +08:00
fatedier
48fa618c34
update e2e tests (#1973) 2020-09-07 15:45:44 +08:00
fatedier
c9fe23eb10
more e2e tests (#1845) 2020-09-07 14:57:23 +08:00
fatedier
8b75b8b837
fix by golint (#1822) 2020-05-24 17:48:37 +08:00
Tank
d193519329
feat: Support user specify udp packet size in config (#1794) 2020-05-07 17:47:36 +08:00
Tank
4797136965
feat: support sudp proxy (#1730) 2020-04-22 21:37:45 +08:00
Tank
caa6e8cf01
fix: frpc reconnect frps frequently lead to memory leak (#1722) 2020-04-02 10:58:37 +08:00
fatedier
1db091b381
tcp multiplexing over http connect tunnel 2020-03-05 21:47:49 +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
曹海迪
575b7d569b frp 0.31.2 2020-02-17 10:56:45 +08:00
曹海迪
f03d1e5eba Merge branch 'frp/master' 2020-02-16 11:43:53 +08:00
fatedier
4a4cf552af send closeProxy msg to server then client start proxy error, fix #1606 2020-02-04 19:41:39 +08:00
fatedier
42014eea23 improve xtcp, fix #1585 2020-01-03 11:39:44 +08:00
fatedier
91e46a2c53 support server plugin feature 2019-12-23 20:00:04 +08:00
haidy
2c1eaf2faf Merge branch 'frp/master' 
# Conflicts:
#	client/control.go
#	client/proxy/proxy.go
#	client/service.go
#	client/visitor.go
#	server/service.go
#	utils/net/listener.go
#	utils/net/tcp.go
 2019-12-18 22:01:34 +08:00
fatedier
12cc53d699 update bandwidth_limit 2019-11-09 01:13:30 +08:00
fatedier
6da093a402 support bandwith limit for one proxy 2019-11-03 01:20:49 +08:00
fatedier
649f47c345 change log method 2019-10-12 20:13:12 +08:00
haidy
6e819501d9 frp 0.29.0 2019-10-06 13:27:45 +08:00
haidy
59aa7cd710 Merge branch 'frp/master' 
# Conflicts:
#	client/admin_api.go
#	client/control.go
#	client/proxy/proxy.go
#	client/service.go
#	client/visitor.go
#	cmd/frpc/sub/root.go
#	server/service.go
 2019-10-03 14:19:23 +08:00
haidy
64427f8e38 cmd 2019-10-03 14:09:46 +08:00
fatedier
5dc8175fc8
Merge pull request #1420 from Hurricanezwf/fix-bad-xtcp-encryption 
fix #1347:  bad encryption and compression when use xtcp
 2019-09-01 20:49:13 +08:00
zhouwenfeng
dc6a5a29c1 fix bad encryption and compression when use xtcp 2019-08-31 21:24:20 +08:00
fatedier
fdc6902a90 proxy protocol: fix detect method for IPV4 and IPV6 2019-08-26 11:13:33 +08:00
Tyler Compton
4dfd851c46 Add docs for common config fields & sessions 
Now that the common configuration objects and session objects are part
of a public API, they need to be documented in a way that can be read
with godoc. This commit should lead to easier development with FRP as a
library.
 2019-08-24 15:20:34 -07:00
Tyler Compton
666f122a72 Pass client configuration as an argument 
The ClientCommonConf, configuration file path, and server UDP port are
now passed around as arguments instead of being shared between
components as global variables. This allows for multiple clients to
exist in the same process, and allows client.Session to be used as a
library more easily.
 2019-08-20 14:08:01 -07:00
Tyler Compton
bc46e3330a Add an "assets_dir" option for frpc 
This option allows users to specify where they want assets to be loaded
from, like the "assets_dir" option that already exists for frps. This
allows library users to use the admin panel without having to bundle
assets with statik.
 2019-08-19 16:51:03 -07:00
Tyler Compton
00bd0a8af4 Load assets for dashboard/admin panel on demand 
The client and server services now only attempt to load assets if the
dashboard or admin panel are enabled. This change makes it possible to
use FRP as a library without having to manage assets. If a library user
wants to start a server with the dashboard enabled, they will need to
set the DashboardPort and AssetsDir fields of ServerCommonConf.
 2019-08-19 10:10:50 -07:00
haidy
b86ff20d5a Merge branch 'frp/master' 
# Conflicts:
#	client/service.go
#	server/group/tcp.go
#	server/service.go
 2019-08-13 22:16:51 +08:00
fatedier
757b3613fe fix health check bug, fix #1367 2019-08-09 12:47:27 +08:00
haidy
d320d7c030 frp client 2019-08-03 21:25:48 +08:00
fatedier
394af08561 close session in login() 2019-08-03 16:43:21 +08:00
fatedier
5680a88267 fix connection leak when login_fail_exit is false, fix #1335 2019-07-31 00:50:38 +08:00
haidy
cefd81e873 Merge branch 'frp/master' 2019-04-27 12:01:38 +08:00
fatedier
6a1f15b25e support proxy protocol in unix_domain_socket 2019-04-25 12:01:57 +08:00
haidy
10091ba351 Merge branch 'frp/master' 
# Conflicts:
#	client/control.go
#	client/proxy/proxy.go
 2019-04-17 21:49:35 +08:00
fatedier
b7a73d3469 support proxy protocol for type http 2019-04-10 10:51:01 +08:00
fatedier
7f9d88c10a fix 2019-04-08 15:39:14 +08:00
haidy
cfb520379f Merge branch 'frp/master' 2019-03-30 11:40:02 +08:00
fatedier
9c4ec56491 support proxy protocol 2019-03-29 19:01:18 +08:00
fatedier
9ac8f2a047 fix health check unclosed resp body, fix #1155 2019-03-25 18:17:33 +08:00
haidy
003682366c 修复崩溃的bug 2019-03-24 09:29:38 +08:00
haidy
1eb4a917fe 升级到 0.25.1 2019-03-24 08:33:36 +08:00
haidy
d51527959b Merge branch 'frp/master' 
# Conflicts:
#	client/control.go
#	client/proxy/proxy.go
#	client/service.go
#	client/visitor.go
#	server/service.go
 2019-03-24 08:30:06 +08:00
fatedier
e691a40260 improve the stability of xtcp 2019-03-11 15:53:58 +08:00