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

81 Commits

Author SHA1 Message Date
yuyulei 4fff3c7472
Add tls configuration to both client and server (#1974) 2020-09-18 19:58:58 +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
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
glzjin 0b9124d4fd
Fix bandwidth compare (#1679) 
It may cause all proxy restart when api reload.
 2020-03-02 11:20:08 +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 52ecd84d8a fix panic if set meta in proxy config, fix #1595 2020-01-06 15:43:25 +08:00
fatedier 91e46a2c53 support server plugin feature 2019-12-23 20:00:04 +08:00
fatedier a57679f837 support meta info for client and proxy 2019-12-08 21:01:58 +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
Tyler Compton 92791260a7 Add documentation for base proxy config 2019-08-24 15:25:52 -07: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
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 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 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
fatedier 388b016842 support disable_log_color for console mode 2019-08-12 00:47:35 +08:00
fatedier 0dfd3a421c frps: support custom_404_page 2019-04-25 12:29:34 +08:00
fatedier 9c4ec56491 support proxy protocol 2019-03-29 19:01:18 +08:00
fatedier d812488767 support tls connection 2019-03-11 14:14:31 +08:00
fatedier 48990da22e go vet 2019-01-31 16:49:23 +08:00
fatedier f76deb8898 frps: remove auth timeout 2019-01-15 00:22:13 +08:00
fatedier 25cfda5768 conf: support render configure file using environment variables 2018-12-11 11:46:12 +08:00
fatedier aea9f9fbcc health: add more ci cases and fix bugs 2018-12-09 21:56:46 +08:00
fatedier 08c17c3247 frpc: support health check 2018-12-07 18:40:17 +08:00
fatedier 89d1a1fb2b
Merge pull request #968 from fatedier/health 
support health check and code refactor
 2018-11-09 10:06:47 +08:00
fatedier f14ed87b29
Merge pull request #886 from fatedier/websocket 
Connect protocol support websocket
 2018-08-10 16:36:02 +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
fatedier 6e305db4be
Merge pull request #882 from 235832289/master 
Fix the problem of long connection for more than 30 seconds and disconnection of the server
 2018-08-08 11:03:08 +08:00
itcode 9bb08396c7 Fix the problem of long connection for more than 30 seconds and disconnection of the server 2018-08-08 10:52:08 +08:00
fatedier 64136a3b3e
Merge pull request #875 from jettyu/jettyu-websocket 
websocket protocol
 2018-08-06 15:20:09 +08:00
FishFish b8037475ed websocket protocol 2018-08-05 12:55:31 +08:00
fatedier 082447f517 frpc: support health check 2018-07-16 01:21:29 +08:00
fatedier c33b5152e7 split visitors from proxies and add health check config 2018-06-25 18:22:35 +08:00
fatedier f5778349d5 config: fix server_name not using user as prefix, fix #804 2018-06-08 14:44:19 +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 e1918f6396 frps add '-t' to set token 2018-05-18 10:58:08 +08:00
fatedier ad1e32fd2d fix panic error when vhost_http_port is not set but there is a http 
proxy, fix #776
 2018-05-18 00:21:11 +08:00
fatedier 3e349455a0 commands for xtcp, stcp add 'bind_port', fix #767 2018-05-16 23:45:44 +08:00
fatedier 1464836f05 logs panic debug strace info 2018-05-11 12:05:37 +08:00
fatedier 4a5c00286e doc: update 2018-04-24 01:28:25 +08:00