From dd1b16672a9898a780228fca650dd8710a67ca70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=8E=E8=B5=B7?= <1402720815@qq.com> Date: Thu, 21 Jul 2022 16:38:19 +0800 Subject: [PATCH] Update RedGuard Version 22.7.21 --- CHANGELOG | 4 ++++ RedGuard.log | 22 +--------------------- config/version.go | 2 +- go.mod | 4 +++- go.sum | 4 ++-- lib/logger.go | 7 +++---- 6 files changed, 14 insertions(+), 29 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 34d33d5..1fd62a2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +## [22.7.21.1632] - 2022-7-21 +### Added +- Limit the maximum number of log backup files that can be generated + ## [22.7.14.1043] - 2022-7-14 ### Added - Resolve the problem that the custom certificate is overwritten diff --git a/RedGuard.log b/RedGuard.log index ec2639c..8c3a410 100644 --- a/RedGuard.log +++ b/RedGuard.log @@ -538,24 +538,4 @@ [2022-06-01 15:37:41] [RedGuard/core.(*baseHandle).ServeHTTP] [REQUEST] 127.0.0.1 - Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.63 Safari/537.36 [2022-06-01 15:37:41] [RedGuard/core.modifyResponse.func1.1] [RESPONSE] HTTP 404 Not Found, length: 0 [2022-06-01 15:37:41] [RedGuard/core.(*baseHandle).ServeHTTP] [REDIRECT] Source IP: 127.0.0.1 -> Destination Site: https://cloud.tencent.com/ - -[2022-07-14 10:41:04] [RedGuard/lib.InitGenerateSelfSignedCert] A default SSL certificate is being generated for the reverse proxy... -[2022-07-14 10:41:04] [main.(*cobaltStrike).serverInit] HostTarget: {"360.net":"http://127.0.0.1:8080","360.com":"https://127.0.0.1:4433"} -[2022-07-14 10:41:04] [RedGuard/core.ProxyManger] Proxy Listen Port :80 (HTTP) -[2022-07-14 10:41:04] [RedGuard/core.ProxyManger] Proxy Listen Port :443 (HTTPS) -[2022-07-14 10:41:12] [main.(*cobaltStrike).serverInit] HostTarget: {"360.net":"http://127.0.0.1:8080","360.com":"https://127.0.0.1:4433"} -[2022-07-14 10:41:12] [RedGuard/core.ProxyManger] Proxy Listen Port :80 (HTTP) -[2022-07-14 10:41:12] [RedGuard/core.ProxyManger] Proxy Listen Port :443 (HTTPS) -[2022-07-14 10:41:51] [RedGuard/lib.InitGenerateSelfSignedCert] A default SSL certificate is being generated for the reverse proxy... -[2022-07-14 10:41:51] [main.(*cobaltStrike).serverInit] HostTarget: {"360.net":"http://127.0.0.1:8080","360.com":"https://127.0.0.1:4433"} -[2022-07-14 10:41:51] [RedGuard/core.ProxyManger] Proxy Listen Port :80 (HTTP) -[2022-07-14 10:41:51] [RedGuard/core.ProxyManger] Proxy Listen Port :443 (HTTPS) -[2022-07-14 10:42:20] [RedGuard/lib.CreateConfig] RedGuard initialization is complete! -[2022-07-14 10:42:21] [RedGuard/lib.CreateConfig] RedGuard config path is: C:\Users\风起/.RedGuard_CobaltStrike.ini -[2022-07-14 10:42:24] [RedGuard/lib.InitGenerateSelfSignedCert] A default SSL certificate is being generated for the reverse proxy... -[2022-07-14 10:42:24] [main.(*cobaltStrike).serverInit] HostTarget: {"360.net":"http://127.0.0.1:8080","360.com":"https://127.0.0.1:4433"} -[2022-07-14 10:42:24] [RedGuard/core.ProxyManger] Proxy Listen Port :80 (HTTP) -[2022-07-14 10:42:24] [RedGuard/core.ProxyManger] Proxy Listen Port :443 (HTTPS) -[2022-07-14 10:43:15] [main.(*cobaltStrike).serverInit] HostTarget: {"360.net":"http://127.0.0.1:8080","360.com":"https://127.0.0.1:4433"} -[2022-07-14 10:43:15] [RedGuard/core.ProxyManger] Proxy Listen Port :80 (HTTP) -[2022-07-14 10:43:15] [RedGuard/core.ProxyManger] Proxy Listen Port :443 (HTTPS) +[2 \ No newline at end of file diff --git a/config/version.go b/config/version.go index 6ba5861..f1270e0 100644 --- a/config/version.go +++ b/config/version.go @@ -21,7 +21,7 @@ Github:%s RedGuard is a C2 front flow control tool,Can avoid Blue Teams,AVs,EDRs check. ` - VERSION = "22.7.14 Alpha" + VERSION = "22.7.21 Alpha" TITLE = "RedGuard" LICENSE = "GPL-2.0" URL = "https://github.com/wikiZ/RedGuard" diff --git a/go.mod b/go.mod index 2c83f0e..68d0091 100644 --- a/go.mod +++ b/go.mod @@ -7,9 +7,11 @@ require ( github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394 github.com/go-ini/ini v1.66.4 github.com/go-resty/resty/v2 v2.7.0 - github.com/phachon/go-logger v0.0.0-20191215032019-86e4227f71ea + github.com/phachon/go-logger v0.0.0-20191215032019-86e4227f71ea github.com/sleeyax/ja3rp v0.0.1 github.com/stretchr/testify v1.7.1 // indirect github.com/tidwall/gjson v1.14.1 github.com/wxnacy/wgo v1.0.4 ) + +replace github.com/phachon/go-logger v0.0.0-20191215032019-86e4227f71ea => github.com/wikiZ/go-logger v0.0.0-20201128041628-4404a90d93ec diff --git a/go.sum b/go.sum index 43e22d2..b8d2c6c 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,6 @@ github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= -github.com/phachon/go-logger v0.0.0-20191215032019-86e4227f71ea h1:IkOONr/u7Wy+j2R4r1eMV8PEuN4kmOhZZNaYxDOF+KQ= -github.com/phachon/go-logger v0.0.0-20191215032019-86e4227f71ea/go.mod h1:WBIWFH/iYYvuApCvPU+/R6hfX6v0Ogu4apwf0UgzVF0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -43,6 +41,8 @@ github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= +github.com/wikiZ/go-logger v0.0.0-20201128041628-4404a90d93ec h1:soPPf+s+iq4J5qFk0KziWKA6jO29bxonQe1yqNQkeic= +github.com/wikiZ/go-logger v0.0.0-20201128041628-4404a90d93ec/go.mod h1:WBIWFH/iYYvuApCvPU+/R6hfX6v0Ogu4apwf0UgzVF0= github.com/wxnacy/wgo v1.0.4 h1:UEkzjlW3pMAXcTUCgMekrCvFYLKKwc0p5GAQrMIphs8= github.com/wxnacy/wgo v1.0.4/go.mod h1:8hqUwCgvMGgAIr4MLIeFur2YXS/Ns3vbyx5abx0e8iM= golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 h1:/pEO3GD/ABYAjuakUS6xSEmmlyVS4kxBNkeA9tLJiTI= diff --git a/lib/logger.go b/lib/logger.go index 5103354..b8c3d0d 100644 --- a/lib/logger.go +++ b/lib/logger.go @@ -7,9 +7,7 @@ package lib -import ( - "github.com/phachon/go-logger" -) +import "github.com/phachon/go-logger" func Logger() *go_logger.Logger { logger := go_logger.NewLogger() @@ -23,7 +21,8 @@ func Logger() *go_logger.Logger { fileConfig := &go_logger.FileConfig{ Filename: "./RedGuard.log", MaxSize: 1024 * 1024, // Maximum file size (KB). The default value is 0 - MaxLine: 100000, + MaxLine: 50000, + MaxBak: 1, DateSlice: "d", Format: "[%timestamp_format%] [%function%] %body%", }