OrgGo
/
frp
mirror of https://github.com/fatedier/frp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,193 Commits 2 Branches 101 Tags 80 MiB
Commit Graph

180 Commits

Author SHA1 Message Date
kekeimiku 0cee1877e3
refactor: move from io/ioutil to io and os package (#2592) 2021-09-29 10:33:57 +08:00
bobo liu 2f74f54f18
Let's get rid of ugly statik (#2255) 
* Get rid of ugly statik

go1.16 introduced the embed package, it's the more graceful solution for embedding file into binary.
https://golang.org/pkg/embed/

* remove statik totally

* split go and static files in assets
 2021-08-17 20:20:04 +08:00
fatedier 42745a3da2
frpc: add disable_custom_tls_first_byte to not send first custom tls to frps (#2520) 2021-08-11 23:10:35 +08:00
fatedier 82f80a22be
add healthz api (#2511) 2021-08-04 14:33:53 +08:00
Fishbone df5859b5f7
Fix server-side proxy inappropriate quit when met `accept: too many open files` error (#2467) 2021-07-05 10:27:15 +08:00
fatedier 02b12df887
frpc: consider include configs for verify and reload command (#2424) 2021-06-02 23:54:22 +08:00
fatedier fbaa5f866e
add e2e tests (#2334) 2021-03-31 16:57:39 +08:00
Chotow 0ff27fc9ac
fix(server): listen udp port failed (#2308) 
fix #2306
 2021-03-18 11:05:03 +08:00
yuyulei 8e25f13201
update: support ipv6 (#2288) 2021-03-10 20:19:58 +08:00
yuyulei 72595b2da8
Add user remote address info log (#2184) 2021-01-11 16:52:17 +08:00
yuyulei 127a31ea6a
Fix typo (#2089) 2020-11-23 11:38:21 +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 c9fe23eb10
more e2e tests (#1845) 2020-09-07 14:57:23 +08:00
Luka Čehovin Zajc 268afb3438
Sorting plugins so that execution order is deterministic (#1961) 2020-08-31 19:49:46 +08:00
fatedier 8b75b8b837
fix by golint (#1822) 2020-05-24 17:48:37 +08:00
Tank dfbf9c4542
style: adjust frps files (#1820) 2020-05-24 11:28:57 +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
Guy Lewin 6d78af6144
feat: group TCP mux proxies (#1765) 2020-04-20 13:35:47 +08:00
Tank 7728e35c52
fix: frps handle multi conn may happen data race (#1768) 2020-04-19 16:16:24 +08:00
zhang-wei ad0c449a75
Server manager support the NewUserConn operation (#1740) 
support NewUserConn operation
 2020-04-16 13:06:46 +08:00
Guy Lewin a4b105dedb
[Feature] Server Plugin - Ping and NewWorkConn RPC (#1702) 2020-03-18 01:52:44 +08:00
Guy Lewin 10acf638f8
[Feature] Include RunId in FRP Server Plugin NewProxy message (#1700) 
* feat: include RunId in FRP Server Plugin NewProxy message

* doc: rewrite server plugin documentation
 2020-03-14 23:26:35 +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
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 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
fatedier b3ed863021 support http load balancing 2019-07-31 00:41:58 +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
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
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
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
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
fatedier 70ac7d3d11 fix control delete error 2019-01-26 21:36:24 +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
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 08c17c3247 frpc: support health check 2018-12-07 18:40:17 +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 db2d1fce76 http: support setting headers 2018-05-20 23:22:07 +08:00
fatedier 6eb8146334 frps dashboard add stcp 2018-05-20 19:06:05 +08:00
fatedier 1a6cbbb2d2 return error quickly if nathole make error 2018-05-17 00:07:56 +08:00
fatedier 3e349455a0 commands for xtcp, stcp add 'bind_port', fix #767 2018-05-16 23:45:44 +08:00
fatedier 96b94d9164 dashbaord_api: more info 2018-05-11 17:14:16 +08:00
fatedier 1464836f05 logs panic debug strace info 2018-05-11 12:05:37 +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 a27e3dda88 vendor: update shutdown 2018-05-08 23:51:13 +08:00
fatedier 1dd7317c06 vendor: add package io 2018-05-08 23:42:04 +08:00
fatedier 8a6d6c534a vendor: udpate 2018-05-08 02:13:30 +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 dfb892c8f6
Merge pull request #718 from fatedier/cmd 
more cmds
 2018-04-23 03:07:14 +08:00
fatedier 0f6f674a64 cmd: support more cli command 2018-04-23 02:00:25 +08:00
miwee 3fde9176c9 dashboard_api for getting a client status by name 2018-04-04 12:07:20 +05:30
fatedier e9241aeb94 udp proxy: fix #652 2018-03-19 20:22:15 +08:00
fatedier 8e719ff0ff frps: new params max_ports_per_client 2018-01-26 14:56:55 +08:00
fatedier a77c7e8625 server: change MIN_PORT from 1024 to 1 2018-01-22 11:48:31 +08:00
fatedier 4f7dfcdb31 fix new http no traffic stats, fix #590 2018-01-17 23:17:15 +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 3f6799c06a add remoteAddr in NewProxyResp message 2018-01-17 15:01:26 +08:00
fatedier 584e098e8e frpc: add status command 2018-01-17 01:09:33 +08:00
fatedier 4cc5ddc012 newhttp support BasicAuth 2017-12-13 23:44:27 +08:00
fatedier 46358d466d support encryption and compression in new http reverser proxy 2017-12-13 04:28:58 +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