Commit Graph

51 Commits

Author SHA1 Message Date
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 9cebfccb39
cmd: add verify command to verify if config file syntax is valid (#2389) 2021-05-12 12:15:22 +08:00
fatedier 9a849a29e9
fix config parse logic (#2323) 2021-03-22 14:53:30 +08:00
Splash 6b80861bd6
Fix log_file does not work in config files (#2316) 2021-03-22 11:30:12 +08:00
yuyulei 3621aad1c1
Reconstruct config (#2098)
* refactoring config

* Update by comments
2021-01-26 11:31:08 +08:00
wxiaoguang fae2f8768d
tweak logs: (#2100)
* show what config frps uses (config file / command line)
* optimize the "start successfully" log message
2020-11-23 17:01:31 +08:00
Dan Ordille c3b7575453
Add enable_prometheus option as command line flag (#2057) 2020-11-06 15:33:59 +08:00
fatedier 3fbdea0f6b
rename models to pkg (#2005) 2020-09-23 13:49:14 +08:00
fatedier 8b75b8b837
fix by golint (#1822) 2020-05-24 17:48:37 +08:00
Tank 591023a1f0
fix: add frpc tls_enable flag and frps tls_only flag (#1798) 2020-05-12 14:33:34 +08:00
Tank 1ab23b5e0e
fix: typo (#1799) 2020-05-10 17:58: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
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
fatedier 649f47c345 change log method 2019-10-12 20:13:12 +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
fatedier 388b016842 support disable_log_color for console mode 2019-08-12 00:47:35 +08:00
zhangwei 802d1c1861
replace the _ 2019-06-01 10:09:13 +08:00
fatedier 7f9d88c10a fix 2019-04-08 15:39:14 +08:00
fatedier 6b61cb3742 fix frps --log_file useless, fix #1125 2019-03-15 15:37:17 +08:00
fatedier 96d7e2da6f add admin UI for frpc 2019-02-01 19:28:05 +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 89d1a1fb2b
Merge pull request #968 from fatedier/health
support health check and code refactor
2018-11-09 10:06:47 +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 42ee536dae add module comments for vgo 2018-06-27 11:46:53 +08:00
kac- e64fcce417 cmd: frps: allow_ports option 2018-06-06 18:25:55 +02:00
fatedier e1918f6396 frps add '-t' to set token 2018-05-18 10:58:08 +08:00
fatedier 8a6d6c534a vendor: udpate 2018-05-08 02:13:30 +08:00
fatedier 853892f3cd change version to v0.18.0 2018-05-02 22:09:15 +08:00
hanshuai b87df569e7 do not ignore config parsing error 2018-05-02 20:40:33 +08:00
fatedier c47aad348d fix 2018-04-23 02:40: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 a4fece3f51 api: add server web api for statistics 2017-03-23 02:01:25 +08:00
fatedier 88083d21e8 start refactoring 2017-03-09 22:44:42 +08:00
fatedier 09127a3b55 all: improve the method of import for internal packages
1. Change directory structure and Makefile to let GOPATH=`pwd`, so wherever the project directory is, just use make to build.
2016-02-25 17:38:34 +08:00
fatedier 42e062b3b5 all: improvement in utils/conn 2016-02-25 10:28:34 +08:00
fatedier 26479cf92a all: fix bug when client shutdown and reconnect, server response already use
1. if client is offline, server will release all resources
2. use a graceful method to shutdown go net.Listeners
3. add closeFlag for Conn, so startHeartBeat func can exit correctly now
2016-02-19 17:01:47 +08:00
fatedier 84f8addd6a Move config.go to models/xxx 2016-02-18 18:24:48 +08:00
fatedier 50165053f8 Change directory structure, move models and utils to root directory 2016-02-18 16:56:55 +08:00
fatedier e805acd1e3 Merge branch 'fix_some_bugs' of https://github.com/Hurricanezwf/frp into Hurricanezwf-fix_some_bugs
Conflicts:
	cmd/frpc/config.go
	cmd/frpc/control.go
	cmd/frpc/main.go
	cmd/frps/config.go
	cmd/frps/control.go
	cmd/frps/main.go
	pkg/models/server.go
2016-02-18 11:42:31 +08:00
Hurricanezwf 60c9804776 format代码 2016-02-05 16:49:52 +08:00
Hurricanezwf 04c26d1c31 (1)新增心跳检测发送间隔和超时时间的配置 2016-02-05 14:36:04 +08:00
Hurricanezwf 5d6f37aa82 (1)优化重连和心跳检测 2016-02-05 14:18:26 +08:00
fatedier fa9356936b Use go fmt before build 2016-02-03 18:46:24 +08:00
fatedier 79195d7177 Change internal package import to github/fatedier 2016-02-03 18:23:30 +08:00