archive/revsuit
1
0
Fork 0
mirror of https://github.com/Li4n0/revsuit.git synced 2026-09-21 22:30:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix some bug and standardize the code (#2)

Browse Source
This commit is contained in:
Li4n0
2021-04-22 16:40:22 +08:00
committed by GitHub
parent 960b2ab5ea
commit 72c6150517
10 changed files with 45 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/Home.vue
+1 -1
View File
@@ -1,6 +1,6 @@
<template>
<div class="home">
<img alt="Vue logo" src="../assets/logo.png">
<!-- <img alt="Vue logo" src="../assets/logo.png">-->
</div>
</template>
frontend/src/views/logs/Http.vue
+1
View File
@@ -159,6 +159,7 @@ export default {
data: [],
pagination: {current: 1},
filters: {},
order: "desc",
loading: false,
columns,
colors
internal/cli/cli.go
+3 -4
View File
@@ -1,7 +1,6 @@
package cli
import (
"io/ioutil"
"os"
"sort"
@@ -35,12 +34,12 @@ func Start() {
},
Action: func(c *cli.Context) error {
conf := &server.Config{}
if content, err := ioutil.ReadFile("config.yaml"); err == nil {
if content, err := os.ReadFile("config.yaml"); err == nil {
if err := yaml.Unmarshal(content, conf); err != nil {
log.Fatal(err.Error())
return err
}
} else {
log.Fatal(err.Error())
return err
}
if c.String("addr") != "" {
conf.Addr = c.String("addr")
internal/notice/ding.go
+6 -5
View File
@@ -8,6 +8,7 @@ import (
"strings"
"github.com/li4n0/revsuit/internal/record"
"github.com/pkg/errors"
)
var _ Bot = (*DingTalk)(nil)
@@ -37,8 +38,8 @@ func (d *DingTalk) buildPayload(r record.Record) string {
MsgType: "markdown",
Markdown: dingMarkdown{
Title: "New Connection",
Text: "**<font color=\"#e96900\" face=\"Fira Code\" size=\"3\">New Connection</font>**\n" +
formatRecordField(r, "> **<font color=\"#e96900\" face=\"Fira Code\">%s: </font>**<font color=\"#e96900\" face=\"Fira Code\">%v</font>\n"),
Text: "**<font color='#e96900' face='Fira Code' size='3'>New Connection</font>**\n" +
formatRecordField(r, "> **<font color='#e96900' face='Fira Code'>%s: </font>**<font color='#e96900' face='Fira Code'>%v</font>\n"),
},
At: []dingAt{
{
@@ -54,16 +55,16 @@ func (d *DingTalk) buildPayload(r record.Record) string {
}
func (d *DingTalk) notice(r record.Record) error {
resp, err := http.DefaultClient.Post(d.URL, "application/json", strings.NewReader(d.buildPayload(r)))
resp, err := http.Post(d.URL, "application/json", strings.NewReader(d.buildPayload(r)))
if err != nil {
return fmt.Errorf("HTTP request: %v", err)
return errors.Wrap(err, "HTTP request")
}
defer resp.Body.Close()
if resp.StatusCode/100 != 2 {
data, err := ioutil.ReadAll(resp.Body)
if err != nil {
return fmt.Errorf("read HTTP response body: %v", err)
return errors.Wrap(err, "read HTTP response body")
}
return fmt.Errorf("non-success response status code %d with body: %s", resp.StatusCode, data)
}
internal/notice/lark.go
+4 -3
View File
@@ -8,6 +8,7 @@ import (
"strings"
"github.com/li4n0/revsuit/internal/record"
"github.com/pkg/errors"
)
var _ Bot = (*Lark)(nil)
@@ -69,16 +70,16 @@ func (d *Lark) buildPayload(r record.Record) string {
}
func (d *Lark) notice(r record.Record) error {
resp, err := http.DefaultClient.Post(d.URL, "application/json", strings.NewReader(d.buildPayload(r)))
resp, err := http.Post(d.URL, "application/json", strings.NewReader(d.buildPayload(r)))
if err != nil {
return fmt.Errorf("HTTP request: %v", err)
return errors.Wrap(err, "HTTP request")
}
defer resp.Body.Close()
if resp.StatusCode/100 != 2 {
data, err := ioutil.ReadAll(resp.Body)
if err != nil {
return fmt.Errorf("read HTTP response body: %v", err)
return errors.Wrap(err, "read HTTP response body")
}
return fmt.Errorf("non-success response status code %d with body: %s", resp.StatusCode, data)
}
internal/notice/slack.go
+4 -3
View File
@@ -8,6 +8,7 @@ import (
"strings"
"github.com/li4n0/revsuit/internal/record"
"github.com/pkg/errors"
)
var _ Bot = (*Slack)(nil)
@@ -67,16 +68,16 @@ func (d *Slack) buildPayload(r record.Record) string {
}
func (d *Slack) notice(r record.Record) error {
resp, err := http.DefaultClient.Post(d.URL, "application/json", strings.NewReader(d.buildPayload(r)))
resp, err := http.Post(d.URL, "application/json", strings.NewReader(d.buildPayload(r)))
if err != nil {
return fmt.Errorf("HTTP request: %v", err)
return errors.Wrap(err, "HTTP request")
}
defer resp.Body.Close()
if resp.StatusCode/100 != 2 {
data, err := ioutil.ReadAll(resp.Body)
if err != nil {
return fmt.Errorf("read HTTP response body: %v", err)
return errors.Wrap(err, "read HTTP response body")
}
return fmt.Errorf("non-success response status code %d with body: %s", resp.StatusCode, data)
}
internal/notice/weixin.go
+5 -4
View File
@@ -8,6 +8,7 @@ import (
"strings"
"github.com/li4n0/revsuit/internal/record"
"github.com/pkg/errors"
)
var _ Bot = (*Weixin)(nil)
@@ -31,7 +32,7 @@ func (w *Weixin) buildPayload(r record.Record) string {
ToUser: "@all",
MsgType: "markdown",
Markdown: weixinMarkdown{
Content: "<font color=\"#e96900\" face=\"Fira Code\" size=3>New Connection</font>\n" +
Content: "<font color='#e96900' face='Fira Code' size=3>New Connection</font>\n" +
formatRecordField(r, `> **<font color="#e96900" face="Fira Code">%s: </font>**<font color="#e96900" face="Fira Code">%v</font>`),
},
}
@@ -43,15 +44,15 @@ func (w *Weixin) buildPayload(r record.Record) string {
}
func (w *Weixin) notice(r record.Record) error {
resp, err := http.DefaultClient.Post(w.URL, "application/json", strings.NewReader(w.buildPayload(r)))
resp, err := http.Post(w.URL, "application/json", strings.NewReader(w.buildPayload(r)))
if err != nil {
return fmt.Errorf("HTTP request: %v", err)
return errors.Wrap(err, "HTTP request")
}
defer resp.Body.Close()
if resp.StatusCode/100 != 2 {
data, err := ioutil.ReadAll(resp.Body)
if err != nil {
return fmt.Errorf("read HTTP response body: %v", err)
return errors.Wrap(err, "read HTTP response body")
}
return fmt.Errorf("non-success response status code %d with body: %s", resp.StatusCode, data)
}
internal/qqwry/query.go
+2 -3
View File
@@ -2,13 +2,12 @@ package qqwry
// Area return IpArea according to ip
func Area(ip string) string {
ipData := GetQQWry().SearchByIPv4(ip)
if GetQQWry() == nil {
return ""
}
ipData := GetQQWry().SearchByIPv4(ip)
if ipData.Area == " CZ88.NET" {
return ipData.Country
} else {
return ipData.Country + " " + ipData.Area
}
return ipData.Country + " " + ipData.Area
}
internal/rule/rule.go
+19 -31
View File
@@ -25,41 +25,29 @@ type BaseRule struct {
Notice bool `gorm:"default:false;not null;" form:"notice" json:"notice"`
}
func compileCatcher(flagFormat string) (reg *regexp.Regexp, err error) {
if reg, err := regexp.Compile(flagFormat); err == nil {
return reg, nil
} else {
// * meaning record all connections.
if flagFormat != "*" {
return nil, err
} else {
return nil, nil
}
}
}
func (br BaseRule) Match(s string) (flag, flagGroup string) {
if br.flagCatcher == nil && br.FlagFormat != "*" {
// compile rule flags
catcher, err := compileCatcher(br.FlagFormat)
if err != nil {
log.Error("%s(rule:%s)", err.Error(), br.Name)
if br.flagCatcher == nil {
if br.FlagFormat == "*" {
flag = "*"
return
} else {
if catcher, err := regexp.Compile(br.FlagFormat); err != nil {
log.Error("%s(rule:%s)", err.Error(), br.Name)
return
} else {
br.flagCatcher = catcher
}
}
br.flagCatcher = catcher
}
if br.flagCatcher == nil {
// capture all connection.
flag = "*"
} else {
matched := br.flagCatcher.FindStringSubmatch(s)
if len(matched) == 0 {
return
}
flag = matched[0]
if len(matched) > 1 {
flagGroup = matched[1]
}
matched := br.flagCatcher.FindStringSubmatch(s)
if len(matched) == 0 {
return
}
flag = matched[0]
if len(matched) > 1 {
flagGroup = matched[1]
}
return flag, flagGroup
}
pkg/server/router.go
-1
View File
@@ -26,7 +26,6 @@ func (revsuit *Revsuit) registerPlatformRouter() {
if !(c.Request.Header.Get("Token") == revsuit.http.Token || err == nil && cookieToken.Value == revsuit.http.Token) {
c.Abort()
c.Status(403)
return
}
})
revsuit.http.ApiGroup = api