guoswork
/
frp
mirror of https://gitee.com/IrisVega/frp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
810 Commits 4 Branches 99 Tags 30 MiB
Commit Graph

54 Commits

Author SHA1 Message Date
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
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
fatedier 649f47c345 change log method 2019-10-12 20:13:12 +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
fatedier b3ed863021 support http load balancing 2019-07-31 00:41:58 +08:00
fatedier 17cc0735d1 add read timeout for TLS check operation 2019-07-12 17:11:03 +08:00
fatedier 0dfd3a421c frps: support custom_404_page 2019-04-25 12:29:34 +08:00
fatedier d812488767 support tls connection 2019-03-11 14:14:31 +08:00
fatedier 96d7e2da6f add admin UI for frpc 2019-02-01 19:28:05 +08:00
fatedier 70ac7d3d11 fix control delete error 2019-01-26 21:36:24 +08:00
fatedier f76deb8898 frps: remove auth timeout 2019-01-15 00:22:13 +08:00
fatedier 611d063e1f server: adjust code structure 2019-01-15 00:11:08 +08:00
fatedier 0c7d778896 frps: optimize code 2019-01-11 14:34:50 +08:00
fatedier 7c21906884 improve kcp shutdown 2018-12-11 15:17:36 +08:00
fatedier f14ed87b29
Merge pull request #886 from fatedier/websocket 
Connect protocol support websocket
 2018-08-10 16:36:02 +08:00
fatedier 07623027bc websocket: fix 2018-08-10 16:31:49 +08:00
fatedier 941ac25648 fix ci 2018-08-10 12:02:38 +08:00
fatedier 7793f55545 websocket: update muxer for websocket 2018-08-10 11:45:48 +08:00
fatedier ca88b07ecf optimize 2018-08-08 11:18:38 +08:00
FishFish b8037475ed websocket protocol 2018-08-05 12:55:31 +08:00
fatedier 495b577819 update group ci 2018-05-23 14:39:12 +08:00
fatedier f56b49ad3b new feature: load balancing for tcp proxy 2018-05-22 23:59:35 +08:00
fatedier b2a2037032 change accept connection error loglevel to debug 2018-05-11 10:35:16 +08:00
fatedier 20fcb58437 vendor: add package golib/net 2018-05-09 00:23:42 +08:00
fatedier 5db605ca02 frps: vhost_http_port and vhost_https_port can be same with frps bind 
port
 2018-05-06 20:25:52 +08:00
fatedier f45283dbdb disable yamux default log 2018-05-05 00:09:39 +08:00
fatedier 976cf3e9f8 use yamux instead of smux 2018-04-25 02:42:00 +08:00
fatedier 4a5c00286e doc: update 2018-04-24 01:28:25 +08:00
fatedier 0f6f674a64 cmd: support more cli command 2018-04-23 02:00:25 +08:00
fatedier b2c846664d new feature: assign a random port if remote_port is 0 in type tcp and 
udp
 2018-01-17 22:18:34 +08:00
fatedier 584e098e8e frpc: add status command 2018-01-17 01:09:33 +08:00
fatedier 7da61f004b improve http vhost package 2017-12-13 03:27:43 +08:00
fatedier de48d97cb2 fix kcp port print error 2017-12-11 01:36:47 +08:00
fatedier bd1e9a3010 update doc and fix vistor -> visitor 2017-12-05 01:34:33 +08:00
timerever 8c65b337ca add custom dashboard bind address 2017-11-28 15:56:34 +08:00
fatedier 0559865fe5 support xtcp for making nat hole 2017-10-25 01:27:04 +08:00
fatedier f63a4f0cdd frps: new parameter 'proxy_bind_addr' 2017-07-05 01:40:01 +08:00
fatedier 171bc8dd22 new proxy type: stcp(secret tcp) 2017-06-26 03:02:33 +08:00
fatedier a2c318d24c update kcp mode 2017-06-13 23:36:10 +08:00
fatedier 80ba931326 support protocol kcp 2017-06-04 19:56:21 +08:00
fatedier faf584e1dd metric: fix statistics error 2017-05-19 18:38:31 +08:00
fatedier 3fe50df200 doc: update 2017-05-18 01:59:46 +08:00