曹海迪
600bd1f875
update server/stop
2020-11-06 08:26:03 +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
fatedier
495d999b6c
refactoring monitor code, support prometheus ( #1668 )
...
* refactoring monitor code, support prometheus
* remove vendor
2020-03-11 13:20:26 +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
曹海迪
f03d1e5eba
Merge branch 'frp/master'
2020-02-16 11:43:53 +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
Guy Lewin
f8c6795119
DetailedErrorsToClient - only send detailed error info if this is on
2020-02-10 19:29:57 +02:00
Guy Lewin
c747f160aa
TlsOnly - only accept TLS connections if enabled
2020-02-10 18:56:41 +02: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
fatedier
e9e86fccf0
let max_pool_count valid
2019-08-29 21:13:21 +08:00
fatedier
f999c8a87e
Merge pull request #1396 from velovix/issue-1387_server-conf-as-argument
...
Pass server configuration as an argument
2019-08-21 00:30:01 +08:00
Tyler Compton
5fc7b3ceb5
Remove global ServerService variable
...
This variable didn't seem to be used anyway, so no further changes were
required.
2019-08-19 16:23:33 -07:00
Tyler Compton
6277af4790
Pass server configuration as an argument
...
The ServerCommonConf is now passed around as an argument instead of
being shared between components as a global variable. This allows for
more natural interaction with server.Session as a library and allows for
multiple servers to co-exist within the same process.
Related: #1387
2019-08-19 15:52:08 -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
b661dfb6ec
merge from frp 0.28.2
2019-08-13 22:20:48 +08: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
b3ed863021
support http load balancing
2019-07-31 00:41:58 +08:00
haidy
d3f88fe5ea
Merge branch 'frp/master'
...
# Conflicts:
# server/service.go
2019-07-20 13:05:28 +08:00
Christian Muehlhaeuser
0b40ac2dbc
Fixed typos in comments
...
Just nitpicky typo fixes.
2019-07-19 12:40:14 +02:00
fatedier
17cc0735d1
add read timeout for TLS check operation
2019-07-12 17:11:03 +08:00
haidy
cefd81e873
Merge branch 'frp/master'
2019-04-27 12:01:38 +08:00
fatedier
0dfd3a421c
frps: support custom_404_page
2019-04-25 12:29:34 +08:00
Gihan
9f47c324b7
api error fix due to status code
2019-04-25 09:54:56 +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
fatedier
9c4ec56491
support proxy protocol
2019-03-29 19:01:18 +08:00
fatedier
74a8752570
fix route conflict
2019-03-29 17:12:44 +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
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
2481dfab64
fix api
2019-02-11 14:37:52 +08:00
fatedier
95a881a7d3
frps: update server dashboard_api
2019-02-11 11:42:07 +08:00
fatedier
96d7e2da6f
add admin UI for frpc
2019-02-01 19:28:05 +08:00
fatedier
48990da22e
go vet
2019-01-31 16:49:23 +08:00
haidy
61a3797c55
Merge branch 'frp/master'
2019-01-27 22:10:32 +08:00
fatedier
70ac7d3d11
fix control delete error
2019-01-26 21:36:24 +08:00
haidy
9e42305909
更新至最新代码
2019-01-17 22:10:25 +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
荒野無燈
0bd8f9cd9b
frps dashboard api: fixup getProxyStatsByType no data return
2019-01-15 19:22:38 +08:00
fatedier
f76deb8898
frps: remove auth timeout
2019-01-15 00:22:13 +08:00
