曹海迪
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
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
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
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
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
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
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
d812488767
support tls connection
2019-03-11 14:14:31 +08:00
haidy
fb756e03de
修复内存泄漏的问题
2019-03-07 21:45:38 +08:00
haidy
512e601cc9
合并最新代码
2019-03-05 22:31:51 +08:00
haidy
b66cd62c0d
Merge branch 'frp/master'
...
# Conflicts:
# client/admin_api.go
# cmd/frpc/sub/root.go
2019-03-05 17:09:38 +08:00
fatedier
96d7e2da6f
add admin UI for frpc
2019-02-01 19:28:05 +08:00
haidy
edaaafbf9c
Merge branch 'frp/master'
...
# Conflicts:
# client/control.go
# cmd/frpc/sub/root.go
# server/proxy.go
# server/service.go
2019-01-17 21:45:16 +08:00
haidy
f2512f8fce
support ipv6
2019-01-04 22:21:57 +08:00
caohaidi
594ae40261
修改判断frp状态可能错误的bug
2018-12-27 13:32:20 +08:00
caohaidi
83b9e076f9
修复可能崩溃的bug
2018-12-22 18:59:09 +08:00
haidy
dda7861742
更新至最新代码
2018-12-14 08:50:55 +08:00
haidy
3c114e7cd9
Merge remote-tracking branch 'upstream/master'
...
# Conflicts:
# client/control.go
# client/service.go
2018-12-13 22:44:09 +08:00
fatedier
7c21906884
improve kcp shutdown
2018-12-11 15:17:36 +08:00
haidy
f3813c32a0
更新frp接口
2018-11-26 22:28:48 +08:00
fatedier
b33ea9274c
client/control: refactor code
2018-11-06 18:35:05 +08:00
fatedier
c33b5152e7
split visitors from proxies and add health check config
2018-06-25 18:22:35 +08:00
Haidy
9d383a5b5b
更新代码
2018-05-16 01:11:43 +08:00
haidy
0749c2eb4d
修改frpc异步执行
2018-05-14 14:37:48 +08:00
fatedier
0f6f674a64
cmd: support more cli command
2018-04-23 02:00:25 +08:00
fatedier
584e098e8e
frpc: add status command
2018-01-17 01:09:33 +08:00
fatedier
bd1e9a3010
update doc and fix vistor -> visitor
2017-12-05 01:34:33 +08:00
fatedier
d246400a71
frpc: add admin server for reload configure file
2017-07-13 02:20:49 +08:00
fatedier
aede4e54f8
close all proxies if protocol = kcp
2017-06-27 01:59:30 +08:00
fatedier
171bc8dd22
new proxy type: stcp(secret tcp)
2017-06-26 03:02:33 +08:00
fatedier
88083d21e8
start refactoring
2017-03-09 22:44:42 +08:00
